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

21 files changed, 899 insertions, 0 deletions

diff --git a/keyboards/quark/config.h b/keyboards/quark/config.h
new file mode 100644
index 0000000000..084891b2ce
--- /dev/null
+++ b/keyboards/quark/config.h
@@ -0,0 +1,75 @@
+/* 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/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x7070
+#define PRODUCT_ID      0x5340
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Nasp
+#define PRODUCT         QUARK
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 12
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 }
+#define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, B1, D2, D3, D4, D5, D6 }
+#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
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// ws2812 options
+#define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to
+#define RGBLIGHT_ANIMATIONS // run RGB animations
+#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 TAPPING_TOGGLE 2
diff --git a/keyboards/quark/info.json b/keyboards/quark/info.json
new file mode 100644
index 0000000000..1687a12403
--- /dev/null
+++ b/keyboards/quark/info.json
@@ -0,0 +1,33 @@
+{

+    "keyboard_name": "QUARK",

+    "url": "",

+    "maintainer": "nasp",

+    "width": 12,

+    "height": 5,

+    "layouts": {

+        "LAYOUT_5x12_2x225": {

+            "layout":

+		      [{"label":"_", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"+", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":6, "y":1}, {"label":"U", "x":7, "y":1}, {"label":"I", "x":8, "y":1}, {"label":"O", "x":9, "y":1}, {"label":"P", "x":10, "y":1}, {"label":"Back Space", "x":11, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";", "x":10, "y":2}, {"label":"'", "x":11, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":6, "y":3}, {"label":"M", "x":7, "y":3}, {"label":",", "x":8, "y":3}, {"label":".", "x":9, "y":3}, {"label":"/", "x":10, "y":3}, {"label":"Return", "x":11, "y":3}, {"label":"CTRL", "x":0, "y":4, "w":1.25}, {"label":"WIN", "x":1.25, "y":4, "w":1.25}, {"label":"ALT", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":2.25}, {"label":"ALT", "x":8.25, "y":4, "w":1.25}, {"label":"MENU", "x":9.5, "y":4, "w":1.25}, {"label":"CTRL", "x":10.75, "y":4, "w":1.25}]

+                             },

+   	    "LAYOUT_5x12_2x3":   {

+            "layout":

+              [{"label":"_", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"+", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":6, "y":1}, {"label":"U", "x":7, "y":1}, {"label":"I", "x":8, "y":1}, {"label":"O", "x":9, "y":1}, {"label":"P", "x":10, "y":1}, {"label":"Back Space", "x":11, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";", "x":10, "y":2}, {"label":"'", "x":11, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":6, "y":3}, {"label":"M", "x":7, "y":3}, {"label":",", "x":8, "y":3}, {"label":".", "x":9, "y":3}, {"label":"/", "x":10, "y":3}, {"label":"Return", "x":11, "y":3}, {"label":"CTRL", "x":0, "y":4, "w":1.5}, {"label":"ALT", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":3}, {"x":6, "y":4, "w":3}, {"label":"ALT", "x":9, "y":4, "w":1.5}, {"label":"MENU", "x":10.5, "y":4, "w":1.5}]

+                             },

+        "LAYOUT_4x12_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_4x12_MIT":   {

+            "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_4x12_2x225": {

+            "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_4x12_2x3":   {

+            "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/quark/keymaps/default/config.h b/keyboards/quark/keymaps/default/config.h
new file mode 100644
index 0000000000..311c729c52
--- /dev/null
+++ b/keyboards/quark/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/quark/keymaps/default/keymap.c b/keyboards/quark/keymaps/default/keymap.c
new file mode 100644
index 0000000000..87e03fa180
--- /dev/null
+++ b/keyboards/quark/keymaps/default/keymap.c
@@ -0,0 +1,88 @@
+/* Copyright 2020 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]
+ * ,-----------------------------------------------------------------------------------------.
+ * |   =        |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   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_5x12_2x225( \
+  KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  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_LGUI, KC_LALT, TT(1), LT(2, KC_SPC), KC_LBRC, KC_RBRC, KC_CAPS
+),
+
+/* [1]
+* ,---------------------------------------------------------------------------------------.
+* |   =    |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0   |   -   |
+* |------------+------+------+------+------+------+------+------+------+------+------+----|
+* |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+* |------------+------+------+------+------+-------------+------+------+------+------+----|
+* |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+* |------------+------+------+------+------+------|------+------+------+------+------+----|
+* |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+* |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
+* `---------------------------------------------------------------------------------------'
+*/
+[1] = LAYOUT_5x12_2x225( \
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  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]
+* ,---------------------------------------------------------------------------------------.
+* |   =    |   1  |   2  |   3  |   4  |   5  |  6  |   7  |   8  |   9  |   0   |   -   |
+* |------------+------+------+------+------+------+------+------+------+------+------+---|
+* |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+* |------------+------+------+------+------+-------------+------+------+------+------+---|
+* |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+* |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+* |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+* |     RESET    |           |          |         |         |         |        |         |
+* `---------------------------------------------------------------------------------------'
+ */
+[2] = LAYOUT_5x12_2x225( \
+  KC_EQL,  KC_1,      KC_2,      KC_3,   KC_4,      KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  _______,  _______,  _______,   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/quark/keymaps/default/readme.md b/keyboards/quark/keymaps/default/readme.md
new file mode 100644
index 0000000000..1e0d8e25c4
--- /dev/null
+++ b/keyboards/quark/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The Default Quark Layout
+
diff --git a/keyboards/quark/keymaps/default_4x12_2x225/config.h b/keyboards/quark/keymaps/default_4x12_2x225/config.h
new file mode 100644
index 0000000000..311c729c52
--- /dev/null
+++ b/keyboards/quark/keymaps/default_4x12_2x225/config.h
@@ -0,0 +1,2 @@
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/quark/keymaps/default_4x12_2x225/keymap.c b/keyboards/quark/keymaps/default_4x12_2x225/keymap.c
new file mode 100644
index 0000000000..d94d62026c
--- /dev/null
+++ b/keyboards/quark/keymaps/default_4x12_2x225/keymap.c
@@ -0,0 +1,83 @@
+/* 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_4x12_2x225( \
+      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_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_4x12_2x225( \
+      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_4x12_2x225( \
+      _______,  _______,  _______,   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/quark/keymaps/default_4x12_2x3/config.h b/keyboards/quark/keymaps/default_4x12_2x3/config.h
new file mode 100644
index 0000000000..311c729c52
--- /dev/null
+++ b/keyboards/quark/keymaps/default_4x12_2x3/config.h
@@ -0,0 +1,2 @@
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/quark/keymaps/default_4x12_2x3/keymap.c b/keyboards/quark/keymaps/default_4x12_2x3/keymap.c
new file mode 100644
index 0000000000..938fb6824e
--- /dev/null
+++ b/keyboards/quark/keymaps/default_4x12_2x3/keymap.c
@@ -0,0 +1,83 @@
+/* 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_4x12_2x3( \
+    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_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_4x12_2x3( \
+    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_4x12_2x3( \
+    _______,  _______,  _______,   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/quark/keymaps/default_4x12_grid/config.h b/keyboards/quark/keymaps/default_4x12_grid/config.h
new file mode 100644
index 0000000000..311c729c52
--- /dev/null
+++ b/keyboards/quark/keymaps/default_4x12_grid/config.h
@@ -0,0 +1,2 @@
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/quark/keymaps/default_4x12_grid/keymap.c b/keyboards/quark/keymaps/default_4x12_grid/keymap.c
new file mode 100644
index 0000000000..3eb0e8f86c
--- /dev/null
+++ b/keyboards/quark/keymaps/default_4x12_grid/keymap.c
@@ -0,0 +1,83 @@
+/* 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   |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | 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_ortho_4x12( \
+      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_ortho_4x12( \
+      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_ortho_4x12( \
+      _______,  _______,  _______,   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/quark/keymaps/default_4x12_mit/config.h b/keyboards/quark/keymaps/default_4x12_mit/config.h
new file mode 100644
index 0000000000..2e3dbdb686
--- /dev/null
+++ b/keyboards/quark/keymaps/default_4x12_mit/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 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
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/quark/keymaps/default_4x12_mit/keymap.c b/keyboards/quark/keymaps/default_4x12_mit/keymap.c
new file mode 100644
index 0000000000..db2042e636
--- /dev/null
+++ b/keyboards/quark/keymaps/default_4x12_mit/keymap.c
@@ -0,0 +1,83 @@
+/* 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   |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | 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_4x12_MIT( \
+      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_4x12_MIT( \
+      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_4x12_MIT( \
+      _______,  _______,  _______,   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/quark/keymaps/default_5x12_2x3/config.h b/keyboards/quark/keymaps/default_5x12_2x3/config.h
new file mode 100644
index 0000000000..ef97c811fc
--- /dev/null
+++ b/keyboards/quark/keymaps/default_5x12_2x3/config.h
@@ -0,0 +1,18 @@
+/* Copyright 2020 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/>. 
+  */ 
+
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/quark/keymaps/default_5x12_2x3/keymap.c b/keyboards/quark/keymaps/default_5x12_2x3/keymap.c
new file mode 100644
index 0000000000..8b3cf03119
--- /dev/null
+++ b/keyboards/quark/keymaps/default_5x12_2x3/keymap.c
@@ -0,0 +1,89 @@
+/* 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]
+ * ,-----------------------------------------------------------------------------------------.
+ * |   =        |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   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 |
+ * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+ * |   OS   |   Alt   |         Layer        |      Space & Layer     |     [    |    ]      |
+ * `-----------------------------------------------------------------------------------------'
+ */
+[0] = LAYOUT_5x12_2x3( \
+  KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  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_LGUI, KC_LALT, TT(1), LT(2, KC_SPC), KC_LBRC, KC_RBRC
+),
+
+/* [1]
+* ,---------------------------------------------------------------------------------------.
+* |   =    |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0   |   -   |
+* |------------+------+------+------+------+------+------+------+------+------+------+----|
+* |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+* |------------+------+------+------+------+-------------+------+------+------+------+----|
+* |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+* |------------+------+------+------+------+------|------+------+------+------+------+----|
+* |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+* |    ESC  |    CTRL-ALT-DEL        |             |           |      '|'     |    `      |
+* `---------------------------------------------------------------------------------------'
+*/
+[1] = LAYOUT_5x12_2x3( \
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  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, _______, _______, KC_NUBS, KC_GRV
+),
+
+/* [2]
+* ,---------------------------------------------------------------------------------------.
+* |   =    |   1  |   2  |   3  |   4  |   5  |  6  |   7  |   8  |   9  |   0   |   -   |
+* |------------+------+------+------+------+------+------+------+------+------+------+---|
+* |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+* |------------+------+------+------+------+-------------+------+------+------+------+---|
+* |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+* |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+* |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+* |     RESET    |              |             |            |                |            |
+* `---------------------------------------------------------------------------------------'
+ */
+[2] = LAYOUT_5x12_2x3( \
+  KC_EQL,   KC_1,     KC_2,      KC_3,    KC_4,     KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,   KC_MINS,
+  _______,  _______,  _______,   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/quark/keymaps/via/keymap.c b/keyboards/quark/keymaps/via/keymap.c
new file mode 100644
index 0000000000..87e03fa180
--- /dev/null
+++ b/keyboards/quark/keymaps/via/keymap.c
@@ -0,0 +1,88 @@
+/* Copyright 2020 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]
+ * ,-----------------------------------------------------------------------------------------.
+ * |   =        |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   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_5x12_2x225( \
+  KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  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_LGUI, KC_LALT, TT(1), LT(2, KC_SPC), KC_LBRC, KC_RBRC, KC_CAPS
+),
+
+/* [1]
+* ,---------------------------------------------------------------------------------------.
+* |   =    |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0   |   -   |
+* |------------+------+------+------+------+------+------+------+------+------+------+----|
+* |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+* |------------+------+------+------+------+-------------+------+------+------+------+----|
+* |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+* |------------+------+------+------+------+------|------+------+------+------+------+----|
+* |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+* |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
+* `---------------------------------------------------------------------------------------'
+*/
+[1] = LAYOUT_5x12_2x225( \
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  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]
+* ,---------------------------------------------------------------------------------------.
+* |   =    |   1  |   2  |   3  |   4  |   5  |  6  |   7  |   8  |   9  |   0   |   -   |
+* |------------+------+------+------+------+------+------+------+------+------+------+---|
+* |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+* |------------+------+------+------+------+-------------+------+------+------+------+---|
+* |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+* |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+* |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+* |     RESET    |           |          |         |         |         |        |         |
+* `---------------------------------------------------------------------------------------'
+ */
+[2] = LAYOUT_5x12_2x225( \
+  KC_EQL,  KC_1,      KC_2,      KC_3,   KC_4,      KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  _______,  _______,  _______,   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/quark/keymaps/via/rules.mk b/keyboards/quark/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/quark/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/quark/quark.c b/keyboards/quark/quark.c
new file mode 100644
index 0000000000..6b962a8937
--- /dev/null
+++ b/keyboards/quark/quark.c
@@ -0,0 +1 @@
+#include "quark.h"
diff --git a/keyboards/quark/quark.h b/keyboards/quark/quark.h
new file mode 100644
index 0000000000..a81b062d01
--- /dev/null
+++ b/keyboards/quark/quark.h
@@ -0,0 +1,106 @@
+/* Copyright 2020 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 LAYOUT_5x12_2x225( \
+  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
+  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
+  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
+  k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, \
+  k400, k401,       k402, k403,             k404, k405,       k406, k407  \
+) \
+{ \
+  { k000, k001, k002,  k003, k004, k005,  k006,  k007, k008, k009,  k010, k011 }, \
+  { k100, k101, k102,  k103, k104, k105,  k106,  k107, k108, k109,  k110, k111 }, \
+  { k200, k201, k202,  k203, k204, k205,  k206,  k207, k208, k209,  k210, k211 }, \
+  { k300, k301, k302,  k303, k304, k305,  k306,  k307, k308, k309,  k310, k311 }, \
+  { k400, k401, KC_NO, k402, k403, KC_NO, KC_NO, k404, k405, KC_NO, k406, k407 } \
+}
+
+#define LAYOUT_5x12_2x3( \
+  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
+  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
+  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
+  k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, \
+  k400, k401,             k402,             k403,             k404, k405 \
+) \
+{ \
+  { k000, k001, k002,  k003,  k004, k005,  k006,  k007, k008,  k009,  k010, k011 }, \
+  { k100, k101, k102,  k103,  k104, k105,  k106,  k107, k108,  k109,  k110, k111 }, \
+  { k200, k201, k202,  k203,  k204, k205,  k206,  k207, k208,  k209,  k210, k211 }, \
+  { k300, k301, k302,  k303,  k304, k305,  k306,  k307, k308,  k309,  k310, k311 }, \
+  { k400, k401, KC_NO, KC_NO, k402, KC_NO, KC_NO, k403, KC_NO, KC_NO, k404, k405 } \
+}
+
+#define LAYOUT_ortho_4x12( \
+  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
+  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
+  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
+  k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 \
+) \
+{ \
+  { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
+  { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \
+  { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \
+  { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 }, \
+  {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
+}
+
+#define LAYOUT_4x12_MIT( \
+  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
+  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
+  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
+  k300, k301, k302, k303, k304, k305,       k306, k307, k308, k309, k310 \
+) \
+{ \
+  { k000, k001, k002, k003, k004, k005, k006,  k007, k008, k009, k010, k011 }, \
+  { k100, k101, k102, k103, k104, k105, k106,  k107, k108, k109, k110, k111 }, \
+  { k200, k201, k202, k203, k204, k205, k206,  k207, k208, k209, k210, k211 }, \
+  { k300, k301, k302, k303, k304, k305, KC_NO, k306, k307, k308, k309, k310 }, \
+  {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
+}
+
+#define LAYOUT_4x12_2x225( \
+  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
+  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
+  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
+  k300, k301,       k302, k303,             k304, k305,       k306, k307 \
+) \
+{ \
+  { k000, k001, k002,  k003, k004, k005,  k006,  k007, k008, k009,  k010, k011 }, \
+  { k100, k101, k102,  k103, k104, k105,  k106,  k107, k108, k109,  k110, k111 }, \
+  { k200, k201, k202,  k203, k204, k205,  k206,  k207, k208, k209,  k210, k211 }, \
+  { k300, k301, KC_NO, k302, k303, KC_NO, KC_NO, k304, k305, KC_NO, k306, k307 }, \
+  {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
+}
+
+#define LAYOUT_4x12_2x3( \
+  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
+  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
+  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
+  k300, k301, k302,       k303,             k304,       k305, k306, k307 \
+) \
+{ \
+  { k000, k001, k002, k003,  k004, k005,  k006,  k007, k008,  k009, k010, k011 }, \
+  { k100, k101, k102, k103,  k104, k105,  k106,  k107, k108,  k109, k110, k111 }, \
+  { k200, k201, k202, k203,  k204, k205,  k206,  k207, k208,  k209, k210, k211 }, \
+  { k300, k301, k302, KC_NO, k303, KC_NO, KC_NO, k304, KC_NO, k305, k306, k307 }, \
+  {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
+}
diff --git a/keyboards/quark/readme.md b/keyboards/quark/readme.md
new file mode 100644
index 0000000000..def04f59f3
--- /dev/null
+++ b/keyboards/quark/readme.md
@@ -0,0 +1,15 @@
+# Quark
+
+![Quark](https://i.imgur.com/WcvKyf4.jpg)
+
+The Quark PCB is a modified layout for the Planck by OLKB. It's similar to a Planck, but the bottom row was designed to be more useable-larger than 1u keys.  
+
+Keyboard Maintainer: [Nasp](https://github.com/npspears)  
+Hardware Supported: Planck  
+Hardware Availability: https://forms.gle/ZpGtQjBNtsbuSV767
+
+Make example for this keyboard (after setting up your build environment):
+
+    make quark:default
+
+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/quark/rules.mk b/keyboards/quark/rules.mk
new file mode 100644
index 0000000000..535d7c25c5
--- /dev/null
+++ b/keyboards/quark/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = yes        # Unicode
+
+LAYOUTS = ortho_4x12