5 files changed, 28 insertions, 55 deletions
diff --git a/keyboards/aplyard/aplx6/info.json b/keyboards/aplyard/aplx6/info.json
index 0bd317c1a4..9f86182a33 100644
--- a/keyboards/aplyard/aplx6/info.json
+++ b/keyboards/aplyard/aplx6/info.json
@@ -5,18 +5,5 @@
     "maintainer": "Aplyard",
     "usb": {
         "vid": "0xE0E0"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1}
-            ]
-        }
     }
 }
diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json
index 167699150f..943624fb8f 100644
--- a/keyboards/aplyard/aplx6/rev1/info.json
+++ b/keyboards/aplyard/aplx6/rev1/info.json
@@ -9,5 +9,18 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
 }
diff --git a/keyboards/aplyard/aplx6/rev1/rev1.h b/keyboards/aplyard/aplx6/rev1/rev1.h
deleted file mode 100644
index 6990d388e7..0000000000
--- a/keyboards/aplyard/aplx6/rev1/rev1.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-      k000, k001, k002, \
-      k100, k101, k102 \
-) \
-{ \
-    { k000, k001, k002 }, \
-    { k100, k101, k102 }  \
-} 
-
diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json
index 726dab814c..2dc54180eb 100644
--- a/keyboards/aplyard/aplx6/rev2/info.json
+++ b/keyboards/aplyard/aplx6/rev2/info.json
@@ -14,5 +14,18 @@
         ]
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
 }
diff --git a/keyboards/aplyard/aplx6/rev2/rev2.h b/keyboards/aplyard/aplx6/rev2/rev2.h
deleted file mode 100644
index 193c6cd51c..0000000000
--- a/keyboards/aplyard/aplx6/rev2/rev2.h
+++ /dev/null
@@ -1,28 +0,0 @@
- /* Copyright 2020 Aplyard 
-  * 
-  * 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"
-
-#define LAYOUT( \
-      k000, k001, k002, \
-      k100, k101, k102 \
-) \
-{ \
-    { k000, k001, k002 }, \
-    { k100, k101, k102 }  \
-} 
-
-