diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index 28702ab3f..0a98ca773 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -1098,7 +1098,7 @@ Item {
         anchors.bottom: parent.bottom
         anchors.left: parent.left
 
-        active: root.debugModeLayouter
+        active: appletItem.debug.layouterEnabled
         sourceComponent: Debug.Tag{
             label.text: (root.isHorizontal ? appletItem.width : appletItem.height) + labeltext
             label.color: appletItem.isAutoFillApplet ? "green" : "white"
diff --git a/containment/package/contents/ui/layouts/LayoutsContainer.qml b/containment/package/contents/ui/layouts/LayoutsContainer.qml
index 1db0be2aa..5bd8e4f1c 100644
--- a/containment/package/contents/ui/layouts/LayoutsContainer.qml
+++ b/containment/package/contents/ui/layouts/LayoutsContainer.qml
@@ -423,7 +423,7 @@ Item{
     Loader{
         anchors.top: startLayout.top
         anchors.horizontalCenter: startLayout.horizontalCenter
-        active: root.debugModeLayouter
+        active: debug.layouterEnabled
 
         readonly property Item debugLayout: layouter.startLayout
 
@@ -443,7 +443,7 @@ Item{
     Loader{
         anchors.top: endLayout.top
         anchors.horizontalCenter: endLayout.horizontalCenter
-        active: root.debugModeLayouter
+        active: debug.layouterEnabled
 
         readonly property Item debugLayout: layouter.endLayout
 
@@ -463,7 +463,7 @@ Item{
     Loader{
         anchors.top: mainLayout.top
         anchors.horizontalCenter: mainLayout.horizontalCenter
-        active: root.debugModeLayouter
+        active: debug.layouterEnabled
         z:70
 
         readonly property Item debugLayout: layouter.mainLayout
@@ -484,7 +484,7 @@ Item{
     Loader{
         anchors.top: mainLayout.top
         anchors.left: parent.left
-        active: root.debugModeLayouter
+        active: debug.layouterEnabled
 
         readonly property Item debugLayout: layoutsContainer
 
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index ed918102e..086ffeebe 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -63,7 +63,6 @@ Item {
     ////BEGIN properties
     property bool debugMode: Qt.application.arguments.indexOf("--graphics")>=0
     property bool debugModeInputMask:  Qt.application.arguments.indexOf("--input")>=0
-    property bool debugModeLayouter: Qt.application.arguments.indexOf("--layouter")>=0
     property bool debugModeLocalGeometry: Qt.application.arguments.indexOf("--localgeometry")>=0
     property bool debugModeSpacers: Qt.application.arguments.indexOf("--spacers")>=0