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

2021-05-13 16:36:43 +00:00 · 2021-05-13 16:36:43 +00:00 · b4039ec515
commit b4039ec515
parent f8f0ca458d 54e788364a
30 changed files with 1130 additions and 0 deletions
--- a/keyboards/checkerboards/candybar_ortho/candybar_ortho.c
+++ b/keyboards/checkerboards/candybar_ortho/candybar_ortho.c
@ -0,0 +1,17 @@
+/* Copyright 2021 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 "candybar_ortho.h"
--- a/keyboards/checkerboards/candybar_ortho/candybar_ortho.h
+++ b/keyboards/checkerboards/candybar_ortho/candybar_ortho.h
@ -0,0 +1,67 @@
+/* Copyright 2021 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, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, \
+  k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, \
+  k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, \
+  k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68  \
+) { \
+  { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
+  { k10, k11, k12, k13, k14, k15, k16, k17, k08 }, \
+  { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
+  { k30, k31, k32, k33, k34, k35, k36, k37, k28 }, \
+  { k40, k41, k42, k43, k44, k45, k46, k47, XXX }, \
+  { k50, k51, k52, k53, k54, k55, k56, k57, k48 }, \
+  { k60, k61, k62, k63, k64, k65, k66, k67, XXX }, \
+  { k70, k71, k72, k73, k74, k75, k76, k77, k68 }  \
+}
+#define LAYOUT_2x3u( \
+  k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, \
+  k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, \
+  k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, \
+  k60, k70, k61, k71,      k72,      k73, k64, k74,      k75,      k76, k67, k77, k68  \
+) { \
+  { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
+  { k10, k11, k12, k13, k14, k15, k16, k17, k08 }, \
+  { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
+  { k30, k31, k32, k33, k34, k35, k36, k37, k28 }, \
+  { k40, k41, k42, k43, k44, k45, k46, k47, XXX }, \
+  { k50, k51, k52, k53, k54, k55, k56, k57, k48 }, \
+  { k60, k61, XXX, XXX, k64, XXX, XXX, k67, XXX }, \
+  { k70, k71, k72, k73, k74, k75, k76, k77, k68 }  \
+}
+#define LAYOUT_7u( \
+  k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, \
+  k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, \
+  k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, \
+  k60, k70, k61, k71, k62,                k64,                k66, k76, k67, k77, k68  \
+) { \
+  { k00, k01, k02, k03, k04, k05, k06, k07, XXX }, \
+  { k10, k11, k12, k13, k14, k15, k16, k17, k08 }, \
+  { k20, k21, k22, k23, k24, k25, k26, k27, XXX }, \
+  { k30, k31, k32, k33, k34, k35, k36, k37, k28 }, \
+  { k40, k41, k42, k43, k44, k45, k46, k47, XXX }, \
+  { k50, k51, k52, k53, k54, k55, k56, k57, k48 }, \
+  { k60, k61, k62, XXX, k64, XXX, k66, k67, XXX }, \
+  { k70, k71, XXX, XXX, XXX, XXX, k76, k77, k68 }  \
+}
--- a/keyboards/checkerboards/candybar_ortho/config.h
+++ b/keyboards/checkerboards/candybar_ortho/config.h
@ -0,0 +1,55 @@
+/* Copyright 2021 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      0x3215
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Nasp
+#define PRODUCT         CandyBar Ortho
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 9
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B4, D4, D7, D6, B5, B6, C7, C6 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D0, D1, 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
+
+#define RGB_DI_PIN B7
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 18
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
--- a/keyboards/checkerboards/candybar_ortho/info.json
+++ b/keyboards/checkerboards/candybar_ortho/info.json
@ -0,0 +1,18 @@
+{
+    "keyboard_name": "CandyBar_Ortho",
+    "url": "",
+    "maintainer": "nasp",
+    "width": 17,
+    "height": 4,
+    "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}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"label":"Y", "x":11, "y":0}, {"label":"U", "x":12, "y":0}, {"label":"I", "x":13, "y":0}, {"label":"O", "x":14, "y":0}, {"label":"P", "x":15, "y":0}, {"label":"Back Space", "x":16, "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}, {"x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"x":10, "y":1}, {"label":"H", "x":11, "y":1}, {"label":"J", "x":12, "y":1}, {"label":"K", "x":13, "y":1}, {"label":"L", "x":14, "y":1}, {"label":";", "x":15, "y":1}, {"label":"'", "x":16, "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}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":",", "x":13, "y":2}, {"label":".", "x":14, "y":2}, {"label":"/", "x":15, "y":2}, {"label":"Return", "x":16, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"8", "x":7, "y":3}, {"x":8, "y":3}, {"label":"10", "x":9, "y":3}, {"label":"11", "x":10, "y":3}, {"label":"12", "x":11, "y":3}, {"label":"&uArr;", "x":12, "y":3}, {"label":"&larr;", "x":13, "y":3}, {"label":"15", "x":14, "y":3}, {"label":"&uarr;", "x":15, "y":3}, {"label":"&rarr;", "x":16, "y":3}]
+                       },
+        "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}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"label":"Y", "x":11, "y":0}, {"label":"U", "x":12, "y":0}, {"label":"I", "x":13, "y":0}, {"label":"O", "x":14, "y":0}, {"label":"P", "x":15, "y":0}, {"label":"Back Space", "x":16, "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}, {"x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"x":10, "y":1}, {"label":"H", "x":11, "y":1}, {"label":"J", "x":12, "y":1}, {"label":"K", "x":13, "y":1}, {"label":"L", "x":14, "y":1}, {"label":";", "x":15, "y":1}, {"label":"'", "x":16, "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}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":",", "x":13, "y":2}, {"label":".", "x":14, "y":2}, {"label":"/", "x":15, "y":2}, {"label":"Return", "x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3, "w":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}]
+                       },
+        "LAYOUT_7u": {
+            "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}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"label":"Y", "x":11, "y":0}, {"label":"U", "x":12, "y":0}, {"label":"I", "x":13, "y":0}, {"label":"O", "x":14, "y":0}, {"label":"P", "x":15, "y":0}, {"label":"Back Space", "x":16, "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}, {"x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"x":10, "y":1}, {"label":"H", "x":11, "y":1}, {"label":"J", "x":12, "y":1}, {"label":"K", "x":13, "y":1}, {"label":"L", "x":14, "y":1}, {"label":";", "x":15, "y":1}, {"label":"'", "x":16, "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}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":",", "x":13, "y":2}, {"label":".", "x":14, "y":2}, {"label":"/", "x":15, "y":2}, {"label":"Return", "x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":7}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}]
+                       }
+    }
+}
--- a/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/config.h
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/config.h
@ -0,0 +1,20 @@
+/* Copyright 2021 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
+#define TAPPING_TERM 200
--- a/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/2x3u/keymap.c
@ -0,0 +1,83 @@
+/* Copyright 2021 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.s
+ *
+ * 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
+ * .----------------------------------------------------------------------------------------------------------------------.
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Home | Tab  |   Q  |   W  |   E  |   R  |   T  |  N7  |  N8  |  N9  | NLCK |  Y   |   U  |   I  |   O  |  P  |  Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | PgUp |C(ESC)|   A  |   S  |   D  |   F  |   G  |  N4  |  N5  |  N6  |  +   |  H   |  J   |   K  |   L  | '"  |  ;:   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | PgDn |Shift |   Z  |   X  |   C  |   V  |   B  |  N1  |  N2  |  N3  |   -  |   N  |  M   |   ,  |   .  |   ?  |  Ent |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Grv  | L-OS | LAlt |  RGB |       Lay1-TT      |  NO |  Dot  |   /  |     Spac(Lay2)     | RALT |RCTRL |C.A.D.| Caps |
+ * '----------------------------------------------------------------------------------------------------------------------'
+ */
+[0] = LAYOUT_2x3u(
+  KC_HOME, KC_TAB,          KC_Q,      KC_W,     KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,   KC_NLCK,  KC_Y,     KC_U,   KC_I,     KC_O,     KC_P,      KC_BSPC,
+  KC_PGUP, CTL_T(KC_ESC),   KC_A,      KC_S,     KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,  KC_H,     KC_J,   KC_K,     KC_L,     KC_SCLN,   KC_QUOT,
+  KC_PGDN, KC_LSFT,         KC_Z,      KC_X,     KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_PMNS,  KC_N,     KC_M,   KC_COMM,  KC_DOT,   KC_SLSH,   KC_ENT,
+  KC_GRV,  KC_LGUI,         KC_LALT,   RGB_TOG,           TT(1),            KC_P0,   KC_PDOT, KC_BSLS,        LT(2, KC_SPC),       KC_RALT,  KC_RCTRL, CALTDEL,   KC_CAPS
+),
+
+/* 1
+ * .----------------------------------------------------------------------------------------------------------------------.
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  ~   |      |   !  |  @   |   #  |  $   |  %   |      |      |      |      |  ^   |  &   |  *   |  (   |  )  |  Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   \  |      |   1  |   2  |   3  |   4  |   5  |      |      |      |      |  6   |   7  |   8  |   9  |   0  |  /   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |   +  |   =  |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |C.A.D.| TMGR |      |      |                    |      |      |      |                    |      |  SPC |   |  |   `  |
+ * '----------------------------------------------------------------------------------------------------------------------'
+ */
+[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_PPLS,  KC_EQL, _______, _______, _______,
+  CALTDEL,  TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, KC_SPC, KC_NUBS,   KC_GRV
+),
+
+/* 2
+ * .----------------------------------------------------------------------------------------------------------------------.
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | RHUI | RSAI |      |      |  UP  |      |      |      |      |      |      |      |   _  |      |  (   |  )  |  RVAI |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | RHUD | RSAD |      | LEFT | DOWN |RIGHT |      |      |      |      |      |      |   -  |      |   [  |   ]  | RVAD |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |RESET | RTOG |      |      |                    |      |      |      |                    |      |      | RMOD |RRMOD |
+ * '----------------------------------------------------------------------------------------------------------------------'
+ */
+[2] = LAYOUT_2x3u(
+  RGB_HUI,  RGB_SAI, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI,
+  RGB_HUD,  RGB_SAD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD,
+  _______,  _______,   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, RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD
+),
+};
--- a/keyboards/checkerboards/candybar_ortho/keymaps/7u/config.h
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/7u/config.h
@ -0,0 +1,20 @@
+/* Copyright 2021 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
+#define TAPPING_TERM 200
--- a/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/7u/keymap.c
@ -0,0 +1,83 @@
+/* Copyright 2021 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  | NLCK |  N7  |  N8  |  N9  | HOME |  Y   |   U  |   I  |   O  |  P  |  Bksp |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* |C(ESC)|   A  |   S  |   D  |   F  |   G  | INS  |  N4  |  N5  |  N6  | PgUp |  H   |  J   |   K  |   L  | '"  |  ;:   |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* |Shift |   Z  |   X  |   C  |   V  |   B  | DEL  |  N1  |  N2  |  N3  | PgDn |   N  |  M   |   ,  |   .  |   ?  |  Ent |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* | LCTRL| LOS  | LALT |  /   |  `  |                   Spac(Lay2)                    |   =  | RALT |RCTRL | Caps |RESET |
+* '----------------------------------------------------------------------------------------------------------------------'
+*/
+[0] = LAYOUT_7u(
+  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,            KC_T, KC_NLCK,   KC_P7,    KC_P8,   KC_P9,  KC_HOME,    KC_Y,    KC_U,    KC_I,     KC_O,  KC_P,    KC_BSPC,
+  CTL_T(KC_ESC), KC_A,       KC_S,    KC_D,    KC_F,            KC_G,  KC_INS,   KC_P4,    KC_P5,   KC_P6,  KC_PGUP,    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_DEL,   KC_P1,    KC_P2,   KC_P3,  KC_PGDN,    KC_N,    KC_M, KC_COMM,   KC_DOT,  KC_SLSH,  KC_ENT,
+  KC_LCTRL,      KC_LGUI, KC_LALT, KC_BSLS,    KC_GRV, LT(2, KC_SPC),  KC_EQL, KC_RALT, KC_RCTRL, KC_CAPS, RESET
+),
+
+/* 1
+ * .----------------------------------------------------------------------------------------------------------------------.
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  ~   |   !  |  @   |   #  |  $   |  %   |      |      |      |      |      |  ^   |  &   |  *   |  (   |  )  |  Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   \  |   1  |   2  |   3  |   4  |   5  |      |      |      |      |  6   |   7  |   8  |   9  |   0  |  /   |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |   +  |   =  |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |C.A.D.|TSMGR |      |      |     |                                                 |      |      | SPC  |   |  |   `  |
+ * '----------------------------------------------------------------------------------------------------------------------'
+ */
+[1] = LAYOUT_7u(
+  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_PPLS,  KC_EQL, _______,
+  CALTDEL,  TSKMGR, _______, _______, _______, _______, _______, _______, KC_SPC, KC_NUBS,   KC_GRV
+),
+
+/* 2
+* .----------------------------------------------------------------------------------------------------------------------.
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* | RHUI | RSAI |      |      |  UP  |      |      |      |      |      |      |      |   _  |      |  (   |  )  |  RVAI |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* | RHUD | RSAD |      | LEFT | DOWN |RIGHT |      |      |      |      |      |      |   -  |      |   [  |   ]  | RVAD |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |      |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |      |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* |RESET | RTOG |      |      |     |                                                 |      |      |      | RMOD |RRMOD |
+* '----------------------------------------------------------------------------------------------------------------------'
+*/
+[2] = LAYOUT_7u(
+  RGB_HUI,  RGB_SAI, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI,
+  RGB_HUD,  RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD,
+  _______,  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, RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD
+),
+};
--- a/keyboards/checkerboards/candybar_ortho/keymaps/default/config.h
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/default/config.h
@ -0,0 +1,20 @@
+/* Copyright 2021 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
+#define TAPPING_TERM 200
--- a/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/default/keymap.c
@ -0,0 +1,83 @@
+/* Copyright 2021 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] = {
+
+/* Qwerty
+* .-----------------------------------------------------------------------------------------------------------------------.
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* | Tab  |   Q  |   W  |   E  |   R  |   T  | NLCK |  N7  |  N8  |  N9   | HOME |  Y   |   U  |   I  |   O  |  P  |  Bksp |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |C(ESC)|   A  |   S  |   D  |   F  |   G  | INS  |  N4  |  N5  |  N6   | PgUp |  H   |  J   |   K  |   L  | '"  |  ;:   |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |Shift |   Z  |   X  |   C  |   V  |   B  | DEL  |  N1  |  N2  |  N3   | PgDn |   N  |  M   |   ,  |   .  |   ?  |  Ent |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* | LCTRL| LOS  | LALT |   /  |   `  |   -  |  =   |  [   |TT(1) |LT(SPC)|   ]  | MENU | RALT | ROS  |RCTRL | CAPS |RESET |
+* '-----------------------------------------------------------------------------------------------------------------------'
+*/
+[0] = LAYOUT_grid(
+  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,   KC_T,    KC_NLCK, KC_P7,   KC_P8,   KC_P9,         KC_HOME,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_BSPC,
+  CTL_T(KC_ESC), KC_A,       KC_S,    KC_D,    KC_F,   KC_G,    KC_INS,  KC_P4,   KC_P5,   KC_P6,         KC_PGUP,    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_DEL,  KC_P1,   KC_P2,   KC_P3,         KC_PGDN,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_ENT,
+  KC_LCTRL,      KC_LGUI,    KC_LALT, KC_BSLS, KC_GRV, KC_MINS, KC_EQL,  KC_LBRC, TT(1),   LT(2, KC_SPC), KC_RBRC,    KC_MENU, KC_RALT, KC_RGUI,  KC_RCTRL, KC_CAPS, RESET
+),
+
+/* 1
+* .-----------------------------------------------------------------------------------------------------------------------.
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |  ~   |   !  |  @   |   #  |  $   |  %   |      |      |      |      |      |  ^   |  &   |  *   |  (   |   )  | Bksp  |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |   \  |   1  |   2  |   3  |   4  |   5  |      |      |      |      |  6   |   7  |   8  |   9  |   0  |  /   |       |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |      |      |      |      |      |      |      |      |      |      |      |      |     |       |   +  |   =  |       |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |C.A.D.|TSKMGR|      |      |      |      |      |      |      |      |      |      |     |       | SPC  |   |  |   `   |
+* '-----------------------------------------------------------------------------------------------------------------------'
+*/
+[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_PPLS,  KC_EQL, _______,
+  CALTDEL,  TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SPC, KC_NUBS,   KC_GRV
+),
+
+/* 2
+* .----------------------------------------------------------------------------------------------------------------------.
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* | RHUI | RSAI |      |      |  UP  |      |      |      |      |      |      |      |   _  |      |  (   |  )  |  RVAI |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* | RHUD | RSAD |      | LEFT | DOWN |RIGHT |      |      |      |      |      |      |   -  |      |   [  |   ]  | RVAD |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |      |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |      |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* |RESET | RTOG |      |      |      |      |      |      |      |      |      |      |      |      |      | RMOD |RRMOD |
+* '----------------------------------------------------------------------------------------------------------------------'
+*/
+[2] = LAYOUT_grid(
+  RGB_HUI,  RGB_SAI, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI,
+  RGB_HUD,  RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD,
+  _______,  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, RGB_TOG,  _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD
+),
+};
--- a/keyboards/checkerboards/candybar_ortho/keymaps/default/readme.md
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/default/readme.md
@ -0,0 +1,2 @@
+# The Default Candybar_Ortho Layout
+
--- a/keyboards/checkerboards/candybar_ortho/keymaps/via/config.h
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/via/config.h
@ -0,0 +1,20 @@
+/* Copyright 2021 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
+#define TAPPING_TERM 200
--- a/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/via/keymap.c
@ -0,0 +1,83 @@
+/* Copyright 2021 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] = {
+
+/* Qwerty
+* .-----------------------------------------------------------------------------------------------------------------------.
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* | Tab  |   Q  |   W  |   E  |   R  |   T  | NLCK |  N7  |  N8  |  N9   | HOME |  Y   |   U  |   I  |   O  |  P  |  Bksp |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |C(ESC)|   A  |   S  |   D  |   F  |   G  | INS  |  N4  |  N5  |  N6   | PgUp |  H   |  J   |   K  |   L  | '"  |  ;:   |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |Shift |   Z  |   X  |   C  |   V  |   B  | DEL  |  N1  |  N2  |  N3   | PgDn |   N  |  M   |   ,  |   .  |   ?  |  Ent |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* | LCTRL| LOS  | LALT |   /  |   `  |   -  |  =   |  [   |TT(1) |LT(SPC)|   ]  | MENU | RALT | ROS  |RCTRL | CAPS |RESET |
+* '-----------------------------------------------------------------------------------------------------------------------'
+*/
+[0] = LAYOUT_grid(
+  KC_TAB,        KC_Q,       KC_W,    KC_E,    KC_R,   KC_T,    KC_NLCK, KC_P7,   KC_P8,   KC_P9,         KC_HOME,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_BSPC,
+  CTL_T(KC_ESC), KC_A,       KC_S,    KC_D,    KC_F,   KC_G,    KC_INS,  KC_P4,   KC_P5,   KC_P6,         KC_PGUP,    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_DEL,  KC_P1,   KC_P2,   KC_P3,         KC_PGDN,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_ENT,
+  KC_LCTRL,      KC_LGUI,    KC_LALT, KC_BSLS, KC_GRV, KC_MINS, KC_EQL,  KC_LBRC, TT(1),   LT(2, KC_SPC), KC_RBRC,    KC_MENU, KC_RALT, KC_RGUI,  KC_RCTRL, KC_CAPS, RESET
+),
+
+/* 1
+* .-----------------------------------------------------------------------------------------------------------------------.
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |  ~   |   !  |  @   |   #  |  $   |  %   |      |      |      |      |      |  ^   |  &   |  *   |  (   |   )  | Bksp  |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |   \  |   1  |   2  |   3  |   4  |   5  |      |      |      |      |  6   |   7  |   8  |   9  |   0  |  /   |       |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |      |      |      |      |      |      |      |      |      |      |      |      |     |       |   +  |   =  |       |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+* |C.A.D.|TSKMGR|      |      |      |      |      |      |      |      |      |      |     |       | SPC  |   |  |   `   |
+* '-----------------------------------------------------------------------------------------------------------------------'
+*/
+[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_PPLS,  KC_EQL, _______,
+  CALTDEL,  TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SPC, KC_NUBS,   KC_GRV
+),
+
+/* 2
+* .----------------------------------------------------------------------------------------------------------------------.
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* | RHUI | RSAI |      |      |  UP  |      |      |      |      |      |      |      |   _  |      |  (   |  )  |  RVAI |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* | RHUD | RSAD |      | LEFT | DOWN |RIGHT |      |      |      |      |      |      |   -  |      |   [  |   ]  | RVAD |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |      |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |      |
+* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+* |RESET | RTOG |      |      |      |      |      |      |      |      |      |      |      |      |      | RMOD |RRMOD |
+* '----------------------------------------------------------------------------------------------------------------------'
+*/
+[2] = LAYOUT_grid(
+  RGB_HUI,  RGB_SAI, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI,
+  RGB_HUD,  RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD,
+  _______,  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, RGB_TOG,  _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD
+),
+};
--- a/keyboards/checkerboards/candybar_ortho/keymaps/via/readme.md
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/via/readme.md
@ -0,0 +1,2 @@
+# Keymap for VIA
+
--- a/keyboards/checkerboards/candybar_ortho/keymaps/via/rules.mk
+++ b/keyboards/checkerboards/candybar_ortho/keymaps/via/rules.mk
@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+
--- a/keyboards/checkerboards/candybar_ortho/readme.md
+++ b/keyboards/checkerboards/candybar_ortho/readme.md
@ -0,0 +1,13 @@
+# CandyBar_Ortho
+
+The CandyBar Ortho PCB is a drop-in replacement PCB with an ortho layout for the CandyBar by TheKey.Company.
+
+* Keyboard Maintainer: Nasp
+* Hardware Supported: CandyBar
+* Hardware Availability: https://www.checkerboards.xyz/candybar-ortho-prototype-pcb-and-fr4-plate.html
+
+Make example for this keyboard (after setting up your build environment):
+
+    make checkerboards/candybar_ortho: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).
--- a/keyboards/checkerboards/candybar_ortho/rules.mk
+++ b/keyboards/checkerboards/candybar_ortho/rules.mk
@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+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
--- a/keyboards/checkerboards/nop60/config.h
+++ b/keyboards/checkerboards/nop60/config.h
@ -0,0 +1,64 @@
+ /*
+Copyright 2021 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      0x1416
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Nasp
+#define PRODUCT         NOP60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F0, F1, E6, B7, C6 }
+#define MATRIX_COL_PINS { F6, F5, F4, D0, D7, D3, D4, D5, D6, F7, C7, B4, B6, B5 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Switch LED Backlighting */
+#define BACKLIGHT_PIN           D1
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_LEVELS 6
+#define BACKLIGHT_BREATHING
+#define BREATHING_PERIOD 6
+
+// ws2812 options
+#define RGB_DI_PIN D2 // 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)
+
+
+/* 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
--- a/keyboards/checkerboards/nop60/info.json
+++ b/keyboards/checkerboards/nop60/info.json
@ -0,0 +1,15 @@
+{
+    "keyboard_name": "nop60",
+    "url": "",
+    "maintainer": "nasp",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "2x3u": [{"label":"Esc", "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":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+        },
+	    "LAYOUT": {
+            "7u": [{"label":"Esc", "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":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+        }
+    }
+}
--- a/keyboards/checkerboards/nop60/keymaps/2x3u/config.h
+++ b/keyboards/checkerboards/nop60/keymaps/2x3u/config.h
@ -0,0 +1,23 @@
+ /*
+ Copyright 2020 Alec Penland
+ Copyright 2020 Garret Gartner
+
+ 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_TERM 175
+
+#define TAPPING_TOGGLE 2
--- a/keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c
@ -0,0 +1,83 @@
+ /*
+ Copyright 2021 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
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Default QWERTY layer
+    * ,-------------------------------------------------------------.
+    * |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |  \  |Del|
+    * |-------------------------------------------------------------|
+    * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp  |
+    * |-------------------------------------------------------------|
+    * | Caps  | A | S | D | F | G | H | J | K | L | ; | ' |  Enter  |
+    * |-------------------------------------------------------------|
+    * | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift | FN |
+    * |-------------------------------------------------------------|
+    * |Ctrl  |GUI  |Alt  |Space    |BLTOG  |Space   |Alt |GUI |Ctrl |
+    * `-------------------------------------------------------------'
+    */
+    [0] = LAYOUT_2x3u(
+      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                     KC_RSFT, KC_SPC,
+      KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           BL_TOGG,          KC_SPC,           KC_RALT, KC_RGUI, KC_RCTL
+    ),
+    /* Main Numbers, Symbols & Function Layer (MOMENTARY)
+    * ,------------------------------------------------------------------------------.
+    * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |Del  |    |
+    * |------------------------------------------------------------------------------|
+    * |RTOG  |RMOD| UP |    |    |    |    |    |    |    |     |     |     |    |   |
+    * |------------------------------------------------------------------------------|
+    * |BRTHE    |LFT|DWN|RGHT|    |    |    |     |    |    |     |     |     |      |
+    * |------------------------------------------------------------------------------|
+    * |BINC       |BDEC|BTOG|  |    |    |    |     |    |    |     |     |     |    |
+    * |------------------------------------------------------------------------------|
+    * |     |     |     |            |              |               |    |   |RESET  |
+    * `------------------------------------------------------------------------------'
+    */
+    [1] = LAYOUT_2x3u(
+      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
+      RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      _______,  _______, _______,                               _______, _______, _______,                            _______, _______, RESET
+    ),
+
+    /* ALTERNATE Function layer (MOMENTARY)
+    * ,------------------------------------------------------------------------------.
+    * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |Del  |    |
+    * |------------------------------------------------------------------------------|
+    * |RTOG  |RMOD| UP |    |    |    |    |    |    |    |     |     |     |    |   |
+    * |------------------------------------------------------------------------------|
+    * |BRTHE    |LFT|DWN|RGHT|    |    |    |     |    |    |     |     |     |      |
+    * |------------------------------------------------------------------------------|
+    * |BINC       |BDEC|BTOG|  |    |    |    |     |    |    |     |     |     |    |
+    * |------------------------------------------------------------------------------|
+    * |     |     |     |            |              |               |    |   |RESET  |
+    * `------------------------------------------------------------------------------'
+    */
+    [2] = LAYOUT_2x3u(
+      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
+      RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      _______,  _______, _______,                           _______, _______, _______,                            _______, _______, RESET
+    )
+};
--- a/keyboards/checkerboards/nop60/keymaps/7u/config.h
+++ b/keyboards/checkerboards/nop60/keymaps/7u/config.h
@ -0,0 +1,25 @@
+ /* 
+ Copyright 2020 Alec Penland
+ Copyright 2020 Garret Gartner
+  
+ 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_TERM 175
+
+#define PERMISSIVE_HOLD
+
+#define MOD_TAP_INTERUPT
--- a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
@ -0,0 +1,85 @@
+ /*
+ Copyright 2021 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
+
+
+#define RS_SLS RSFT_T(KC_SLSH)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Default QWERTY layer
+  * ,-------------------------------------------------------------.
+  * |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |  \  |Del|
+  * |-------------------------------------------------------------|
+  * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp  |
+  * |-------------------------------------------------------------|
+  * | Caps  | A | S | D | F | G | H | J | K | L | ; | ' |  Enter  |
+  * |-------------------------------------------------------------|
+  * | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift | FN |
+  * |-------------------------------------------------------------|
+  * |Ctrl  |GUI  |Alt  |          Space          |Alt |GUI |Ctrl  |
+  * `-------------------------------------------------------------'
+  */
+    [0] = LAYOUT_7u(
+      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                     KC_RSFT, TT(1),
+      KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                                 KC_RALT, KC_RGUI, KC_RCTL
+    ),
+    /* Main Numbers, Symbols & Function Layer
+    * ,------------------------------------------------------------------------------.
+    * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |Del  |    |
+    * |------------------------------------------------------------------------------|
+    * |RTOG  |RMOD| UP |    |    |    |    |    |    |    |     |     |     |    |   |
+    * |------------------------------------------------------------------------------|
+    * |BRTHE    |LFT|DWN|RGHT|    |    |    |     |    |    |     |     |     |      |
+    * |------------------------------------------------------------------------------|
+    * |BINC       |BDEC|BTOG|  |    |    |    |     |    |    |     |     |     |    |
+    * |------------------------------------------------------------------------------|
+    * |     |     |     |                                           |    |   |RESET  |
+    * `------------------------------------------------------------------------------'
+    */
+    [1] = LAYOUT_7u(
+      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
+      RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      _______,  _______, _______,                                  _______,                                       _______, _______, RESET
+    ),
+
+    /* Main Numbers, Symbols & Function Layer
+    * ,------------------------------------------------------------------------------.
+    * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |Del  |    |
+    * |------------------------------------------------------------------------------|
+    * |RTOG  |RMOD| UP |    |    |    |    |    |    |    |     |     |     |    |   |
+    * |------------------------------------------------------------------------------|
+    * |BRTHE    |LFT|DWN|RGHT|    |    |    |     |    |    |     |     |     |      |
+    * |------------------------------------------------------------------------------|
+    * |BINC       |BDEC|BTOG|  |    |    |    |     |    |    |     |     |     |    |
+    * |------------------------------------------------------------------------------|
+    * |     |     |     |                                           |    |   |RESET  |
+    * `------------------------------------------------------------------------------'
+    */
+    [2] = LAYOUT_7u(
+      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
+      RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      _______,  _______, _______,                           _______,                                              _______, _______, RESET
+    )
+};
--- a/keyboards/checkerboards/nop60/keymaps/via/config.h
+++ b/keyboards/checkerboards/nop60/keymaps/via/config.h
@ -0,0 +1,22 @@
+ /*
+ Copyright 2021 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_TERM 175
+
+#define TAPPING_TOGGLE 2
--- a/keyboards/checkerboards/nop60/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
@ -0,0 +1,100 @@
+ /*
+ Copyright 2021 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
+
+// Layer names
+enum nop60_layers{
+  // - Base layer:
+  _BASE,
+  // - Symbols, numbers, and functions:
+  _FN1,
+  // - Alternate Function layer:
+  _FN2,
+  // - VIA Layer:
+  _VIA
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Default QWERTY layer
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───┐
+     * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │Del│BkS│   │PgU│
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤   ├───┤
+     * │Tab │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ' │Enter │   │PgD│
+     * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┘   ├───┤
+     * │LShift│ Z │ X │ C │ V │ B │ N │ M │ , │ . │Sft/│ ┌───┐ │CAP│
+     * ├────┬─┴─┬─┴──┬┴───┴───┴─┬─┴───┴──┬┴───┼───┴┬───┘ │ ↑ │ └───┘
+     * │LCtl│OS │LAlt│    Fn    │  Space │RAlt│ Ln │ ┌───┼───┼───┐
+     * └────┴───┴────┴──────────┴────────┴────┴────┘ │ ← │ ↓ │ → │
+     *                                               └───┴───┴───┘
+     */
+    [_BASE] = LAYOUT_2x3u(
+      KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS, KC_DEL,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                     KC_RSFT, KC_SPC,
+      KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           BL_TOGG,          KC_SPC,           KC_RALT, KC_RGUI, KC_RCTL
+    ),
+    /* Main Numbers, Symbols & Function Layer (MOMENTARY)
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───┐
+     * │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ [ │ ] │ \ │   │   │Hme│
+     * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤   ├───┤
+     * │    │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │      │   │End│
+     * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┘   ├───┤
+     * │      │ ( │ ) │ ; │ . │   │ - │ + │ * │ / │ =  │ ┌───┐ │   │
+     * ├────┬─┴─┬─┴──┬┴───┴───┴─┬─┴───┴──┬┴───┼───┴┬───┘ │   │ └───┘
+     * │    │   │    │          │        │    │    │ ┌───┼───┼───┐
+     * └────┴───┴────┴──────────┴────────┴────┴────┘ │   │   │   │
+     *                                               └───┴───┴───┘
+     */
+    [_FN1] = LAYOUT_2x3u(
+      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
+      RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      _______,  _______, _______,                               _______, _______, _______,                            _______, _______, RESET
+    ),
+
+    /* ALTERNATE Function layer (MOMENTARY)
+     * ┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───┐
+     * │ PWR│F1 │F2 │F3 │F4 │F5 │F6 │   │   │   │   │PRV│NXT│   │VL+│
+     * ├────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤   ├───┤
+     * │ SLP │F7 │F8 │F9 │F10│F11│F12│   │   │   │   │ PLAY │   │VL-│
+     * ├─────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┘   ├───┤
+     * │ WAKE  │   │   │   │   │   │   │   │   │   │    │ ┌───┐ │   │
+     * ├────┬──┴─┬─┴──┬┴───┴───┴─┬─┴───┴──┬┴───┼───┴┬───┘ │   │ └───┘
+     * │RSET│    │    │          │        │    │    │ ┌───┼───┼───┐
+     * └────┴────┴────┴──────────┴────────┴────┴────┘ │   │   │   │
+     *                                                └───┴───┴───┘
+     */
+    [_FN2] = LAYOUT_2x3u(
+      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
+      RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      _______,  _______, _______,                           _______, _______, _______,                            _______, _______, RESET
+    ),
+
+    [_VIA] = LAYOUT_2x3u(
+      KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
+      RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+      _______,  _______, _______,                           _______, _______, _______,                            _______, _______, RESET
+    )
+};
--- a/keyboards/checkerboards/nop60/keymaps/via/rules.mk
+++ b/keyboards/checkerboards/nop60/keymaps/via/rules.mk
@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/checkerboards/nop60/nop60.c
+++ b/keyboards/checkerboards/nop60/nop60.c
@ -0,0 +1,18 @@
+ /*
+ Copyright 2021 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 "nop60.h"
--- a/keyboards/checkerboards/nop60/nop60.h
+++ b/keyboards/checkerboards/nop60/nop60.h
@ -0,0 +1,49 @@
+ /*
+ Copyright 2021 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_2x3u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,      \
+    k40, k41, k42,      k44,      k46,      k48,      k4A, k4B, k4C            \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, xxx }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, xxx, k3D }, \
+    { k40, k41, k42, xxx, k44, xxx, k46, xxx, k48, xxx, k4A, k4B, k4C, k4D }  \
+}
+#define LAYOUT_7u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,      \
+    k40, k41, k42,                k46,                k4A, k4B, k4C            \
+) { \
+  { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
+  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
+  { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, xxx }, \
+  { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, xxx, k3D }, \
+  { k40, k41, k42, xxx, xxx, xxx, k46, xxx, xxx, xxx, k4A, k4B, k4C, k4D }  \
+}
--- a/keyboards/checkerboards/nop60/readme.md
+++ b/keyboards/checkerboards/nop60/readme.md
@ -0,0 +1,13 @@
+# NOP60 
+
+60% Universal PCB feauturing Tsangan bottom row, 2x3u bar support, backlighting, and RGB underglow.
+
+- Keyboard Maintainer: [Nasp](https://github.com/npspears)
+- Hardware Supported: NOP60 PCB
+- Hardware Availability: www.checkerboards.xyz
+
+Make example for this keyboard (after setting up your build environment):
+
+    make checkerboards/nop60: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).
--- a/keyboards/checkerboards/nop60/rules.mk
+++ b/keyboards/checkerboards/nop60/rules.mk
@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# 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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output