diff --git a/doc/leader.md b/doc/leader.md
index 70d2adb..cecc602 100644
--- a/doc/leader.md
+++ b/doc/leader.md
@@ -8,27 +8,11 @@
 | P A      | Proxy Ashe              | Proxytag for Ashe                          |
 | P S      | Proxy Sephie            | Proxytag for Sephie                        |
 | P M      | Proxy Mai               | Proxytag for Mai                           |
-| C D      | Combo Disable           | Disables keyboard combos                   |
-| C E      | Combo Enable            | Enables keyboard combos                    |
-| A T      | Autoshift Toggle        |                                            |
-| A E      | Autoshift Enable        |                                            |
-| A D      | Autoshift Disable       |                                            |
 | G I E    | Go If Err               | Inserts an `if err != nil` sequence        |
 | G B      | Go Build                | `go build`                                 |
 | G B A    | Go Build All            | `go build ./...`                           |
 | G T      | Go Test                 | `go test`                                  |
 | G T A    | Go Test All             | `go test ./...`                            |
-| D L F    | Dwm Layout Float        | triggers floating mode in dwm              |
-| D L T    | Dwm Layout Tile         | triggers tiling mode in dwm                |
-| D L M    | Dwm Layout Monocle      | triggers monocle mode in dwm               |
-| D L B    | Dwm Layout Bstack       | triggers bottom-stack mode in dwm          |
-| D L O    | Dwm Layout Otherbstack  | triggers the other bstack mode in dwm      |
-| D S E    | Dwm Spawn Emacs         | opens a new emacs frame                    |
-| D S T    | Dwm Spawn Terminal      | opens a new terminal window                |
-| D S      | Dwm Spawn               | opens a new program by name                |
-| D C      | Dwm Close               | closes the active window                   |
-| D ENTER  | Dwm Entersnap           | makes the current window the primary focus |
-| D Q L    | Dwm Quit Logout         | kills dwm and returns to the login screen  |
 | N B      | Nix Build               | `nix-build`                                |
 | N B D    | Nix Build Docker        | `nix-build docker.nix`                     |
 | N O R    | Nix Os Rebuild          | `sudo nixos-rebuild switch`                |
diff --git a/moonlander/keymap.c b/moonlander/keymap.c
index 22ad390..577bb8d 100644
--- a/moonlander/keymap.c
+++ b/moonlander/keymap.c
@@ -101,11 +101,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [3] = LAYOUT_moonlander(
     KC_ESCAPE,      KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          DYN_REC_STOP,                                   DYN_REC_STOP,   KC_F6,          KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,
     KC_TRANSPARENT, KC_EXLM,        KC_AT,          KC_LCBR,        KC_RCBR,        KC_PIPE,        DYN_REC_START1,                                 DYN_REC_START2, KC_SCROLLLOCK,  KC_7,           KC_8,           KC_9,           KC_ASTR,        KC_F12,
-    KC_TRANSPARENT, KC_HASH,        KC_DLR,         KC_LPRN,        KC_RPRN,        KC_GRAVE,       DYN_MACRO_PLAY1,                                DYN_MACRO_PLAY2,KC_NUMLOCK,     KC_4,           KC_5,           KC_6,           KC_KP_PLUS,     KC_MINUS,
-    KC_PGUP,        KC_PERC,        KC_CIRC,        KC_LBRACKET,    KC_RBRACKET,    KC_TILD,                                                                        KC_AMPR,        KC_1,           KC_2,           KC_3,           KC_BSLASH,      KC_HOME,
-    KC_PGDOWN,      KC_COMMA,       KC_LCTRL,       KC_LALT,        KC_TRANSPARENT, KC_TRANSPARENT,                                                                 RGB_TOG,        KC_RGUI,        KC_DOT,         KC_0,           KC_EQUAL,       KC_END,
-    RGB_VAD,        RGB_VAI,        HSV_172_255_255,
-    PRINT_WPM,      RGB_HUD,        RGB_HUI
+    KC_PGUP,        KC_HASH,        KC_DLR,         KC_LPRN,        KC_RPRN,        KC_GRAVE,       DYN_MACRO_PLAY1,                                DYN_MACRO_PLAY2,KC_NUMLOCK,     KC_4,           KC_5,           KC_6,           KC_KP_PLUS,     KC_MINUS,
+    KC_PGDOWN,      KC_PERC,        KC_CIRC,        KC_LBRACKET,    KC_RBRACKET,    KC_TILD,                                                                        KC_AMPR,        KC_1,           KC_2,           KC_3,           KC_BSLASH,      KC_TRANSPARENT,
+    KC_TRANSPARENT, KC_COMMA,       KC_LCTRL,       KC_LALT,        KC_TRANSPARENT, KC_TRANSPARENT,                                                                 RGB_TOG,        KC_RGUI,        KC_DOT,         KC_0,           KC_EQUAL,       KC_TRANSPARENT,
+    RGB_VAD,        RGB_VAI,        KC_HOME,
+    KC_END,         RGB_HUD,        RGB_HUI
   ),
   [4] = LAYOUT_moonlander(
     AU_TOG,         TO(6),          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,