diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
index 753cc3c6..284498bc 100644
--- a/keyboards/nullbitsco/tidbit/config.h
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -29,3 +29,7 @@
 #define MOUSEKEY_WHEEL_INTERVAL 50
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 20
 #define MOUSEKEY_WHEEL_MAX_SPEED 10
+
+// Encoder
+#define ENCODERS_PAD_A { D3 }
+#define ENCODERS_PAD_B { D2 }
\ No newline at end of file
diff --git a/qmk/keyboards/nullbitsco/tidbit/config.h b/qmk/keyboards/nullbitsco/tidbit/config.h
index 6f9b5ecf..8e1b5899 100644
--- a/qmk/keyboards/nullbitsco/tidbit/config.h
+++ b/qmk/keyboards/nullbitsco/tidbit/config.h
@@ -46,8 +46,8 @@
 #define RGBLIGHT_ANIMATIONS
 
 /* Optional encoder pins */
-#define ENCODERS_PAD_A { B5, B3 }
-#define ENCODERS_PAD_B { B4, B2 }
+//#define ENCODERS_PAD_A { B5, B3 }
+//#define ENCODERS_PAD_B { B4, B2 }
 
 /* Additional optional encoder pins */
 // #define ENCODERS_PAD_A { D1, D0 } //Can only be used if I2C is not used
diff --git a/qmk/keyboards/nullbitsco/tidbit/keymaps/19keypad/config.h b/qmk/keyboards/nullbitsco/tidbit/keymaps/19keypad/config.h
index 6f0ef726..881fb0ad 100644
--- a/qmk/keyboards/nullbitsco/tidbit/keymaps/19keypad/config.h
+++ b/qmk/keyboards/nullbitsco/tidbit/keymaps/19keypad/config.h
@@ -14,5 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define ENCODERS_PAD_A { B5, B3 }
-#define ENCODERS_PAD_B { B4, B2 }
\ No newline at end of file
+#define TAPPING_TERM 200
+
+#define ENCODERS_PAD_A { D3 }
+#define ENCODERS_PAD_B { D2 }
\ No newline at end of file
diff --git a/qmk/keyboards/nullbitsco/tidbit/keymaps/default/config.h b/qmk/keyboards/nullbitsco/tidbit/keymaps/default/config.h
index ad08c21b..6a8a5a5b 100644
--- a/qmk/keyboards/nullbitsco/tidbit/keymaps/default/config.h
+++ b/qmk/keyboards/nullbitsco/tidbit/keymaps/default/config.h
@@ -16,5 +16,5 @@
 
 #define TAPPING_TERM 200
 
-#define ENCODERS_PAD_A { B5, B3 }
-#define ENCODERS_PAD_B { B4, B2 }
\ No newline at end of file
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B3 }
\ No newline at end of file
diff --git a/qmk/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c b/qmk/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
index e2b8f581..f24087e3 100644
--- a/qmk/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
+++ b/qmk/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
@@ -40,10 +40,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // Base layer (numpad)
   [_BASE] = LAYOUT(
            KC_NO,    KC_KP_ASTERISK, KC_KP_MINUS, \
-  KC_KP_7, KC_KP_8,  KC_KP_9,        KC_NO, \
-  KC_KP_4, KC_KP_5,  KC_KP_6,        KC_KP_PLUS, \
-  KC_KP_1, KC_KP_2,  KC_KP_3,        KC_NO, \
-  KC_KP_0, KC_NO,    KC_KP_DOT,      TD(TD_ENTER_LAYER) \
+  KC_KP_7, KC_KP_8,  KC_KP_9,        KC_KP_PLUS, \
+  KC_KP_4, KC_KP_5,  KC_KP_6,        KC_NO, \
+  KC_KP_1, KC_KP_2,  KC_KP_3,        TD(TD_ENTER_LAYER), \
+  KC_NO,   KC_KP_0,  KC_KP_DOT,      KC_NO \
   ),
   // Function layer (numpad)
   [_FUNC] = LAYOUT(
diff --git a/qmk/keyboards/nullbitsco/tidbit/keymaps/kemonine/config.h b/qmk/keyboards/nullbitsco/tidbit/keymaps/kemonine/config.h
index dbb4948b..5145f11c 100644
--- a/qmk/keyboards/nullbitsco/tidbit/keymaps/kemonine/config.h
+++ b/qmk/keyboards/nullbitsco/tidbit/keymaps/kemonine/config.h
@@ -29,3 +29,7 @@
 #define MOUSEKEY_WHEEL_INTERVAL 50
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 20
 #define MOUSEKEY_WHEEL_MAX_SPEED 10
+
+// Encoder
+#define ENCODERS_PAD_A { D3 }
+#define ENCODERS_PAD_B { D2 }
\ No newline at end of file