diff --git a/po/utpass.qrouland.pot b/po/utpass.qrouland.pot
index cdb4ae5..cbb4bdb 100644
--- a/po/utpass.qrouland.pot
+++ b/po/utpass.qrouland.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: utpass.qrouland\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-13 17:26+0000\n"
+"POT-Creation-Date: 2025-01-13 20:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../qml/components/FileDir.qml:69
+#: ../qml/components/FileDir.qml:72
 msgid "Decryption failed !"
 msgstr ""
 
-#: ../qml/dialogs/DoubleValidationDialog.qml:28
-#: ../qml/dialogs/PassphraseDialog.qml:29
-#: ../qml/dialogs/SimpleValidationDialog.qml:19
-msgid "Ok"
-msgstr ""
-
-#: ../qml/dialogs/DoubleValidationDialog.qml:44
-#: ../qml/dialogs/PassphraseDialog.qml:41
-#: ../qml/dialogs/SimpleValidationDialog.qml:30
-msgid "Cancel"
-msgstr ""
-
 #: ../qml/dialogs/ErrorDialog.qml:12
 msgid "Error !"
 msgstr ""
@@ -53,6 +41,16 @@ msgstr ""
 msgid "passphrase"
 msgstr ""
 
+#: ../qml/dialogs/PassphraseDialog.qml:29
+#: ../qml/dialogs/SimpleValidationDialog.qml:9
+msgid "Ok"
+msgstr ""
+
+#: ../qml/dialogs/PassphraseDialog.qml:41
+#: ../qml/dialogs/SimpleValidationDialog.qml:33
+msgid "Cancel"
+msgstr ""
+
 #: ../qml/dialogs/SuccessDialog.qml:12
 msgid "Success !"
 msgstr ""
@@ -61,27 +59,27 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ../qml/pages/Info.qml:58
+#: ../qml/pages/Info.qml:61
 msgid "<b>Version</b>"
 msgstr ""
 
-#: ../qml/pages/Info.qml:77
+#: ../qml/pages/Info.qml:82
 msgid "<b>Maintainer</>"
 msgstr ""
 
-#: ../qml/pages/Info.qml:102
+#: ../qml/pages/Info.qml:109
 msgid "Suggest improvement(s) or report a bug(s)"
 msgstr ""
 
-#: ../qml/pages/Info.qml:107
+#: ../qml/pages/Info.qml:114
 msgid "Access to the source code"
 msgstr ""
 
-#: ../qml/pages/Info.qml:115
+#: ../qml/pages/Info.qml:122
 msgid "Released under the terms of the GNU GPL v3"
 msgstr ""
 
-#: ../qml/pages/Info.qml:123 ../qml/pages/headers/MainHeader.qml:33
+#: ../qml/pages/Info.qml:131 ../qml/pages/headers/MainHeader.qml:33
 msgid "Info"
 msgstr ""
 
@@ -100,7 +98,7 @@ msgstr ""
 msgid "UTPass"
 msgstr ""
 
-#: ../qml/pages/headers/MainHeader.qml:26 ../qml/pages/settings/Settings.qml:68
+#: ../qml/pages/headers/MainHeader.qml:26 ../qml/pages/settings/Settings.qml:70
 msgid "Settings"
 msgstr ""
 
@@ -116,26 +114,31 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: ../qml/pages/settings/ImportGitClone.qml:69
+#: ../qml/pages/settings/ImportGitClone.qml:70
 msgid "Clone"
 msgstr ""
 
-#: ../qml/pages/settings/ImportGitClone.qml:89
+#: ../qml/pages/settings/ImportGitClone.qml:90
 msgid ""
 "Importing a git repo will delete<br>any existing password store!"
 "<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/ImportGitClone.qml:101
+#: ../qml/pages/settings/ImportGitClone.qml:91
+#: ../qml/pages/settings/ImportZip.qml:62 ../qml/pages/settings/InfoKeys.qml:77
+msgid "Yes"
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:104
 msgid "An error occured during git clone !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportGitClone.qml:110
-#: ../qml/pages/settings/ImportZip.qml:82
+#: ../qml/pages/settings/ImportGitClone.qml:113
+#: ../qml/pages/settings/ImportZip.qml:84
 msgid "Password store sucessfully imported !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportGitClone.qml:122
+#: ../qml/pages/settings/ImportGitClone.qml:125
 msgid "Git Clone Import"
 msgstr ""
 
@@ -156,39 +159,35 @@ msgid ""
 "Importing a new zip will delete<br>any existing password store!<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/ImportZip.qml:73
+#: ../qml/pages/settings/ImportZip.qml:75
 msgid "Password store import failed !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportZip.qml:94
+#: ../qml/pages/settings/ImportZip.qml:96
 msgid "Zip Password Store Import"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:40
+#: ../qml/pages/settings/InfoKeys.qml:41
 msgid "Key id : %1"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:46
+#: ../qml/pages/settings/InfoKeys.qml:54
 msgid "Delete this key"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:67
+#: ../qml/pages/settings/InfoKeys.qml:76
 msgid "You're are about to delete<br>%1<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:68
-msgid "%1<br>will be definitively removed.<br>Continue ?"
-msgstr ""
-
-#: ../qml/pages/settings/InfoKeys.qml:84
+#: ../qml/pages/settings/InfoKeys.qml:94
 msgid "Key removal failed !"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:93
+#: ../qml/pages/settings/InfoKeys.qml:103
 msgid "Key successfully deleted !"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:104
+#: ../qml/pages/settings/InfoKeys.qml:114
 msgid "Info Keys"
 msgstr ""
 
@@ -196,26 +195,26 @@ msgstr ""
 msgid "GPG"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:28
+#: ../qml/pages/settings/Settings.qml:29
 msgid "Import a GPG key file"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:33
+#: ../qml/pages/settings/Settings.qml:34
 msgid "Show GPG keys"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:41
+#: ../qml/pages/settings/Settings.qml:42
 msgid "Password Store"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:46
+#: ../qml/pages/settings/Settings.qml:48
 msgid "Import a Password Store using Git"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:51
+#: ../qml/pages/settings/Settings.qml:53
 msgid "Import a Password Store Zip"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:60
+#: ../qml/pages/settings/Settings.qml:62
 msgid "Warning: importing delete any exiting Password Store"
 msgstr ""
diff --git a/qml/Main.qml b/qml/Main.qml
index 1f22bcc..68d756d 100644
--- a/qml/Main.qml
+++ b/qml/Main.qml
@@ -6,6 +6,8 @@ import QtQuick.Layouts 1.1
 import "dialogs"
 
 MainView {
+    //theme.name: "Lomiri.Components.Themes.SuruDark"
+
     id: root
 
     signal responsePassphraseDialog(bool canceled, string passphrase)
diff --git a/qml/components/ExternalLink.qml b/qml/components/ExternalLink.qml
index 7de1038..465c9d0 100644
--- a/qml/components/ExternalLink.qml
+++ b/qml/components/ExternalLink.qml
@@ -20,12 +20,14 @@ Item {
 
     Rectangle {
         anchors.fill: parent
+        color: theme.palette.normal.background
 
         Text {
             text: externalLink.text
             anchors.left: parent.left
             anchors.leftMargin: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter
+            color: theme.palette.normal.backgroundText
         }
 
         Icon {
diff --git a/qml/components/FileDir.qml b/qml/components/FileDir.qml
index 9f637d0..865ab96 100644
--- a/qml/components/FileDir.qml
+++ b/qml/components/FileDir.qml
@@ -2,6 +2,7 @@ import "../dialogs"
 import "../styles"
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
+import Lomiri.Components.Themes 1.3
 import Pass 1.0
 import QtQuick 2.4
 
@@ -14,12 +15,14 @@ Component {
         anchors.right: parent.right
         anchors.left: parent.left
         height: units.gu(5)
+        color: theme.palette.normal.background
 
         Text {
             text: fileBaseName
             anchors.left: parent.left
             anchors.leftMargin: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter
+            color: theme.palette.normal.backgroundText
         }
 
         Icon {
diff --git a/qml/components/PageStackLink.qml b/qml/components/PageStackLink.qml
index 1c64cc3..e5591f1 100644
--- a/qml/components/PageStackLink.qml
+++ b/qml/components/PageStackLink.qml
@@ -22,12 +22,14 @@ Item {
 
     Rectangle {
         anchors.fill: parent
+        color: theme.palette.normal.background
 
         Text {
             text: pageStackLink.text
             anchors.left: parent.left
             anchors.leftMargin: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter
+            color: theme.palette.normal.backgroundText
         }
 
         Icon {
diff --git a/qml/dialogs/DoubleValidationDialog.qml b/qml/dialogs/DoubleValidationDialog.qml
deleted file mode 100644
index c673a0f..0000000
--- a/qml/dialogs/DoubleValidationDialog.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-import Lomiri.Components 1.3
-import Lomiri.Components.Popups 1.3
-import QtQuick 2.4
-
-Dialog {
-    id: doubleValidationDialog
-
-    property int nb_validation: 0
-    property string text1
-    property string text2
-
-    signal doubleValidated()
-    signal canceled()
-
-    Text {
-        visible: nb_validation == 0
-        horizontalAlignment: Text.AlignHCenter
-        text: text1
-    }
-
-    Text {
-        visible: nb_validation == 1
-        horizontalAlignment: Text.AlignHCenter
-        text: text2
-    }
-
-    Button {
-        text: i18n.tr("Ok")
-        color: LomiriColors.green
-        onClicked: {
-            if (nb_validation == 1) {
-                nb_validation = 0;
-                doubleValidated();
-                PopupUtils.close(doubleValidationDialog);
-            } else {
-                nb_validation += 1;
-            }
-        }
-    }
-
-    Button {
-        id: cancelButton
-
-        text: i18n.tr("Cancel")
-        color: LomiriColors.red
-        onClicked: {
-            nb_validation = 0;
-            canceled();
-            PopupUtils.close(doubleValidationDialog);
-        }
-    }
-
-}
diff --git a/qml/dialogs/ErrorDialog.qml b/qml/dialogs/ErrorDialog.qml
index 630cd5d..5edf7ae 100644
--- a/qml/dialogs/ErrorDialog.qml
+++ b/qml/dialogs/ErrorDialog.qml
@@ -3,7 +3,7 @@ import Lomiri.Components.Popups 1.3
 import QtQuick 2.4
 
 Dialog {
-    id: dialogError
+    id: dialog
 
     property string textError
 
@@ -14,10 +14,9 @@ Dialog {
 
     Button {
         text: i18n.tr("Close")
-        color: LomiriColors.red
         onClicked: function() {
             dialogClosed();
-            PopupUtils.close(dialogError);
+            PopupUtils.close(dialog);
         }
     }
 
diff --git a/qml/dialogs/PassphraseDialog.qml b/qml/dialogs/PassphraseDialog.qml
index f000675..01b832c 100644
--- a/qml/dialogs/PassphraseDialog.qml
+++ b/qml/dialogs/PassphraseDialog.qml
@@ -3,7 +3,7 @@ import Lomiri.Components.Popups 1.3
 import QtQuick 2.4
 
 Dialog {
-    id: passphraseProvider
+    id: dialog
 
     signal validated(string passphrase)
     signal canceled()
@@ -27,11 +27,11 @@ Dialog {
         id: okButton
 
         text: i18n.tr("Ok")
-        color: LomiriColors.green
+        color: theme.palette.normal.positive
         onClicked: {
             validated(passphraseField.text);
             passphraseField.text = "";
-            PopupUtils.close(passphraseProvider);
+            PopupUtils.close(dialog);
         }
     }
 
@@ -39,10 +39,9 @@ Dialog {
         id: cancelButton
 
         text: i18n.tr("Cancel")
-        color: LomiriColors.red
         onClicked: {
             canceled();
-            PopupUtils.close(passphraseProvider);
+            PopupUtils.close(dialog);
         }
     }
 
diff --git a/qml/dialogs/SimpleValidationDialog.qml b/qml/dialogs/SimpleValidationDialog.qml
index f512f35..fd87bc6 100644
--- a/qml/dialogs/SimpleValidationDialog.qml
+++ b/qml/dialogs/SimpleValidationDialog.qml
@@ -3,24 +3,28 @@ import Lomiri.Components.Popups 1.3
 import QtQuick 2.4
 
 Dialog {
-    id: doubleValidationDialog
+    id: dialog
 
     property string text
+    property string continueText: i18n.tr("Ok")
+    property color continueColor: theme.palette.normal.positive
 
     signal validated()
     signal canceled()
 
     Text {
         horizontalAlignment: Text.AlignHCenter
-        text: doubleValidationDialog.text
+        text: dialog.text
     }
 
     Button {
-        text: i18n.tr("Ok")
-        color: LomiriColors.green
+        id: continueButton
+
+        text: dialog.continueText
+        color: dialog.continueColor
         onClicked: {
             validated();
-            PopupUtils.close(doubleValidationDialog);
+            PopupUtils.close(dialog);
         }
     }
 
@@ -28,10 +32,9 @@ Dialog {
         id: cancelButton
 
         text: i18n.tr("Cancel")
-        color: LomiriColors.red
         onClicked: {
             canceled();
-            PopupUtils.close(doubleValidationDialog);
+            PopupUtils.close(dialog);
         }
     }
 
diff --git a/qml/dialogs/SuccessDialog.qml b/qml/dialogs/SuccessDialog.qml
index a46d020..1def747 100644
--- a/qml/dialogs/SuccessDialog.qml
+++ b/qml/dialogs/SuccessDialog.qml
@@ -3,7 +3,7 @@ import Lomiri.Components.Popups 1.3
 import QtQuick 2.4
 
 Dialog {
-    id: dialogSuccess
+    id: dialog
 
     property string textSuccess
 
@@ -14,10 +14,9 @@ Dialog {
 
     Button {
         text: i18n.tr("OK")
-        color: LomiriColors.green
         onClicked: function() {
             dialogClosed();
-            PopupUtils.close(dialogSuccess);
+            PopupUtils.close(dialog);
         }
     }
 
diff --git a/qml/pages/Info.qml b/qml/pages/Info.qml
index c9d09ec..35dd756 100644
--- a/qml/pages/Info.qml
+++ b/qml/pages/Info.qml
@@ -25,6 +25,7 @@ Page {
         Rectangle {
             width: parent.width
             height: units.gu(1)
+            color: theme.palette.normal.background
         }
 
         Text {
@@ -36,11 +37,13 @@ Page {
             height: units.gu(8)
             fontSizeMode: Text.Fit
             font.pixelSize: 144
+            color: theme.palette.normal.backgroundText
         }
 
         Rectangle {
             width: parent.width
             height: units.gu(12)
+            color: theme.palette.normal.background
 
             Image {
                 source: "../../assets/logo.svg"
@@ -58,6 +61,7 @@ Page {
             text: i18n.tr("<b>Version</b>")
             fontSizeMode: Text.Fit
             font.pixelSize: 72
+            color: theme.palette.normal.backgroundText
         }
 
         Text {
@@ -68,6 +72,7 @@ Page {
             height: units.gu(4)
             fontSizeMode: Text.Fit
             font.pixelSize: 72
+            color: theme.palette.normal.backgroundText
         }
 
         Text {
@@ -77,6 +82,7 @@ Page {
             text: i18n.tr("<b>Maintainer</>")
             fontSizeMode: Text.Fit
             font.pixelSize: 72
+            color: theme.palette.normal.backgroundText
         }
 
         Text {
@@ -87,6 +93,7 @@ Page {
             height: units.gu(2)
             fontSizeMode: Text.Fit
             font.pixelSize: 72
+            color: theme.palette.normal.backgroundText
         }
 
     }
@@ -113,6 +120,7 @@ Page {
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             text: i18n.tr("Released under the terms of the GNU GPL v3")
+            color: theme.palette.normal.backgroundText
         }
 
     }
diff --git a/qml/pages/settings/ImportGitClone.qml b/qml/pages/settings/ImportGitClone.qml
index 2373938..9194b11 100644
--- a/qml/pages/settings/ImportGitClone.qml
+++ b/qml/pages/settings/ImportGitClone.qml
@@ -66,6 +66,7 @@ Page {
             id: buttonAdd
 
             width: parent.width
+            color: theme.palette.normal.positive
             text: i18n.tr('Clone')
             onClicked: {
                 var ret = false;
@@ -87,6 +88,8 @@ Page {
 
         SimpleValidationDialog {
             text: i18n.tr("Importing a git repo will delete<br>any existing password store!<br>Continue ?")
+            continueText: i18n.tr("Yes")
+            continueColor: theme.palette.normal.negative
             onCanceled: {
                 pageStack.pop();
             }
diff --git a/qml/pages/settings/ImportZip.qml b/qml/pages/settings/ImportZip.qml
index 8ca8836..35e5e14 100644
--- a/qml/pages/settings/ImportZip.qml
+++ b/qml/pages/settings/ImportZip.qml
@@ -59,6 +59,8 @@ Page {
 
         SimpleValidationDialog {
             text: i18n.tr("Importing a new zip will delete<br>any existing password store!<br>Continue ?")
+            continueText: i18n.tr("Yes")
+            continueColor: theme.palette.normal.negative
             onCanceled: {
                 pageStack.pop();
             }
diff --git a/qml/pages/settings/InfoKeys.qml b/qml/pages/settings/InfoKeys.qml
index 95a4e99..5d280d2 100644
--- a/qml/pages/settings/InfoKeys.qml
+++ b/qml/pages/settings/InfoKeys.qml
@@ -29,6 +29,7 @@ Page {
             Rectangle {
                 width: parent.width
                 height: units.gu(1)
+                color: theme.palette.normal.background
             }
 
             Text {
@@ -38,13 +39,20 @@ Page {
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 text: i18n.tr('Key id : %1').arg(model.modelData.uid)
+                color: theme.palette.normal.backgroundText
+            }
+
+            Rectangle {
+                width: parent.width
+                height: units.gu(1)
+                color: theme.palette.normal.background
             }
 
             Button {
                 id: buttonDeleteKey
 
                 text: i18n.tr("Delete this key")
-                color: LomiriColors.red
+                color: theme.palette.normal.negative
                 onClicked: {
                     infoKeysPage.currentKey = model.modelData.uid;
                     PopupUtils.open(infoKeysPageDeleteValidation, infoKeysPage);
@@ -54,6 +62,7 @@ Page {
             Rectangle {
                 width: parent.width
                 height: units.gu(1)
+                color: theme.palette.normal.background
             }
 
         }
@@ -63,10 +72,11 @@ Page {
     Component {
         id: infoKeysPageDeleteValidation
 
-        DoubleValidationDialog {
-            text1: i18n.tr("You're are about to delete<br>%1<br>Continue ?").arg(infoKeysPage.currentKey)
-            text2: i18n.tr("%1<br>will be definitively removed.<br>Continue ?").arg(infoKeysPage.currentKey)
-            onDoubleValidated: {
+        SimpleValidationDialog {
+            text: i18n.tr("You're are about to delete<br>%1<br>Continue ?").arg(infoKeysPage.currentKey)
+            continueText: i18n.tr("Yes")
+            continueColor: theme.palette.normal.negative
+            onValidated: {
                 var status = Pass.gpgDeleteKeyId(infoKeysPage.currentKey);
                 if (status)
                     PopupUtils.open(infoKeysPageDeleteSuccess);
diff --git a/qml/pages/settings/Settings.qml b/qml/pages/settings/Settings.qml
index dc45af5..5cb62fa 100644
--- a/qml/pages/settings/Settings.qml
+++ b/qml/pages/settings/Settings.qml
@@ -21,6 +21,7 @@ Page {
             width: parent.width
             height: units.gu(4)
             text: i18n.tr('GPG')
+            color: theme.palette.normal.backgroundText
         }
 
         PageStackLink {
@@ -39,6 +40,7 @@ Page {
             width: parent.width
             height: units.gu(4)
             text: i18n.tr('Password Store')
+            color: theme.palette.normal.backgroundText
         }
 
         PageStackLink {