4 files changed, 15 insertions, 15 deletions
diff --git a/users/rmeli/keyrecords/tap_dances.c b/users/rmeli/keyrecords/tap_dances.c
index 3b38bf4a33..4e7ac31962 100644
--- a/users/rmeli/keyrecords/tap_dances.c
+++ b/users/rmeli/keyrecords/tap_dances.c
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Tap dances definitions
 // Need to needs to be defined in a .c file to avoid a linker error (multiple definitions)
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     [TD_LSPO_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, LSPO_CAPS_finished, LSPO_CAPS_reset),
     [TD_RSPC_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, RSPC_CAPS_finished, RSPC_CAPS_reset),
     [TD_ESC_DEL]   = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_DEL),
@@ -34,7 +34,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 // + ------ +
 
 // https://github.com/qmk/qmk_firmware/blob/9294258c02d3e025e01935a06c4d9f1997535bda/users/gordon/gordon.c#L112-L135
-td_state_t hold_cur_dance(qk_tap_dance_state_t *state) {
+td_state_t hold_cur_dance(tap_dance_state_t *state) {
     if (state->count == 1) {
         if (state->interrupted) {
             if (!state->pressed)
@@ -63,7 +63,7 @@ td_state_t hold_cur_dance(qk_tap_dance_state_t *state) {
 // Create an instance of 'td_tap_t' for the 'LSPO_CAPS' tap dance.
 static td_tap_t LSPO_CAPS_state = {.is_press_action = true, .state = TD_NONE};
 
-void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) {
+void LSPO_CAPS_finished(tap_dance_state_t *state, void *user_data) {
     LSPO_CAPS_state.state = hold_cur_dance(state);
     switch (LSPO_CAPS_state.state) {
         case TD_SINGLE_TAP:
@@ -80,7 +80,7 @@ void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) {
     }
 }
 
-void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) {
+void LSPO_CAPS_reset(tap_dance_state_t *state, void *user_data) {
     switch (LSPO_CAPS_state.state) {
         case TD_SINGLE_TAP:
             unregister_code16(KC_LPRN);
@@ -104,7 +104,7 @@ void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) {
 // Create an instance of 'td_tap_t' for the 'RSPC_CAPS' tap dance.
 static td_tap_t RSPC_CAPS_state = {.is_press_action = true, .state = TD_NONE};
 
-void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) {
+void RSPC_CAPS_finished(tap_dance_state_t *state, void *user_data) {
     RSPC_CAPS_state.state = hold_cur_dance(state);
     switch (RSPC_CAPS_state.state) {
         case TD_SINGLE_TAP:
@@ -121,7 +121,7 @@ void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) {
     }
 }
 
-void RSPC_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) {
+void RSPC_CAPS_reset(tap_dance_state_t *state, void *user_data) {
     switch (RSPC_CAPS_state.state) {
         case TD_SINGLE_TAP:
             unregister_code16(KC_RPRN);
diff --git a/users/rmeli/keyrecords/tap_dances.h b/users/rmeli/keyrecords/tap_dances.h
index 1d3018441e..40866fe17f 100644
--- a/users/rmeli/keyrecords/tap_dances.h
+++ b/users/rmeli/keyrecords/tap_dances.h
@@ -60,12 +60,12 @@ typedef struct {
 // + --------- +
 
 // Tap dance for fast modifiers; favors being held over being tapped.
-td_state_t hold_cur_dance(qk_tap_dance_state_t *state);
+td_state_t hold_cur_dance(tap_dance_state_t *state);
 
 // Left Shift Parenthesis Open (LSPO) and Caps Lock (CAPS) on DOUBLE_TAP
-void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data);
-void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data);
+void LSPO_CAPS_finished(tap_dance_state_t *state, void *user_data);
+void LSPO_CAPS_reset(tap_dance_state_t *state, void *user_data);
 
 // Right Shift Parenthesis Close (RSPC) and Caps Lock (CAPS) on DOUBLE_TAP
-void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data);
-void RSPC_CAPS_reset(qk_tap_dance_state_t *state, void *user_data);
+void RSPC_CAPS_finished(tap_dance_state_t *state, void *user_data);
+void RSPC_CAPS_reset(tap_dance_state_t *state, void *user_data);
diff --git a/users/rmeli/keyrecords/unicode.h b/users/rmeli/keyrecords/unicode.h
index d818af02ee..c3ba96d5b6 100644
--- a/users/rmeli/keyrecords/unicode.h
+++ b/users/rmeli/keyrecords/unicode.h
@@ -45,7 +45,7 @@ enum unicode_names {
     UUML,
 };
 
-const uint32_t PROGMEM unicode_map[] = {
+const uint32_t unicode_map[] PROGMEM = {
     // KC_A
     [aGRV] = 0x00E0, // à
     [AGRV] = 0x00C0, // À
diff --git a/users/rmeli/keyrecords/wrappers.h b/users/rmeli/keyrecords/wrappers.h
index 70ec4878bf..3513fd0abb 100644
--- a/users/rmeli/keyrecords/wrappers.h
+++ b/users/rmeli/keyrecords/wrappers.h
@@ -168,9 +168,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ________________NAV_R3_x5__________________ XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
 #define ____________NAV_VIM_x4____________ KC_LEFT, KC_DOWN,  KC_UP, KC_RIGHT
 
-#define _______________CONFIG_R1_x5________________ UC_MOD,  KC_ASUP,   NK_ON, XXXXXXX, XXXXXXX
-#define _______________CONFIG_R2_x5________________ XXXXXXX, KC_ASTG, NK_TOGG, CG_TOGG, XXXXXXX
-#define _______________CONFIG_R3_x5________________ UC_RMOD, KC_ASDN,  NK_OFF, CG_NORM, XXXXXXX
+#define _______________CONFIG_R1_x5________________ UC_NEXT, AS_UP,    NK_ON,   XXXXXXX, XXXXXXX
+#define _______________CONFIG_R2_x5________________ XXXXXXX, AS_TOGG,  NK_TOGG, CG_TOGG, XXXXXXX
+#define _______________CONFIG_R3_x5________________ UC_PREV, AS_DOWN,  NK_OFF,  CG_NORM, XXXXXXX
 
 #define ________________RGB_L2_x5__________________  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI
 #define ________________RGB_L3_x5__________________ RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD