diff --git a/src/MainApplicationWindow.qml b/src/MainApplicationWindow.qml
index d92f9972bf661f920692c740a28948242a188f2d..9d89dd46f9eba1d2dfc8ba6cc3f1e6503b0cf386 100644
--- a/src/MainApplicationWindow.qml
+++ b/src/MainApplicationWindow.qml
@@ -26,6 +26,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/commoncomponents/AccountMigrationDialog.qml b/src/commoncomponents/AccountMigrationDialog.qml
index 8ef5fd979b93b8b57d444c4f4f563f7512936e4e..536257de19dafd0a5befc662279cf28fec3c2317 100644
--- a/src/commoncomponents/AccountMigrationDialog.qml
+++ b/src/commoncomponents/AccountMigrationDialog.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/BaseContextMenu.qml b/src/commoncomponents/BaseContextMenu.qml
index c0f59b2961102d79953dc2f9e3f8e6cff9ebde23..da0b96397b3f6d3030833169b4a2b94ce10ee4ad 100644
--- a/src/commoncomponents/BaseContextMenu.qml
+++ b/src/commoncomponents/BaseContextMenu.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
Menu {
diff --git a/src/commoncomponents/DaemonReconnectPopup.qml b/src/commoncomponents/DaemonReconnectPopup.qml
index 631f9318abeb0068a0e5671790c77cdda49af70b..9520e3a211ff4a6fede84d6ec656209eca26c8bb 100644
--- a/src/commoncomponents/DaemonReconnectPopup.qml
+++ b/src/commoncomponents/DaemonReconnectPopup.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/DeleteAccountDialog.qml b/src/commoncomponents/DeleteAccountDialog.qml
index ba3a9608b1573a7b5dbd5d2f5633fdbd8f5883f9..41093d42dfa44854088d3e934869439d05d11873 100644
--- a/src/commoncomponents/DeleteAccountDialog.qml
+++ b/src/commoncomponents/DeleteAccountDialog.qml
@@ -19,7 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/ElidedTextLabel.qml b/src/commoncomponents/ElidedTextLabel.qml
index 3d334b501ea0ce58d345ba5fbc80e7c2daccba04..44e6b2dd1da21cda8bf1c60c554d7152b969052e 100644
--- a/src/commoncomponents/ElidedTextLabel.qml
+++ b/src/commoncomponents/ElidedTextLabel.qml
@@ -17,7 +17,8 @@
*/
import QtQuick 2.14
-import QtQuick.Controls 1.4
+import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
Label {
diff --git a/src/commoncomponents/GeneralMenuItem.qml b/src/commoncomponents/GeneralMenuItem.qml
index d87a6b38c3f8ff1e489aecd677a1e0a79868ac0d..57701221410354049d6abe6b6760318c5b83ff8b 100644
--- a/src/commoncomponents/GeneralMenuItem.qml
+++ b/src/commoncomponents/GeneralMenuItem.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
// General menu item.
diff --git a/src/commoncomponents/GeneralMenuSeparator.qml b/src/commoncomponents/GeneralMenuSeparator.qml
index f719a2d5a6e76e954b588fda1b548597e4cc3c7d..6ccac22e0840686b8b84c90937aa3c8eb26f76ea 100644
--- a/src/commoncomponents/GeneralMenuSeparator.qml
+++ b/src/commoncomponents/GeneralMenuSeparator.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
MenuSeparator {
diff --git a/src/commoncomponents/InfoLineEdit.qml b/src/commoncomponents/InfoLineEdit.qml
index 7521393131a32b664dfd82dd018a37c526b6e5a6..07b16f68ea8a0622f6542450e67a8c35d6fdd388 100644
--- a/src/commoncomponents/InfoLineEdit.qml
+++ b/src/commoncomponents/InfoLineEdit.qml
@@ -1,7 +1,25 @@
+/*
+ * Copyright (C) 2019-2020 by Savoir-faire Linux
+ * Author: Yang Wang <yang.wang@savoirfairelinux.com>
+ *
+ * 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 3 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/>.
+ */
+
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
TextField{
diff --git a/src/commoncomponents/JamiFileDialog.qml b/src/commoncomponents/JamiFileDialog.qml
index 0ba09a6bddd38af18947c1a92d75698433d924c1..491d1a71de442ba4e85ed0ea883e60006f0f75ab 100644
--- a/src/commoncomponents/JamiFileDialog.qml
+++ b/src/commoncomponents/JamiFileDialog.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import Qt.labs.platform 1.1
+
import net.jami.Constants 1.0
FileDialog {
diff --git a/src/commoncomponents/ListViewJami.qml b/src/commoncomponents/ListViewJami.qml
index be6e24aabf2e4afb4f93b60bc991e2da9e8556ec..926555ad3f3943c2d11fe41ff9643a2fd1dbfcda 100644
--- a/src/commoncomponents/ListViewJami.qml
+++ b/src/commoncomponents/ListViewJami.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
Rectangle {
diff --git a/src/commoncomponents/LookupStatusLabel.qml b/src/commoncomponents/LookupStatusLabel.qml
index e44a7f83cb8cdf4ca337588e92e9877abce32f62..5cc64d2135f5bc22418f0fefd04f3b1c22e466f7 100644
--- a/src/commoncomponents/LookupStatusLabel.qml
+++ b/src/commoncomponents/LookupStatusLabel.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
Label {
diff --git a/src/commoncomponents/MaterialButton.qml b/src/commoncomponents/MaterialButton.qml
index 08dda04031ce30a98b1e2087277a415f09478860..1e61e370ab506f57529dff627c2f573be59f4a35 100644
--- a/src/commoncomponents/MaterialButton.qml
+++ b/src/commoncomponents/MaterialButton.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import QtQuick.Window 2.14
+
import net.jami.Constants 1.0
Button {
diff --git a/src/commoncomponents/MaterialLineEdit.qml b/src/commoncomponents/MaterialLineEdit.qml
index 31323dfab4c72f06bad46d709b38e57bbf61a712..5cf627ee71ef24d428ee46fe7c8cd36e92637325 100644
--- a/src/commoncomponents/MaterialLineEdit.qml
+++ b/src/commoncomponents/MaterialLineEdit.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
TextField {
diff --git a/src/commoncomponents/ModalPopup.qml b/src/commoncomponents/ModalPopup.qml
index 7534204a866388d62943e2501ec57e1465a64208..95a3ae48d9d8dbddf955fdd70f1fbf2c9ca32ccb 100644
--- a/src/commoncomponents/ModalPopup.qml
+++ b/src/commoncomponents/ModalPopup.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
Popup {
diff --git a/src/commoncomponents/PasswordDialog.qml b/src/commoncomponents/PasswordDialog.qml
index ccb56719d170fc973f7efe7a48db6bbc29949540..082f2684efa64bf6fad2f25b0e9b2fb264b87a3a 100644
--- a/src/commoncomponents/PasswordDialog.qml
+++ b/src/commoncomponents/PasswordDialog.qml
@@ -19,7 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml
index 35876c31d2dcabe07365320d86d5cedc40e7fbe2..69b0b504a17541af7ff46663bee646a3f7bc0022 100644
--- a/src/commoncomponents/PhotoboothView.qml
+++ b/src/commoncomponents/PhotoboothView.qml
@@ -1,9 +1,27 @@
+/*
+ * Copyright (C) 2020 by Savoir-faire Linux
+ * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
+ *
+ * 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 3 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 <https://www.gnu.org/licenses/>.
+ */
+
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/PreferenceItemDelegate.qml b/src/commoncomponents/PreferenceItemDelegate.qml
index 0a18830f8970a6bc9e4ef137f9df0147562d8105..752d885bcf535b04c102e66ee1d5ee045237f7ce 100644
--- a/src/commoncomponents/PreferenceItemDelegate.qml
+++ b/src/commoncomponents/PreferenceItemDelegate.qml
@@ -21,9 +21,9 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import QtQuick.Dialogs 1.3
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/PresenceIndicator.qml b/src/commoncomponents/PresenceIndicator.qml
index d3e95c935a52deca0cffcb40cb62598bbb5d051d..d7baf7692d0b1031c30af8c93504df544c57ff66 100644
--- a/src/commoncomponents/PresenceIndicator.qml
+++ b/src/commoncomponents/PresenceIndicator.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/PushButton.qml b/src/commoncomponents/PushButton.qml
index a75f5a71addd3a0c0fa809d42686f5a2f936c8ba..314d5df1b4c53b89e56f60e0827bff6e80564a00 100644
--- a/src/commoncomponents/PushButton.qml
+++ b/src/commoncomponents/PushButton.qml
@@ -20,6 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
//
diff --git a/src/commoncomponents/SettingParaCombobox.qml b/src/commoncomponents/SettingParaCombobox.qml
index 9e821e1d761db8526b3b57f1e58000141aea02e7..157e6d71450cecea97b570e5ae53886e8224924c 100644
--- a/src/commoncomponents/SettingParaCombobox.qml
+++ b/src/commoncomponents/SettingParaCombobox.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+import QtQml 2.14
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/SimpleMessageDialog.qml b/src/commoncomponents/SimpleMessageDialog.qml
index ca3857d30f16aa2f0c4696802567c897dc4f1bce..f1c904beb752efcf0e4f1836d90ad5df22e10470 100644
--- a/src/commoncomponents/SimpleMessageDialog.qml
+++ b/src/commoncomponents/SimpleMessageDialog.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/SpinnerButton.qml b/src/commoncomponents/SpinnerButton.qml
index a6a6cb299d9c038c169ca041baa45e3b4264092d..05c7737fd0c7422afb58d375dce750bdd526f282 100644
--- a/src/commoncomponents/SpinnerButton.qml
+++ b/src/commoncomponents/SpinnerButton.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
MaterialButton {
diff --git a/src/commoncomponents/UsernameLineEdit.qml b/src/commoncomponents/UsernameLineEdit.qml
index 6b0aeaa4f21e68438e2ec032448ad10c3f8aa911..c454af954fcfb5f67e9971c4612071c51a628142 100644
--- a/src/commoncomponents/UsernameLineEdit.qml
+++ b/src/commoncomponents/UsernameLineEdit.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
MaterialLineEdit {
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index e08372c31345ceae7aab57faf9a82e390fd1ef65..00ae1aa97c9b4af9d9c5483b5fe59145df4a613e 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -20,6 +20,7 @@
pragma Singleton
import QtQuick 2.14
+
import net.jami.Helpers 1.0
Item {
diff --git a/src/constant/JamiTheme.qml b/src/constant/JamiTheme.qml
index 5bc49f020ef5d52580a4cef13ee47f479c884b41..5552d29b422871d583dd246cdcb66ef1c2712ddc 100644
--- a/src/constant/JamiTheme.qml
+++ b/src/constant/JamiTheme.qml
@@ -19,11 +19,11 @@
// JamiTheme as a singleton is to provide global theme property entry.
pragma Singleton
+import QtQuick 2.14
+
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
-import QtQuick 2.14
-
Item {
property bool darkTheme: SettingsAdapter.getAppValue(Settings.EnableDarkTheme)
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 35857a6f37efb3208768a12d77f20df5fa6cb356..960c22a6eb4c4ade6ce9956752ccfd1408393c3b 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/AboutPopUp.qml b/src/mainview/components/AboutPopUp.qml
index 8b684d6b664bd1749bf938d0f97ed20a94a4ed52..0919791f4165ad7a845c1a23b82e5ec92713ddbc 100644
--- a/src/mainview/components/AboutPopUp.qml
+++ b/src/mainview/components/AboutPopUp.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/AccountComboBox.qml b/src/mainview/components/AccountComboBox.qml
index 09994b88e0c5c4c9548f8a5484d83c84687a7486..499f0f8597f79653280a06e021baca77071671cc 100644
--- a/src/mainview/components/AccountComboBox.qml
+++ b/src/mainview/components/AccountComboBox.qml
@@ -21,6 +21,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/AccountComboBoxPopup.qml b/src/mainview/components/AccountComboBoxPopup.qml
index 31c3d080a5f9ed4e051aebb61bdf40e260740b52..a100ba42bfcbdc6f8338d36b0ab489b10d7a4c1a 100644
--- a/src/mainview/components/AccountComboBoxPopup.qml
+++ b/src/mainview/components/AccountComboBoxPopup.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/AudioCallPage.qml b/src/mainview/components/AudioCallPage.qml
index 0005a1fe68fd6c85624357954ddc61cefff6658b..b9fcbad00cb31a546da0d3a055cf5b6ab7c72f47 100644
--- a/src/mainview/components/AudioCallPage.qml
+++ b/src/mainview/components/AudioCallPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml
index fd0e9d7c08a7377b60ed7f2fa1cc9efc1578f5c1..aca0ae87867f81f84b768b822df52644cbda2392 100644
--- a/src/mainview/components/CallOverlay.qml
+++ b/src/mainview/components/CallOverlay.qml
@@ -23,6 +23,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtQml 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/CallOverlayButtonGroup.qml b/src/mainview/components/CallOverlayButtonGroup.qml
index 583d0cf2115ac0ed86aea562a0b5294c1baa9ca4..3445539222d74ae83cb8c9268bd8a46978dd4c38 100644
--- a/src/mainview/components/CallOverlayButtonGroup.qml
+++ b/src/mainview/components/CallOverlayButtonGroup.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtQml 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/CallStackView.qml b/src/mainview/components/CallStackView.qml
index 265948fd1508d57283e7765982ce95e924393ba2..ac48bc7371517d382e0eca50010fa7a886009b46 100644
--- a/src/mainview/components/CallStackView.qml
+++ b/src/mainview/components/CallStackView.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
diff --git a/src/mainview/components/CallViewContextMenu.qml b/src/mainview/components/CallViewContextMenu.qml
index 012fc9aad7b485edf2dbbe576513dd0cafc1fa66..408deb0f349eabe09e48991d0fa5b44dba2d5b62 100644
--- a/src/mainview/components/CallViewContextMenu.qml
+++ b/src/mainview/components/CallViewContextMenu.qml
@@ -21,6 +21,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ContactPicker.qml b/src/mainview/components/ContactPicker.qml
index 4419a43f3dc06110a8cc0bc5b978a912a2bcfd76..9bf98af6c03eb23eae7dfa2d1562040382f18cde 100644
--- a/src/mainview/components/ContactPicker.qml
+++ b/src/mainview/components/ContactPicker.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ContactPickerItemDelegate.qml b/src/mainview/components/ContactPickerItemDelegate.qml
index 2dae40ee4b402adf215fb700f909a6f378323518..bd3aa2379d2eb56dcf166d975d04e8c310890aed 100644
--- a/src/mainview/components/ContactPickerItemDelegate.qml
+++ b/src/mainview/components/ContactPickerItemDelegate.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ContactSearchBar.qml b/src/mainview/components/ContactSearchBar.qml
index 359a38dd4a890842f678e3420c030a1c2f753801..96aba47236d734256e8b7c190490effedafbfed8 100644
--- a/src/mainview/components/ContactSearchBar.qml
+++ b/src/mainview/components/ContactSearchBar.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ConversationSmartListContextMenu.qml b/src/mainview/components/ConversationSmartListContextMenu.qml
index 9f600940ce398e41d032c04fda05767af5d4243a..3a50fe36f25f4469d3f9777be15a375baa2c0700 100644
--- a/src/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/mainview/components/ConversationSmartListContextMenu.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ConversationSmartListView.qml b/src/mainview/components/ConversationSmartListView.qml
index 4256c330de935e07eda4345605c7a439313a110f..7fe91f767e9b570ce0b46c6b23a20a3435fd103d 100644
--- a/src/mainview/components/ConversationSmartListView.qml
+++ b/src/mainview/components/ConversationSmartListView.qml
@@ -20,6 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
diff --git a/src/mainview/components/ConversationSmartListViewItemDelegate.qml b/src/mainview/components/ConversationSmartListViewItemDelegate.qml
index a5c349b88f16b4b453b1a67e68ada398928d5c26..a7a4bc1640c9b0dfc77399ef480acef77475929a 100644
--- a/src/mainview/components/ConversationSmartListViewItemDelegate.qml
+++ b/src/mainview/components/ConversationSmartListViewItemDelegate.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/IncomingCallPage.qml b/src/mainview/components/IncomingCallPage.qml
index dfc4b95c71e829ea2651283ca890d4767034adb4..5efb73088a543d43a2d2790f3b4fc75bc8fba159 100644
--- a/src/mainview/components/IncomingCallPage.qml
+++ b/src/mainview/components/IncomingCallPage.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/MessageWebView.qml b/src/mainview/components/MessageWebView.qml
index e55d28533f4f9cd52774f6b16ccb43406ffd3cc8..bf8a33eb9c279b5fcadfc4540ba609e034058cc8 100644
--- a/src/mainview/components/MessageWebView.qml
+++ b/src/mainview/components/MessageWebView.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtWebEngine 1.10
import QtWebChannel 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/MessageWebViewHeader.qml b/src/mainview/components/MessageWebViewHeader.qml
index 282bbe9437a42156bbd1cb752c77ea67e55866fd..d6192c80eddbb51a58f20918e7817ebd10eaf674 100644
--- a/src/mainview/components/MessageWebViewHeader.qml
+++ b/src/mainview/components/MessageWebViewHeader.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
import net.jami.Adapters 1.0
diff --git a/src/mainview/components/OutgoingCallPage.qml b/src/mainview/components/OutgoingCallPage.qml
index d418f81afbd0517f39b37335571c81df0b8c2448..72023a0dc3d4a1ec043662ab93576d76d7b53300 100644
--- a/src/mainview/components/OutgoingCallPage.qml
+++ b/src/mainview/components/OutgoingCallPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ParticipantOverlay.qml b/src/mainview/components/ParticipantOverlay.qml
index 922c6214f2011491a350381d7a009745e3fee3c3..d74c9dd3aa06ecedb9ed1a06f9e0e117dea2499d 100644
--- a/src/mainview/components/ParticipantOverlay.qml
+++ b/src/mainview/components/ParticipantOverlay.qml
@@ -23,6 +23,7 @@ import QtQuick.Layouts 1.14
import QtQuick.Shapes 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ParticipantOverlayMenu.qml b/src/mainview/components/ParticipantOverlayMenu.qml
index 7d11c32ff14f79802d39a7d9422dda0c3ab5e3bb..78249d5fe409c873fdb140e45c71cbe711dab785 100644
--- a/src/mainview/components/ParticipantOverlayMenu.qml
+++ b/src/mainview/components/ParticipantOverlayMenu.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import QtQuick.Layouts 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/PluginHandlerItemDelegate.qml b/src/mainview/components/PluginHandlerItemDelegate.qml
index 82d6a486aa87a004e4286fd4f5c7fe3b1c4c2914..19bdf469c2aa10172b8bec0e8dc0e867ecde158d 100644
--- a/src/mainview/components/PluginHandlerItemDelegate.qml
+++ b/src/mainview/components/PluginHandlerItemDelegate.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/PluginHandlerPicker.qml b/src/mainview/components/PluginHandlerPicker.qml
index d553de6d69071ac5af38ebd697008d151a78c989..8ea38e208c993a0ae53d6a5ef911cb63d0d5c9ec 100644
--- a/src/mainview/components/PluginHandlerPicker.qml
+++ b/src/mainview/components/PluginHandlerPicker.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ProjectCreditsScrollView.qml b/src/mainview/components/ProjectCreditsScrollView.qml
index 99bfcea9978c0735430170bffa6b928e1d8e3cef..2d53614b622dc2c8b5025eaf791439e7a0db85d2 100644
--- a/src/mainview/components/ProjectCreditsScrollView.qml
+++ b/src/mainview/components/ProjectCreditsScrollView.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/RecordBox.qml b/src/mainview/components/RecordBox.qml
index 3c5cddb25fa20a67bf0cf6301f65a215185ff8d8..f9412e69370862cefcc8902de61b61776a13366b 100644
--- a/src/mainview/components/RecordBox.qml
+++ b/src/mainview/components/RecordBox.qml
@@ -19,9 +19,9 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.14
import QtQuick.Shapes 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ScreenRubberBand.qml b/src/mainview/components/ScreenRubberBand.qml
index 04704f9afbf9ac638fdbbeb573b07e20ba42369b..a20ec53b0a0d03b0d4593037089c621d6e00d391 100644
--- a/src/mainview/components/ScreenRubberBand.qml
+++ b/src/mainview/components/ScreenRubberBand.qml
@@ -21,6 +21,7 @@ import QtQuick.Window 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/SelectScreen.qml b/src/mainview/components/SelectScreen.qml
index 4c5c1001139536b7b2b5640f33e5b61f7e812732..dcb262f46632587207028a580358b1ca00384933 100644
--- a/src/mainview/components/SelectScreen.qml
+++ b/src/mainview/components/SelectScreen.qml
@@ -21,6 +21,7 @@ import QtQuick.Window 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml
index 7ccf9f0fba79b502a31bdd0ca1eb244b4a66fe55..9686a761df9b3916c5baf243ddde53a2284ba245 100644
--- a/src/mainview/components/SidePanel.qml
+++ b/src/mainview/components/SidePanel.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml
index dca27459ecec117f132716057795aa20bef90e7c..980efbf61ab2aa2aa8e8efe2eebe09a559aee925 100644
--- a/src/mainview/components/SidePanelTabBar.qml
+++ b/src/mainview/components/SidePanelTabBar.qml
@@ -21,6 +21,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/SipInputPanel.qml b/src/mainview/components/SipInputPanel.qml
index 20b2c1a306d36e37adf28a852fbc1d8395cb6726..b319b03047f78ef81ed1300ed90f829eaa980a76 100644
--- a/src/mainview/components/SipInputPanel.qml
+++ b/src/mainview/components/SipInputPanel.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/UserInfoCallPage.qml b/src/mainview/components/UserInfoCallPage.qml
index 8cd9cebf50b1f3eda62d4e56fe3456108966676c..133d8a0d7a7928b9438a3a28aa0651689f1a9e22 100644
--- a/src/mainview/components/UserInfoCallPage.qml
+++ b/src/mainview/components/UserInfoCallPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/UserProfile.qml b/src/mainview/components/UserProfile.qml
index 33aed722d329cb67277b8f8518a183493200d758..ac0690dccf406b626e05ea2b7a5aedde989e0bd6 100644
--- a/src/mainview/components/UserProfile.qml
+++ b/src/mainview/components/UserProfile.qml
@@ -20,6 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/VideoCallFullScreenWindowContainer.qml b/src/mainview/components/VideoCallFullScreenWindowContainer.qml
index 2c76179fefb9ba458c8208677f7d80467ae392b3..cae72835e7ef5c2441e8398387362ad78308bd61 100644
--- a/src/mainview/components/VideoCallFullScreenWindowContainer.qml
+++ b/src/mainview/components/VideoCallFullScreenWindowContainer.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Window 2.14
+
import net.jami.Models 1.0
Window {
diff --git a/src/mainview/components/VideoCallPage.qml b/src/mainview/components/VideoCallPage.qml
index e2e61062d8c9a0ed26399ea334140e22a44b7867..f600f18faefedcfcf446afd552a160c61bf2c8f3 100644
--- a/src/mainview/components/VideoCallPage.qml
+++ b/src/mainview/components/VideoCallPage.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml b/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
index 4b13a43035305f4efba023d7ca4964163f33cae4..85754663f1a3b2fba20741c2d1651d698f76b3a7 100644
--- a/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
+++ b/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/WelcomePage.qml b/src/mainview/components/WelcomePage.qml
index 582b4114dd1c1b60a17348a4ce5820c3e9d5022b..5b6c178b1482fae4a8fe9530eea1ce4220717830 100644
--- a/src/mainview/components/WelcomePage.qml
+++ b/src/mainview/components/WelcomePage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/WelcomePageQrDialog.qml b/src/mainview/components/WelcomePageQrDialog.qml
index 337d4c451d5ce4dd34916c06985ba1602e409120..00be782d470b8ed6856cee581c1b3e1872cb8556 100644
--- a/src/mainview/components/WelcomePageQrDialog.qml
+++ b/src/mainview/components/WelcomePageQrDialog.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml
index 87af87a07c7ce2723cfdc5e3a602123e4d5003b0..4ac5b063a8ccdcfc9d439c9c8c0e56ae1f97c661 100644
--- a/src/settingsview/SettingsView.qml
+++ b/src/settingsview/SettingsView.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AccountProfile.qml b/src/settingsview/components/AccountProfile.qml
index 070b5170243108d82d2e0f842283e7507ff2763e..8ce48df6b8582eebdba1711afc9d461ccdff524b 100644
--- a/src/settingsview/components/AccountProfile.qml
+++ b/src/settingsview/components/AccountProfile.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedCallSettings.qml b/src/settingsview/components/AdvancedCallSettings.qml
index d3032e45af16768daa5baf39db074c41567a23a2..fb567b14588916010f80e2db3fb8ff24a1702a6e 100644
--- a/src/settingsview/components/AdvancedCallSettings.qml
+++ b/src/settingsview/components/AdvancedCallSettings.qml
@@ -22,8 +22,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedConnectivitySettings.qml b/src/settingsview/components/AdvancedConnectivitySettings.qml
index 9e0d1776ae3eb9fa4deb13e6ca0d2cf1b83f04aa..21a1adb783b3aa27b55aa0d6ca85847a5f112ddb 100644
--- a/src/settingsview/components/AdvancedConnectivitySettings.qml
+++ b/src/settingsview/components/AdvancedConnectivitySettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedJamiSecuritySettings.qml b/src/settingsview/components/AdvancedJamiSecuritySettings.qml
index d860ee2fed1c7b7f86486c563d20c5c6bcc69787..75ad2bd2eb83efa8cb129925569140275ff07db6 100644
--- a/src/settingsview/components/AdvancedJamiSecuritySettings.qml
+++ b/src/settingsview/components/AdvancedJamiSecuritySettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedMediaSettings.qml b/src/settingsview/components/AdvancedMediaSettings.qml
index 9d1c0c208077166120c728ee6ec719a0819ffe8b..52d2329068bf4f034d5ab4dc247306841ba96fb1 100644
--- a/src/settingsview/components/AdvancedMediaSettings.qml
+++ b/src/settingsview/components/AdvancedMediaSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedNameServerSettings.qml b/src/settingsview/components/AdvancedNameServerSettings.qml
index 282f968070560c21622dead1b8a60ca1abaae045..c44a907fca3c359f727ac6648348b8c3e05c27c0 100644
--- a/src/settingsview/components/AdvancedNameServerSettings.qml
+++ b/src/settingsview/components/AdvancedNameServerSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedOpenDHTSettings.qml b/src/settingsview/components/AdvancedOpenDHTSettings.qml
index 771587a3adc03c735eedf5994f0e1e54bf208f2b..30d8e66622a25d2a4920bd16d2537cf122e1491f 100644
--- a/src/settingsview/components/AdvancedOpenDHTSettings.qml
+++ b/src/settingsview/components/AdvancedOpenDHTSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedPublicAddressSettings.qml b/src/settingsview/components/AdvancedPublicAddressSettings.qml
index 6a4b7905a0c0866dc1ae06431ece5b673adf64c6..b9be1abcfcd696d68c9f39a3413d0f86ee6ee10a 100644
--- a/src/settingsview/components/AdvancedPublicAddressSettings.qml
+++ b/src/settingsview/components/AdvancedPublicAddressSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedSDPSettings.qml b/src/settingsview/components/AdvancedSDPSettings.qml
index dba6180fbb2736676b7aaa27af6a0826a92ae597..57252b711e25eaa829c16d7e8bf5723743dec355 100644
--- a/src/settingsview/components/AdvancedSDPSettings.qml
+++ b/src/settingsview/components/AdvancedSDPSettings.qml
@@ -21,9 +21,9 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.3
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedSIPSecuritySettings.qml b/src/settingsview/components/AdvancedSIPSecuritySettings.qml
index 4a61839db9b4fbdd84fddd92a4998fdc85a21ca8..bd56dc9ac54a46852f87baed19db1dfad5c5abc4 100644
--- a/src/settingsview/components/AdvancedSIPSecuritySettings.qml
+++ b/src/settingsview/components/AdvancedSIPSecuritySettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedSettings.qml b/src/settingsview/components/AdvancedSettings.qml
index b7141824a393d4af6aa629a6df009b6efcd88952..f5b6eba5b0c17ed0768a31d09ccc9ad562e52cb4 100644
--- a/src/settingsview/components/AdvancedSettings.qml
+++ b/src/settingsview/components/AdvancedSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedVoiceMailSettings.qml b/src/settingsview/components/AdvancedVoiceMailSettings.qml
index 8c83d4ece13afbd034e9d2e07751e6dde1555f5b..07c3856de3e1ded2596fe8ebe72332f15f9ea507 100644
--- a/src/settingsview/components/AdvancedVoiceMailSettings.qml
+++ b/src/settingsview/components/AdvancedVoiceMailSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AvSettingPage.qml b/src/settingsview/components/AvSettingPage.qml
index fa5e692c47dcd108c7c64ea6db6562b0b4bf76fa..352d110809eeca21801740cfd453346dfeeda542 100644
--- a/src/settingsview/components/AvSettingPage.qml
+++ b/src/settingsview/components/AvSettingPage.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/BannedContacts.qml b/src/settingsview/components/BannedContacts.qml
index 9c995d9fd0e69102f83821e9c8fc890f4b12ec6d..6ffd49fa40999930086f13771c19bd9c30a32de2 100644
--- a/src/settingsview/components/BannedContacts.qml
+++ b/src/settingsview/components/BannedContacts.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/ChatviewSettings.qml b/src/settingsview/components/ChatviewSettings.qml
index f62de089adb524fdf24e37c5c56c199c9fd77592..9796e150d2bb1fa5eb34ce5e246677463c65fe18 100644
--- a/src/settingsview/components/ChatviewSettings.qml
+++ b/src/settingsview/components/ChatviewSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/settingsview/components/ContactItemDelegate.qml b/src/settingsview/components/ContactItemDelegate.qml
index 029a764f6ec0ed2e777681d7ea3814ec30628324..92a8ce1c7ef42eb872be8412bd724f8cc932ba4e 100644
--- a/src/settingsview/components/ContactItemDelegate.qml
+++ b/src/settingsview/components/ContactItemDelegate.qml
@@ -22,7 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/CurrentAccountSettings.qml b/src/settingsview/components/CurrentAccountSettings.qml
index f642d949c0a434c6f0afbc65f06224b3d369736f..cb8bc785336a3361ce662cc85eb19d2613de7c52 100644
--- a/src/settingsview/components/CurrentAccountSettings.qml
+++ b/src/settingsview/components/CurrentAccountSettings.qml
@@ -21,9 +21,9 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.3
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/DeviceItemDelegate.qml b/src/settingsview/components/DeviceItemDelegate.qml
index e270618cebf63262e797fe507f92592ba6f0cc29..ebc15bf6633e4693c81d31ac578e88ad8480dc21 100644
--- a/src/settingsview/components/DeviceItemDelegate.qml
+++ b/src/settingsview/components/DeviceItemDelegate.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/GeneralSettingsPage.qml b/src/settingsview/components/GeneralSettingsPage.qml
index c7d807e215db19e3f5fcea2063dd20a6cbee527d..e08d8c9e63406a04e269b17aae11dca079569823 100644
--- a/src/settingsview/components/GeneralSettingsPage.qml
+++ b/src/settingsview/components/GeneralSettingsPage.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/settingsview/components/JamiUserIdentity.qml b/src/settingsview/components/JamiUserIdentity.qml
index 11b041d08d2a7206cd426a11dcb07a00f05a10b5..b4ec1dd9db2c2e638ae34313f45ee0a0320eaef8 100644
--- a/src/settingsview/components/JamiUserIdentity.qml
+++ b/src/settingsview/components/JamiUserIdentity.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/KeyBoardShortcutKey.qml b/src/settingsview/components/KeyBoardShortcutKey.qml
index 1def1f817c51bc784b5227fb991716a78afc2095..6652b21b6d326e010c08664286d29439d98572cb 100644
--- a/src/settingsview/components/KeyBoardShortcutKey.qml
+++ b/src/settingsview/components/KeyBoardShortcutKey.qml
@@ -1,5 +1,24 @@
+/*
+ * Copyright (C) 2019-2020 by Savoir-faire Linux
+ * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
+ *
+ * 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 3 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/>.
+ */
+
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
Item {
diff --git a/src/settingsview/components/KeyBoardShortcutTable.qml b/src/settingsview/components/KeyBoardShortcutTable.qml
index 240d219143c51449c10232c4df11673eda06fb77..cbdc1ae9b52eef4d8f6b5f358f066dfa210c63a9 100644
--- a/src/settingsview/components/KeyBoardShortcutTable.qml
+++ b/src/settingsview/components/KeyBoardShortcutTable.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/LevelMeter.qml b/src/settingsview/components/LevelMeter.qml
index b14b18df799fb9257a50408d7dc53fdf0b6c66cd..be3ed8c8e8f7d3e5b36be02c8e9d4b4b92b90936 100644
--- a/src/settingsview/components/LevelMeter.qml
+++ b/src/settingsview/components/LevelMeter.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
diff --git a/src/settingsview/components/LinkDeviceDialog.qml b/src/settingsview/components/LinkDeviceDialog.qml
index 3e1523450cdf9d0c2d58311809e1988af79dfeca..f0de02c3c285accd468fc048a4f2ba4527ae3692 100644
--- a/src/settingsview/components/LinkDeviceDialog.qml
+++ b/src/settingsview/components/LinkDeviceDialog.qml
@@ -20,7 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/LinkedDevices.qml b/src/settingsview/components/LinkedDevices.qml
index 35fe2722a6849b2c47619733206d7ee5ee7cb22d..fbf803c5fd52519cb755362c5c39c4f1f4ea8dcc 100644
--- a/src/settingsview/components/LinkedDevices.qml
+++ b/src/settingsview/components/LinkedDevices.qml
@@ -22,8 +22,8 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/MediaCodecDelegate.qml b/src/settingsview/components/MediaCodecDelegate.qml
index 0774e519d3dcdd369b0748a4fa7cd8ad411b508a..278386d1a53ea4e7538015488f078c441f527a3f 100644
--- a/src/settingsview/components/MediaCodecDelegate.qml
+++ b/src/settingsview/components/MediaCodecDelegate.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/MediaSettings.qml b/src/settingsview/components/MediaSettings.qml
index cf451fed74cb38ac16fe5c43fc6c8af8032e7692..1463c0a322ef51aa91177b67b7c25a9aa0bf9ecb 100644
--- a/src/settingsview/components/MediaSettings.qml
+++ b/src/settingsview/components/MediaSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/NameRegistrationDialog.qml b/src/settingsview/components/NameRegistrationDialog.qml
index 9c39a07510a2756bc72b70fea9d360d51c2ae927..83768c58ad97beab688aaa2cd03aeefd8643803a 100644
--- a/src/settingsview/components/NameRegistrationDialog.qml
+++ b/src/settingsview/components/NameRegistrationDialog.qml
@@ -20,7 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/PluginItemDelegate.qml b/src/settingsview/components/PluginItemDelegate.qml
index 8db65967e75e1da617030c9a001069bdfedc3c73..5c254fd8e2f1c4e10f53820baca3fb59434fa867 100644
--- a/src/settingsview/components/PluginItemDelegate.qml
+++ b/src/settingsview/components/PluginItemDelegate.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/PluginListPreferencesView.qml b/src/settingsview/components/PluginListPreferencesView.qml
index bf986ca080b039059c05b4128c2e072b2ef19d25..a7ee6f0fabde9bda1c214c0cbac65a86028b7d8a 100644
--- a/src/settingsview/components/PluginListPreferencesView.qml
+++ b/src/settingsview/components/PluginListPreferencesView.qml
@@ -23,6 +23,7 @@ import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtQuick.Dialogs 1.3
import QtGraphicalEffects 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/PluginListSettingsView.qml b/src/settingsview/components/PluginListSettingsView.qml
index 6c1fc640c166037d08433ca66fd47f2260116271..9b3110856415091f5ae8ec2dab507a0e024b4075 100644
--- a/src/settingsview/components/PluginListSettingsView.qml
+++ b/src/settingsview/components/PluginListSettingsView.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/PluginSettingsPage.qml b/src/settingsview/components/PluginSettingsPage.qml
index 0a4260e2de821459de1f97ab63dbf8996cd1a1db..111ecc7122129b880021899aef3056b8f01228f5 100644
--- a/src/settingsview/components/PluginSettingsPage.qml
+++ b/src/settingsview/components/PluginSettingsPage.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/RecordingSettings.qml b/src/settingsview/components/RecordingSettings.qml
index fcdd4e5c61e1252e7cf90a2a2f038acffba31e87..d3d999c0188069bab439bdfac28f6bbcb6be8c87 100644
--- a/src/settingsview/components/RecordingSettings.qml
+++ b/src/settingsview/components/RecordingSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/RevokeDevicePasswordDialog.qml b/src/settingsview/components/RevokeDevicePasswordDialog.qml
index d78bb17656baf5a2aaada95abda6d1b881902ba6..32e827a98e1ceba442d28c8511d286ab8c728564 100644
--- a/src/settingsview/components/RevokeDevicePasswordDialog.qml
+++ b/src/settingsview/components/RevokeDevicePasswordDialog.qml
@@ -20,7 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/SIPUserIdentity.qml b/src/settingsview/components/SIPUserIdentity.qml
index 5f8e578952395b4f149b88ad2a40759d5602c9fb..76684329ec59b451e8086ec7211a61214d209367 100644
--- a/src/settingsview/components/SIPUserIdentity.qml
+++ b/src/settingsview/components/SIPUserIdentity.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingMaterialButton.qml b/src/settingsview/components/SettingMaterialButton.qml
index cf3b7421f60f57217ff38b81b75e4366a588947a..187c8326c7cdfc73f1b666684e938c961a38900e 100644
--- a/src/settingsview/components/SettingMaterialButton.qml
+++ b/src/settingsview/components/SettingMaterialButton.qml
@@ -21,9 +21,9 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
-import net.jami.Models 1.0
import Qt.labs.platform 1.1
+
+import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingSpinBox.qml b/src/settingsview/components/SettingSpinBox.qml
index d7cd17d7fcacbb4e6e66534c7c2a923db1379c20..58d4d67c8a46fa2ed8c1a92bc4916f29dc103856 100644
--- a/src/settingsview/components/SettingSpinBox.qml
+++ b/src/settingsview/components/SettingSpinBox.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingsComboBox.qml b/src/settingsview/components/SettingsComboBox.qml
index 5fc1a1a6a433925e007660da76a6ef6e3f44b4d7..5b95b24ccd09136b2f5ce673bfaa616c09eefab8 100644
--- a/src/settingsview/components/SettingsComboBox.qml
+++ b/src/settingsview/components/SettingsComboBox.qml
@@ -22,7 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/SettingsHeader.qml b/src/settingsview/components/SettingsHeader.qml
index 0dc8be3a24919332614aa041b89496f77bddcca8..f7b6b60fd425323d731a5b55847415814aef0340 100644
--- a/src/settingsview/components/SettingsHeader.qml
+++ b/src/settingsview/components/SettingsHeader.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingsMaterialLineEdit.qml b/src/settingsview/components/SettingsMaterialLineEdit.qml
index d98501ecede4be7b3afdb6ffb890bbc945d08d99..2a31b873968469bcd38d7ad4e442fbe05c0f0cff 100644
--- a/src/settingsview/components/SettingsMaterialLineEdit.qml
+++ b/src/settingsview/components/SettingsMaterialLineEdit.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingsMenu.qml b/src/settingsview/components/SettingsMenu.qml
index 4da59c755184c3863bd5cd7cac4b60ab3086200c..cb820a968cb4cf6fdf0b33fb7cabc78c33b4c38f 100644
--- a/src/settingsview/components/SettingsMenu.qml
+++ b/src/settingsview/components/SettingsMenu.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SystemSettings.qml b/src/settingsview/components/SystemSettings.qml
index e9520a583e395448a0a53fef5b2521280c388cb0..4737cdea22e4e75dcabf7dc0f80483bfe8d9eb14 100644
--- a/src/settingsview/components/SystemSettings.qml
+++ b/src/settingsview/components/SystemSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/settingsview/components/ToggleSwitch.qml b/src/settingsview/components/ToggleSwitch.qml
index 052bd4e6d75c0bcfa11774e42b1e7105d395ac52..9fc1dc3360a5f26bbea172cfac8b918ded7829cf 100644
--- a/src/settingsview/components/ToggleSwitch.qml
+++ b/src/settingsview/components/ToggleSwitch.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/UpdateSettings.qml b/src/settingsview/components/UpdateSettings.qml
index 3005c7c80bb47ff017a0e6303603a92c32ef942f..0df5bf118a89ad1c51c49e291be40a228492a10a 100644
--- a/src/settingsview/components/UpdateSettings.qml
+++ b/src/settingsview/components/UpdateSettings.qml
@@ -19,9 +19,9 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
-import QtQuick.Controls.Styles 1.4
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
import net.jami.Models 1.0
diff --git a/src/settingsview/components/UserIdentity.qml b/src/settingsview/components/UserIdentity.qml
index dc901b25af8312122ff930b0542aacb9bb4a2abe..c9732a3deb569f760e50d2f25090ee05623137b3 100644
--- a/src/settingsview/components/UserIdentity.qml
+++ b/src/settingsview/components/UserIdentity.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/VideoSettings.qml b/src/settingsview/components/VideoSettings.qml
index 6e3c301f6429e48a42a66c351b82b4b9d9fb8db0..8680ae485d11725abcf8643e4a32548e4750f964 100644
--- a/src/settingsview/components/VideoSettings.qml
+++ b/src/settingsview/components/VideoSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/wizardview/WizardView.qml b/src/wizardview/WizardView.qml
index 655fd652577e35b9e41ff7deb2a689348a2b2505..c1e7f7a88c292ad6e0de851be1151f405f84b0d5 100644
--- a/src/wizardview/WizardView.qml
+++ b/src/wizardview/WizardView.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/AccountCreationStepIndicator.qml b/src/wizardview/components/AccountCreationStepIndicator.qml
index c81a92e8c5d8f224899d60680110eda3e6ce673f..37daaf0e27e771be3854ee975aab437acc1d9098 100644
--- a/src/wizardview/components/AccountCreationStepIndicator.qml
+++ b/src/wizardview/components/AccountCreationStepIndicator.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/components/BackupKeyPage.qml b/src/wizardview/components/BackupKeyPage.qml
index fbbdf765cb3a8a5344e01fa3c1e8c85f9581e8ae..cf69527f30c614a0ebf50cd13a0fded4ee290fed 100644
--- a/src/wizardview/components/BackupKeyPage.qml
+++ b/src/wizardview/components/BackupKeyPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/CollapsiblePasswordWidget.qml b/src/wizardview/components/CollapsiblePasswordWidget.qml
index 5a34ca5e3c2499d5b4f3d00a65c496a854b5bf41..c9bf8f645805eef5e6aa620f2697fea02ceefbdd 100644
--- a/src/wizardview/components/CollapsiblePasswordWidget.qml
+++ b/src/wizardview/components/CollapsiblePasswordWidget.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/components/ConnectToAccountManagerPage.qml b/src/wizardview/components/ConnectToAccountManagerPage.qml
index bf4d69c772749a12bb4c9b8c53a8d1220fbca9aa..ae2610aed5162f9e07bf7906670a28e0236e12ff 100644
--- a/src/wizardview/components/ConnectToAccountManagerPage.qml
+++ b/src/wizardview/components/ConnectToAccountManagerPage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml
index 2a45f80f30f0d6f7572b9dc294c419a8bc51d69d..af6426f82dffec4960d4d12fac3ee7bbb8c0c827 100644
--- a/src/wizardview/components/CreateAccountPage.qml
+++ b/src/wizardview/components/CreateAccountPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/CreateSIPAccountPage.qml b/src/wizardview/components/CreateSIPAccountPage.qml
index 81eae576b539284be92a2b979cb84749a3f6cbdb..a6b8d389cccfb3f1cc1a90eccc7005fe0ca71617 100644
--- a/src/wizardview/components/CreateSIPAccountPage.qml
+++ b/src/wizardview/components/CreateSIPAccountPage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/components/ImportFromBackupPage.qml b/src/wizardview/components/ImportFromBackupPage.qml
index 454dbbab3e0bcdd42f27dc082fccbf59653dff51..f1078d521f3fbbcfdccd381561123653b414d756 100644
--- a/src/wizardview/components/ImportFromBackupPage.qml
+++ b/src/wizardview/components/ImportFromBackupPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/ImportFromDevicePage.qml b/src/wizardview/components/ImportFromDevicePage.qml
index 66886d62efeb635414da8160922d3e7b48d04a55..3f15c661759873220c96961d807ad208ac6486f8 100644
--- a/src/wizardview/components/ImportFromDevicePage.qml
+++ b/src/wizardview/components/ImportFromDevicePage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml
index cd7e72f2d089bd6e873acdd8c077627e61c0ec4b..79b6c1641727eb5e4866468d23a397136414a17b 100644
--- a/src/wizardview/components/ProfilePage.qml
+++ b/src/wizardview/components/ProfilePage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/components/WelcomePage.qml b/src/wizardview/components/WelcomePage.qml
index f44a99680d105f6ef5c601576f30da64c41411b9..48ba545b518a2f2af40ff3b36d68fa3546ba224b 100644
--- a/src/wizardview/components/WelcomePage.qml
+++ b/src/wizardview/components/WelcomePage.qml
@@ -21,6 +21,7 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0