diff --git a/qmk/cirque sensitivity settings.png b/qmk/puckbuddy/cirque sensitivity settings.png
similarity index 100%
rename from qmk/cirque sensitivity settings.png
rename to qmk/puckbuddy/cirque sensitivity settings.png
diff --git a/qmk/kmn_puckbuddy.patch b/qmk/puckbuddy/kmn_puckbuddy.patch
similarity index 62%
rename from qmk/kmn_puckbuddy.patch
rename to qmk/puckbuddy/kmn_puckbuddy.patch
index ca58ce9b..a38e5c56 100644
--- a/qmk/kmn_puckbuddy.patch
+++ b/qmk/puckbuddy/kmn_puckbuddy.patch
@@ -1,30 +1,19 @@
-diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
-index 2db7f916fe..668973f70c 100644
---- a/drivers/sensors/cirque_pinnacle.c
-+++ b/drivers/sensors/cirque_pinnacle.c
-@@ -213,7 +213,7 @@ void cirque_pinnacle_init(void) {
-     // Host sets z-idle packet count to 5 (default is 30)
-     RAP_Write(Z_IDLE_COUNT, Z_IDLE_COUNT_VALUE);
- 
--    cirque_pinnacle_set_adc_attenuation(0xFF);
-+    cirque_pinnacle_set_adc_attenuation(0x40);
-     cirque_pinnacle_tune_edge_sensitivity();
-     cirque_pinnacle_enable_feed(true);
- }
 diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
-index dc94d9b474..ff71eb67a1 100644
+index 666c1ff085..a451afa8af 100644
 --- a/keyboards/mechwild/puckbuddy/config.h
 +++ b/keyboards/mechwild/puckbuddy/config.h
-@@ -27,7 +27,7 @@
- #define LED_PIN_ON_STATE 0
- 
+@@ -38,6 +38,10 @@
  /* set the tapping term for glidepoint pad to register a tap click */
--#define CIRQUE_PINNACLE_TAPPING_TERM 10 // This is set unreasonably low to effectively disable it
-+#define CIRQUE_PINNACLE_TAPPING_TERM 0 // This is set unreasonably low to effectively disable it
+ #define CIRQUE_PINNACLE_TAPPING_TERM 0 // This is set unreasonably low to effectively disable it
  
++/* set attenuation/speed to be more sensitive (kmn local tweak) */
++#define CIRQUE_PINNACLE_ATTENUATION ADC_ATTENUATE_2X
++#define GLIDEPOINT_DPI_DEFAULT 3
++
  /*
   * Keyboard Matrix Assignments
-@@ -143,4 +143,4 @@
+  *
+@@ -152,4 +156,4 @@
  
  /* Bootmagic Lite key configuration */
  //#define BOOTMAGIC_LITE_ROW 0
@@ -57,25 +46,59 @@ index bb5313fcb2..643fdb2818 100644
 -};
 \ No newline at end of file
 +};
+diff --git a/keyboards/mechwild/puckbuddy/keymaps/via/keymap.c b/keyboards/mechwild/puckbuddy/keymaps/via/keymap.c
+index bb5313fcb2..643fdb2818 100644
+--- a/keyboards/mechwild/puckbuddy/keymaps/via/keymap.c
++++ b/keyboards/mechwild/puckbuddy/keymaps/via/keymap.c
+@@ -34,10 +34,10 @@ enum layer_names {
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /* Base */
+     [_BASE] = LAYOUT(
+-    KC_MUTE,  MO(_FN3), MO(_FN2), MO(_FN1),       LGUI(KC_D),
+-    KC_HOME,                                      KC_PGUP,
+-    KC_END,                                       KC_PGDN,
+-    KC_BTN3,  KC_BTN1, KC_BTN2, KC_BTN2, KC_BTN1, DPI_FINE
++    RGB_TOG,          KC_NO,   KC_NO,   DPI_DN,              DPI_UP,
++    LGUI(KC_DOWN),                                           LCA(KC_TAB),
++    KC_WBAK,                                                 KC_WH_U,
++    KC_WHOM,          KC_BTN1, KC_BTN2, KC_WH_L, KC_WH_R,    KC_WH_D
+     ),
+     [_FN1] = LAYOUT(
+     RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS,          RESET,
+@@ -57,4 +57,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     KC_TRNS,                                     KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+     )
+-};
+\ No newline at end of file
++};
 diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.c b/keyboards/mechwild/puckbuddy/puckbuddy.c
-index 6a8df58655..6f68f3bf1e 100644
+index 65e939166d..eeb5e20db3 100644
 --- a/keyboards/mechwild/puckbuddy/puckbuddy.c
 +++ b/keyboards/mechwild/puckbuddy/puckbuddy.c
-@@ -7,11 +7,11 @@
+@@ -6,12 +6,6 @@
+ #ifndef GLIDEPOINT_DPI_OPTIONS
  #    define GLIDEPOINT_DPI_OPTIONS \
          { 400, 800, 1200, 1600, 2000, 2400, 2800, 3200, 3600, 4000 }
- #    ifndef GLIDEPOINT_DPI_DEFAULT
+-#    ifndef GLIDEPOINT_DPI_DEFAULT
 -#        define GLIDEPOINT_DPI_DEFAULT 1
-+#        define GLIDEPOINT_DPI_DEFAULT 3
- #    endif
- #endif
- #ifndef GLIDEPOINT_DPI_DEFAULT
+-#    endif
+-#endif
+-#ifndef GLIDEPOINT_DPI_DEFAULT
 -#    define GLIDEPOINT_DPI_DEFAULT 1
-+#    define GLIDEPOINT_DPI_DEFAULT 3
  #endif
  
  keyboard_config_t keyboard_config;
-@@ -132,7 +132,7 @@ bool oled_task_kb(void) {
+@@ -82,7 +76,7 @@ static void render_name(void) {     // Render Puckbuddy "Get Puck'd" text
+     oled_set_cursor(0,3);
+     oled_write_P(name_4, false);
+ 
+-}    
++}
+ 
+ static void render_logo(void) {     // Render MechWild "MW" Logo
+     static const char PROGMEM logo_1[] = {0x97, 0x98, 0x99, 0x9A,0x00};
+@@ -137,7 +131,7 @@ bool oled_task_kb(void) {
          }
          led_t led_state = host_keyboard_led_state();
          oled_set_cursor(8,0);
@@ -84,7 +107,7 @@ index 6a8df58655..6f68f3bf1e 100644
          oled_set_cursor(8,1);
          oled_write_P(led_state.num_lock ? PSTR("NLCK ") : PSTR("     "), false);
          oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR("     "), false);
-@@ -202,4 +202,4 @@ void keyboard_post_init_kb(void) {
+@@ -207,4 +201,4 @@ void keyboard_post_init_kb(void) {
      keyboard_post_init_user();
      rgblight_toggle_noeeprom();     //double toggle post init removes the weirdness with rgb strips having a yellow first LED
      rgblight_toggle_noeeprom();
diff --git a/qmk/puckbuddy/mechwild_puckbuddy_default.uf2 b/qmk/puckbuddy/mechwild_puckbuddy_default.uf2
new file mode 100644
index 00000000..61828f4b
Binary files /dev/null and b/qmk/puckbuddy/mechwild_puckbuddy_default.uf2 differ
diff --git a/qmk/puckbuddy/tinyuf2-stm32f401_blackpill-0.9.4.bin b/qmk/puckbuddy/tinyuf2-stm32f401_blackpill-0.9.4.bin
new file mode 100644
index 00000000..2da717c2
Binary files /dev/null and b/qmk/puckbuddy/tinyuf2-stm32f401_blackpill-0.9.4.bin differ