7 files changed, 28 insertions, 12 deletions
diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json
index 0d8de8a1d9..c66bd05f1b 100644
--- a/keyboards/keycapsss/plaid_pad/info.json
+++ b/keyboards/keycapsss/plaid_pad/info.json
@@ -10,14 +10,6 @@
     "qmk": {
         "tap_keycode_delay": 60
     },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "matrix_pins": {
         "cols": ["B0", "D7", "D6", "D5"],
         "rows": ["C0", "C1", "C2", "C3"]
diff --git a/keyboards/keycapsss/plaid_pad/rev1/info.json b/keyboards/keycapsss/plaid_pad/rev1/keyboard.json
index 0877051858..e4a8a8d3c8 100644
--- a/keyboards/keycapsss/plaid_pad/rev1/info.json
+++ b/keyboards/keycapsss/plaid_pad/rev1/keyboard.json
@@ -8,5 +8,14 @@
             {"pin_a": "D1", "pin_b": "D0"},
             {"pin_a": "B2", "pin_b": "B1"}
         ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true
     }
 }
diff --git a/keyboards/keycapsss/plaid_pad/rev1/rules.mk b/keyboards/keycapsss/plaid_pad/rev1/rules.mk
deleted file mode 100644
index 5af1ba8536..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/rev2/info.json b/keyboards/keycapsss/plaid_pad/rev2/keyboard.json
index 637139c5a4..8dc84d4ee8 100644
--- a/keyboards/keycapsss/plaid_pad/rev2/info.json
+++ b/keyboards/keycapsss/plaid_pad/rev2/keyboard.json
@@ -10,5 +10,14 @@
             {"pin_a": "B4", "pin_b": "B3"},
             {"pin_a": "D4", "pin_b": "B5"}
         ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true
     }
 }
diff --git a/keyboards/keycapsss/plaid_pad/rev2/rules.mk b/keyboards/keycapsss/plaid_pad/rev2/rules.mk
deleted file mode 100644
index 5af1ba8536..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/rev3/info.json b/keyboards/keycapsss/plaid_pad/rev3/keyboard.json
index 0468b70499..4e1d071287 100644
--- a/keyboards/keycapsss/plaid_pad/rev3/info.json
+++ b/keyboards/keycapsss/plaid_pad/rev3/keyboard.json
@@ -10,5 +10,15 @@
             {"pin_a": "B4", "pin_b": "B3"},
             {"pin_a": "D4", "pin_b": "B5"}
         ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true,
+        "oled": true
     }
 }
diff --git a/keyboards/keycapsss/plaid_pad/rev3/rules.mk b/keyboards/keycapsss/plaid_pad/rev3/rules.mk
deleted file mode 100644
index 5ec06e9609..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes