diff --git a/colorcorrection/manager.cpp b/colorcorrection/manager.cpp
--- a/colorcorrection/manager.cpp
+++ b/colorcorrection/manager.cpp
@@ -397,9 +397,9 @@
     bool isDay = daylight();
     int targetTemp = isDay ? m_dayTargetTemp : m_nightTargetTemp;
 
-    if (m_prev.first == m_prev.second) {
-        // transition time is zero
-        commitGammaRamps(isDay ? m_dayTargetTemp : m_nightTargetTemp);
+    // We've reached the target color temperature or the transition time is zero.
+    if (m_prev.first == m_prev.second || m_currentTemp == targetTemp) {
+        commitGammaRamps(targetTemp);
         return;
     }
 
diff --git a/doc/windowbehaviour/index.docbook b/doc/windowbehaviour/index.docbook
--- a/doc/windowbehaviour/index.docbook
+++ b/doc/windowbehaviour/index.docbook
@@ -656,11 +656,11 @@
 <varlistentry>
 <term><guilabel>Placement</guilabel></term>
 <listitem><para>The placement policy determines where a new window will appear
-on the desktop.  <guilabel>Smart</guilabel> will try to achieve a minimum
-overlap of windows, <guilabel>Cascade</guilabel> will cascade the
+on the desktop.  <guilabel>Minimal Overlapping</guilabel> will try to achieve a minimum
+overlap of windows, <guilabel>Cascaded</guilabel> will cascade the
 windows, and <guilabel>Random</guilabel> will use a random
 position.  <guilabel>Centered</guilabel> will open all new windows in
-the center of the screen, and <guilabel>Zero-Cornered</guilabel> will
+the center of the screen, and <guilabel>In Top-Left Corner</guilabel> will
 open all windows with their top left corner in the top left corner of
 the screen.</para></listitem>
 </varlistentry>
diff --git a/doc/windowspecific/index.docbook b/doc/windowspecific/index.docbook
--- a/doc/windowspecific/index.docbook
+++ b/doc/windowspecific/index.docbook
@@ -338,12 +338,12 @@
 <itemizedlist>
 <listitem><para><guilabel>Default</guilabel> - use the global window placement strategy.</para></listitem>
 <listitem><para><guilabel>No Placement</guilabel> - top-left corner.</para></listitem>
-<listitem><para><guilabel>Smart</guilabel> - place where no other window exists.</para></listitem>
-<listitem><para><guilabel>Maximizing</guilabel> - start the window maximized.</para></listitem>
-<listitem><para><guilabel>Cascade</guilabel> - staircase-by-title.</para></listitem>
+<listitem><para><guilabel>Minimal Overlapping</guilabel> - place where no other window exists.</para></listitem>
+<listitem><para><guilabel>Maximized</guilabel> - start the window maximized.</para></listitem>
+<listitem><para><guilabel>Cascaded</guilabel> - staircase-by-title.</para></listitem>
 <listitem><para><guilabel>Centered</guilabel> - center of the desktop.</para></listitem>
 <listitem><para><guilabel>Random</guilabel></para></listitem>
-<listitem><para><guilabel>Top-Left Corner</guilabel></para></listitem>
+<listitem><para><guilabel>In Top-Left Corner</guilabel></para></listitem>
 <listitem><para><guilabel>Under Mouse</guilabel></para></listitem>
 <listitem><para><guilabel>On Main Window</guilabel> - restrict placement of a child window to the boundaries of the parent window.</para></listitem>
 </itemizedlist>
diff --git a/effects/windowgeometry/windowgeometry.cpp b/effects/windowgeometry/windowgeometry.cpp
--- a/effects/windowgeometry/windowgeometry.cpp
+++ b/effects/windowgeometry/windowgeometry.cpp
@@ -165,7 +165,7 @@
         QPoint center = geometry.center();
         const QRect &r = geometry;
         const QRect &r2 = myOriginalGeometry;
-        const QRect screen = effects->clientArea(ScreenArea, center, w->desktop());
+        const QRect screen = effects->clientArea(ScreenArea, w);
         QRect expandedGeometry = w->expandedGeometry();
         expandedGeometry = geometry.adjusted(expandedGeometry.x() - w->x(),
                                              expandedGeometry.y() - w->y(),
diff --git a/kcmkwin/kwinoptions/advanced.ui b/kcmkwin/kwinoptions/advanced.ui
--- a/kcmkwin/kwinoptions/advanced.ui
+++ b/kcmkwin/kwinoptions/advanced.ui
@@ -77,17 +77,17 @@
      </property>
      <item>
       <property name="text">
-       <string>Smart</string>
+       <string>Minimal Overlapping</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Maximizing</string>
+       <string>Maximized</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Cascade</string>
+       <string>Cascaded</string>
       </property>
      </item>
      <item>
@@ -102,7 +102,7 @@
      </item>
      <item>
       <property name="text">
-       <string>Zero-cornered</string>
+       <string>In Top-Left Corner</string>
       </property>
      </item>
      <item>
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -35,7 +35,7 @@
 X-KDE-Keywords[es]=desplegar,extender,recoger,plegar,borde,pasada,bordes activos,mosaico,pestañas,páginas en pestañas,ventana,pestañas de páginas,agrupación de ventanas,ventanas en mosaico,posicionamiento,posicionamiento de ventanas,comportamiento avanzado de las ventanas
 X-KDE-Keywords[eu]=zabaldu,zabaltzea,bildu,biltzea,gainetik pasatzea,ertz aktiboak,lauzatze,fitxak,leihoa,leihoen fitxak,leihoak lauza moduan,leihoen kokapena,leihoen jokabide aurreratua
 X-KDE-Keywords[nl]=verhelderen,verheldering,schaduw,verduistering,rand,boven zweven,actieve randen,schuin achter elkaar,tabbladen,met tabbladen werken,venster,vensterwisseling,verstergroepering,vensters schuin achter elkaar,plaatsing,vensterplaatsing,plaatsing van vensters,geavanceerd gedrag van vensters
-X-KDE-Keywords[nn]=opprulling,kant,sveva,aktive kantar,flislegging,faner,vindaugsfaner,vindaugsgruppering,vindaugsflislegging,vindaugsplassering,plassering;plassering av vindauge,avansert vindaugsåtferd
+X-KDE-Keywords[nn]=opprulling,kant,sveva,aktive kantar,flislegging,faner,vindaugsfaner,vindaugsgruppering,vindaugsflislegging,vindaugsplassering,plassering,plassering av vindauge,avansert vindaugsåtferd
 X-KDE-Keywords[pt]=sombra,contorno,passagem,contornos activos,lado-a-lado,páginas,páginas da janela,agrupamento de janelas,janelas lado-a-lado,colocação das janelas,comportamento avançado das janelas
 X-KDE-Keywords[sv]=skugga,skuggning,kanter,hålla musen över,aktiva kanter,sida vid sida,flikar,fönster,fönsterflikar,fönstergruppering,fönster sida vid sida,placering,fönsterplacering,placering av fönster,avancerat fönsterbeteende
 X-KDE-Keywords[uk]=unshade,unshading,shade,shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,placement?window placement,placement of windows,window advanced behavior,прибирання тіні,тінь,тіні,границі,межі,краї,активні краї,плитка,тайлінґ,вкладки,мозаїка,вікно з вкладками,групування вікон,розташування,розташування вікон, додаткові ефекти поведінки
diff --git a/kcmkwin/kwinrules/ruleswidgetbase.ui b/kcmkwin/kwinrules/ruleswidgetbase.ui
--- a/kcmkwin/kwinrules/ruleswidgetbase.ui
+++ b/kcmkwin/kwinrules/ruleswidgetbase.ui
@@ -1063,17 +1063,17 @@
          </item>
          <item>
           <property name="text">
-           <string>Smart</string>
+           <string>Minimal Overlapping</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Maximizing</string>
+           <string>Maximized</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Cascade</string>
+           <string>Cascaded</string>
           </property>
          </item>
          <item>
@@ -1088,7 +1088,7 @@
          </item>
          <item>
           <property name="text">
-           <string>Top-Left Corner</string>
+           <string>In Top-Left Corner</string>
           </property>
          </item>
          <item>