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 a36ce468..ba3e8e9a 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/via/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
similarity index 98%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
index c328e03e..a97b46e5 100644
--- a/keyboards/handwired/horrortroll/k552/keymaps/via/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