diff --git a/TODO.md b/TODO.md
index a4387c9d..7ea9617f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1 +1,2 @@
 Remove all tap-dance keys.
+
diff --git a/keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.c b/keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.c
index bf5411f3..8b188e35 100644
--- a/keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.c
+++ b/keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.c
@@ -20,11 +20,13 @@ void turn_on_caps_word(custom_key_t* custom_key) {
 custom_key_t custom_keys[] = {
     // _BASE layer
     [NK_Q] = CUSTOM_KEY(KC_Q, 1, REMAP_WITH_OPTIONS(A(KC_F4), MOD_MASK_GUI, REMOVE_TRIGGER, false)),
-    [NK_R] = CUSTOM_KEY(KC_R, 1, REMAP(KC_Y, MOD_MASK_CTRL)),
 
     // _NUM layer
     [NK_COLN] = CUSTOM_KEY(KC_COLN, 1, REMAP(KC_M, MOD_MASK_CTRL)),
-    [NK_MINS_NUM] = CUSTOM_KEY(KC_MINS, 1, REMAP(KC_Y, MOD_MASK_CTRL)),
+    [NK_MINS_NUM] = CUSTOM_KEY(
+        KC_MINS, 2, REMAP(KC_R, MOD_MASK_CTRL),
+        REMAP_WITH_OPTIONS(KC_MINS, MOD_MASK_SHIFT, REMOVE_TRIGGER, false)
+    ),
     [NK_1] = CUSTOM_KEY(
         KC_1, 2, REMAP(KC_A, MOD_MASK_CTRL),
         REMAP_WITH_OPTIONS(KC_1, MOD_MASK_SHIFT, REMOVE_TRIGGER, false)
diff --git a/keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.h b/keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.h
index ca82529f..e3a24df6 100644
--- a/keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.h
+++ b/keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.h
@@ -15,7 +15,6 @@
 enum custom_keycodes {
     // _BASE layer
     NK_Q,
-    NK_R,
     // _NUM layer
     NK_COLN,
     NK_MINS_NUM,
diff --git a/keyboards/keebio/nyquist/rev4/keymaps/drew/keymap.c b/keyboards/keebio/nyquist/rev4/keymaps/drew/keymap.c
index cb2427e7..441889e3 100644
--- a/keyboards/keebio/nyquist/rev4/keymaps/drew/keymap.c
+++ b/keyboards/keebio/nyquist/rev4/keymaps/drew/keymap.c
@@ -4,6 +4,7 @@
 #include "custom_keys/custom_keys.h"
 #include "custom_keys/mapping.h"
 #include "layers.h"
+#include "tap_dance/tap_dance.c"
 #include "tap_dance/tap_dance.h"
 #include "taphold/taphold_options.h"
 
@@ -13,14 +14,14 @@ bool NAV_enabled = false;
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // base
     [_BASE] = LAYOUT_ortho_4x12(
-        NK(NK_ESC),        NK(NK_Q),             KC_W,           KC_E,            NK(NK_R),        KC_T,               KC_Y,               KC_U,           KC_I,         KC_O,          KC_P,          NK(NK_BSPC),
+        NK(NK_ESC),        NK(NK_Q),             KC_W,           KC_E,            KC_R,            KC_T,               KC_Y,               KC_U,           KC_I,         KC_O,          KC_P,          NK(NK_BSPC),
         CTL_T(KC_TAB),     KC_A,                 KC_S,           KC_D,            KC_F,            KC_G,               KC_H,               KC_J,           KC_K,         KC_L,          KC_SCLN,       KC_QUOT,
         SFT_SFT,           KC_Z,                 KC_X,           KC_C,            KC_V,            KC_B,               KC_N,               KC_M,           KC_COMM,      KC_DOT,        KC_SLSH,       ALT_DEL,
         KC_RCTL,           LT(_FUNC, KC_MPLY),   ALT_T(KC_LALT), TD(TD_CAD_LOCK), GUI_LAUNCH,      NUM_SPC,            NAV_ENT,            ALT_COMP,       KC_LEFT,      NK(NK_DOWN),   NK(NK_UP),     KC_RGHT
     ),
     // gamer
     [_GAME] = LAYOUT_ortho_4x12(
-        KC_TRNS,           KC_Q,                 KC_TRNS,        KC_TRNS,         KC_R,            KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,
+        KC_TRNS,           KC_Q,                 KC_TRNS,        KC_TRNS,         KC_TRNS,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,
         KC_TAB,            KC_TRNS,              KC_TRNS,        KC_TRNS,         KC_TRNS,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,
         KC_LSFT,           KC_TRNS,              KC_TRNS,        KC_TRNS,         KC_TRNS,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,
         KC_TRNS,           KC_TRNS,              KC_TRNS,        KC_PGDN,         KC_PGUP,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS
diff --git a/keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.c b/keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.c
index 76a4322c..8fbd2fe7 100644
--- a/keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.c
+++ b/keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.c
@@ -1,4 +1,6 @@
 #include "tap_dance.h"
+#include "../common.h"
+#include "../custom_keys/alias.h"
 
 tap_dance_action_t tap_dance_actions[] = {
     [TD_CAD_LOCK] = ACTION_TAP_DANCE_DOUBLE(CAD, LOCK),
diff --git a/keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.h b/keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.h
index e4919720..3b7f9f49 100644
--- a/keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.h
+++ b/keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.h
@@ -5,5 +5,3 @@
 enum {
     TD_CAD_LOCK,
 };
-
-extern tap_dance_action_t tap_dance_actions[];
diff --git a/keyboards/keebio/nyquist/rev4/keymaps/drew/taphold/taphold_options.h b/keyboards/keebio/nyquist/rev4/keymaps/drew/taphold/taphold_options.h
index 56c70af5..04738e2c 100644
--- a/keyboards/keebio/nyquist/rev4/keymaps/drew/taphold/taphold_options.h
+++ b/keyboards/keebio/nyquist/rev4/keymaps/drew/taphold/taphold_options.h
@@ -5,7 +5,7 @@
 #include "../custom_keys/alias.h"
 #include "../custom_keys/mapping.h"
 #include "../layers.h"
-#include "../tap_dance.h"
+#include "../tap_dance/tap_dance.h"
 
 uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record);
 bool get_permissive_hold(uint16_t keycode, keyrecord_t* record);
diff --git a/keyboards/planck/rev7/keymaps/drew/common.h b/keyboards/planck/rev7/keymaps/drew/common.h
new file mode 100644
index 00000000..6e7d145b
--- /dev/null
+++ b/keyboards/planck/rev7/keymaps/drew/common.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
diff --git a/keyboards/planck/rev7/keymaps/drew/custom_keys/alias.h b/keyboards/planck/rev7/keymaps/drew/custom_keys/alias.h
index 3d1c4170..c173284d 100644
--- a/keyboards/planck/rev7/keymaps/drew/custom_keys/alias.h
+++ b/keyboards/planck/rev7/keymaps/drew/custom_keys/alias.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include QMK_KEYBOARD_H
+#include "../common.h"
 
 #define TAB_FORWARD C(KC_TAB)
 #define TAB_BACKWARD (C(S(KC_TAB)))
@@ -17,4 +19,4 @@
 #define NUM_SPC LT(_NUM, TH_SPC)
 #define NAV_ENT LT(_NAV, KC_ENT)
 #define CAD C(A(KC_DEL))
-#define LOCK G(KC_L)
+#define LOCK G(KC_L)
\ No newline at end of file
diff --git a/keyboards/planck/rev7/keymaps/drew/custom_keys/custom_keys.h b/keyboards/planck/rev7/keymaps/drew/custom_keys/custom_keys.h
index b3968f6e..25782c29 100644
--- a/keyboards/planck/rev7/keymaps/drew/custom_keys/custom_keys.h
+++ b/keyboards/planck/rev7/keymaps/drew/custom_keys/custom_keys.h
@@ -1,5 +1,6 @@
 #pragma once
 #include QMK_KEYBOARD_H
+#include "../common.h"
 #include "../utils/mod_suppression.h"
 #include "alias.h"
 
diff --git a/keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.c b/keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.c
index bf5411f3..8b188e35 100644
--- a/keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.c
+++ b/keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.c
@@ -20,11 +20,13 @@ void turn_on_caps_word(custom_key_t* custom_key) {
 custom_key_t custom_keys[] = {
     // _BASE layer
     [NK_Q] = CUSTOM_KEY(KC_Q, 1, REMAP_WITH_OPTIONS(A(KC_F4), MOD_MASK_GUI, REMOVE_TRIGGER, false)),
-    [NK_R] = CUSTOM_KEY(KC_R, 1, REMAP(KC_Y, MOD_MASK_CTRL)),
 
     // _NUM layer
     [NK_COLN] = CUSTOM_KEY(KC_COLN, 1, REMAP(KC_M, MOD_MASK_CTRL)),
-    [NK_MINS_NUM] = CUSTOM_KEY(KC_MINS, 1, REMAP(KC_Y, MOD_MASK_CTRL)),
+    [NK_MINS_NUM] = CUSTOM_KEY(
+        KC_MINS, 2, REMAP(KC_R, MOD_MASK_CTRL),
+        REMAP_WITH_OPTIONS(KC_MINS, MOD_MASK_SHIFT, REMOVE_TRIGGER, false)
+    ),
     [NK_1] = CUSTOM_KEY(
         KC_1, 2, REMAP(KC_A, MOD_MASK_CTRL),
         REMAP_WITH_OPTIONS(KC_1, MOD_MASK_SHIFT, REMOVE_TRIGGER, false)
diff --git a/keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.h b/keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.h
index f8da2ffe..e3a24df6 100644
--- a/keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.h
+++ b/keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.h
@@ -1,5 +1,6 @@
 #pragma once
 #include QMK_KEYBOARD_H
+#include "../common.h"
 #include "../layers.h"
 #include "../utils/deletion.h"
 #include "alias.h"
@@ -14,7 +15,6 @@
 enum custom_keycodes {
     // _BASE layer
     NK_Q,
-    NK_R,
     // _NUM layer
     NK_COLN,
     NK_MINS_NUM,
diff --git a/keyboards/planck/rev7/keymaps/drew/keymap.c b/keyboards/planck/rev7/keymaps/drew/keymap.c
index 509dd06a..441889e3 100644
--- a/keyboards/planck/rev7/keymaps/drew/keymap.c
+++ b/keyboards/planck/rev7/keymaps/drew/keymap.c
@@ -1,9 +1,11 @@
 #include QMK_KEYBOARD_H
 #include "caps_word/caps_word.h"
+#include "common.h"
 #include "custom_keys/custom_keys.h"
 #include "custom_keys/mapping.h"
 #include "layers.h"
-#include "tap_dance.c"
+#include "tap_dance/tap_dance.c"
+#include "tap_dance/tap_dance.h"
 #include "taphold/taphold_options.h"
 
 bool NAV_enabled = false;
@@ -12,14 +14,14 @@ bool NAV_enabled = false;
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // base
     [_BASE] = LAYOUT_ortho_4x12(
-        NK(NK_ESC),        NK(NK_Q),             KC_W,           KC_E,            NK(NK_R),        KC_T,               KC_Y,               KC_U,           KC_I,         KC_O,          KC_P,          NK(NK_BSPC),
+        NK(NK_ESC),        NK(NK_Q),             KC_W,           KC_E,            KC_R,            KC_T,               KC_Y,               KC_U,           KC_I,         KC_O,          KC_P,          NK(NK_BSPC),
         CTL_T(KC_TAB),     KC_A,                 KC_S,           KC_D,            KC_F,            KC_G,               KC_H,               KC_J,           KC_K,         KC_L,          KC_SCLN,       KC_QUOT,
         SFT_SFT,           KC_Z,                 KC_X,           KC_C,            KC_V,            KC_B,               KC_N,               KC_M,           KC_COMM,      KC_DOT,        KC_SLSH,       ALT_DEL,
         KC_RCTL,           LT(_FUNC, KC_MPLY),   ALT_T(KC_LALT), TD(TD_CAD_LOCK), GUI_LAUNCH,      NUM_SPC,            NAV_ENT,            ALT_COMP,       KC_LEFT,      NK(NK_DOWN),   NK(NK_UP),     KC_RGHT
     ),
     // gamer
     [_GAME] = LAYOUT_ortho_4x12(
-        KC_TRNS,           KC_Q,                 KC_TRNS,        KC_TRNS,         KC_R,            KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,
+        KC_TRNS,           KC_Q,                 KC_TRNS,        KC_TRNS,         KC_TRNS,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,
         KC_TAB,            KC_TRNS,              KC_TRNS,        KC_TRNS,         KC_TRNS,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,
         KC_LSFT,           KC_TRNS,              KC_TRNS,        KC_TRNS,         KC_TRNS,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,
         KC_TRNS,           KC_TRNS,              KC_TRNS,        KC_PGDN,         KC_PGUP,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS
@@ -42,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FUNC] = LAYOUT_ortho_4x12(
         KC_F1,             KC_F2,                KC_F3,          KC_F4,           KC_F5,           KC_F6,              KC_F7,              KC_F8,          KC_F9,        KC_F10,        KC_F11,        KC_F12,
         KC_F7,             KC_F8,                KC_F9,          KC_F10,          KC_F11,          KC_F12,             KC_NO,              KC_NO,          KC_NO,        KC_NO,         KC_NO,         KC_NO,
-        KC_TRNS,           KC_MUTE,              KC_MPRV,        KC_VOLD,         KC_VOLU,         KC_MNXT,            KC_NO,              KC_NO,          KC_NO,        QK_AUDIO_OFF,  TG(_GAME),     QK_BOOT,
+        KC_TRNS,           KC_MUTE,              KC_MPRV,        KC_VOLD,         KC_VOLU,         KC_MNXT,            KC_NO,              KC_NO,          KC_NO,        KC_NO,         TG(_GAME),     QK_BOOT,
         KC_TRNS,           KC_NO,                KC_BRID,        KC_BRIU,         KC_TRNS,         KC_TRNS,            KC_TRNS,            KC_TRNS,        KC_TRNS,      KC_TRNS,       KC_TRNS,       QK_RBT
     ),
 };
diff --git a/keyboards/planck/rev7/keymaps/drew/rules.mk b/keyboards/planck/rev7/keymaps/drew/rules.mk
index 2e2b086b..02c2e5af 100644
--- a/keyboards/planck/rev7/keymaps/drew/rules.mk
+++ b/keyboards/planck/rev7/keymaps/drew/rules.mk
@@ -5,7 +5,6 @@ SRC += utils/deletion.c
 SRC += custom_keys/custom_keys.c
 SRC += custom_keys/mapping.c
 
-VIA_ENABLE = yes
 LTO_ENABLE = yes
 
 CAPS_WORD_ENABLE = yes
diff --git a/keyboards/planck/rev7/keymaps/drew/tap_dance.c b/keyboards/planck/rev7/keymaps/drew/tap_dance.c
deleted file mode 100644
index fe0598eb..00000000
--- a/keyboards/planck/rev7/keymaps/drew/tap_dance.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "tap_dance.h"
-
-void on_password_tap(tap_dance_state_t* state, void* user_data) {
-    switch (state->count) {
-        case 1:
-            tap_code16(C(A(KC_DEL)));
-            break;
-        case 2:
-            SEND_STRING("240303");
-            break;
-        case 3:
-            tap_code(KC_ENT);
-            break;
-    }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_PASSWORD] = ACTION_TAP_DANCE_FN_ADVANCED(on_password_tap, NULL, NULL),
-    [TD_CAD_LOCK] = ACTION_TAP_DANCE_DOUBLE(CAD, LOCK),
-};
diff --git a/keyboards/planck/rev7/keymaps/drew/tap_dance.h b/keyboards/planck/rev7/keymaps/drew/tap_dance.h
deleted file mode 100644
index d5d06cc7..00000000
--- a/keyboards/planck/rev7/keymaps/drew/tap_dance.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-enum {
-    TD_CAD_LOCK,
-    TD_PASSWORD,
-};
diff --git a/keyboards/planck/rev7/keymaps/drew/tap_dance/tap_dance.c b/keyboards/planck/rev7/keymaps/drew/tap_dance/tap_dance.c
new file mode 100644
index 00000000..8fbd2fe7
--- /dev/null
+++ b/keyboards/planck/rev7/keymaps/drew/tap_dance/tap_dance.c
@@ -0,0 +1,7 @@
+#include "tap_dance.h"
+#include "../common.h"
+#include "../custom_keys/alias.h"
+
+tap_dance_action_t tap_dance_actions[] = {
+    [TD_CAD_LOCK] = ACTION_TAP_DANCE_DOUBLE(CAD, LOCK),
+};
diff --git a/keyboards/planck/rev7/keymaps/drew/tap_dance/tap_dance.h b/keyboards/planck/rev7/keymaps/drew/tap_dance/tap_dance.h
new file mode 100644
index 00000000..192572d5
--- /dev/null
+++ b/keyboards/planck/rev7/keymaps/drew/tap_dance/tap_dance.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "../common.h"
+
+enum {
+    TD_CAD_LOCK,
+};
+
+// tap_dance_action_t tap_dance_actions;
diff --git a/keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.c b/keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.c
index 46c427a1..c4b92bf2 100644
--- a/keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.c
+++ b/keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.c
@@ -41,9 +41,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t* record) {
         case GUI_LAUNCH:
             return 500;
             break;
-        case TD(TD_PASSWORD):
-            return 800;
-            break;
         default:
             return TAPPING_TERM;
             break;
diff --git a/keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.h b/keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.h
index 290c179d..04738e2c 100644
--- a/keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.h
+++ b/keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.h
@@ -1,9 +1,11 @@
 #pragma once
+
 #include QMK_KEYBOARD_H
+#include "../common.h"
 #include "../custom_keys/alias.h"
 #include "../custom_keys/mapping.h"
 #include "../layers.h"
-#include "../tap_dance.h"
+#include "../tap_dance/tap_dance.h"
 
 uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record);
 bool get_permissive_hold(uint16_t keycode, keyrecord_t* record);