diff --git a/keyboards/xelus/snap96/config.h b/keyboards/xelus/snap96/config.h
new file mode 100644
index 0000000000..0ebc75e391
--- /dev/null
+++ b/keyboards/xelus/snap96/config.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "config_common.h"
+
+// USB Device descriptor parameter
+#define VENDOR_ID       0x5845 // XE
+#define PRODUCT_ID      0x5396 // Snap96
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Xelus
+#define PRODUCT         Snap96
+#define DESCRIPTION     Snap96
+
+// key matrix size
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 10
+
+// key matrix pins
+#define MATRIX_ROW_PINS { B2, B1, B0, C7, F6, F7, B3, D1, D2, D7, B6, C6 }
+#define MATRIX_COL_PINS { E6, D5, B7, D0, F5, D3, B4, B5, D4, D6 }
+#define UNUSED_PINS
+
+// COL2ROW or ROW2COL
+#define DIODE_DIRECTION COL2ROW
+
+// Set 0 if debouncing isn't needed
+#define DEBOUNCE 5
+
+// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+#define LOCKING_SUPPORT_ENABLE
+// Locking resynchronize hack
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/snap96/keymaps/default/keymap.c b/keyboards/xelus/snap96/keymaps/default/keymap.c
new file mode 100644
index 0000000000..31c7a2ff28
--- /dev/null
+++ b/keyboards/xelus/snap96/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Default layout for Snap96
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        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_INS,  KC_DEL,  KC_PSCR, KC_SLCK, KC_HOME, KC_END,
+		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_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+		KC_LSFT, KC_NUBS, 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_P1,   KC_P2,   KC_P3,   KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_LCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/xelus/snap96/keymaps/via/config.h b/keyboards/xelus/snap96/keymaps/via/config.h
new file mode 100644
index 0000000000..96c85573df
--- /dev/null
+++ b/keyboards/xelus/snap96/keymaps/via/config.h
@@ -0,0 +1,2 @@
+// 3 layers or else it will not fit in EEPROM
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/xelus/snap96/keymaps/via/keymap.c b/keyboards/xelus/snap96/keymaps/via/keymap.c
new file mode 100644
index 0000000000..03547d5fd1
--- /dev/null
+++ b/keyboards/xelus/snap96/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+// VIA layout for Snap96
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        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_INS,  KC_DEL,  KC_PSCR, KC_SLCK, KC_HOME, KC_END,
+		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_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+		KC_LSFT, KC_NUBS, 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_P1,   KC_P2,   KC_P3,   KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/xelus/snap96/keymaps/via/rules.mk b/keyboards/xelus/snap96/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/xelus/snap96/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/xelus/snap96/readme.md b/keyboards/xelus/snap96/readme.md
new file mode 100644
index 0000000000..55751c1c5f
--- /dev/null
+++ b/keyboards/xelus/snap96/readme.md
@@ -0,0 +1,13 @@
+# Snap96
+
+A 96 Keyboard which supports various layouts and is able to be "snapped" to smaller layouts.
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: Snap96
+* Hardware Availability: Custom Project
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xelus/snap96:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/xelus/snap96/rules.mk b/keyboards/xelus/snap96/rules.mk
new file mode 100644
index 0000000000..a52c97b2d5
--- /dev/null
+++ b/keyboards/xelus/snap96/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+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 = no         # 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 on B7 by default
+MIDI_ENABLE = no            # MIDI support
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. - We have custom RGB underglow
+
diff --git a/keyboards/xelus/snap96/snap96.c b/keyboards/xelus/snap96/snap96.c
new file mode 100644
index 0000000000..e7c728bb05
--- /dev/null
+++ b/keyboards/xelus/snap96/snap96.c
@@ -0,0 +1 @@
+#include "snap96.h"
diff --git a/keyboards/xelus/snap96/snap96.h b/keyboards/xelus/snap96/snap96.h
new file mode 100644
index 0000000000..cbdbc97cb3
--- /dev/null
+++ b/keyboards/xelus/snap96/snap96.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+	K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009, K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608, \
+	K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109, K0700, K0701, K0702, K0703, K0704, K0705, K0706, K0707, K0708, \
+	K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209, K0800, K0801, K0802,        K0804, K0805, K0806, K0807, K0808, \
+	K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309, K0900, K0901,        K0903,        K0905, K0906, K0907, K0908, \
+	K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409, K1000, K1001,        K1003, K1004, K1005, K1006, K1007, K1008, \
+	K0500, K0501, K0502,               K0505, K0506, K0509,               K1100, K1101, K1102, K1103, K1104, K1105, K1106, K1107, K1108  \
+) { \
+	{ K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009 }, \
+	{ K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109 }, \
+	{ K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209 }, \
+	{ K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309 }, \
+	{ K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409 }, \
+	{ K0500, K0501, K0502, KC_NO, KC_NO, K0505, K0506, KC_NO, KC_NO, K0509 }, \
+	{ K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608, KC_NO }, \
+	{ K0700, K0701, K0702, K0703, K0704, K0705, K0706, K0707, K0708, KC_NO }, \
+	{ K0800, K0801, K0802, KC_NO, K0804, K0805, K0806, K0807, K0808, KC_NO }, \
+	{ K0900, K0901, KC_NO, K0903, KC_NO, K0905, K0906, K0907, K0908, KC_NO }, \
+	{ K1000, K1001, KC_NO, K1003, K1004, K1005, K1006, K1007, K1008, KC_NO }, \
+	{ K1100, K1101, K1102, K1103, K1104, K1105, K1106, K1107, K1108, KC_NO }  \
+}