diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
new file mode 100644
index 0000000000..6cfc312243
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -0,0 +1,79 @@
+/*
+Copyright 2021 MTBKeys
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0001
+#define MANUFACTURER MTBKeys
+#define PRODUCT honeyboard60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pinout */
+#define MATRIX_ROW_PINS { D6, D7, B4, B5, D5 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, B7, B6, F7, C6, C7, F6, F4, F1, F0, F5, E6 }
+#define UNUSED_PINS
+
+/* diode direction: COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Pin WS2812 RGB LEDs are connected to */
+#define RGB_DI_PIN D4
+
+#ifdef RGB_DI_PIN
+# define RGBLED_NUM 16
+# define RGBLIGHT_HUE_STEP 8
+# define RGBLIGHT_SAT_STEP 8
+# define RGBLIGHT_VAL_STEP 8
+# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+# define RGBLIGHT_SLEEP /* Turn RGB light off when the host goes to sleep */
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_RGB_TEST
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
+#endif /* RGB_DI_PIN */
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mtbkeys/mtb60/hotswap/hotswap.c b/keyboards/mtbkeys/mtb60/hotswap/hotswap.c
new file mode 100644
index 0000000000..f23de6af54
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/hotswap/hotswap.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 MTBKeys
+ *
+ * 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 "hotswap.h"
diff --git a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
new file mode 100644
index 0000000000..7dae44b5da
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 MTBKeys
+ *
+ * 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 LAYOUT( \
+ k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, ke0, \
+ k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1, \
+ k02, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, \
+ k03, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kd3, \
+ k04, k14, k24, k64, ka4, kb4, kd4, ke4 \
+) { \
+ { k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, KC_NO, ke0 }, \
+ { KC_NO, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1 }, \
+ { k02, KC_NO, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, KC_NO }, \
+ { k03, KC_NO, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, KC_NO, kd3, KC_NO }, \
+ { k04, k14, k24, KC_NO, KC_NO, KC_NO, k64, KC_NO, KC_NO, KC_NO, ka4, kb4, kd4, KC_NO, ke4 } \
+}
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
new file mode 100644
index 0000000000..5718d70507
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -0,0 +1,72 @@
+{
+ "keyboard_name": "MTB60",
+ "url": "mtbkeys.com",
+ "maintainer": "MTBKeys",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc" , "x": 0, "y": 0 },
+ {"label": "!" , "x": 1, "y": 0 },
+ {"label": "@" , "x": 2, "y": 0 },
+ {"label": "#" , "x": 3, "y": 0 },
+ {"label": "$" , "x": 4, "y": 0 },
+ {"label": "%" , "x": 5, "y": 0 },
+ {"label": "^" , "x": 6, "y": 0 },
+ {"label": "&" , "x": 7, "y": 0 },
+ {"label": "*" , "x": 8, "y": 0 },
+ {"label": "(" , "x": 9, "y": 0 },
+ {"label": ")" , "x": 10, "y": 0 },
+ {"label": "_" , "x": 11, "y": 0 },
+ {"label": "+" , "x": 12, "y": 0 },
+ {"label": "Back Space", "x": 13, "y": 0, "w": 2},
+ {"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": "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": "Enter" , "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Left 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": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
+ {"label": "Left Ctrl" , "x": 0 , "y": 4, "w": 1.25},
+ {"label": "GUI" , "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Left Alt" , "x": 2.5 , "y": 4, "w": 1.25},
+ {"label": "Space" , "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Right Ctrl", "x": 10 , "y": 4, "w": 1.25},
+ {"label": "GUI" , "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "MO(1)" , "x": 12.5 , "y": 4, "w": 1.25},
+ {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c b/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..648c8201f5
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2021 MTBKeys
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _BASE, ///< Default Layer
+ _FN ///< Function Layer
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
+ ),
+ [_FN] = LAYOUT(
+ KC_GRV, 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_DEL,
+ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, RGB_TOG
+ )
+};
diff --git a/keyboards/mtbkeys/mtb60/hotswap/readme.md b/keyboards/mtbkeys/mtb60/hotswap/readme.md
new file mode 100644
index 0000000000..7afa26bbd4
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/hotswap/readme.md
@@ -0,0 +1,26 @@
+# MTB60 (Hotswap Edition)
+
+## Details
+
+* Keyboard Maintainer: [MTBKeys](https://mtbkeys.com/)
+* Hardware Supported: MTB60 PCB (Hotswap edition)
+* Hardware Availability: [HB60 on MTBKeys Website](https://mtbkeys.com/)
+
+## Building Firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mtbkeys/mtb60/hotswap:default
+
+Flashing example for this keyboard:
+
+ make mtbkeys/mtb60/hotswap:default:flash
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+1. **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+2. **Physical reset button**: Briefly press the button on the back of the PCB
+
+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/mtbkeys/mtb60/hotswap/rules.mk b/keyboards/mtbkeys/mtb60/hotswap/rules.mk
new file mode 100644
index 0000000000..02ae236709
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/hotswap/rules.mk
@@ -0,0 +1,21 @@
+# 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
+# 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 = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h
new file mode 100644
index 0000000000..02037e83df
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -0,0 +1,79 @@
+/*
+Copyright 2021 MTBKeys
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x0000
+#define DEVICE_VER 0x0001
+#define MANUFACTURER MTBKeys
+#define PRODUCT MTB60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pinout */
+#define MATRIX_ROW_PINS { D0, D1, F4, F1, D2 }
+#define MATRIX_COL_PINS { E6, F0, F5, F6, F7, D5, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
+#define UNUSED_PINS
+
+/* diode direction: COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Pin WS2812 RGB LEDs are connected to */
+#define RGB_DI_PIN B0
+
+#ifdef RGB_DI_PIN
+# define RGBLED_NUM 16
+# define RGBLIGHT_HUE_STEP 8
+# define RGBLIGHT_SAT_STEP 8
+# define RGBLIGHT_VAL_STEP 8
+# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+# define RGBLIGHT_SLEEP /* Turn RGB light off when the host goes to sleep */
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_RGB_TEST
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
+#endif /* RGB_DI_PIN */
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
new file mode 100644
index 0000000000..e60d3eee2f
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -0,0 +1,75 @@
+{
+ "keyboard_name": "MTB60",
+ "url": "mtbkeys.com",
+ "maintainer": "MTBKeys",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc" , "x": 0, "y": 0},
+ {"label": "!" , "x": 1, "y": 0},
+ {"label": "@" , "x": 2, "y": 0},
+ {"label": "#" , "x": 3, "y": 0},
+ {"label": "$" , "x": 4, "y": 0},
+ {"label": "%" , "x": 5, "y": 0},
+ {"label": "^" , "x": 6, "y": 0},
+ {"label": "&" , "x": 7, "y": 0},
+ {"label": "*" , "x": 8, "y": 0},
+ {"label": "(" , "x": 9, "y": 0},
+ {"label": ")" , "x": 10, "y": 0},
+ {"label": "_" , "x": 11, "y": 0},
+ {"label": "+" , "x": 12, "y": 0},
+ {"label": "Back Space", "x": 13, "y": 0},
+ {"label": "Delete" , "x": 14, "y": 0},
+ {"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": "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": "Enter" , "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Left 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": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
+ {"label": "Left Ctrl" , "x": 0 , "y": 4, "w": 1.25},
+ {"label": "GUI" , "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Left Alt" , "x": 2.5 , "y": 4, "w": 1.25},
+ {"label": "Space" , "x": 3.75, "y": 4, "w": 2.25},
+ {"label": "Space" , "x": 6 , "y": 4, "w": 1.25},
+ {"label": "Space" , "x": 7.25, "y": 4, "w": 2.75},
+ {"label": "Right Ctrl", "x": 10 , "y": 4, "w": 1.25},
+ {"label": "GUI" , "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "MO(1)" , "x": 12.5 , "y": 4, "w": 1.25},
+ {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c b/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6ed34b6432
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 MTBKeys
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _BASE,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Base */
+ [_BASE] = LAYOUT(
+ KC_ESC, 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_BSPC,
+ 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_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_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RGUI, KC_RCTL
+ ),
+ [_FN] = LAYOUT(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/mtbkeys/mtb60/solder/readme.md b/keyboards/mtbkeys/mtb60/solder/readme.md
new file mode 100644
index 0000000000..adaa94244f
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/solder/readme.md
@@ -0,0 +1,26 @@
+# MTB60 (Solder Edition)
+
+## Details
+
+* Keyboard Maintainer: [MTBKeys](https://mtbkeys.com/)
+* Hardware Supported: MTB60 PCB (Solder edition)
+* Hardware Availability: [HB60 on MTBKeys Website](https://mtbkeys.com/)
+
+## Building Firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mtbkeys/mtb60/solder:default
+
+Flashing example for this keyboard:
+
+ make mtbkeys/mtb60/solder:default:flash
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+1. **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+2. **Physical reset button**: Briefly press the button on the back of the PCB
+
+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/mtbkeys/mtb60/solder/rules.mk b/keyboards/mtbkeys/mtb60/solder/rules.mk
new file mode 100644
index 0000000000..33e1763375
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/solder/rules.mk
@@ -0,0 +1,21 @@
+# 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
+# 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 = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mtbkeys/mtb60/solder/solder.c b/keyboards/mtbkeys/mtb60/solder/solder.c
new file mode 100644
index 0000000000..9bb7f2b98e
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/solder/solder.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 MTBKeys
+ *
+ * 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 "solder.h"
diff --git a/keyboards/mtbkeys/mtb60/solder/solder.h b/keyboards/mtbkeys/mtb60/solder/solder.h
new file mode 100644
index 0000000000..31756e7af7
--- /dev/null
+++ b/keyboards/mtbkeys/mtb60/solder/solder.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 MTBKeys
+ *
+ * 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 LAYOUT( \
+ k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, ke0, \
+ k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1, \
+ k02, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, \
+ k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3, kd3, ke3, \
+ k04, k14, k34, k44, k64, k84, ka4, kb4, kc4, kd4, ke4 \
+) { \
+ { k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, ke0 }, \
+ { KC_NO, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1 }, \
+ { k02, KC_NO, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, KC_NO }, \
+ { k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3, kd3, ke3 }, \
+ { k04, k14, KC_NO, k34, k44, KC_NO, k64, KC_NO, k84, KC_NO, ka4, kb4, kc4, kd4, ke4 } \
+}