diff --git a/effects/kscreen/kscreen.cpp b/effects/kscreen/kscreen.cpp
index 2d167110b5..ee21ac5c20 100644
--- a/effects/kscreen/kscreen.cpp
+++ b/effects/kscreen/kscreen.cpp
@@ -105,19 +105,23 @@ void KscreenEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &data, in
 
 void KscreenEffect::paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data)
 {
+    //fade to black and fully opaque
     switch (m_state) {
-    case StateFadingOut:
-        data.multiplyOpacity(1.0 - m_timeLine.currentValue());
-        break;
-    case StateFadedOut:
-        data.multiplyOpacity(0.0);
-        break;
-    case StateFadingIn:
-        data.multiplyOpacity(m_timeLine.currentValue());
-        break;
-    default:
-        // no adjustment
-        break;
+        case StateFadingOut:
+            data.setOpacity(data.opacity() + (1.0 - data.opacity()) * m_timeLine.currentValue());
+            data.multiplyBrightness(1.0 - m_timeLine.currentValue());
+            break;
+        case StateFadedOut:
+            data.multiplyOpacity(0.0);
+            data.multiplyBrightness(0.0);
+            break;
+        case StateFadingIn:
+            data.setOpacity(data.opacity() + (1.0 - data.opacity()) * (1.0 - m_timeLine.currentValue()));
+            data.multiplyBrightness(m_timeLine.currentValue());
+            break;
+        default:
+            // no adjustment
+            break;
     }
     effects->paintWindow(w, mask, region, data);
 }
diff --git a/effects/maximize/package/contents/code/maximize.js b/effects/maximize/package/contents/code/maximize.js
index d381a68102..4345c04fa9 100644
--- a/effects/maximize/package/contents/code/maximize.js
+++ b/effects/maximize/package/contents/code/maximize.js
@@ -1,7 +1,7 @@
 /********************************************************************
  This file is part of the KDE project.
 
- Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
+ Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/effects/morphingpopups/package/contents/code/morphingpopups.js b/effects/morphingpopups/package/contents/code/morphingpopups.js
index 9ae52847f6..16040dc2b0 100644
--- a/effects/morphingpopups/package/contents/code/morphingpopups.js
+++ b/effects/morphingpopups/package/contents/code/morphingpopups.js
@@ -1,7 +1,7 @@
 /********************************************************************
  This file is part of the KDE project.
 
- Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
+ Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
  Copyright (C) 2016 Marco Martin <mart@kde.org>
 
 This program is free software; you can redistribute it and/or modify