Merge branch 'master' into taamas

23 files changed, 569 insertions, 124 deletions

diff --git a/keyboards/mokey/ginkgo65/config.h b/keyboards/mokey/ginkgo65/config.h
index 3660989267..6605744221 100644
--- a/keyboards/mokey/ginkgo65/config.h
+++ b/keyboards/mokey/ginkgo65/config.h
@@ -15,20 +15,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6653
-#define PRODUCT_ID      0x3365
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mokey
-#define PRODUCT         ginkgo 65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
                        /*  1  2   3   4   5   6   7   8   9   10  11  12  13  14  15  16 */
 #define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
 #define MATRIX_COL_PINS { C7, F6, B2, F4, B3, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B1 }
-#define UNUSED_PINS
 #define DIODE_DIRECTION COL2ROW
 
 #define BACKLIGHT_PIN B6
diff --git a/keyboards/mokey/ginkgo65/info.json b/keyboards/mokey/ginkgo65/info.json
index 080d97feeb..462d1869b6 100644
--- a/keyboards/mokey/ginkgo65/info.json
+++ b/keyboards/mokey/ginkgo65/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "ginkgo65",
+    "keyboard_name": "ginkgo 65",
+    "manufacturer": "Mokey",
     "url": "",
     "maintainer": "rhmokey",
+    "usb": {
+        "vid": "0x6653",
+        "pid": "0x3365",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_65_ansi_blocker"
     },
diff --git a/keyboards/mokey/ginkgo65hot/config.h b/keyboards/mokey/ginkgo65hot/config.h
index 5b73c4dc98..423d844765 100644
--- a/keyboards/mokey/ginkgo65hot/config.h
+++ b/keyboards/mokey/ginkgo65hot/config.h
@@ -15,20 +15,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6653
-#define PRODUCT_ID      0x3366
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mokey
-#define PRODUCT         ginkgo65hot
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-#define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
-#define MATRIX_COL_PINS { C7, F6, B2, F4, B3, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
+#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
 #define DIODE_DIRECTION COL2ROW
 
 #define BACKLIGHT_PIN B6
diff --git a/keyboards/mokey/ginkgo65hot/ginkgo65hot.h b/keyboards/mokey/ginkgo65hot/ginkgo65hot.h
index 1a599291b8..e4a42d9ad9 100644
--- a/keyboards/mokey/ginkgo65hot/ginkgo65hot.h
+++ b/keyboards/mokey/ginkgo65hot/ginkgo65hot.h
@@ -19,7 +19,7 @@
 
 #define XXX KC_NO
 
-/*LAYOUT
+/*LAYOUT_65_ansi_blocker
   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
   * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│  k0D  │k0E│
   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
@@ -32,7 +32,7 @@
   * │k40 │k41 │k42 │  k44                   │k49 │k4A │ │k4C│k4D│k4E│
   * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 */
-#define LAYOUT( \
+#define LAYOUT_65_ansi_blocker( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json
index e2e96c167c..929e31e31b 100644
--- a/keyboards/mokey/ginkgo65hot/info.json
+++ b/keyboards/mokey/ginkgo65hot/info.json
@@ -1,82 +1,91 @@
 {
     "keyboard_name": "ginkgo65hot",
+    "manufacturer": "Mokey",
     "url": "",
     "maintainer": "mokey",
+    "usb": {
+        "vid": "0x6653",
+        "pid": "0x3366",
+        "device_version": "0.0.1"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0, "w":2},
-                {"label":"k0e", "x":15, "y":0},
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":"-", "x":11, "y":0},
+                {"label":"=", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Insert", "x":15, "y":0},
                 
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1d", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
+                {"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":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[", "x":11.5, "y":1},
+                {"label":"]", "x":12.5, "y":1},
+                {"label":"\\", "x":13.5, "y":1, "w":1.5},
+                {"label":"Delete", "x":15, "y":1},
                 
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                {"label":"k2e", "x":15, "y":2},
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";", "x":10.75, "y":2},
+                {"label":"'", "x":11.75, "y":2},
+                {"label":"Return", "x":12.75, "y":2, "w":2.25},
+                {"label":"Page Up", "x":15, "y":2},
                 
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",", "x":9.25, "y":3},
+                {"label":".", "x":10.25, "y":3},
+                {"label":"/", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"Page Down", "x":15, "y":3},
 
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k44", "x":3.75, "y":4, "w":6.25},
-                {"label":"k49", "x":10, "y":4, "w":1.25},
-                {"label":"k4a", "x":11.25, "y":4, "w":1.25},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mokey/ginkgo65hot/rules.mk b/keyboards/mokey/ginkgo65hot/rules.mk
index 02fbe72525..d04e1a74fa 100644
--- a/keyboards/mokey/ginkgo65hot/rules.mk
+++ b/keyboards/mokey/ginkgo65hot/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi_blocker
diff --git a/keyboards/mokey/ibis80/config.h b/keyboards/mokey/ibis80/config.h
new file mode 100644
index 0000000000..e70b8b8084
--- /dev/null
+++ b/keyboards/mokey/ibis80/config.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2021 Kyle McCreery
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+#define MATRIX_ROW_PINS { B0, B1, B2, E6, F0, F1 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
diff --git a/keyboards/mokey/ibis80/ibis80.c b/keyboards/mokey/ibis80/ibis80.c
new file mode 100644
index 0000000000..faddc99eb5
--- /dev/null
+++ b/keyboards/mokey/ibis80/ibis80.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Ocean
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ibis80.h"
\ No newline at end of file
diff --git a/keyboards/mokey/ibis80/ibis80.h b/keyboards/mokey/ibis80/ibis80.h
new file mode 100644
index 0000000000..ed2dbf7195
--- /dev/null
+++ b/keyboards/mokey/ibis80/ibis80.h
@@ -0,0 +1,76 @@
+/* Copyright 2021 Ocean
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/*
+ *  ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ *  │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │0E │0F │0G │
+ *  └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ *  ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+ *  │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
+ *  ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤    ┌─────┐
+ *  │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │    │3D   │
+ *  ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐    │ ISO Enter
+ *  │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │               │2D │    │
+ *  ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     └───┴────┘
+ *  │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D        │     │4F │     
+ *  ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ 
+ *  │50   │51 │52   │56                         │5A   │5B │5D   │ │5E │5F │5G │
+ *  └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘           
+ *  ┌─────┐   ┌─────┬───────────────────────────┬─────┐   ┌─────┐
+ *  │50   │   │52   │56                         │5A   │   │5D   │
+ *  └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+ */
+
+#define LAYOUT(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,           k4d,      k4f, \
+    k50, k51, k52,                k56,                k5a, k5b,      k5d, k5e, k5f, k5g \
+) \
+{ \
+    { k00, k01, k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0a, k0b,   k0c,   k0d, k0e,   k0f,   k0g }, \
+    { k10, k11, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1a, k1b,   k1c,   k1d, k1e,   k1f,   k1g }, \
+    { k20, k21, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2a, k2b,   k2c,   k2d, k2e,   k2f,   k2g }, \
+    { k30, k31, k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3a, k3b,   KC_NO, k3d, KC_NO, KC_NO, KC_NO }, \
+    { k40, k41, k42, k43,   k44,   k45,   k46, k47,   k48,   k49,   k4a, KC_NO, KC_NO, k4d, KC_NO, k4f,   KC_NO },  \
+    { k50, k51, k52, KC_NO, KC_NO, KC_NO, k56, KC_NO, KC_NO, KC_NO, k5a, k5b,   KC_NO,   k5d, k5e,   k5f,   k5g }  \
+}
+
+#define LAYOUT_all(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k3d, k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k2d, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,           k4d,      k4f, \
+    k50,      k52,                k56,                k5a,           k5d, k5e, k5f, k5g \
+) \
+{ \
+    { k00, k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0a, k0b,   k0c,   k0d,   k0e,   k0f,   k0g }, \
+    { k10, k11,   k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1a, k1b,   k1c,   k1d,   k1e,   k1f,   k1g }, \
+    { k20, k21,   k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2a, k2b,   k2c,   k3d,   k2e,   k2f,   k2g }, \
+    { k30, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3a, k3b,   KC_NO, k2d,   KC_NO, KC_NO, KC_NO }, \
+    { k40, k41,   k42, k43,   k44,   k45,   k46, k47,   k48,   k49,   k4a, KC_NO, KC_NO, k4d,   KC_NO, k4f,   KC_NO },  \
+    { k50, KC_NO, k52, KC_NO, KC_NO, KC_NO, k56, KC_NO, KC_NO, KC_NO, k5a, KC_NO, KC_NO, k5d,   k5e,   k5f,   k5g }  \
+}
+
diff --git a/keyboards/mokey/ibis80/info.json b/keyboards/mokey/ibis80/info.json
new file mode 100644
index 0000000000..d236eabc71
--- /dev/null
+++ b/keyboards/mokey/ibis80/info.json
@@ -0,0 +1,213 @@
+{
+    "keyboard_name": "ibis 80",
+    "manufacturer": "Mokey",
+    "url": "",
+    "maintainer": "Mokey",
+    "usb": {
+        "vid": "0x6653",
+        "pid": "0x3380",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1.25, "y": 0},
+                {"label": "k02", "x": 2.25, "y": 0},
+                {"label": "k03", "x": 3.25, "y": 0},
+                {"label": "k04", "x": 4.25, "y": 0},
+                {"label": "k05", "x": 5.5, "y": 0},
+                {"label": "k06", "x": 6.5, "y": 0},
+                {"label": "k07", "x": 7.5, "y": 0},
+                {"label": "k08", "x": 8.5, "y": 0},
+                {"label": "k09", "x": 9.75, "y": 0},
+                {"label": "k0A", "x": 10.75, "y": 0},
+                {"label": "k0B", "x": 11.75, "y": 0},
+                {"label": "k0C", "x": 12.75, "y": 0},
+                {"label": "k0D", "x": 14, "y": 0},
+
+                {"label": "k0E", "x": 15.25, "y": 0},
+                {"label": "k0F", "x": 16.25, "y": 0},
+                {"label": "k0G", "x": 17.25, "y": 0},
+
+                {"label": "k10", "x": 0, "y": 1.5},
+                {"label": "k11", "x": 1, "y": 1.5},
+                {"label": "k12", "x": 2, "y": 1.5},
+                {"label": "k13", "x": 3, "y": 1.5},
+                {"label": "k14", "x": 4, "y": 1.5},
+                {"label": "k15", "x": 5, "y": 1.5},
+                {"label": "k16", "x": 6, "y": 1.5},
+                {"label": "k17", "x": 7, "y": 1.5},
+                {"label": "k18", "x": 8, "y": 1.5},
+                {"label": "k19", "x": 9, "y": 1.5},
+                {"label": "k1A", "x": 10, "y": 1.5},
+                {"label": "k1B", "x": 11, "y": 1.5},
+                {"label": "k1C", "x": 12, "y": 1.5},
+                {"label": "k1D", "x": 13, "y": 1.5, "w": 2},
+
+                {"label": "k1E", "x": 15.25, "y": 1.5},
+                {"label": "k1F", "x": 16.25, "y": 1.5},
+                {"label": "k1G", "x": 17.25, "y": 1.5},
+                
+                {"label": "k20", "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "k21", "x": 1.5, "y": 2.5},
+                {"label": "k22", "x": 2.5, "y": 2.5},
+                {"label": "k23", "x": 3.5, "y": 2.5},
+                {"label": "k24", "x": 4.5, "y": 2.5},
+                {"label": "k25", "x": 5.5, "y": 2.5},
+                {"label": "k26", "x": 6.5, "y": 2.5},
+                {"label": "k27", "x": 7.5, "y": 2.5},
+                {"label": "k28", "x": 8.5, "y": 2.5},
+                {"label": "k29", "x": 9.5, "y": 2.5},
+                {"label": "k2A", "x": 10.5, "y": 2.5},
+                {"label": "k2B", "x": 11.5, "y": 2.5},
+                {"label": "k2C", "x": 12.5, "y": 2.5},
+                {"label": "k2D", "x": 13.5, "y": 2.5},
+
+                {"label": "k2E", "x": 15.25, "y": 2.5},
+                {"label": "k2F", "x": 16.25, "y": 2.5},
+                {"label": "k2G", "x": 17.25, "y": 2.5},
+
+                {"label": "k30", "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "k31", "x": 1.75, "y": 3.5},
+                {"label": "k32", "x": 2.75, "y": 3.5},
+                {"label": "k33", "x": 3.75, "y": 3.5},
+                {"label": "k34", "x": 4.75, "y": 3.5},
+                {"label": "k35", "x": 5.75, "y": 3.5},
+                {"label": "k36", "x": 6.75, "y": 3.5},
+                {"label": "k37", "x": 7.75, "y": 3.5},
+                {"label": "k38", "x": 8.75, "y": 3.5},
+                {"label": "k39", "x": 9.75, "y": 3.5},
+                {"label": "k3A", "x": 10.75, "y": 3.5},
+                {"label": "k3B", "x": 11.75, "y": 3.5},
+                {"label": "k3D", "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"label": "k40", "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "k41", "x": 2.25, "y": 4.5},
+                {"label": "k42", "x": 3.25, "y": 4.5},
+                {"label": "k43", "x": 4.25, "y": 4.5},
+                {"label": "k44", "x": 5.25, "y": 4.5},
+                {"label": "k45", "x": 6.25, "y": 4.5},
+                {"label": "k46", "x": 7.25, "y": 4.5},
+                {"label": "k47", "x": 8.25, "y": 4.5},
+                {"label": "k48", "x": 9.25, "y": 4.5},
+                {"label": "k49", "x": 10.25, "y": 4.5},
+                {"label": "k4A", "x": 11.25, "y": 4.5},
+                {"label": "k4D", "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"label": "k4F", "x": 16.25, "y": 4.5},
+
+                {"label": "k50", "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "k51", "x": 1.5, "y": 5.5},
+                {"label": "k52", "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "k56", "x": 4, "y": 5.5, "w": 7},
+                {"label": "k5A", "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "k5B", "x": 12.5, "y": 5.5},
+                {"label": "k5D", "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"label": "k5E", "x": 15.25, "y": 5.5},
+                {"label": "k5F", "x": 16.25, "y": 5.5},
+                {"label": "k5G", "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1.25, "y": 0},
+                {"label": "k02", "x": 2.25, "y": 0},
+                {"label": "k03", "x": 3.25, "y": 0},
+                {"label": "k04", "x": 4.25, "y": 0},
+                {"label": "k05", "x": 5.5, "y": 0},
+                {"label": "k06", "x": 6.5, "y": 0},
+                {"label": "k07", "x": 7.5, "y": 0},
+                {"label": "k08", "x": 8.5, "y": 0},
+                {"label": "k09", "x": 9.75, "y": 0},
+                {"label": "k0A", "x": 10.75, "y": 0},
+                {"label": "k0B", "x": 11.75, "y": 0},
+                {"label": "k0C", "x": 12.75, "y": 0},
+                {"label": "k0D", "x": 14, "y": 0},
+
+                {"label": "k0E", "x": 15.25, "y": 0},
+                {"label": "k0F", "x": 16.25, "y": 0},
+                {"label": "k0G", "x": 17.25, "y": 0},
+
+                {"label": "k10", "x": 0, "y": 1.5},
+                {"label": "k11", "x": 1, "y": 1.5},
+                {"label": "k12", "x": 2, "y": 1.5},
+                {"label": "k13", "x": 3, "y": 1.5},
+                {"label": "k14", "x": 4, "y": 1.5},
+                {"label": "k15", "x": 5, "y": 1.5},
+                {"label": "k16", "x": 6, "y": 1.5},
+                {"label": "k17", "x": 7, "y": 1.5},
+                {"label": "k18", "x": 8, "y": 1.5},
+                {"label": "k19", "x": 9, "y": 1.5},
+                {"label": "k1A", "x": 10, "y": 1.5},
+                {"label": "k1B", "x": 11, "y": 1.5},
+                {"label": "k1C", "x": 12, "y": 1.5},
+                {"label": "k1D", "x": 13, "y": 1.5, "w": 2},
+
+                {"label": "k1E", "x": 15.25, "y": 1.5},
+                {"label": "k1F", "x": 16.25, "y": 1.5},
+                {"label": "k1G", "x": 17.25, "y": 1.5},
+                
+                {"label": "k20", "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "k21", "x": 1.5, "y": 2.5},
+                {"label": "k22", "x": 2.5, "y": 2.5},
+                {"label": "k23", "x": 3.5, "y": 2.5},
+                {"label": "k24", "x": 4.5, "y": 2.5},
+                {"label": "k25", "x": 5.5, "y": 2.5},
+                {"label": "k26", "x": 6.5, "y": 2.5},
+                {"label": "k27", "x": 7.5, "y": 2.5},
+                {"label": "k28", "x": 8.5, "y": 2.5},
+                {"label": "k29", "x": 9.5, "y": 2.5},
+                {"label": "k2A", "x": 10.5, "y": 2.5},
+                {"label": "k2B", "x": 11.5, "y": 2.5},
+                {"label": "k2C", "x": 12.5, "y": 2.5},
+                {"label": "k3D", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"label": "k2E", "x": 15.25, "y": 2.5},
+                {"label": "k2F", "x": 16.25, "y": 2.5},
+                {"label": "k2G", "x": 17.25, "y": 2.5},
+
+                {"label": "k30", "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "k31", "x": 1.75, "y": 3.5},
+                {"label": "k32", "x": 2.75, "y": 3.5},
+                {"label": "k33", "x": 3.75, "y": 3.5},
+                {"label": "k34", "x": 4.75, "y": 3.5},
+                {"label": "k35", "x": 5.75, "y": 3.5},
+                {"label": "k36", "x": 6.75, "y": 3.5},
+                {"label": "k37", "x": 7.75, "y": 3.5},
+                {"label": "k38", "x": 8.75, "y": 3.5},
+                {"label": "k39", "x": 9.75, "y": 3.5},
+                {"label": "k3A", "x": 10.75, "y": 3.5},
+                {"label": "k3B", "x": 11.75, "y": 3.5},
+                {"label": "k2C", "x": 12.75, "y": 3.5},
+
+                {"label": "k40", "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "k41", "x": 2.25, "y": 4.5},
+                {"label": "k42", "x": 3.25, "y": 4.5},
+                {"label": "k43", "x": 4.25, "y": 4.5},
+                {"label": "k44", "x": 5.25, "y": 4.5},
+                {"label": "k45", "x": 6.25, "y": 4.5},
+                {"label": "k46", "x": 7.25, "y": 4.5},
+                {"label": "k47", "x": 8.25, "y": 4.5},
+                {"label": "k48", "x": 9.25, "y": 4.5},
+                {"label": "k49", "x": 10.25, "y": 4.5},
+                {"label": "k4A", "x": 11.25, "y": 4.5},
+                {"label": "k4D", "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"label": "k4F", "x": 16.25, "y": 4.5},
+
+                {"label": "k50", "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "k52", "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "k56", "x": 4, "y": 5.5, "w": 7},
+                {"label": "k5A", "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "k5D", "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"label": "k5E", "x": 15.25, "y": 5.5},
+                {"label": "k5F", "x": 16.25, "y": 5.5},
+                {"label": "k5G", "x": 17.25, "y": 5.5}
+            ]
+        }        
+    }
+}
diff --git a/keyboards/mokey/ibis80/keymaps/default/keymap.c b/keyboards/mokey/ibis80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..fefeede966
--- /dev/null
+++ b/keyboards/mokey/ibis80/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021 Ocean
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_GESC, 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_F13,   KC_PSCR,   KC_BRMD, KC_PAUS,
+        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_INSERT, KC_HOME, KC_PGUP,
+        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_DELETE, KC_END,  KC_PGDOWN,
+        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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                                KC_UP,
+        KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_LWIN, KC_RCTL,                     KC_LEFT,   KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/mokey/ibis80/keymaps/via/keymap.c b/keyboards/mokey/ibis80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..94678a8201
--- /dev/null
+++ b/keyboards/mokey/ibis80/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 Ocean
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_all(
+      KC_GESC, 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_F13,   KC_PSCR,   KC_BRMD, KC_PAUS,
+      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_INSERT, KC_HOME, KC_PGUP,
+      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_DELETE, KC_END,  KC_PGDOWN,
+      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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                                KC_UP,
+      KC_LCTL,          KC_LALT,                   KC_SPC,                             KC_RALT,          KC_RCTL,                     KC_LEFT,   KC_DOWN, KC_RGHT
+   ),
+   [1] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+      _______,          _______,                   _______,                            _______,          _______,                     _______, _______, _______
+   ),
+   [2] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+      _______,          _______,                   _______,                            _______,          _______,                     _______, _______, _______
+   ),
+   [3] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+      _______,          _______,                   _______,                            _______,          _______,                     _______, _______, _______
+   )
+};
diff --git a/keyboards/mokey/ibis80/keymaps/via/rules.mk b/keyboards/mokey/ibis80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mokey/ibis80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mokey/ibis80/readme.md b/keyboards/mokey/ibis80/readme.md
new file mode 100644
index 0000000000..b493fd7f0d
--- /dev/null
+++ b/keyboards/mokey/ibis80/readme.md
@@ -0,0 +1,18 @@
+# ibis80
+
+Support Atmega32u4 keyboard,With a variety of configurations
+
+* Keyboard Maintainer: [Mokey](https://github.com/Runheme)
+
+## Bootloader
+* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmwar
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mokey/ibis80:default
+
+Flashing example for this keyboard:
+
+    make mokey/ibis80:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/mokey/ibis80/rules.mk b/keyboards/mokey/ibis80/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/mokey/ibis80/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mokey/mokey63/config.h b/keyboards/mokey/mokey63/config.h
index 504a274143..a8917c31f9 100644
--- a/keyboards/mokey/mokey63/config.h
+++ b/keyboards/mokey/mokey63/config.h
@@ -16,20 +16,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6653
-#define PRODUCT_ID      0x063A
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    rhmokey
-#define PRODUCT         MOKEY63
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
 #define MATRIX_ROW_PINS { B5, B6, B2, B3, B1 }
 #define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/mokey63/info.json b/keyboards/mokey/mokey63/info.json
index 476667dfbc..f34c47050e 100644
--- a/keyboards/mokey/mokey63/info.json
+++ b/keyboards/mokey/mokey63/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mokey63",
+    "manufacturer": "Mokey",
     "url": "",
     "maintainer": "mokey",
+    "usb": {
+        "vid": "0x6653",
+        "pid": "0x063A",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mokey/mokey64/config.h b/keyboards/mokey/mokey64/config.h
index 52345ed973..685d26af00 100644
--- a/keyboards/mokey/mokey64/config.h
+++ b/keyboards/mokey/mokey64/config.h
@@ -16,19 +16,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID 0x6653
-#define PRODUCT_ID 0x001A
-#define DEVICE_VER 0x0001
-
-#define MANUFACTURER rhmokey
-#define PRODUCT MOKEY64
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
 #define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 }
 #define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D2, D1, D3, D5, D4, D6, D7, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/mokey64/info.json b/keyboards/mokey/mokey64/info.json
index 62b9c90493..4673f1120c 100644
--- a/keyboards/mokey/mokey64/info.json
+++ b/keyboards/mokey/mokey64/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mokey64",
+    "manufacturer": "Mokey",
     "url": "",
     "maintainer": "mokey",
+    "usb": {
+        "vid": "0x6653",
+        "pid": "0x001A",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mokey/xox70/config.h b/keyboards/mokey/xox70/config.h
index f5c08c4480..a0696aad05 100644
--- a/keyboards/mokey/xox70/config.h
+++ b/keyboards/mokey/xox70/config.h
@@ -15,20 +15,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6653
-#define PRODUCT_ID      0x3370
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mokey
-#define PRODUCT         XOX 70
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18
 
 #define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
 #define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json
index 5baa620bc6..73aa7e8dec 100644
--- a/keyboards/mokey/xox70/info.json
+++ b/keyboards/mokey/xox70/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "xox70",
+    "keyboard_name": "XOX 70",
+    "manufacturer": "Mokey",
     "url": "",
     "maintainer": "Mokey",
+    "usb": {
+        "vid": "0x6653",
+        "pid": "0x3370",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mokey/xox70hot/config.h b/keyboards/mokey/xox70hot/config.h
index bc2279e3d1..a0696aad05 100644
--- a/keyboards/mokey/xox70hot/config.h
+++ b/keyboards/mokey/xox70hot/config.h
@@ -15,20 +15,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6653
-#define PRODUCT_ID      0x3371
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mokey
-#define PRODUCT         xox70hot
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18
 
 #define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
 #define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json
index a1fc86924f..8a490265ec 100644
--- a/keyboards/mokey/xox70hot/info.json
+++ b/keyboards/mokey/xox70hot/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "xox70hot",
+    "keyboard_name": "XOX 70 Hotswap",
+    "manufacturer": "Mokey",
     "url": "",
     "maintainer": "rhmokey",
+    "usb": {
+        "vid": "0x6653",
+        "pid": "0x3371",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_tkl_nofrow_ansi_tsangan"
     },