diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.c b/keyboards/horrortroll/handwired_k552/boards/k552/board.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/boards/k552/board.c
rename to keyboards/horrortroll/handwired_k552/boards/k552/board.c
diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.h b/keyboards/horrortroll/handwired_k552/boards/k552/board.h
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/boards/k552/board.h
rename to keyboards/horrortroll/handwired_k552/boards/k552/board.h
diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.mk b/keyboards/horrortroll/handwired_k552/boards/k552/board.mk
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/boards/k552/board.mk
rename to keyboards/horrortroll/handwired_k552/boards/k552/board.mk
diff --git a/keyboards/handwired/horrortroll/k552/chconf.h b/keyboards/horrortroll/handwired_k552/chconf.h
similarity index 80%
rename from keyboards/handwired/horrortroll/k552/chconf.h
rename to keyboards/horrortroll/handwired_k552/chconf.h
index 41c38c33e4..4ad4a3be34 100644
--- a/keyboards/handwired/horrortroll/k552/chconf.h
+++ b/keyboards/horrortroll/handwired_k552/chconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
  *
  * 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
@@ -16,14 +16,11 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/horrortroll/handwired_k552/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
 #include_next <chconf.h>
-
diff --git a/keyboards/handwired/horrortroll/k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
similarity index 93%
rename from keyboards/handwired/horrortroll/k552/config.h
rename to keyboards/horrortroll/handwired_k552/config.h
index 1071b7ff31..87908a1dcd 100644
--- a/keyboards/handwired/horrortroll/k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -19,23 +19,26 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x7516 //Redragon
+#define VENDOR_ID       0x7516
 #define PRODUCT_ID      0x5104
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Redragon
+#define MANUFACTURER    HorrorTroll
 #define PRODUCT         K552 Kumara
 
 /* Key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
 
-/* Key matrix pin           0    1,   2,  3,  4,  5,  6,   7,   8,  9, 10, 11, 12,  13, 14, 15, 16 */
+/* key matrix pins */
 #define MATRIX_ROW_PINS { C12, C10, A10, A8, C8, C9 }
 #define MATRIX_COL_PINS { B15,  C6,  C7, A3, A1, C3, C1, B14, B13, A9, B3, B4, A0, C11, A2, C0, C2 }
 
-/* Direction of diode (COL2ROW or ROW2COL) */
+/* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
 /* Bootmagic reset */
 #define BOOTMAGIC_LITE_ROW 4
 #define BOOTMAGIC_LITE_COLUMN 6
@@ -47,9 +50,6 @@
 #define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 12
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* EEPROM size */
 #define EEPROM_PAGE_SIZE
 #define FEE_PAGE_SIZE 0x800
diff --git a/keyboards/handwired/horrortroll/k552/halconf.h b/keyboards/horrortroll/handwired_k552/halconf.h
similarity index 80%
rename from keyboards/handwired/horrortroll/k552/halconf.h
rename to keyboards/horrortroll/handwired_k552/halconf.h
index e872252b6e..2ef68f8fb2 100644
--- a/keyboards/handwired/horrortroll/k552/halconf.h
+++ b/keyboards/horrortroll/handwired_k552/halconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
  *
  * 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
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/horrortroll/handwired_k552/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/horrortroll/k552/k552.c b/keyboards/horrortroll/handwired_k552/handwired_k552.c
similarity index 98%
rename from keyboards/handwired/horrortroll/k552/k552.c
rename to keyboards/horrortroll/handwired_k552/handwired_k552.c
index 31ce5d1bbf..31012d8a33 100644
--- a/keyboards/handwired/horrortroll/k552/k552.c
+++ b/keyboards/horrortroll/handwired_k552/handwired_k552.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "k552.h"
+#include "handwired_k552.h"
 
 // OLED animation
 #include "lib/logo.c"
diff --git a/keyboards/handwired/horrortroll/k552/k552.h b/keyboards/horrortroll/handwired_k552/handwired_k552.h
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/k552.h
rename to keyboards/horrortroll/handwired_k552/handwired_k552.h
diff --git a/keyboards/handwired/horrortroll/k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
similarity index 99%
rename from keyboards/handwired/horrortroll/k552/info.json
rename to keyboards/horrortroll/handwired_k552/info.json
index d7cbb2b448..2db30bb552 100644
--- a/keyboards/handwired/horrortroll/k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Redragon K552 Kumara",
+    "keyboard_name": "Handwired K552 Kumara",
     "url": "",
     "maintainer": "HorrorTroll",
     "layouts": {
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/keymap.c b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/keymap.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/keymap.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
similarity index 98%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
index c328e03e00..a97b46e5e4 100644
--- a/keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
@@ -14,10 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgb_matrix.h"
-#include "progmem.h"
-#include "config.h"
-#include "eeprom.h"
 #include <string.h>
 #include <math.h>
 
@@ -84,7 +80,7 @@ enum layer_keycodes {
     RGB_C_E,             //Cycle user effect
 };
 
-void keyboard_post_init_kb(void) {
+void keyboard_post_init_user(void) {
     user_config.raw = eeconfig_read_user();
     switch (user_config.rgb_mode) {
         case RGB_MODE_ALL:
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/cool_diagonal.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/cool_diagonal.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/cool_diagonal.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/cool_diagonal.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/custom_gradient.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/custom_gradient.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/custom_gradient.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/custom_gradient.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/diagonal.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/diagonal.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/diagonal.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/diagonal.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/kitt.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/kitt.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/kitt.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/kitt.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/random_breath_rainbow.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/random_breath_rainbow.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/random_breath_rainbow.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/random_breath_rainbow.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/oled/oled_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/default/oled/oled_stuff.h
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/oled/oled_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/default/oled/oled_stuff.h
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/readme.md b/keyboards/horrortroll/handwired_k552/keymaps/default/readme.md
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/readme.md
rename to keyboards/horrortroll/handwired_k552/keymaps/default/readme.md
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/rgb_matrix_user.inc b/keyboards/horrortroll/handwired_k552/keymaps/default/rgb_matrix_user.inc
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/rgb_matrix_user.inc
rename to keyboards/horrortroll/handwired_k552/keymaps/default/rgb_matrix_user.inc
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/rules.mk b/keyboards/horrortroll/handwired_k552/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/rules.mk
rename to keyboards/horrortroll/handwired_k552/keymaps/default/rules.mk
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/config.h b/keyboards/horrortroll/handwired_k552/keymaps/via/config.h
similarity index 91%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/config.h
rename to keyboards/horrortroll/handwired_k552/keymaps/via/config.h
index a36ce468bc..ba3e8e9a03 100644
--- a/keyboards/handwired/horrortroll/k552/keymaps/via/config.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/config.h
@@ -17,3 +17,7 @@
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
+
+#ifdef RGB_MATRIX_ENABLE
+    #define VIA_QMK_RGBLIGHT_ENABLE
+#endif
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/keymap.c b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/keymap.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/keymap.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
similarity index 98%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
index c328e03e00..a97b46e5e4 100644
--- a/keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
@@ -14,10 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgb_matrix.h"
-#include "progmem.h"
-#include "config.h"
-#include "eeprom.h"
 #include <string.h>
 #include <math.h>
 
@@ -84,7 +80,7 @@ enum layer_keycodes {
     RGB_C_E,             //Cycle user effect
 };
 
-void keyboard_post_init_kb(void) {
+void keyboard_post_init_user(void) {
     user_config.raw = eeconfig_read_user();
     switch (user_config.rgb_mode) {
         case RGB_MODE_ALL:
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/cool_diagonal.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/cool_diagonal.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/cool_diagonal.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/cool_diagonal.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/custom_gradient.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/custom_gradient.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/custom_gradient.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/custom_gradient.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/diagonal.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/diagonal.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/diagonal.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/diagonal.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/kitt.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/kitt.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/kitt.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/kitt.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/random_breath_rainbow.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/random_breath_rainbow.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/random_breath_rainbow.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/random_breath_rainbow.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/oled/oled_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/via/oled/oled_stuff.h
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/oled/oled_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/via/oled/oled_stuff.h
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/readme.md b/keyboards/horrortroll/handwired_k552/keymaps/via/readme.md
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/readme.md
rename to keyboards/horrortroll/handwired_k552/keymaps/via/readme.md
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/rgb_matrix_user.inc b/keyboards/horrortroll/handwired_k552/keymaps/via/rgb_matrix_user.inc
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/rgb_matrix_user.inc
rename to keyboards/horrortroll/handwired_k552/keymaps/via/rgb_matrix_user.inc
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/rules.mk b/keyboards/horrortroll/handwired_k552/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/rules.mk
rename to keyboards/horrortroll/handwired_k552/keymaps/via/rules.mk
diff --git a/keyboards/handwired/horrortroll/k552/ld/k552_f103.ld b/keyboards/horrortroll/handwired_k552/ld/k552_f103.ld
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/ld/k552_f103.ld
rename to keyboards/horrortroll/handwired_k552/ld/k552_f103.ld
diff --git a/keyboards/handwired/horrortroll/k552/lib/bongocat.c b/keyboards/horrortroll/handwired_k552/lib/bongocat.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/bongocat.c
rename to keyboards/horrortroll/handwired_k552/lib/bongocat.c
diff --git a/keyboards/handwired/horrortroll/k552/lib/galaxy.c b/keyboards/horrortroll/handwired_k552/lib/galaxy.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/galaxy.c
rename to keyboards/horrortroll/handwired_k552/lib/galaxy.c
diff --git a/keyboards/handwired/horrortroll/k552/lib/glcdfont.c b/keyboards/horrortroll/handwired_k552/lib/glcdfont.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/glcdfont.c
rename to keyboards/horrortroll/handwired_k552/lib/glcdfont.c
diff --git a/keyboards/handwired/horrortroll/k552/lib/logo.c b/keyboards/horrortroll/handwired_k552/lib/logo.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/logo.c
rename to keyboards/horrortroll/handwired_k552/lib/logo.c
diff --git a/keyboards/handwired/horrortroll/k552/lib/wave.c b/keyboards/horrortroll/handwired_k552/lib/wave.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/wave.c
rename to keyboards/horrortroll/handwired_k552/lib/wave.c
diff --git a/keyboards/handwired/horrortroll/k552/mcuconf.h b/keyboards/horrortroll/handwired_k552/mcuconf.h
similarity index 79%
rename from keyboards/handwired/horrortroll/k552/mcuconf.h
rename to keyboards/horrortroll/handwired_k552/mcuconf.h
index c2c0e9a2f6..c9970fa28b 100644
--- a/keyboards/handwired/horrortroll/k552/mcuconf.h
+++ b/keyboards/horrortroll/handwired_k552/mcuconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
  *
  * 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
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/horrortroll/handwired_k552/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/horrortroll/k552/readme.md b/keyboards/horrortroll/handwired_k552/readme.md
similarity index 86%
rename from keyboards/handwired/horrortroll/k552/readme.md
rename to keyboards/horrortroll/handwired_k552/readme.md
index f1b30afae5..85e99f4cd4 100644
--- a/keyboards/handwired/horrortroll/k552/readme.md
+++ b/keyboards/horrortroll/handwired_k552/readme.md
@@ -1,15 +1,15 @@
-# Redragon K552 Kumara
+# Handwired K552 Kumara
 
 ![K552](https://i.imgur.com/XpNmJpBh.png)
 
 A handwired K552 Kumara. Built using STM32F103RCT6 Mini
 
 * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
-* Hardware Supported: Redragon K552 Kumara and STM32F103RCT6 Mini
+* Hardware Supported: STM32F103RCT6
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/horrortroll/k552:default
+    make horrortroll/handwired_k552: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).
 
diff --git a/keyboards/handwired/horrortroll/k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/rules.mk
rename to keyboards/horrortroll/handwired_k552/rules.mk