diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index d64694229bb..2f3f21fa048 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -4,26 +4,136 @@
         "device_version": "2.0.0",
         "pid": "0x1836"
     },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
         "rows": ["GP4", "GP5", "GP27", "GP26"]
     },
     "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "GP1"
+        "enabled": true,
+        "soft_serial_pin": "GP1",
+        "bootmagic": {
+            "matrix": [4, 0]
+        },
     },
-    "rgblight": {
-        "split_count": [18, 18]
+    "encoder": {
+        "enabled" : true,
+        "rotary" : [
+            {"pin_a": "GP25", "pin_b": "GP24"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "caps_word": {
+        "enabled": true,
     },
     "ws2812": {
         "pin": "GP10",
         "driver": "vendor"
     },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [36, 36],
+        "max_brightness": 128,
+        "layout": [
+            {"x": 82, "y": 0, "flags": 2},
+            {"x": 60, "y": 0, "flags": 2},
+            {"x": 22, "y": 0, "flags": 2},
+            {"x": 15, "y": 0, "flags": 2},
+
+            {"x": 0, "y": 25, "flags": 2},
+            {"x": 0, "y": 40, "flags": 2},
+            {"x": 0, "y": 55, "flags": 2},
+
+            {"x": 15, "y": 45, "flags": 2},
+            {"x": 30, "y": 45, "flags": 2},
+            {"x": 35, "y": 60, "flags": 2},
+            {"x": 55, "y": 62, "flags": 2},
+
+            {"x": 72, "y": 64, "flags": 2},
+            {"x": 90, "y": 64, "flags": 2},
+            {"x": 98, "y": 47, "flags": 2},
+            {"x": 107, "y": 40, "flags": 2},
+
+            {"x": 110, "y": 33, "flags": 2},
+            {"x": 110, "y": 19, "flags": 2},
+            {"x": 110, "y": 5, "flags": 2},
+
+            {"matrix": [0, 4], "x": 73, "y": 11, "flags": 4},
+            {"matrix": [0, 3], "x": 56, "y": 9, "flags": 4},
+            {"matrix": [0, 2], "x": 39, "y": 5, "flags": 4},
+            {"matrix": [0, 1], "x": 22, "y": 10, "flags": 4},
+            {"matrix": [0, 0], "x": 5, "y": 15, "flags": 4},
+
+            {"matrix": [1, 0], "x": 5, "y": 30, "flags": 4},
+            {"matrix": [1, 1], "x": 22, "y": 25, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 20, "flags": 4},
+            {"matrix": [1, 3], "x": 56, "y": 24, "flags": 4},
+            {"matrix": [1, 4], "x": 73, "y": 26, "flags": 4},
+
+            {"matrix": [2, 4], "x": 73, "y": 41, "flags": 4},
+            {"matrix": [2, 3], "x": 56, "y": 39, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 35, "flags": 4},
+            {"matrix": [2, 1], "x": 22, "y": 40, "flags": 4},
+            {"matrix": [2, 0], "x": 5, "y": 45, "flags": 4},
+
+            {"matrix": [3, 2], "x": 45, "y": 51, "flags": 4},
+            {"matrix": [3, 0], "x": 64, "y": 53, "flags": 4},
+            {"matrix": [3, 1], "x": 81, "y": 60, "flags": 4},
+
+            {"x": 142, "y": 0, "flags": 2},
+            {"x": 164, "y": 0, "flags": 2},
+            {"x": 202, "y": 0, "flags": 2},
+            {"x": 209, "y": 0, "flags": 2},
+
+            {"x": 224, "y": 25, "flags": 2},
+            {"x": 224, "y": 40, "flags": 2},
+            {"x": 224, "y": 55, "flags": 2},
+
+            {"x": 209, "y": 45, "flags": 2},
+            {"x": 194, "y": 45, "flags": 2},
+            {"x": 189, "y": 60, "flags": 2},
+            {"x": 169, "y": 62, "flags": 2},
+
+            {"x": 152, "y": 64, "flags": 2},
+            {"x": 134, "y": 64, "flags": 2},
+            {"x": 126, "y": 47, "flags": 2},
+            {"x": 117, "y": 40, "flags": 2},
+
+            {"x": 114, "y": 33, "flags": 2},
+            {"x": 114, "y": 19, "flags": 2},
+            {"x": 114, "y": 5, "flags": 2},
+
+            {"matrix": [4, 4], "x": 151, "y": 11, "flags": 4},
+            {"matrix": [4, 3], "x": 168, "y": 9, "flags": 4},
+            {"matrix": [4, 2], "x": 185, "y": 5, "flags": 4},
+            {"matrix": [4, 1], "x": 202, "y": 10, "flags": 4},
+            {"matrix": [4, 0], "x": 219, "y": 15, "flags": 4},
+
+            {"matrix": [5, 0], "x": 219, "y": 30, "flags": 4},
+            {"matrix": [5, 1], "x": 202, "y": 25, "flags": 4},
+            {"matrix": [5, 2], "x": 185, "y": 20, "flags": 4},
+            {"matrix": [5, 3], "x": 168, "y": 24, "flags": 4},
+            {"matrix": [5, 4], "x": 151, "y": 26, "flags": 4},
+
+            {"matrix": [6, 4], "x": 151, "y": 41, "flags": 4},
+            {"matrix": [6, 3], "x": 168, "y": 39, "flags": 4},
+            {"matrix": [6, 2], "x": 185, "y": 35, "flags": 4},
+            {"matrix": [6, 1], "x": 202, "y": 40, "flags": 4},
+            {"matrix": [6, 0], "x": 219, "y": 45, "flags": 4},
+
+            {"matrix": [7, 2], "x": 179, "y": 51, "flags": 4},
+            {"matrix": [7, 0], "x": 160, "y": 53, "flags": 4},
+            {"matrix": [7, 1], "x": 143, "y": 60, "flags": 4}
+        ]
+    },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {