9 files changed, 18 insertions, 18 deletions
diff --git a/users/talljoe/macros.c b/users/talljoe/macros.c
index e9c9b521b7..1afc1ef7f6 100644
--- a/users/talljoe/macros.c
+++ b/users/talljoe/macros.c
@@ -29,9 +29,9 @@ ostype_t get_os() {
 
 #define MOD_SEND(KEY) (IS_OSX() ? SEND_STRING(SS_LCMD(KEY)) : SEND_STRING(SS_LCTL(KEY)))
 
-void macro_copy() { MOD_SEND("c"); }
-void macro_paste() { MOD_SEND("v"); }
-void macro_lock() {
+void macro_copy(void) { MOD_SEND("c"); }
+void macro_paste(void) { MOD_SEND("v"); }
+void macro_lock(void) {
   if (IS_OSX()) {
     SEND_STRING(SS_LCTL(SS_LCMD("q")));
   } else {
diff --git a/users/talljoe/talljoe.h b/users/talljoe/talljoe.h
index 23dabdd883..04d640b1ea 100644
--- a/users/talljoe/talljoe.h
+++ b/users/talljoe/talljoe.h
@@ -123,7 +123,7 @@ enum layers {
   #define H2_DEC KC_NO
   #define S2_INC KC_NO
   #define S2_DEC KC_NO
-  #define FN_MO13 KC_NO
+  #define TL_LOWR KC_NO
   #define FN_MO2 KC_NO
 #endif
 
diff --git a/users/talljoe/tapdance/actions/td.function.c b/users/talljoe/tapdance/actions/td.function.c
index fffbf283dd..577f2be3d4 100644
--- a/users/talljoe/tapdance/actions/td.function.c
+++ b/users/talljoe/tapdance/actions/td.function.c
@@ -19,14 +19,14 @@ static struct {
 } function_state = {0};
 
 // Send semi-colon + enter on two taps
-void tap_dance_function_finished(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_function_finished(tap_dance_state_t *state, void *user_data) {
   function_state.state = hold_cur_dance(state);
   switch (function_state.state) {
     case SINGLE_HOLD: layer_on(_ADJUST); break;
   }
 }
 
-void tap_dance_function_reset(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_function_reset(tap_dance_state_t *state, void *user_data) {
   switch (function_state.state) {
     case SPECIAL: reset_keyboard(); break;
     case SINGLE_HOLD: layer_off(_ADJUST); break;
diff --git a/users/talljoe/tapdance/actions/td.grave.c b/users/talljoe/tapdance/actions/td.grave.c
index 509b66dc35..f58f00f8c0 100644
--- a/users/talljoe/tapdance/actions/td.grave.c
+++ b/users/talljoe/tapdance/actions/td.grave.c
@@ -15,7 +15,7 @@
  */
 
 // Send `. ~. ```
-void tap_dance_grave_finished(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_grave_finished(tap_dance_state_t *state, void *user_data) {
   switch(state->count) {
     case 1:
       SEND_STRING("`");
@@ -26,7 +26,7 @@ void tap_dance_grave_finished(qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void tap_dance_grave_each(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_grave_each(tap_dance_state_t *state, void *user_data) {
   if(state->count == 3) {
     SEND_STRING("```");
   } else if (state->count > 3) {
diff --git a/users/talljoe/tapdance/actions/td.lock.c b/users/talljoe/tapdance/actions/td.lock.c
index 4422d9e252..bdca0bb11b 100644
--- a/users/talljoe/tapdance/actions/td.lock.c
+++ b/users/talljoe/tapdance/actions/td.lock.c
@@ -19,7 +19,7 @@ static struct {
 } lock_state = {0};
 
 // Send semi-colon + enter on two taps
-void tap_dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_lock_finished(tap_dance_state_t *state, void *user_data) {
   lock_state.state = cur_dance(state);
   switch (lock_state.state) {
     case SINGLE_TAP: register_code(KC_ESC); break;
@@ -27,7 +27,7 @@ void tap_dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void tap_dance_lock_reset(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_lock_reset(tap_dance_state_t *state, void *user_data) {
   switch (lock_state.state) {
     case SINGLE_TAP: unregister_code(KC_ESC); break;
   }
diff --git a/users/talljoe/tapdance/actions/td.semicolon.c b/users/talljoe/tapdance/actions/td.semicolon.c
index 45776492a4..c2fc500c48 100644
--- a/users/talljoe/tapdance/actions/td.semicolon.c
+++ b/users/talljoe/tapdance/actions/td.semicolon.c
@@ -19,12 +19,12 @@ static struct {
   bool mods;
 } tap_state = {0};
 
-void tap_dance_semicolon_each(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_semicolon_each(tap_dance_state_t *state, void *user_data) {
     tap_state.mods |= get_mods();
 }
 
 // Send semi-colon + enter on two taps
-void tap_dance_semicolon_finished(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_semicolon_finished(tap_dance_state_t *state, void *user_data) {
   tap_state.semicolon = hold_cur_dance(state);
   switch (tap_state.semicolon) {
     case SINGLE_TAP: case DOUBLE_HOLD: register_code(KC_SCLN); break;
@@ -32,7 +32,7 @@ void tap_dance_semicolon_finished(qk_tap_dance_state_t *state, void *user_data)
   }
 }
 
-void tap_dance_semicolon_reset(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_semicolon_reset(tap_dance_state_t *state, void *user_data) {
   switch (tap_state.semicolon) {
     case SINGLE_TAP: case DOUBLE_HOLD: unregister_code(KC_SCLN); break;
     case DOUBLE_TAP: {
diff --git a/users/talljoe/tapdance/tapdance_actions.c b/users/talljoe/tapdance/tapdance_actions.c
index 59a34b7b9e..b574586171 100644
--- a/users/talljoe/tapdance/tapdance_actions.c
+++ b/users/talljoe/tapdance/tapdance_actions.c
@@ -20,7 +20,7 @@
 #include "actions/td.semicolon.c"
 #include "actions/td.function.c"
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   [TD_SEMICOLON] = ACTION_TAP_DANCE_FN_ADVANCED(tap_dance_semicolon_each, tap_dance_semicolon_finished, tap_dance_semicolon_reset),
   [TD_LOCK]      = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_dance_lock_finished, tap_dance_lock_reset),
   [TD_GRAVE]     = ACTION_TAP_DANCE_FN_ADVANCED(tap_dance_grave_each, tap_dance_grave_finished, NULL),
diff --git a/users/talljoe/tapdance/td_setup.c b/users/talljoe/tapdance/td_setup.c
index d8464144ac..0742763266 100644
--- a/users/talljoe/tapdance/td_setup.c
+++ b/users/talljoe/tapdance/td_setup.c
@@ -16,7 +16,7 @@
 
 #include "tapdance.h"
 
-int cur_dance (qk_tap_dance_state_t *state) {
+int cur_dance (tap_dance_state_t *state) {
   if (state->count == 1) {
     //If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP
     if (state->interrupted) {
@@ -45,7 +45,7 @@ int cur_dance (qk_tap_dance_state_t *state) {
   else return SPECIAL;
 }
 
-int hold_cur_dance (qk_tap_dance_state_t *state) {
+int hold_cur_dance (tap_dance_state_t *state) {
   if (state->count == 1) {
     if (state->interrupted) {
       if (!state->pressed) return SINGLE_TAP;
diff --git a/users/talljoe/tapdance/td_setup.h b/users/talljoe/tapdance/td_setup.h
index 85d45d944f..e9685c83b2 100644
--- a/users/talljoe/tapdance/td_setup.h
+++ b/users/talljoe/tapdance/td_setup.h
@@ -25,5 +25,5 @@ enum {
   SPECIAL = 8
 };
 
-int cur_dance (qk_tap_dance_state_t *state);
-int hold_cur_dance (qk_tap_dance_state_t *state);
+int cur_dance (tap_dance_state_t *state);
+int hold_cur_dance (tap_dance_state_t *state);