4 files changed, 8 insertions, 10 deletions
diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h
index 3dd4d1b1b6..583567d4f3 100644
--- a/users/muppetjones/config.h
+++ b/users/muppetjones/config.h
@@ -34,7 +34,7 @@
 #    define IGNORE_MOD_TAP_INTERRUPT
 
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#    define TAPPING_FORCE_HOLD
+#    define QUICK_TAP_TERM 0
 
 #endif
 
diff --git a/users/muppetjones/features/dancelayers.c b/users/muppetjones/features/dancelayers.c
index e7e5f2a6f2..3744950a4f 100644
--- a/users/muppetjones/features/dancelayers.c
+++ b/users/muppetjones/features/dancelayers.c
@@ -27,7 +27,7 @@ static td_tap_t lyr_tap_state = {.is_press_action = true, .state = TD_NONE};
  * @param A tap dance state struct.
  * @return A struct.
  */
-td_state_t cur_dance(qk_tap_dance_state_t *state) {
+td_state_t cur_dance(tap_dance_state_t *state) {
     switch (state->count) {
         case 1:
             if (!state->pressed)
@@ -49,7 +49,7 @@ td_state_t cur_dance(qk_tap_dance_state_t *state) {
 }
 
 // Functions that control what our tap dance key does
-__attribute__((weak)) void td_layer_finished(qk_tap_dance_state_t *state, void *user_data) {
+__attribute__((weak)) void td_layer_finished(tap_dance_state_t *state, void *user_data) {
     lyr_tap_state.state = cur_dance(state);
     switch (lyr_tap_state.state) {
         case TD_1X_TAP:
@@ -87,7 +87,7 @@ __attribute__((weak)) void td_layer_finished(qk_tap_dance_state_t *state, void *
     }
 }
 
-__attribute__((weak)) void td_layer_reset(qk_tap_dance_state_t *state, void *user_data) {
+__attribute__((weak)) void td_layer_reset(tap_dance_state_t *state, void *user_data) {
     // If the key was held down and now is released then switch off the layer
     if (lyr_tap_state.state == TD_1X_HOLD) {
         layer_off(_ADJUST);
diff --git a/users/muppetjones/features/dancelayers.h b/users/muppetjones/features/dancelayers.h
index 23defcca92..5f7440f48b 100644
--- a/users/muppetjones/features/dancelayers.h
+++ b/users/muppetjones/features/dancelayers.h
@@ -51,7 +51,7 @@ typedef struct {
  * @param A tap dance state struct.
  * @return A struct.
  */
-td_state_t cur_dance(qk_tap_dance_state_t *state);
+td_state_t cur_dance(tap_dance_state_t *state);
 
 // Functions associated with individual tap dances
 
@@ -63,7 +63,7 @@ td_state_t cur_dance(qk_tap_dance_state_t *state);
  * @param user_data Pointer to user data.
  * @return None.
  */
-void td_layer_finished(qk_tap_dance_state_t *state, void *user_data);
+void td_layer_finished(tap_dance_state_t *state, void *user_data);
 
 /* @brief Reset tap dance actions.
  *
@@ -73,10 +73,10 @@ void td_layer_finished(qk_tap_dance_state_t *state, void *user_data);
  * @param user_data Pointer to user data.
  * @return None.
  */
-void td_layer_reset(qk_tap_dance_state_t *state, void *user_data);
+void td_layer_reset(tap_dance_state_t *state, void *user_data);
 
 /* Define tap dance actions.
  */
 __attribute__((weak))
-qk_tap_dance_action_t tap_dance_actions[1] = {[TD_LAYERS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_layer_finished, td_layer_reset, 275)};
+tap_dance_action_t tap_dance_actions[1] = {[TD_LAYERS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_layer_finished, td_layer_reset, 275)};
 #endif
diff --git a/users/muppetjones/wrappers.h b/users/muppetjones/wrappers.h
index 9bcf81857c..9c6b25481d 100644
--- a/users/muppetjones/wrappers.h
+++ b/users/muppetjones/wrappers.h
@@ -165,8 +165,6 @@
  * | Play | Stop | Next | Prev | Mute |
  * `----------------------------------'
  */
-// What it MUV_IN and MUV_DE (5C2A and B)?
-// https://github.com/qmk/qmk_firmware/blob/7e832e46de26989b81f2fbf58a0f391b2b0c1aaf/quantum/quantum_keycodes.h#L135
 #define __MEDIA_R1_________________________________ AU_ON,   MI_ON,   MU_ON,   KC_BRMU, KC_VOLU
 #define __MEDIA_R2_________________________________ AU_OFF,  MI_OFF,  MU_OFF,  KC_BRMD, KC_VOLD
 #define __MEDIA_R3_________________________________ KC_MPLY, KC_MSTP, KC_MNXT, KC_MPRV, KC_MUTE