diff --git a/keyboards/smartkit/macro8/info.json b/keyboards/smartkit/macro8/info.json
new file mode 100644
index 00000000000..1ff6a10071f
--- /dev/null
+++ b/keyboards/smartkit/macro8/info.json
@@ -0,0 +1,74 @@
+{
+    "keyboard_name": "Macro8",
+    "manufacturer": "SmartKit",
+    "url": "smartkit.si",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6000",
+        "pid": "0x6060",
+        "device_version": "0.0.3"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B3" ]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6", "resolution": 1}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "bootmagic": {
+        "matrix": [0, 7]
+    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "rgblight": {
+        "led_count": 8,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": false,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": false,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                
+                {"matrix": [0, 4], "x": 0, "y": 1},
+                {"matrix": [0, 5], "x": 1, "y": 1},
+                {"matrix": [0, 6], "x": 2, "y": 1},
+                {"matrix": [0, 7], "x": 3, "y": 1}
+
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/smartkit/macro8/keymaps/default/keymap.c b/keyboards/smartkit/macro8/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ca59b2f7b49
--- /dev/null
+++ b/keyboards/smartkit/macro8/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_0, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8),
+
+	  [1] = LAYOUT(
+        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)
+    
+};
+
+
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+  [1] = { ENCODER_CCW_CW(_______, _______) },
+  [2] = { ENCODER_CCW_CW(_______, _______) }
+};
+#endif
+
diff --git a/keyboards/smartkit/macro8/keymaps/default/rules.mk b/keyboards/smartkit/macro8/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/smartkit/macro8/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/smartkit/macro8/keymaps/via/keymap.c b/keyboards/smartkit/macro8/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ca59b2f7b49
--- /dev/null
+++ b/keyboards/smartkit/macro8/keymaps/via/keymap.c
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_0, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8),
+
+	  [1] = LAYOUT(
+        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)
+    
+};
+
+
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+  [1] = { ENCODER_CCW_CW(_______, _______) },
+  [2] = { ENCODER_CCW_CW(_______, _______) }
+};
+#endif
+
diff --git a/keyboards/smartkit/macro8/keymaps/via/rules.mk b/keyboards/smartkit/macro8/keymaps/via/rules.mk
new file mode 100644
index 00000000000..715838ecc5d
--- /dev/null
+++ b/keyboards/smartkit/macro8/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/smartkit/macro8/rules.mk b/keyboards/smartkit/macro8/rules.mk
new file mode 100644
index 00000000000..e0c38f51c53
--- /dev/null
+++ b/keyboards/smartkit/macro8/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_ENABLE = yes
+DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/smartkit/macro8_line/info.json b/keyboards/smartkit/macro8_line/info.json
new file mode 100644
index 00000000000..e38c5256d60
--- /dev/null
+++ b/keyboards/smartkit/macro8_line/info.json
@@ -0,0 +1,70 @@
+{
+    "keyboard_name": "Macro8 Line",
+    "manufacturer": "SmartKit",
+    "url": "smartkit.si",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6000",
+        "pid": "0x6062",
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B3" ]
+    },
+    "diode_direction": "COL2ROW",
+
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "bootmagic": {
+        "matrix": [0, 7]
+    },
+    "dynamic_keymap": {
+        "layer_count": 4
+    },
+    "rgblight": {
+        "led_count": 8,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": false,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": false,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0}
+
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/smartkit/macro8_line/keymaps/default/keymap.c b/keyboards/smartkit/macro8_line/keymaps/default/keymap.c
new file mode 100644
index 00000000000..93992e1e987
--- /dev/null
+++ b/keyboards/smartkit/macro8_line/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_0, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8),
+
+	  [1] = LAYOUT(
+        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),
+
+    [3] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+    
+};
+
+
+
+
+
diff --git a/keyboards/smartkit/macro8_line/keymaps/via/keymap.c b/keyboards/smartkit/macro8_line/keymaps/via/keymap.c
new file mode 100644
index 00000000000..93992e1e987
--- /dev/null
+++ b/keyboards/smartkit/macro8_line/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_0, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8),
+
+	  [1] = LAYOUT(
+        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),
+
+    [3] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+    
+};
+
+
+
+
+
diff --git a/keyboards/smartkit/macro8_line/keymaps/via/rules.mk b/keyboards/smartkit/macro8_line/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/smartkit/macro8_line/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/smartkit/macro8_line/rules.mk b/keyboards/smartkit/macro8_line/rules.mk
new file mode 100644
index 00000000000..b5aca23ec45
--- /dev/null
+++ b/keyboards/smartkit/macro8_line/rules.mk
@@ -0,0 +1,2 @@
+
+DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/smartkit/macropad/info.json b/keyboards/smartkit/macropad/info.json
new file mode 100644
index 00000000000..40e18fdcce8
--- /dev/null
+++ b/keyboards/smartkit/macropad/info.json
@@ -0,0 +1,93 @@
+{
+    "keyboard_name": "MacroPad",
+    "manufacturer": "SmartKit",
+    "url": "smartkit.si",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6000",
+        "pid": "0x6061",
+        "device_version": "0.0.3"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B2", "B3", "F7"],
+        "rows": ["D4", "C6", "D7", "E6", "B4" ]
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6", "resolution": 1}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "dynamic_keymap": {
+        "layer_count": 2
+    },
+    "rgblight": {
+        "led_count": 20,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": false,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": false,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4}
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/smartkit/macropad/keymaps/default/keymap.c b/keyboards/smartkit/macropad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..7fd7866a234
--- /dev/null
+++ b/keyboards/smartkit/macropad/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_MUTE, 
+    KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, 
+    KC_P4, KC_P5, KC_P6, KC_DEL, KC_TRNS, 
+    KC_P1, KC_P2, KC_P3, KC_CALC, KC_TRNS,
+    KC_P0, KC_PDOT, KC_COMM, KC_PENT, KC_ENT),
+
+  	[1] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
+
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+  [1] = { ENCODER_CCW_CW(_______, _______) }
+};
+#endif
+
diff --git a/keyboards/smartkit/macropad/keymaps/default/rules.mk b/keyboards/smartkit/macropad/keymaps/default/rules.mk
new file mode 100644
index 00000000000..9c538186fac
--- /dev/null
+++ b/keyboards/smartkit/macropad/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+
diff --git a/keyboards/smartkit/macropad/keymaps/via/keymap.c b/keyboards/smartkit/macropad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..7fd7866a234
--- /dev/null
+++ b/keyboards/smartkit/macropad/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_MUTE, 
+    KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, 
+    KC_P4, KC_P5, KC_P6, KC_DEL, KC_TRNS, 
+    KC_P1, KC_P2, KC_P3, KC_CALC, KC_TRNS,
+    KC_P0, KC_PDOT, KC_COMM, KC_PENT, KC_ENT),
+
+  	[1] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
+
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+  [1] = { ENCODER_CCW_CW(_______, _______) }
+};
+#endif
+
diff --git a/keyboards/smartkit/macropad/keymaps/via/rules.mk b/keyboards/smartkit/macropad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..a947ad61901
--- /dev/null
+++ b/keyboards/smartkit/macropad/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
+
diff --git a/keyboards/smartkit/macropad/rules.mk b/keyboards/smartkit/macropad/rules.mk
new file mode 100644
index 00000000000..e0c38f51c53
--- /dev/null
+++ b/keyboards/smartkit/macropad/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_ENABLE = yes
+DYNAMIC_MACRO_ENABLE = yes