diff --git a/effects/dialogparent.desktop b/effects/dialogparent.desktop
index 39a2d3c48c..b1d38bbd28 100644
--- a/effects/dialogparent.desktop
+++ b/effects/dialogparent.desktop
@@ -122,7 +122,7 @@ X-KDE-PluginInfo-Author=Rivo Laks
 X-KDE-PluginInfo-Email=rivolaks@hot.ee
 X-KDE-PluginInfo-Name=kwin4_effect_dialogparent
 X-KDE-PluginInfo-Version=0.1.0
-X-KDE-PluginInfo-Category=Appearance
+X-KDE-PluginInfo-Category=Focus
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/effects/diminactive.desktop b/effects/diminactive.desktop
index 37bec1e876..f0625adad8 100644
--- a/effects/diminactive.desktop
+++ b/effects/diminactive.desktop
@@ -113,7 +113,7 @@ X-KDE-PluginInfo-Author=Luboš Luňák
 X-KDE-PluginInfo-Email=l.lunak@kde.org
 X-KDE-PluginInfo-Name=kwin4_effect_diminactive
 X-KDE-PluginInfo-Version=0.1.0
-X-KDE-PluginInfo-Category=Accessibility
+X-KDE-PluginInfo-Category=Focus
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=false
diff --git a/effects/dimscreen.desktop b/effects/dimscreen.desktop
index 951b0be726..b050c7b475 100644
--- a/effects/dimscreen.desktop
+++ b/effects/dimscreen.desktop
@@ -97,7 +97,7 @@ X-KDE-PluginInfo-Author=Martin Gräßlin
 X-KDE-PluginInfo-Email=ubuntu@martin-graesslin.com
 X-KDE-PluginInfo-Name=kwin4_effect_dimscreen
 X-KDE-PluginInfo-Version=0.1.0
-X-KDE-PluginInfo-Category=Appearance
+X-KDE-PluginInfo-Category=Focus
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=false
diff --git a/effects/presentwindows.desktop b/effects/presentwindows.desktop
index 90fdeaaed3..7fcc87082e 100644
--- a/effects/presentwindows.desktop
+++ b/effects/presentwindows.desktop
@@ -126,7 +126,7 @@ X-KDE-PluginInfo-Author=Rivo Laks & Lucas Murray
 X-KDE-PluginInfo-Email=rivolaks@hot.ee & lmurray@undefinedfire.com
 X-KDE-PluginInfo-Name=kwin4_effect_presentwindows
 X-KDE-PluginInfo-Version=0.2.0
-X-KDE-PluginInfo-Category=Appearance
+X-KDE-PluginInfo-Category=Window Management
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/effects/showfps.desktop b/effects/showfps.desktop
index 05205c5892..4d8a4d4b66 100644
--- a/effects/showfps.desktop
+++ b/effects/showfps.desktop
@@ -132,7 +132,7 @@ X-KDE-PluginInfo-Author=Luboš Luňák
 X-KDE-PluginInfo-Email=l.lunak@kde.org
 X-KDE-PluginInfo-Name=kwin4_effect_showfps
 X-KDE-PluginInfo-Version=0.1.0
-X-KDE-PluginInfo-Category=Misc
+X-KDE-PluginInfo-Category=Tools
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=false
diff --git a/effects/showpaint.desktop b/effects/showpaint.desktop
index 8b9e67bde7..3639dc6a1c 100644
--- a/effects/showpaint.desktop
+++ b/effects/showpaint.desktop
@@ -109,7 +109,7 @@ X-KDE-PluginInfo-Author=Luboš Luňák
 X-KDE-PluginInfo-Email=l.lunak@kde.org
 X-KDE-PluginInfo-Name=kwin4_effect_showpaint
 X-KDE-PluginInfo-Version=0.1.0
-X-KDE-PluginInfo-Category=Misc
+X-KDE-PluginInfo-Category=Tools
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=false
diff --git a/effects/slide.desktop b/effects/slide.desktop
index 893355112a..ae5af1761e 100644
--- a/effects/slide.desktop
+++ b/effects/slide.desktop
@@ -16,7 +16,7 @@ Name[tr]=Kaydır
 Name[uk]=Ковзання
 Name[zh_TW]=滑動
 Icon=preferences-system-windows-effect-slide
-Comment=Slide windows across the desktop when switching desktops
+Comment=Slide windows across the screen when switching virtual desktops
 Comment[el]=Κύλιση παραθύρων κατά την εναλλαγή επιφανειών εργασίας
 Comment[et]=Akende liuglemine töölaudade vahetamisel
 Comment[ga]=Sleamhnaigh fuinneoga agus an deasc reatha á hathrú
diff --git a/effects/snow.desktop b/effects/snow.desktop
index b83053cb37..ac52989be9 100644
--- a/effects/snow.desktop
+++ b/effects/snow.desktop
@@ -122,7 +122,7 @@ X-KDE-PluginInfo-Email=ubuntu@martin-graesslin.com
 # Internal name of the effect
 X-KDE-PluginInfo-Name=kwin4_effect_snow
 # Category of the effect, for config dialog
-X-KDE-PluginInfo-Category=Appearance
+X-KDE-PluginInfo-Category=Candy
 # Version and license
 X-KDE-PluginInfo-Version=0.1.2
 X-KDE-PluginInfo-License=GPL
diff --git a/effects/taskbarthumbnail.desktop b/effects/taskbarthumbnail.desktop
index 1f09bca695..618b508d08 100644
--- a/effects/taskbarthumbnail.desktop
+++ b/effects/taskbarthumbnail.desktop
@@ -111,7 +111,7 @@ X-KDE-PluginInfo-Author=Lubos Lunak
 X-KDE-PluginInfo-Email=l.lunak@kde.org
 X-KDE-PluginInfo-Name=kwin4_effect_taskbarthumbnail
 X-KDE-PluginInfo-Version=0.1.0
-X-KDE-PluginInfo-Category=Window Management
+X-KDE-PluginInfo-Category=Appearance
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/effects/videorecord.desktop b/effects/videorecord.desktop
index 620296a471..a42a2e70ba 100644
--- a/effects/videorecord.desktop
+++ b/effects/videorecord.desktop
@@ -129,7 +129,7 @@ X-KDE-PluginInfo-Author=Luboš Luňák
 X-KDE-PluginInfo-Email=l.lunak@kde.org
 X-KDE-PluginInfo-Name=kwin4_effect_videorecord
 X-KDE-PluginInfo-Version=0.1.0
-X-KDE-PluginInfo-Category=Misc
+X-KDE-PluginInfo-Category=Tools
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=false
diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index d0acb0e03d..1ed4a10444 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -235,10 +235,12 @@ void KWinCompositingConfig::initEffectSelector()
     // Add them to the plugin selector
     ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Appearance"), "Appearance", mTmpConfig);
     ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Accessibility"), "Accessibility", mTmpConfig);
+    ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Focus"), "Focus", mTmpConfig);
     ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Window Management"), "Window Management", mTmpConfig);
+    ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Candy"), "Candy", mTmpConfig);
     ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Demos"), "Demos", mTmpConfig);
     ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Tests"), "Tests", mTmpConfig);
-    ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Misc"), "Misc", mTmpConfig);
+    ui.effectSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Tools"), "Tools", mTmpConfig);
 }
 
 void KWinCompositingConfig::currentTabChanged(int tab)