From 51d73f0c4a71e4ecdd7ef72ebab10bdcd4c8dae1 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <1koryhicks@gmail.com>
Date: Wed, 27 Dec 2023 22:09:33 -0800
Subject: [PATCH 01/13] adding my keyboard

---
 keyboards/kk/65/config.h                 |  22 +++++
 keyboards/kk/65/info.json                | 104 +++++++++++++++++++++++
 keyboards/kk/65/keymaps/default/keymap.c |  34 ++++++++
 keyboards/kk/65/keymaps/via/keymap.c     |  34 ++++++++
 keyboards/kk/65/keymaps/via/rules.mk     |   1 +
 keyboards/kk/65/readme.md                |  27 ++++++
 keyboards/kk/65/rules.mk                 |   1 +
 7 files changed, 223 insertions(+)
 create mode 100644 keyboards/kk/65/config.h
 create mode 100644 keyboards/kk/65/info.json
 create mode 100644 keyboards/kk/65/keymaps/default/keymap.c
 create mode 100644 keyboards/kk/65/keymaps/via/keymap.c
 create mode 100644 keyboards/kk/65/keymaps/via/rules.mk
 create mode 100644 keyboards/kk/65/readme.md
 create mode 100644 keyboards/kk/65/rules.mk

diff --git a/keyboards/kk/65/config.h b/keyboards/kk/65/config.h
new file mode 100644
index 000000000000..bbc48ed213cf
--- /dev/null
+++ b/keyboards/kk/65/config.h
@@ -0,0 +1,22 @@
+// Copyright 2023 Kory Hicks (@apricity-spam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define ENABLE_COMPILE_KEYCODE
+#define TAPPING_TOGGLE 2
+/*
+ * 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
diff --git a/keyboards/kk/65/info.json b/keyboards/kk/65/info.json
new file mode 100644
index 000000000000..774cfab3402f
--- /dev/null
+++ b/keyboards/kk/65/info.json
@@ -0,0 +1,104 @@
+{
+    "manufacturer": "Kory Hicks",
+    "keyboard_name": "KK65",
+    "maintainer": "apricity-spam",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0", "D3", "D6", "C6", "B0", "C7", "F7", "E6", "F0", "F1", "F4", "F5", "F6"],
+        "rows": ["D7", "B4", "B5", "B6", "B7"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x4B4B"
+    },
+    "layouts": {
+        "LAYOUT_68_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kk/65/keymaps/default/keymap.c b/keyboards/kk/65/keymaps/default/keymap.c
new file mode 100644
index 000000000000..cc16eccf14c4
--- /dev/null
+++ b/keyboards/kk/65/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │Ins│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │Hme│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │End│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│TT1│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_68_ansi(
+        KC_ESC,  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_BSPC, KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        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_HOME,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, TT(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_68_ansi(
+        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_TRNS, KC_VOLU, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MUTE, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/kk/65/keymaps/via/keymap.c b/keyboards/kk/65/keymaps/via/keymap.c
new file mode 100644
index 000000000000..cc16eccf14c4
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │Ins│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │Hme│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │End│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│TT1│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_68_ansi(
+        KC_ESC,  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_BSPC, KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        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_HOME,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, TT(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_68_ansi(
+        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_TRNS, KC_VOLU, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MUTE, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/kk/65/keymaps/via/rules.mk b/keyboards/kk/65/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kk/65/readme.md b/keyboards/kk/65/readme.md
new file mode 100644
index 000000000000..8d31f73e4dd0
--- /dev/null
+++ b/keyboards/kk/65/readme.md
@@ -0,0 +1,27 @@
+# KK65
+
+![KK65](imgur.com image replace me!)
+
+The KK65 is a hot-swappable 68-key keyboard designed and manufactured in the USA.
+
+* Keyboard Maintainer: [Kory Hicks](https://github.com/apricity-spam)
+* Hardware Supported: KK65 PCB, ATMega32u4
+* Hardware Availability: Coming soon!
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kk/65:default
+
+Flashing example for this keyboard:
+
+    make kk/65:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kk/65/rules.mk b/keyboards/kk/65/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/kk/65/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From 8dd08436c7d7e5f806db7ca687e102eb439e36a0 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Thu, 28 Dec 2023 07:09:04 -0800
Subject: [PATCH 02/13] Update keyboards/kk/65/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/kk/65/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/kk/65/info.json b/keyboards/kk/65/info.json
index 774cfab3402f..a21050fb5846 100644
--- a/keyboards/kk/65/info.json
+++ b/keyboards/kk/65/info.json
@@ -101,4 +101,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

From 2834baebcd6db0ef66e1af1589f6b64635de7693 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Thu, 28 Dec 2023 07:11:02 -0800
Subject: [PATCH 03/13] Update keyboards/kk/65/keymaps/via/rules.mk

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/kk/65/keymaps/via/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/kk/65/keymaps/via/rules.mk b/keyboards/kk/65/keymaps/via/rules.mk
index 036bd6d1c3ec..1e5b99807cb7 100644
--- a/keyboards/kk/65/keymaps/via/rules.mk
+++ b/keyboards/kk/65/keymaps/via/rules.mk
@@ -1 +1 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes

From ee986271261951d43f1c2d2b75596e69ad0a0d39 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Mon, 1 Jan 2024 12:27:03 -0800
Subject: [PATCH 04/13] Update keyboards/kk/65/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/kk/65/info.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboards/kk/65/info.json b/keyboards/kk/65/info.json
index a21050fb5846..50759a95e362 100644
--- a/keyboards/kk/65/info.json
+++ b/keyboards/kk/65/info.json
@@ -23,8 +23,9 @@
         "pid": "0x0001",
         "vid": "0x4B4B"
     },
+    "community_layouts": ["65_ansi"],
     "layouts": {
-        "LAYOUT_68_ansi": {
+        "LAYOUT_65_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},

From b23f3851b3e0f683ab1da4b2ecc3b0303b7f65c7 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Mon, 1 Jan 2024 12:27:11 -0800
Subject: [PATCH 05/13] Update keyboards/kk/65/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/kk/65/keymaps/default/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/kk/65/keymaps/default/keymap.c b/keyboards/kk/65/keymaps/default/keymap.c
index cc16eccf14c4..968244f2f2d5 100644
--- a/keyboards/kk/65/keymaps/default/keymap.c
+++ b/keyboards/kk/65/keymaps/default/keymap.c
@@ -17,14 +17,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│GUI │Alt │                        │Alt│GUI│TT1│ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
      */
-    [0] = LAYOUT_68_ansi(
+    [0] = LAYOUT_65_ansi(
         KC_ESC,  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_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         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_HOME,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, TT(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_68_ansi(
+    [1] = LAYOUT_65_ansi(
         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_TRNS, KC_VOLU, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MUTE, 

From 08acdb48637ca489a4f80118429db4ae5ae8059f Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Mon, 1 Jan 2024 12:27:20 -0800
Subject: [PATCH 06/13] Update keyboards/kk/65/rules.mk

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/kk/65/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/kk/65/rules.mk b/keyboards/kk/65/rules.mk
index 7ff128fa692e..6e7633bfe015 100644
--- a/keyboards/kk/65/rules.mk
+++ b/keyboards/kk/65/rules.mk
@@ -1 +1 @@
-# This file intentionally left blank
\ No newline at end of file
+# This file intentionally left blank

From 5d5266e0daa614382afd09e8e3d1f25636d1ed41 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Mon, 1 Jan 2024 12:27:31 -0800
Subject: [PATCH 07/13] Update keyboards/kk/65/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/kk/65/keymaps/via/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/kk/65/keymaps/via/keymap.c b/keyboards/kk/65/keymaps/via/keymap.c
index cc16eccf14c4..968244f2f2d5 100644
--- a/keyboards/kk/65/keymaps/via/keymap.c
+++ b/keyboards/kk/65/keymaps/via/keymap.c
@@ -17,14 +17,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│GUI │Alt │                        │Alt│GUI│TT1│ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
      */
-    [0] = LAYOUT_68_ansi(
+    [0] = LAYOUT_65_ansi(
         KC_ESC,  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_BSPC, KC_INS,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
         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_HOME,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, TT(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_68_ansi(
+    [1] = LAYOUT_65_ansi(
         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_TRNS, KC_VOLU, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MUTE, 

From c2b2674f4bea58ecb01a033b59971b58a5b7955b Mon Sep 17 00:00:00 2001
From: Apricity-Projects <1koryhicks@gmail.com>
Date: Mon, 1 Jan 2024 20:12:31 -0800
Subject: [PATCH 08/13] Added photo imgur photo link to readme.md

---
 keyboards/kk/65/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/kk/65/readme.md b/keyboards/kk/65/readme.md
index 8d31f73e4dd0..3b2593bb4ac8 100644
--- a/keyboards/kk/65/readme.md
+++ b/keyboards/kk/65/readme.md
@@ -1,6 +1,6 @@
 # KK65
 
-![KK65](imgur.com image replace me!)
+![KK65](https://i.imgur.com/vGBCw5Q.jpg)
 
 The KK65 is a hot-swappable 68-key keyboard designed and manufactured in the USA.
 

From e2bb68faeee1fce9cf650a34f2129bf7f9b17bda Mon Sep 17 00:00:00 2001
From: Apricity-Projects <1koryhicks@gmail.com>
Date: Mon, 1 Jan 2024 20:49:02 -0800
Subject: [PATCH 09/13] Adjusted keyboard level config and added config files
 with tapping_toggle to keymaps.

---
 keyboards/kk/65/config.h                 | 7 +++++--
 keyboards/kk/65/keymaps/default/config.h | 7 +++++++
 keyboards/kk/65/keymaps/via/config.h     | 7 +++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/kk/65/keymaps/default/config.h
 create mode 100644 keyboards/kk/65/keymaps/via/config.h

diff --git a/keyboards/kk/65/config.h b/keyboards/kk/65/config.h
index bbc48ed213cf..efff3fd5e1e6 100644
--- a/keyboards/kk/65/config.h
+++ b/keyboards/kk/65/config.h
@@ -3,8 +3,11 @@
 
 #pragma once
 
-#define ENABLE_COMPILE_KEYCODE
-#define TAPPING_TOGGLE 2
+/* 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.
diff --git a/keyboards/kk/65/keymaps/default/config.h b/keyboards/kk/65/keymaps/default/config.h
new file mode 100644
index 000000000000..97fad80ee0da
--- /dev/null
+++ b/keyboards/kk/65/keymaps/default/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Kory Hicks (@apricity-spam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Adjust value for number of taps required to toggle layer change */
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/kk/65/keymaps/via/config.h b/keyboards/kk/65/keymaps/via/config.h
new file mode 100644
index 000000000000..97fad80ee0da
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Kory Hicks (@apricity-spam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Adjust value for number of taps required to toggle layer change */
+#define TAPPING_TOGGLE 2

From 4d2a98f5713b67a36389f4cab2eed40f1e2e9492 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Sun, 7 Jan 2024 19:41:19 -0800
Subject: [PATCH 10/13] Update keyboards/kk/65/readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/kk/65/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/kk/65/readme.md b/keyboards/kk/65/readme.md
index 3b2593bb4ac8..6c8f1ee396f2 100644
--- a/keyboards/kk/65/readme.md
+++ b/keyboards/kk/65/readme.md
@@ -1,6 +1,6 @@
 # KK65
 
-![KK65](https://i.imgur.com/vGBCw5Q.jpg)
+![KK65](https://i.imgur.com/vGBCw5Qh.jpg)
 
 The KK65 is a hot-swappable 68-key keyboard designed and manufactured in the USA.
 

From c913d8b701ce8532f7b5c6771e64e7adafef6a05 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <1koryhicks@gmail.com>
Date: Tue, 9 Jan 2024 17:28:08 -0800
Subject: [PATCH 11/13] Migrated qmk.locking settings to info.json and removed
 config.h

---
 keyboards/kk/65/config.h  | 25 -------------------------
 keyboards/kk/65/info.json |  6 ++++++
 2 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 keyboards/kk/65/config.h

diff --git a/keyboards/kk/65/config.h b/keyboards/kk/65/config.h
deleted file mode 100644
index efff3fd5e1e6..000000000000
--- a/keyboards/kk/65/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2023 Kory Hicks (@apricity-spam)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* 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
diff --git a/keyboards/kk/65/info.json b/keyboards/kk/65/info.json
index 50759a95e362..9101e1d3d9ea 100644
--- a/keyboards/kk/65/info.json
+++ b/keyboards/kk/65/info.json
@@ -12,6 +12,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D2", "D1", "D0", "D3", "D6", "C6", "B0", "C7", "F7", "E6", "F0", "F1", "F4", "F5", "F6"],
         "rows": ["D7", "B4", "B5", "B6", "B7"]

From 80d61f6a24ebcd625a5ba6f364174a7f8e739c49 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Sat, 13 Jan 2024 23:34:16 -0800
Subject: [PATCH 12/13] Update keyboards/kk/65/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/kk/65/keymaps/default/keymap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/kk/65/keymaps/default/keymap.c b/keyboards/kk/65/keymaps/default/keymap.c
index 968244f2f2d5..19f0e5d914d7 100644
--- a/keyboards/kk/65/keymaps/default/keymap.c
+++ b/keyboards/kk/65/keymaps/default/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         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_TRNS, KC_VOLU, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MUTE, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MUTE, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };

From 4a38ae023dbb85b279547b74bae3e7fdc7c24130 Mon Sep 17 00:00:00 2001
From: Apricity-Projects <34521406+apricity-spam@users.noreply.github.com>
Date: Sat, 13 Jan 2024 23:34:25 -0800
Subject: [PATCH 13/13] Update keyboards/kk/65/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/kk/65/keymaps/via/keymap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/kk/65/keymaps/via/keymap.c b/keyboards/kk/65/keymaps/via/keymap.c
index 968244f2f2d5..19f0e5d914d7 100644
--- a/keyboards/kk/65/keymaps/via/keymap.c
+++ b/keyboards/kk/65/keymaps/via/keymap.c
@@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_65_ansi(
         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_TRNS, KC_VOLU, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MUTE, 
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_MUTE, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };