diff --git a/keyboards/hexatana/config.h b/keyboards/hexatana/config.h
new file mode 100644
index 0000000000..72d9db9a67
--- /dev/null
+++ b/keyboards/hexatana/config.h
@@ -0,0 +1,25 @@
+// Copyright 2024 Nico Stuhlmüller (@ThePurox)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
+#define WS2812_DI_PIN GP16
+#define HOLD_ON_OTHER_KEY_PRESS
+#define RGBLIGHT_LAYERS
+#define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/hexatana/hexatana.h b/keyboards/hexatana/hexatana.h
new file mode 100644
index 0000000000..d1e7b6dcf3
--- /dev/null
+++ b/keyboards/hexatana/hexatana.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT(k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,\
+               k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\
+               k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\
+               k30, k31, k32, k33, k34, k35)                    \
+    { \
+        {k09, k07, k05, KC_NO, k03, k01, k35},  \
+        {k08, k06, KC_NO, k04, k02, k00, k34},  \
+        {k19, k17, k15, KC_NO, k13, k11, k33},  \
+        {k18, k16, KC_NO, k14, k12, k10, k32},  \
+        {k29, k27, k25, KC_NO, k23, k21, k31},  \
+        {k28, k26, KC_NO, k24, k22, k20, k30}  \
+    }
diff --git a/keyboards/hexatana/keyboard.json b/keyboards/hexatana/keyboard.json
new file mode 100644
index 0000000000..2b0c04b5e5
--- /dev/null
+++ b/keyboards/hexatana/keyboard.json
@@ -0,0 +1,78 @@
+{
+    "manufacturer": "Nico Stuhlm\u00fcller",
+    "keyboard_name": "hexatana",
+    "maintainer": "ThePurox",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "rgblight": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP1", "GP2", "GP3", "GP29", "GP27", "GP28", "GP26"],
+        "rows": ["GP4", "GP8", "GP9", "GP15", "GP10", "GP12"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "rgblight" : {
+        "pin": "G16",
+        "led_count" : 37,
+        "sleep" : false,
+        "animations": {
+            "rainbow_mood" : true,
+            "rainbow_swirl" : true,
+        },
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 9, "y": 0 },
+                { "matrix": [0, 1], "x": 7, "y": 0 },
+                { "matrix": [0, 2], "x": 5, "y": 0 },
+                { "matrix": [0, 4], "x": 3, "y": 0 },
+                { "matrix": [0, 5], "x": 1, "y": 0 },
+                { "matrix": [0, 6], "x": 5, "y": 3 },
+                { "matrix": [1, 0], "x": 8, "y": 0 },
+                { "matrix": [1, 1], "x": 6, "y": 0 },
+                { "matrix": [1, 3], "x": 4, "y": 0 },
+                { "matrix": [1, 4], "x": 2, "y": 0 },
+                { "matrix": [1, 5], "x": 0, "y": 0 },
+                { "matrix": [1, 6], "x": 4, "y": 3 },
+                { "matrix": [2, 0], "x": 9, "y": 1 },
+                { "matrix": [2, 1], "x": 7, "y": 1 },
+                { "matrix": [2, 2], "x": 5, "y": 1 },
+                { "matrix": [2, 4], "x": 3, "y": 1 },
+                { "matrix": [2, 5], "x": 1, "y": 1 },
+                { "matrix": [2, 6], "x": 3, "y": 3 },
+                { "matrix": [3, 0], "x": 8, "y": 1 },
+                { "matrix": [3, 1], "x": 6, "y": 1 },
+                { "matrix": [3, 3], "x": 4, "y": 1 },
+                { "matrix": [3, 4], "x": 2, "y": 1 },
+                { "matrix": [3, 5], "x": 0, "y": 1 },
+                { "matrix": [3, 6], "x": 2, "y": 3 },
+                { "matrix": [4, 0], "x": 9, "y": 2 },
+                { "matrix": [4, 1], "x": 7, "y": 2 },
+                { "matrix": [4, 2], "x": 5, "y": 2 },
+                { "matrix": [4, 4], "x": 3, "y": 2 },
+                { "matrix": [4, 5], "x": 1, "y": 2 },
+                { "matrix": [4, 6], "x": 1, "y": 3 },
+                { "matrix": [5, 0], "x": 8, "y": 2 },
+                { "matrix": [5, 1], "x": 6, "y": 2 },
+                { "matrix": [5, 3], "x": 4, "y": 2 },
+                { "matrix": [5, 4], "x": 2, "y": 2 },
+                { "matrix": [5, 5], "x": 0, "y": 2 },
+                { "matrix": [5, 6], "x": 0, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/hexatana/keymaps/ceres/keymap.c b/keyboards/hexatana/keymaps/ceres/keymap.c
new file mode 100644
index 0000000000..ea76c23b01
--- /dev/null
+++ b/keyboards/hexatana/keymaps/ceres/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define SFT_ENT LSFT_T(KC_ENT)
+#define SFT_TAB LSFT(KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT(
+     KC_W,    KC_L,    KC_Y,    KC_P,    KC_K,                         KC_Z,    KC_X,    KC_O,    KC_U,    KC_QUOT,
+     KC_C,    KC_R,    KC_S,    KC_T,    KC_B,                         KC_F,    KC_N,    KC_E,    KC_I,    KC_A,
+     KC_Q,    KC_J,    KC_V,    KC_D,    KC_G,                         KC_M,    KC_H,    KC_SLSH, KC_COMM, KC_DOT,
+                                KC_LGUI, KC_SPC, OSL(1),      KC_BSPC, SFT_ENT, KC_LCTL
+
+  ),
+
+  [1] = LAYOUT(
+     QK_GESC,  KC_1,    KC_2,    KC_3,     KC_MINS,                    KC_LBRC, KC_RBRC, KC_UP,    KC_PGUP,  KC_INS,
+     KC_TAB,  KC_4,    KC_5,    KC_6,     KC_EQL,                     KC_SCLN, KC_LEFT, KC_RGHT,  KC_HOME,  KC_END,
+     SFT_TAB, KC_7,    KC_8,    KC_9,     KC_0,                       KC_BSLS, KC_DOWN, KC_NUHS,  KC_PGDN,  KC_DEL,
+                                KC_TRNS,  KC_TRNS, MO(2),    KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT(
+     KC_TRNS, KC_F1,   KC_F2,    KC_F3,    KC_F4,                      KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+     KC_TRNS, KC_F5,   KC_F6,    KC_F7,    KC_F8,                      KC_TRNS, KC_PSCR, KC_MENU,  KC_TRNS,  KC_TRNS,
+     KC_TRNS, 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
+  ),
+};
diff --git a/keyboards/hexatana/keymaps/default/keymap.c b/keyboards/hexatana/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4a70881aa4
--- /dev/null
+++ b/keyboards/hexatana/keymaps/default/keymap.c
@@ -0,0 +1,19 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define SFT_ENT LSFT_T(KC_ENT)
+#define LAYERS LT(1, MO(2))
+#define GUI_LAY LGUI_T(MO(3))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT(
+     KC_W,    KC_L,    KC_Y,    KC_P,    KC_B,                         KC_Z,    KC_F,    KC_O,    KC_U,    KC_QUOT,
+     KC_C,    KC_R,    KC_S,    KC_T,    KC_G,                         KC_M,    KC_N,    KC_E,    KC_I,    KC_A,
+     KC_Q,    KC_J,    KC_V,    KC_D,    KC_K,                         KC_X,    KC_H,    KC_SLSH, KC_COMM, KC_DOT,
+                                GUI_LAY, KC_SPC, LAYERS,      KC_BSPC, SFT_ENT, KC_LCTL
+
+  ),
+};
diff --git a/keyboards/hexatana/rules.mk b/keyboards/hexatana/rules.mk
new file mode 100644
index 0000000000..dbd44b2620
--- /dev/null
+++ b/keyboards/hexatana/rules.mk
@@ -0,0 +1,2 @@
+WS2812_DRIVER = vendor
+ONESHOT_ENABLE = yes