diff --git a/v3/hineybush/h87_g2/h87_g2.json b/v3/hineybush/h87_g2/h87_g2.json
index a53c620424..293f7042d2 100644
--- a/v3/hineybush/h87_g2/h87_g2.json
+++ b/v3/hineybush/h87_g2/h87_g2.json
@@ -1,11 +1,24 @@
-
 {
   "name": "h87_g2",
   "vendorId": "0x4069",
   "productId": "0x0001",
-  "firmwareVersion": 0,
-  "matrix": { "rows": 6, "cols": 17 },
+  "keycodes": [ "qmk_lighting" ],
+  "menus": [ "qmk_backlight" ],
+  "matrix": {
+    "rows": 6,
+    "cols": 17
+  },
   "layouts": {
+    "labels": [
+      "Split Backspace",
+      "Split Right Shift",
+      [
+        "Bottom Row",
+        "6.25u",
+        "7u WKL",
+        "7u WK"
+      ]
+    ],
     "keymap": [
       [
         {
@@ -66,13 +79,18 @@
           "c": "#aaaaaa",
           "w": 2
         },
-        "1,14",
+        "1,14\n\n\n0,0",
         {
           "x": 0.25
         },
         "1,15",
         "1,16",
-        "2,16"
+        "2,16",
+        {
+          "x": 0.25
+        },
+        "1,13\n\n\n0,1",
+        "1,14\n\n\n0,1"
       ],
       [
         {
@@ -102,8 +120,8 @@
           "x": 0.25,
           "c": "#aaaaaa"
         },
-        "2,14",
-        "2,15",
+        "3,14",
+        "3,15",
         "4,16"
       ],
       [
@@ -154,44 +172,120 @@
           "c": "#aaaaaa",
           "w": 2.75
         },
-        "4,12",
+        "4,12\n\n\n1,0",
         {
           "x": 1.25
         },
-        "4,15"
+        "4,15",
+        {
+          "x": 1.25,
+          "w": 1.75
+        },
+        "4,12\n\n\n1,1",
+        "4,13\n\n\n1,1"
       ],
       [
         {
+          "w": 1.25
+        },
+        "5,0\n\n\n2,0",
+        {
+          "w": 1.25
+        },
+        "5,1\n\n\n2,0",
+        {
+          "w": 1.25
+        },
+        "5,2\n\n\n2,0",
+        {
+          "c": "#cccccc",
+          "w": 6.25
+        },
+        "5,6\n\n\n2,0",
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "5,9\n\n\n2,0",
+        {
+          "w": 1.25
+        },
+        "5,10\n\n\n2,0",
+        {
+          "w": 1.25
+        },
+        "5,11\n\n\n2,0",
+        {
+          "w": 1.25
+        },
+        "5,13\n\n\n2,0",
+        {
+          "x": 0.25
+        },
+        "5,14",
+        "5,15",
+        "5,16"
+      ],
+      [
+        {
+          "y": 0.25,
           "w": 1.5
         },
-        "5,0",
-        "5,1",
+        "5,0\n\n\n2,1",
+        {
+          "d": true
+        },
+        "5,1\n\n\n2,1",
         {
           "w": 1.5
         },
-        "5,2",
+        "5,2\n\n\n2,1",
         {
           "c": "#cccccc",
           "w": 7
         },
-        "5,6",
+        "5,6\n\n\n2,1",
         {
           "c": "#aaaaaa",
           "w": 1.5
         },
-        "5,10",
-        "5,11",
+        "5,10\n\n\n2,1",
+        {
+          "d": true
+        },
+        "5,11\n\n\n2,1",
         {
           "w": 1.5
         },
-        "5,13",
+        "5,13\n\n\n2,1"
+      ],
+      [
         {
-          "x": 0.25
+          "y": 0.25,
+          "w": 1.5
         },
-        "5,14",
-        "5,15",
-        "5,16"
+        "5,0\n\n\n2,2",
+        "5,1\n\n\n2,2",
+        {
+          "w": 1.5
+        },
+        "5,2\n\n\n2,2",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "5,6\n\n\n2,2",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "5,10\n\n\n2,2",
+        "5,11\n\n\n2,2",
+        {
+          "w": 1.5
+        },
+        "5,13\n\n\n2,2"
       ]
     ]
   }
-}
+}
\ No newline at end of file