diff --git a/effects/demo_shiftworkspaceup.cpp b/effects/demo_shiftworkspaceup.cpp
index 7bf20a47ac..1363d6dfe9 100644
--- a/effects/demo_shiftworkspaceup.cpp
+++ b/effects/demo_shiftworkspaceup.cpp
@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWin
 {
 
-KWIN_EFFECT( DemoShiftWorkspaceUp, ShiftWorkspaceUpEffect )
+KWIN_EFFECT( Demo_ShiftWorkspaceUp, ShiftWorkspaceUpEffect )
 
 ShiftWorkspaceUpEffect::ShiftWorkspaceUpEffect()
     : up( false )
diff --git a/effects/demo_shiftworkspaceup.desktop b/effects/demo_shiftworkspaceup.desktop
index 5c79dc2fd2..302f7309b5 100644
--- a/effects/demo_shiftworkspaceup.desktop
+++ b/effects/demo_shiftworkspaceup.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=DemoShiftWorkspaceUp
-X-KDE-Library=kwin4_effect_demos
+Name=Demo_ShiftWorkspaceUp
+X-KDE-Library=kwin4_effect_tests
diff --git a/effects/demo_taskbarthumbnail.cpp b/effects/demo_taskbarthumbnail.cpp
index 724678e89b..2b17f17556 100644
--- a/effects/demo_taskbarthumbnail.cpp
+++ b/effects/demo_taskbarthumbnail.cpp
@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWin
 {
 
-KWIN_EFFECT( DemoTaskbarThumbnail, TaskbarThumbnailEffect )
+KWIN_EFFECT( Demo_TaskbarThumbnail, TaskbarThumbnailEffect )
 
 TaskbarThumbnailEffect::TaskbarThumbnailEffect()
     {
diff --git a/effects/demo_taskbarthumbnail.desktop b/effects/demo_taskbarthumbnail.desktop
index f03e488713..9544c228ae 100644
--- a/effects/demo_taskbarthumbnail.desktop
+++ b/effects/demo_taskbarthumbnail.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=DemoTaskbarThumbnail
-X-KDE-Library=kwin4_effect_demos
+Name=Demo_TaskbarThumbnail
+X-KDE-Library=kwin4_effect_tests
+
diff --git a/effects/diminactive.cpp b/effects/diminactive.cpp
index 17c0a17c83..957ee25a0f 100644
--- a/effects/diminactive.cpp
+++ b/effects/diminactive.cpp
@@ -19,7 +19,7 @@ KWIN_EFFECT( DimInactive, DimInactiveEffect )
 DimInactiveEffect::DimInactiveEffect()
     : active( NULL )
     {
-    dim_panels = true; // TODO config option
+    dim_panels = false; // TODO config option
     dim_by_group = true; // TODO config option
     }
 
@@ -27,7 +27,12 @@ void DimInactiveEffect::paintWindow( EffectWindow* w, int mask, QRegion region,
     {
     bool dim = false;
     if( active == NULL )
-        dim = true;
+        {
+        if( !w->isDock() || dim_panels )
+            dim = true;
+        else
+            dim = false;
+        }
     else if( dim_by_group && active->group() == w->group())
         dim = false;
     else if( !dim_by_group && active == w )
diff --git a/effects/howto.cpp b/effects/howto.cpp
index 9cdf1af901..4e17ae5ca7 100644
--- a/effects/howto.cpp
+++ b/effects/howto.cpp
@@ -23,6 +23,9 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWin
 {
 
+// This macro creates entry function for the plugin. First argument is name, second is class name.
+KWIN_EFFECT( Howto, HowtoEffect )
+
 // A pre-paint function that tells the compositing code how this effect will affect
 // the painting. During every painting pass this function is called first, before
 // the actual painting function.
diff --git a/effects/test_input.cpp b/effects/test_input.cpp
index 4c6d1ca936..ae11a42f88 100644
--- a/effects/test_input.cpp
+++ b/effects/test_input.cpp
@@ -29,7 +29,7 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWin
 {
 
-KWIN_EFFECT( TestInput, TestInputEffect )
+KWIN_EFFECT( Test_Input, TestInputEffect )
 
 TestInputEffect::TestInputEffect()
     {
diff --git a/effects/test_input.desktop b/effects/test_input.desktop
index 73a62977cc..c22d9f7fb6 100644
--- a/effects/test_input.desktop
+++ b/effects/test_input.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=TestInput
+Name=Test_Input
 X-KDE-Library=kwin4_effect_tests
diff --git a/effects/test_thumbnail.cpp b/effects/test_thumbnail.cpp
index f3388a1418..32a5a09751 100644
--- a/effects/test_thumbnail.cpp
+++ b/effects/test_thumbnail.cpp
@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWin
 {
 
-KWIN_EFFECT( TestThumbnail, TestThumbnailEffect )
+KWIN_EFFECT( Test_Thumbnail, TestThumbnailEffect )
 
 TestThumbnailEffect::TestThumbnailEffect()
     : active_window( NULL )
diff --git a/effects/test_thumbnail.desktop b/effects/test_thumbnail.desktop
index 311d5ee92d..a51f79eeef 100644
--- a/effects/test_thumbnail.desktop
+++ b/effects/test_thumbnail.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=TestThumbnail
+Name=Test_Thumbnail
 X-KDE-Library=kwin4_effect_tests
diff --git a/effects/videorecord.cpp b/effects/videorecord.cpp
index 132c8f9ad3..ac625d5df6 100644
--- a/effects/videorecord.cpp
+++ b/effects/videorecord.cpp
@@ -42,6 +42,8 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWin
 {
 
+KWIN_EFFECT( VideoRecord, VideoRecordEffect )
+
 VideoRecordEffect::VideoRecordEffect()
     : client( NULL )
     {
diff --git a/effects/zoom.cpp b/effects/zoom.cpp
index 62822519ce..1644b71c30 100644
--- a/effects/zoom.cpp
+++ b/effects/zoom.cpp
@@ -13,6 +13,8 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWin
 {
 
+KWIN_EFFECT( Zoom, ZoomEffect )
+
 ZoomEffect::ZoomEffect()
     : zoom( 1 )
     , target_zoom( 2 )