3 files changed, 52 insertions, 52 deletions

diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json
index 0bbb867ad..f5b1ff38c 100644
--- a/keyboards/handwired/zergo/info.json
+++ b/keyboards/handwired/zergo/info.json
@@ -1,13 +1,13 @@
 {
     "keyboard_name": "zergo", 
-    "url": "", 
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/zergo", 
     "maintainer": "greenjack", 
     "width": 15, 
     "height": 6.25,
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0}, 
+              {"label":"Esc", "x":0, "y":0},
               {"label":"F1", "x":2, "y":0}, 
               {"label":"F2", "x":3, "y":0}, 
               {"label":"F3", "x":4, "y":0}, 
@@ -20,28 +20,28 @@
               {"label":"F10", "x":12, "y":0}, 
               {"label":"F11", "x":13, "y":0}, 
               {"label":"F12", "x":14, "y":0}, 
-              {"label":"Home", "x":0, "y":1.25}, 
-              {"label":"~", "x":1, "y":1.25}, 
-              {"label":"!", "x":2, "y":1.25}, 
-              {"label":"@", "x":3, "y":1.25}, 
-              {"label":"#", "x":4, "y":1.25}, 
-              {"label":"$", "x":5, "y":1.25}, 
-              {"label":"%", "x":6, "y":1.25}, 
-              {"label":"^", "x":7, "y":1.25}, 
-              {"label":"&", "x":8, "y":1.25}, 
-              {"label":"*", "x":9, "y":1.25}, 
-              {"label":"(", "x":10, "y":1.25}, 
-              {"label":")", "x":11, "y":1.25}, 
-              {"label":"_", "x":12, "y":1.25}, 
-              {"label":"+", "x":13, "y":1.25}, 
-              {"label":"PgUp", "x":14, "y":1.25}, 
+              {"label":"Del", "x":0, "y":1.25}, 
+              {"label":"`", "x":1, "y":1.25}, 
+              {"label":"1", "x":2, "y":1.25}, 
+              {"label":"2", "x":3, "y":1.25}, 
+              {"label":"3", "x":4, "y":1.25}, 
+              {"label":"4", "x":5, "y":1.25}, 
+              {"label":"5", "x":6, "y":1.25}, 
+              {"label":"6", "x":7, "y":1.25}, 
+              {"label":"7", "x":8, "y":1.25}, 
+              {"label":"8", "x":9, "y":1.25}, 
+              {"label":"9", "x":10, "y":1.25}, 
+              {"label":"0", "x":11, "y":1.25}, 
+              {"label":"-", "x":12, "y":1.25}, 
+              {"label":"=", "x":13, "y":1.25}, 
+              {"label":"Backspace", "x":14, "y":1.25}, 
               {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
               {"label":"Q", "x":1.5, "y":2.25}, 
               {"label":"W", "x":2.5, "y":2.25}, 
               {"label":"E", "x":3.5, "y":2.25}, 
               {"label":"R", "x":4.5, "y":2.25}, 
               {"label":"T", "x":5.5, "y":2.25}, 
-              {"label":"}", "x":6.5, "y":2.25}, 
+              {"label":"modifier", "x":6.5, "y":2.25}, 
               {"label":"Y", "x":7.5, "y":2.25}, 
               {"label":"U", "x":8.5, "y":2.25}, 
               {"label":"I", "x":9.5, "y":2.25}, 
@@ -49,7 +49,7 @@
               {"label":"P", "x":11.5, "y":2.25}, 
               {"label":"{", "x":12.5, "y":2.25}, 
               {"label":"|", "x":13.5, "y":2.25, "w":1.5}, 
-              {"label":"Ctrl", "x":0, "y":3.25, "w":1.25}, 
+              {"label":"modifier", "x":0, "y":3.25, "w":1.25}, 
               {"label":"A", "x":1.25, "y":3.25}, 
               {"label":"S", "x":2.25, "y":3.25}, 
               {"label":"D", "x":3.25, "y":3.25}, 
@@ -61,32 +61,32 @@
               {"label":"L", "x":10.75, "y":3.25}, 
               {"label":":", "x":11.75, "y":3.25}, 
               {"label":"\"", "x":12.75, "y":3.25}, 
-              {"label":"Ctrl", "x":13.75, "y":3.25, "w":1.25}, 
-              {"label":"End", "x":0, "y":4.25}, 
-              {"label":"\u2191", "x":1, "y":4.25}, 
-              {"label":"Z", "x":2, "y":4.25}, 
-              {"label":"X", "x":3, "y":4.25}, 
-              {"label":"C", "x":4, "y":4.25}, 
-              {"label":"V", "x":5, "y":4.25}, 
-              {"label":"Enter", "x":6, "y":4.25, "w":2}, 
-              {"label":"B", "x":8, "y":4.25}, 
-              {"label":"N", "x":9, "y":4.25}, 
-              {"label":"M", "x":10, "y":4.25}, 
-              {"label":"<", "x":11, "y":4.25}, 
-              {"label":">", "x":12, "y":4.25}, 
-              {"label":"?", "x":13, "y":4.25}, 
-              {"label":"PgDn", "x":14, "y":4.25}, 
-              {"label":"\u2190", "x":0, "y":5.25}, 
-              {"label":"\u2193", "x":1, "y":5.25}, 
-              {"label":"\u2192", "x":2, "y":5.25}, 
-              {"label":"Alt", "x":3, "y":5.25, "w":1.25}, 
+              {"label":"modifier", "x":13.75, "y":3.25, "w":1.25}, 
+              {"label":"LShift", "x":0, "y":4.25}, 
+              {"label":"Z", "x":1, "y":4.25}, 
+              {"label":"X", "x":2, "y":4.25}, 
+              {"label":"C", "x":3, "y":4.25}, 
+              {"label":"V", "x":4, "y":4.25}, 
+              {"label":"B", "x":5, "y":4.25}, 
+              {"label":"Backspace", "x":6, "y":4.25, "w":2}, 
+              {"label":"N", "x":8, "y":4.25}, 
+              {"label":"M", "x":9, "y":4.25}, 
+              {"label":"<", "x":10, "y":4.25}, 
+              {"label":">", "x":11, "y":4.25}, 
+              {"label":"?", "x":12, "y":4.25}, 
+              {"label":"}", "x":13, "y":4.25}, 
+              {"label":"Rshift", "x":14, "y":4.25}, 
+              {"label":"LControl", "x":0, "y":5.25}, 
+              {"label":"free-1", "x":1, "y":5.25}, 
+              {"label":"free-2", "x":2, "y":5.25}, 
+              {"label":"LAlt", "x":3, "y":5.25, "w":1.25}, 
               {"label":"Space", "x":4.25, "y":5.25, "w":2.25}, 
-              {"label":"Bsp", "x":6.5, "y":5.25}, 
+              {"label":"Enter", "x":6.5, "y":5.25}, 
               {"label":"Space", "x":7.5, "y":5.25, "w":2.75}, 
-              {"label":"Alt", "x":10.25, "y":5.25, "w":1.25}, 
+              {"label":"RAlt", "x":10.25, "y":5.25, "w":1.25}, 
               {"label":"Win", "x":11.5, "y":5.25, "w":1.25}, 
               {"label":"Menu", "x":12.75, "y":5.25, "w":1.25}, 
-              {"label":"Fn", "x":14, "y":5.25}
+              {"label":"RControl", "x":14, "y":5.25}
              ]
         }
     }
diff --git a/keyboards/handwired/zergo/keymaps/default/keymap.c b/keyboards/handwired/zergo/keymaps/default/keymap.c
index d0f7b750e..a9dcc82ae 100644
--- a/keyboards/handwired/zergo/keymaps/default/keymap.c
+++ b/keyboards/handwired/zergo/keymaps/default/keymap.c
@@ -20,17 +20,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
         LAYOUT(
                 KC_ESC, 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_HOME, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_PGUP, 
-                KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_5, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSLS, 
-                KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LCTL, 
-                MT(MOD_LSFT, KC_END), KC_UP, KC_Z, KC_X, KC_C, KC_V, KC_ENT, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_LSFT, KC_PGDN), 
-                KC_LEFT, KC_DOWN, KC_RGHT, KC_LALT, KC_SPC, KC_BSPC, KC_SPC, KC_RALT, KC_LGUI, KC_RGUI, LT(1, KC_NO)),
+                KC_DEL, KC_GRV, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSLS, 
+                KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RCTL, 
+                MT(MOD_LSFT, KC_HOME), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RBRC, MT(MOD_RSFT, KC_PGUP), 
+                MT(MOD_LCTL, KC_END), KC_DOWN, KC_RGHT, KC_LALT, KC_SPC, KC_ENT, KC_SPC, KC_RALT, KC_LGUI, KC_MENU, MT(MOD_RCTL, KC_PGDN)),
 
         LAYOUT(
-                TG(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 
+                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 
                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, KC_UP, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/handwired/zergo/zergo.h b/keyboards/handwired/zergo/zergo.h
index b4daeff76..5b7695868 100644
--- a/keyboards/handwired/zergo/zergo.h
+++ b/keyboards/handwired/zergo/zergo.h
@@ -19,10 +19,10 @@
 #include "quantum.h"
 
 #define LAYOUT( \
-        K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
-        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
-        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
-        K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
+        K000,       K002, K003, K004, K005,     K006, K007, K008, K009,     K010, K011, K012, K013, \
+        K100, K101, K102, K103, K104, K105, K206, K106, K107, K108, K109, K110, K111, K112, K113, \
+        K200, K201, K202, K203, K204, K205, K306, K207, K208, K209, K210, K211, K212, K213, \
+        K300, K301, K302, K303, K304, K305,     K307, K308, K309, K310, K311, K312, K313, \
         K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \
         K500, K501, K502, K503,       K505, K506, K507,       K509,       K511, K512, K513  \
 ) { \