diff --git a/wallpapers/color/contents/ui/config.qml b/wallpapers/color/contents/ui/config.qml
index 6a7eaa605..44c3d7125 100644
--- a/wallpapers/color/contents/ui/config.qml
+++ b/wallpapers/color/contents/ui/config.qml
@@ -1,44 +1,35 @@
 /*
  *  Copyright 2013 Marco Martin <mart@kde.org>
  *  Copyright 2014 Kai Uwe Broulik <kde@privat.broulik.de>
  *
  *  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, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  2.010-1301, USA.
  */
 
 import QtQuick 2.0
-import QtQuick.Controls 1.0 as QtControls
 import org.kde.kquickcontrols 2.0 as KQuickControls
-//We need units from it
-import org.kde.plasma.core 2.0 as Plasmacore
+import org.kde.kirigami 2.5 as Kirigami
 
-Column {
+Kirigami.FormLayout {
     id: root
-    property alias cfg_Color: colorButton.color
+    twinFormLayouts: parentLayout
 
-    Row {
-        spacing: units.largeSpacing / 2
+    property alias cfg_Color: colorButton.color
 
-        QtControls.Label {
-            width: formAlignment - units.largeSpacing
-            anchors.verticalCenter: colorButton.verticalCenter
-            horizontalAlignment: Text.AlignRight
-            text: i18nd("plasma_wallpaper_org.kde.color", "Color:")
-        }
-        KQuickControls.ColorButton {
-            id: colorButton
-            dialogTitle: i18nd("plasma_wallpaper_org.kde.color", "Select Background Color")
-        }
+    KQuickControls.ColorButton {
+        id: colorButton
+        Kirigami.FormData.label: i18nd("plasma_wallpaper_org.kde.color", "Color:")
+        dialogTitle: i18nd("plasma_wallpaper_org.kde.color", "Select Background Color")
     }
 }