diff --git a/tests/ui/modules/Common/Animations/CaterpillarAnimation.qml b/tests/ui/modules/Common/Animations/CaterpillarAnimation.qml
index 8a63e85b8..66e5212e4 100644
--- a/tests/ui/modules/Common/Animations/CaterpillarAnimation.qml
+++ b/tests/ui/modules/Common/Animations/CaterpillarAnimation.qml
@@ -2,7 +2,7 @@ import QtQuick 2.7
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 
 Row {
   id: container
diff --git a/tests/ui/modules/Common/Borders.qml b/tests/ui/modules/Common/Borders.qml
index c38aa1842..0c1021a40 100644
--- a/tests/ui/modules/Common/Borders.qml
+++ b/tests/ui/modules/Common/Borders.qml
@@ -1,10 +1,10 @@
 import QtQuick 2.7
 
-// ===================================================================
+// =============================================================================
 // Alternative to rectangle border which is a limited feature.
 // Allow the use of different borders (size, color...) for each
 // rectangle side.
-// ===================================================================
+// =============================================================================
 
 Rectangle {
   property var borderColor
diff --git a/tests/ui/modules/Common/Collapse.qml b/tests/ui/modules/Common/Collapse.qml
index 4a9b76da7..3ee5d9f97 100644
--- a/tests/ui/modules/Common/Collapse.qml
+++ b/tests/ui/modules/Common/Collapse.qml
@@ -10,11 +10,15 @@ import Common.Styles 1.0
 Item {
   id: collapse
 
+  // ---------------------------------------------------------------------------
+
   property alias target: targetChanges.target
   property int targetHeight
 
   property bool _collapsed: false
 
+  // ---------------------------------------------------------------------------
+
   signal collapsed (bool collapsed)
 
   // ---------------------------------------------------------------------------
diff --git a/tests/ui/modules/Common/Colors.qml b/tests/ui/modules/Common/Colors.qml
index c8253c54e..2abd11381 100644
--- a/tests/ui/modules/Common/Colors.qml
+++ b/tests/ui/modules/Common/Colors.qml
@@ -4,17 +4,10 @@ import QtQuick 2.7
 // =============================================================================
 
 QtObject {
-  property color a: 'transparent'
-
-  property color q: '#E6E6E6'
-  property color d:   '#5A585B'
-
-  // -----------------------------------------------------------------
-  // OK.
-  // -----------------------------------------------------------------
-
+  property color a:   'transparent'
   property color b:   '#5E5E5F'
   property color c:   '#CBCBCB'
+  property color d:   '#5A585B'
   property color e:   '#F3F3F3'
   property color f:   '#E8E8E8'
   property color g:   '#6B7A86'
@@ -32,6 +25,7 @@ QtObject {
   property color n:   '#C0C0C0'
   property color o:   '#232323'
   property color p:   '#E2E9EF'
+  property color q:   '#E6E6E6'
   property color r:   '#595759'
   property color s:   '#D64D00'
   property color t:   '#FF8600'
diff --git a/tests/ui/modules/Common/Constants.qml b/tests/ui/modules/Common/Constants.qml
index 465fa9d8a..6095d45c9 100644
--- a/tests/ui/modules/Common/Constants.qml
+++ b/tests/ui/modules/Common/Constants.qml
@@ -1,7 +1,7 @@
 pragma Singleton
 import QtQuick 2.7
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int zPopup: 999
diff --git a/tests/ui/modules/Common/Dialog/ConfirmDialog.qml b/tests/ui/modules/Common/Dialog/ConfirmDialog.qml
index c6801fdfb..424891f49 100644
--- a/tests/ui/modules/Common/Dialog/ConfirmDialog.qml
+++ b/tests/ui/modules/Common/Dialog/ConfirmDialog.qml
@@ -1,9 +1,9 @@
 import Common 1.0
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 // A dialog with OK/Cancel buttons.
-// ===================================================================
+// =============================================================================
 
 DialogPlus {
   buttons: [
diff --git a/tests/ui/modules/Common/Dialog/ConfirmDialog.spec.qml b/tests/ui/modules/Common/Dialog/ConfirmDialog.spec.qml
index 6f640c684..5af36ae92 100644
--- a/tests/ui/modules/Common/Dialog/ConfirmDialog.spec.qml
+++ b/tests/ui/modules/Common/Dialog/ConfirmDialog.spec.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.7
 import QtTest 1.1
 
-// ===================================================================
+// =============================================================================
 
 TestCase {
   id: testCase
@@ -16,7 +16,7 @@ TestCase {
     return container
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function test_exitStatusViaButtons_data () {
     return [
@@ -35,7 +35,7 @@ TestCase {
     compare(spy.signalArguments[0][0], data.expectedStatus)
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function test_exitStatusViaClose () {
     var container = buildConfirmDialog()
@@ -47,7 +47,7 @@ TestCase {
     compare(spy.signalArguments[0][0], 0)
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   Component {
     id: builder
diff --git a/tests/ui/modules/Common/Dialog/DialogDescription.qml b/tests/ui/modules/Common/Dialog/DialogDescription.qml
index 9d4c8ef28..63e2360cf 100644
--- a/tests/ui/modules/Common/Dialog/DialogDescription.qml
+++ b/tests/ui/modules/Common/Dialog/DialogDescription.qml
@@ -2,9 +2,9 @@ import QtQuick 2.7
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 // Description content used by dialogs.
-// ===================================================================
+// =============================================================================
 
 Item {
   property alias text: description.text
@@ -17,9 +17,12 @@ Item {
   Text {
     id: description
 
-    anchors.fill: parent
-    anchors.leftMargin: DialogStyle.leftMargin
-    anchors.rightMargin: DialogStyle.rightMargin
+    anchors {
+      fill: parent
+      leftMargin: DialogStyle.leftMargin
+      rightMargin: DialogStyle.rightMargin
+    }
+
     color: DialogStyle.description.color
     font.pointSize: DialogStyle.description.fontSize
     verticalAlignment: Text.AlignVCenter
diff --git a/tests/ui/modules/Common/Dialog/DialogPlus.qml b/tests/ui/modules/Common/Dialog/DialogPlus.qml
index f24e2a348..56bcc678c 100644
--- a/tests/ui/modules/Common/Dialog/DialogPlus.qml
+++ b/tests/ui/modules/Common/Dialog/DialogPlus.qml
@@ -4,9 +4,9 @@ import QtQuick.Window 2.2
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 // Helper to build quickly dialogs.
-// ===================================================================
+// =============================================================================
 
 Window {
   property alias buttons: buttons.data // Optionnal.
@@ -16,8 +16,12 @@ Window {
   default property alias _content: content.data // Required.
   property bool _disableExitStatus
 
+  // ---------------------------------------------------------------------------
+
   signal exitStatus (int status)
 
+  // ---------------------------------------------------------------------------
+
   // Derived class must use this function instead of close.
   // Destroy the component and send signal to caller.
   function exit (status) {
@@ -37,14 +41,12 @@ Window {
     anchors.fill: parent
     spacing: 0
 
-    // Description.
     DialogDescription {
       id: description
 
       Layout.fillWidth: true
     }
 
-    // Content.
     Item {
       id: content
 
@@ -52,7 +54,6 @@ Window {
       Layout.fillWidth: true
     }
 
-    // Buttons.
     Row {
       id: buttons
 
diff --git a/tests/ui/modules/Common/DroppableTextArea.qml b/tests/ui/modules/Common/DroppableTextArea.qml
index b25b8d2fc..c95cd93c7 100644
--- a/tests/ui/modules/Common/DroppableTextArea.qml
+++ b/tests/ui/modules/Common/DroppableTextArea.qml
@@ -4,12 +4,16 @@ import QtQuick.Dialogs 1.2
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 
 Item {
+  property alias placeholderText: textArea.placeholderText
+
+  // ---------------------------------------------------------------------------
+
   signal dropped (var files)
 
-  property alias placeholderText: textArea.placeholderText
+  // ---------------------------------------------------------------------------
 
   function _emitFiles (files) {
     // Filtering files, other urls are forbidden.
@@ -28,6 +32,8 @@ Item {
     }
   }
 
+  // ---------------------------------------------------------------------------
+
   // Text area.
   Flickable {
     ScrollBar.vertical: ForceScrollBar {
@@ -80,7 +86,7 @@ Item {
     }
   }
 
-  // Hover style.
+  // Hovered style.
   Rectangle {
     id: hoverContent
 
diff --git a/tests/ui/modules/Common/ForceScrollBar.qml b/tests/ui/modules/Common/ForceScrollBar.qml
index 26d4ef388..f9cf1d7ea 100644
--- a/tests/ui/modules/Common/ForceScrollBar.qml
+++ b/tests/ui/modules/Common/ForceScrollBar.qml
@@ -3,9 +3,9 @@ import QtQuick.Controls 2.0
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 // A simple custom vertical scrollbar.
-// ===================================================================
+// =============================================================================
 
 ScrollBar {
   id: scrollBar
diff --git a/tests/ui/modules/Common/Form/ActionBar.qml b/tests/ui/modules/Common/Form/ActionBar.qml
index d476100ab..6aa92c53c 100644
--- a/tests/ui/modules/Common/Form/ActionBar.qml
+++ b/tests/ui/modules/Common/Form/ActionBar.qml
@@ -2,9 +2,9 @@ import QtQuick 2.7
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 // Bar which can contains ActionButtons.
-// ===================================================================
+// =============================================================================
 
 Row {
   property int iconSize
diff --git a/tests/ui/modules/Common/Form/ActionButton.qml b/tests/ui/modules/Common/Form/ActionButton.qml
index aac19d8f5..59c5f4b19 100644
--- a/tests/ui/modules/Common/Form/ActionButton.qml
+++ b/tests/ui/modules/Common/Form/ActionButton.qml
@@ -3,13 +3,15 @@ import QtQuick.Controls 2.0
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 // An animated (or not) button with image(s).
-// ===================================================================
+// =============================================================================
 
 Item {
   id: wrappedButton
 
+  // ---------------------------------------------------------------------------
+
   property bool enabled: true
   property bool useStates: true
   property int iconSize // Optionnal.
@@ -19,9 +21,11 @@ Item {
   // `icon`_pressed, `icon`_hovered and `icon`_normal.
   property string icon
 
+  // ---------------------------------------------------------------------------
+
   signal clicked
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function _getIcon () {
     if (!useStates) {
@@ -39,7 +43,7 @@ Item {
     )
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   height: iconSize || parent.iconSize || parent.height
   width: iconSize || parent.iconSize || parent.height
diff --git a/tests/ui/modules/Common/Form/ActionSwitch.qml b/tests/ui/modules/Common/Form/ActionSwitch.qml
index ae2e7c4ab..9a9c19d0c 100644
--- a/tests/ui/modules/Common/Form/ActionSwitch.qml
+++ b/tests/ui/modules/Common/Form/ActionSwitch.qml
@@ -8,6 +8,8 @@ Item {
   property int iconSize // Optionnal.
   property string icon
 
+  // ---------------------------------------------------------------------------
+
   signal clicked
 
   // ---------------------------------------------------------------------------
diff --git a/tests/ui/modules/Common/Form/CheckBoxText.qml b/tests/ui/modules/Common/Form/CheckBoxText.qml
index 871e28b9d..44a9d55ae 100644
--- a/tests/ui/modules/Common/Form/CheckBoxText.qml
+++ b/tests/ui/modules/Common/Form/CheckBoxText.qml
@@ -3,9 +3,9 @@ import QtQuick.Controls 2.0
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 // Checkbox with clickable text.
-// ===================================================================
+// =============================================================================
 
 CheckBox {
   id: checkBox
diff --git a/tests/ui/modules/Common/Form/ExclusiveButtons.qml b/tests/ui/modules/Common/Form/ExclusiveButtons.qml
index c98a26ea4..c7f374ccf 100644
--- a/tests/ui/modules/Common/Form/ExclusiveButtons.qml
+++ b/tests/ui/modules/Common/Form/ExclusiveButtons.qml
@@ -7,14 +7,19 @@ import Common.Styles 1.0
 Row {
   id: item
 
-  property var texts
+  // ---------------------------------------------------------------------------
 
   property int selectedButton: 0
+  property var texts
+
+  // ---------------------------------------------------------------------------
 
   // Emitted when the selected button is changed.
   // Gives the selected button id.
   signal clicked (int button)
 
+  // ---------------------------------------------------------------------------
+
   spacing: ExclusiveButtonsStyle.buttonsSpacing
 
   Repeater {
diff --git a/tests/ui/modules/Common/Form/ExclusiveButtons.spec.qml b/tests/ui/modules/Common/Form/ExclusiveButtons.spec.qml
index ace394f50..eb5dd4fa6 100644
--- a/tests/ui/modules/Common/Form/ExclusiveButtons.spec.qml
+++ b/tests/ui/modules/Common/Form/ExclusiveButtons.spec.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.7
 import QtTest 1.1
 
-// ===================================================================
+// =============================================================================
 
 Item {
   id: root
@@ -43,7 +43,7 @@ Item {
     }
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   TestCase {
     id: testCase
diff --git a/tests/ui/modules/Common/Form/ListForm.qml b/tests/ui/modules/Common/Form/ListForm.qml
index 677db501e..f68ba8190 100644
--- a/tests/ui/modules/Common/Form/ListForm.qml
+++ b/tests/ui/modules/Common/Form/ListForm.qml
@@ -10,6 +10,8 @@ import Utils 1.0
 RowLayout {
   id: listForm
 
+  // ---------------------------------------------------------------------------
+
   property alias placeholder: placeholder.text
   property alias title: text.text
   property bool readOnly: false
@@ -18,6 +20,8 @@ RowLayout {
   property var minValues
   readonly property int count: values.count
 
+  // ---------------------------------------------------------------------------
+
   signal changed (int index, string defaultValue, string newValue)
   signal removed (int index, string value)
 
diff --git a/tests/ui/modules/Common/Form/SmallButton.qml b/tests/ui/modules/Common/Form/SmallButton.qml
index a1ce638fa..871889951 100644
--- a/tests/ui/modules/Common/Form/SmallButton.qml
+++ b/tests/ui/modules/Common/Form/SmallButton.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 2.0
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 
 Button {
   id: button
diff --git a/tests/ui/modules/Common/Form/StaticListForm.qml b/tests/ui/modules/Common/Form/StaticListForm.qml
index cf98914f8..07981fe2b 100644
--- a/tests/ui/modules/Common/Form/StaticListForm.qml
+++ b/tests/ui/modules/Common/Form/StaticListForm.qml
@@ -24,30 +24,30 @@ RowLayout {
 
   // ---------------------------------------------------------------------------
 
-	spacing: 0
+  spacing: 0
 
-	Text {
-		id: text
+  Text {
+    id: text
 
-		Layout.leftMargin: ListFormStyle.titleArea.iconSize + ListFormStyle.titleArea.spacing
-		Layout.preferredHeight: ListFormStyle.lineHeight
-		Layout.preferredWidth: ListFormStyle.titleArea.text.width
     Layout.alignment: Qt.AlignTop
+    Layout.leftMargin: ListFormStyle.titleArea.iconSize + ListFormStyle.titleArea.spacing
+    Layout.preferredHeight: ListFormStyle.lineHeight
+    Layout.preferredWidth: ListFormStyle.titleArea.text.width
 
-		color: ListFormStyle.titleArea.text.color
-		elide: Text.ElideRight
+    color: ListFormStyle.titleArea.text.color
+    elide: Text.ElideRight
 
-		font {
-			bold: true
-			pointSize: ListFormStyle.titleArea.text.fontSize
-		}
+    font {
+      bold: true
+      pointSize: ListFormStyle.titleArea.text.fontSize
+    }
 
-		verticalAlignment: Text.AlignVCenter
-	}
+    verticalAlignment: Text.AlignVCenter
+  }
 
-	ColumnLayout {
-		Layout.fillWidth: true
-		spacing: 0
+  ColumnLayout {
+    Layout.fillWidth: true
+    spacing: 0
 
     Repeater {
       model: form.fields
diff --git a/tests/ui/modules/Common/Form/TextField.qml b/tests/ui/modules/Common/Form/TextField.qml
index fef84d566..939474eba 100644
--- a/tests/ui/modules/Common/Form/TextField.qml
+++ b/tests/ui/modules/Common/Form/TextField.qml
@@ -4,9 +4,9 @@ import QtQuick.Controls 2.0 as Controls
 import Common 1.0
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 // A classic TextInput which supports an icon attribute.
-// ===================================================================
+// =============================================================================
 
 Controls.TextField {
   property alias icon: icon.icon
diff --git a/tests/ui/modules/Common/Form/TransparentComboBox.qml b/tests/ui/modules/Common/Form/TransparentComboBox.qml
index 6b771eb30..0d3ad7858 100644
--- a/tests/ui/modules/Common/Form/TransparentComboBox.qml
+++ b/tests/ui/modules/Common/Form/TransparentComboBox.qml
@@ -3,9 +3,9 @@ import QtQuick.Controls 2.0
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 // Discrete ComboBox that can be integrated in text.
-// ===================================================================
+// =============================================================================
 
 ComboBox {
   id: comboBox
diff --git a/tests/ui/modules/Common/Form/TransparentTextInput.qml b/tests/ui/modules/Common/Form/TransparentTextInput.qml
index f0ea7a82a..630d27193 100644
--- a/tests/ui/modules/Common/Form/TransparentTextInput.qml
+++ b/tests/ui/modules/Common/Form/TransparentTextInput.qml
@@ -18,6 +18,8 @@ Item {
   property bool isInvalid: false
   property int padding: TransparentTextInputStyle.padding
 
+  // ---------------------------------------------------------------------------
+
   signal editingFinished
 
   // ---------------------------------------------------------------------------
diff --git a/tests/ui/modules/Common/Image/Icon.qml b/tests/ui/modules/Common/Image/Icon.qml
index bb6743e5a..6bb0e5965 100644
--- a/tests/ui/modules/Common/Image/Icon.qml
+++ b/tests/ui/modules/Common/Image/Icon.qml
@@ -3,9 +3,9 @@ import QtQuick 2.7
 import Common 1.0
 import Utils 1.0
 
-// ===================================================================
+// =============================================================================
 // An icon image properly resized.
-// ===================================================================
+// =============================================================================
 
 Item {
   property var iconSize // Required.
diff --git a/tests/ui/modules/Common/InvertedMouseArea.qml b/tests/ui/modules/Common/InvertedMouseArea.qml
index 82b91fc87..9b9a17e17 100644
--- a/tests/ui/modules/Common/InvertedMouseArea.qml
+++ b/tests/ui/modules/Common/InvertedMouseArea.qml
@@ -3,21 +3,25 @@ import QtQuick 2.7
 import Common 1.0
 import Utils 1.0
 
-// ===================================================================
+// =============================================================================
 // Helper to handle button click outside an item.
-// ===================================================================
+// =============================================================================
 
 Item {
   id: item
 
+  // ---------------------------------------------------------------------------
+
   property bool _mouseAlwaysOutside
   property var _mouseArea: null
 
+  // ---------------------------------------------------------------------------
+
   // When emitted, returns a function to test if the click
   // is on a specific item. It takes only a item parameter.
   signal pressed (var pointIsInItem)
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function _createMouseArea () {
     var parent = Utils.getTopParent(item, true)
@@ -41,7 +45,7 @@ Item {
     }
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   // It's necessary to use a `enabled` variable.
   // See: http://doc.qt.io/qt-5/qml-qtqml-component.html#completed-signal
diff --git a/tests/ui/modules/Common/Menu/ActionMenu.qml b/tests/ui/modules/Common/Menu/ActionMenu.qml
index d394ac4f8..2c15b4991 100644
--- a/tests/ui/modules/Common/Menu/ActionMenu.qml
+++ b/tests/ui/modules/Common/Menu/ActionMenu.qml
@@ -3,9 +3,7 @@ import QtQuick.Layouts 1.3
 
 import Common.Styles 1.0
 
-// ===================================================================
-// Basic actions menu.
-// ===================================================================
+// =============================================================================
 
 ColumnLayout {
   id: menu
diff --git a/tests/ui/modules/Common/Menu/ActionMenuEntry.qml b/tests/ui/modules/Common/Menu/ActionMenuEntry.qml
index c2eebf6e8..f5b787ee9 100644
--- a/tests/ui/modules/Common/Menu/ActionMenuEntry.qml
+++ b/tests/ui/modules/Common/Menu/ActionMenuEntry.qml
@@ -2,7 +2,7 @@ import QtQuick 2.7
 
 import Common.Styles 1.0
 
-// ===================================================================
+// =============================================================================
 
 Rectangle {
   id: entry
diff --git a/tests/ui/modules/Common/Menu/Menu.qml b/tests/ui/modules/Common/Menu/Menu.qml
index 9f9bf2284..128b4f653 100644
--- a/tests/ui/modules/Common/Menu/Menu.qml
+++ b/tests/ui/modules/Common/Menu/Menu.qml
@@ -11,12 +11,16 @@ import Common.Styles 1.0
 Rectangle {
   id: menu
 
+  // ---------------------------------------------------------------------------
+
   property int entryHeight
   property int entryWidth
   property var entries
 
   property int _selectedEntry: 0
 
+  // ---------------------------------------------------------------------------
+
   signal entrySelected (int entry)
 
   // ---------------------------------------------------------------------------
diff --git a/tests/ui/modules/Common/Paned.qml b/tests/ui/modules/Common/Paned.qml
index 4946cf704..25cc19863 100644
--- a/tests/ui/modules/Common/Paned.qml
+++ b/tests/ui/modules/Common/Paned.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 import Common.Styles 1.0
 import Utils 1.0
 
-// ===================================================================
+// =============================================================================
 //
 // Paned is one container divided in two areas.
 // The division between the areas can be modified with a handle.
@@ -19,11 +19,13 @@ import Utils 1.0
 // `minimumLeftLimit: '66%'`.
 // The percentage is relative to the container width.
 //
-// ===================================================================
+// =============================================================================
 
 Item {
   id: container
 
+  // ---------------------------------------------------------------------------
+
   property alias childA: contentA.data
   property alias childB: contentB.data
   property bool defaultClosed: false
@@ -46,9 +48,9 @@ Item {
   property var _minimumLeftLimit
   property var _minimumRightLimit
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
   // Public functions.
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function isClosed () {
     return _isClosed
@@ -66,9 +68,9 @@ Item {
     }
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
   // Private functions.
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function _getLimitValue (limit) {
     if (limit == null) {
@@ -135,7 +137,7 @@ Item {
     }
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function _applyLimitsOnUserMove (offset) {
     var minimumRightLimit = _getLimitValue(_minimumRightLimit)
@@ -200,7 +202,7 @@ Item {
     }
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function _open () {
     _isClosed = false
@@ -230,7 +232,7 @@ Item {
     ) || closingEdge !== edge
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   onWidthChanged: _applyLimits()
 
diff --git a/tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml b/tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml
index c9ed7edd3..ffdcae0be 100644
--- a/tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml
+++ b/tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml
@@ -11,6 +11,8 @@ import Utils 1.0
 Item {
   id: menu
 
+  // ---------------------------------------------------------------------------
+
   // Optionnal parameter, if defined and if a click is detected
   // on it, menu is not closed.
   property var launcher
@@ -24,6 +26,8 @@ Item {
   default property alias _content: content.data
   property bool _isOpen: false
 
+  // ---------------------------------------------------------------------------
+
   signal menuClosed
   signal menuOpened
 
diff --git a/tests/ui/modules/Common/Popup/DesktopPopup.qml b/tests/ui/modules/Common/Popup/DesktopPopup.qml
index 9426051ca..e1f92cd7d 100644
--- a/tests/ui/modules/Common/Popup/DesktopPopup.qml
+++ b/tests/ui/modules/Common/Popup/DesktopPopup.qml
@@ -8,6 +8,8 @@ import Common.Styles 1.0
 Item {
   id: wrapper
 
+  // ---------------------------------------------------------------------------
+
   property alias popupX: popup.x
   property alias popupY: popup.y
 
@@ -19,6 +21,8 @@ Item {
   default property alias _content: content.data
   property bool _isOpen: false
 
+  // ---------------------------------------------------------------------------
+
   function show () {
     _isOpen = true
   }
diff --git a/tests/ui/modules/Common/SearchBox.qml b/tests/ui/modules/Common/SearchBox.qml
index 38ea4a744..ddd4d54bc 100644
--- a/tests/ui/modules/Common/SearchBox.qml
+++ b/tests/ui/modules/Common/SearchBox.qml
@@ -12,6 +12,8 @@ import Utils 1.0
 Item {
   id: searchBox
 
+  // ---------------------------------------------------------------------------
+
   readonly property alias filter: searchField.text
 
   property alias delegate: list.delegate
@@ -26,6 +28,8 @@ Item {
 
   property bool _isOpen: false
 
+  // ---------------------------------------------------------------------------
+
   signal menuClosed
   signal menuOpened
 
diff --git a/tests/ui/modules/Common/SmartConnect.qml b/tests/ui/modules/Common/SmartConnect.qml
index 6869c9b33..94d4bab5a 100644
--- a/tests/ui/modules/Common/SmartConnect.qml
+++ b/tests/ui/modules/Common/SmartConnect.qml
@@ -2,7 +2,7 @@ import QtQuick 2.7
 
 import Utils 1.0
 
-// ===================================================================
+// =============================================================================
 
 Item {
   property bool _connected: false
diff --git a/tests/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml b/tests/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml
index c61079c2e..dfa85b9dc 100644
--- a/tests/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml
+++ b/tests/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int nSpheres: 3
diff --git a/tests/ui/modules/Common/Styles/CollapseStyle.qml b/tests/ui/modules/Common/Styles/CollapseStyle.qml
index 0c1193486..4ba3925d4 100644
--- a/tests/ui/modules/Common/Styles/CollapseStyle.qml
+++ b/tests/ui/modules/Common/Styles/CollapseStyle.qml
@@ -1,7 +1,7 @@
 pragma Singleton
 import QtQuick 2.7
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int animationDuration: 200
diff --git a/tests/ui/modules/Common/Styles/DialogStyle.qml b/tests/ui/modules/Common/Styles/DialogStyle.qml
index 68f563bf7..1ddfa09a2 100644
--- a/tests/ui/modules/Common/Styles/DialogStyle.qml
+++ b/tests/ui/modules/Common/Styles/DialogStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int leftMargin: 50
diff --git a/tests/ui/modules/Common/Styles/DroppableTextAreaStyle.qml b/tests/ui/modules/Common/Styles/DroppableTextAreaStyle.qml
index efd3d3ae0..64303beb0 100644
--- a/tests/ui/modules/Common/Styles/DroppableTextAreaStyle.qml
+++ b/tests/ui/modules/Common/Styles/DroppableTextAreaStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property color backgroundColor: Colors.k
diff --git a/tests/ui/modules/Common/Styles/ForceScrollBarStyle.qml b/tests/ui/modules/Common/Styles/ForceScrollBarStyle.qml
index e765eefa2..50d46533a 100644
--- a/tests/ui/modules/Common/Styles/ForceScrollBarStyle.qml
+++ b/tests/ui/modules/Common/Styles/ForceScrollBarStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property color backgroundColor: Colors.g20
diff --git a/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml b/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml
index 0c791c575..7b5337a52 100644
--- a/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml
@@ -1,7 +1,7 @@
 pragma Singleton
 import QtQuick 2.7
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property QtObject background: QtObject {
diff --git a/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml b/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml
index b0a2f3b80..1be8c1d01 100644
--- a/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml
@@ -1,7 +1,7 @@
 pragma Singleton
 import QtQuick 2.7
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int spacing: 8
diff --git a/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
index f90a546b3..603143711 100644
--- a/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int radius: 3
diff --git a/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml b/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml
index 40023d462..0561bc6ca 100644
--- a/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int buttonsSpacing: 8
diff --git a/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml b/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml
index 26482e672..5801b06a4 100644
--- a/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/ListFormStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int lineHeight: 35
diff --git a/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml b/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml
index e6a5d3803..b5e99c40c 100644
--- a/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int leftPadding: 5
diff --git a/tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml b/tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml
index c09330dd6..3eb3134db 100644
--- a/tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property QtObject background: QtObject {
diff --git a/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml b/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml
index c591f1cd7..ee80396cd 100644
--- a/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property QtObject item: QtObject {
diff --git a/tests/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml b/tests/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
index efc6ea74a..401626bc7 100644
--- a/tests/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property color backgroundColor: Colors.q
diff --git a/tests/ui/modules/Common/Styles/Menu/ActionMenuStyle.qml b/tests/ui/modules/Common/Styles/Menu/ActionMenuStyle.qml
index 35a9ffac6..a2dd626ac 100644
--- a/tests/ui/modules/Common/Styles/Menu/ActionMenuStyle.qml
+++ b/tests/ui/modules/Common/Styles/Menu/ActionMenuStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int spacing: 1
diff --git a/tests/ui/modules/Common/Styles/Menu/MenuStyle.qml b/tests/ui/modules/Common/Styles/Menu/MenuStyle.qml
index b589d20ca..2d228979d 100644
--- a/tests/ui/modules/Common/Styles/Menu/MenuStyle.qml
+++ b/tests/ui/modules/Common/Styles/Menu/MenuStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int spacing: 1
diff --git a/tests/ui/modules/Common/Styles/PanedStyle.qml b/tests/ui/modules/Common/Styles/PanedStyle.qml
index 7fa990fda..21af8f76c 100644
--- a/tests/ui/modules/Common/Styles/PanedStyle.qml
+++ b/tests/ui/modules/Common/Styles/PanedStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property int transitionDuration: 200
diff --git a/tests/ui/modules/Common/Styles/PopupStyle.qml b/tests/ui/modules/Common/Styles/PopupStyle.qml
index ba28fe528..52b983e45 100644
--- a/tests/ui/modules/Common/Styles/PopupStyle.qml
+++ b/tests/ui/modules/Common/Styles/PopupStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property color backgroundColor: Colors.k
diff --git a/tests/ui/modules/Common/Styles/SearchBoxStyle.qml b/tests/ui/modules/Common/Styles/SearchBoxStyle.qml
index 93aac9832..344beae14 100644
--- a/tests/ui/modules/Common/Styles/SearchBoxStyle.qml
+++ b/tests/ui/modules/Common/Styles/SearchBoxStyle.qml
@@ -3,7 +3,7 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
   property color shadowColor: Colors.l
diff --git a/tests/ui/modules/Common/Styles/TooltipStyle.qml b/tests/ui/modules/Common/Styles/TooltipStyle.qml
index 3748bfe99..a1b690ceb 100644
--- a/tests/ui/modules/Common/Styles/TooltipStyle.qml
+++ b/tests/ui/modules/Common/Styles/TooltipStyle.qml
@@ -3,11 +3,11 @@ import QtQuick 2.7
 
 import Common 1.0
 
-// ===================================================================
+// =============================================================================
 
 QtObject {
-  property color backgroundColor: '#6B7A86'
-  property color color: '#FFFFFF'
+  property color backgroundColor: Colors.g
+  property color color: Colors.k
   property int arrowSize: 8
   property int delay: 500
   property int fontSize: 9
diff --git a/tests/ui/modules/Common/Styles/qmldir b/tests/ui/modules/Common/Styles/qmldir
index 068db0c23..3c083574d 100644
--- a/tests/ui/modules/Common/Styles/qmldir
+++ b/tests/ui/modules/Common/Styles/qmldir
@@ -2,7 +2,7 @@
 
 module Common.Styles
 
-# Components styles --------------------------------------------------
+# Components styles ------------------------------------------------------------
 
 singleton CaterpillarAnimationStyle 1.0 Animations/CaterpillarAnimationStyle.qml
 
diff --git a/tests/ui/modules/Common/Tooltip/Tooltip.qml b/tests/ui/modules/Common/Tooltip/Tooltip.qml
index 21a42ae55..b6768c4bf 100644
--- a/tests/ui/modules/Common/Tooltip/Tooltip.qml
+++ b/tests/ui/modules/Common/Tooltip/Tooltip.qml
@@ -5,14 +5,14 @@ import Common 1.0
 import Common.Styles 1.0
 import Utils 1.0
 
-// ===================================================================
+// =============================================================================
 
 ToolTip {
   id: tooltip
 
   property string _edge: 'left'
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   function _getArrowHeightMargin () {
     Utils.assert(
@@ -75,7 +75,7 @@ ToolTip {
     }
   }
 
-  // -----------------------------------------------------------------
+  // ---------------------------------------------------------------------------
 
   background: Item {
     id: container
diff --git a/tests/ui/modules/Common/Tooltip/TooltipArea.qml b/tests/ui/modules/Common/Tooltip/TooltipArea.qml
index 1257ef216..9cfa8b3b3 100644
--- a/tests/ui/modules/Common/Tooltip/TooltipArea.qml
+++ b/tests/ui/modules/Common/Tooltip/TooltipArea.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.7
 
-// ===================================================================
+// =============================================================================
 
 MouseArea {
   property alias text: tooltip.text