Merge remote-tracking branch 'origin/master' into develop

2 files changed, 89 insertions, 4 deletions

diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json
new file mode 100644
index 0000000000..cb0cf8c12c
--- /dev/null
+++ b/keyboards/mode/m65s/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "Mode SixtyFive S",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "K00", "x": 0, "y": 0 },
+                { "label": "K01", "x": 1, "y": 0 },
+                { "label": "K02", "x": 2, "y": 0 },
+                { "label": "K03", "x": 3, "y": 0 },
+                { "label": "K04", "x": 4, "y": 0 },
+                { "label": "K05", "x": 5, "y": 0 },
+                { "label": "K06", "x": 6, "y": 0 },
+                { "label": "K07", "x": 7, "y": 0 },
+                { "label": "K08", "x": 8, "y": 0 },
+                { "label": "K09", "x": 9, "y": 0 },
+                { "label": "K0A", "x": 10, "y": 0 },
+                { "label": "K0B", "x": 11, "y": 0 },
+                { "label": "K0C", "x": 12, "y": 0 },
+                { "label": "K0D", "x": 13, "y": 0 },
+                { "label": "K0E", "x": 14, "y": 0 },
+                { "label": "K0F", "x": 15, "y": 0 },
+
+                { "label": "K10", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "K11", "x": 1.5, "y": 1 },
+                { "label": "K12", "x": 2.5, "y": 1 },
+                { "label": "K13", "x": 3.5, "y": 1 },
+                { "label": "K14", "x": 4.5, "y": 1 },
+                { "label": "K15", "x": 5.5, "y": 1 },
+                { "label": "K16", "x": 6.5, "y": 1 },
+                { "label": "K17", "x": 7.5, "y": 1 },
+                { "label": "K18", "x": 8.5, "y": 1 },
+                { "label": "K19", "x": 9.5, "y": 1 },
+                { "label": "K1A", "x": 10.5, "y": 1 },
+                { "label": "K1B", "x": 11.5, "y": 1 },
+                { "label": "K1C", "x": 12.5, "y": 1 },
+                { "label": "K1E", "x": 13.5, "y": 1, "w": 1.5},
+                { "label": "K1F", "x": 15, "y": 1 },
+
+                { "label": "K20", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "K21", "x": 1.75, "y": 2 },
+                { "label": "K22", "x": 2.75, "y": 2 },
+                { "label": "K23", "x": 3.75, "y": 2 },
+                { "label": "K24", "x": 4.75, "y": 2 },
+                { "label": "K25", "x": 5.75, "y": 2 },
+                { "label": "K26", "x": 6.75, "y": 2 },
+                { "label": "K27", "x": 7.75, "y": 2 },
+                { "label": "K28", "x": 8.75, "y": 2 },
+                { "label": "K29", "x": 9.75, "y": 2 },
+                { "label": "K2A", "x": 10.75, "y": 2 },
+                { "label": "K2B", "x": 11.75, "y": 2 },
+                { "label": "K2D", "x": 12.75, "y": 2 },
+                { "label": "K2E", "x": 13.75, "y": 2, "w": 1.25 },
+                { "label": "K2F", "x": 15, "y": 2 },
+
+                { "label": "K30", "x": 0, "y": 3, "w": 1.25 },
+                { "label": "K31", "x": 1.25, "y": 3 },
+                { "label": "K32", "x": 2.25, "y": 3 },
+                { "label": "K33", "x": 3.25, "y": 3 },
+                { "label": "K34", "x": 4.25, "y": 3 },
+                { "label": "K35", "x": 5.25, "y": 3 },
+                { "label": "K36", "x": 6.25, "y": 3 },
+                { "label": "K37", "x": 7.25, "y": 3 },
+                { "label": "K38", "x": 8.25, "y": 3 },
+                { "label": "K39", "x": 9.25, "y": 3 },
+                { "label": "K3A", "x": 10.25, "y": 3 },
+                { "label": "K3B", "x": 11.25, "y": 3 },
+                { "label": "K3C", "x": 12.25, "y": 3, "w": 1.75 },
+                { "label": "K3E", "x": 14, "y": 3 },
+                { "label": "K3F", "x": 15, "y": 3 },
+
+                { "label": "K40", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "K41", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "K42", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "K56", "x": 3.75, "y": 4, "w": 6.25 },
+                { "label": "K5A", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "K5B", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "K5D", "x": 13, "y": 4 },
+                { "label": "K5E", "x": 14, "y": 4 },
+                { "label": "K5F", "x": 15, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/mode/m65s/README.md b/keyboards/mode/m65s/readme.md
index 2fa0ed1681..92e0b8421e 100644
--- a/keyboards/mode/m65s/README.md
+++ b/keyboards/mode/m65s/readme.md
@@ -1,12 +1,12 @@
 # Mode SixtyFive M65S
 
-![MODE65](https://raw.githubusercontent.com/Gondolindrim/file_hosting/main/mode_sixtyfive/Group_95_1024x1024.jpg)\
+![MODE65](https://raw.githubusercontent.com/Gondolindrim/file_hosting/main/mode_sixtyfive/Group_95_1024x1024.jpg)
 
-The M65S is the sodlerable PCB for the Mode SixtyFive keyboard, s sixty-five-percent high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
+The M65S is the solderable PCB for the Mode SixtyFive keyboard, a sixty-five-percent high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
 
-* Keyboard Maintainer: [Gondolindrim](https://github.com/gondolindrim)
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
 * Hardware Supported: proprietary PCB using STM32F401RBT6 controller
-* Hardware Availability: you can get a Mode SixtyFive as of today (august. 2021) through the in stock sales or special groupbuy editions at https://shop.modedesigns.com/
+* Hardware Availability: you can get a Mode SixtyFive as of today (August 2021) through the in-stock sales or special group buy editions at [Mode Designs](https://shop.modedesigns.com/)
 
 Make example for this keyboard (after setting up your build environment):