diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt
index 382f225a23..aaa38585c5 100644
--- a/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kcmkwin/kwindecoration/CMakeLists.txt
@@ -1,16 +1,8 @@
 ########### next target ###############
 
 set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp )
-
-
-
-
 kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS})
-
-
-
 target_link_libraries(kcm_kwindecoration ${KDE4_KDE3SUPPORT_LIBS} kdecorations ${X11_LIBRARIES})
-
 install(TARGETS kcm_kwindecoration  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index 52d0c31341..d371e07793 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -69,7 +69,7 @@ Name[uk]=Обрамлення вікон
 Name[uz]=Ойнанинг безаклари
 Name[wa]=Gåliotaedjes des purneas
 Name[x-test]=xxWindow Decorationsxx
-Name[xh]=Izihombiso zeWindow 
+Name[xh]=Izihombiso zeWindow
 Name[zh_TW]=視窗裝飾
 
 Comment=Configure the look and feel of window titles
diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt
index 43562bbc34..1efdb0f596 100644
--- a/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kcmkwin/kwinoptions/CMakeLists.txt
@@ -1,18 +1,8 @@
-
-
-
 ########### next target ###############
 
 set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
-
-
-
 kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
-
-
-
 target_link_libraries(kcm_kwinoptions  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
-
 install(TARGETS kcm_kwinoptions  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index c79db27214..2b5773300c 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -6,7 +6,7 @@ ServiceTypes=KCModule
 Exec=kcmshell kwinactions
 DocPath=kcontrol/windowmanagement/index.html#action-actions
 
-X-KDE-Library=kwinoptions
+X-KDE-Library=kcm_kwinoptions
 X-KDE-FactoryName=kwinactions
 
 Name=Actions
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index 8a64bd560d..02c213af64 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -6,7 +6,7 @@ ServiceTypes=KCModule
 Exec=kcmshell kwinadvanced
 DocPath=kcontrol/windowmanagement/index.html#action-advanced
 
-X-KDE-Library=kwinoptions
+X-KDE-Library=kcm_kwinoptions
 X-KDE-FactoryName=kwinadvanced
 
 Name=Advanced
diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop
index 0f514ae9b6..37c0cf9881 100644
--- a/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -6,7 +6,7 @@ ServiceTypes=KCModule
 Exec=kcmshell kwinfocus
 DocPath=kcontrol/windowmanagement/index.html#action-focus
 
-X-KDE-Library=kwinoptions
+X-KDE-Library=kcm_kwinoptions
 X-KDE-FactoryName=kwinfocus
 
 Name=Focus
diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop
index 6ae5326664..a412756aba 100644
--- a/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -6,7 +6,7 @@ ServiceTypes=KCModule
 Exec=kcmshell kwinmoving
 DocPath=kcontrol/windowmanagement/index.html#action-moving
 
-X-KDE-Library=kwinoptions
+X-KDE-Library=kcm_kwinoptions
 X-KDE-FactoryName=kwinmoving
 
 Name=Moving
diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
index 8758174e7c..31107658f8 100644
--- a/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kcmkwin/kwinrules/kwinrules.desktop
@@ -6,7 +6,7 @@ Type=Service
 ServiceTypes=KCModule
 DocPath=kcontrol/windowmanagement/index.html
 
-X-KDE-Library=kwinrules
+X-KDE-Library=kcm_kwinrules
 X-KDE-FactoryName=kwinrules
 X-KDE-ParentApp=kcontrol