From 27d1e2909f3fa28b69b86728d32a5bd3360c47a8 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 29 Jun 2021 16:30:48 -0700
Subject: Ergocheap handwired Layout Macro refactor (#13348)

* physically arrange layout macro

Arranges the layout macro and keycodes to resemble the assembled keyboard.

* update info.json data
---
 keyboards/handwired/ergocheap/ergocheap.h          | 21 +++---
 keyboards/handwired/ergocheap/info.json            | 84 ++++++++++++++++++++--
 .../handwired/ergocheap/keymaps/default/keymap.c   | 22 +++---
 keyboards/handwired/ergocheap/keymaps/via/keymap.c | 44 ++++++------
 4 files changed, 117 insertions(+), 54 deletions(-)

diff --git a/keyboards/handwired/ergocheap/ergocheap.h b/keyboards/handwired/ergocheap/ergocheap.h
index 72f3775618..106fa45328 100644
--- a/keyboards/handwired/ergocheap/ergocheap.h
+++ b/keyboards/handwired/ergocheap/ergocheap.h
@@ -27,16 +27,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define LAYOUT( \
-       K00, K01, K02,                                             K0B, K0D, K0E,      K0F,      \
-      K10,    K11,   K03, K04, K05, K06,        K07, K08, K09, K0A,    K1B, K1D, K1E,   K1F,    \
-     K20,     K21,K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K2B, K2D, K2E,       K2F, \
-    K30,       K31,K22, K23, K24, K25,        K26, K27, K28, K29,     K3B, K3D,   K3E,  K3F,    \
-    K40,              K32, K33, K34, K35,       K36, K37, K38, K39, K4B,     K4D, K4E, K4F,     \
-                      K42,  K44,      K45,   K46, K47,          K48                                  \
+    K00, K01, K02, K03, K04, K05, K06,        K07, K08, K09, K0A, K0B, K0D, K0E, K0F, \
+    K10, K11, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2B, K2D,      K2E, K2F, \
+    K30,      K31, K32, K33, K34, K35,        K36, K37, K38, K39, K3B, K3D, K3E, K3F, \
+    K40,           K42,      K44, K45,        K46,      K47, K48, K4B, K4D, K4E, K4F  \
 ) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,    K0D,   K0E,   K0F,    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,    K1D,   K1E,   K1F,    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   KC_NO, K2B,    K2D,   K2E,   K2F,    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   KC_NO, K3B,    K3D,   K3E,   K3F,    }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   K45,   K46,   K47,   K48,   KC_NO, KC_NO, K4B,    K4D,   K4E,   K4F     } \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,    K0D,   K0E,   K0F }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,    K1D,   K1E,   K1F }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   KC_NO, K2B,    K2D,   K2E,   K2F }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   KC_NO, K3B,    K3D,   K3E,   K3F }, \
+    { K40,   KC_NO, K42,   KC_NO, K44,   K45,   K46,   K47,   K48,   KC_NO, KC_NO, K4B,    K4D,   K4E,   K4F }  \
 }
diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json
index 2bf09653aa..12223fa023 100644
--- a/keyboards/handwired/ergocheap/info.json
+++ b/keyboards/handwired/ergocheap/info.json
@@ -1,12 +1,82 @@
 {
-    "keyboard_name": "Ergocheap", 
-    "url": "", 
-    "maintainer": "xSteins", 
-    "width": 17.8, 
-    "height": 11.85, 
+    "keyboard_name": "Ergocheap",
+    "url": "",
+    "maintainer": "xSteins",
+    "width": 20.75,
+    "height": 5,
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"0,12", "x":13.47, "y":0}, {"label":"0,13", "x":14.5, "y":0, "w":2}, {"label":"0,14", "x":16.5, "y":0}, {"label":"0,0", "x":0.75, "y":0.25}, {"label":"0,1", "x":1.75, "y":0.25}, {"label":"1,11", "x":13.1, "y":1}, {"label":"1,12", "x":14.1, "y":1}, {"label":"1,13", "x":15.1, "y":1, "w":1.5}, {"label":"1,14", "x":16.6, "y":1}, {"label":"1,0", "x":0.5, "y":1.25, "w":1.5}, {"label":"1,1", "x":2, "y":1.25}, {"label":"2,11", "x":13.55, "y":2}, {"label":"2,12", "x":14.55, "y":2, "w":2.25}, {"label":"2,13", "x":16.8, "y":2}, {"label":"2,0", "x":0.25, "y":2.25, "w":1.75}, {"label":"2,1", "x":2, "y":2.25}, {"label":"3,11", "x":13.05, "y":3}, {"label":"3,12", "x":14.05, "y":3, "w":1.75}, {"label":"3,13", "x":15.75, "y":3}, {"label":"3,14", "x":16.75, "y":3}, {"label":"3,0", "x":0.1, "y":3.25, "w":2.25}, {"label":"3,1", "x":2.35, "y":3.25}, {"label":"4,8", "x":13.5, "y":4, "w":1.25}, {"label":"4,12", "x":14.75, "y":4}, {"label":"4,13", "x":15.75, "y":4}, {"label":"4,14", "x":16.75, "y":4}, {"label":"4,0", "x":0.1, "y":4.25, "w":1.25}, {"label":"0,11", "x":2.45, "y":5.25}, {"label":"0,2", "x":-7.25, "y":5.35}, {"label":"0,3", "x":-5.1, "y":4.1}, {"label":"0,4", "x":-4.1, "y":4.1}, {"label":"0,5", "x":-3.0999999999999996, "y":4.1}, {"label":"0,6", "x":-2.0999999999999996, "y":4.1}, {"label":"1,2", "x":-5.7, "y":5.1}, {"label":"1,3", "x":-4.7, "y":5.1}, {"label":"1,4", "x":-3.7, "y":5.1}, {"label":"1,5", "x":-2.7, "y":5.1}, {"label":"2,2", "x":-5.45, "y":6.1}, {"label":"2,3", "x":-4.45, "y":6.1}, {"label":"2,4", "x":-3.45, "y":6.1}, {"label":"2,5", "x":-2.45, "y":6.1}, {"label":"3,2", "x":-4.85, "y":7.1}, {"label":"3,3", "x":-3.8499999999999996, "y":7.1}, {"label":"3,4", "x":-2.8499999999999996, "y":7.1}, {"label":"3,5", "x":-1.8499999999999996, "y":7.1}, {"label":"4,2", "x":-4.9, "y":8.1, "w":1.25}, {"label":"4,4", "x":-3.6500000000000004, "y":8.1, "w":2}, {"label":"4,5", "x":-1.6500000000000004, "y":8.1, "w":1.25}, {"label":"0,7", "x":0.3, "y":6.85}, {"label":"0,8", "x":1.3, "y":6.85}, {"label":"0,9", "x":2.3, "y":6.85}, {"label":"0,10", "x":3.3, "y":6.85}, {"label":"1,6", "x":-0.2, "y":7.85}, {"label":"1,7", "x":0.7999999999999999, "y":7.85}, {"label":"1,8", "x":1.8, "y":7.85}, {"label":"1,9", "x":2.8, "y":7.85}, {"label":"1,10", "x":3.8, "y":7.85}, {"label":"2,6", "x":0.05, "y":8.85}, {"label":"2,7", "x":1.05, "y":8.85}, {"label":"2,8", "x":2.05, "y":8.85}, {"label":"2,9", "x":3.05, "y":8.85}, {"label":"2,10", "x":4, "y":8.85}, {"label":"3,6", "x":0.3, "y":9.85}, {"label":"3,7", "x":1.3, "y":9.85}, {"label":"3,8", "x":2.3, "y":9.85}, {"label":"3,9", "x":3.3, "y":9.85}, {"label":"4,6", "x":-0.2, "y":10.85, "w":2.75}, {"label":"4,7", "x":2.5, "y":10.85, "w":1.25}]
+            "layout": [
+                {"label":"ESC", "x":0.75, "y":0},
+                {"label":"1", "x":1.75, "y":0},
+                {"label":"2", "x":2.75, "y":0},
+                {"label":"3", "x":4.25, "y":0},
+                {"label":"4", "x":5.25, "y":0},
+                {"label":"5", "x":6.25, "y":0},
+                {"label":"6", "x":7.25, "y":0},
+                {"label":"7", "x":10.5, "y":0},
+                {"label":"8", "x":11.5, "y":0},
+                {"label":"9", "x":12.5, "y":0},
+                {"label":"0", "x":13.5, "y":0},
+                {"label":"MINS", "x":14.5, "y":0},
+                {"label":"EQL", "x":16, "y":0},
+                {"label":"BSPC", "x":17, "y":0, "w":2},
+                {"label":"GRV", "x":19, "y":0},
+                {"label":"TAB", "x":0.5, "y":1, "w":1.5},
+                {"label":"Q", "x":2, "y":1},
+                {"label":"W", "x":3.75, "y":1},
+                {"label":"E", "x":4.75, "y":1},
+                {"label":"R", "x":5.75, "y":1},
+                {"label":"T", "x":6.75, "y":1},
+                {"label":"Y", "x":10, "y":1},
+                {"label":"U", "x":11, "y":1},
+                {"label":"I", "x":12, "y":1},
+                {"label":"O", "x":13, "y":1},
+                {"label":"P", "x":14, "y":1},
+                {"label":"LBRC", "x":16, "y":1},
+                {"label":"RBRC", "x":17, "y":1},
+                {"label":"BSLS", "x":18, "y":1, "w":1.5},
+                {"label":"DEL", "x":19.5, "y":1},
+                {"label":"CAPS", "x":0.25, "y":2, "w":1.75},
+                {"label":"A", "x":2, "y":2},
+                {"label":"S", "x":4, "y":2},
+                {"label":"D", "x":5, "y":2},
+                {"label":"F", "x":6, "y":2},
+                {"label":"G", "x":7, "y":2},
+                {"label":"H", "x":10.25, "y":2},
+                {"label":"J", "x":11.25, "y":2},
+                {"label":"K", "x":12.25, "y":2},
+                {"label":"L", "x":13.25, "y":2},
+                {"label":"SCLN", "x":15.5, "y":2},
+                {"label":"QUOT", "x":16.5, "y":2},
+                {"label":"ENT", "x":17.5, "y":2, "w":2.25},
+                {"label":"HOME", "x":19.75, "y":2},
+                {"label":"LSFT", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":4.5, "y":3},
+                {"label":"C", "x":5.5, "y":3},
+                {"label":"V", "x":6.5, "y":3},
+                {"label":"B", "x":7.5, "y":3},
+                {"label":"N", "x":10.5, "y":3},
+                {"label":"M", "x":11.5, "y":3},
+                {"label":"COMM", "x":12.5, "y":3},
+                {"label":"DOT", "x":13.5, "y":3},
+                {"label":"SLSH", "x":15.75, "y":3},
+                {"label":"TO(_FN1)", "x":16.75, "y":3, "w":1.25},
+                {"label":"UP", "x":18, "y":3},
+                {"label":"END", "x":19.5, "y":3},
+                {"label":"LCTL", "x":0, "y":4, "w":1.25},
+                {"label":"LALT", "x":4.5, "y":4, "w":1.25},
+                {"label":"SPC", "x":5.75, "y":4, "w":2},
+                {"label":"MO(_FN1)", "x":7.75, "y":4, "w":1.25},
+                {"label":"SPC", "x":10, "y":4, "w":1.75},
+                {"label":"SPC", "x":11.75, "y":4},
+                {"label":"MO(_FN1)", "x":12.75, "y":4, "w":1.25},
+                {"label":"LGUI", "x":15.5, "y":4, "w":1.25},
+                {"label":"LEFT", "x":17, "y":4},
+                {"label":"DOWN", "x":18, "y":4},
+                {"label":"RGHT", "x":19, "y":4}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/ergocheap/keymaps/default/keymap.c b/keyboards/handwired/ergocheap/keymaps/default/keymap.c
index dc70f4f278..15753dabd7 100644
--- a/keyboards/handwired/ergocheap/keymaps/default/keymap.c
+++ b/keyboards/handwired/ergocheap/keymaps/default/keymap.c
@@ -24,19 +24,17 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,                                                                     KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
-        KC_TAB,  KC_Q,    KC_3,    KC_4,    KC_5,    KC_6,      KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPS, KC_A,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
-        KC_LSFT, KC_Z,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SLSH, TO(_FN1), KC_UP,  KC_END,
-        KC_LCTL, KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT,
-                 KC_LALT, KC_SPC,           MO(_FN1),KC_SPC,    KC_SPC,           MO(_FN1)
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,    KC_BSPC, KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC, KC_RBRC,   KC_BSLS, KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,            KC_ENT,  KC_HOME,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                 KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, TO(_FN1),  KC_UP,   KC_END,
+        KC_LCTL,                   KC_LALT,          KC_SPC,  MO(_FN1),             KC_SPC,           KC_SPC,  MO(_FN1), KC_LGUI, KC_LEFT,   KC_DOWN, KC_RGHT
     ),
     [_FN1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,                                                                    KC_F11,  KC_F12,    _______,     _______,
-        _______, _______, KC_F3,   KC_F4,   KC_F5,   KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_UP,   _______,   _______,     _______,
-        KC_LCTL, _______, _______, _______, _______, _______,   _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LEFT,   KC_RIGHT,    _______, _______,
-        KC_LSFT, KC_LEFT, KC_S,    _______, _______, _______,   _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_DOWN, TO(_BASE), KC_MS_WH_UP, _______,
-        _______, KC_UP,   KC_DOWN, KC_RGHT, _______,            _______, _______, _______, _______, _______, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT,
-                 KC_LGUI, _______,          _______, _______,   _______,          _______
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,    _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_UP,   _______,   _______, _______,
+        KC_LCTL, _______, KC_S,    _______, _______, _______,              _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_LEFT,  KC_RGHT, _______,   _______,
+        KC_LSFT,          KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______,              _______, _______, _______, _______,  KC_DOWN, TO(_BASE), KC_WH_U, _______,
+        _______,                   KC_LGUI,          _______, _______,              _______,          _______, _______,  _______, KC_WH_L,   KC_WH_D, KC_WH_R
     )
 };
diff --git a/keyboards/handwired/ergocheap/keymaps/via/keymap.c b/keyboards/handwired/ergocheap/keymaps/via/keymap.c
index 6f56f52f65..35d5826a14 100644
--- a/keyboards/handwired/ergocheap/keymaps/via/keymap.c
+++ b/keyboards/handwired/ergocheap/keymaps/via/keymap.c
@@ -26,35 +26,31 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,                                                                     KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
-        KC_TAB,  KC_Q,    KC_3,    KC_4,    KC_5,    KC_6,      KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPS, KC_A,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
-        KC_LSFT, KC_Z,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SLSH, TO(_FN1), KC_UP,  KC_END,
-        KC_LCTL, KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT,
-                 KC_LALT, KC_SPC,           MO(_FN1),KC_SPC,    KC_SPC,           MO(_FN1)
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,    KC_BSPC, KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC, KC_RBRC,   KC_BSLS, KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,            KC_ENT,  KC_HOME,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                 KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, TO(_FN1),  KC_UP,   KC_END,
+        KC_LCTL,                   KC_LALT,          KC_SPC,  MO(_FN1),             KC_SPC,           KC_SPC,  MO(_FN1), KC_LGUI, KC_LEFT,   KC_DOWN, KC_RGHT
     ),
     [_FN1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,                                                                    KC_F11,  KC_F12,    _______,     _______,
-        _______, _______, KC_F3,   KC_F4,   KC_F5,   KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_UP,   _______,   _______,     _______,
-        KC_LCTL, _______, _______, _______, _______, _______,   _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LEFT,   KC_RIGHT,    _______, _______,
-        KC_LSFT, KC_LEFT, KC_S,    _______, _______, _______,   _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_DOWN, TO(_BASE), KC_MS_WH_UP, _______,
-        _______, KC_UP,   KC_DOWN, KC_RGHT, _______,            _______, _______, _______, _______, _______, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT,
-                 KC_LGUI, _______,          _______, _______,   _______,          _______
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,    _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_UP,   _______,   _______, _______,
+        KC_LCTL, _______, KC_S,    _______, _______, _______,              _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_LEFT,  KC_RGHT,            _______, _______,
+        KC_LSFT,          KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______,              _______, _______, _______, _______,  KC_DOWN, TO(_BASE), KC_WH_U, _______,
+        _______,                   KC_LGUI,          _______, _______,              _______,          _______, _______,  _______, KC_WH_L,   KC_WH_D, KC_WH_R
     ),
     [_FN2] = LAYOUT(
-        _______, _______, _______,                                                                  _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,            _______, _______, _______, _______, _______, _______, _______, _______,
-                 _______, _______,          _______, _______,   _______,          _______
+        _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,  _______,            _______, _______,
+        _______,          _______, _______, _______, _______, _______,              _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______,                   _______,          _______, _______,              _______,          _______, _______,  _______, _______,   _______, _______
     ),
     [_FN3] = LAYOUT(
-        _______, _______, _______,                                                                  _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,            _______, _______, _______, _______, _______, _______, _______, _______,
-                 _______, _______,          _______, _______,   _______,          _______
+        _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,  _______,            _______, _______,
+        _______,          _______, _______, _______, _______, _______,              _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______,                   _______,          _______, _______,              _______,          _______, _______,  _______, _______,   _______, _______
     )
 };
-- 
cgit v1.2.3