diff --git a/README.md b/README.md
index 413e37a31..595e3075f 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,48 @@
 # KWin
 
 KWin is an easy to use, but flexible, composited Window Manager for Xorg windowing systems (Wayland, X11) on Linux. Its primary usage is in conjunction with a Desktop Shell (e.g. KDE Plasma Desktop). KWin is designed to go out of the way; users should not notice that they use a window manager at all. Nevertheless KWin provides a steep learning curve for advanced features, which are available, if they do not conflict with the primary mission. KWin does not have a dedicated targeted user group, but follows the targeted user group of the Desktop Shell using KWin as it's window manager.
 
 ## KWin is not...
 
  * a standalone window manager (c.f. openbox, i3) and does not provide any functionality belonging to a Desktop Shell.
  * a replacement for window managers designed for use with a specific Desktop Shell (e.g. GNOME Shell)
  * a minimalistic window manager
  * designed for use without compositing or for X11 network transparency, though both are possible.
 
 # Contacting KWin development team
 
  * mailing list: [kwin@kde.org](https://mail.kde.org/mailman/listinfo/kwin)
  * IRC: #kwin on freenode
 
 # Support
 ## Application Developer
 If you are an application developer having questions regarding windowing systems (either X11 or Wayland) please do not hesitate to contact us. Preferable through our mailing list. Ideally subscribe to the mailing list, so that your mail doesn't get stuck in the moderation queue.
 
 ## End user
 Please contact the support channels of your Linux distribution for user support. The KWin development team does not provide end user support.
 
 # Reporting bugs
 
 Please use [KDE's bugtracker](https://bugs.kde.org) and report for [product KWin](https://bugs.kde.org/enter_bug.cgi?product=kwin).
 
 # Developing on KWin
 Please refer to [hacking documentation](HACKING.md) for how to build and start KWin. Further information about KWin's test suite can be found in [TESTING.md](TESTING.md).
 
 ## Guidelines for new features
 
 A new Feature can only be added to KWin if:
 
  * it does not violate the primary missions as stated at the start of this document
  * it does not introduce instabilities
  * it is maintained, that is bugs are fixed in a timely manner (second next minor release) if it is not a corner case.
  * it works together with all existing features
  * it supports both single and multi screen (xrandr)
  * it adds a significant advantage
  * it is feature complete, that is supports at least all useful features from competitive implementations
  * it is not a special case for a small user group
  * it does not increase code complexity significantly
  * it does not affect KWin's license (GPLv2+)
 
 All new added features are under probation, that is if any of the non-functional requirements as listed above do not hold true in the next two feature releases, the added feature will be removed again.
 
-The same non functional requirements hold true for any kind of plugins (effects, scripts, etc.). It is suggested to use scripted plugins and distribute them separately.
+The same non functional requirements hold true for any kind of plugins (effects, scripts, etc.). It is suggested to use scripted plugins and distribute them separately.
\ No newline at end of file
diff --git a/kcmkwin/kwinscreenedges/main.ui b/kcmkwin/kwinscreenedges/main.ui
index 9b7705531..3a0818951 100644
--- a/kcmkwin/kwinscreenedges/main.ui
+++ b/kcmkwin/kwinscreenedges/main.ui
@@ -1,331 +1,331 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KWinScreenEdgesConfigUI</class>
  <widget class="QWidget" name="KWinScreenEdgesConfigUI">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>500</width>
     <height>525</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>500</width>
     <height>525</height>
    </size>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="infoLabel">
      <property name="text">
       <string>You can trigger an action by pushing the mouse cursor against the corresponding screen edge or corner.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Minimum</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="KWin::Monitor" name="monitor" native="true">
      <property name="minimumSize">
       <size>
        <width>200</width>
        <height>200</height>
       </size>
      </property>
      <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QFormLayout" name="formLayout">
      <property name="formAlignment">
       <set>Qt::AlignHCenter|Qt::AlignTop</set>
      </property>
      <item row="0" column="0">
       <widget class="QLabel" name="quickMaximizeLabel">
        <property name="text">
         <string>&amp;Maximize:</string>
        </property>
        <property name="buddy">
         <cstring>kcfg_ElectricBorderMaximize</cstring>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QCheckBox" name="kcfg_ElectricBorderMaximize">
        <property name="text">
         <string>Windows dragged to top edge</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="quickTileLabel">
        <property name="text">
         <string>&amp;Tile:</string>
        </property>
        <property name="buddy">
-        <cstring>quickTileBox</cstring>
+        <cstring>kcfg_ElectricBorderTiling</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QCheckBox" name="kcfg_ElectricBorderTiling">
        <property name="text">
         <string>Windows dragged to left or right edge</string>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="electricBorderCornerRatioLabel">
        <property name="text">
         <string>Trigger &amp;quarter tiling in:</string>
        </property>
        <property name="buddy">
         <cstring>electricBorderCornerRatioSpin</cstring>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
         <widget class="QSpinBox" name="electricBorderCornerRatioSpin">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="suffix">
           <string>%</string>
          </property>
          <property name="prefix">
           <string>Outer </string>
          </property>
          <property name="minimum">
           <number>1</number>
          </property>
          <property name="maximum">
           <number>49</number>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="label_1">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
           <string>of the screen</string>
          </property>
         </widget>
        </item>
       </layout>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="desktopSwitchLabel">
        <property name="toolTip">
         <string>Change desktop when the mouse cursor is pushed against the edge of the screen</string>
        </property>
        <property name="text">
         <string>&amp;Switch desktop on edge:</string>
        </property>
        <property name="buddy">
         <cstring>kcfg_ElectricBorders</cstring>
        </property>
       </widget>
      </item>
      <item row="4" column="1">
       <widget class="KComboBox" name="kcfg_ElectricBorders">
        <item>
         <property name="text">
          <string comment="Switch desktop on edge">Disabled</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Only When Moving Windows</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Always Enabled</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="5" column="0">
       <widget class="QLabel" name="activationDelayLabel">
        <property name="toolTip">
         <string>Amount of time required for the mouse cursor to be pushed against the edge of the screen before the action is triggered</string>
        </property>
        <property name="text">
         <string>Activation &amp;delay:</string>
        </property>
        <property name="buddy">
         <cstring>kcfg_ElectricBorderDelay</cstring>
        </property>
       </widget>
      </item>
      <item row="5" column="1">
       <widget class="QSpinBox" name="kcfg_ElectricBorderDelay">
        <property name="suffix">
         <string> ms</string>
        </property>
        <property name="maximum">
         <number>1000</number>
        </property>
        <property name="singleStep">
         <number>50</number>
        </property>
        <property name="value">
         <number>0</number>
        </property>
       </widget>
      </item>
      <item row="6" column="0">
       <widget class="QLabel" name="triggerCooldownLabel">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="toolTip">
         <string>Amount of time required after triggering an action until the next trigger can occur</string>
        </property>
        <property name="text">
         <string>&amp;Reactivation delay:</string>
        </property>
        <property name="buddy">
         <cstring>kcfg_ElectricBorderCooldown</cstring>
        </property>
       </widget>
      </item>
      <item row="6" column="1">
       <widget class="QSpinBox" name="kcfg_ElectricBorderCooldown">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="suffix">
         <string> ms</string>
        </property>
        <property name="maximum">
         <number>1000</number>
        </property>
        <property name="singleStep">
         <number>50</number>
        </property>
        <property name="value">
         <number>0</number>
        </property>
       </widget>
      </item>
      <item row="3" column="1">
       <spacer name="verticalSpacer_1">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>4</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer_3">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KWin::Monitor</class>
    <extends>QWidget</extends>
    <header>monitor.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>kcfg_ElectricBorderTiling</sender>
    <signal>toggled(bool)</signal>
    <receiver>label_1</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_ElectricBorderTiling</sender>
    <signal>toggled(bool)</signal>
    <receiver>electricBorderCornerRatioSpin</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_ElectricBorderTiling</sender>
    <signal>toggled(bool)</signal>
    <receiver>electricBorderCornerRatioLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
index e121d6d94..d06c448ce 100644
--- a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
+++ b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
@@ -1,31 +1,32 @@
 /********************************************************************
 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
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "plastikplugin.h"
 #include "plastikbutton.h"
 #include <QQmlEngine>
 
 void PlastikPlugin::registerTypes(const char *uri)
 {
-    Q_UNUSED(uri)
+    // Need to register something to tell Qt that it loaded (QTBUG-84571)
+    qmlRegisterModule(uri, 1, 0);
 }
 
 void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.kwin.decorations.plastik"));
     engine->addImageProvider(QLatin1String("plastik"), new KWin::PlastikButtonProvider());
     QQmlExtensionPlugin::initializeEngine(engine, uri);
 }
diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
index 49a4b402d..aa7bf16b3 100644
--- a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
+++ b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
@@ -1,5 +1,2 @@
 module org.kde.kwin.decorations.plastik
 plugin plastikplugin
-
-# we need to have at least one element of Qt is not able to find the plugin *shrug*
-Foo 1.0 Foo.qml