Merge remote-tracking branch 'origin/master' into develop

6 files changed, 55 insertions, 55 deletions

diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json
index 3e3f8ea8b5..7128937a74 100644
--- a/keyboards/aliceh66/pianoforte/info.json
+++ b/keyboards/aliceh66/pianoforte/info.json
@@ -9,7 +9,7 @@
         "vid": "0x6168"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
 				{"label":"Esc", "x":0, "y":0}, 
 				{"label":"F1", "x":1.25, "y":0}, 
@@ -81,7 +81,7 @@
 				{"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
 				
 				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25, "w":1}, 
+				{"label":"ISO Pipe", "x":1.25, "y":4.25}, 
 				{"label":"Z", "x":2.25, "y":4.25}, 
 				{"label":"X", "x":3.25, "y":4.25}, 
 				{"label":"C", "x":4.25, "y":4.25}, 
@@ -93,25 +93,25 @@
 				{"label":">", "x":10.25, "y":4.25}, 
 				{"label":"?", "x":11.25, "y":4.25}, 
 				{"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-				{"label":"Shift", "x":12.24, "y":4.25, "w":2.75},
+				{"label":"Shift", "x":12.24, "y":4.25, "w":1.75},
 				{"label":"Fn", "x":14, "y":4.25},
 				{"label":"\u2191", "x":16.25, "y":4.25}, 
 				
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
 				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":4, "y":5.25, "w":7},
-				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
-				{"label":"Alt", "x":11, "y":5.25, "w":1.25},
-				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-				{"label": "MO(1)", "x":12.5, "y": 5.25, "w":1.25},
-				{"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
+				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+				{"label":"Alt", "x":10, "y":5.25},
+				{"label":"Alt", "x":11, "y":5.25},
+				{"label":"Win", "x":12, "y":5.25},
+				{"label": "MO(1)", "x":13, "y": 5.25},
+				{"label":"Ctrl", "x":14, "y":5.25}, 
 				{"label":"\u2190", "x":15.25, "y":5.25}, 
 				{"label":"\u2193", "x":16.25, "y":5.25}, 
 				{"label":"\u2192", "x":17.25, "y":5.25}
 			]
         },
-		"LAYOUT_tkl_ansi": {
+		"LAYOUT_tkl_f13_ansi": {
 			"layout": [
 				{"label":"Esc", "x":0, "y":0}, 
 				{"label":"F1", "x":1.25, "y":0}, 
@@ -198,7 +198,7 @@
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
 				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":4, "y":5.25, "w":6.25},
+				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
 				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
 				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
 				{"label":"MO(1)", "x":12.5, "y":5.25, "w":1.25},
@@ -208,7 +208,7 @@
 				{"label":"\u2192", "x":17.25, "y":5.25}
 			]
         },
-		"LAYOUT_tkl_iso": {
+		"LAYOUT_tkl_f13_iso": {
 			"layout": [
 				{"label":"Esc", "x":0, "y":0}, 
 				{"label":"F1", "x":1.25, "y":0}, 
@@ -278,8 +278,8 @@
 				{"label":"ISO #", "x":12.75, "y":3.25}, 
 				{"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, 
 				
-				{"label":"Shift", "x":0, "y":4.25, "w":2.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25, "w":1},
+				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
+				{"label":"ISO Pipe", "x":1.25, "y":4.25},
 				{"label":"Z", "x":2.25, "y":4.25}, 
 				{"label":"X", "x":3.25, "y":4.25}, 
 				{"label":"C", "x":4.25, "y":4.25}, 
@@ -296,7 +296,7 @@
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
 				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":4, "y":5.25, "w":6.25},
+				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
 				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
 				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
 				{"label":"MO(1)", "x":12.5, "y":5.25, "w":1.25},
@@ -391,11 +391,11 @@
 				{"label":"\u2191", "x":16.25, "y":4.25}, 
 				
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-				{"label":"Win", "x":1.5, "y":5.25, "w":1},
+				{"label":"Win", "x":1.5, "y":5.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
 				{"label":"Space", "x":4, "y":5.25, "w":7},
 				{"label":"Alt", "x":11, "y":5.25, "w":1.5},
-				{"label":"Win", "x":12.5, "y":5.25, "w":1},
+				{"label":"Win", "x":12.5, "y":5.25},
 				{"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, 
 				{"label":"\u2190", "x":15.25, "y":5.25}, 
 				{"label":"\u2193", "x":16.25, "y":5.25}, 
@@ -472,8 +472,8 @@
 				{"label":"ISO #", "x":12.75, "y":3.25}, 
 				{"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, 
 				
-				{"label":"Shift", "x":0, "y":4.25, "w":2.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25, "w":1},
+				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
+				{"label":"ISO Pipe", "x":1.25, "y":4.25},
 				{"label":"Z", "x":2.25, "y":4.25}, 
 				{"label":"X", "x":3.25, "y":4.25}, 
 				{"label":"C", "x":4.25, "y":4.25}, 
@@ -488,11 +488,11 @@
 				{"label":"\u2191", "x":16.25, "y":4.25}, 
 				
 				{"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-				{"label":"Win", "x":1.5, "y":5.25, "w":1},
+				{"label":"Win", "x":1.5, "y":5.25},
 				{"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
 				{"label":"Space", "x":4, "y":5.25, "w":7},
 				{"label":"Alt", "x":11, "y":5.25, "w":1.5},
-				{"label":"Win", "x":12.5, "y":5.25, "w":1},
+				{"label":"Win", "x":12.5, "y":5.25},
 				{"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, 
 				{"label":"\u2190", "x":15.25, "y":5.25}, 
 				{"label":"\u2193", "x":16.25, "y":5.25}, 
diff --git a/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
index 00acfe82c9..a63648bcf7 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/default/keymap.c
@@ -21,13 +21,13 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_LAYER0] = LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,       KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  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_INS,  KC_HOME, KC_PGUP,
-    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_DEL,  KC_END,  KC_PGDN,
-    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_NUHS,    KC_ENT,       MO(1),
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_RSFT,      MO(1),   KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  KC_RGUI,    MO(1),      KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+  [_LAYER0] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  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_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+    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_DEL,  KC_END,  KC_PGDN,
+    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_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                   KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RALT, KC_RGUI, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
 )
 
 };
diff --git a/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
index c8c4e8498e..72892846f9 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/iso/keymap.c
@@ -21,13 +21,13 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_LAYER0] = LAYOUT_tkl_iso(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,       KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  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_INS,  KC_HOME, KC_PGUP,
-    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_DEL,  KC_END,  KC_PGDN,
-    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_NUHS,    KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,                          KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  KC_RGUI,    MO(1),      KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
+  [_LAYER0] = LAYOUT_tkl_f13_iso(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  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_INS,  KC_HOME, KC_PGUP,
+    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_DEL,  KC_END,  KC_PGDN,
+    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_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
 )
 
 };
diff --git a/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c b/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
index aa0f8a5e0d..234b1baf76 100644
--- a/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
+++ b/keyboards/aliceh66/pianoforte/keymaps/via/keymap.c
@@ -23,21 +23,21 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_LAYER0] = LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_F13,       KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  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_INS,  KC_HOME, KC_PGUP,
-    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_DEL,  KC_END,  KC_PGDN,
-    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_NUHS,    KC_ENT,       MO(1),
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_RSFT,      MO(1),   KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  KC_RGUI,    MO(1),      KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+  [_LAYER0] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,           KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  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_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+    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_DEL,  KC_END,  KC_PGDN,
+    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_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                   KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RALT, KC_RGUI, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [_LAYER1] = LAYOUT(
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,                            KC_TRNS,                                                    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+  [_LAYER1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
   )
 };
diff --git a/keyboards/aliceh66/pianoforte/pianoforte.h b/keyboards/aliceh66/pianoforte/pianoforte.h
index 02749b7eb3..614af44cfe 100644
--- a/keyboards/aliceh66/pianoforte/pianoforte.h
+++ b/keyboards/aliceh66/pianoforte/pianoforte.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ____ KC_NO
 
-#define LAYOUT( \
+#define LAYOUT_all( \
 	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }
 
-#define LAYOUT_tkl_ansi( \
+#define LAYOUT_tkl_f13_ansi( \
 	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \
@@ -64,7 +64,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }	
 
-#define LAYOUT_tkl_iso( \
+#define LAYOUT_tkl_f13_iso( \
 	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046,       K047, K057, K048, \
@@ -104,7 +104,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
 	{ K080, K081, K082, K083, K084, K085, ____, ____, ____ }, \
 	{ ____, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, K105, K106, K107, K108 }, \
+	{ K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
 	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }
 
@@ -126,6 +126,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
 	{ K080, K081, K082, K083, K084, K085, ____, ____, ____ }, \
 	{ K090, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, K105, K106, K107, K108 }, \
+	{ K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
 	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
 }
diff --git a/keyboards/aliceh66/pianoforte/rules.mk b/keyboards/aliceh66/pianoforte/rules.mk
index 4fecee4ef8..c7f0b93fef 100644
--- a/keyboards/aliceh66/pianoforte/rules.mk
+++ b/keyboards/aliceh66/pianoforte/rules.mk
@@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
-LAYOUTS = tkl_ansi tkl_iso
\ No newline at end of file
+LAYOUTS = tkl_f13_ansi tkl_f13_iso
\ No newline at end of file