diff --git a/keyboards/mode/eighty/readme.md b/keyboards/mode/eighty/readme.md
deleted file mode 100644
index 40df5adb51..0000000000
--- a/keyboards/mode/eighty/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Mode Eighty
-
-![MODE80](https://i.imgur.com/26uzM3yl.jpg)\
-[Image Gallery](https://imgur.com/t/mechanicalkeyboards/8Uf6c2m?nc=1)
-
-The Mode80 is a tenkeyless high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
-
-* Keyboard Maintainer: [Gondolindrim](https://github.com/gondolindrim)
-* Hardware Supported: proprietary PCB using STM32F072 controller
-* Hardware Availability: you can get a Mode Eighty as of today (dec. 2020) through the in stock sales or special groupbuy editions at https://shop.modedesigns.com/
-
-Make example for this keyboard (after setting up your build environment):
-
-    make mode/eighty/m80h:default # Hotswap
-    make mode/eighty/m80s:default # Soldered
-
-Flashing example for this keyboard:
-
-    make mode/eighty/m80h:default:flash # Hotswap
-    make mode/eighty/m80s:default:flash # Soldered
-
-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/mode/eighty/chconf.h b/keyboards/mode/m80v1/chconf.h
similarity index 100%
rename from keyboards/mode/eighty/chconf.h
rename to keyboards/mode/m80v1/chconf.h
diff --git a/keyboards/mode/eighty/config.h b/keyboards/mode/m80v1/config.h
similarity index 100%
rename from keyboards/mode/eighty/config.h
rename to keyboards/mode/m80v1/config.h
diff --git a/keyboards/mode/eighty/halconf.h b/keyboards/mode/m80v1/halconf.h
similarity index 79%
rename from keyboards/mode/eighty/halconf.h
rename to keyboards/mode/m80v1/halconf.h
index eab8a300a1..bd55942f8c 100644
--- a/keyboards/mode/eighty/halconf.h
+++ b/keyboards/mode/m80v1/halconf.h
@@ -14,14 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/mode/eighty/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
-
 #pragma once
 
-#define HAL_USE_I2C TRUE
-
 #include_next <halconf.h>
-
diff --git a/keyboards/mode/eighty/m80h/config.h b/keyboards/mode/m80v1/m80h/config.h
similarity index 100%
rename from keyboards/mode/eighty/m80h/config.h
rename to keyboards/mode/m80v1/m80h/config.h
diff --git a/keyboards/mode/eighty/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json
similarity index 100%
rename from keyboards/mode/eighty/m80h/info.json
rename to keyboards/mode/m80v1/m80h/info.json
diff --git a/keyboards/mode/eighty/m80h/keymaps/default/keymap.c b/keyboards/mode/m80v1/m80h/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mode/eighty/m80h/keymaps/default/keymap.c
rename to keyboards/mode/m80v1/m80h/keymaps/default/keymap.c
diff --git a/keyboards/mode/eighty/m80h/keymaps/via/keymap.c b/keyboards/mode/m80v1/m80h/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mode/eighty/m80h/keymaps/via/keymap.c
rename to keyboards/mode/m80v1/m80h/keymaps/via/keymap.c
diff --git a/keyboards/mode/eighty/m80h/keymaps/via/rules.mk b/keyboards/mode/m80v1/m80h/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mode/eighty/m80h/keymaps/via/rules.mk
rename to keyboards/mode/m80v1/m80h/keymaps/via/rules.mk
diff --git a/keyboards/mode/eighty/m80h/m80h.c b/keyboards/mode/m80v1/m80h/m80h.c
similarity index 100%
rename from keyboards/mode/eighty/m80h/m80h.c
rename to keyboards/mode/m80v1/m80h/m80h.c
diff --git a/keyboards/mode/eighty/m80h/m80h.h b/keyboards/mode/m80v1/m80h/m80h.h
similarity index 99%
rename from keyboards/mode/eighty/m80h/m80h.h
rename to keyboards/mode/m80v1/m80h/m80h.h
index 882099b1a3..f3f4c53889 100644
--- a/keyboards/mode/eighty/m80h/m80h.h
+++ b/keyboards/mode/m80v1/m80h/m80h.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "eighty.h"
+#include "m80v1.h"
 
 #define LAYOUT_eighty_m80h( \
     K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K415,  K114, K115,  K116, \
diff --git a/keyboards/mode/eighty/m80h/readme.md b/keyboards/mode/m80v1/m80h/readme.md
similarity index 100%
rename from keyboards/mode/eighty/m80h/readme.md
rename to keyboards/mode/m80v1/m80h/readme.md
diff --git a/keyboards/mode/eighty/m80h/rules.mk b/keyboards/mode/m80v1/m80h/rules.mk
similarity index 100%
rename from keyboards/mode/eighty/m80h/rules.mk
rename to keyboards/mode/m80v1/m80h/rules.mk
diff --git a/keyboards/mode/eighty/m80s/config.h b/keyboards/mode/m80v1/m80s/config.h
similarity index 100%
rename from keyboards/mode/eighty/m80s/config.h
rename to keyboards/mode/m80v1/m80s/config.h
diff --git a/keyboards/mode/eighty/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json
similarity index 100%
rename from keyboards/mode/eighty/m80s/info.json
rename to keyboards/mode/m80v1/m80s/info.json
diff --git a/keyboards/mode/eighty/m80s/keymaps/default/keymap.c b/keyboards/mode/m80v1/m80s/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mode/eighty/m80s/keymaps/default/keymap.c
rename to keyboards/mode/m80v1/m80s/keymaps/default/keymap.c
diff --git a/keyboards/mode/eighty/m80s/keymaps/via/keymap.c b/keyboards/mode/m80v1/m80s/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mode/eighty/m80s/keymaps/via/keymap.c
rename to keyboards/mode/m80v1/m80s/keymaps/via/keymap.c
diff --git a/keyboards/mode/eighty/m80s/keymaps/via/rules.mk b/keyboards/mode/m80v1/m80s/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mode/eighty/m80s/keymaps/via/rules.mk
rename to keyboards/mode/m80v1/m80s/keymaps/via/rules.mk
diff --git a/keyboards/mode/eighty/m80s/m80s.c b/keyboards/mode/m80v1/m80s/m80s.c
similarity index 100%
rename from keyboards/mode/eighty/m80s/m80s.c
rename to keyboards/mode/m80v1/m80s/m80s.c
diff --git a/keyboards/mode/eighty/m80s/m80s.h b/keyboards/mode/m80v1/m80s/m80s.h
similarity index 99%
rename from keyboards/mode/eighty/m80s/m80s.h
rename to keyboards/mode/m80v1/m80s/m80s.h
index 3799b5f617..b5d1e4dd06 100644
--- a/keyboards/mode/eighty/m80s/m80s.h
+++ b/keyboards/mode/m80v1/m80s/m80s.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "eighty.h"
+#include "m80v1.h"
 
 #define LAYOUT_eighty_m80s( \
     K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K415,  K114, K115,  K116, \
diff --git a/keyboards/mode/eighty/m80s/readme.md b/keyboards/mode/m80v1/m80s/readme.md
similarity index 100%
rename from keyboards/mode/eighty/m80s/readme.md
rename to keyboards/mode/m80v1/m80s/readme.md
diff --git a/keyboards/mode/eighty/m80s/rules.mk b/keyboards/mode/m80v1/m80s/rules.mk
similarity index 100%
rename from keyboards/mode/eighty/m80s/rules.mk
rename to keyboards/mode/m80v1/m80s/rules.mk
diff --git a/keyboards/mode/eighty/eighty.c b/keyboards/mode/m80v1/m80v1.c
similarity index 96%
rename from keyboards/mode/eighty/eighty.c
rename to keyboards/mode/m80v1/m80v1.c
index bde91d35a5..225ed9cc8d 100644
--- a/keyboards/mode/eighty/eighty.c
+++ b/keyboards/mode/m80v1/m80v1.c
@@ -11,4 +11,4 @@
   * GNU General Public License for more details. 
   */
 
-#include "eighty.h"
+#include "m80v1.h"
diff --git a/keyboards/mode/eighty/eighty.h b/keyboards/mode/m80v1/m80v1.h
similarity index 62%
rename from keyboards/mode/eighty/eighty.h
rename to keyboards/mode/m80v1/m80v1.h
index b5f6328854..704ea28439 100644
--- a/keyboards/mode/eighty/eighty.h
+++ b/keyboards/mode/m80v1/m80v1.h
@@ -2,8 +2,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_mode_eighty_m80h)
+#if defined(KEYBOARD_mode_m80v1_m80h)
   #include "m80h.h"
-#elif defined(KEYBOARD_mode_eighty_m80s)
+#elif defined(KEYBOARD_mode_m80v1_m80s)
   #include "m80s.h"
 #endif // Mode80 solderable "S" and hotswap "H" revisions
diff --git a/keyboards/mode/eighty/mcuconf.h b/keyboards/mode/m80v1/mcuconf.h
similarity index 100%
rename from keyboards/mode/eighty/mcuconf.h
rename to keyboards/mode/m80v1/mcuconf.h
diff --git a/keyboards/mode/m80v1/readme.md b/keyboards/mode/m80v1/readme.md
new file mode 100644
index 0000000000..5435a02e61
--- /dev/null
+++ b/keyboards/mode/m80v1/readme.md
@@ -0,0 +1,38 @@
+# Mode Eighty V1 PCB QMK firmware
+
+![MODE80](https://i.imgur.com/26uzM3yl.jpg)\
+[Image Gallery](https://imgur.com/t/mechanicalkeyboards/8Uf6c2m?nc=1)
+
+The Mode80 is a tenkeyless high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/gondolindrim)
+* Hardware Supported: proprietary PCB using STM32F072 controller
+* Hardware Availability: the Mode Eighty V1 was discontinued in 2021 in favour of its second revisions. You can still buy hardware (PCBs and plates) at the Mode Designs website.
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (ESC key at layer 1 in the default layout)
+
+## Compile firmware
+
+After accessing the DFU state in your PCB, build the default layout using:
+
+    make mode/m80v1/m80h:default # Hotswap
+    make mode/m80v1/m80s:default # Soldered
+
+Then download the resulting binary `*bin` file using `dfu-util` or QMK Toolbox.
+
+## Compile and flash
+
+After accessing the DFU state in your PCB, you can compile-and-flash automatically usind `dfu-util` through
+
+    make mode/m80v1/m80h:default:flash # Hotswap
+    make mode/m80v1/m80s:default:flash # Soldered
+
+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/mode/m80v2/chconf.h b/keyboards/mode/m80v2/chconf.h
new file mode 100644
index 0000000000..cbbae31079
--- /dev/null
+++ b/keyboards/mode/m80v2/chconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * 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
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h
new file mode 100644
index 0000000000..fbe5fb86df
--- /dev/null
+++ b/keyboards/mode/m80v2/config.h
@@ -0,0 +1,45 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x00DE
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    Mode
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+#define MATRIX_ROW_PINS { B12, B13, B14, B3, B4, B9 }
+#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B10, A8, A10, B15, A15, B5, B8, C13 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define LED_CAPS_LOCK_PIN A0
diff --git a/keyboards/mode/m80v2/halconf.h b/keyboards/mode/m80v2/halconf.h
new file mode 100644
index 0000000000..3aeb26b0e7
--- /dev/null
+++ b/keyboards/mode/m80v2/halconf.h
@@ -0,0 +1,18 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <halconf.h>
diff --git a/keyboards/mode/m80v2/m80v2.c b/keyboards/mode/m80v2/m80v2.c
new file mode 100644
index 0000000000..faad98b7a7
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2.c
@@ -0,0 +1,18 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2.h"
diff --git a/keyboards/mode/m80v2/m80v2.h b/keyboards/mode/m80v2/m80v2.h
new file mode 100644
index 0000000000..c00f148e62
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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"
+
+#if defined(KEYBOARD_mode_m80v2_m80v2h)
+  #include "m80v2h.h"
+#elif defined(KEYBOARD_mode_m80v2_m80v2s)
+  #include "m80v2s.h"
+#endif
diff --git a/keyboards/mode/m80v2/m80v2h/config.h b/keyboards/mode/m80v2/m80v2h/config.h
new file mode 100644
index 0000000000..f474e28453
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/config.h
@@ -0,0 +1,2 @@
+#define PRODUCT_ID      0x0083 // 81 was used for M80H V1
+#define PRODUCT         M80H V2
diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json
new file mode 100644
index 0000000000..251937c562
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "MODE80V2H", 
+    "url": "https://shop.modedesigns.com/collections/eighty", 
+    "maintainer": "Gondolindrim", 
+    "layouts": {
+        "LAYOUT_m80v2h": {
+            "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":"Bkspc", "x":13, "y":1.5, "w": 2},
+			{"label":"Mute", "x":15.25, "y":0},
+			{"label":"VolDn", "x":16.25, "y":0},
+			{"label":"VolUp", "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":"Insert", "x":15.25, "y":1.5},
+			{"label":"Home", "x":16.25, "y":1.5},
+			{"label":"PgUp", "x":17.25, "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":"PgDn", "x":17.25, "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":"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":"\u2191", "x":16.25, "y":4.5},
+			{"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+			{"label":"Win", "x":1.25, "y":5.5, "w":1.25},
+			{"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+			{"x":3.75, "y":5.5, "w":6.25},
+			{"label":"Alt", "x":10, "y":5.5, "w":1.25},
+			{"label":"Win", "x":11.25, "y":5.5, "w":1.25},
+			{"label":"FN1", "x":12.5, "y":5.5, "w":1.25},
+			{"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+			{"label":"\u2190", "x":15.25, "y":5.5},
+			{"label":"\u2193", "x":16.25, "y":5.5},
+			{"label":"\u2192", "x":17.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/mode/m80v2/m80v2h/keymaps/default/keymap.c b/keyboards/mode/m80v2/m80v2h/keymaps/default/keymap.c
new file mode 100755
index 0000000000..f65309dfc7
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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_m80v2h(
+        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_BSPC, KC_MUTE, KC_VOLD , KC_VOLU ,
+        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_INS , 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_DEL , KC_END  , KC_PGDN ,
+        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_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+   [1] = LAYOUT_m80v2h(
+        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_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_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 
+	),
+   [2] = LAYOUT_m80v2h(
+        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_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_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 
+	),
+   [3] = LAYOUT_m80v2h(
+        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_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_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/mode/m80v2/m80v2h/keymaps/via/keymap.c b/keyboards/mode/m80v2/m80v2h/keymaps/via/keymap.c
new file mode 100755
index 0000000000..f65309dfc7
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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_m80v2h(
+        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_BSPC, KC_MUTE, KC_VOLD , KC_VOLU ,
+        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_INS , 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_DEL , KC_END  , KC_PGDN ,
+        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_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+   [1] = LAYOUT_m80v2h(
+        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_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_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 
+	),
+   [2] = LAYOUT_m80v2h(
+        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_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_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 
+	),
+   [3] = LAYOUT_m80v2h(
+        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_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_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/mode/m80v2/m80v2h/keymaps/via/rules.mk b/keyboards/mode/m80v2/m80v2h/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.c b/keyboards/mode/m80v2/m80v2h/m80v2h.c
new file mode 100644
index 0000000000..0d4e533c30
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/m80v2h.c
@@ -0,0 +1,18 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2h.h"
diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.h b/keyboards/mode/m80v2/m80v2h/m80v2h.h
new file mode 100644
index 0000000000..6a21b8cecc
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/m80v2h.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_m80v2h( \
+	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,      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,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,      \
+        K50, K51, K52,                K56,                K5A, K5B, K5C, 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, ___, 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, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
+	{ K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, K5G } \
+}
diff --git a/keyboards/mode/m80v2/m80v2h/rules.mk b/keyboards/mode/m80v2/m80v2h/rules.mk
new file mode 100644
index 0000000000..5422160c87
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # 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 = yes          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m80v2/m80v2s/config.h b/keyboards/mode/m80v2/m80v2s/config.h
new file mode 100644
index 0000000000..ad1871f8ab
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/config.h
@@ -0,0 +1,2 @@
+#define PRODUCT_ID      0x0082 // 81 was used for M80H V1
+#define PRODUCT         M80S V2
diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json
new file mode 100644
index 0000000000..6e0bd62d51
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/info.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "MODE80V2S", 
+    "url": "https://shop.modedesigns.com/collections/eighty", 
+    "maintainer": "Gondolindrim", 
+    "layouts": {
+        "LAYOUT_m80v2s": {
+            "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": "LBkspc", "x":13, "y":1.5},
+			{"label":"Mute", "x":15.25, "y":0},
+			{"label":"VolDn", "x":16.25, "y":0},
+			{"label":"VolUp", "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": "RBkspc", "x":14, "y":1.5},
+			{"label":"Insert", "x":15.25, "y":1.5},
+			{"label":"Home", "x":16.25, "y":1.5},
+			{"label":"PgUp", "x":17.25, "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":"PgDn", "x":17.25, "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":"NUBS", "x":12.75, "y":3.5},
+			{"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+			{"label":"Shift", "x":0, "y":4.5, "w":1.25},
+			{"label":"NUHS", "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":1.75},
+			{"label":"FN1", "x":14, "y":4.5},
+			{"label":"\u2191", "x":16.25, "y":4.5},
+			{"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+			{"label":"Win", "x":1.25, "y":5.5, "w":1.25},
+			{"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+			{"x":3.75, "y":5.5, "w":6.25},
+			{"label":"Alt", "x":10, "y":5.5, "w":1.25},
+			{"label":"Win", "x":11.25, "y":5.5, "w":1.25},
+			{"label":"FN1", "x":12.5, "y":5.5, "w":1.25},
+			{"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+			{"label":"\u2190", "x":15.25, "y":5.5},
+			{"label":"\u2193", "x":16.25, "y":5.5},
+			{"label":"\u2192", "x":17.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/mode/m80v2/m80v2s/keymaps/default/keymap.c b/keyboards/mode/m80v2/m80v2s/keymaps/default/keymap.c
new file mode 100755
index 0000000000..fcb05df0cf
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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_m80v2s(
+        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_BSPC, KC_MUTE, KC_VOLD , KC_VOLU ,
+        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_INS , 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_DEL , KC_END  , KC_PGDN ,
+        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_NUHS, KC_ENT ,          
+	KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP   , 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+   [1] = LAYOUT_m80v2s(
+        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_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_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 
+	),
+   [2] = LAYOUT_m80v2s(
+        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_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_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 
+	),
+   [3] = LAYOUT_m80v2s(
+        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_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_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 
+	)
+};
diff --git a/keyboards/mode/m80v2/m80v2s/keymaps/via/keymap.c b/keyboards/mode/m80v2/m80v2s/keymaps/via/keymap.c
new file mode 100755
index 0000000000..fcb05df0cf
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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_m80v2s(
+        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_BSPC, KC_MUTE, KC_VOLD , KC_VOLU ,
+        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_INS , 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_DEL , KC_END  , KC_PGDN ,
+        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_NUHS, KC_ENT ,          
+	KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP   , 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+   [1] = LAYOUT_m80v2s(
+        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_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_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 
+	),
+   [2] = LAYOUT_m80v2s(
+        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_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_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 
+	),
+   [3] = LAYOUT_m80v2s(
+        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_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_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 
+	)
+};
diff --git a/keyboards/mode/m80v2/m80v2s/keymaps/via/rules.mk b/keyboards/mode/m80v2/m80v2s/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.c b/keyboards/mode/m80v2/m80v2s/m80v2s.c
new file mode 100644
index 0000000000..7be89b1288
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/m80v2s.c
@@ -0,0 +1,18 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2s.h"
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.h b/keyboards/mode/m80v2/m80v2s/m80v2s.h
new file mode 100644
index 0000000000..440b54583a
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/m80v2s.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_m80v2s( \
+	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, K3C, K3D,                \
+	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F,      \
+        K50, K51, K52,                K56,                K5A, K5B, K5C, 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, K3C, K3D, ___, ___, ___ }, \
+	{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
+	{ K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, K5G } \
+}
diff --git a/keyboards/mode/m80v2/m80v2s/rules.mk b/keyboards/mode/m80v2/m80v2s/rules.mk
new file mode 100644
index 0000000000..5422160c87
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # 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 = yes          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m80v2/mcuconf.h b/keyboards/mode/m80v2/mcuconf.h
new file mode 100644
index 0000000000..6d5ee13d30
--- /dev/null
+++ b/keyboards/mode/m80v2/mcuconf.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <mcuconf.h>
diff --git a/keyboards/mode/m80v2/readme.md b/keyboards/mode/m80v2/readme.md
new file mode 100644
index 0000000000..e94984f06b
--- /dev/null
+++ b/keyboards/mode/m80v2/readme.md
@@ -0,0 +1,38 @@
+# Mode Eighty V2 PCB QMK firmware
+
+![MODE80](https://i.imgur.com/26uzM3yl.jpg)\
+[Image Gallery](https://imgur.com/t/mechanicalkeyboards/8Uf6c2m?nc=1)
+
+The Mode80 is a tenkeyless high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/gondolindrim)
+* Hardware Supported: proprietary PCB using STM32F072 controller
+* Hardware Availability: you can get a Mode Eighty as of today (dec. 2021) through the in stock sales or special groupbuy editions at https://shop.modedesigns.com/
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (ESC key at layer 1 in the default layout)
+
+## Compile firmware
+
+After accessing the DFU state in your PCB, build the default layout using:
+
+    make mode/m80v2/m80v2h:default # Hotswap
+    make mode/m80v2/m80v2s:default # Soldered
+
+Then download the resulting binary `*bin` file using `dfu-util` or QMK Toolbox.
+
+## Compile and flash
+
+After accessing the DFU state in your PCB, you can compile-and-flash automatically usind `dfu-util` through
+
+    make mode/m80v2/m80v2h:default:flash # Hotswap
+    make mode/m80v2/m80v2s:default:flash # Soldered
+
+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).