[Keyboard] Unigo66 fixes and improvements (#5060)

* UniGo66 keyboard added

* UniGo66 keyboard added

* case correction of unigo66 files

* create sirius folder

* Update keyboards/sirius/unigo66/rules.mk

Co-Authored-By: danielhklein <danielklein@utexas.edu>

* Update keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c

Co-Authored-By: danielhklein <danielklein@utexas.edu>

* Update keyboards/sirius/unigo66/keymaps/default/config.h

Co-Authored-By: danielhklein <danielklein@utexas.edu>

* Update keyboards/sirius/unigo66/keymaps/danielhklein/config.h

Co-Authored-By: danielhklein <danielklein@utexas.edu>

* debugging

* correct keymap to layout

* readme

* remove common config

* suggested changes to config.h

* updates and fixes

6 files changed, 238 insertions, 539 deletions

diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/info.json
index 142e8f1fad..f343cc3ead 100644
--- a/keyboards/sirius/unigo66/info.json
+++ b/keyboards/sirius/unigo66/info.json
@@ -1,485 +1,81 @@
 {
-	"keyboard_name": "UniGo66",
-	"url": "https://discord.gg/GJ8bdM",
-	"maintainer": "qmk",
-	"width": 22.5,
-  "height": 6.5,
-  "layouts": {
-    "LAYOUT_all": {
-      "layout": [
-        {"label":"F13", "x":2, "y":0},
-        {"label":"F14", "x":3, "y":0},
-        {"label":"F15", "x":4, "y":0},
-        {"label":"F16", "x":5, "y":0},
-        {"label":"F17", "x":6.5, "y":0},
-        {"label":"F18", "x":7.5, "y":0},
-        {"label":"F19", "x":8.5, "y":0},
-        {"label":"F20", "x":9.5, "y":0},
-        {"label":"F21", "x":11, "y":0},
-        {"label":"F22", "x":12, "y":0},
-        {"label":"F23", "x":13, "y":0},
-        {"label":"F24", "x":14, "y":0},
-        {"label":"Esc", "x":0, "y":1},
-        {"label":"F1", "x":2, "y":1},
-        {"label":"F2", "x":3, "y":1},
-        {"label":"F3", "x":4, "y":1},
-        {"label":"F4", "x":5, "y":1},
-        {"label":"F5", "x":6.5, "y":1},
-        {"label":"F6", "x":7.5, "y":1},
-        {"label":"F7", "x":8.5, "y":1},
-        {"label":"F8", "x":9.5, "y":1},
-        {"label":"F9", "x":11, "y":1},
-        {"label":"F10", "x":12, "y":1},
-        {"label":"F11", "x":13, "y":1},
-        {"label":"F12", "x":14, "y":1},
-        {"label":"Print Screen", "x":15.25, "y":1},
-        {"label":"Scroll Lock", "x":16.25, "y":1},
-        {"label":"Pause", "x":17.25, "y":1},
-        {"label":"Volume Down", "x":18.5, "y":1},
-        {"label":"Vol Up", "x":19.5, "y":1},
-        {"label":"Mute", "x":20.5, "y":1},
-        {"label":"Power", "x":21.5, "y":1},
-        {"label":"Help", "x":22.75, "y":1},
-        {"label":"`", "x":0, "y":2.5},
-        {"label":"1", "x":1, "y":2.5},
-        {"label":"2", "x":2, "y":2.5},
-        {"label":"3", "x":3, "y":2.5},
-        {"label":"4", "x":4, "y":2.5},
-        {"label":"5", "x":5, "y":2.5},
-        {"label":"6", "x":6, "y":2.5},
-        {"label":"7", "x":7, "y":2.5},
-        {"label":"8", "x":8, "y":2.5},
-        {"label":"9", "x":9, "y":2.5},
-        {"label":"0", "x":10, "y":2.5},
-        {"label":"-", "x":11, "y":2.5},
-        {"label":"=", "x":12, "y":2.5},
-        {"label":"Yen", "x":13, "y":2.5},
-        {"label":"Back Space", "x":14, "y":2.5},
-        {"label":"Insert", "x":15.25, "y":2.5},
-        {"label":"Home", "x":16.25, "y":2.5},
-        {"label":"Page Up", "x":17.25, "y":2.5},
-        {"label":"Num Lock", "x":18.5, "y":2.5},
-        {"label":"Num /", "x":19.5, "y":2.5},
-        {"label":"Num *", "x":20.5, "y":2.5},
-        {"label":"Num -", "x":21.5, "y":2.5},
-        {"label":"Stop", "x":22.75, "y":2.5},
-        {"label":"Again", "x":23.75, "y":2.5},
-        {"label":"Tab", "x":0, "y":3.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":3.5},
-        {"label":"W", "x":2.5, "y":3.5},
-        {"label":"E", "x":3.5, "y":3.5},
-        {"label":"R", "x":4.5, "y":3.5},
-        {"label":"T", "x":5.5, "y":3.5},
-        {"label":"Y", "x":6.5, "y":3.5},
-        {"label":"U", "x":7.5, "y":3.5},
-        {"label":"I", "x":8.5, "y":3.5},
-        {"label":"O", "x":9.5, "y":3.5},
-        {"label":"P", "x":10.5, "y":3.5},
-        {"label":"[", "x":11.5, "y":3.5},
-        {"label":"]", "x":12.5, "y":3.5},
-        {"label":"\\", "x":13.5, "y":3.5, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":3.5},
-        {"label":"End", "x":16.25, "y":3.5},
-        {"label":"Page Down", "x":17.25, "y":3.5},
-        {"label":"Num 7", "x":18.5, "y":3.5},
-        {"label":"Num 8", "x":19.5, "y":3.5},
-        {"label":"Num 9", "x":20.5, "y":3.5},
-        {"label":"Num +", "x":21.5, "y":3.5},
-        {"label":"Menu", "x":22.75, "y":3.5},
-        {"label":"Undo", "x":23.75, "y":3.5},
-        {"label":"Caps Lock", "x":0, "y":4.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":4.5},
-        {"label":"S", "x":2.75, "y":4.5},
-        {"label":"D", "x":3.75, "y":4.5},
-        {"label":"F", "x":4.75, "y":4.5},
-        {"label":"G", "x":5.75, "y":4.5},
-        {"label":"H", "x":6.75, "y":4.5},
-        {"label":"J", "x":7.75, "y":4.5},
-        {"label":"K", "x":8.75, "y":4.5},
-        {"label":"L", "x":9.75, "y":4.5},
-        {"label":";", "x":10.75, "y":4.5},
-        {"label":"\"", "x":11.75, "y":4.5},
-        {"label":"ISO #", "x":12.75, "y":4.5},
-        {"label":"Enter", "x":13.75, "y":4.5, "w":1.25},
-        {"label":"Num 4", "x":18.5, "y":4.5},
-        {"label":"Num 5", "x":19.5, "y":4.5},
-        {"label":"Num 6", "x":20.5, "y":4.5},
-        {"label":"Num , ", "x":21.5, "y":4.5},
-        {"label":"Select", "x":22.75, "y":4.5},
-        {"label":"Copy", "x":23.75, "y":4.5},
-        {"label":"Shift", "x":0, "y":5.5, "w":1.25},
-        {"label":"ISO \\", "x":1.25, "y":5.5},
-        {"label":"Z", "x":2.25, "y":5.5},
-        {"label":"X", "x":3.25, "y":5.5},
-        {"label":"C", "x":4.25, "y":5.5},
-        {"label":"V", "x":5.25, "y":5.5},
-        {"label":"B", "x":6.25, "y":5.5},
-        {"label":"N", "x":7.25, "y":5.5},
-        {"label":"M", "x":8.25, "y":5.5},
-        {"label":",", "x":9.25, "y":5.5},
-        {"label":".", "x":10.25, "y":5.5},
-        {"label":"/", "x":11.25, "y":5.5},
-        {"label":"JIS \\", "x":12.25, "y":5.5},
-        {"label":"Shift", "x":13.25, "y":5.5, "w":1.75},
-        {"label":"Up", "x":16.25, "y":5.5},
-        {"label":"Num 1", "x":18.5, "y":5.5},
-        {"label":"Num 2", "x":19.5, "y":5.5},
-        {"label":"Num 3", "x":20.5, "y":5.5},
-        {"label":"Num =", "x":21.5, "y":5.5},
-        {"label":"Exec", "x":22.75, "y":5.5},
-        {"label":"Paste", "x":23.75, "y":5.5},
-        {"label":"Ctrl", "x":0, "y":6.5},
-        {"label":"GUI", "x":1, "y":6.5},
-        {"label":"Alt", "x":2, "y":6.5},
-        {"label":"JIS Muhenkan", "x":3, "y":6.5},
-        {"label":"Hanja", "x":4, "y":6.5},
-        {"label":"Space", "x":5, "y":6.5, "w":3},
-        {"label":"Hangul/English", "x":8, "y":6.5},
-        {"label":"JIS Henkan", "x":9, "y":6.5},
-        {"label":"JIS Katakana/Hiragana", "x":10, "y":6.5},
-        {"label":"Alt", "x":11, "y":6.5},
-        {"label":"GUI", "x":12, "y":6.5},
-        {"label":"App", "x":13, "y":6.5},
-        {"label":"Ctrl", "x":14, "y":6.5},
-        {"label":"Left", "x":15.25, "y":6.5},
-        {"label":"Down", "x":16.25, "y":6.5},
-        {"label":"Right", "x":17.25, "y":6.5},
-        {"label":"Num 0", "x":18.5, "y":6.5, "w":2},
-        {"label":"Num .", "x":20.5, "y":6.5},
-        {"label":"Num Enter", "x":21.5, "y":6.5},
-        {"label":"Find", "x":22.75, "y":6.5},
-        {"label":"Cut", "x":23.75, "y":6.5}
-      ]
-    },
-    "LAYOUT_ansi": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"PrtSc", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Num Lock", "x":18.5, "y":1.5},
-        {"label":"Num /", "x":19.5, "y":1.5},
-        {"label":"Num *", "x":20.5, "y":1.5},
-        {"label":"Num -", "x":21.5, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"[", "x":11.5, "y":2.5},
-        {"label":"]", "x":12.5, "y":2.5},
-        {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Num 7", "x":18.5, "y":2.5},
-        {"label":"Num 8", "x":19.5, "y":2.5},
-        {"label":"Num 9", "x":20.5, "y":2.5},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":":", "x":10.75, "y":3.5},
-        {"label":"\"", "x":11.75, "y":3.5},
-        {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"Num 4", "x":18.5, "y":3.5},
-        {"label":"Num 5", "x":19.5, "y":3.5},
-        {"label":"Num 6", "x":20.5, "y":3.5},
-        {"label":"Num +", "x":21.5, "y":2.5, "h":2},
-        {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Num 1", "x":18.5, "y":4.5},
-        {"label":"Num 2", "x":19.5, "y":4.5},
-        {"label":"Num 3", "x":20.5, "y":4.5},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5},
-        {"label":"Num 0", "x":18.5, "y":5.5, "w":2},
-        {"label":"Num .", "x":20.5, "y":5.5},
-        {"label":"Num Enter", "x":21.5, "y":4.5, "h":2}
-      ]
-    },
-    "LAYOUT_iso": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Num Lock", "x":18.5, "y":1.5},
-        {"label":"Num /", "x":19.5, "y":1.5},
-        {"label":"Num *", "x":20.5, "y":1.5},
-        {"label":"Num -", "x":21.5, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"[", "x":11.5, "y":2.5},
-        {"label":"]", "x":12.5, "y":2.5},
-        {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Num 7", "x":18.5, "y":2.5},
-        {"label":"Num 8", "x":19.5, "y":2.5},
-        {"label":"Num 9", "x":20.5, "y":2.5},
-        {"label":"Num +", "x":21.5, "y":2.5, "h":2},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":"'", "x":11.75, "y":3.5},
-        {"label":"ISO #", "x":12.75, "y":3.5},
-        {"label":"Num 4", "x":18.5, "y":3.5},
-        {"label":"Num 5", "x":19.5, "y":3.5},
-        {"label":"Num 6", "x":20.5, "y":3.5},
-        {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-        {"label":"ISO \\", "x":1.25, "y":4.5},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Num 1", "x":18.5, "y":4.5},
-        {"label":"Num 2", "x":19.5, "y":4.5},
-        {"label":"Num 3", "x":20.5, "y":4.5},
-        {"label":"Num Enter", "x":21.5, "y":4.5, "h":2},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5},
-        {"label":"Num 0", "x":18.5, "y":5.5, "w":2},
-        {"label":"Num .", "x":20.5, "y":5.5}
-      ]
-    },
-    "LAYOUT_jis": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"JIS Hankaku / Zenkaku", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"ˆ", "x":12, "y":1.5},
-        {"label":"JIS Yen", "x":13, "y":1.5},
-        {"label":"Back Space", "x":14, "y":1.5},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Num Lock", "x":18.5, "y":1.5},
-        {"label":"Num /", "x":19.5, "y":1.5},
-        {"label":"Num *", "x":20.5, "y":1.5},
-        {"label":"Num -", "x":21.5, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"@", "x":11.5, "y":2.5},
-        {"label":"[", "x":12.5, "y":2.5},
-        {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Num 7", "x":18.5, "y":2.5},
-        {"label":"Num 8", "x":19.5, "y":2.5},
-        {"label":"Num 9", "x":20.5, "y":2.5},
-        {"label":"Num +", "x":21.5, "y":2.5, "h":2},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":":", "x":11.75, "y":3.5},
-        {"label":"]", "x":12.75, "y":3.5},
-        {"label":"Num 4", "x":18.5, "y":3.5},
-        {"label":"Num 5", "x":19.5, "y":3.5},
-        {"label":"Num 6", "x":20.5, "y":3.5},
-        {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"JIS \\", "x":12.25, "y":4.5},
-        {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Num 1", "x":18.5, "y":4.5},
-        {"label":"Num 2", "x":19.5, "y":4.5},
-        {"label":"Num 3", "x":20.5, "y":4.5},
-        {"label":"Num Enter", "x":21.5, "y":4.5, "h":2},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"JIS Muhenkan", "x":3.75, "y":5.5, "w":1.25},
-        {"label":"Space", "x":5, "y":5.5, "w":2.5},
-        {"label":"JIS Henkan", "x":7.5, "y":5.5, "w":1.25},
-        {"label":"JIS Hiragana / Katakana", "x":8.75, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5},
-        {"label":"Num 0", "x":18.5, "y":5.5, "w":2},
-        {"label":"Num .", "x":20.5, "y":5.5}
-      ]
+    "keyboard_name": "UniGo66",
+    "url": "https://discord.gg/GJ8bdM",
+    "maintainer": "qmk",
+    "width": 17,
+    "height": 7,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "w":1.5},
+                {"label":"1", "x":1.5, "y":0},
+                {"label":"2", "x":2.5, "y":0},
+                {"label":"3", "x":3.5, "y":0},
+                {"label":"4", "x":4.5, "y":0},
+                {"label":"5", "x":5.5, "y":0},
+                {"label":"-", "x":6.5, "y":0},
+                {"label":"=", "x":9.5, "y":0},
+                {"label":"6", "x":10.5, "y":0},
+                {"label":"7", "x":11.5, "y":0},
+                {"label":"8", "x":12.5, "y":0},
+                {"label":"9", "x":13.5, "y":0},
+                {"label":"0", "x":14.5, "y":0},
+                {"label":"Bspc", "x":15.5, "y":0, "w":1.5},
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"PgUp", "x":6.5, "y":1, "h":1.5},
+                {"label":"[", "x":9.5, "y":1, "h":1.5},
+                {"label":"Y", "x":10.5, "y":1},
+                {"label":"U", "x":11.5, "y":1},
+                {"label":"I", "x":12.5, "y":1},
+                {"label":"O", "x":13.5, "y":1},
+                {"label":"P", "x":14.5, "y":1},
+                {"label":"\\", "x":15.5, "y":1, "w":1.5},
+                {"label":"Caps", "x":0, "y":2, "w":1.5},
+                {"label":"A", "x":1.5, "y":2},
+                {"label":"S", "x":2.5, "y":2},
+                {"label":"D", "x":3.5, "y":2},
+                {"label":"F", "x":4.5, "y":2},
+                {"label":"G", "x":5.5, "y":2},
+                {"label":"PgDn", "x":6.5, "y":2.5, "h":1.5},
+                {"label":"]", "x":9.5, "y":2.5, "h":1.5},
+                {"label":"H", "x":10.5, "y":2},
+                {"label":"J", "x":11.5, "y":2},
+                {"label":"K", "x":12.5, "y":2},
+                {"label":"L", "x":13.5, "y":2},
+                {"label":";", "x":14.5, "y":2},
+                {"label":"Enter", "x":15.5, "y":2, "w":1.5},
+                {"label":"Shift", "x":0, "y":3, "w":1.5},
+                {"label":"Z", "x":1.5, "y":3},
+                {"label":"X", "x":2.5, "y":3},
+                {"label":"C", "x":3.5, "y":3},
+                {"label":"V", "x":4.5, "y":3},
+                {"label":"B", "x":5.5, "y":3},
+                {"label":"N", "x":10.5, "y":3},
+                {"label":"M", "x":11.5, "y":3},
+                {"label":",", "x":12.5, "y":3},
+                {"label":".", "x":13.5, "y":3},
+                {"label":"Up", "x":14.5, "y":3},
+                {"label":"Shift", "x":15.5, "y":3, "w":1.5},
+                {"label":"Ctrl", "x":0.5, "y":4},
+                {"label":"Super", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4},
+                {"label":"Left", "x":13.5, "y":4},
+                {"label":"Down", "x":14.5, "y":4},
+                {"label":"Right", "x":15.5, "y":4},
+                {"label":"Space", "x":5.5, "y":5},
+                {"label":"Space", "x":5.5, "y":6},
+                {"label":"Ins", "x":6.5, "y":5},
+                {"label":"Del", "x":6.5, "y":6},
+                {"label":"Home", "x":9.5, "y":5},
+                {"label":"End", "x":9.5, "y":6},
+                {"label":"Space", "x":10.5, "y":5},
+                {"label":"Space", "x":10.5, "y":6}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/sirius/unigo66/keymaps/default/keymap.c b/keyboards/sirius/unigo66/keymaps/default/keymap.c
index d2e0cbfbff..06982e64b7 100644
--- a/keyboards/sirius/unigo66/keymaps/default/keymap.c
+++ b/keyboards/sirius/unigo66/keymaps/default/keymap.c
@@ -6,53 +6,115 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * | ESC    |   1  |   2  |   3  |   4  |   5  |  -   |           |  =   |   6  |   7  |   8  |   9  |   0  |  Bsp   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  [   |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  | PgUp |           |  [   |   Y  |   U  |   I  |   O  |   P  |   \    |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Caps   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
- * |--------+------+------+------+------+------|  L2  |           |  ]   |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  /   |  Up    |
+ * | Caps   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | Enter  |
+ * |--------+------+------+------+------+------| PgDn |           |  ]   |------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  Up  |M2/Shift|
  * `--------+------+------+---------------------------'           `---------------------------+------+------+--------'
- *   | Ctrl | Super|  Alt |                                                                   | Left |  Down| Right |
+ *   | Ctrl |  Gui |  Alt |                                                                   | Left |  Down| Right |
  *   `--------------------'                                                                   `--------------------'
- *                                        ,------|------.       ,---------------.
- *                                        |      | PgUp |       | Home |        |  
- *                                        | Space|------|       |------|  Enter | 
- *                                        |      | PgDn |       | End  |        | 
+ *                                        ,-------------.       ,---------------.
+ *                                        |      |  Ins |       | Home |        |  
+ *                                        | Space|------|       |------|M1/Space| 
+ *                                        |      |  Del |       | End  |        | 
  *                                        `-------------'       `---------------'
  */
     [0] = LAYOUT(
-	KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_MINS,       KC_EQL,  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,    KC_BSPC,
-	KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   TG(1),         KC_LBRC, KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,    KC_BSLS,
-	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_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   TG(2),         KC_RBRC, KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_UP  ,
-	KC_LCTL, KC_LGUI,KC_LALT,                                                                        KC_LEFT,KC_DOWN, KC_RGHT,
-                                           KC_SPC, KC_PGUP,       KC_HOME, KC_ENT,
-                                           KC_SPC, KC_PGDN,       KC_END,  KC_ENT
+  KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_MINS,      KC_EQL,  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,    KC_BSPC,
+  KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_PGUP,      KC_LBRC, KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,    KC_BSLS,
+  KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                          KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN, KC_ENT, 
+  KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_PGDN,      KC_RBRC, KC_N,   KC_M,   KC_COMM,KC_DOT, KC_UP,   LM(2,MOD_RSFT),
+  KC_LCTL, KC_LGUI,KC_LALT,                                                                       KC_LEFT,KC_DOWN, KC_RGHT,
+                                           KC_SPC, KC_INS,       KC_HOME, LT(1,KC_SPC),
+                                           KC_NO , KC_DEL,       KC_END,  KC_NO
     ),
+/* 
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   ~    |  F1  |  F2  |  F3  |  F4  |  F5  | F11  |           |  F12 |  F6  |  F7  |  F8  |  F9  | F10  |  Del   |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |   '    |
+ * |--------+------+------+------+------+------|      |           |  M3  |------+------+------+------+------+--------|
+ * |        | Mute | Vol- | Vol+ |      |      |      |           |      |      |      |      |      |   /  |        |
+ * `--------+------+------+---------------------------'           `---------------------------+------+------+--------'
+ *   |      |      |      |                                                                   |      |      |       |
+ *   `--------------------'                                                                   `--------------------'
+ *                                        ,-------------.       ,---------------.
+ *                                        |      |      |       |      |        |  
+ *                                        |      |------|       |------|        | 
+ *                                        |      |      |       |      |        | 
+ *                                        `-------------'       `---------------'
+ */
     [1] = LAYOUT(
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-	_______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-	_______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,  _______,  _______,  _______, 
-	_______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-	_______,  _______,  _______,                                                                                    _______,  _______,  _______,
+  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,     KC_F12,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_DEL, 
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,  _______,  _______,  _______,  _______,  _______, 
+  _______,  _______,  _______,  _______,  _______,  _______,                       _______,  _______,  _______,  _______,  _______,  KC_QUOT, 
+  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,    TG(3),   _______,  _______,  _______,  _______,  KC_SLSH,  _______, 
+  _______,  _______,  _______,                                                                                   _______,  _______,  _______,
                                                     _______,  _______,    _______,  _______,  
                                                     _______,  _______,    _______,  _______
     ),
+/* 
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |   '    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |   /  |        |
+ * `--------+------+------+---------------------------'           `---------------------------+------+------+--------'
+ *   |      |      |      |                                                                   |      |      |       |
+ *   `--------------------'                                                                   `--------------------'
+ *                                        ,-------------.       ,---------------.
+ *                                        |      |      |       |      |        |  
+ *                                        |      |------|       |------|        | 
+ *                                        |      |      |       |      |        | 
+ *                                        `-------------'       `---------------'
+ */
     [2] = LAYOUT(
   _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-	_______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-	_______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,  _______,  _______,  _______, 
-	_______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-	_______,  _______,  _______,                                                                                    _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______, 
+  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  _______,  _______,  _______,  KC_QUOT,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  KC_SLSH,  _______, 
+  _______,  _______,  _______,                                                                                    _______,  _______,  _______,
+                                                    _______,  _______,    _______,  _______,   
+                                                    _______,  _______,    _______,  _______
+    ),
+/* 
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      | Calc |NumLoc|   /  |   *  |    -   |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |   7  |   8  |   9  |    +   |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |------|           |------|      |      |   4  |   5  |   6  |    =   |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |   1  |   2  |   3  |  Enter |
+ * `--------+------+------+---------------------------'           `---------------------------+------+------+--------'
+ *   |      |      |      |                                                                   |   0  |   .  | Enter|
+ *   `--------------------'                                                                   `--------------------'
+ *                                        ,-------------.       ,---------------.
+ *                                        |      |      |       |      |        |  
+ *                                        |      |------|       |------|        | 
+ *                                        |      |      |       |      |        | 
+ *                                        `-------------'       `---------------'
+ */
+    [3] = LAYOUT(
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  KC_CALC,  KC_NLCK, KC_PSLS,KC_PAST,KC_PMNS, 
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  KC_P7,   KC_P8,  KC_P9,  KC_PPLS, 
+  _______,  _______,  _______,  _______,  _______,  _______,                        _______,  _______,  KC_P4,   KC_P5,  KC_P6,  KC_PEQL, 
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  KC_P1,   KC_P2,  KC_P3,  KC_PENT, 
+  _______,  _______,  _______,                                                                                   KC_P0,  KC_PDOT,KC_PENT,
                                                     _______,  _______,    _______,  _______,  
                                                     _______,  _______,    _______,  _______
     ),
 };
 
-void matrix_init_user(void) {
-
-}
-
 void matrix_scan_user(void) {
 
 }
diff --git a/keyboards/sirius/unigo66/main.c b/keyboards/sirius/unigo66/main.c
index 76e88922cb..4d167d9f7e 100644
--- a/keyboards/sirius/unigo66/main.c
+++ b/keyboards/sirius/unigo66/main.c
@@ -11,7 +11,6 @@
 #include "keyboard.h"
 #include "led.h"
 
-
 /* LED ping configuration */
 #define TMK_LED
 //#define LEONARDO_LED
@@ -87,6 +86,12 @@ int main(void)
     }
 */
 
+    /* wait for USB startup to get ready for debug output */
+    uint8_t timeout = 255;  // timeout when USB is not available(Bluetooth)
+    while (timeout-- && USB_DeviceState != DEVICE_STATE_Configured) {
+    _delay_ms(4);
+    }
+
     debug("init: done\n");
 
     for (;;) {
diff --git a/keyboards/sirius/unigo66/readme.md b/keyboards/sirius/unigo66/readme.md
new file mode 100644
index 0000000000..78a02ed09e
--- /dev/null
+++ b/