diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c
index 8630969..ab849ec 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c
@@ -21,12 +21,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 #define _BASE 0
-#define _LAYER1 1
-#define _LAYER2 2
+#define _NUM_MEDIA_MOUSE 1
+#define _SYM_ARROWS_F 2
 
-#define L1_BSP      LT(1,KC_BACKSPACE)
+
+#define L1_BSP      LT(_NUM_MEDIA_MOUSE, KC_BACKSPACE)
 #define ALT_ESC     MT(MOD_LALT, KC_ESC)
-#define L2_SPACE    LT(2, KC_SPACE)
+#define L2_SP       LT(_SYM_ARROWS_F, KC_SPACE)
 #define CTL_ENT     MT(MOD_RCTL, KC_ENT)
 #define CT_TAB      MT(MOD_LCTL, KC_TAB)
 #define GUI_DEL     MT(MOD_RGUI, KC_DEL)
@@ -78,23 +79,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_A,    KC_S,    KC_D,     SFT_F,   KC_G,                                          KC_H,       SFT_J,   KC_K,    KC_L,    KC_SCLN,
         KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,                                          KC_N,       KC_M,    KC_COMM, KC_DOT,  KC_SLASH,
                           KC_LBRC,  KC_RBRC,                                                            KC_MINS, KC_EQL,
-                                    ALT_ESC, L1_BSP,                                        L2_SPACE,   CTL_ENT,
+                                    ALT_ESC, L1_BSP,                                        L2_SP,      CTL_ENT,
                                                      CT_TAB,  KC_PGUP,  KC_PGDN,  GUI_DEL,
                                                      KC_GRV,  KC_HOME,  KC_END,   KC_NUHS
     ),
 
-    /* Layer 1
+    /* Layer 1 _NUM_MEDIA_MOUSE
      * ,----------------------------------,                             ,----------------------------------,
-     * |QKBOOT|      |  mup |      |      |                             | VOL+ |      |  up  |      | PgUp |
+     * |QKBOOT|      |  mup |      |  >>  |                             | VOL+ |  7   |  8   |  9   |  +   |
      * |------+------+------+------+------|                             |-------------+------+------+------|
-     * |      | mleft| mdown|mright|      |                             | MUTE | left | down |right | PgDn |
+     * |      | mleft| mdown|mright|  >|| |                             | MUTE |  4   |  5   |  6   |  -   |
      * |------+------+------+------+------|                             |------|------+------+------+------|
-     * |      |      |      |      |      |                             | VOL- |  /   |  \   |  ?   |  |   |
+     * |      |      |      |      |  <<  |                             | VOL- |  1   |  2   |  3   |  *   |
      * |------+------+------+-------------,                             ,-------------+------+------+------,
      *        |      |      |                                                         | mbtn |mbtn2 |
      *        '------+------'-------------'                             '-------------'------+------'
      *                      |      |      |                             |      |      |
-     *                      |      |      |                             |      |      |
+     *                      |      |      |                             |      |  0   |
      *                      |      |      |                             |      |      |
      *                      '------+------'                             '------+------'
      *                                    '------+------' '------+------'
@@ -103,25 +104,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                    |      |      | |      |      |
      *                                    '------+------' '------+------'
      */
-    [_LAYER1] = LAYOUT(
-        QK_BOOT, _______, KC_MU,   _______, _______,                                      KC_VOLU, _______, KC_UP,   _______, KC_PGUP,
-        _______, KC_ML,   KC_MD,   KC_MR,   _______,                                      KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-        _______, _______, _______, _______, _______,                                      KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE,
-                 _______, _______,                                                                          KC_MB1,  KC_MB2,
-                                   _______, _______,                                      _______, _______,
+    [_NUM_MEDIA_MOUSE] = LAYOUT(
+        QK_BOOT, _______, KC_MU,   _______, KC_MNXT,                                      KC_VOLU, KC_7,    KC_8,     KC_9,   KC_KP_PLUS,
+        _______, KC_ML,   KC_MD,   KC_MR,   KC_MPLY,                                      KC_MUTE, KC_4,    KC_5,     KC_6,   KC_KP_MINUS,
+        _______, _______, _______, _______, KC_MPRV,                                      KC_VOLD, KC_1,    KC_2,     KC_3,   KC_KP_ASTERISK,
+                 _______, _______,                                                                          KC_MB1,   KC_MB2,
+                                   _______, _______,                                      _______, KC_0   ,
                                                      _______, _______,  _______, _______,
                                                      _______, _______,  _______, _______
     ),
 
-    /* Layer 2
+    /* Layer 2 _SYM_ARROWS_F
      * ,----------------------------------,                             ,----------------------------------,
-     * | F1   | F2   | F3   | F4   | F5   |                             |  F6  | F7   |  F8  |  F9  |  F10 |
-     * |------+------+------+------+------|                             |-------------+------+------+------|
-     * |  1   |  2   |  3   |  4   |  5   |                             |  6   |  7   |  8   |  9   |  0   |
-     * |------+------+------+------+------|                             |------|------+------+------+------|
      * |  !   |  @   |  #   |  $   |  %   |                             |  ^   |  &   |  *   |  (   |  )   |
+     * |------+------+------+------+------|                             |-------------+------+------+------|
+     * |      |      |      |      |      |                             | LEFT | DOWN |  UP  | RGHT |      |
+     * |------+------+------+------+------|                             |------|------+------+------+------|
+     * | F1   | F2   | F3   | F4   | F5   |                             |  F6  | F7   |  F8  |  F9  |  F10 |
      * |------+------+------+-------------,                             ,-------------+------+------+------,
-     *        | F11  | F12  |                                                         |  -   |  =   |
+     *        | F11  | F12  |                                                         |      |      |
      *        '------+------'-------------'                             '-------------'------+------'
      *                      |      |      |                             |      |      |
      *                      |      |      |                             |      |      |
@@ -133,11 +134,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                    |      |      | |      |      |
      *                                    '------+------' '------+------'
      */
-    [_LAYER2] = LAYOUT(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-                 KC_F11,  KC_F12,                                                                           _______, _______,
+    [_SYM_ARROWS_F] = LAYOUT(
+      KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                                  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  
+      _______,  _______,  _______,  _______,  _______,                                  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, _______,
+      KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                                    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,
+                KC_F11,   KC_F12,                                                                           _______, _______,
                                    _______, _______,                                      _______, _______,
                                                      _______, _______,  _______, _______,
                                                      _______, _______,  _______, _______