diff --git a/src/plugins/kdecorations/aurorae/src/CMakeLists.txt b/src/plugins/kdecorations/aurorae/src/CMakeLists.txt
index 4e1b4e8437..7041ab7349 100644
--- a/src/plugins/kdecorations/aurorae/src/CMakeLists.txt
+++ b/src/plugins/kdecorations/aurorae/src/CMakeLists.txt
@@ -57,18 +57,8 @@ configure_file(aurorae.knsrc.cmake ${CMAKE_CURRENT_BINARY_DIR}/aurorae.knsrc)
 ########### install files ###############
 
 if (KWIN_BUILD_KCMS)
-    kwin_add_effect_config(kwin_aurorae_config auroraeconfig.cpp)
+    add_subdirectory(config)
 
-    target_link_libraries(kwin_aurorae_config
-        KF6::ConfigGui
-        KF6::KCMUtils
-        KF6::I18n
-        KDecoration2::KDecoration
-        Qt::DBus
-        Qt::UiTools
-        Qt::Widgets
-        KWinEffectsInterface
-    )
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/aurorae.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
 endif()
 
diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
index 1ef5de6e9d..07de79aa03 100644
--- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp
+++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
@@ -618,7 +618,7 @@ void ThemeProvider::findAllQmlThemes()
         data.setThemeName(offer.pluginId());
         data.setVisibleName(offer.name());
         if (hasConfiguration(offer.pluginId())) {
-            data.setConfigurationName("kwin_aurorae_config");
+            data.setConfigurationName("kcm_auroraedecoration");
         }
         m_themes.append(data);
     }
@@ -657,7 +657,7 @@ void ThemeProvider::findAllSvgThemes()
         data.setThemeName(QLatin1String("__aurorae__svg__") + packageName);
         data.setVisibleName(name);
         if (hasConfiguration(data.themeName())) {
-            data.setConfigurationName("kwin_aurorae_config");
+            data.setConfigurationName("kcm_auroraedecoration");
         }
         m_themes.append(data);
     }
diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.json b/src/plugins/kdecorations/aurorae/src/aurorae.json
index 344881e108..8840dbe59f 100644
--- a/src/plugins/kdecorations/aurorae/src/aurorae.json
+++ b/src/plugins/kdecorations/aurorae/src/aurorae.json
@@ -4,6 +4,5 @@
         "defaultTheme": "kwin4_decoration_qml_plastik",
         "themeListKeyword": "themes",
         "themes": true
-    },
-    "X-KDE-ConfigModule": "kwin4_decoration_qml_plastik"
+    }
 }
diff --git a/src/plugins/kdecorations/aurorae/src/config/CMakeLists.txt b/src/plugins/kdecorations/aurorae/src/config/CMakeLists.txt
new file mode 100644
index 0000000000..d47d56b0ce
--- /dev/null
+++ b/src/plugins/kdecorations/aurorae/src/config/CMakeLists.txt
@@ -0,0 +1,11 @@
+kcoreaddons_add_plugin(kcm_auroraedecoration SOURCES auroraeconfig.cpp INSTALL_NAMESPACE "${KDECORATION_KCM_PLUGIN_DIR}")
+target_link_libraries(kcm_auroraedecoration
+    KF6::ConfigGui
+    KF6::KCMUtils
+    KF6::I18n
+    KDecoration2::KDecoration
+    Qt::DBus
+    Qt::UiTools
+    Qt::Widgets
+    KWinEffectsInterface
+)
diff --git a/src/plugins/kdecorations/aurorae/src/auroraeconfig.cpp b/src/plugins/kdecorations/aurorae/src/config/auroraeconfig.cpp
similarity index 98%
rename from src/plugins/kdecorations/aurorae/src/auroraeconfig.cpp
rename to src/plugins/kdecorations/aurorae/src/config/auroraeconfig.cpp
index 2f2a9acf46..1466ecb548 100644
--- a/src/plugins/kdecorations/aurorae/src/auroraeconfig.cpp
+++ b/src/plugins/kdecorations/aurorae/src/config/auroraeconfig.cpp
@@ -15,7 +15,7 @@
 #include <QLabel>
 #include <QUiLoader>
 
-K_PLUGIN_CLASS(Aurorae::ConfigurationModule)
+K_PLUGIN_CLASS_WITH_JSON(Aurorae::ConfigurationModule, "kcm_auroraeconfig.json")
 
 namespace Aurorae
 {
diff --git a/src/plugins/kdecorations/aurorae/src/auroraeconfig.h b/src/plugins/kdecorations/aurorae/src/config/auroraeconfig.h
similarity index 100%
rename from src/plugins/kdecorations/aurorae/src/auroraeconfig.h
rename to src/plugins/kdecorations/aurorae/src/config/auroraeconfig.h
diff --git a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json
new file mode 100644
index 0000000000..f479438251
--- /dev/null
+++ b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json
@@ -0,0 +1,6 @@
+{
+    "KPlugin": {
+        "Description": "Window Decoration Theme Engine",
+        "Name": "Aurorae"
+    }
+}