diff --git a/kcms/cellularnetwork/CMakeLists.txt b/kcms/cellularnetwork/CMakeLists.txt
index ca4e867c..ce5d03fe 100644
--- a/kcms/cellularnetwork/CMakeLists.txt
+++ b/kcms/cellularnetwork/CMakeLists.txt
@@ -10,7 +10,7 @@ set (cellularnetworksettings_SRCS
     profilesettings.cpp
 )
 
-add_library(kcm_cellular_network MODULE ${cellularnetworksettings_SRCS})
+kcoreaddons_add_plugin(kcm_cellular_network SOURCES ${cellularnetworksettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
 
 target_link_libraries(kcm_cellular_network
     Qt::DBus
@@ -25,5 +25,5 @@ target_link_libraries(kcm_cellular_network
     KF6::QuickAddons
 )
 
-install(TARGETS kcm_cellular_network DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
+kcmutils_generate_desktop_file(kcm_cellular_network)
 kpackage_install_package(package kcm_cellular_network kcms)
diff --git a/kcms/cellularnetwork/cellularnetworksettings.cpp b/kcms/cellularnetwork/cellularnetworksettings.cpp
index 798c4904..0fa50c7a 100644
--- a/kcms/cellularnetwork/cellularnetworksettings.cpp
+++ b/kcms/cellularnetwork/cellularnetworksettings.cpp
@@ -13,7 +13,7 @@
 
 #include <QQmlEngine>
 
-K_PLUGIN_CLASS_WITH_JSON(CellularNetworkSettings, "cellularnetworksettings.json")
+K_PLUGIN_CLASS_WITH_JSON(CellularNetworkSettings, "kcm_cellular_network.json")
 
 CellularNetworkSettings *CellularNetworkSettings::staticInst = nullptr;
 
diff --git a/kcms/cellularnetwork/cellularnetworksettings.json b/kcms/cellularnetwork/kcm_cellular_network.json
similarity index 100%
rename from kcms/cellularnetwork/cellularnetworksettings.json
rename to kcms/cellularnetwork/kcm_cellular_network.json
diff --git a/kcms/hotspot/CMakeLists.txt b/kcms/hotspot/CMakeLists.txt
index f426ccc1..54f562bb 100644
--- a/kcms/hotspot/CMakeLists.txt
+++ b/kcms/hotspot/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 set (hotspotsettings_SRCS hotspotsettings.cpp)
 
-add_library(kcm_mobile_hotspot MODULE ${hotspotsettings_SRCS})
+kcoreaddons_add_plugin(kcm_mobile_hotspot SOURCES ${hotspotsettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
 
 target_link_libraries(kcm_mobile_hotspot
     Qt::Quick
@@ -13,6 +13,5 @@ target_link_libraries(kcm_mobile_hotspot
     KF6::QuickAddons
 )
 
-install(TARGETS kcm_mobile_hotspot DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 kpackage_install_package(package kcm_mobile_hotspot kcms)
 kcmutils_generate_desktop_file(kcm_mobile_hotspot)
diff --git a/kcms/hotspot/kcm_mobile_hotspot.json b/kcms/hotspot/kcm_mobile_hotspot.json
index 185cd8ea..5abe696b 100644
--- a/kcms/hotspot/kcm_mobile_hotspot.json
+++ b/kcms/hotspot/kcm_mobile_hotspot.json
@@ -40,6 +40,7 @@
         "Version": "0.1",
         "Website": "https://plasma-mobile.org/"
     },
+    "X-KDE-System-Settings-Parent-Category": "network",
     "X-Plasma-MainScript": "ui/main.qml",
     "X-Plasma-Package": "kcm_mobile_hotspot"
 }
diff --git a/kcms/info/CMakeLists.txt b/kcms/info/CMakeLists.txt
index 04bd6dd0..563fb1ee 100644
--- a/kcms/info/CMakeLists.txt
+++ b/kcms/info/CMakeLists.txt
@@ -8,7 +8,7 @@ set(info_SRCS # Specify source files for the library
     hardwareinfo.cpp
 )
 
-add_library(kcm_mobile_info MODULE ${info_SRCS})
+kcoreaddons_add_plugin(kcm_mobile_info SOURCES ${info_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
 
 target_link_libraries(kcm_mobile_info
     Qt::Core
@@ -19,7 +19,6 @@ target_link_libraries(kcm_mobile_info
     KF6::Solid
 )
 
-install(TARGETS kcm_mobile_info DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) # Install the library to the kcm location
-
-kpackage_install_package(package kcm_mobile_info kcms) # Finally install our QML kpackage.
+kpackage_install_package(package kcm_mobile_info kcms)
+kcmutils_generate_desktop_file(kcm_mobile_info)
 
diff --git a/kcms/info/info.cpp b/kcms/info/info.cpp
index 98b844e0..ede5ac0a 100644
--- a/kcms/info/info.cpp
+++ b/kcms/info/info.cpp
@@ -11,7 +11,7 @@
 #include <QClipboard>
 #include <QGuiApplication>
 
-K_PLUGIN_CLASS_WITH_JSON(Info, "info.json")
+K_PLUGIN_CLASS_WITH_JSON(Info, "kcm_mobile_info.json")
 
 Info::Info(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
     : KQuickAddons::ConfigModule(parent, metaData, args)
diff --git a/kcms/info/info.json b/kcms/info/kcm_mobile_info.json
similarity index 97%
rename from kcms/info/info.json
rename to kcms/info/kcm_mobile_info.json
index a4139d9e..50319383 100644
--- a/kcms/info/info.json
+++ b/kcms/info/kcm_mobile_info.json
@@ -60,5 +60,6 @@
     "X-KDE-Keywords[vi]": "info,distro,system,thông tin,bản phân phối,hệ thống",
     "X-KDE-Keywords[x-test]": "xxinfoxx,xx distroxx,xx systemxx",
     "X-KDE-Keywords[zh_CN]": "info, distro, system, 信息, 发行版, 系统",
-    "X-KDE-Keywords[zh_TW]": "info, distro, system, 資訊, 發行版, 系統, 信息"
+    "X-KDE-Keywords[zh_TW]": "info, distro, system, 資訊, 發行版, 系統, 信息",
+    "X-KDE-System-Settings-Parent-Category": "system-administration"
 }
diff --git a/kcms/powermanagement/CMakeLists.txt b/kcms/powermanagement/CMakeLists.txt
index a620b48e..c7da852c 100644
--- a/kcms/powermanagement/CMakeLists.txt
+++ b/kcms/powermanagement/CMakeLists.txt
@@ -3,12 +3,14 @@
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kcm_mobile_power\")
 
-add_library(kcm_mobile_power MODULE 
+set(kcm_mobile_power_SRCS
     mobilepower.cpp
     batterymodel.cpp
     statisticsprovider.cpp
 )
 
+kcoreaddons_add_plugin(kcm_mobile_power SOURCES ${kcm_mobile_power_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
+
 target_link_libraries(kcm_mobile_power
     Qt::DBus
     Qt::Core
@@ -19,6 +21,5 @@ target_link_libraries(kcm_mobile_power
     KF6::Solid
 )
 
-install(TARGETS kcm_mobile_power DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
-
+kcmutils_generate_desktop_file(kcm_mobile_power)
 kpackage_install_package(package kcm_mobile_power kcms)
diff --git a/kcms/powermanagement/powermanagement.json b/kcms/powermanagement/kcm_mobile_power.json
similarity index 98%
rename from kcms/powermanagement/powermanagement.json
rename to kcms/powermanagement/kcm_mobile_power.json
index d89b9b6e..cc202166 100644
--- a/kcms/powermanagement/powermanagement.json
+++ b/kcms/powermanagement/kcm_mobile_power.json
@@ -62,6 +62,7 @@
     "X-KDE-Keywords[x-test]": "xxvideoxx,xx monitorxx,xx graphicsxx,xx timeoutxx,xx sleepxx,xx lockxx,xx screenlockerxx,xx screensaverxx",
     "X-KDE-Keywords[zh_CN]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, 视频, 显示器, 监视器, 图形, 图像, 超时, 睡眠, 锁屏, 屏幕保护, 屏幕锁定, 屏保, 锁定",
     "X-KDE-Keywords[zh_TW]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, 影片, 顯示器, 圖形, 顯示卡, 逾時, 休眠, 鎖定, 螢幕鎖定, 螢幕保護程式",
-    "X-KDE-System-Settings-Parent-Category": "display",
-    "X-KDE-Weight": 70
+    "X-KDE-System-Settings-Parent-Category": "power-management",
+    "X-KDE-Weight": 70,
+    "X-Plasma-MainScript": "ui/main.qml"
 }
diff --git a/kcms/powermanagement/mobilepower.cpp b/kcms/powermanagement/mobilepower.cpp
index b1355c93..f0e4ecb0 100644
--- a/kcms/powermanagement/mobilepower.cpp
+++ b/kcms/powermanagement/mobilepower.cpp
@@ -11,7 +11,7 @@
 
 #include <Solid/Battery>
 
-K_PLUGIN_CLASS_WITH_JSON(MobilePower, "powermanagement.json")
+K_PLUGIN_CLASS_WITH_JSON(MobilePower, "kcm_mobile_power.json")
 
 enum {
     THIRTY_SECONDS,
diff --git a/kcms/time/CMakeLists.txt b/kcms/time/CMakeLists.txt
index 014cc319..94be89b8 100644
--- a/kcms/time/CMakeLists.txt
+++ b/kcms/time/CMakeLists.txt
@@ -10,7 +10,7 @@ set(timesettings_SRCS
 
 qt_add_dbus_interface(timesettings_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/timedated1.xml timedated_interface)
 
-add_library(kcm_mobile_time MODULE ${timesettings_SRCS})
+kcoreaddons_add_plugin(kcm_mobile_time SOURCES ${timesettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
 
 target_link_libraries(kcm_mobile_time
     Qt::Quick
@@ -23,5 +23,5 @@ target_link_libraries(kcm_mobile_time
 
 # Time and Date
 
-install(TARGETS kcm_mobile_time DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/kcms)
+kcmutils_generate_desktop_file(kcm_mobile_time)
 kpackage_install_package(package kcm_mobile_time kcms)
diff --git a/kcms/time/timesettings.json b/kcms/time/kcm_mobile_time.json
similarity index 100%
rename from kcms/time/timesettings.json
rename to kcms/time/kcm_mobile_time.json
diff --git a/kcms/time/timesettings.cpp b/kcms/time/timesettings.cpp
index 58d29a84..1e64d878 100644
--- a/kcms/time/timesettings.cpp
+++ b/kcms/time/timesettings.cpp
@@ -31,7 +31,7 @@
 #define FORMAT24H "HH:mm:ss"
 #define FORMAT12H "h:mm:ss ap"
 
-K_PLUGIN_FACTORY_WITH_JSON(TimeSettingsFactory, "timesettings.json", registerPlugin<TimeSettings>();)
+K_PLUGIN_FACTORY_WITH_JSON(TimeSettingsFactory, "kcm_mobile_time.json", registerPlugin<TimeSettings>();)
 
 TimeSettings::TimeSettings(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
     : KQuickAddons::ConfigModule(parent, metaData, args)
diff --git a/kcms/virtualkeyboard/CMakeLists.txt b/kcms/virtualkeyboard/CMakeLists.txt
index b77497c7..781895ce 100644
--- a/kcms/virtualkeyboard/CMakeLists.txt
+++ b/kcms/virtualkeyboard/CMakeLists.txt
@@ -11,7 +11,7 @@ set(onscreenkeyboard_SRCS
     virtualkeyboard.cpp
 )
 
-add_library(kcm_mobile_onscreenkeyboard MODULE ${onscreenkeyboard_SRCS})
+kcoreaddons_add_plugin(kcm_mobile_onscreenkeyboard SOURCES ${onscreenkeyboard_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
 
 target_compile_definitions(kcm_mobile_onscreenkeyboard PRIVATE "MALIIT_KEYBOARD_LANGUAGES_DIR=\"${MALIIT_KEYBOARD_LANGUAGES_DIR}\"")
 
@@ -25,6 +25,5 @@ target_link_libraries(kcm_mobile_onscreenkeyboard
     PkgConfig::GOBJECT
 )
 
-install(TARGETS kcm_mobile_onscreenkeyboard DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
-
-kpackage_install_package(package kcm_mobile_virtualkeyboard kcms)
+kcmutils_generate_desktop_file(kcm_mobile_onscreenkeyboard)
+kpackage_install_package(package kcm_mobile_onscreenkeyboard kcms)
diff --git a/kcms/virtualkeyboard/metadata.json b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json
similarity index 98%
rename from kcms/virtualkeyboard/metadata.json
rename to kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json
index 95b7a7ee..c88e32bc 100644
--- a/kcms/virtualkeyboard/metadata.json
+++ b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json
@@ -89,5 +89,6 @@
     "X-KDE-Keywords[uk]": "virtualkeyboard,keyboard,екранна,віртуальна,клавіатура,клавіші",
     "X-KDE-Keywords[vi]": "virtualkeyboard,keyboard,bàn phím ảo,bàn phím",
     "X-KDE-Keywords[x-test]": "xxvirtualkeyboardxx,xxkeyboardxx",
-    "X-KDE-Keywords[zh_CN]": "virtualkeyboard,keyboard,虚拟键盘,键盘"
+    "X-KDE-Keywords[zh_CN]": "virtualkeyboard,keyboard,虚拟键盘,键盘",
+    "X-KDE-System-Settings-Parent-Category": "input-devices"
 }
diff --git a/kcms/virtualkeyboard/virtualkeyboard.cpp b/kcms/virtualkeyboard/virtualkeyboard.cpp
index 36d44697..689ca87f 100644
--- a/kcms/virtualkeyboard/virtualkeyboard.cpp
+++ b/kcms/virtualkeyboard/virtualkeyboard.cpp
@@ -26,7 +26,7 @@
 
 // clang-format on
 
-K_PLUGIN_CLASS_WITH_JSON(VirtualKeyboard, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(VirtualKeyboard, "kcm_mobile_onscreenkeyboard.json")
 
 VirtualKeyboard::VirtualKeyboard(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
     : KQuickAddons::ConfigModule(parent, metaData, args)
diff --git a/kcms/wifi/CMakeLists.txt b/kcms/wifi/CMakeLists.txt
index cda58c74..4194c2ba 100644
--- a/kcms/wifi/CMakeLists.txt
+++ b/kcms/wifi/CMakeLists.txt
@@ -5,7 +5,7 @@ project (kcm_mobile_wifi)
 
 set (wifisettings_SRCS wifisettings.cpp)
 
-add_library(kcm_mobile_wifi MODULE ${wifisettings_SRCS})
+kcoreaddons_add_plugin(kcm_mobile_wifi SOURCES ${wifisettings_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings")
 
 target_link_libraries(kcm_mobile_wifi
     Qt::DBus
@@ -18,6 +18,5 @@ target_link_libraries(kcm_mobile_wifi
     KF6::QuickAddons
 )
 
-install(TARGETS kcm_mobile_wifi DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 kpackage_install_package(package kcm_mobile_wifi kcms)
 kcmutils_generate_desktop_file(kcm_mobile_wifi)