diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
new file mode 100644
index 00000000000..d3b49becb32
--- /dev/null
+++ b/keyboards/neson_design/n6/config.h
@@ -0,0 +1,67 @@
+/**
+ * config.h
+ *
+ Copyright 2021 astro
+
+ 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 0x4E65 //'Ne'
+#define PRODUCT_ID 0x4E36 //'N6'
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Neson Design
+#define PRODUCT N6 Keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+#define MATRIX_ROW_PINS { F0, B1, F6, F4, F1}
+#define MATRIX_COL_PINS { F7, B0, E6, C7, C6, B6, B5, B4, D7, D6, D4, D5, B2, D3, D2 }
+#define UNUSED_PINS
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+
+//rgb light setting
+//#define RGBLIGHT_LIMIT_VAL 128
+#define RGBLED_NUM 33
+#define RGB_DI_PIN B3
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+
+#define DRIVER_1_LED_TOTAL 32
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_COUNT 1
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL)
+
+#define CAPS_PIN F5
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
new file mode 100644
index 00000000000..fc61ac77609
--- /dev/null
+++ b/keyboards/neson_design/n6/info.json
@@ -0,0 +1,84 @@
+{
+ "keyboard_name": "n6",
+ "url": "",
+ "maintainer": "qmk",
+ "width": 15,
+ "height": 5,
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ { "x":0, "y":0 },
+ { "x":1, "y":0 },
+ { "x":2, "y":0 },
+ { "x":3, "y":0 },
+ { "x":4, "y":0 },
+ { "x":5, "y":0 },
+ { "x":6, "y":0 },
+ { "x":7, "y":0 },
+ { "x":8, "y":0 },
+ { "x":9, "y":0 },
+ { "x":10, "y":0 },
+ { "x":11, "y":0 },
+ { "x":12, "y":0 },
+ { "x":13, "y":0, "w": 2 },
+ { "x":15, "y":0 },
+
+ { "x":0, "y":1, "w":1.5 },
+ { "x":1.5, "y":1 },
+ { "x":2.5, "y":1 },
+ { "x":3.5, "y":1 },
+ { "x":4.5, "y":1 },
+ { "x":5.5, "y":1 },
+ { "x":6.5, "y":1 },
+ { "x":7.5, "y":1 },
+ { "x":8.5, "y":1 },
+ { "x":9.5, "y":1 },
+ { "x":10.5, "y":1 },
+ { "x":11.5, "y":1 },
+ { "x":12.5, "y":1 },
+ { "x":13.5, "y":1, "w":1.5 },
+ { "x":15, "y":1 },
+
+ { "x":0, "y":2, "w":1.75 },
+ { "x":1.75, "y":2 },
+ { "x":2.75, "y":2 },
+ { "x":3.75, "y":2 },
+ { "x":4.75, "y":2 },
+ { "x":5.75, "y":2 },
+ { "x":6.75, "y":2 },
+ { "x":7.75, "y":2 },
+ { "x":8.75, "y":2 },
+ { "x":9.75, "y":2 },
+ { "x":10.75, "y":2 },
+ { "x":11.75, "y":2 },
+ { "x":12.75, "y":2, "w":2.25 },
+ { "x":15, "y":2 },
+
+ { "x":0, "y":3, "w":2.25 },
+ { "x":2.25, "y":3 },
+ { "x":3.25, "y":3 },
+ { "x":4.25, "y":3 },
+ { "x":5.25, "y":3 },
+ { "x":6.25, "y":3 },
+ { "x":7.25, "y":3 },
+ { "x":8.25, "y":3 },
+ { "x":9.25, "y":3 },
+ { "x":10.25, "y":3 },
+ { "x":11.25, "y":3 },
+ { "x":12.25, "y":3, "w":1.75 },
+ { "x":14, "y":3 },
+ { "x":15, "y":3 },
+
+ { "x":0, "y":4, "w":1.25 },
+ { "x":1.25, "y":4, "w":1.25 },
+ { "x":2.5, "y":4, "w":1.25 },
+ { "x":3.75, "y":4, "w":6.25 },
+ { "x":10, "y":4, "w":1.25 },
+ { "x":11.25, "y":4, "w":1.25 },
+ { "x":13, "y":4 },
+ { "x":14, "y":4 },
+ { "x":15, "y":4 }
+ ]
+ }
+ }
+ }
diff --git a/keyboards/neson_design/n6/keymaps/default/keymap.c b/keyboards/neson_design/n6/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ecf17f3a6dc
--- /dev/null
+++ b/keyboards/neson_design/n6/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/**
+ Copyright 2021 astro
+
+ 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_65_ansi_blocker_splitbs(
+ 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_DEL, KC_BSPC, KC_PSCR,
+ 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_HOME,
+ 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_END,
+ 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, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_LEFT,KC_DOWN, KC_RIGHT),
+
+ [1] = LAYOUT_65_ansi_blocker_splitbs(
+ _______, 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,_______,
+ RESET, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,
+ _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END, _______,_______,
+ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,
+ _______,_______,_______, _______, _______,_______, _______,_______,_______),
+};
diff --git a/keyboards/neson_design/n6/keymaps/via/keymap.c b/keyboards/neson_design/n6/keymaps/via/keymap.c
new file mode 100644
index 00000000000..cad04a096c9
--- /dev/null
+++ b/keyboards/neson_design/n6/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/**
+ Copyright 2021 astro
+
+ 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_65_ansi_blocker_splitbs(
+ 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_DEL, KC_BSPC, KC_PSCR,
+ 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_HOME,
+ 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_END,
+ 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, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_LEFT,KC_DOWN, KC_RIGHT),
+
+ [1] = LAYOUT_65_ansi_blocker_splitbs(
+ _______, 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,_______,
+ RESET, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______,
+ _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______, _______,
+ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
+ _______,_______,_______, _______, _______,_______, _______,_______,_______),
+
+ [2] = LAYOUT_65_ansi_blocker_splitbs(
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______, _______, _______,_______, TG(0),_______,_______),
+
+ [3] = LAYOUT_65_ansi_blocker_splitbs(
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______, _______, _______,_______, TG(0),_______,_______),
+};
diff --git a/keyboards/neson_design/n6/keymaps/via/rules.mk b/keyboards/neson_design/n6/keymaps/via/rules.mk
new file mode 100644
index 00000000000..43061db1dd4
--- /dev/null
+++ b/keyboards/neson_design/n6/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
new file mode 100644
index 00000000000..800aa0ae9a8
--- /dev/null
+++ b/keyboards/neson_design/n6/n6.c
@@ -0,0 +1,319 @@
+/**
+ * @file n6.c
+ *
+ Copyright 2021 astro
+
+ 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 "n6.h"
+#include "i2c_master.h"
+#include "issi/is31fl3731.h"
+
+enum {
+ SELF_TESTING,
+ CAPS_ALERT,
+ NORMAL,
+};
+
+enum {
+ ST_STAGE_1,
+ ST_STAGE_2,
+ ST_STAGE_3,
+};
+
+// alert state update interval
+#define ALERT_INTERVAL 600
+// self testing state update interval
+#define ST_INTERVAL 100
+// self testing start index
+#define ST_DEFAULT_INDEX 15
+// self testing stage delay
+#define ST_STAGE_DELAY 10
+// self testing stage cycle count
+#define ST_STAGE_COUNT 4
+// self testing stage end duration
+#define ST_END_DURATION 10
+
+#ifdef RGBLIGHT_ENABLE
+extern rgblight_config_t rgblight_config;
+
+typedef struct {
+ uint8_t state;
+ uint8_t testing;
+ bool alert;
+ uint8_t index;
+ uint8_t delay;
+ uint8_t count;
+ bool dir;
+ uint8_t duration;
+ uint16_t ticks;
+} rgb_state_t;
+
+static rgb_state_t rgb_state = {
+ .state = //NORMAL,
+ SELF_TESTING,
+ .testing = ST_STAGE_1,
+ .ticks = 0,
+ .alert = false,
+ .index = ST_DEFAULT_INDEX,
+ .delay = ST_STAGE_DELAY,
+ .count = ST_STAGE_COUNT,
+ .dir = true,
+ .duration = ST_END_DURATION,
+};
+
+static void update_ticks(void)
+{
+ rgb_state.ticks = timer_read();
+}
+
+static void self_testing(void)
+{
+ if (timer_elapsed(rgb_state.ticks) < ST_INTERVAL) return;
+ HSV hsv;
+ hsv.h = rgblight_config.hue;
+ hsv.s = rgblight_config.sat;
+ hsv.v = rgblight_config.val;
+
+ RGB led = hsv_to_rgb(hsv);
+ switch(rgb_state.testing) {
+ case ST_STAGE_1:
+ if (rgb_state.index !=0 ) {
+ IS31FL3731_set_color_all(0, 0, 0);
+ }
+
+ if (rgb_state.index >= 1) {
+ for (int i = rgb_state.index-1; i < 32-rgb_state.index+1; i++) {
+ IS31FL3731_set_color(i, led.r, led.g, led.b);
+ }
+ if (rgb_state.index==1) {
+ rgb_state.index=0;
+ } else {
+ rgb_state.index -= 2;
+ }
+ } else{
+ if (rgb_state.delay > 0) {
+ rgb_state.delay--;
+ } else {
+ // move to stage 2
+ rgb_state.index = 2;
+ rgb_state.testing = ST_STAGE_2;
+ }
+ }
+ break;
+ case ST_STAGE_2: {
+ // clear all
+ IS31FL3731_set_color_all(0, 0, 0);
+ // light left and right
+ IS31FL3731_set_color(0, led.r, led.g, led.b);
+ IS31FL3731_set_color(1, led.r, led.g, led.b);
+ IS31FL3731_set_color(30, led.r, led.g, led.b);
+ IS31FL3731_set_color(31, led.r, led.g, led.b);
+ if (rgb_state.dir) {
+ // left to right
+ for (int i = rgb_state.index; i < rgb_state.index+4; i++) {
+ IS31FL3731_set_color(i, led.r, led.g, led.b);
+ }
+ rgb_state.index += 4;
+ if (rgb_state.index == 30) {
+ rgb_state.dir = !rgb_state.dir;
+ rgb_state.count--;
+ }
+ } else {
+ // right to left
+ for (int i = rgb_state.index-4; i < rgb_state.index; i++) {
+ IS31FL3731_set_color(i, led.r, led.g, led.b);
+ }
+ rgb_state.index -= 4;
+ if (rgb_state.index == 2) {
+ rgb_state.dir = !rgb_state.dir;
+ rgb_state.count--;
+ }
+ }
+
+ if (rgb_state.count == 0) {
+ // move to stage 3
+ rgb_state.testing = ST_STAGE_3;
+ rgb_state.index = 0;
+ rgb_state.delay = ST_STAGE_DELAY;
+ rgb_state.duration = ST_END_DURATION;
+ }
+ }
+ break;
+ case ST_STAGE_3:
+ if (rgb_state.index != 16) {
+ IS31FL3731_set_color_all(0, 0, 0);
+ }
+
+ // light left and right
+
+ if (rgb_state.index == 16) {
+ if (rgb_state.duration) {
+ rgb_state.duration--;
+ } else {
+ if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+ rgb_state.state = CAPS_ALERT;
+ } else {
+ rgb_state.state = NORMAL;
+ rgblight_set();
+ }
+ }
+ } else {
+ // left
+ for (int i = 0; i < rgb_state.index+1; i++) {
+ IS31FL3731_set_color(i, led.r, led.g, led.b);
+ }
+ // right
+ for (int i = 31; i > 31-rgb_state.index-1; i--) {
+ IS31FL3731_set_color(i, led.r, led.g, led.b);
+ }
+ rgb_state.index ++;
+ }
+ break;
+ }
+
+ update_ticks();
+}
+
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+// left CA
+ {0, C1_1, C3_2, C4_2},
+ {0, C1_2, C2_2, C4_3},
+ {0, C1_3, C2_3, C3_3},
+ {0, C1_4, C2_4, C3_4},
+ {0, C1_5, C2_5, C3_5},
+ {0, C1_6, C2_6, C3_6},
+ {0, C1_7, C2_7, C3_7},
+ {0, C1_8, C2_8, C3_8},
+
+ {0, C9_1, C8_1, C7_1},
+ {0, C9_2, C8_2, C7_2},
+ {0, C9_3, C8_3, C7_3},
+ {0, C9_4, C8_4, C7_4},
+ {0, C9_5, C8_5, C7_5},
+ {0, C9_6, C8_6, C7_6},
+ {0, C9_7, C8_7, C6_6},
+ {0, C9_8, C7_7, C6_7},
+// left CB
+ {0, C1_9, C3_10, C4_10},
+ {0, C1_10, C2_10, C4_11},
+ {0, C1_11, C2_11, C3_11},
+ {0, C1_12, C2_12, C3_12},
+ {0, C1_13, C2_13, C3_13},
+ {0, C1_14, C2_14, C3_14},
+ {0, C1_15, C2_15, C3_15},
+ {0, C1_16, C2_16, C3_16},
+
+ {0, C9_9, C8_9, C7_9},
+ {0, C9_10, C8_10, C7_10},
+ {0, C9_11, C8_11, C7_11},
+ {0, C9_12, C8_12, C7_12},
+ {0, C9_13, C8_13, C7_13},
+ {0, C9_14, C8_14, C7_14},
+ {0, C9_15, C8_15, C6_14},
+ {0, C9_16, C7_15, C6_15},
+};
+#endif
+__attribute__((weak))
+void matrix_init_user(void) {}
+
+void matrix_init_kb(void)
+{
+ // clear caps led
+ setPinOutput(CAPS_PIN);
+ writePinLow(CAPS_PIN);
+#ifdef RGBLIGHT_ENABLE
+ i2c_init();
+ IS31FL3731_init(DRIVER_ADDR_1);
+ for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
+ IS31FL3731_set_led_control_register(index, true, true, true);
+ }
+ IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+ update_ticks();
+#endif
+ matrix_init_user();
+}
+
+#ifdef RGBLIGHT_ENABLE
+void housekeeping_task_kb(void)
+{
+ if (rgb_state.state == SELF_TESTING) {
+ self_testing();
+ } else if (rgb_state.state == CAPS_ALERT) {
+ //gold 0xFF, 0xD9, 0x00
+ LED_TYPE led = {
+ .r = 0xFF,
+ .g = 0xD9,
+ .b = 0x00,
+ };
+ if (rgb_state.alert) {
+ IS31FL3731_set_color_all(led.r, led.g, led.b);
+ ws2812_setleds(&led, 1);
+ } else {
+ led.r = 0;
+ led.g = 0;
+ led.b = 0;
+ IS31FL3731_set_color_all(0, 0, 0);
+ ws2812_setleds(&led, 1);
+ }
+
+ if (timer_elapsed(rgb_state.ticks) > ALERT_INTERVAL) {
+ rgb_state.alert = !rgb_state.alert;
+ update_ticks();
+ }
+ }
+
+ IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1,0);
+
+ housekeeping_task_user();
+}
+
+void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
+{
+ if (rgb_state.state != NORMAL) return;
+
+ for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+ IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
+ }
+ ws2812_setleds(start_led+DRIVER_LED_TOTAL, 1);
+}
+#endif
+
+bool led_update_kb(led_t led_state)
+{
+ bool res = led_update_user(led_state);
+ if (res) {
+ writePin(CAPS_PIN, led_state.caps_lock);
+
+#ifdef RGBLIGHT_ENABLE
+ if (rgb_state.state != SELF_TESTING) {
+ if (led_state.caps_lock) {
+ rgb_state.state = CAPS_ALERT;
+ update_ticks();
+ } else {
+ rgb_state.state = NORMAL;
+ rgblight_set();
+ }
+ }
+#endif
+ }
+ return res;
+}
\ No newline at end of file
diff --git a/keyboards/neson_design/n6/n6.h b/keyboards/neson_design/n6/n6.h
new file mode 100644
index 00000000000..0015f8570ab
--- /dev/null
+++ b/keyboards/neson_design/n6/n6.h
@@ -0,0 +1,54 @@
+/**
+ * @file n6.h
+ *
+ Copyright 2021 astro
+
+ 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"
+
+// This a shortcut to help you visually see your layout.
+// The first section contains all of the arguements
+// The second converts the arguments into a two-dimensional array
+#define LAYOUT_65_ansi_blocker( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
+ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
+ K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+ K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \
+ { K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+ { K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2D, K2F }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F }, \
+ { K40, K41, K43, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K46, K4A, K4B, K4D, K4E, K4F, K0F }, \
+}
+
+#define LAYOUT_65_ansi_blocker_splitbs( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
+ K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+ K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0E }, \
+ { K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+ { K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2D, K2F }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F }, \
+ { K40, K41, K43, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K46, K4A, K4B, K4D, K4E, K4F, K0F }, \
+}
diff --git a/keyboards/neson_design/n6/readme.md b/keyboards/neson_design/n6/readme.md
new file mode 100644
index 00000000000..81ba05be499
--- /dev/null
+++ b/keyboards/neson_design/n6/readme.md
@@ -0,0 +1,21 @@
+# Neson Design (formerly iNETT Studio) N6
+
+A 65% keyboard from the Neson Design's N series.
+
+* Keyboard Maintainer: [astro](https://github.com/yulei)
+* Hardware Supported: N6 keyboard
+* Hardware Availability: Limited gb
+
+Make example for this keyboard (after setting up your build environment):
+
+ make neson_design/n6:default
+
+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).
+
+## Bootloader
+
+Enter the bootloader 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**: Briefly press the *RST* button on the back of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
\ No newline at end of file
diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk
new file mode 100644
index 00000000000..a12a4034b79
--- /dev/null
+++ b/keyboards/neson_design/n6/rules.mk
@@ -0,0 +1,23 @@
+# 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 = 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
+# 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 = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+
+QUANTUM_LIB_SRC += i2c_master.c issi/is31fl3731.c
+LAYOUTS = 65_ansi_blocker