diff --git a/keyboards/tr60w/tr60w.h b/keyboards/tr60w/tr60w.h
index f1be5193e95..10963e5dddd 100644
--- a/keyboards/tr60w/tr60w.h
+++ b/keyboards/tr60w/tr60w.h
@@ -2,19 +2,19 @@
 
 #include "quantum.h"
 
-#define KEYMAP( \
-        K113, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K000, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       \
-	K400, K401, K402,             K505,                         K510, K511, K512  \
+#define LAYOUT_60_tsangan_hhkb( \
+    K113, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K000, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K213, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K212, \
+    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
+    K400, K401, K402,                      K505,                      K510, K511, K512  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  KC_NO }  \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013  }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113  }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213  }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO }, \
+    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  KC_NO }  \
 }
 
 #endif