diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index d027794798..d349929c05 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -67,7 +67,7 @@
 // KCModule plugin interface
 // =========================
 typedef KGenericFactory<KWinDecorationModule, QWidget> KWinDecoFactory;
-K_EXPORT_COMPONENT_FACTORY( kwindecoration, KWinDecoFactory("kcmkwindecoration") )
+K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") )
 
 KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QStringList &)
     : KCModule(KWinDecoFactory::componentData(), parent),
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index d03df9fc3d..bd87a31581 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -7,7 +7,7 @@ ServiceTypes=KCModule
 DocPath=kcontrol/kwindecoration/index.html
 
 X-KDE-Library=kcm_kwindecoration
-X-KDE-FactoryName=kwindecoration
+X-KDE-FactoryName=kcm_kwindecoration
 X-KDE-ParentApp=kcontrol
 
 X-KDE-System-Settings-Parent-Category=appearance
diff --git a/kcmkwin/kwineffects/kwineffects.desktop b/kcmkwin/kwineffects/kwineffects.desktop
index 54f962c63d..5c8e3529e0 100644
--- a/kcmkwin/kwineffects/kwineffects.desktop
+++ b/kcmkwin/kwineffects/kwineffects.desktop
@@ -10,6 +10,8 @@ X-KDE-Library=kcm_kwineffects
 X-KDE-FactoryName=kcm_kwineffects
 X-KDE-ParentApp=kcontrol
 
+X-KDE-System-Settings-Parent-Category=window-behaviour
+
 Name=Window Effects
 Name[be]=Эфекты вокнаў
 Name[csb]=Efektë òknów
@@ -56,3 +58,6 @@ Keywords[nl]=kwin,window,venster,window manager,effect
 Keywords[pt]=kwin,janela,gestor,efeito
 Keywords[pt_BR]=kwin,janela,gestor,efeito
 Keywords[sv]=kwin,fönster,hantera,effekt
+
+Categories=Qt;KDE;X-KDE-settings-looknfeel;
+
diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
index 33a29202ad..a567df0ab0 100644
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -6,10 +6,12 @@ ServiceTypes=KCModule
 Exec=kcmshell kwinoptions
 DocPath=kcontrol/windowmanagement/index.html
 
-X-KDE-Library=kwinoptions
+X-KDE-Library=kcm_kwinoptions
 X-KDE-FactoryName=kwinoptions
 X-KDE-ParentApp=kcontrol
 
+X-KDE-System-Settings-Parent-Category=window-behaviour
+
 Name=Window Behavior
 Name[af]=Venster Gedrag
 Name[be]=Паводзіны вокнаў
@@ -179,3 +181,6 @@ Keywords[uk]=фокус,розташовування,поведінка вікн
 Keywords[uz]=фокуслаш,жойлашиш,ойнанинг хусусиятлари,анимация,олдинга,авто-олдинга,ойналар,фрейм,сарлавҳа,икки марта босиш
 Keywords[x-test]=xxfocus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclickxx
 Keywords[zh_TW]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick,焦點,放置,視窗行為,動畫,抬升,自動抬升,視窗,框架,標題列,雙擊
+
+Categories=Qt;KDE;X-KDE-settings-looknfeel;
+