diff --git a/keyboards/hs60/config.h b/keyboards/hs60/config.h
new file mode 100644
index 000000000..185b31cf6
--- /dev/null
+++ b/keyboards/hs60/config.h
@@ -0,0 +1,139 @@
+/*
+Copyright 2018 Yiancar
+
+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 .
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x0257
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Yiancar-Designs
+#define PRODUCT HS60
+#define DESCRIPTION GH60 compatible, tool free RGB keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * 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 { B0, B1, B2, B3, F7 }
+#define MATRIX_COL_PINS { F1, F4, F5, E6, F0, B7, D2, D3, D5, D4, D6, D7, B4, B5 }
+#define UNUSED_PINS { B6, C6, C7, F6 }
+
+/* bootloader configuration */
+
+#define QMK_ESC_OUTPUT B5 // usually COL
+#define QMK_ESC_INPUT B2 // usually ROW
+
+/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCING_DELAY 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+#define IS_COMMAND() ( \
+ keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* Backlight options */
+
+//This is experimental do not enable yet
+//#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
+
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
+#define RGB_MATRIX_SKIP_FRAMES 0
+
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110101
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 30
+#define DRIVER_2_LED_TOTAL 32
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL
+
+#endif
diff --git a/keyboards/hs60/hs60.c b/keyboards/hs60/hs60.c
new file mode 100644
index 000000000..b4820af27
--- /dev/null
+++ b/keyboards/hs60/hs60.c
@@ -0,0 +1,338 @@
+/* Copyright 2018 Yiancar
+ *
+ * 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 "hs60.h"
+#include "config.h"
+
+// Please ignore this is for upcoming features
+/*#ifdef RAW_ENABLE
+
+void raw_hid_receive( uint8_t *data, uint8_t length )
+{
+ uint8_t command = data[0];
+ switch ( command )
+ {
+ case id_protocol_version:
+ {
+ msg_protocol_version *msg = (msg_protocol_version*)&data[1];
+ msg->version = PROTOCOL_VERSION;
+ break;
+ }
+#if USE_KEYMAPS_IN_EEPROM
+ case id_keymap_keycode_load:
+ {
+ msg_keymap_keycode_load *msg = (msg_keymap_keycode_load*)&data[1];
+ msg->keycode = keymap_keycode_load( msg->layer, msg->row, msg->column );
+ break;
+ }
+ case id_keymap_keycode_save:
+ {
+ msg_keymap_keycode_save *msg = (msg_keymap_keycode_save*)&data[1];
+ keymap_keycode_save( msg->layer, msg->row, msg->column, msg->keycode);
+ break;
+ }
+ case id_keymap_default_save:
+ {
+ keymap_default_save();
+ break;
+ }
+#endif // USE_KEYMAPS_IN_EEPROM
+ case id_backlight_config_set_values:
+ {
+ msg_backlight_config_set_values *msg = (msg_backlight_config_set_values*)&data[1];
+ backlight_config_set_values(msg);
+ backlight_config_save();
+ break;
+ }
+ case id_backlight_config_set_alphas_mods:
+ {
+ msg_backlight_config_set_alphas_mods *msg = (msg_backlight_config_set_alphas_mods*)&data[1];
+ backlight_config_set_alphas_mods( msg->alphas_mods );
+ backlight_config_save();
+ break;
+ }
+ case id_backlight_set_key_color:
+ {
+ msg_backlight_set_key_color *msg = (msg_backlight_set_key_color*)&data[1];
+ backlight_set_key_color(msg->row, msg->column, msg->hsv);
+ break;
+ }
+ case id_system_get_state:
+ {
+ msg_system_state *msg = (msg_system_state*)&data[1];
+ msg->value = backlight_get_tick();
+ break;
+ }
+ default:
+ {
+ // Unhandled message.
+ data[0] = id_unhandled;
+ break;
+ }
+ }
+
+ // Return same buffer with values changed
+ raw_hid_send( data, length );
+
+}
+
+#endif*/
+
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, C1_1, C3_2, C4_2}, //A1
+ {0, C1_2, C2_2, C4_3}, //A2
+ {0, C1_3, C2_3, C3_3}, //A3
+ {0, C1_4, C2_4, C3_4}, //A4
+ {0, C1_5, C2_5, C3_5}, //A5
+ {0, C1_6, C2_6, C3_6}, //A6
+ {0, C1_7, C2_7, C3_7}, //A7
+ {0, C1_8, C2_8, C3_8}, //A8
+ {0, C9_1, C8_1, C7_1}, //A9
+ {0, C9_2, C8_2, C7_2}, //A10
+ {0, C9_3, C8_3, C7_3}, //A11
+ {0, C9_4, C8_4, C7_4}, //A12
+ {0, C9_5, C8_5, C7_5}, //A13
+ {0, C9_6, C8_6, C7_6}, //A14
+ {0, C9_7, C8_7, C6_6}, //A15
+ {0, C9_8, C7_7, C6_7}, //A16
+
+ {0, C1_9, C3_10, C4_10}, //B1
+ {0, C1_10, C2_10, C4_11}, //B2
+ {0, C1_11, C2_11, C3_11}, //B3
+ {0, C1_12, C2_12, C3_12}, //B4
+ {0, C1_13, C2_13, C3_13}, //B5
+ {0, C1_14, C2_14, C3_14}, //B6
+ {0, C1_15, C2_15, C3_15}, //B7
+ {0, C1_16, C2_16, C3_16}, //B8
+ {0, C9_9, C8_9, C7_9}, //B9
+ {0, C9_10, C8_10, C7_10}, //B10
+ {0, C9_11, C8_11, C7_11}, //B11
+ {0, C9_12, C8_12, C7_12}, //B12
+ {0, C9_13, C8_13, C7_13}, //B13
+ {0, C9_14, C8_14, C7_14}, //B14
+
+ {1, C1_1, C3_2, C4_2}, //C1
+ {1, C1_2, C2_2, C4_3}, //C2
+ {1, C1_3, C2_3, C3_3}, //C3
+ {1, C1_4, C2_4, C3_4}, //C4
+ {1, C1_5, C2_5, C3_5}, //C5
+ {1, C1_6, C2_6, C3_6}, //C6
+ {1, C1_7, C2_7, C3_7}, //C7
+ {1, C1_8, C2_8, C3_8}, //C8
+ {1, C9_1, C8_1, C7_1}, //C9
+ {1, C9_2, C8_2, C7_2}, //C10
+ {1, C9_3, C8_3, C7_3}, //C11
+ {1, C9_4, C8_4, C7_4}, //C12
+ {1, C9_5, C8_5, C7_5}, //C13
+ {1, C9_6, C8_6, C7_6}, //C14
+ {1, C9_7, C8_7, C6_6}, //C15
+ {1, C9_8, C7_7, C6_7}, //C16
+
+ {1, C1_9, C3_10, C4_10}, //D1
+ {1, C1_10, C2_10, C4_11}, //D2
+ {1, C1_11, C2_11, C3_11}, //D3
+ {1, C1_12, C2_12, C3_12}, //D4
+ {1, C1_13, C2_13, C3_13}, //D5
+ {1, C1_14, C2_14, C3_14}, //D6
+ {1, C1_15, C2_15, C3_15}, //D7
+ {1, C1_16, C2_16, C3_16}, //D8
+ {1, C9_9, C8_9, C7_9}, //D9
+ {1, C9_10, C8_10, C7_10}, //D10
+ {1, C9_11, C8_11, C7_11}, //D11
+ {1, C9_12, C8_12, C7_12}, //D12
+ {1, C9_13, C8_13, C7_13}, //D13
+ {1, C9_14, C8_14, C7_14}, //D14
+ {1, C9_15, C8_15, C6_14}, //D15
+ {1, C9_16, C7_15, C6_15} //D16
+};
+
+const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+//
+// C7, C6, C5, C4, C3, C2, C1, A7, A6, A5, A4, A3, A2, A1,
+// C8, C9, C10, C11, C12, C13, C14, A8, A9, A10, A11, A12, A13, ---,
+// D4, D5, D6, D7, D8, C16, C15, B5, B6, B7, B8, A16, A15, A14,
+// D3, D2, D1, D9, D10, D11, D12, B4, B3, B2, B1, B9, ---, B10,
+// D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
+/* {row | col << 4}
+ * | {x=0..224, y=0..64}
+ * | | modifier
+ * | | | */
+ {{0|(13<<4)}, {224, 0}, 1}, //A1-A16
+ {{0|(12<<4)}, {204, 0}, 0},
+ {{0|(11<<4)}, {187, 0}, 0},
+ {{0|(10<<4)}, {170, 0}, 0},
+ {{0|(9<<4)}, {153, 0}, 0},
+ {{0|(8<<4)}, {136, 0}, 0},
+ {{0|(7<<4)}, {119, 0}, 0},
+ {{1|(7<<4)}, {119, 16}, 0},
+ {{1|(8<<4)}, {136, 16}, 0},
+ {{1|(9<<4)}, {153, 16}, 0},
+ {{1|(10<<4)}, {170, 16}, 0},
+ {{1|(11<<4)}, {187, 16}, 0},
+ {{1|(12<<4)}, {204, 16}, 0},
+ {{2|(13<<4)}, {224, 8}, 1},
+ {{2|(12<<4)}, {204, 32}, 0},
+ {{2|(11<<4)}, {187, 32}, 0},
+
+ {{3|(10<<4)}, {170, 48}, 0}, //B1-B14
+ {{3|(9<<4)}, {153, 48}, 0},
+ {{3|(8<<4)}, {136, 48}, 0},
+ {{3|(7<<4)}, {119, 48}, 0},
+ {{2|(7<<4)}, {119, 32}, 0},
+ {{2|(8<<4)}, {136, 32}, 0},
+ {{2|(9<<4)}, {153, 32}, 0},
+ {{2|(10<<4)}, {170, 32}, 0},
+ {{3|(11<<4)}, {187, 48}, 0},
+ {{3|(13<<4)}, {214, 48}, 1},
+ {{4|(13<<4)}, {224, 64}, 1},
+ {{4|(12<<4)}, {204, 64}, 1},
+ {{4|(11<<4)}, {187, 64}, 1},
+ {{4|(10<<4)}, {170, 64}, 1},
+
+ {{0|(6<<4)}, {102, 0}, 0}, //C1-C16
+ {{0|(5<<4)}, { 85, 0}, 0},
+ {{0|(4<<4)}, { 68, 0}, 0},
+ {{0|(3<<4)}, { 51, 0}, 0},
+ {{0|(2<<4)}, { 34, 0}, 0},
+ {{0|(1<<4)}, { 17, 0}, 0},
+ {{0|(0<<4)}, { 0, 0}, 1},
+ {{1|(0<<4)}, { 0, 16}, 1},
+ {{1|(1<<4)}, { 17, 16}, 0},
+ {{1|(2<<4)}, { 34, 16}, 0},
+ {{1|(3<<4)}, { 51, 16}, 0},
+ {{1|(4<<4)}, { 68, 16}, 0},
+ {{1|(5<<4)}, { 85, 16}, 0},
+ {{1|(6<<4)}, {102, 16}, 0},
+ {{2|(6<<4)}, {102, 32}, 0},
+ {{2|(5<<4)}, { 85, 32}, 0},
+
+ {{3|(2<<4)}, { 32, 48}, 0}, //D1-D16
+ {{3|(1<<4)}, { 17, 48}, 0},
+ {{3|(0<<4)}, { 0, 48}, 1},
+ {{2|(0<<4)}, { 0, 32}, 1},
+ {{2|(1<<4)}, { 17, 32}, 0},
+ {{2|(2<<4)}, { 34, 32}, 0},
+ {{2|(3<<4)}, { 51, 32}, 0},
+ {{2|(4<<4)}, { 68, 32}, 0},
+ {{3|(3<<4)}, { 51, 48}, 0},
+ {{3|(4<<4)}, { 68, 48}, 0},
+ {{3|(5<<4)}, { 85, 48}, 0},
+ {{3|(6<<4)}, {102, 48}, 0},
+ {{4|(3<<4)}, {102, 64}, 0},
+ {{4|(2<<4)}, { 34, 68}, 1},
+ {{4|(1<<4)}, { 17, 68}, 1},
+ {{4|(0<<4)}, { 0, 68}, 1}
+};
+
+void bootmagic_lite(void)
+{
+ // The lite version of TMK's bootmagic made by Wilba.
+ // 100% less potential for accidentally making the
+ // keyboard do stupid things.
+
+ // We need multiple scans because debouncing can't be turned off.
+ matrix_scan();
+ wait_ms(DEBOUNCING_DELAY);
+ matrix_scan();
+
+ // If the Esc and space bar are held down on power up,
+ // reset the EEPROM valid state and jump to bootloader.
+ // Assumes Esc is at [0,0] and spacebar is at [4,6].
+ // This isn't very generalized, but we need something that doesn't
+ // rely on user's keymaps in firmware or EEPROM.
+ if ( ( matrix_get_row(0) & (1<<0) ) &&
+ ( matrix_get_row(4) & (1<<6) ) )
+ {
+ // Set the TMK/QMK EEPROM state as invalid.
+ eeconfig_disable();
+ //eeprom_set_valid(false);
+ // Jump to bootloader.
+ bootloader_jump();
+ }
+}
+
+void matrix_init_kb(void) {
+ // put your keyboard start-up code here
+ // runs once when the firmware starts up
+
+ bootmagic_lite();
+
+ // Please ignore this is for upcoming features
+ // If the EEPROM has the magic, the data is good.
+ // OK to load from EEPROM.
+ /*if (eeprom_is_valid())
+ {
+ backlight_config_load();
+
+ // TODO: do something to "turn on" keymaps in EEPROM?
+ }
+ else
+ {
+ // If the EEPROM has not been saved before, or is out of date,
+ // save the default values to the EEPROM. Default values
+ // come from construction of the zeal_backlight_config instance.
+ backlight_config_save();
+
+ // Clear the LED colors stored in EEPROM
+ for ( int row=0; row < MATRIX_ROWS; row++ )
+ {
+ HSV hsv;
+ for ( int column=0; column < MATRIX_COLS; column++ )
+ {
+ hsv.h = rand() & 0xFF;
+ hsv.s = rand() & 0x7F;
+ hsv.v = 255;
+ backlight_set_key_color( row, column, hsv );
+ }
+ }
+ #ifdef USE_KEYMAPS_IN_EEPROM
+ keymap_default_save();
+ #endif
+ // Save the magic number last, in case saving was interrupted
+ eeprom_set_valid(true);
+ }*/
+
+ matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+
+ matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+
+ return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+ //backlight_set_indicator_state(usb_led);
+}
+
+void suspend_power_down_kb(void)
+{
+ rgb_matrix_set_suspend_state(true);
+}
+
+void suspend_wakeup_init_kb(void)
+{
+ rgb_matrix_set_suspend_state(false);
+}
\ No newline at end of file
diff --git a/keyboards/hs60/hs60.h b/keyboards/hs60/hs60.h
new file mode 100644
index 000000000..b6de3b151
--- /dev/null
+++ b/keyboards/hs60/hs60.h
@@ -0,0 +1,39 @@
+/* Copyright 2018 Yiancar
+ *
+ * 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 .
+ */
+#ifndef HS60_H
+#define HS60_H
+
+#define XXX KC_NO
+
+#include "quantum.h"
+
+// This a shortcut to help you visually see your layout.
+
+#define LAYOUT_60_iso( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
+ { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D } \
+}
+
+#endif
diff --git a/keyboards/hs60/keymaps/default/keymap.c b/keyboards/hs60/keymaps/default/keymap.c
new file mode 100644
index 000000000..2a5e82361
--- /dev/null
+++ b/keyboards/hs60/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2018 Yiancar
+ *
+ * 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
+
+//This is the ISO version of the PCB
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_60_iso( /* Base */
+ KC_GESC, 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_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_NUBS, 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, MO(1) , KC_APP, KC_RCTL),
+
+[1] = LAYOUT_60_iso( /* FN */
+ KC_TRNS, 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 ,\
+ KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET , \
+ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
+ KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,\
+ KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
+
+void matrix_init_user(void) {
+ //user initialization
+}
+
+void matrix_scan_user(void) {
+ //user matrix
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ return true;
+}
\ No newline at end of file
diff --git a/keyboards/hs60/keymaps/default/readme.md b/keyboards/hs60/keymaps/default/readme.md
new file mode 100644
index 000000000..cf1ac7a96
--- /dev/null
+++ b/keyboards/hs60/keymaps/default/readme.md
@@ -0,0 +1,6 @@
+The default keymap for ISO HS60
+===============================
+
+
+
+Default layer is normal ISO and Fn layer is used for RGB functions, Volume control and arrow cluster
\ No newline at end of file
diff --git a/keyboards/hs60/readme.md b/keyboards/hs60/readme.md
new file mode 100644
index 000000000..15ecac6cd
--- /dev/null
+++ b/keyboards/hs60/readme.md
@@ -0,0 +1,16 @@
+HS60
+====
+
+[HS60](https://mechboards.co.uk/wp-content/uploads/2018/04/IMG_20180420_140353.jpg)
+
+This is a standard fixed layout 60% PCB. It comes in two varians, ISO and ANSI and support full per-key RGB.
+
+Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [github](https://github.com/yiancar)
+Hardware Supported: HS60 ISO and ANSI PCBs with Atmega 32u4
+Hardware Availability: https://mechboards.co.uk/shop/all/hs60-pcb/
+
+Make example for this keyboard (after setting up your build environment):
+
+ make hs60:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/hs60/rules.mk b/keyboards/hs60/rules.mk
new file mode 100644
index 000000000..050a1293e
--- /dev/null
+++ b/keyboards/hs60/rules.mk
@@ -0,0 +1,76 @@
+# MCU name
+#MCU = at90usb1286
+MCU = atmega32u4
+
+# project specific files
+#SRC =
+
+# Processor frequency.
+# This will define a symbol, F_CPU, in all source code files equal to the
+# processor frequency in Hz. You can then use this symbol in your source code to
+# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+# automatically to create a 32-bit value in your source code.
+#
+# This will be an integer division of F_USB below, as it is sourced by
+# F_USB after it has run through any CPU prescalers. Note that this value
+# does not *change* the processor frequency - it should merely be updated to
+# reflect the processor speed set externally so that the code can use accurate
+# software delays.
+F_CPU = 16000000
+
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+# This will define a symbol, F_USB, in all source code files equal to the
+# input clock frequency (before any prescaling is performed) in Hz. This value may
+# differ from F_CPU if prescaling is used on the latter, and is required as the
+# raw input clock is fed directly to the PLL sections of the AVR for high speed
+# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+# at the end, this will be done automatically to create a 32-bit value in your
+# source code.
+#
+# If no clock division is performed on the input clock inside the AVR (via the
+# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+# Boot Section
+BOOTLOADER = qmk-dfu
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = no # Console for debug(+400)
+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 on B7 by default
+MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE = no # Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no # Audio output on port C6
+FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
+RGB_MATRIX_ENABLE = yes # Use RGB matrix
+
+LAYOUTS = 60_iso # Define standard layouts
+
+# Experimental features for zealcmd please do no enable
+#RAW_ENABLE = yes
+#USE_KEYMAPS_IN_EEPROM = yes