diff --git a/keyboards/omnikey_blackheart/config.h b/keyboards/omnikey_blackheart/config.h
new file mode 100644
index 000000000..14b4a5f17
--- /dev/null
+++ b/keyboards/omnikey_blackheart/config.h
@@ -0,0 +1,60 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    blindassassin111
+#define PRODUCT         Omnikey Blackheart PCB
+#define DESCRIPTION     Teensy++ Board for Omnikey keyboards
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 23
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D4 }
+#define MATRIX_COL_PINS { C2, C3, C4, C7, C1, C0, E1, E0, D7, F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1, B2, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 0
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCING_DELAY 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
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+/* force n-key rollover*/
+#define FORCE_NKRO
+
+/* prevent stuck modifiers */
+#define PREVENT_STUCK_MODIFIERS
+
+
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 0
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
+
+#endif
\ No newline at end of file
diff --git a/keyboards/omnikey_blackheart/keymaps/default/keymap.c b/keyboards/omnikey_blackheart/keymaps/default/keymap.c
new file mode 100644
index 000000000..9dff862e8
--- /dev/null
+++ b/keyboards/omnikey_blackheart/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+#include "omnikey_blackheart.h"
+
+// Fillers to make layering more clear
+#define ______ KC_TRNS
+#define XXXXXX KC_NO
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = KEYMAP(\
+	KC_F11	, 	KC_F12 ,	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_PSCR	, 	KC_SLCK	, 	KC_PAUS	, 
+	KC_F1	, 	KC_F2  , 	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_NLCK	, KC_PSLS, KC_PAST, KC_PMNS, 
+	KC_F3	, 	KC_F4  , 	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_P7	, KC_P8	 , KC_P9  , KC_PPLS, 
+	KC_F5	, 	KC_F6  , 	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 	,	XXXXXX	, 	XXXXXX	, 	XXXXXX	, 	KC_P4	, KC_P5	 , KC_P6  ,	KC_EQL, 
+	KC_F7	, 	KC_F8  , 	KC_LSFT	, 	KC_Z	, 	KC_X	, 	KC_C	, 	KC_V	, 	KC_B	, 	KC_N	, 	KC_M	, 	KC_COMM	, 	KC_DOT	, 	KC_SLSH	,	KC_RSFT	, 				MO(1)	,	XXXXXX	, 	KC_UP	, 	XXXXXX	, 	KC_P1	, KC_P2	 , KC_P3  ,	KC_PENT, 
+	KC_F9 	, 	KC_F10 ,	KC_LCTL	,   KC_LGUI	, 	KC_LALT	, 	XXXXXX	,		 		KC_SPC	, 										KC_RALT	, 	KC_RGUI	, 	KC_RCTL	, 				XXXXXX 	,	KC_LEFT	, 	KC_DOWN	, 	KC_RIGHT, 		  KC_P0		 , KC_PDOT
+	),
+	
+	[1] = KEYMAP(\
+	KC_F11	, 	KC_F12 ,	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_PSCR	, 	KC_SLCK	, 	KC_PAUS	, 
+	KC_F1	, 	KC_F2  , 	RESET	, 	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_NLCK	, KC_PSLS, KC_PAST, KC_PMNS, 
+	KC_F3	, 	KC_F4  , 	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_P7	, KC_P8	 , KC_P9  , KC_PPLS, 
+	KC_F5	, 	KC_F6  , 	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 	,	XXXXXX	, 	XXXXXX	, 	XXXXXX	, 	KC_P4	, KC_P5	 , KC_P6  ,	KC_EQL, 
+	KC_F7	, 	KC_F8  , 	KC_LSFT	, 	KC_Z	, 	KC_X	, 	KC_C	, 	KC_V	, 	KC_B	, 	KC_N	, 	KC_M	, 	KC_COMM	, 	KC_DOT	, 	KC_SLSH	,	KC_RSFT	, 				______	,	XXXXXX	, 	KC_UP	, 	XXXXXX	, 	KC_P1	, KC_P2	 , KC_P3  ,	KC_PENT, 
+	KC_F9 	, 	KC_F10 ,	KC_LCTL	,   KC_LGUI	, 	KC_LALT	, 	XXXXXX	,		 		KC_SPC	, 										KC_RALT	, 	KC_RGUI	, 	KC_RCTL	, 				XXXXXX 	,	KC_LEFT	, 	KC_DOWN	, 	KC_RIGHT, 	KC_P0	, KC_PDOT
+	),
+};
+
+void led_set_kb(uint8_t usb_led) {
+	DDRB |= (1 << 4) | (1 << 5) | (1 << 6);
+
+	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+		PORTB |= (1 << 4);
+	} else {
+		PORTB &= ~(1 << 4);
+	}
+
+	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+		PORTB |= (1 << 5);
+	} else {
+		PORTB &= ~(1 << 5);
+	}
+
+	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+		PORTB |= (1 << 6);
+	} else {
+		PORTB &= ~(1 << 6);
+	}
+}
\ No newline at end of file
diff --git a/keyboards/omnikey_blackheart/omnikey_blackheart.c b/keyboards/omnikey_blackheart/omnikey_blackheart.c
new file mode 100644
index 000000000..e54047fa6
--- /dev/null
+++ b/keyboards/omnikey_blackheart/omnikey_blackheart.c
@@ -0,0 +1 @@
+#include "omnikey_blackheart.h"
diff --git a/keyboards/omnikey_blackheart/omnikey_blackheart.h b/keyboards/omnikey_blackheart/omnikey_blackheart.h
new file mode 100644
index 000000000..e0baa7f63
--- /dev/null
+++ b/keyboards/omnikey_blackheart/omnikey_blackheart.h
@@ -0,0 +1,22 @@
+#ifndef omnikey_blackheart
+#define omnikey_blackheart
+
+#include "quantum.h"
+
+#define KEYMAP( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017,                               \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, K121, K122, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, K221, K222, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, K319, K320, K321,       \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, K419, K420, K421,       \
+	K500, K501, K502, K503, K504, K505,       K507,                         K512, K513, K514, K515, K516, K517, K518, K519, K520  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,  K120,  K121,  K122 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,  K220,  K221,  K222 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318,  K319,  K320,  K321,  KC_NO }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415,  K416,  K417,  K418,  K419,  K420,  K421,  KC_NO }, \
+	{ K500,  K501,  K502,  K503,  K504,  K505,  KC_NO, K507,  KC_NO, KC_NO, KC_NO, KC_NO, K512,  K513,  K514,  K515,  K516,  K517,  K518,  K519,  K520,  KC_NO, KC_NO }  \
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/omnikey_blackheart/readme.md b/keyboards/omnikey_blackheart/readme.md
new file mode 100644
index 000000000..b318f3e37
--- /dev/null
+++ b/keyboards/omnikey_blackheart/readme.md
@@ -0,0 +1,14 @@
+Omnikey Blackheart PCB
+===
+
+A replacement PCB for Omnikey keyboards. Supports 101, 102, Plus, Ultra T, Ultra, Prime and Stellar, as well as customs.
+
+Keyboard Maintainer: QMK Community and blindassassin111
+Hardware Supported: Omnikey blackheart PCB
+Hardware Availability: https://deskthority.net/group-buys-f50/omnikey-replacement-pcb-t18276.html
+
+Make example for this keyboard (after setting up your build environment):
+
+    make omnikey_blackheart:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/omnikey_blackheart/rules.mk b/keyboards/omnikey_blackheart/rules.mk
new file mode 100644
index 000000000..3d4422e98
--- /dev/null
+++ b/keyboards/omnikey_blackheart/rules.mk
@@ -0,0 +1,56 @@
+# MCU name
+MCU = at90usb1286
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+#     This will define a symbol, F_USB, in all source code files equal to the
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in *bytes*
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE ?= yes	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE ?= yes	# Mouse keys(+4700)
+EXTRAKEY_ENABLE ?= yes	# Audio control and System control(+450)
+CONSOLE_ENABLE ?= no	# Console for debug(+400)
+COMMAND_ENABLE ?= no    # Commands for debug and configuration
+SLEEP_LED_ENABLE ?= no  # Breathing sleep LED during USB suspend
+NKRO_ENABLE ?= yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE ?= no  # Enable keyboard backlight functionality
+AUDIO_ENABLE ?= no
+RGBLIGHT_ENABLE ?= no
\ No newline at end of file