diff --git a/qmk/README.md b/qmk/README.md
index 6f3a22ac..8bd43b24 100644
--- a/qmk/README.md
+++ b/qmk/README.md
@@ -7,7 +7,8 @@
 ## Compiling
 
 ``` sh
-qmk compile -kb tidbit -km kemonine
+cd /qmk_firmware/users/kemonine
+qmk compile keymaps/tidbit.json
 ```
 
 ## Docker Critical
diff --git a/qmk/users/kemonine/boards/tidbit.c b/qmk/users/kemonine/boards/tidbit.c
index 83085489..c409d4a4 100644
--- a/qmk/users/kemonine/boards/tidbit.c
+++ b/qmk/users/kemonine/boards/tidbit.c
@@ -12,33 +12,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return true;
 }
 
-#define _BASE 0
-#define _FUNC 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-           TO(_FUNC), KC_NO,     KC_KP_SLASH, 
-  KC_KP_7, KC_KP_8,   KC_KP_9,   KC_KP_ASTERISK, 
-  KC_KP_4, KC_KP_5,   KC_KP_6,   KC_KP_MINUS, 
-  KC_KP_1, KC_KP_2,   KC_KP_3,   KC_KP_PLUS, 
-  KC_NO,   KC_KP_0,   KC_KP_DOT, KC_KP_ENTER  
-  ),
-
-  [_FUNC] = LAYOUT(
-             TO(_BASE), PROG,    KC_NO,
-    KC_NO,   KC_NO,     RGB_MOD, KC_NO,
-    KC_NO,   KC_NO,     RGB_HUI, KC_NO,
-    KC_NO,   KC_NO,     RGB_SAI, KC_NO,
-    KC_NO,   KC_NO,     RGB_VAI, KC_NO
-  ),
-};
-
 /***** Nuke unneeded functionality *****/
 
 void matrix_init_user(void) {
 }
 
-void matrix_scan_user(void) { 
+void matrix_scan_user(void) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/qmk/users/kemonine/config.h b/qmk/users/kemonine/config.h
index 907c8334..cd1bd5d4 100644
--- a/qmk/users/kemonine/config.h
+++ b/qmk/users/kemonine/config.h
@@ -1,16 +1,22 @@
 #pragma once
 
-/**** TAP HOLD ****
+/**** TAP HOLD *****/
 #define TAPPING_TOGGLE 2
 #define PERMISSIVE_HOLD
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 /****  END TAP HOLD *****/
 
-/******** MOUSE KEYS **********
+/******** MOUSE KEYS **********/
 #define MK_KINETIC_SPEED
 #define MOUSEKEY_DELAY         16
 #define MOUSEKEY_MOVE_DELTA    10
 #define MOUSEKEY_INITIAL_SPEED 10
 #define MOUSEKEY_BASE_SPEED    300
 /******** END MOUSE KEYS ***********/
+
+/***** Keyboard Definitions *****/
+#ifdef KEYBOARD_nullbitsco_tidbit
+#define ENCODERS_PAD_A { D3 }
+#define ENCODERS_PAD_B { D2 }
+#endif
diff --git a/qmk/users/kemonine/kemonine.c b/qmk/users/kemonine/kemonine.c
index c092993f..b815f7e9 100644
--- a/qmk/users/kemonine/kemonine.c
+++ b/qmk/users/kemonine/kemonine.c
@@ -1 +1 @@
-#include QMK_KEYBOARD_H
\ No newline at end of file
+#include "kemonine.h"
diff --git a/qmk/users/kemonine/kemonine.h b/qmk/users/kemonine/kemonine.h
new file mode 100644
index 00000000..6f70f09b
--- /dev/null
+++ b/qmk/users/kemonine/kemonine.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/qmk/users/kemonine/keymaps/tidbit.json b/qmk/users/kemonine/keymaps/tidbit.json
new file mode 100644
index 00000000..f49aaf7e
--- /dev/null
+++ b/qmk/users/kemonine/keymaps/tidbit.json
@@ -0,0 +1,49 @@
+{
+    "keyboard":"nullbitsco/tidbit",
+    "keymap":"kemonine",
+    "layout":"LAYOUT",
+    "layers":[
+        [
+            "TO(1)",
+            "KC_NLCK",
+            "KC_KP_SLASH",
+            "KC_KP_7",
+            "KC_KP_8",
+            "KC_KP_9",
+            "KC_KP_ASTERISK",
+            "KC_KP_4",
+            "KC_KP_5",
+            "KC_KP_6",
+            "KC_KP_MINUS",
+            "KC_KP_1",
+            "KC_KP_2",
+            "KC_KP_3",
+            "KC_KP_PLUS",
+            "KC_NO",
+            "KC_KP_0",
+            "KC_KP_DOT",
+            "KC_KP_ENTER"
+        ],
+        [
+            "TO(0)",
+            "KC_NO",
+            "KC_NO",
+            "KC_NO",
+            "KC_NO",
+            "RGB_MOD",
+            "KC_NO",
+            "KC_NO",
+            "KC_NO",
+            "RGB_HUI",
+            "KC_NO",
+            "KC_NO",
+            "KC_NO",
+            "RGB_SAI",
+            "KC_NO",
+            "KC_NO",
+            "KC_NO",
+            "RGB_VAI",
+            "KC_NO"
+        ]
+    ]
+}