6 files changed, 10 insertions, 10 deletions
diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h
index 9315f879ae..bc0fe67df8 100644
--- a/users/kuchosauronad0/config.h
+++ b/users/kuchosauronad0/config.h
@@ -70,7 +70,7 @@
 // actually sends Ctrl-x. That's bad.)
 #define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
-//#define TAPPING_FORCE_HOLD
+//#define QUICK_TAP_TERM 0
 //#define RETRO_TAPPING
 
 #ifndef TAPPING_TOGGLE
diff --git a/users/kuchosauronad0/encoder.c b/users/kuchosauronad0/encoder.c
index 9284a041c2..2578ddd873 100644
--- a/users/kuchosauronad0/encoder.c
+++ b/users/kuchosauronad0/encoder.c
@@ -57,8 +57,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   }
     return true;
 }
-const uint16_t PROGMEM encoder_actions[][9] = { \
+const uint16_t PROGMEM encoder_actions[][9] = {
 //  None     CTRL     ALT                SHIFT    GUI             CTRL+ALT             CTRL+SHFT ALT+SHFT      HYPER
-  { KC_PGDN, KC_DOWN, KC_AUDIO_VOL_UP,   KC_END,  KC_WWW_FORWARD, KC_AUDIO_MUTE,       KC_RIGHT, LSFT(KC_TAB), KC_MEDIA_NEXT_TRACK}, \
+  { KC_PGDN, KC_DOWN, KC_AUDIO_VOL_UP,   KC_END,  KC_WWW_FORWARD, KC_AUDIO_MUTE,       KC_RIGHT, LSFT(KC_TAB), KC_MEDIA_NEXT_TRACK},
   { KC_PGUP, KC_UP,   KC_AUDIO_VOL_DOWN, KC_HOME, KC_WWW_BACK,    KC_MEDIA_PLAY_PAUSE, KC_LEFT,  KC_TAB,       KC_MEDIA_PREV_TRACK}
 };
diff --git a/users/kuchosauronad0/leader.c b/users/kuchosauronad0/leader.c
index ac2a6599a1..e8935ec401 100644
--- a/users/kuchosauronad0/leader.c
+++ b/users/kuchosauronad0/leader.c
@@ -93,7 +93,7 @@ void matrix_scan_user(void) {
 //  matrix_scan_keymap();
 }
 
-void leader_start(void) {
+void leader_start_user(void) {
 #ifdef RGBLIGHT_ENABLE
  rgblight_savebase();
  rgblight_mode_noeeprom(1);
@@ -101,7 +101,7 @@ void leader_start(void) {
 #endif
 }
 
-void leader_end(void) {
+void leader_end_user(void) {
 // pick color depending of success /fail
 // fade leader_start from 100 to 0
 // fade new color from  0 to 100 to 0
diff --git a/users/kuchosauronad0/tap_dances.c b/users/kuchosauronad0/tap_dances.c
index 7bdd3d3375..40d1c245e3 100644
--- a/users/kuchosauronad0/tap_dances.c
+++ b/users/kuchosauronad0/tap_dances.c
@@ -1,5 +1,5 @@
 #include "tap_dances.h"
-void td_parenthesis (qk_tap_dance_state_t *state, void *user_data) {
+void td_parenthesis (tap_dance_state_t *state, void *user_data) {
    if (state->count == 1) {
 //        SEND_STRING ("\(");
         tap_code(KC_QUOT);
@@ -23,7 +23,7 @@ void td_parenthesis (qk_tap_dance_state_t *state, void *user_data) {
    }
 }
 
-void safe_reset(qk_tap_dance_state_t *state, void *user_data) {
+void safe_reset(tap_dance_state_t *state, void *user_data) {
   if (state->count >= 3) {
     // Reset the keyboard if you tap the key more than three times
     reset_keyboard();
@@ -31,7 +31,7 @@ void safe_reset(qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   [TD_RESET] = ACTION_TAP_DANCE_FN(safe_reset),
   [TD_NUM1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_4),
   [TD_NUM2] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_5),
diff --git a/users/kuchosauronad0/tap_dances.h b/users/kuchosauronad0/tap_dances.h
index 19da8d69dc..818bbd7b93 100644
--- a/users/kuchosauronad0/tap_dances.h
+++ b/users/kuchosauronad0/tap_dances.h
@@ -23,4 +23,4 @@ enum {
   TD_ABR   // single double angle brackets
 };
 #endif // TAP_DANCE_ENABLE
-void td_parenthesis (qk_tap_dance_state_t *state, void *user_data);
+void td_parenthesis (tap_dance_state_t *state, void *user_data);
diff --git a/users/kuchosauronad0/unicode.c b/users/kuchosauronad0/unicode.c
index 8b312deb66..f0168cef9f 100644
--- a/users/kuchosauronad0/unicode.c
+++ b/users/kuchosauronad0/unicode.c
@@ -1,7 +1,7 @@
 #include "unicode.h"
 
 //#ifdef UNICODEMAP_ENABLE
-const uint32_t PROGMEM unicode_map[] = {
+const uint32_t unicode_map[] PROGMEM = {
   [BANG]      = 0x0203D,// ‽
   [IRONY]     = 0x02E2E,// ⸮
   [DEGREE]    = 0x000B0,// °