diff --git a/keyboards/ah/haven65/haven65.c b/keyboards/ah/haven65/haven65.c
new file mode 100644
index 000000000000..b4077b1a63a3
--- /dev/null
+++ b/keyboards/ah/haven65/haven65.c
@@ -0,0 +1,29 @@
+/* Copyright 2023 CMM.S Freather
+ *
+ * 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 .
+ */
+
+#include "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+ bool res = led_update_user(led_state);
+ if (res) {
+ if (led_state.caps_lock) {
+ rgblight_sethsv_at(0, 0, 255, 0);
+ } else {
+ rgblight_sethsv_at(0, 0, 0, 0);
+ }
+ }
+ return res;
+}
diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json
new file mode 100644
index 000000000000..43214e50089c
--- /dev/null
+++ b/keyboards/ah/haven65/info.json
@@ -0,0 +1,124 @@
+{
+ "keyboard_name": "HAVEN65",
+ "manufacturer": "Atelier_Haven",
+ "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven",
+ "maintainer": "Freather",
+ "usb": {
+ "vid": "0x4446",
+ "pid": "0x4665",
+ "device_version": "1.0.0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "matrix_pins": {
+ "rows": ["B5", "B6", "C6", "F1", "D6"],
+ "cols": ["F7", "F6", "F5", "F4", "F0", "B4", "D0", "D1", "D2", "D3", "D5", "B0", "B1", "B2", "B3"]
+ },
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "ws2812": {
+ "pin": "C7",
+ },
+ "rgblight": {
+ "led_count": 1,
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "sleep": true,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 },
+ { "label": "1", "matrix":[0,1],"x": 1, "y": 0 },
+ { "label": "2", "matrix":[0,2],"x": 2, "y": 0 },
+ { "label": "3", "matrix":[0,3],"x": 3, "y": 0 },
+ { "label": "4", "matrix":[0,4],"x": 4, "y": 0 },
+ { "label": "5", "matrix":[0,5],"x": 5, "y": 0 },
+ { "label": "6", "matrix":[0,6],"x": 6, "y": 0 },
+ { "label": "7", "matrix":[0,7],"x": 7, "y": 0 },
+ { "label": "8", "matrix":[0,8],"x": 8, "y": 0 },
+ { "label": "9", "matrix":[0,9],"x": 9, "y": 0 },
+ { "label": "0", "matrix":[0,10],"x": 10, "y": 0 },
+ { "label": "-", "matrix":[0,11],"x": 11, "y": 0 },
+ { "label": "=", "matrix":[0,12],"x": 12, "y": 0 },
+ { "label": "backspace", "matrix":[0,13],"x": 13, "y": 0, "w": 2 },
+ { "label": "home", "matrix":[0,14],"x": 15, "y": 0 },
+
+ { "label": "tab", "matrix":[1,0],"x": 0, "y": 1, "w": 1.5 },
+ { "label": "q", "matrix":[1,1],"x": 1.5, "y": 1 },
+ { "label": "w", "matrix":[1,2],"x": 2.5, "y": 1 },
+ { "label": "e", "matrix":[1,3],"x": 3.5, "y": 1 },
+ { "label": "r", "matrix":[1,4],"x": 4.5, "y": 1 },
+ { "label": "t", "matrix":[1,5],"x": 5.5, "y": 1 },
+ { "label": "y", "matrix":[1,6],"x": 6.5, "y": 1 },
+ { "label": "u", "matrix":[1,7],"x": 7.5, "y": 1 },
+ { "label": "i", "matrix":[1,8],"x": 8.5, "y": 1 },
+ { "label": "o", "matrix":[1,9],"x": 9.5, "y": 1 },
+ { "label": "p", "matrix":[1,10],"x": 10.5, "y": 1 },
+ { "label": "{", "matrix":[1,11],"x": 11.5, "y": 1 },
+ { "label": "}", "matrix":[1,12],"x": 12.5, "y": 1 },
+ { "label": "|", "matrix":[2,13],"x": 13.5, "y": 1, "w": 1.5 },
+ { "label": "insert", "matrix":[1,14],"x": 15, "y": 1 },
+
+ { "label": "capslock", "matrix":[2,0],"x": 0, "y": 2, "w": 1.75 },
+ { "label": "a", "matrix":[2,1],"x": 1.75, "y": 2 },
+ { "label": "s", "matrix":[2,2],"x": 2.75, "y": 2 },
+ { "label": "d", "matrix":[2,3],"x": 3.75, "y": 2 },
+ { "label": "f", "matrix":[2,4],"x": 4.75, "y": 2 },
+ { "label": "g", "matrix":[2,5],"x": 5.75, "y": 2 },
+ { "label": "h", "matrix":[2,6],"x": 6.75, "y": 2 },
+ { "label": "j", "matrix":[2,7],"x": 7.75, "y": 2 },
+ { "label": "k", "matrix":[2,8],"x": 8.75, "y": 2 },
+ { "label": "l", "matrix":[2,9],"x": 9.75, "y": 2 },
+ { "label": ";", "matrix":[2,10],"x": 10.75, "y": 2 },
+ { "label": "'", "matrix":[2,11],"x": 11.75, "y": 2 },
+ { "label": "enter", "matrix":[2,12],"x": 12.75, "y": 2, "w": 2.25 },
+ { "label": "delete", "matrix":[2,14],"x": 15, "y": 2 },
+
+ { "label": "leftshift", "matrix":[3,0],"x": 0, "y": 3, "w": 2.25 },
+ { "label": "z", "matrix":[3,2],"x": 2.25, "y": 3 },
+ { "label": "x", "matrix":[3,3],"x": 3.25, "y": 3 },
+ { "label": "c", "matrix":[3,4],"x": 4.25, "y": 3 },
+ { "label": "v", "matrix":[3,5],"x": 5.25, "y": 3 },
+ { "label": "b", "matrix":[3,6],"x": 6.25, "y": 3 },
+ { "label": "n", "matrix":[3,7],"x": 7.25, "y": 3 },
+ { "label": "m", "matrix":[3,8],"x": 8.25, "y": 3 },
+ { "label": ",", "matrix":[3,9],"x": 9.25, "y": 3 },
+ { "label": ".", "matrix":[3,10],"x": 10.25, "y": 3 },
+ { "label": "/", "matrix":[3,11],"x": 11.25, "y": 3 },
+ { "label": "rightshift", "matrix":[3,12],"x": 12.25, "y": 3, "w": 1.75 },
+ { "label": "up", "matrix":[3,13],"x": 14, "y": 3 },
+ { "label": "end", "matrix":[3,14],"x": 15, "y": 3 },
+
+ { "label": "lctrl", "matrix":[4,0],"x": 0, "y": 4, "w": 1.25 },
+ { "label": "lwin", "matrix":[4,1],"x": 1.25, "y": 4, "w": 1.25 },
+ { "label": "lalt", "matrix":[4,2],"x": 2.5, "y": 4, "w": 1.25 },
+ { "label": "space", "matrix":[4,6],"x": 3.75, "y": 4, "w": 6.25 },
+ { "label": "ralt", "matrix":[4,9],"x": 10, "y": 4, "w": 1.25 },
+ { "label": "MO(1)", "matrix":[4,10],"x": 11.25, "y": 4, "w": 1.25 },
+ { "label": "left", "matrix":[4,11],"x": 13, "y": 4 },
+ { "label": "down", "matrix":[4,12],"x": 14, "y": 4 },
+ { "label": "right", "matrix":[4,13],"x": 15, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c
new file mode 100644
index 000000000000..1d3e67b78bb3
--- /dev/null
+++ b/keyboards/ah/haven65/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Freather
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ 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_BACKSPACE, KC_HOME,
+ 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_INS,
+ 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_DEL,
+ 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, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT(
+ KC_TRNS, 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_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_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/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c
new file mode 100644
index 000000000000..c42231995fb1
--- /dev/null
+++ b/keyboards/ah/haven65/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Freather
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ 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_BACKSPACE, KC_HOME,
+ 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_INS,
+ 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_DEL,
+ 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, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT(
+ KC_TRNS, 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_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_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/ah/haven65/keymaps/via/rules.mk b/keyboards/ah/haven65/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/ah/haven65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ah/haven65/readme.md b/keyboards/ah/haven65/readme.md
new file mode 100644
index 000000000000..bf29ca0810bd
--- /dev/null
+++ b/keyboards/ah/haven65/readme.md
@@ -0,0 +1,21 @@
+#Haven65
+
+
+
+
+* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather)
+* Hardware Supported: PCB, Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ah/haven65:default
+
+Flashing example for this keyboard:
+
+ make ah/haven65:default:flash
+
+##Bootloader Atmel-DFU
+
+For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ah/haven65/rules.mk b/keyboards/ah/haven65/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/ah/haven65/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/ah/haven80/haven80.c b/keyboards/ah/haven80/haven80.c
new file mode 100644
index 000000000000..d02130cfe9ef
--- /dev/null
+++ b/keyboards/ah/haven80/haven80.c
@@ -0,0 +1,29 @@
+/* Copyright 2023 CMM.S Freather
+ *
+ * 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 .
+ */
+
+#include "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+ bool res = led_update_user(led_state);
+ if (res) {
+ if (led_state.caps_lock) {
+ rgblight_sethsv_range(0, 0, 255, 0,20);
+ } else {
+ rgblight_sethsv_range(0, 0, 0, 0, 20);
+ }
+ }
+ return res;
+}
diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json
new file mode 100644
index 000000000000..4ec292ef9655
--- /dev/null
+++ b/keyboards/ah/haven80/hotswap/info.json
@@ -0,0 +1,110 @@
+{
+ "keyboard_name": "haven80_hotswap",
+ "usb": {
+ "vid": "0x4446",
+ "pid": "0x4680",
+ "device_version": "1.0.0"
+ },
+ "matrix_pins": {
+ "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"],
+ "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 },
+ { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 },
+ { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 },
+ { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 },
+ { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 },
+ { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 },
+ { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 },
+ { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 },
+ { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 },
+ { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 },
+ { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 },
+ { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 },
+ { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 },
+ { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 },
+ { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 },
+ { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 },
+ { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 },
+
+ { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 },
+ { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 },
+ { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 },
+ { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 },
+ { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 },
+ { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 },
+ { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 },
+ { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 },
+ { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 },
+ { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 },
+ { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 },
+ { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 },
+ { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 },
+ { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 },
+ { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 },
+ { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 },
+ { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 },
+
+ { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 },
+ { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 },
+ { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 },
+ { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 },
+ { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 },
+ { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 },
+ { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 },
+ { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 },
+ { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 },
+ { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 },
+ { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 },
+ { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 },
+ { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 },
+ { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 },
+ { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 },
+ { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 },
+ { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 },
+
+ { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 },
+ { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 },
+ { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 },
+ { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 },
+ { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 },
+ { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 },
+ { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 },
+ { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 },
+ { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 },
+ { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 },
+ { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 },
+ { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 },
+ { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 },
+
+ { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 },
+ { "label": "z", "matrix":[4,1],"x": 2.25, "y": 4.5 },
+ { "label": "x", "matrix":[4,2],"x": 3.25, "y": 4.5 },
+ { "label": "c", "matrix":[4,3],"x": 4.25, "y": 4.5 },
+ { "label": "v", "matrix":[4,4],"x": 5.25, "y": 4.5 },
+ { "label": "b", "matrix":[4,5],"x": 6.25, "y": 4.5 },
+ { "label": "n", "matrix":[4,6],"x": 7.25, "y": 4.5 },
+ { "label": "m", "matrix":[4,7],"x": 8.25, "y": 4.5 },
+ { "label": ",", "matrix":[4,8],"x": 9.25, "y": 4.5 },
+ { "label": ".", "matrix":[9,8],"x": 10.25, "y": 4.5 },
+ { "label": "/", "matrix":[9,7],"x": 11.25, "y": 4.5 },
+ { "label": "rightshift", "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 },
+ { "label": "up", "matrix":[8,1],"x": 16.25, "y": 4.5 },
+
+ { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 },
+ { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 },
+ { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 },
+ { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 },
+ { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 },
+ { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 },
+ { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5},
+ { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 },
+ { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 },
+ { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 }
+ ]
+ }
+ },
+}
diff --git a/keyboards/ah/haven80/hotswap/readme.md b/keyboards/ah/haven80/hotswap/readme.md
new file mode 100644
index 000000000000..a43054863c33
--- /dev/null
+++ b/keyboards/ah/haven80/hotswap/readme.md
@@ -0,0 +1,21 @@
+#Haven80 Hotswap
+
+
+
+
+* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather)
+* Hardware Supported: PCB, Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ah/haven80/hotswap:default
+
+Flashing example for this keyboard:
+
+ make ah/haven80/hotswap:default:flash
+
+##Bootloader Atmel-DFU
+
+For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ah/haven80/hotswap/rules.mk b/keyboards/ah/haven80/hotswap/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/ah/haven80/hotswap/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/ah/haven80/info.json b/keyboards/ah/haven80/info.json
new file mode 100644
index 000000000000..bd8781515495
--- /dev/null
+++ b/keyboards/ah/haven80/info.json
@@ -0,0 +1,34 @@
+{
+ "manufacturer": "Atelier_Haven",
+ "url": "",
+ "maintainer": "Freather",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "ws2812": {
+ "pin": "E6",
+ },
+ "rgblight": {
+ "led_count": 21,
+ "sleep": true,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ }
+}
diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c
new file mode 100644
index 000000000000..cbcc6bef38e2
--- /dev/null
+++ b/keyboards/ah/haven80/keymaps/default/keymap.c
@@ -0,0 +1,15 @@
+// Copyright 2023 Freather
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, 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_F13, KC_PSCR, KC_SCRL, KC_PAUS,
+ KC_GRV, 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_HOME, KC_PGUP,
+ 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_END, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
+};
diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c
new file mode 100644
index 000000000000..03b98293fcd2
--- /dev/null
+++ b/keyboards/ah/haven80/keymaps/via/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2023 Freather
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, 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_F13, KC_PSCR, KC_SCRL, KC_PAUS,
+ KC_GRV, 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_HOME, KC_PGUP,
+ 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_END, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+};
diff --git a/keyboards/ah/haven80/keymaps/via/rules.mk b/keyboards/ah/haven80/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/ah/haven80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json
new file mode 100644
index 000000000000..db9eb015de11
--- /dev/null
+++ b/keyboards/ah/haven80/solder/info.json
@@ -0,0 +1,110 @@
+{
+ "keyboard_name": "haven80_solder",
+ "usb": {
+ "vid": "0x4446",
+ "pid": "0x4681",
+ "device_version": "1.0.0"
+ },
+ "matrix_pins": {
+ "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"],
+ "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 },
+ { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 },
+ { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 },
+ { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 },
+ { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 },
+ { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 },
+ { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 },
+ { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 },
+ { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 },
+ { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 },
+ { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 },
+ { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 },
+ { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 },
+ { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 },
+ { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 },
+ { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 },
+ { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 },
+
+ { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 },
+ { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 },
+ { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 },
+ { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 },
+ { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 },
+ { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 },
+ { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 },
+ { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 },
+ { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 },
+ { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 },
+ { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 },
+ { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 },
+ { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 },
+ { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 },
+ { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 },
+ { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 },
+ { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 },
+
+ { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 },
+ { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 },
+ { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 },
+ { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 },
+ { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 },
+ { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 },
+ { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 },
+ { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 },
+ { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 },
+ { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 },
+ { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 },
+ { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 },
+ { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 },
+ { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 },
+ { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 },
+ { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 },
+ { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 },
+
+ { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 },
+ { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 },
+ { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 },
+ { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 },
+ { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 },
+ { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 },
+ { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 },
+ { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 },
+ { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 },
+ { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 },
+ { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 },
+ { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 },
+ { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 },
+
+ { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 },
+ { "label": "z", "matrix":[4,1],"x": 2.25, "y": 4.5 },
+ { "label": "x", "matrix":[4,2],"x": 3.25, "y": 4.5 },
+ { "label": "c", "matrix":[4,3],"x": 4.25, "y": 4.5 },
+ { "label": "v", "matrix":[4,4],"x": 5.25, "y": 4.5 },
+ { "label": "b", "matrix":[4,5],"x": 6.25, "y": 4.5 },
+ { "label": "n", "matrix":[4,6],"x": 7.25, "y": 4.5 },
+ { "label": "m", "matrix":[4,7],"x": 8.25, "y": 4.5 },
+ { "label": ",", "matrix":[4,8],"x": 9.25, "y": 4.5 },
+ { "label": ".", "matrix":[9,8],"x": 10.25, "y": 4.5 },
+ { "label": "/", "matrix":[9,7],"x": 11.25, "y": 4.5 },
+ { "label": "rightshift", "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 },
+ { "label": "up", "matrix":[8,1],"x": 16.25, "y": 4.5 },
+
+ { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 },
+ { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 },
+ { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 },
+ { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 },
+ { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 },
+ { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 },
+ { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5},
+ { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 },
+ { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 },
+ { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 }
+ ]
+ }
+ },
+}
diff --git a/keyboards/ah/haven80/solder/readme.md b/keyboards/ah/haven80/solder/readme.md
new file mode 100644
index 000000000000..670e760682ce
--- /dev/null
+++ b/keyboards/ah/haven80/solder/readme.md
@@ -0,0 +1,21 @@
+# Haven80 Solder
+
+
+
+
+* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather)
+* Hardware Supported: PCB, Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ah/haven80/solder:default
+
+Flashing example for this keyboard:
+
+ make ah/haven80/solder:default:flash
+
+## Bootloader
+
+For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ah/haven80/solder/rules.mk b/keyboards/ah/haven80/solder/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/ah/haven80/solder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank