diff --git a/keyboards/lily58/keymaps/tudattr/keymap.c b/keyboards/lily58/keymaps/tudattr/keymap.c
index 5bf491330e..6c2c39e54c 100644
--- a/keyboards/lily58/keymaps/tudattr/keymap.c
+++ b/keyboards/lily58/keymaps/tudattr/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
      * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
      * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | LGUI | LALT | FUNC | /Space  /       \Enter \  | FUNC |BackSP| RALT |
+     *                   | LGUI | LALT | LWR  | /Space  /       \Enter \  | RALT |BackSP| RSE  |
      *                   |      |      |      |/       /         \      \ |      |      |      |
      *                   `----------------------------'           '------''--------------------'
      */
@@ -61,34 +61,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                    KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_BSLS,   \
             KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                    KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT,   \
             KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC, KC_N,    KC_M,     KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  \
-            KC_LGUI, KC_LALT, MO(_LWR), KC_SPC                       ,           KC_ENT, MO(_RSE), KC_BSPC, KC_RALT \
+            KC_LGUI, KC_LALT, MO(_LWR), KC_SPC                       ,           KC_ENT, KC_RALT, KC_BSPC, MO(_RSE) \
             ),
     /* LOWER
      * ,-----------------------------------------.                    ,-----------------------------------------.
-     * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F12  |
+     * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
      * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |                    |  F19 |  F20 |  F21 | F22  | F23  | F24  |
+     * | F11  |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F12  |
      * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      | BRID | BRIU |      |      |      |-------.    ,-------| LEFT | DOWN |  UP  | RIGHT|      |      |
-     * |------+------+------+------+------+------| MPLAY |    | MSTP  |------+------+------+------+------+------|
+     * |      | HOME | END  |  [   |   ]  |      |-------.    ,-------| LEFT | DOWN |  UP  | RIGHT|      |      |
+     * |------+------+------+------+------+------| MUTE  |    | PLAY  |------+------+------+------+------+------|
      * |      |      |      |      |      |      |-------|    |-------|  =   |  -   |      |      |      |      |
      * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | PRNT |      |      | /VOLDWN /       \VOLUP \  | MUTE | DEL  |      |
+     *                   |      |      |      | /VOLDWN /       \VOLUP \  | PRNT | DEL  |      |
      *                   |      |      |      |/       /         \      \ |      |      |      |
      *                   `----------------------------'           '------''--------------------'
      */
     [_LWR] = LAYOUT( \
-            KC_F11  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5 ,                   KC_F6  , KC_F7  , KC_F8    , KC_F9 , KC_F10  , KC_F12, \
-            KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_F17 , KC_F18 ,                   KC_F19 , KC_F20   , KC_F21, KC_F22  , KC_F23 , KC_F24, \
-            _______, KC_BRID, KC_BRIU, _______, _______, _______,                   KC_LEFT, KC_DOWN  , KC_UP , KC_RIGHT, _______, _______,\
-            _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_EQL , KC_MINS  ,_______,_______  , _______, _______,\
-            KC_PSCR, _______, _______, KC_VOLD                           ,          KC_VOLU, KC_MUTE  , KC_DEL,  _______ \
+            _______, _______, _______, _______, _______, _______,                   _______, _______  , _______, _______, _______, _______,\
+            KC_F11 ,  KC_F1 , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                   KC_F6  , KC_F7    , KC_F8  , KC_F9  , KC_F10 , KC_F12 ,\
+            _______, KC_HOME, KC_END , KC_LBRC, KC_RBRC,_______ ,                   KC_LEFT, KC_DOWN  , KC_UP , KC_RIGHT, _______, _______, \
+            _______, _______, _______, _______, _______, _______, KC_MUTE, KC_MPLY, KC_EQL , KC_MINS  ,_______,_______  , _______, _______,\
+            _______, _______, _______, KC_VOLD                           ,          KC_VOLU, KC_PSCR  , KC_DEL,  _______ \
             ),
     /* RISE
      * ,-----------------------------------------.                    ,-----------------------------------------.
-     * |      |      | NUM  |      |      |      |                    |      |      |      |      |      |      |
+     * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
      * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      |      |  7   |  8   |  9   |      |                    | SCRL | PAUS |INSERT|      |      |      |
+     * |      | NUM  |  7   |  8   |  9   |      |                    | SCRL | PAUS |INSERT|      |      |      |
      * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
      * |      |      |  4   |  5   |  6   |  +   |-------.    ,-------| LEFT | DOWN |  UP  | RIGHT|      |      |
      * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
@@ -99,8 +99,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                   `----------------------------'           '------''--------------------'
      */
     [_RSE] = LAYOUT( \
-            _______, _______ , KC_NUM ,_______,_______ ,_______ ,                   _______,_______ ,_______   ,_______,_______  ,_______, \
-            _______, _______, KC_P7  , KC_P8  , KC_P9  ,_______ ,                   KC_SCRL, KC_PAUS, KC_INS   , _______, _______,_______, \
+            _______, _______ ,_______ ,_______,_______ ,_______ ,                   _______,_______ ,_______   ,_______,_______  ,_______, \
+            _______, KC_NUM , KC_P7  , KC_P8  , KC_P9  ,_______ ,                   KC_SCRL, KC_PAUS, KC_INS   , _______, _______,_______, \
             _______, _______, KC_P4  , KC_P5  , KC_P6  , KC_PPLS,                   KC_LEFT, KC_DOWN  , KC_UP , KC_RIGHT, _______, _______,\
             _______, _______, KC_P1  , KC_P2  , KC_P3  , KC_PENT, _______, _______, _______, _______  ,_______,_______  , _______, _______,\
             _______, _______, _______, KC_P0,                                                         _______, _______  , _______, _______ \