From c3f5185662c8683860dd1938c1b873aad1fd4d26 Mon Sep 17 00:00:00 2001
From: Cipulot <40441626+Cipulot@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:44:42 +0100
Subject: [PATCH] Update src/ibm/model_m/ctrl_m/ctrl_m.json

---
 src/ibm/model_m/ctrl_m/ctrl_m.json | 65 ++++++++++++++++++------------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/ibm/model_m/ctrl_m/ctrl_m.json b/src/ibm/model_m/ctrl_m/ctrl_m.json
index 4c7ce63b9f..9338becb01 100644
--- a/src/ibm/model_m/ctrl_m/ctrl_m.json
+++ b/src/ibm/model_m/ctrl_m/ctrl_m.json
@@ -1,8 +1,11 @@
 {
-  "name": "ctrl-M replacement controller for the IBM Model M 101/102",
+  "name": "ctrl-M",
   "vendorId": "0x1D50",
   "productId": "0x6180",
-  "matrix": {"rows": 8, "cols": 16},
+  "matrix": {
+    "rows": 8,
+    "cols": 16
+  },
   "layouts": {
     "labels": [
       "ISO Enter"
@@ -10,6 +13,7 @@
     "keymap": [
       [
         {
+          "x": 2.5,
           "c": "#777777"
         },
         "0,2",
@@ -44,6 +48,7 @@
       [
         {
           "y": 0.5,
+          "x": 2.5,
           "c": "#cccccc"
         },
         "2,2",
@@ -83,6 +88,7 @@
       ],
       [
         {
+          "x": 2.5,
           "c": "#777777",
           "w": 1.5
         },
@@ -107,17 +113,8 @@
         },
         "5,6\n\n\n0,0",
         {
-          "x": -1.25,
-          "c": "#777777",
-          "w": 1.25,
-          "h": 2,
-          "w2": 1.5,
-          "h2": 1,
-          "x2": -0.25
-        },
-        "6,6\n\n\n0,1",
-        {
-          "x": 0.25
+          "x": 0.25,
+          "c": "#777777"
         },
         "2,11",
         "3,14",
@@ -132,11 +129,21 @@
         {
           "h": 2
         },
-        "4,14"
+        "4,14",
+        {
+          "x": 1.25,
+          "c": "#777777",
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "6,6\n\n\n0,1"
       ],
       [
         {
-          "c": "#777777",
+          "x": 2.5,
           "w": 1.75
         },
         "1,3",
@@ -160,25 +167,20 @@
         },
         "6,6\n\n\n0,0",
         {
-          "x": -2.25,
+          "x": 3.5,
           "c": "#cccccc"
         },
-        "6,10\n\n\n0,1",
-        {
-          "x": 4.75
-        },
         "1,11",
         "1,12",
-        "1,13"
+        "1,13",
+        {
+          "x": 1.25
+        },
+        "6,10\n\n\n0,1"
       ],
       [
         {
           "c": "#aaaaaa",
-          "w": 2.25
-        },
-        "1,1\n\n\n0,0",
-        {
-          "x": -2.25,
           "w": 1.25
         },
         "1,1\n\n\n0,1",
@@ -186,6 +188,15 @@
           "c": "#cccccc"
         },
         "0,3\n\n\n0,1",
+        {
+          "x": 0.25,
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "1,1\n\n\n0,0",
+        {
+          "c": "#cccccc"
+        },
         "6,2",
         "6,3",
         "6,4",
@@ -221,6 +232,7 @@
       ],
       [
         {
+          "x": 2.5,
           "c": "#aaaaaa",
           "w": 1.25
         },
@@ -263,3 +275,4 @@
     ]
   }
 }
+