diff --git a/zmk/app/boards/shields/tidbit/Kconfig.defconfig b/zmk/app/boards/shields/tidbit/Kconfig.defconfig
index 1d177b1a..82f2a4e6 100644
--- a/zmk/app/boards/shields/tidbit/Kconfig.defconfig
+++ b/zmk/app/boards/shields/tidbit/Kconfig.defconfig
@@ -4,13 +4,6 @@
 if SHIELD_TIDBIT
 
 config ZMK_KEYBOARD_NAME
-	default "TIDBIT_DEFAULT"
-
-endif
-
-if SHIELD_TIDBIT_19
-
-config ZMK_KEYBOARD_NAME
-	default "TIDBIT_19"
+	default "tidbit"
 
 endif
diff --git a/zmk/app/boards/shields/tidbit/Kconfig.shield b/zmk/app/boards/shields/tidbit/Kconfig.shield
index 506756de..c1e8ecca 100644
--- a/zmk/app/boards/shields/tidbit/Kconfig.shield
+++ b/zmk/app/boards/shields/tidbit/Kconfig.shield
@@ -2,7 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_TIDBIT
-	def_bool $(shields_list_contains,tidbit_default)
-
-config SHIELD_TIDBIT_19
-	def_bool $(shields_list_contains,tidbit_19keys)
+	def_bool $(shields_list_contains,tidbit)
diff --git a/zmk/app/boards/shields/tidbit/README.md b/zmk/app/boards/shields/tidbit/README.md
new file mode 100644
index 00000000..98030c07
--- /dev/null
+++ b/zmk/app/boards/shields/tidbit/README.md
@@ -0,0 +1,3 @@
+west build -p --board nice_nano -d build/tidbit/default -- -DSHIELD=tidbit
+
+west build -p --board nice_nano -d build/tidbit/19_keys -- -DSHIELD=tidbit -DKEYMAP_FILE=${PWD}/boards/shields/tidbit/tidbit_19key.keymap
diff --git a/zmk/app/boards/shields/tidbit/tidbit.keymap b/zmk/app/boards/shields/tidbit/tidbit.keymap
index 9826fe3d..b2144dc0 100644
--- a/zmk/app/boards/shields/tidbit/tidbit.keymap
+++ b/zmk/app/boards/shields/tidbit/tidbit.keymap
@@ -9,6 +9,10 @@
 #include <dt-bindings/zmk/outputs.h>
 #include <dt-bindings/zmk/keys.h>
 
+&encoder_1_top_row {
+    status = "okay";
+};
+
 / {
     keymap {
         compatible = "zmk,keymap";
diff --git a/zmk/app/boards/shields/tidbit/tidbit.overlay b/zmk/app/boards/shields/tidbit/tidbit.overlay
index 672f0df6..dc425618 100644
--- a/zmk/app/boards/shields/tidbit/tidbit.overlay
+++ b/zmk/app/boards/shields/tidbit/tidbit.overlay
@@ -5,7 +5,3 @@
  */
 
 #include "tidbit.dtsi"
-
-&encoder_1_top_row {
-    status = "okay";
-};
diff --git a/zmk/app/boards/shields/tidbit/tidbit_19key.keymap b/zmk/app/boards/shields/tidbit/tidbit_19key.keymap
index 75c6ccf9..e322c3b8 100644
--- a/zmk/app/boards/shields/tidbit/tidbit_19key.keymap
+++ b/zmk/app/boards/shields/tidbit/tidbit_19key.keymap
@@ -10,6 +10,10 @@
 #include <dt-bindings/zmk/rgb.h>
 #include <dt-bindings/zmk/keys.h>
 
+&encoder_4 {
+    status = "okay";
+};
+
 / {
     keymap {
         compatible = "zmk,keymap";
@@ -17,7 +21,7 @@
         default_layer {
             bindings = <
                                 &tog 1          &kp KP_NUMLOCK  &kp KP_SLASH
-                &kp KP_NUBMER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_ASTERISK
+                &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_ASTERISK
                 &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp KP_MINUS
                 &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &kp KP_PLUS
                 &none           &kp KP_NUMBER_0 &kp KP_DOT      &kp KP_ENTER
@@ -30,7 +34,7 @@
              bindings = <
                       &tog 0          &bootloader &reset
                 &none &bt BT_CLR_CMD  &none       &out OUT_TOG
-                &none &bt BT_NEXT_CMD &none       &out OUT_BLE
+                &none &bt BT_NXT_CMD &none       &out OUT_BLE
                 &none &bt BT_PRV_CMD  &none       &out OUT_USB
                 &none &bt BT_SEL_CMD  &none       &none
              >;
diff --git a/zmk/app/boards/shields/tidbit/tidbit_19key.overlay b/zmk/app/boards/shields/tidbit/tidbit_19key.overlay
deleted file mode 100644
index 5738d837..00000000
--- a/zmk/app/boards/shields/tidbit/tidbit_19key.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2020 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "tidbit.dtsi"
-
-&encoder_4 {
-    status = "okay";
-};