Move remaining `LAYOUT`s to data driven (#20422)

7 files changed, 589 insertions, 743 deletions

diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index 968965e51c..9a50c83ad7 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -33,244 +33,192 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label":"Tab",
-                    "x":0,
-                    "y":0
-                },
-                {
-                    "label":"Q",
-                    "x":1,
-                    "y":0
-                },
-                {
-                    "label":"W",
-                    "x":2,
-                    "y":0
-                },
-                {
-                    "label":"E",
-                    "x":3,
-                    "y":0
-                },
-                {
-                    "label":"R",
-                    "x":4,
-                    "y":0
-                },
-                {
-                    "label":"T",
-                    "x":5,
-                    "y":0
-                },
-                {
-                    "label":"Y",
-                    "x":8,
-                    "y":0
-                },
-                {
-                    "label":"U",
-                    "x":9,
-                    "y":0
-                },
-                {
-                    "label":"I",
-                    "x":10,
-                    "y":0
-                },
-                {
-                    "label":"O",
-                    "x":11,
-                    "y":0
-                },
-                {
-                    "label":"P",
-                    "x":12,
-                    "y":0
-                },
-                {
-                    "label":"Back Space",
-                    "x":13,
-                    "y":0
-                },
-                {
-                    "label":"Esc",
-                    "x":0,
-                    "y":1
-                },
-                {
-                    "label":"A",
-                    "x":1,
-                    "y":1
-                },
-                {
-                    "label":"S",
-                    "x":2,
-                    "y":1
-                },
-                {
-                    "label":"D",
-                    "x":3,
-                    "y":1
-                },
-                {
-                    "label":"F",
-                    "x":4,
-                    "y":1
-                },
-                {
-                    "label":"G",
-                    "x":5,
-                    "y":1
-                },
-                {
-                    "label":"H",
-                    "x":8,
-                    "y":1
-                },
-                {
-                    "label":"J",
-                    "x":9,
-                    "y":1
-                },
-                {
-                    "label":"K",
-                    "x":10,
-                    "y":1
-                },
-                {
-                    "label":"L",
-                    "x":11,
-                    "y":1
-                },
-                {
-                    "label":";",
-                    "x":12,
-                    "y":1
-                },
-                {
-                    "label":"'",
-                    "x":13,
-                    "y":1
-                },
-                {
-                    "label":"Shift",
-                    "x":0,
-                    "y":2
-                },
-                {
-                    "label":"Z",
-                    "x":1,
-                    "y":2
-                },
-                {
-                    "label":"X",
-                    "x":2,
-                    "y":2
-                },
-                {
-                    "label":"C",
-                    "x":3,
-                    "y":2
-                },
-                {
-                    "label":"V",
-                    "x":4,
-                    "y":2
-                },
-                {
-                    "label":"B",
-                    "x":5,
-                    "y":2
-                },
-                {
-                    "label":"N",
-                    "x":8,
-                    "y":2
-                },
-                {
-                    "label":"M",
-                    "x":9,
-                    "y":2
-                },
-                {
-                    "label":",",
-                    "x":10,
-                    "y":2
-                },
-                {
-                    "label":".",
-                    "x":11,
-                    "y":2
-                },
-                {
-                    "label":"/",
-                    "x":12,
-                    "y":2
-                },
-                {
-                    "label":"Enter",
-                    "x":13,
-                    "y":2
-                },
-                {
-                    "label":"Adjust",
-                    "x":1,
-                    "y":3
-                },
-                {
-                    "label":"Ctrl",
-                    "x":2,
-                    "y":3
-                },
-                {
-                    "label":"Alt",
-                    "x":3,
-                    "y":3
-                },
-                {
-                    "label":"GUI",
-                    "x":4,
-                    "y":3
-                },
-                {
-                    "label":"⇓",
-                    "x":5,
-                    "y":3
-                },
-                {
-                    "x":6,
-                    "y":3
-                },
-                {
-                    "x":7,
-                    "y":3
-                },
-                {
-                    "label":"⇑",
-                    "x":8,
-                    "y":3
-                },
-                {
-                    "label":"←",
-                    "x":9,
-                    "y":3
-                },
-                {
-                    "label":"↓",
-                    "x":10,
-                    "y":3
-                },
-                {
-                    "label":"↑",
-                    "x":11,
-                    "y":3
-                },
-                {
-                    "label":"→",
-                    "x":12,
-                    "y":3
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [3, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
+            ]
+        },
+        "LAYOUT_with_nafuda": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [4, 1], "x": 12, "y": 0},
+                {"matrix": [1, 0], "x": 13, "y": 0},
+                {"matrix": [1, 1], "x": 14, "y": 0},
+                {"matrix": [1, 2], "x": 15, "y": 0},
+                {"matrix": [1, 3], "x": 16, "y": 0},
+                {"matrix": [1, 4], "x": 17, "y": 0},
+                {"matrix": [1, 5], "x": 18, "y": 0},
+                {"matrix": [1, 6], "x": 19, "y": 0},
+                {"matrix": [1, 7], "x": 20, "y": 0},
+                {"matrix": [1, 8], "x": 21, "y": 0},
+                {"matrix": [1, 9], "x": 22, "y": 0},
+                {"matrix": [1, 10], "x": 23, "y": 0},
+                {"matrix": [1, 11], "x": 24, "y": 0},
+                {"matrix": [5, 0], "x": 25, "y": 0},
+                {"matrix": [5, 1], "x": 26, "y": 0},
+                {"matrix": [5, 2], "x": 27, "y": 0},
+                {"matrix": [2, 0], "x": 28, "y": 0},
+                {"matrix": [2, 1], "x": 29, "y": 0},
+                {"matrix": [2, 2], "x": 30, "y": 0},
+                {"matrix": [2, 3], "x": 31, "y": 0},
+                {"matrix": [2, 4], "x": 32, "y": 0},
+                {"matrix": [2, 5], "x": 33, "y": 0},
+                {"matrix": [2, 6], "x": 34, "y": 0},
+                {"matrix": [2, 7], "x": 35, "y": 0},
+                {"matrix": [2, 8], "x": 36, "y": 0},
+                {"matrix": [2, 9], "x": 37, "y": 0},
+                {"matrix": [2, 10], "x": 38, "y": 0},
+                {"matrix": [2, 11], "x": 39, "y": 0},
+                {"matrix": [6, 0], "x": 40, "y": 0},
+                {"matrix": [6, 1], "x": 41, "y": 0},
+                {"matrix": [6, 2], "x": 42, "y": 0},
+                {"matrix": [3, 0], "x": 43, "y": 0},
+                {"matrix": [3, 1], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0}
+            ]
+        },
+        "LAYOUT_with_setta21": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [4, 1], "x": 13, "y": 0},
+                {"matrix": [4, 2], "x": 14, "y": 0},
+                {"matrix": [4, 3], "x": 15, "y": 0},
+                {"matrix": [4, 4], "x": 16, "y": 0},
+                {"matrix": [4, 5], "x": 17, "y": 0},
+                {"matrix": [1, 0], "x": 18, "y": 0},
+                {"matrix": [1, 1], "x": 19, "y": 0},
+                {"matrix": [1, 2], "x": 20, "y": 0},
+                {"matrix": [1, 3], "x": 21, "y": 0},
+                {"matrix": [1, 4], "x": 22, "y": 0},
+                {"matrix": [1, 5], "x": 23, "y": 0},
+                {"matrix": [1, 6], "x": 24, "y": 0},
+                {"matrix": [1, 7], "x": 25, "y": 0},
+                {"matrix": [1, 8], "x": 26, "y": 0},
+                {"matrix": [1, 9], "x": 27, "y": 0},
+                {"matrix": [1, 10], "x": 28, "y": 0},
+                {"matrix": [1, 11], "x": 29, "y": 0},
+                {"matrix": [5, 1], "x": 30, "y": 0},
+                {"matrix": [5, 2], "x": 31, "y": 0},
+                {"matrix": [5, 3], "x": 32, "y": 0},
+                {"matrix": [5, 4], "x": 33, "y": 0},
+                {"matrix": [5, 5], "x": 34, "y": 0},
+                {"matrix": [2, 0], "x": 35, "y": 0},
+                {"matrix": [2, 1], "x": 36, "y": 0},
+                {"matrix": [2, 2], "x": 37, "y": 0},
+                {"matrix": [2, 3], "x": 38, "y": 0},
+                {"matrix": [2, 4], "x": 39, "y": 0},
+                {"matrix": [2, 5], "x": 40, "y": 0},
+                {"matrix": [2, 6], "x": 41, "y": 0},
+                {"matrix": [2, 7], "x": 42, "y": 0},
+                {"matrix": [2, 8], "x": 43, "y": 0},
+                {"matrix": [2, 9], "x": 44, "y": 0},
+                {"matrix": [2, 10], "x": 45, "y": 0},
+                {"matrix": [2, 11], "x": 46, "y": 0},
+                {"matrix": [6, 0], "x": 47, "y": 0},
+                {"matrix": [6, 1], "x": 48, "y": 0},
+                {"matrix": [6, 2], "x": 49, "y": 0},
+                {"matrix": [6, 3], "x": 50, "y": 0},
+                {"matrix": [6, 4], "x": 51, "y": 0},
+                {"matrix": [6, 5], "x": 52, "y": 0},
+                {"matrix": [3, 0], "x": 53, "y": 0},
+                {"matrix": [3, 1], "x": 54, "y": 0},
+                {"matrix": [3, 2], "x": 55, "y": 0},
+                {"matrix": [3, 3], "x": 56, "y": 0},
+                {"matrix": [3, 4], "x": 57, "y": 0},
+                {"matrix": [3, 5], "x": 58, "y": 0},
+                {"matrix": [3, 6], "x": 59, "y": 0},
+                {"matrix": [3, 7], "x": 60, "y": 0},
+                {"matrix": [3, 8], "x": 61, "y": 0},
+                {"matrix": [3, 9], "x": 62, "y": 0},
+                {"matrix": [3, 10], "x": 63, "y": 0},
+                {"matrix": [3, 11], "x": 64, "y": 0},
+                {"matrix": [7, 0], "x": 65, "y": 0},
+                {"matrix": [7, 2], "x": 66, "y": 0},
+                {"matrix": [7, 4], "x": 67, "y": 0},
+                {"matrix": [7, 5], "x": 68, "y": 0}
             ]
         }
     }
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
index 5c9d8035c0..d4da157a56 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/rev1.c
+++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "rev1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
     led_config_t g_led_config = { {
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.h b/keyboards/salicylic_acid3/naked48/rev1/rev1.h
deleted file mode 100644
index d43e9f4fb3..0000000000
--- a/keyboards/salicylic_acid3/naked48/rev1/rev1.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-#ifdef RGBLIGHT_ENABLE
-//rgb led driver
-#include "ws2812.h"
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Naked48.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------           ------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 |           | L06 | L07 | L08 | L09 | L0A | L0B |
- * |------------------------------------           ------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 |           | L16 | L17 | L18 | L19 | L1A | L1B |
- * |------------------------------------           ------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 |           | L26 | L17 | L28 | L29 | L2A | L2B |
- * |-----------------------------------------------------------------------------------+
- *       | L30 | L32 | L33 | L34 | L35 | L36 | L37 | L38 | L39 | L3A | L3B | L3D |
- *       |-----------------------------------------------------------------------'
- */
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, \
-    L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, \
-    L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, \
-    L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B  \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05,  L06,  L07,  L08,  L09,  L0A,  L0B  },  \
-    {  L10,  L11,  L12,  L13,  L14,  L15,  L16,  L17,  L18,  L19,  L1A,  L1B  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25,  L26,  L27,  L28,  L29,  L2A,  L2B  },  \
-    {  L30,  L31,  L32,  L33,  L34,  L35,  L36,  L37,  L38,  L39,  L3A,  L3B  },  \
-    {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,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,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  }   \
-  }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Setta21 to Naked48.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_setta21( \
-    L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B,    R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B,         R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B,    R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B,    R30,      R32,      R34, R35  \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05,  L06,  L07,  L08,  L09,  L0A,  L0B  },  \
-    {  L10,  L11,  L12,  L13,  L14,  L15,  L16,  L17,  L18,  L19,  L1A,  L1B  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25,  L26,  L27,  L28,  L29,  L2A,  L2B  },  \
-    {  L30,  L31,  L32,  L33,  L34,  L35,  L36,  L37,  L38,  L39,  L3A,  L3B  },  \
-    {  R00,  R01,  R02,  R03,  R04,  R05,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {KC_NO,  R11,  R12,  R13,  R14,  R15,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {  R20,  R21,  R22,  R23,  R24,  R25,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {  R30,KC_NO,  R32,KC_NO,  R34,  R35,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  }   \
-  }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Nafuda to Naked48.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_nafuda( \
-    L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B,         R01,      \
-    L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B,    R10, R11, R12, \
-    L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B,    R20, R21, R22, \
-    L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B  \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05,  L06,  L07,  L08,  L09,  L0A,  L0B  },  \
-    {  L10,  L11,  L12,  L13,  L14,  L15,  L16,  L17,  L18,  L19,  L1A,  L1B  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25,  L26,  L27,  L28,  L29,  L2A,  L2B  },  \
-    {  L30,  L31,  L32,  L33,  L34,  L35,  L36,  L37,  L38,  L39,  L3A,  L3B  },  \
-    {KC_NO,  R01,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {  R10,  R11,  R12,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {  R20,  R21,  R22,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,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  }   \
-  }
-
diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json
index 92da4070a5..8021bf747f 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/info.json
@@ -27,66 +27,230 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":8, "y":0},
-                {"label":"7", "x":9, "y":0},
-                {"label":"8", "x":10, "y":0},
-                {"label":"9", "x":11, "y":0},
-                {"label":"0", "x":12, "y":0},
-                {"label":"Back Space", "x":13, "y":0},
-                {"label":"Tab", "x":0, "y":1},
-                {"label":"Q", "x":1, "y":1},
-                {"label":"W", "x":2, "y":1},
-                {"label":"E", "x":3, "y":1},
-                {"label":"R", "x":4, "y":1},
-                {"label":"T", "x":5, "y":1},
-                {"label":"Y", "x":8, "y":1},
-                {"label":"U", "x":9, "y":1},
-                {"label":"I", "x":10, "y":1},
-                {"label":"O", "x":11, "y":1},
-                {"label":"P", "x":12, "y":1},
-                {"label":"\\", "x":13, "y":1},
-                {"label":"Esc", "x":0, "y":2},
-                {"label":"A", "x":1, "y":2},
-                {"label":"S", "x":2, "y":2},
-                {"label":"D", "x":3, "y":2},
-                {"label":"F", "x":4, "y":2},
-                {"label":"G", "x":5, "y":2},
-                {"label":"H", "x":8, "y":2},
-                {"label":"J", "x":9, "y":2},
-                {"label":"K", "x":10, "y":2},
-                {"label":"L", "x":11, "y":2},
-                {"label":";", "x":12, "y":2},
-                {"label":"'", "x":13, "y":2},
-                {"label":"Shift", "x":0, "y":3},
-                {"label":"Z", "x":1, "y":3},
-                {"label":"X", "x":2, "y":3},
-                {"label":"C", "x":3, "y":3},
-                {"label":"V", "x":4, "y":3},
-                {"label":"B", "x":5, "y":3},
-                {"label":"N", "x":8, "y":3},
-                {"label":"M", "x":9, "y":3},
-                {"label":",", "x":10, "y":3},
-                {"label":".", "x":11, "y":3},
-                {"label":"/", "x":12, "y":3},
-                {"label":"Enter", "x":13, "y":3},
-                {"label":"Adjust", "x":1, "y":4},
-                {"label":"Ctrl", "x":2, "y":4},
-                {"label":"Alt", "x":3, "y":4},
-                {"label":"GUI", "x":4, "y":4},
-                {"label":"&dArr;", "x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"label":"&uArr;", "x":8, "y":4},
-                {"label":"&larr;", "x":9, "y":4},
-                {"label":"&darr;", "x":10, "y":4},
-                {"label":"&uarr;", "x":11, "y":4},
-                {"label":"&rarr;", "x":12, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [4, 1], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 7], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_with_nafuda": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [1, 0], "x": 13, "y": 0},
+                {"matrix": [1, 1], "x": 14, "y": 0},
+                {"matrix": [1, 2], "x": 15, "y": 0},
+                {"matrix": [1, 3], "x": 16, "y": 0},
+                {"matrix": [1, 4], "x": 17, "y": 0},
+                {"matrix": [1, 5], "x": 18, "y": 0},
+                {"matrix": [1, 6], "x": 19, "y": 0},
+                {"matrix": [1, 7], "x": 20, "y": 0},
+                {"matrix": [1, 8], "x": 21, "y": 0},
+                {"matrix": [1, 9], "x": 22, "y": 0},
+                {"matrix": [1, 10], "x": 23, "y": 0},
+                {"matrix": [1, 11], "x": 24, "y": 0},
+                {"matrix": [6, 0], "x": 25, "y": 0},
+                {"matrix": [6, 1], "x": 26, "y": 0},
+                {"matrix": [6, 2], "x": 27, "y": 0},
+                {"matrix": [2, 0], "x": 28, "y": 0},
+                {"matrix": [2, 1], "x": 29, "y": 0},
+                {"matrix": [2, 2], "x": 30, "y": 0},
+                {"matrix": [2, 3], "x": 31, "y": 0},
+                {"matrix": [2, 4], "x": 32, "y": 0},
+                {"matrix": [2, 5], "x": 33, "y": 0},
+                {"matrix": [2, 6], "x": 34, "y": 0},
+                {"matrix": [2, 7], "x": 35, "y": 0},
+                {"matrix": [2, 8], "x": 36, "y": 0},
+                {"matrix": [2, 9], "x": 37, "y": 0},
+                {"matrix": [2, 10], "x": 38, "y": 0},
+                {"matrix": [2, 11], "x": 39, "y": 0},
+                {"matrix": [7, 0], "x": 40, "y": 0},
+                {"matrix": [7, 1], "x": 41, "y": 0},
+                {"matrix": [7, 2], "x": 42, "y": 0},
+                {"matrix": [3, 0], "x": 43, "y": 0},
+                {"matrix": [3, 1], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0},
+                {"matrix": [4, 0], "x": 55, "y": 0},
+                {"matrix": [4, 1], "x": 56, "y": 0},
+                {"matrix": [4, 2], "x": 57, "y": 0},
+                {"matrix": [4, 3], "x": 58, "y": 0},
+                {"matrix": [4, 4], "x": 59, "y": 0},
+                {"matrix": [4, 5], "x": 60, "y": 0},
+                {"matrix": [4, 6], "x": 61, "y": 0},
+                {"matrix": [4, 7], "x": 62, "y": 0},
+                {"matrix": [4, 8], "x": 63, "y": 0},
+                {"matrix": [4, 9], "x": 64, "y": 0},
+                {"matrix": [4, 10], "x": 65, "y": 0},
+                {"matrix": [4, 11], "x": 66, "y": 0}
+            ]
+        },
+        "LAYOUT_with_setta21": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [5, 0], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 3], "x": 15, "y": 0},
+                {"matrix": [5, 4], "x": 16, "y": 0},
+                {"matrix": [5, 5], "x": 17, "y": 0},
+                {"matrix": [1, 0], "x": 18, "y": 0},
+                {"matrix": [1, 1], "x": 19, "y": 0},
+                {"matrix": [1, 2], "x": 20, "y": 0},
+                {"matrix": [1, 3], "x": 21, "y": 0},
+                {"matrix": [1, 4], "x": 22, "y": 0},
+                {"matrix": [1, 5], "x": 23, "y": 0},
+                {"matrix": [1, 6], "x": 24, "y": 0},
+                {"matrix": [1, 7], "x": 25, "y": 0},
+                {"matrix": [1, 8], "x": 26, "y": 0},
+                {"matrix": [1, 9], "x": 27, "y": 0},
+                {"matrix": [1, 10], "x": 28, "y": 0},
+                {"matrix": [1, 11], "x": 29, "y": 0},
+                {"matrix": [6, 1], "x": 30, "y": 0},
+                {"matrix": [6, 2], "x": 31, "y": 0},
+                {"matrix": [6, 3], "x": 32, "y": 0},
+                {"matrix": [6, 4], "x": 33, "y": 0},
+                {"matrix": [6, 5], "x": 34, "y": 0},
+                {"matrix": [2, 0], "x": 35, "y": 0},
+                {"matrix": [2, 1], "x": 36, "y": 0},
+                {"matrix": [2, 2], "x": 37, "y": 0},
+                {"matrix": [2, 3], "x": 38, "y": 0},
+                {"matrix": [2, 4], "x": 39, "y": 0},
+                {"matrix": [2, 5], "x": 40, "y": 0},
+                {"matrix": [2, 6], "x": 41, "y": 0},
+                {"matrix": [2, 7], "x": 42, "y": 0},
+                {"matrix": [2, 8], "x": 43, "y": 0},
+                {"matrix": [2, 9], "x": 44, "y": 0},
+                {"matrix": [2, 10], "x": 45, "y": 0},
+                {"matrix": [2, 11], "x": 46, "y": 0},
+                {"matrix": [7, 0], "x": 47, "y": 0},
+                {"matrix": [7, 1], "x": 48, "y": 0},
+                {"matrix": [7, 2], "x": 49, "y": 0},
+                {"matrix": [7, 3], "x": 50, "y": 0},
+                {"matrix": [7, 4], "x": 51, "y": 0},
+                {"matrix": [7, 5], "x": 52, "y": 0},
+                {"matrix": [3, 0], "x": 53, "y": 0},
+                {"matrix": [3, 1], "x": 54, "y": 0},
+                {"matrix": [3, 2], "x": 55, "y": 0},
+                {"matrix": [3, 3], "x": 56, "y": 0},
+                {"matrix": [3, 4], "x": 57, "y": 0},
+                {"matrix": [3, 5], "x": 58, "y": 0},
+                {"matrix": [3, 6], "x": 59, "y": 0},
+                {"matrix": [3, 7], "x": 60, "y": 0},
+                {"matrix": [3, 8], "x": 61, "y": 0},
+                {"matrix": [3, 9], "x": 62, "y": 0},
+                {"matrix": [3, 10], "x": 63, "y": 0},
+                {"matrix": [3, 11], "x": 64, "y": 0},
+                {"matrix": [8, 0], "x": 65, "y": 0},
+                {"matrix": [8, 2], "x": 66, "y": 0},
+                {"matrix": [8, 4], "x": 67, "y": 0},
+                {"matrix": [8, 5], "x": 68, "y": 0},
+                {"matrix": [4, 0], "x": 69, "y": 0},
+                {"matrix": [4, 1], "x": 70, "y": 0},
+                {"matrix": [4, 2], "x": 71, "y": 0},
+                {"matrix": [4, 3], "x": 72, "y": 0},
+                {"matrix": [4, 4], "x": 73, "y": 0},
+                {"matrix": [4, 5], "x": 74, "y": 0},
+                {"matrix": [4, 6], "x": 75, "y": 0},
+                {"matrix": [4, 7], "x": 76, "y": 0},
+                {"matrix": [4, 8], "x": 77, "y": 0},
+                {"matrix": [4, 9], "x": 78, "y": 0},
+                {"matrix": [4, 10], "x": 79, "y": 0},
+                {"matrix": [4, 11], "x": 80, "y": 0}
             ]
         }
     }
diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.h b/keyboards/salicylic_acid3/naked60/rev1/rev1.h
deleted file mode 100644
index fcb26d5fc2..0000000000
--- a/keyboards/salicylic_acid3/naked60/rev1/rev1.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use naked60.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------           ------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 |           | L06 | L07 | L08 | L09 | L0A | L0B |
- * |------------------------------------           ------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 |           | L16 | L17 | L18 | L19 | L1A | L1B |
- * |------------------------------------           ------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 |           | L26 | L17 | L28 | L29 | L2A | L2B |
- * |------------------------------------           ------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 |           | L36 | L37 | L38 | L39 | L3A | L3B |
- *       |-----------------------------------------------------------------------'
- *       | L40 | L41 | L42 | L43 | L44 | L45 | L46 | L47 | L48 | L49 | L4A | L4B |
- *       |-----------------------------------------------------------------------'
- */
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, \
-    L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, \
-    L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, \
-    L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, \
-    L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B  \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05,  L06,  L07,  L08,  L09,  L0A,  L0B  },  \
-    {  L10,  L11,  L12,  L13,  L14,  L15,  L16,  L17,  L18,  L19,  L1A,  L1B  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25,  L26,  L27,  L28,  L29,  L2A,  L2B  },  \
-    {  L30,  L31,  L32,  L33,  L34,  L35,  L36,  L37,  L38,  L39,  L3A,  L3B  },  \
-    {  L40,  L41,  L42,  L43,  L44,  L45,  L46,  L47,  L48,  L49,  L4A,  L4B  },  \
-    {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,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,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  },  \
-    {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  }   \
-  }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Setta21 to naked60.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_setta21( \
-    L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B,    R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B,         R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B,    R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B,    R30,      R32,      R34, R35, \
-    L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B  \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05,  L06,  L07,  L08,  L09,  L0A,  L0B  },  \
-    {  L10,  L11,  L12,  L13,  L14,  L15,  L16,  L17,  L18,  L19,  L1A,  L1B  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25,  L26,  L27,  L28,  L29,  L2A,  L2B  },  \
-    {  L30,  L31,  L32,  L33,  L34,  L35,  L36,  L37,  L38,  L39,  L3A,  L3B  },  \
-    {  L40,  L41,  L42,  L43,  L44,  L45,  L46,  L47,  L48,  L49,  L4A,  L4B  },  \
-    {  R00,  R01,  R02,  R03,  R04,  R05,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {KC_NO,  R11,  R12,  R13,  R14,  R15,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {  R20,  R21,  R22,  R23,  R24,  R25,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {  R30,KC_NO,  R32,KC_NO,  R34,  R35,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,KC_NO,KC_NO  }   \
-  }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Nafuda to naked60.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_nafuda( \
-    L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B,         R01,      \
-    L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B,    R10, R11, R12, \
-    L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B,    R20, R21, R22, \
-    L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, \
-    L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A, L4B  \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05,  L06,  L07,  L08,  L09,  L0A,  L0B  },  \
-    {  L10,  L11,  L12,  L13,  L14,  L15,  L16,  L17,  L18,  L19,  L1A,  L1B  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25,  L26,  L27,  L28,  L29,  L2A,  L2B  },  \
-    {  L30,  L31,  L32,  L33,  L34,  L35,  L36,  L37,  L38,  L39,  L3A,  L3B  },  \
-    {  L40,  L41,  L42,  L43,  L44,  L45,  L46,  L47,  L48,  L49,  L4A,  L4B  },  \
-    {KC_NO,  R01,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {  R10,  R11,  R12,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO  },  \
-    {  R20,  R21,  R22,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,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,KC_NO  }   \
-  }
-
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index 7eed51635b..999f1e98c0 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -30,170 +30,189 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"pgup", "x":0.25, "y":0},
-                {"label":"ESC", "x":1.75, "y":0},
-                {"label":"1", "x":2.75, "y":0},
-                {"label":"2", "x":4, "y":0},
-                {"label":"3", "x":5, "y":0},
-                {"label":"4", "x":6, "y":0},
-                {"label":"5", "x":7, "y":0},
-                {"label":"6", "x":9.25, "y":0},
-                {"label":"7", "x":10.25, "y":0},
-                {"label":"8", "x":11.25, "y":0},
-                {"label":"9", "x":12.25, "y":0},
-                {"label":"0", "x":13.5, "y":0},
-                {"label":"-", "x":14.5, "y":0},
-                {"label":"Back Space", "x":15.5, "y":0},
-                {"label":"pgdn", "x":0, "y":1},
-                {"label":"Tab", "x":1.25, "y":1, "w":1.5},
-                {"label":"Q", "x":2.75, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.25, "y":1},
-                {"label":"U", "x":10.25, "y":1},
-                {"label":"I", "x":11.25, "y":1},
-                {"label":"O", "x":12.25, "y":1},
-                {"label":"P", "x":13.5, "y":1},
-                {"label":"[", "x":14.5, "y":1},
-                {"label":"]", "x":15.5, "y":1},
-                {"label":"Control", "x":1, "y":2, "w":1.75},
-                {"label":"A", "x":2.75, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":9.25, "y":2},
-                {"label":"J", "x":10.25, "y":2},
-                {"label":"K", "x":11.25, "y":2},
-                {"label":"L", "x":12.25, "y":2},
-                {"label":";", "x":13.5, "y":2},
-                {"label":"'", "x":14.5, "y":2},
-                {"label":"Return", "x":15.5, "y":2},
-                {"label":"Shift", "x":0.5, "y":3, "w":2.25},
-                {"label":"Z", "x":2.75, "y":3},
-                {"label":"X", "x":4, "y":3},
-                {"label":"C", "x":5, "y":3},
-                {"label":"V", "x":6, "y":3},
-                {"label":"B", "x":7, "y":3},
-                {"label":"N", "x":9.25, "y":3},
-                {"label":"M", "x":10.25, "y":3},
-                {"label":",", "x":11.25, "y":3},
-                {"label":".", "x":12.25, "y":3},
-                {"label":"/", "x":13.5, "y":3},
-                {"label":"&uarr;", "x":14.5, "y":3},
-                {"label":"Shift", "x":15.5, "y":3},
-                {"label":"Adjust", "x":1.25, "y":4, "w":1.75},
-                {"label":"Alt", "x":3.75, "y":4.25},
-                {"x":4.75, "y":4.25, "w":2.25},
-                {"label":"&dArr;", "x":7, "y":4.25},
-                {"label":"&uArr;", "x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25, "w":2},
-                {"label":"GUI", "x":12.25, "y":4.25},
-                {"label":"&larr;", "x":13.5, "y":4},
-                {"label":"&darr;", "x":14.5, "y":4},
-                {"label":"&rarr;", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 0},
+                {"matrix": [7, 0], "x": 2.75, "y": 0},
+                {"matrix": [3, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [5, 2], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+
+                {"matrix": [6, 3], "x": 9.25, "y": 0},
+                {"matrix": [3, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [4, 5], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.5, "y": 0},
+                {"matrix": [6, 6], "x": 14.5, "y": 0},
+                {"matrix": [3, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 2.75, "y": 1},
+                {"matrix": [4, 1], "x": 4, "y": 1},
+                {"matrix": [1, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9.25, "y": 1},
+                {"matrix": [4, 4], "x": 10.25, "y": 1},
+                {"matrix": [1, 5], "x": 11.25, "y": 1},
+                {"matrix": [5, 5], "x": 12.25, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 6], "x": 14.5, "y": 1},
+                {"matrix": [4, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [7, 2], "x": 6, "y": 2},
+                {"matrix": [3, 3], "x": 7, "y": 2},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 2},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [2, 5], "x": 11.25, "y": 2},
+                {"matrix": [6, 5], "x": 12.25, "y": 2},
+                {"matrix": [3, 6], "x": 13.5, "y": 2},
+                {"matrix": [0, 7], "x": 14.5, "y": 2},
+                {"matrix": [5, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.75, "y": 3},
+                {"matrix": [6, 1], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [0, 3], "x": 6, "y": 3},
+                {"matrix": [4, 3], "x": 7, "y": 3},
+
+                {"matrix": [1, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 4], "x": 10.25, "y": 3},
+                {"matrix": [3, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 6], "x": 13.5, "y": 3},
+                {"matrix": [1, 7], "x": 14.5, "y": 3},
+                {"matrix": [6, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
+                {"matrix": [5, 3], "x": 7, "y": 4.25},
+
+                {"matrix": [2, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
+                {"matrix": [0, 6], "x": 12.25, "y": 4.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 4},
+                {"matrix": [2, 7], "x": 14.5, "y": 4},
+                {"matrix": [7, 7], "x": 15.5, "y": 4}
             ]
         },
         "LAYOUT_with_setta21": {
             "layout": [
-                {"label":"pgup", "x":0.25, "y":0},
-                {"label":"ESC", "x":1.75, "y":0},
-                {"label":"1", "x":2.75, "y":0},
-                {"label":"2", "x":4, "y":0},
-                {"label":"3", "x":5, "y":0},
-                {"label":"4", "x":6, "y":0},
-                {"label":"5", "x":7, "y":0},
-                {"label":"6", "x":9.25, "y":0},
-                {"label":"7", "x":10.25, "y":0},
-                {"label":"8", "x":11.25, "y":0},
-                {"label":"9", "x":12.25, "y":0},
-                {"label":"0", "x":13.5, "y":0},
-                {"label":"-", "x":14.5, "y":0},
-                {"label":"Back Space", "x":15.5, "y":0},
-
-                {"label":"Esc", "x": 17.5, "y":0},
-                {"label":"F2", "x": 18.5, "y":0},
-                {"label":"=", "x": 19.5, "y":0},
-                {"label":"Delete", "x": 20.5, "y":0},
-
-                {"label":"pgdn", "x":0, "y":1},
-                {"label":"Tab", "x":1.25, "y":1, "w":1.5},
-                {"label":"Q", "x":2.75, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.25, "y":1},
-                {"label":"U", "x":10.25, "y":1},
-                {"label":"I", "x":11.25, "y":1},
-                {"label":"O", "x":12.25, "y":1},
-                {"label":"P", "x":13.5, "y":1},
-                {"label":"[", "x":14.5, "y":1},
-                {"label":"]", "x":15.5, "y":1},
-
-                {"label":"Num Lock", "x": 17.5, "y":1.25},
-                {"label":"/", "x": 18.5, "y":1.25},
-                {"label":"*", "x": 19.5, "y":1.25},
-                {"label":"-", "x": 20.5, "y":1.25},
-
-                {"label":"Control", "x":1, "y":2, "w":1.75},
-                {"label":"A", "x":2.75, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":9.25, "y":2},
-                {"label":"J", "x":10.25, "y":2},
-                {"label":"K", "x":11.25, "y":2},
-                {"label":"L", "x":12.25, "y":2},
-                {"label":";", "x":13.5, "y":2},
-                {"label":"'", "x":14.5, "y":2},
-                {"label":"Return", "x":15.5, "y":2},
-
-                {"label":"7", "x": 17.5, "y":2.25},
-                {"label":"8", "x": 18.5, "y":2.25},
-                {"label":"9", "x": 19.5, "y":2.25},
-
-                {"label":"Shift", "x":0.5, "y":3, "w":2.25},
-                {"label":"Z", "x":2.75, "y":3},
-                {"label":"X", "x":4, "y":3},
-                {"label":"C", "x":5, "y":3},
-                {"label":"V", "x":6, "y":3},
-                {"label":"B", "x":7, "y":3},
-                {"label":"N", "x":9.25, "y":3},
-                {"label":"M", "x":10.25, "y":3},
-                {"label":",", "x":11.25, "y":3},
-                {"label":".", "x":12.25, "y":3},
-                {"label":"/", "x":13.5, "y":3},
-                {"label":"&uarr;", "x":14.5, "y":3},
-                {"label":"Shift", "x":15.5, "y":3},
-
-                {"label":"4", "x": 17.5, "y":3.25},
-                {"label":"5", "x": 18.5, "y":3.25},
-                {"label":"6", "x": 19.5, "y":3.25},
-                {"label":"+", "x": 20.5, "y":2.25, "h":2},
-
-                {"label":"Adjust", "x":1.25, "y":4, "w":1.75},
-                {"label":"Alt", "x":3.75, "y":4.25},
-                {"x":4.75, "y":4.25, "w":2.25},
-                {"label":"&dArr;", "x":7, "y":4.25},
-                {"label":"&uArr;", "x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25, "w":2},
-                {"label":"GUI", "x":12.25, "y":4.25},
-                {"label":"&larr;", "x":13.5, "y":4},
-                {"label":"&darr;", "x":14.5, "y":4},
-                {"label":"&rarr;", "x":15.5, "y":4},
-
-                {"label":"1", "x": 17.5, "y":4.25},
-                {"label":"2", "x": 18.5, "y":4.25},
-                {"label":"3", "x": 19.5, "y":4.25},
-
-                {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2},
-                {"label":"Raise / .", "x": 19.5, "y":5.25},
-                {"label":"Enter", "x": 20.5, "y":4.25, "h":2}
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 0},
+                {"matrix": [7, 0], "x": 2.75, "y": 0},
+                {"matrix": [3, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [5, 2], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+
+                {"matrix": [6, 3], "x": 9.25, "y": 0},
+                {"matrix": [3, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [4, 5], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.5, "y": 0},
+                {"matrix": [6, 6], "x": 14.5, "y": 0},
+                {"matrix": [3, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [8, 5], "x": 17.5, "y": 0},
+                {"matrix": [9, 5], "x": 18.5, "y": 0},
+                {"matrix": [10, 5], "x": 19.5, "y": 0},
+                {"matrix": [11, 5], "x": 20.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 2.75, "y": 1},
+                {"matrix": [4, 1], "x": 4, "y": 1},
+                {"matrix": [1, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9.25, "y": 1},
+                {"matrix": [4, 4], "x": 10.25, "y": 1},
+                {"matrix": [1, 5], "x": 11.25, "y": 1},
+                {"matrix": [5, 5], "x": 12.25, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 6], "x": 14.5, "y": 1},
+                {"matrix": [4, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [8, 4], "x": 17.5, "y": 1.25},
+                {"matrix": [9, 4], "x": 18.5, "y": 1.25},
+                {"matrix": [10, 4], "x": 19.5, "y": 1.25},
+                {"matrix": [11, 4], "x": 20.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [7, 2], "x": 6, "y": 2},
+                {"matrix": [3, 3], "x": 7, "y": 2},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 2},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [2, 5], "x": 11.25, "y": 2},
+                {"matrix": [6, 5], "x": 12.25, "y": 2},
+                {"matrix": [3, 6], "x": 13.5, "y": 2},
+                {"matrix": [0, 7], "x": 14.5, "y": 2},
+                {"matrix": [5, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [8, 3], "x": 17.5, "y": 2.25},
+                {"matrix": [9, 3], "x": 18.5, "y": 2.25},
+                {"matrix": [10, 3], "x": 19.5, "y": 2.25},
+
+                {"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.75, "y": 3},
+                {"matrix": [6, 1], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [0, 3], "x": 6, "y": 3},
+                {"matrix": [4, 3], "x": 7, "y": 3},
+
+                {"matrix": [1, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 4], "x": 10.25, "y": 3},
+                {"matrix": [3, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 6], "x": 13.5, "y": 3},
+                {"matrix": [1, 7], "x": 14.5, "y": 3},
+                {"matrix": [6, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 2], "x": 17.5, "y": 3.25},
+                {"matrix": [9, 2], "x": 18.5, "y": 3.25},
+                {"matrix": [10, 2], "x": 19.5, "y": 3.25},
+                {"matrix": [11, 2], "x": 20.5, "y": 2.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
+                {"matrix": [5, 3], "x": 7, "y": 4.25},
+
+                {"matrix": [2, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
+                {"matrix": [0, 6], "x": 12.25, "y": 4.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 4},
+                {"matrix": [2, 7], "x": 14.5, "y": 4},
+                {"matrix": [7, 7], "x": 15.5, "y": 4},
+
+                {"matrix": [8, 1], "x": 17.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 18.5, "y": 4.25},
+                {"matrix": [10, 1], "x": 19.5, "y": 4.25},
+
+                {"matrix": [8, 0], "x": 17.5, "y": 5.25, "w": 2},
+                {"matrix": [10, 0], "x": 19.5, "y": 5.25},
+                {"matrix": [11, 0], "x": 20.5, "y": 4.25, "h": 2}
             ]
         }
     }
+
 }
diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.h b/keyboards/salicylic_acid3/naked64/rev1/rev1.h
deleted file mode 100644
index d8965556c7..0000000000
--- a/keyboards/salicylic_acid3/naked64/rev1/rev1.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Naked64.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------------       -----------------------------------------.
- * | L00 | L20 | L70 | L31 | L02 | L52 | L13 |       | L63 | L34 | L05 | L45 | L16 | L66 | L37 |
- * |------------------------------------------       ------------------------------------------+
- * | L10 | L30 | L01 | L41 | L12 | L62 | L23 |       | L73 | L44 | L15 | L55 | L26 | L76 | L47 |
- * |------------------------------------------       ------------------------------------------+
- *       | L40 | L11 | L51 | L22 | L72 | L33 |       | L04 | L54 | L25 | L65 | L36 | L07 | L57 |
- *       |------------------------------------       ------------------------------------------+
- *       | L50 | L21 | L61 | L32 | L03 | L43 |       | L14 | L64 | L35 | L75 | L46 | L17 | L67 |
- *       |------------------------------------       ------------------------------------------+
- *       | L60 |     | L71 | L42 |     | L53 |       | L24 | L74 |     | L06 | L56 | L27 | L77 |
- *       |------------------------------------       ------------------------------------------'
- */
-
-#define LAYOUT( \
-       L00, L20, L70, L31, L02, L52, L13,    L63, L34, L05, L45, L16, L66, L37, \
-       L10, L30, L01, L41, L12, L62, L23,    L73, L44, L15, L55, L26, L76, L47, \
-            L40, L11, L51, L22, L72, L33,    L04, L54, L25, L65, L36, L07, L57, \
-            L50, L21, L61, L32, L03, L43,    L14, L64, L35, L75, L46, L17, L67, \
-            L60,      L71, L42,      L53,    L24, L74,      L06, L56, L27, L77 \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05,  L06,  L07  },  \
-    {  L10,  L11,  L12,  L13,  L14,  L15,  L16,  L17  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25,  L26,  L27  },  \
-    {  L30,  L31,  L32,  L33,  L34,  L35,  L36,  L37  },  \
-    {  L40,  L41,  L42,  L43,  L44,  L45,  L46,  L47  },  \
-    {  L50,  L51,  L52,  L53,  L54,  L55,  L56,  L57  },  \
-    {  L60,  L61,  L62,  L63,  L64,  L65,  L66,  L67  },  \
-    {  L70,  L71,  L72,  L73,  L74,  L75,  L76,  L77  },  \
-    {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  },  \
-    {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  },  \
-    {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  },  \
-    {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  }   \
-  }
-
-//////////////////////////////////////////////////////////////////////////////
-// When connecting Setta21 to Naked64.
-//////////////////////////////////////////////////////////////////////////////
-
-#define LAYOUT_with_setta21( \
-       L00, L20, L70, L31, L02, L52, L13,    L63, L34, L05, L45, L16, L66, L37,    R05, R15, R25, R35, \
-       L10, L30, L01, L41, L12, L62, L23,    L73, L44, L15, L55, L26, L76, L47,    R04, R14, R24, R34, \
-            L40, L11, L51, L22, L72, L33,    L04, L54, L25, L65, L36, L07, L57,    R03, R13, R23,      \
-            L50, L21, L61, L32, L03, L43,    L14, L64, L35, L75, L46, L17, L67,    R02, R12, R22, R32, \
-            L60,      L71, L42,      L53,    L24, L74,      L06, L56, L27, L77,    R01, R11, R21,      \
-                                                                                   R00,      R20, R30  \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05,  L06,  L07  },  \
-    {  L10,  L11,  L12,  L13,  L14,  L15,  L16,  L17  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25,  L26,  L27  },  \
-    {  L30,  L31,  L32,  L33,  L34,  L35,  L36,  L37  },  \
-    {  L40,  L41,  L42,  L43,  L44,  L45,  L46,  L47  },  \
-    {  L50,  L51,  L52,  L53,  L54,  L55,  L56,  L57  },  \
-    {  L60,  L61,  L62,  L63,  L64,  L65,  L66,  L67  },  \
-    {  L70,  L71,  L72,  L73,  L74,  L75,  L76,  L77  },  \
-    {  R00,  R01,  R02,  R03,  R04,  R05,KC_NO,KC_NO  },  \
-    {KC_NO,  R11,  R12,  R13,  R14,  R15,KC_NO,KC_NO  },  \
-    {  R20,  R21,  R22,  R23,  R24,  R25,KC_NO,KC_NO  },  \
-    {  R30,KC_NO,  R32,KC_NO,  R34,  R35,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,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,KC_NO,KC_NO  }   \
-  }
-