diff --git a/keyboards/ciaanh/kanagawa/ansi/kanagawa.json b/keyboards/ciaanh/kanagawa/ansi/kanagawa.json
deleted file mode 100644
index dac98fd7bbd..00000000000
--- a/keyboards/ciaanh/kanagawa/ansi/kanagawa.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "Kanagawa",
-    "vendorId": "0xC1E0",
-    "productId": "0x0010",
-    "menus": [ "qmk_rgb_matrix" ],
-    "matrix": { "rows": 6, "cols": 14 },
-    "keycodes": [ "qmk_lighting" ],
-    "layouts": {
-        "keymap": [
-            [{ "c": "#777777" }, "0,0", { "x": 0.5, "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", { "x": 0.25 }, "0,5", "0,6", "0,7", "0,8", { "x": 0.25 }, "0,9", "0,10", "0,11", "0,12", { "x": 2.25, "c": "#777777" }, "0,13"],
-            [{ "y": 0.25, "c": "#cccccc" }, "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "c": "#aaaaaa", "w": 2 }, "1,13", { "x": 1.25, "c": "#777777" }, "3,13"],
-            [{ "c": "#aaaaaa", "w": 1.5 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "w": 1.5 }, "2,13", { "x": 1.25, "c": "#777777" }, "4,13"],
-            [{ "c": "#aaaaaa", "w": 1.75 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#777777", "w": 2.25 }, "3,12", { "x": 1.25 }, "5,13"],
-            [{ "c": "#aaaaaa", "w": 2.25 }, "4,0", { "c": "#cccccc" }, "4,1", "4,2", "4,3", "4,4", "4,5", "4,6", "4,7", "4,8", "4,9", "4,10", { "c": "#aaaaaa", "w": 1.75 }, "4,11"],
-            [{ "y": -0.75, "x": 14.25, "c": "#777777" }, "4,12"],
-            [{ "y": -0.25, "c": "#aaaaaa", "w": 1.25 }, "5,0", "5,1", { "w": 1.25 }, "5,2", { "x": 6.5 }, "5,7", "5,8", "5,9"],
-            [{ "y": -0.75, "x": 13.25, "c": "#777777" }, "5,10", "5,11", "5,12"],
-            [{ "r": 15, "rx": 3.75, "ry": 5.5, "y": -0.25 }, "5,3", { "w": 2 }, "5,4"],
-            [{ "r": -15, "rx": 9.75, "y": -0.25, "x": -3, "w": 2 }, "5,5", "5,6"]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/keyboards/ciaanh/kanagawa/iso/kanagawa.json b/keyboards/ciaanh/kanagawa/iso/kanagawa.json
deleted file mode 100644
index dac98fd7bbd..00000000000
--- a/keyboards/ciaanh/kanagawa/iso/kanagawa.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "Kanagawa",
-    "vendorId": "0xC1E0",
-    "productId": "0x0010",
-    "menus": [ "qmk_rgb_matrix" ],
-    "matrix": { "rows": 6, "cols": 14 },
-    "keycodes": [ "qmk_lighting" ],
-    "layouts": {
-        "keymap": [
-            [{ "c": "#777777" }, "0,0", { "x": 0.5, "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", { "x": 0.25 }, "0,5", "0,6", "0,7", "0,8", { "x": 0.25 }, "0,9", "0,10", "0,11", "0,12", { "x": 2.25, "c": "#777777" }, "0,13"],
-            [{ "y": 0.25, "c": "#cccccc" }, "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "c": "#aaaaaa", "w": 2 }, "1,13", { "x": 1.25, "c": "#777777" }, "3,13"],
-            [{ "c": "#aaaaaa", "w": 1.5 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "w": 1.5 }, "2,13", { "x": 1.25, "c": "#777777" }, "4,13"],
-            [{ "c": "#aaaaaa", "w": 1.75 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#777777", "w": 2.25 }, "3,12", { "x": 1.25 }, "5,13"],
-            [{ "c": "#aaaaaa", "w": 2.25 }, "4,0", { "c": "#cccccc" }, "4,1", "4,2", "4,3", "4,4", "4,5", "4,6", "4,7", "4,8", "4,9", "4,10", { "c": "#aaaaaa", "w": 1.75 }, "4,11"],
-            [{ "y": -0.75, "x": 14.25, "c": "#777777" }, "4,12"],
-            [{ "y": -0.25, "c": "#aaaaaa", "w": 1.25 }, "5,0", "5,1", { "w": 1.25 }, "5,2", { "x": 6.5 }, "5,7", "5,8", "5,9"],
-            [{ "y": -0.75, "x": 13.25, "c": "#777777" }, "5,10", "5,11", "5,12"],
-            [{ "r": 15, "rx": 3.75, "ry": 5.5, "y": -0.25 }, "5,3", { "w": 2 }, "5,4"],
-            [{ "r": -15, "rx": 9.75, "y": -0.25, "x": -3, "w": 2 }, "5,5", "5,6"]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/keyboards/ciaanh/kanagawa/kanagawa.json b/keyboards/ciaanh/kanagawa/kanagawa.json
new file mode 100644
index 00000000000..82e887b9c3b
--- /dev/null
+++ b/keyboards/ciaanh/kanagawa/kanagawa.json
@@ -0,0 +1,23 @@
+{
+    "name": "Kanagawa",
+    "vendorId": "0xC1E0",
+    "productId": "0x0010",    
+    "matrix": { "rows": 6, "cols": 14 },
+    "menus": [ "qmk_rgb_matrix" ],
+    "keycodes": [ "qmk_lighting" ],
+    "layouts": {
+        "keymap": [
+            [{"x":2.75,"c":"#777777"},"0,0",{"x":0.5,"c":"#cccccc"},"0,1","0,2","0,3","0,4",{"x":0.25},"0,5","0,6","0,7","0,8",{"x":0.25},"0,9","0,10","0,11","0,12",{"x":2.25,"c":"#777777"},"0,13\n\n\n\n\n\n\n\n\ne0"],
+            [{"y":0.25,"x":2.75,"c":"#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"c":"#aaaaaa","w":2},"1,13",{"x":1.25,"c":"#777777"},"3,13"],
+            [{"x":2.75,"c":"#aaaaaa","w":1.5},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12",{"w":1.5},"2,13\n\n\n1,0",{"x":1.25,"c":"#777777"},"4,13",{"x":1.75,"c":"#cccccc","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"2,13\n\n\n1,1"],
+            [{"x":2.75,"c":"#aaaaaa","w":1.75},"3,0",{"c":"#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#777777","w":2.25},"3,12\n\n\n1,0",{"x":1.25},"5,13",{"x":0.75},"3,12\n\n\n1,1"],
+            [{"c":"#aaaaaa","w":1.25},"4,0\n\n\n0,1",{"c":"#cccccc"},"4,1\n\n\n0,1",{"x":0.5,"c":"#aaaaaa","w":2.25},"4,0\n\n\n0,0",{"c":"#cccccc"},"4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"c":"#aaaaaa","w":1.75},"4,12"],
+            [{"y":-0.75,"x":17,"c":"#777777"},"5,12"],
+            [{"y":-0.25,"x":2.75,"c":"#aaaaaa"},"5,0","5,1","5,2",{"x":7},"5,6","5,7","5,8"],
+            [{"y":-0.75,"x":16,"c":"#777777"},"5,9","5,10","5,11"],
+            [{"ry":5.5,"y":-0.25,"x":5.75},"5,3"],
+            [{"r":15,"rx":6.5,"y":-0.25,"x":0.75,"w":2.25},"5,4"],
+            [{"r":-15,"rx":12.5,"y":-0.25,"x":-3,"w":2.75},"5,5"]
+        ]
+    }
+}
\ No newline at end of file