From e8b7cee9d321d24467fe408f2915cc69a44bcc4d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 28 Sep 2021 03:46:10 +1000
Subject: SquishyTKL: Layouts cleanup (#14594)

---
 keyboards/ramonimbao/squishytkl/info.json | 802 ++++++++++++++++--------------
 1 file changed, 416 insertions(+), 386 deletions(-)

(limited to 'keyboards/ramonimbao/squishytkl/info.json')

diff --git a/keyboards/ramonimbao/squishytkl/info.json b/keyboards/ramonimbao/squishytkl/info.json
index caf45d6319..aa19c73fa8 100644
--- a/keyboards/ramonimbao/squishytkl/info.json
+++ b/keyboards/ramonimbao/squishytkl/info.json
@@ -5,404 +5,434 @@
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1.25, "y":0.5},
-                {"x":2.25, "y":0.5},
-                {"x":3.25, "y":0.5},
-                {"x":4.25, "y":0.5},
-                {"x":5.5, "y":0.5},
-                {"x":6.5, "y":0.5},
-                {"x":7.5, "y":0.5},
-                {"x":8.5, "y":0.5},
-                {"x":9.75, "y":0.5},
-                {"x":10.75, "y":0.5},
-                {"x":11.75, "y":0.5},
-                {"x":12.75, "y":0.5},
-                {"x":14, "y":0.5},
-                {"x":15.25, "y":0.5},
-                {"x":16.25, "y":0.5},
-                {"x":17.25, "y":0.5},
-
-                {"x":0, "y":1.75},
-                {"x":1, "y":1.75},
-                {"x":2, "y":1.75},
-                {"x":3, "y":1.75},
-                {"x":4, "y":1.75},
-                {"x":5, "y":1.75},
-                {"x":6, "y":1.75},
-                {"x":7, "y":1.75},
-                {"x":8, "y":1.75},
-                {"x":9, "y":1.75},
-                {"x":10, "y":1.75},
-                {"x":11, "y":1.75},
-                {"x":12, "y":1.75},
-                {"x":13, "y":1.75, "w":2},
-                {"x":15.25, "y":1.75},
-                {"x":16.25, "y":1.75},
-                {"x":17.25, "y":1.75},
-
-                {"x":0, "y":2.75, "w":1.5},
-                {"x":1.5, "y":2.75},
-                {"x":2.5, "y":2.75},
-                {"x":3.5, "y":2.75},
-                {"x":4.5, "y":2.75},
-                {"x":5.5, "y":2.75},
-                {"x":6.5, "y":2.75},
-                {"x":7.5, "y":2.75},
-                {"x":8.5, "y":2.75},
-                {"x":9.5, "y":2.75},
-                {"x":10.5, "y":2.75},
-                {"x":11.5, "y":2.75},
-                {"x":12.5, "y":2.75},
-                {"x":13.5, "y":2.75, "w":1.5},
-                {"x":15.25, "y":2.75},
-                {"x":16.25, "y":2.75},
-                {"x":17.25, "y":2.75},
-
-                {"x":0, "y":3.75, "w":1.75},
-                {"x":1.75, "y":3.75},
-                {"x":2.75, "y":3.75},
-                {"x":3.75, "y":3.75},
-                {"x":4.75, "y":3.75},
-                {"x":5.75, "y":3.75},
-                {"x":6.75, "y":3.75},
-                {"x":7.75, "y":3.75},
-                {"x":8.75, "y":3.75},
-                {"x":9.75, "y":3.75},
-                {"x":10.75, "y":3.75},
-                {"x":11.75, "y":3.75},
-                {"x":12.75, "y":3.75, "w":2.25},
-
-                {"x":0, "y":4.75, "w":2.25},
-                {"x":2.25, "y":4.75},
-                {"x":3.25, "y":4.75},
-                {"x":4.25, "y":4.75},
-                {"x":5.25, "y":4.75},
-                {"x":6.25, "y":4.75},
-                {"x":7.25, "y":4.75},
-                {"x":8.25, "y":4.75},
-                {"x":9.25, "y":4.75},
-                {"x":10.25, "y":4.75},
-                {"x":11.25, "y":4.75},
-                {"x":12.25, "y":4.75, "w":2.75},
-                {"x":16.25, "y":4.75},
-
-                {"x":0, "y":5.75, "w":1.25},
-                {"x":1.25, "y":5.75, "w":1.25},
-                {"x":2.5, "y":5.75, "w":1.25},
-                {"x":3.75, "y":5.75, "w":6.25},
-                {"x":10, "y":5.75, "w":1.25},
-                {"x":11.25, "y":5.75, "w":1.25},
-                {"x":12.5, "y":5.75, "w":1.25},
-                {"x":13.75, "y":5.75, "w":1.25},
-                {"x":15.25, "y":5.75},
-                {"x":16.25, "y":5.75},
-                {"x":17.25, "y":5.75}
+                {"x": 0, "y": 0},
+
+                {"x": 1.25, "y": 0},
+                {"x": 2.25, "y": 0},
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+
+                {"x": 9.75, "y": 0},
+                {"x": 10.75, "y": 0},
+                {"x": 11.75, "y": 0},
+                {"x": 12.75, "y": 0},
+
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"x": 0, "y": 4.25, "w": 2.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1.25, "y":0.5},
-                {"x":2.25, "y":0.5},
-                {"x":3.25, "y":0.5},
-                {"x":4.25, "y":0.5},
-                {"x":5.5, "y":0.5},
-                {"x":6.5, "y":0.5},
-                {"x":7.5, "y":0.5},
-                {"x":8.5, "y":0.5},
-                {"x":9.75, "y":0.5},
-                {"x":10.75, "y":0.5},
-                {"x":11.75, "y":0.5},
-                {"x":12.75, "y":0.5},
-                {"x":14, "y":0.5},
-                {"x":15.25, "y":0.5},
-                {"x":16.25, "y":0.5},
-                {"x":17.25, "y":0.5},
-
-                {"x":0, "y":1.75},
-                {"x":1, "y":1.75},
-                {"x":2, "y":1.75},
-                {"x":3, "y":1.75},
-                {"x":4, "y":1.75},
-                {"x":5, "y":1.75},
-                {"x":6, "y":1.75},
-                {"x":7, "y":1.75},
-                {"x":8, "y":1.75},
-                {"x":9, "y":1.75},
-                {"x":10, "y":1.75},
-                {"x":11, "y":1.75},
-                {"x":12, "y":1.75},
-                {"x":13, "y":1.75, "w":2},
-                {"x":15.25, "y":1.75},
-                {"x":16.25, "y":1.75},
-                {"x":17.25, "y":1.75},
-
-                {"x":0, "y":2.75, "w":1.5},
-                {"x":1.5, "y":2.75},
-                {"x":2.5, "y":2.75},
-                {"x":3.5, "y":2.75},
-                {"x":4.5, "y":2.75},
-                {"x":5.5, "y":2.75},
-                {"x":6.5, "y":2.75},
-                {"x":7.5, "y":2.75},
-                {"x":8.5, "y":2.75},
-                {"x":9.5, "y":2.75},
-                {"x":10.5, "y":2.75},
-                {"x":11.5, "y":2.75},
-                {"x":12.5, "y":2.75},
-                {"x":15.25, "y":2.75},
-                {"x":16.25, "y":2.75},
-                {"x":17.25, "y":2.75},
-
-                {"x":0, "y":3.75, "w":1.75},
-                {"x":1.75, "y":3.75},
-                {"x":2.75, "y":3.75},
-                {"x":3.75, "y":3.75},
-                {"x":4.75, "y":3.75},
-                {"x":5.75, "y":3.75},
-                {"x":6.75, "y":3.75},
-                {"x":7.75, "y":3.75},
-                {"x":8.75, "y":3.75},
-                {"x":9.75, "y":3.75},
-                {"x":10.75, "y":3.75},
-                {"x":11.75, "y":3.75},
-                {"x":12.75, "y":3.75},
-                {"x":13.75, "y":2.75, "w":1.25, "h":2},
-
-                {"x":0, "y":4.75, "w":1.25},
-                {"x":1.25, "y":4.75},
-                {"x":2.25, "y":4.75},
-                {"x":3.25, "y":4.75},
-                {"x":4.25, "y":4.75},
-                {"x":5.25, "y":4.75},
-                {"x":6.25, "y":4.75},
-                {"x":7.25, "y":4.75},
-                {"x":8.25, "y":4.75},
-                {"x":9.25, "y":4.75},
-                {"x":10.25, "y":4.75},
-                {"x":11.25, "y":4.75},
-                {"x":12.25, "y":4.75, "w":2.75},
-                {"x":16.25, "y":4.75},
-
-                {"x":0, "y":5.75, "w":1.25},
-                {"x":1.25, "y":5.75, "w":1.25},
-                {"x":2.5, "y":5.75, "w":1.25},
-                {"x":3.75, "y":5.75, "w":6.25},
-                {"x":10, "y":5.75, "w":1.25},
-                {"x":11.25, "y":5.75, "w":1.25},
-                {"x":12.5, "y":5.75, "w":1.25},
-                {"x":13.75, "y":5.75, "w":1.25},
-                {"x":15.25, "y":5.75},
-                {"x":16.25, "y":5.75},
-                {"x":17.25, "y":5.75}
+                {"x": 0, "y": 0},
+
+                {"x": 1.25, "y": 0},
+                {"x": 2.25, "y": 0},
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+
+                {"x": 9.75, "y": 0},
+                {"x": 10.75, "y": 0},
+                {"x": 11.75, "y": 0},
+                {"x": 12.75, "y": 0},
+
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_jis": {
             "layout": [
-                {"x":0, "y":0}, 
-                {"x":1.25, "y":0}, 
-                {"x":2.25, "y":0}, 
-                {"x":3.25, "y":0}, 
-                {"x":4.25, "y":0}, 
-                {"x":5.5, "y":0}, 
-                {"x":6.5, "y":0}, 
-                {"x":7.5, "y":0}, 
-                {"x":8.5, "y":0}, 
-                {"x":9.75, "y":0}, 
-                {"x":10.75, "y":0}, 
-                {"x":11.75, "y":0}, 
-                {"x":12.75, "y":0}, 
-                {"x":14, "y":0}, 
-                {"x":15.25, "y":0}, 
-                {"x":16.25, "y":0}, 
-                {"x":17.25, "y":0}, 
-                
-                {"x":0, "y":1.25}, 
-                {"x":1, "y":1.25}, 
-                {"x":2, "y":1.25}, 
-                {"x":3, "y":1.25}, 
-                {"x":4, "y":1.25}, 
-                {"x":5, "y":1.25}, 
-                {"x":6, "y":1.25}, 
-                {"x":7, "y":1.25}, 
-                {"x":8, "y":1.25}, 
-                {"x":9, "y":1.25}, 
-                {"x":10, "y":1.25}, 
-                {"x":11, "y":1.25}, 
-                {"x":12, "y":1.25}, 
-                {"x":13, "y":1.25}, 
-                {"x":14, "y":1.25}, 
-                {"x":15.25, "y":1.25}, 
-                {"x":16.25, "y":1.25}, 
-                {"x":17.25, "y":1.25}, 
-
-                {"x":0, "y":2.25, "w":1.5}, 
-                {"x":1.5, "y":2.25}, 
-                {"x":2.5, "y":2.25}, 
-                {"x":3.5, "y":2.25}, 
-                {"x":4.5, "y":2.25}, 
-                {"x":5.5, "y":2.25}, 
-                {"x":6.5, "y":2.25}, 
-                {"x":7.5, "y":2.25}, 
-                {"x":8.5, "y":2.25}, 
-                {"x":9.5, "y":2.25}, 
-                {"x":10.5, "y":2.25}, 
-                {"x":11.5, "y":2.25}, 
-                {"x":12.5, "y":2.25}, 
-                {"x":15.25, "y":2.25}, 
-                {"x":16.25, "y":2.25}, 
-                {"x":17.25, "y":2.25}, 
-
-                {"x":0, "y":3.25, "w":1.75}, 
-                {"x":1.75, "y":3.25}, 
-                {"x":2.75, "y":3.25}, 
-                {"x":3.75, "y":3.25}, 
-                {"x":4.75, "y":3.25}, 
-                {"x":5.75, "y":3.25}, 
-                {"x":6.75, "y":3.25}, 
-                {"x":7.75, "y":3.25}, 
-                {"x":8.75, "y":3.25}, 
-                {"x":9.75, "y":3.25}, 
-                {"x":10.75, "y":3.25}, 
-                {"x":11.75, "y":3.25}, 
-                {"x":12.75, "y":3.25}, 
-                {"x":13.75, "y":2.25, "w":1.25, "h":2}, 
-                
-                {"x":0, "y":4.25, "w":2.25}, 
-                {"x":2.25, "y":4.25}, 
-                {"x":3.25, "y":4.25}, 
-                {"x":4.25, "y":4.25}, 
-                {"x":5.25, "y":4.25}, 
-                {"x":6.25, "y":4.25}, 
-                {"x":7.25, "y":4.25}, 
-                {"x":8.25, "y":4.25}, 
-                {"x":9.25, "y":4.25}, 
-                {"x":10.25, "y":4.25}, 
-                {"x":11.25, "y":4.25}, 
-                {"x":12.25, "y":4.25}, 
-                {"x":13.25, "y":4.25, "w":1.75}, 
-                {"x":16.25, "y":4.25}, 
-
-                {"x":0, "y":5.25, "w":1.5}, 
-                {"x":1.5, "y":5.25}, 
-                {"x":2.5, "y":5.25, "w":1.5}, 
-                {"x":4, "y":5.25}, 
-                {"x":5, "y":5.25}, 
-                {"x":6, "y":5.25, "w":3}, 
-                {"x":9, "y":5.25}, 
-                {"x":10, "y":5.25}, 
-                {"x":11, "y":5.25, "w":1.5}, 
-                {"x":12.5, "y":5.25}, 
-                {"x":13.5, "y":5.25, "w":1.5}, 
-                {"x":15.25, "y":5.25}, 
-                {"x":16.25, "y":5.25}, 
-                {"x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+                {"x": 1.25, "y": 0},
+                {"x": 2.25, "y": 0},
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.75, "y": 0},
+                {"x": 10.75, "y": 0},
+                {"x": 11.75, "y": 0},
+                {"x": 12.75, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25},
+                {"x": 14, "y": 1.25},
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 4.25, "w": 2.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25},
+                {"x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.5},
+                {"x": 1.5, "y": 5.25},
+                {"x": 2.5, "y": 5.25, "w": 1.5},
+                {"x": 4, "y": 5.25},
+                {"x": 5, "y": 5.25},
+                {"x": 6, "y": 5.25, "w": 3},
+                {"x": 9, "y": 5.25},
+                {"x": 10, "y": 5.25},
+                {"x": 11, "y": 5.25, "w": 1.5},
+                {"x": 12.5, "y": 5.25},
+                {"x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1.25, "y":0.5},
-                {"x":2.25, "y":0.5},
-                {"x":3.25, "y":0.5},
-                {"x":4.25, "y":0.5},
-                {"x":5.5, "y":0.5},
-                {"x":6.5, "y":0.5},
-                {"x":7.5, "y":0.5},
-                {"x":8.5, "y":0.5},
-                {"x":9.75, "y":0.5},
-                {"x":10.75, "y":0.5},
-                {"x":11.75, "y":0.5},
-                {"x":12.75, "y":0.5},
-                {"x":14, "y":0.5},
-                {"x":15.25, "y":0.5},
-                {"x":16.25, "y":0.5},
-                {"x":17.25, "y":0.5},
-
-                {"x":0, "y":1.75},
-                {"x":1, "y":1.75},
-                {"x":2, "y":1.75},
-                {"x":3, "y":1.75},
-                {"x":4, "y":1.75},
-                {"x":5, "y":1.75},
-                {"x":6, "y":1.75},
-                {"x":7, "y":1.75},
-                {"x":8, "y":1.75},
-                {"x":9, "y":1.75},
-                {"x":10, "y":1.75},
-                {"x":11, "y":1.75},
-                {"x":12, "y":1.75},
-                {"x":13, "y":1.75},
-                {"x":14, "y":1.75},
-                {"x":15.25, "y":1.75},
-                {"x":16.25, "y":1.75},
-                {"x":17.25, "y":1.75},
-
-                {"x":0, "y":2.75, "w":1.5},
-                {"x":1.5, "y":2.75},
-                {"x":2.5, "y":2.75},
-                {"x":3.5, "y":2.75},
-                {"x":4.5, "y":2.75},
-                {"x":5.5, "y":2.75},
-                {"x":6.5, "y":2.75},
-                {"x":7.5, "y":2.75},
-                {"x":8.5, "y":2.75},
-                {"x":9.5, "y":2.75},
-                {"x":10.5, "y":2.75},
-                {"x":11.5, "y":2.75},
-                {"x":12.5, "y":2.75},
-                {"x":13.5, "y":2.75, "w":1.5},
-                {"x":15.25, "y":2.75},
-                {"x":16.25, "y":2.75},
-                {"x":17.25, "y":2.75},
-
-                {"x":0, "y":3.75, "w":1.75},
-                {"x":1.75, "y":3.75},
-                {"x":2.75, "y":3.75},
-                {"x":3.75, "y":3.75},
-                {"x":4.75, "y":3.75},
-                {"x":5.75, "y":3.75},
-                {"x":6.75, "y":3.75},
-                {"x":7.75, "y":3.75},
-                {"x":8.75, "y":3.75},
-                {"x":9.75, "y":3.75},
-                {"x":10.75, "y":3.75},
-                {"x":11.75, "y":3.75},
-                {"x":12.75, "y":3.75, "w":2.25},
-
-                {"x":0, "y":4.75, "w":1.25},
-                {"x":1.25, "y":4.75},
-                {"x":2.25, "y":4.75},
-                {"x":3.25, "y":4.75},
-                {"x":4.25, "y":4.75},
-                {"x":5.25, "y":4.75},
-                {"x":6.25, "y":4.75},
-                {"x":7.25, "y":4.75},
-                {"x":8.25, "y":4.75},
-                {"x":9.25, "y":4.75},
-                {"x":10.25, "y":4.75},
-                {"x":11.25, "y":4.75},
-                {"x":12.25, "y":4.75, "w":1.75},
-                {"x":14, "y":4.75},
-                {"x":16.25, "y":4.75},
-
-                {"x":0, "y":5.75, "w":1.25},
-                {"x":1.25, "y":5.75, "w":1.25},
-                {"x":2.5, "y":5.75, "w":1.25},
-                {"x":3.75, "y":5.75, "w":2.5},
-                {"x":6.25, "y":5.75},
-                {"x":7.25, "y":5.75, "w":2.75},
-                {"x":10, "y":5.75, "w":1.25},
-                {"x":11.25, "y":5.75, "w":1.25},
-                {"x":12.5, "y":5.75, "w":1.25},
-                {"x":13.75, "y":5.75, "w":1.25},
-                {"x":15.25, "y":5.75},
-                {"x":16.25, "y":5.75},
-                {"x":17.25, "y":5.75},
-
-                {"x":18.5, "y":0},
-                {"x":18.5, "y":1}
+                {"x": 0, "y": 0.5},
+
+                {"x": 1.25, "y": 0.5},
+                {"x": 2.25, "y": 0.5},
+                {"x": 3.25, "y": 0.5},
+                {"x": 4.25, "y": 0.5},
+
+                {"x": 5.5, "y": 0.5},
+                {"x": 6.5, "y": 0.5},
+                {"x": 7.5, "y": 0.5},
+                {"x": 8.5, "y": 0.5},
+
+                {"x": 9.75, "y": 0.5},
+                {"x": 10.75, "y": 0.5},
+                {"x": 11.75, "y": 0.5},
+                {"x": 12.75, "y": 0.5},
+
+                {"x": 14, "y": 0.5},
+
+                {"x": 15.25, "y": 0.5},
+                {"x": 16.25, "y": 0.5},
+                {"x": 17.25, "y": 0.5},
+
+                {"x": 0, "y": 1.75},
+                {"x": 1, "y": 1.75},
+                {"x": 2, "y": 1.75},
+                {"x": 3, "y": 1.75},
+                {"x": 4, "y": 1.75},
+                {"x": 5, "y": 1.75},
+                {"x": 6, "y": 1.75},
+                {"x": 7, "y": 1.75},
+                {"x": 8, "y": 1.75},
+                {"x": 9, "y": 1.75},
+                {"x": 10, "y": 1.75},
+                {"x": 11, "y": 1.75},
+                {"x": 12, "y": 1.75},
+                {"x": 13, "y": 1.75},
+                {"x": 14, "y": 1.75},
+
+                {"x": 15.25, "y": 1.75},
+                {"x": 16.25, "y": 1.75},
+                {"x": 17.25, "y": 1.75},
+
+                {"x": 0, "y": 2.75, "w": 1.5},
+                {"x": 1.5, "y": 2.75},
+                {"x": 2.5, "y": 2.75},
+                {"x": 3.5, "y": 2.75},
+                {"x": 4.5, "y": 2.75},
+                {"x": 5.5, "y": 2.75},
+                {"x": 6.5, "y": 2.75},
+                {"x": 7.5, "y": 2.75},
+                {"x": 8.5, "y": 2.75},
+                {"x": 9.5, "y": 2.75},
+                {"x": 10.5, "y": 2.75},
+                {"x": 11.5, "y": 2.75},
+                {"x": 12.5, "y": 2.75},
+                {"x": 13.5, "y": 2.75, "w": 1.5},
+
+                {"x": 15.25, "y": 2.75},
+                {"x": 16.25, "y": 2.75},
+                {"x": 17.25, "y": 2.75},
+
+                {"x": 0, "y": 3.75, "w": 1.75},
+                {"x": 1.75, "y": 3.75},
+                {"x": 2.75, "y": 3.75},
+                {"x": 3.75, "y": 3.75},
+                {"x": 4.75, "y": 3.75},
+                {"x": 5.75, "y": 3.75},
+                {"x": 6.75, "y": 3.75},
+                {"x": 7.75, "y": 3.75},
+                {"x": 8.75, "y": 3.75},
+                {"x": 9.75, "y": 3.75},
+                {"x": 10.75, "y": 3.75},
+                {"x": 11.75, "y": 3.75},
+                {"x": 12.75, "y": 3.75, "w": 2.25},
+
+                {"x": 0, "y": 4.75, "w": 1.25},
+                {"x": 1.25, "y": 4.75},
+                {"x": 2.25, "y": 4.75},
+                {"x": 3.25, "y": 4.75},
+                {"x": 4.25, "y": 4.75},
+                {"x": 5.25, "y": 4.75},
+                {"x": 6.25, "y": 4.75},
+                {"x": 7.25, "y": 4.75},
+                {"x": 8.25, "y": 4.75},
+                {"x": 9.25, "y": 4.75},
+                {"x": 10.25, "y": 4.75},
+                {"x": 11.25, "y": 4.75},
+                {"x": 12.25, "y": 4.75, "w": 1.75},
+                {"x": 14, "y": 4.75},
+
+                {"x": 16.25, "y": 4.75},
+
+                {"x": 0, "y": 5.75, "w": 1.25},
+                {"x": 1.25, "y": 5.75, "w": 1.25},
+                {"x": 2.5, "y": 5.75, "w": 1.25},
+                {"x": 3.75, "y": 5.75},
+                {"x": 4.75, "y": 5.75, "w": 1.5},
+                {"x": 6.25, "y": 5.75},
+                {"x": 7.25, "y": 5.75, "w": 2.75},
+                {"x": 10, "y": 5.75, "w": 1.25},
+                {"x": 11.25, "y": 5.75, "w": 1.25},
+                {"x": 12.5, "y": 5.75, "w": 1.25},
+                {"x": 13.75, "y": 5.75, "w": 1.25},
+
+                {"x": 15.25, "y": 5.75},
+                {"x": 16.25, "y": 5.75},
+                {"x": 17.25, "y": 5.75},
+
+                {"x": 18.5, "y": 0},
+                {"x": 18.5, "y": 1}
             ]
         }
     }
-- 
cgit v1.2.3