diff --git a/keyboards/ymdk/ymd60/keymaps/via/keymap.c b/keyboards/ymdk/ymd60/keymaps/via/keymap.c
index 4dec77a2224..95c1c7f100b 100644
--- a/keyboards/ymdk/ymd60/keymaps/via/keymap.c
+++ b/keyboards/ymdk/ymd60/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*  Row:    0        1        2        3        4        5        6        7        8        9         10       11        12       13       14     */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_60_tsangan_hhkb(
                 KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
                 KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
                 KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT,           KC_ENT,           
@@ -41,10 +41,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             ),
 
     /*  Row:    0        1        2        3        4        5        6        7        8        9         10       11        12       13       14     */
-    [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,           _______,           
+    [_FN1] = LAYOUT_60_tsangan_hhkb(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,   _______, QK_BOOT,
+                _______, _______, RGB_TOG, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,
+                _______, _______, _______, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______,  _______, _______,           _______,           
                 _______,          _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,           _______, _______,            
                 _______, _______, _______,                                     _______,                    _______,          _______,  _______
             ),