diff --git a/keyboards/cmm_studio/saka68/solder/config.h b/keyboards/cmm_studio/saka68/solder/config.h
index f7153bee4f..a886f01a4b 100644
--- a/keyboards/cmm_studio/saka68/solder/config.h
+++ b/keyboards/cmm_studio/saka68/solder/config.h
@@ -45,13 +45,3 @@
#define DIODE_DIRECTION COL2ROW
#define DEBOUNCE 5
-
-
-// Dynamic keymap starts after EEPROM version
-#define DYNAMIC_KEYMAP_EEPROM_ADDR 35
-// Dynamic macro starts after dynamic keymaps (35+(4*10*6*2)) = (35+480)
-#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 680 // **** CHANGE THIS BASED ON MATRIX_ROWS & MATRIX_COLS ****
-#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 344 // **** CHANGE THIS BASED ON 1024-DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR ****
-#define DYNAMIC_KEYMAP_MACRO_COUNT 16
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
new file mode 100644
index 0000000000..1df34a48dd
--- /dev/null
+++ b/keyboards/sam/s80/config.h
@@ -0,0 +1,73 @@
+/* Copyright 2020 CMM。Studio Freather
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x534D
+#define PRODUCT_ID 0x3830
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Sam
+#define PRODUCT s80
+
+/* key matrix size */
+#define MATRIX_ROWS 11
+#define MATRIX_COLS 9
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+
+#define DIODE_DIRECTION ROW2COL
+
+#define BACKLIGHT_PIN B6
+// #define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+# define RGBLED_NUM 20
+# define RGBLIGHT_HUE_STEP 8
+# define RGBLIGHT_SAT_STEP 8
+# define RGBLIGHT_VAL_STEP 8
+# define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */
+//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+// # define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+// #define RGBLIGHT_EFFECT_BREATHING
+// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+// #define RGBLIGHT_EFFECT_SNAKE
+// #define RGBLIGHT_EFFECT_KNIGHT
+// #define RGBLIGHT_EFFECT_CHRISTMAS
+// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+// #define RGBLIGHT_EFFECT_RGB_TEST
+// #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
new file mode 100644
index 0000000000..c6dc769d53
--- /dev/null
+++ b/keyboards/sam/s80/info.json
@@ -0,0 +1,104 @@
+{
+ "keyboard_name": "s80 wkl",
+ "url": "",
+ "maintainer": "qmk",
+ "width": 18.25,
+ "height": 6.5,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"K00 (E6,D0)", "x":0, "y":0},
+ {"label":"K02 (E6,D2)", "x":2, "y":0},
+ {"label":"K03 (E6,D3)", "x":3, "y":0},
+ {"label":"K04 (E6,D5)", "x":4, "y":0},
+ {"label":"K05 (E6,D4)", "x":5, "y":0},
+ {"label":"K06 (E6,D6)", "x":6.5, "y":0},
+ {"label":"K07 (E6,D7)", "x":7.5, "y":0},
+ {"label":"K08 (E6,B4)", "x":8.5, "y":0},
+ {"label":"K68 (F7,B4)", "x":9.5, "y":0},
+ {"label":"K67 (F7,D7)", "x":11, "y":0},
+ {"label":"K65 (F7,D4)", "x":12, "y":0},
+ {"label":"K64 (F7,D5)", "x":13, "y":0},
+ {"label":"K63 (F7,D3)", "x":14, "y":0},
+ {"label":"K66 (F7,D6)", "x":15.25, "y":0},
+ {"label":"K62 (F7,D2)", "x":16.25, "y":0},
+ {"label":"K61 (F7,D1)", "x":17.25, "y":0},
+ {"label":"K10 (B0,D0)", "x":0, "y":1.5},
+ {"label":"K11 (B0,D1)", "x":1, "y":1.5},
+ {"label":"K12 (B0,D2)", "x":2, "y":1.5},
+ {"label":"K13 (B0,D3)", "x":3, "y":1.5},
+ {"label":"K14 (B0,D5)", "x":4, "y":1.5},
+ {"label":"K15 (B0,D4)", "x":5, "y":1.5},
+ {"label":"K16 (B0,D6)", "x":6, "y":1.5},
+ {"label":"K17 (B0,D7)", "x":7, "y":1.5},
+ {"label":"K18 (B0,B4)", "x":8, "y":1.5},
+ {"label":"K78 (F6,B4)", "x":9, "y":1.5},
+ {"label":"K70 (F6,D0)", "x":10, "y":1.5},
+ {"label":"K77 (F6,D7)", "x":11, "y":1.5},
+ {"label":"K75 (F6,D4)", "x":12, "y":1.5},
+ {"label":"K74 (F6,D5)", "x":13, "y":1.5},
+ {"label":"K73 (F6,D3)", "x":14, "y":1.5},
+ {"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
+ {"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
+ {"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
+ {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
+ {"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
+ {"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
+ {"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
+ {"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
+ {"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
+ {"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
+ {"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
+ {"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
+ {"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
+ {"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
+ {"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
+ {"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
+ {"label":"K94 (F4,D5)", "x":13.5, "y":2.5, "w":1.5},
+ {"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
+ {"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
+ {"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
+ {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
+ {"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
+ {"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
+ {"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
+ {"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
+ {"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
+ {"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
+ {"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
+ {"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
+ {"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
+ {"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
+ {"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
+ {"label":"K83 (F5,D3)", "x":12.75, "y":3.5, "w":2.25},
+ {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":1.25},
+ {"label":"K41 (B3,D1)", "x":1.25, "y":4.5},
+ {"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
+ {"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
+ {"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
+ {"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
+ {"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
+ {"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
+ {"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
+ {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
+ {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
+ {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
+ {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":1.75},
+ {"label":"KA3 (F1,D3)", "x":14, "y":4.5},
+ {"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
+ {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.25},
+ {"label":"K51 (B7,D1)", "x":1.25, "y":5.5, "w":1.25},
+ {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.25},
+ {"label":"K56 (B7,D6)", "x":3.75, "y":5.5, "w":6.25},
+ {"label":"K58 (B7,B4)", "x":10, "y":5.5, "w":1.25},
+ {"label":"K57 (B7,D7)", "x":11.25, "y":5.5, "w":1.25},
+ {"label":"K54 (B7,D5)", "x":12.5, "y":5.5, "w":1.25},
+ {"label":"K53 (B7,D3)", "x":13.75, "y":5.5, "w":1.25},
+ {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
+ {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
+ {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
+ ]
+ }
+ }
+ ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/sam/s80/keymaps/default/keymap.c b/keyboards/sam/s80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a4f3ee1fd9
--- /dev/null
+++ b/keyboards/sam/s80/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, 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_SPC, 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_ENT,
+ KC_LSFT, 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_RSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_LCTL, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, 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/sam/s80/keymaps/via/keymap.c b/keyboards/sam/s80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..fc5852bb61
--- /dev/null
+++ b/keyboards/sam/s80/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, 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_SPC, 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_ENT,
+ KC_LSFT, 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_RSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_LCTL, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, 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(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/sam/s80/keymaps/via/rules.mk b/keyboards/sam/s80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..e78785bb35
--- /dev/null
+++ b/keyboards/sam/s80/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/s80/readme.md b/keyboards/sam/s80/readme.md
new file mode 100644
index 0000000000..50d1544321
--- /dev/null
+++ b/keyboards/sam/s80/readme.md
@@ -0,0 +1,16 @@
+# Sam S80
+
+Sam S80 TKL Keyboard
+
+
+
+* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather)
+* Hardware Supported: PCB, Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+ make sam/s80:default
+
+
+For reset instruction, use tweezer to short the top two pins to enter bootloader mode
+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/sam/s80/rules.mk b/keyboards/sam/s80/rules.mk
new file mode 100644
index 0000000000..e2f9c83102
--- /dev/null
+++ b/keyboards/sam/s80/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/sam/s80/s80.c b/keyboards/sam/s80/s80.c
new file mode 100644
index 0000000000..7b56bd854e
--- /dev/null
+++ b/keyboards/sam/s80/s80.c
@@ -0,0 +1,20 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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 .
+ */
+
+#include "s80.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/s80/s80.h b/keyboards/sam/s80/s80.h
new file mode 100644
index 0000000000..482688b0a1
--- /dev/null
+++ b/keyboards/sam/s80/s80.h
@@ -0,0 +1,43 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+ K00, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K74, K73, K76, K72, K71, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94, K86, K82, K81, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, KA3, K92, \
+ K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \
+) { \
+ { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
+ { K50, K51, K52, K53, K54, KC_NO, K56, K57, K58 }, \
+ { KC_NO, K61, K62, K63, K64, K65, K66, K67, K68 }, \
+ { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
+ { KC_NO, K81, K82, K83, K84, K85, K86, K87, K88 }, \
+ { KC_NO, KC_NO, K92, KC_NO, K94, K95, KC_NO, K97, K98 }, \
+ { KC_NO, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8 }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/