diff --git a/.crowdin/config.example.yml b/.crowdin/config.example.yml
deleted file mode 100644
index 4ef788a3..00000000
--- a/.crowdin/config.example.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-project_id: "372633"
-api_token: "<api-token-here>"
-base_path: "../app/src/main"
-base_url: "https://api.crowdin.com"
-preserve_hierarchy: true
-
-files:
-- source: "res/values/strings.xml"
-  dest: "strings.xml"
-  translation: "res/values-%android_code%/%original_file_name%"
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index bb4c019b..4dd0941a 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
+buy_me_a_coffee: beemdevelopment
 custom:
-  - "https://www.buymeacoffee.com/beemdevelopment"
   - "https://www.blockchain.com/btc/address/bc1q26kyxqjkc6tu477pzy0whagwhs4ypv93qls22n"
   - "https://nanocrawler.cc/explorer/account/nano_1aegisc559b1x4p3839egnu579jkd4htpidy14eo9e31gzqmwuafypnj4q94"
diff --git a/.github/workflows/build-app-workflow.yaml b/.github/workflows/build-app-workflow.yaml
index 515b2e04..ab511ab7 100644
--- a/.github/workflows/build-app-workflow.yaml
+++ b/.github/workflows/build-app-workflow.yaml
@@ -5,36 +5,37 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6
-      - uses: actions/setup-java@v3
+        uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2
+      - uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Build the app
         run: ./gradlew build
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: apk
           path: app/build/outputs/apk/debug/app-debug.apk
   test:
-    runs-on: macos-latest
-    # This is probably pretty expensive for GitHub, so restrict the repositories that this job runs on
-    if: github.repository == 'beemdevelopment/Aegis' || github.repository == 'alexbakker/Aegis'
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Install HAXM
-        run: brew install --cask intel-haxm
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
       - name: Tests
-        uses: reactivecircus/android-emulator-runner@50986b1464923454c95e261820bc626f38490ec0
+        uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d
         with:
           api-level: 31
           arch: x86_64
@@ -52,8 +53,8 @@ jobs:
             adb logcat -d > artifacts/logcat.txt
             cp -r app/build/reports/androidTests/connected/* artifacts/report/
             if adb shell '[ -e /sdcard/Pictures/screenshots ]'; then adb pull /sdcard/Pictures/screenshots artifacts/; fi
-          # test ! -f tests_failing
-      - uses: actions/upload-artifact@v3
+            test ! -f tests_failing
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: instrumented-test-report
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0d3d0dc0..b575535b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,9 +14,10 @@ jobs:
       actions: read
       contents: read
       security-events: write
+    if: github.event_name != 'schedule' || github.repository == 'beemdevelopment/Aegis'
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Exclude paths
       # The importers are excluded from analysis, because some of the apps Aegis
       # can import from don't have such great crypto, which will cause false
@@ -24,18 +25,18 @@ jobs:
       run: |
         find app/src/main/java/com/beemdevelopment/aegis/importers ! \( -name AegisImporter.java -o -name "DatabaseImporter*" \) -type f -exec rm -f {} +
         sed -i '/Importer.class/d' app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
         cache: 'gradle'
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: java
     - name: Build
       run: ./gradlew assembleDebug
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
index 6b9cb779..e7898362 100644
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -10,22 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'beemdevelopment/Aegis'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install crowdin-cli
         run: |
-          wget https://github.com/crowdin/crowdin-cli/releases/download/3.7.2/crowdin-cli.zip
-          echo "ee9f838b819ccedc33c9b2537055e5ba7d7934561b24df1e1a6274cbd6e27f2d  crowdin-cli.zip" | sha256sum -c
+          wget https://github.com/crowdin/crowdin-cli/releases/download/4.6.1/crowdin-cli.zip
+          echo "7afd70de3a747ac631a5bad7866008163ae1d50c4606b5773f0b90a5481ffde2  crowdin-cli.zip" | sha256sum -c
           unzip crowdin-cli.zip -d crowdin-cli
       - name: Upload to Crowdin
         env:
-          CROWDIN_TOKEN: "${{ secrets.CROWDIN_TOKEN }}"
+          CROWDIN_PERSONAL_TOKEN: "${{ secrets.CROWDIN_TOKEN }}"
         run: |
-          java -jar ./crowdin-cli/3.7.2/crowdin-cli.jar upload sources \
+          java -jar ./crowdin-cli/4.6.1/crowdin-cli.jar upload sources \
             --no-progress \
-            --token "$CROWDIN_TOKEN" \
-            --project-id 372633 \
-            --base-path app/src/main \
-            --source res/values/strings.xml \
-            --translation "res/values-%android_code%/%original_file_name%" \
-            --dest strings.xml \
             --branch master
diff --git a/FAQ.md b/FAQ.md
index 815490aa..6d514574 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -86,6 +86,14 @@ Another common setup is to configure Aegis to back up to a folder on local
 storage of your device and then have a separate app (like
 [Syncthing](https://syncthing.net/)) sync that folder anywhere you want.
 
+## Encrypted Backups
+
+### Why do I not get prompted to enter an encryption password when exporting?
+
+Aegis uses the same password you have configured to encrypt your vault as the
+password which is used when exporting and importing your vault; so when prompted, 
+you will enter that when importing your vault.
+
 ## Importing
 
 ### When importing from Authenticator Plus, an error is shown claiming that Accounts.txt is missing
diff --git a/README.md b/README.md
index 382a3c59..195bd4ed 100644
--- a/README.md
+++ b/README.md
@@ -123,20 +123,33 @@ documentation](docs/iconpacks.md).
   Unofficial monochrome-styled 2FA icons.
 
   [<img width=500 alt="aegis-icons preview"
-  src="https://raw.githubusercontent.com/aegis-icons/aegis-icons/master/showcase.png">](https://github.com/aegis-icons/aegis-icons)
+  src="metadata/en-US/images/iconPacks/aegis-icons.png">](https://github.com/aegis-icons/aegis-icons)
 
-- [aegis-simple-icons](https://github.com/alexbakker/aegis-simple-icons) *
+- [delta-aegis-icons](https://github.com/Delta-Icons/aegis-icons)
+
+  Delta version of the unofficial monochrome-styled 2FA icon pack aegis-icons.
+
+  [<img width=500 alt="delta-icons preview"
+  src="metadata/en-US/images/iconPacks/delta-icons.png">](https://github.com/Delta-Icons/aegis-icons)
+
+- [aegis-simple-icons](https://github.com/alexbakker/aegis-simple-icons) \*
 
   This project periodically generates an icon pack for Aegis based on [Simple
   Icons](https://simpleicons.org/).
 
-- [aegis-simple-icons-outlined](https://github.com/michaelschattgen/aegis-simple-icons-outlined) *
+  [<img width=500 alt="aegis-simple-icons preview"
+  src="metadata/en-US/images/iconPacks/aegis-simple-icons.png">](https://github.com/alexbakker/aegis-simple-icons)
+
+- [aegis-simple-icons-outlined](https://github.com/michaelschattgen/aegis-simple-icons-outlined) \*
 
   This is a variant on the aegis-simple-icons pack where the icons contain no solid background and just the outlines are being used.
- 
+
+  [<img width=500 alt="aegis-simple-icons-outlined preview"
+  src="metadata/en-US/images/iconPacks/aegis-simple-icons-outlined.png">](https://github.com/michaelschattgen/aegis-simple-icons-outlined)
+
 \* The icons are automatically generated, so
-  not all of them are as high quality as the ones you'll find in
-  [aegis-icons](https://github.com/aegis-icons/aegis-icons).
+not all of them are as high quality as the ones you'll find in
+[aegis-icons](https://github.com/aegis-icons/aegis-icons).
 
 ## Contributing
 
@@ -151,3 +164,9 @@ Swing by our Matrix room to interact with other contributors:
 
 This project is licensed under the GNU General Public License v3.0. See the
 [LICENSE](LICENSE) file for details.
+
+A couple of libraries vendored in Aegis' repository are licensed under a
+different license:
+
+- [TextDrawable](app/src/main/java/com/amulyakhare/textdrawable)
+- [TrustedIntents](app/src/main/java/info/guardianproject/trustedintents)
diff --git a/app/build.gradle b/app/build.gradle
index 3faacee6..43512d69 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 
 def getCmdOutput = { cmd ->
     def stdout = new ByteArrayOutputStream()
@@ -19,21 +20,27 @@ def fileProviderAuthority = "${packageName}.fileprovider"
 def fileProviderAuthorityDebug = "${packageName}.debug.fileprovider"
 
 android {
-    compileSdk 33
+    compileSdk 35
 
     namespace packageName
 
     defaultConfig {
         applicationId "${packageName}"
-        minSdkVersion 21
-        targetSdkVersion 33
-        versionCode 60
-        versionName "2.2"
+        minSdkVersion 23
+        targetSdkVersion 35
+        versionCode 79
+        versionName "3.4"
         multiDexEnabled true
         buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
         buildConfigField "String", "GIT_BRANCH", "\"${getGitBranch()}\""
         buildConfigField "java.util.concurrent.atomic.AtomicBoolean", "TEST", "new java.util.concurrent.atomic.AtomicBoolean(false)"
 
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas"]
+            }
+        }
+
         testInstrumentationRunner "com.beemdevelopment.aegis.AegisTestRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
@@ -86,28 +93,41 @@ android {
         }
     }
 
+    // Required to make the APK reproducible
+    aaptOptions {
+        cruncherEnabled = false
+    }
+    defaultConfig {
+        vectorDrawables.generatedDensities = []
+    }
+
     packagingOptions {
         // R8 doesn't remove these resources, so exclude them manually. This reduces APK size by 4MB.
         resources {
-            excludes += ['/org/bouncycastle/pqc/**/*.properties']
+            excludes += [
+                    '/org/bouncycastle/pqc/**/*.properties',
+                    'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
+            ]
         }
     }
 
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_17
         coreLibraryDesugaringEnabled true
     }
     lint {
         abortOnError true
         checkDependencies true
-        disable 'MissingQuantity', 'MissingTranslation'
+    }
+    buildFeatures {
+        buildConfig true
     }
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.8.0'
+        artifact = 'com.google.protobuf:protoc:3.25.1'
     }
     generateProtoTasks {
         all().each { task ->
@@ -120,37 +140,46 @@ protobuf {
     }
 }
 
-dependencies {
-    def cameraxVersion = '1.2.3'
-    def glideVersion = '4.16.0'
-    def guavaVersion = '32.1.2'
-    def hiltVersion = '2.47'
-    def junitVersion = '4.13.2'
-    def libsuVersion = '5.2.0'
+aboutLibraries {
+    // Tasks for aboutLibraries are not run automatically to keep the build reproducible
+    // To update manually: ./gradlew app:exportLibraryDefinitions -PaboutLibraries.exportPath=src/main/res/raw
+    prettyPrint = true
+    configPath = "app/config"
+    fetchRemoteFunding = false
+    registerAndroidTasks = false
+    exclusionPatterns = [~"javax.annotation.*"]
+    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+}
 
-    annotationProcessor 'androidx.annotation:annotation:1.6.0'
+dependencies {
+    def cameraxVersion = '1.4.2'
+    def glideVersion = '4.16.0'
+    def guavaVersion = '33.4.8'
+    def hiltVersion = '2.56.2'
+    def junitVersion = '4.13.2'
+    def libsuVersion = '6.0.0'
+    def roomVersion = '2.7.1'
+
+    annotationProcessor 'androidx.annotation:annotation:1.9.1'
+    annotationProcessor "androidx.room:room-compiler:$roomVersion"
     annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion"
     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
 
-    // Ridiculous fix for a bunch of "Duplicate class" build errors:
-    implementation (platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
-
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.activity:activity:1.7.2'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.activity:activity:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation "androidx.biometric:biometric:1.1.0"
     implementation "androidx.camera:camera-camera2:$cameraxVersion"
     implementation "androidx.camera:camera-lifecycle:$cameraxVersion"
-    implementation 'androidx.camera:camera-view:1.2.3'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "androidx.core:core:1.10.1"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation "androidx.lifecycle:lifecycle-process:2.6.1"
+    implementation "androidx.camera:camera-view:$cameraxVersion"
+    implementation 'androidx.core:core:1.16.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'androidx.documentfile:documentfile:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-process:2.9.0'
     implementation "androidx.preference:preference:1.2.1"
-    implementation 'androidx.recyclerview:recyclerview:1.3.1'
-    implementation "androidx.viewpager2:viewpager2:1.0.0"
-    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation "androidx.room:room-runtime:$roomVersion"
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation "com.google.dagger:hilt-android:$hiltVersion"
     implementation 'com.github.avito-tech:krop:0.52'
@@ -162,36 +191,35 @@ dependencies {
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
     implementation "com.google.guava:guava:${guavaVersion}-android"
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'com.google.protobuf:protobuf-javalite:3.22.0'
-    implementation 'com.google.zxing:core:3.5.2'
-    implementation "com.mikepenz:iconics-core:3.2.5"
-    implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar'
-    implementation 'com.nulab-inc:zxcvbn:1.8.2'
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'com.google.protobuf:protobuf-javalite:4.31.0'
+    implementation 'com.google.zxing:core:3.5.3'
+    implementation('com.mikepenz:aboutlibraries:11.2.3') {
+        exclude group: 'com.mikepenz', module: 'aboutlibraries-core'
+    }
+    implementation 'com.mikepenz:aboutlibraries-core-android:11.2.3'
+    implementation 'com.nulab-inc:zxcvbn:1.9.0'
     implementation 'net.lingala.zip4j:zip4j:2.11.5'
-    implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.76'
-    implementation "org.simpleflatmapper:sfm-csv:8.2.3"
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.80'
+    implementation 'org.simpleflatmapper:sfm-csv:8.2.3'
 
     androidTestAnnotationProcessor "com.google.dagger:hilt-android-compiler:$hiltVersion"
     androidTestImplementation "com.google.dagger:hilt-android-testing:$hiltVersion"
-    androidTestImplementation 'androidx.test:core:1.5.0'
-    androidTestImplementation 'androidx.test:runner:1.5.2'
-    androidTestImplementation 'androidx.test:rules:1.5.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
+    androidTestImplementation 'androidx.test:core:1.6.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
     androidTestImplementation "junit:junit:${junitVersion}"
-    androidTestUtil 'androidx.test:orchestrator:1.4.2'
+    androidTestUtil 'androidx.test:orchestrator:1.5.1'
 
-    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation 'androidx.test:core:1.6.1'
     testImplementation "com.google.guava:guava:${guavaVersion}-jre"
     testImplementation "junit:junit:${junitVersion}"
-    testImplementation 'org.json:json:20230618'
-    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'org.json:json:20250517'
+    testImplementation 'org.robolectric:robolectric:4.14.1'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 }
diff --git a/app/config/libraries/krop.json b/app/config/libraries/krop.json
new file mode 100644
index 00000000..72731ef0
--- /dev/null
+++ b/app/config/libraries/krop.json
@@ -0,0 +1,6 @@
+{
+    "uniqueId": "com.github.avito-tech:krop",
+    "licenses": [
+        "MIT"
+    ]
+}
\ No newline at end of file
diff --git a/app/config/libraries/libsu.json b/app/config/libraries/libsu.json
new file mode 100644
index 00000000..3ec91d89
--- /dev/null
+++ b/app/config/libraries/libsu.json
@@ -0,0 +1,6 @@
+{
+    "uniqueId": "com.github.topjohnwu.libsu:.*::regex",
+    "licenses": [
+        "Apache-2.0"
+    ]
+}
\ No newline at end of file
diff --git a/app/config/libraries/textdrawable.json b/app/config/libraries/textdrawable.json
new file mode 100644
index 00000000..528a6354
--- /dev/null
+++ b/app/config/libraries/textdrawable.json
@@ -0,0 +1,15 @@
+{
+    "uniqueId": "com.amulyakhare:com.amulyakhare.textdrawable",
+    "funding": [
+        
+    ],
+    "developers": [
+        
+    ],
+    "artifactVersion": "1.0.1",
+    "description": "This light-weight library provides images with letter/text like the Gmail app. It extends the Drawable class thus can be used with existing/custom/network ImageView classes. Also included is a fluent interface for creating drawables and a customizable ColorGenerator.",
+    "name": "textdrawable",
+    "licenses": [
+        "MIT"
+    ]
+}
\ No newline at end of file
diff --git a/app/config/libraries/trustedintents.json b/app/config/libraries/trustedintents.json
new file mode 100644
index 00000000..5ba89066
--- /dev/null
+++ b/app/config/libraries/trustedintents.json
@@ -0,0 +1,23 @@
+{
+    "uniqueId": "info.guardianproject.trustedintents:trustedintents",
+    "funding": [
+        
+    ],
+    "developers": [
+        {
+            "name": "Guardian Project"
+        }
+    ],
+    "artifactVersion": "0.2",
+    "description": "TrustedIntents is a library for flexible trusted interactions between Android apps.  It is modeled after Android's `signature` protection level for permissions.  The key difference is that the framework allows the trusted signature to be set, rather than requiring to match the current app's signature.",
+    "scm": {
+        "connection": "scm:https://github.com/guardianproject/TrustedIntents.git",
+        "url": "scm:https://github.com/guardianproject/TrustedIntents",
+        "developerConnection": "scm:git@github.com:guardianproject/TrustedIntents.git"
+    },
+    "name": "TrustedIntents",
+    "website": "https://guardianproject.info/code/trustedintents",
+    "licenses": [
+        "3ca920d1875f7ad7ab04a2a331958577"
+    ]
+}
\ No newline at end of file
diff --git a/app/config/licenses/3ca920d1875f7ad7ab04a2a331958577.json b/app/config/licenses/3ca920d1875f7ad7ab04a2a331958577.json
new file mode 100644
index 00000000..2f0d7c2a
--- /dev/null
+++ b/app/config/licenses/3ca920d1875f7ad7ab04a2a331958577.json
@@ -0,0 +1,5 @@
+{
+    "hash": "3ca920d1875f7ad7ab04a2a331958577",
+    "url": "https://github.com/guardianproject/TrustedIntents/blob/master/LICENSE.txt",
+    "name": "LGPLv2.1"
+}
\ No newline at end of file
diff --git a/app/lint.xml b/app/lint.xml
index 4cdb0450..f9f30d6e 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <issue id="MissingTranslation" severity="ignore" />
+    <issue id="MissingQuantity" severity="ignore" />
     <issue id="InvalidPackage">
         <ignore regexp="X509LDAPCertStoreSpi" />
     </issue>
     <issue id="NotificationPermission">
         <ignore regexp="com.bumptech.glide.request.target.NotificationTarget" />
     </issue>
-    <issue id="ResourceType" severity="Warning" />
+    <issue id="UnusedResources" severity="error">
+        <ignore path="res/raw/aboutlibraries.json" />
+        <ignore regexp="res/mipmap.*/ic_launcher_debug.*.png" />
+    </issue>
 </lint>
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index a8103102..f0789326 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,7 +1,10 @@
+-keepattributes LineNumberTable,SourceFile
+-renamesourcefileattribute SourceFile
+-dontobfuscate
+
 -keepclasseswithmembers public class androidx.recyclerview.widget.RecyclerView { *; }
 -keep class com.beemdevelopment.aegis.ui.fragments.preferences.*
 -keep class com.beemdevelopment.aegis.importers.** { *; }
 -keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
 
--dontobfuscate
 -dontwarn javax.naming.**
diff --git a/app/schemas/com.beemdevelopment.aegis.database.AppDatabase/1.json b/app/schemas/com.beemdevelopment.aegis.database.AppDatabase/1.json
new file mode 100644
index 00000000..811e430c
--- /dev/null
+++ b/app/schemas/com.beemdevelopment.aegis.database.AppDatabase/1.json
@@ -0,0 +1,52 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "392278bdb797d013cb2ada67a3b1cc60",
+    "entities": [
+      {
+        "tableName": "audit_logs",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `event_type` TEXT NOT NULL, `reference` TEXT, `timestamp` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "_eventType",
+            "columnName": "event_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "_reference",
+            "columnName": "reference",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "_timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '392278bdb797d013cb2ada67a3b1cc60')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTest.java b/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTest.java
index 001facd6..a7322c3c 100644
--- a/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTest.java
+++ b/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTest.java
@@ -2,15 +2,19 @@ package com.beemdevelopment.aegis;
 
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.matcher.BoundedMatcher;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.GrantPermissionRule;
 
 import com.beemdevelopment.aegis.crypto.CryptoUtils;
 import com.beemdevelopment.aegis.crypto.SCryptParameters;
 import com.beemdevelopment.aegis.otp.OtpInfo;
+import com.beemdevelopment.aegis.ui.views.EntryHolder;
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.beemdevelopment.aegis.vault.VaultFileCredentials;
 import com.beemdevelopment.aegis.vault.VaultManager;
@@ -20,6 +24,7 @@ import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
 import com.beemdevelopment.aegis.vault.slots.SlotException;
 import com.beemdevelopment.aegis.vectors.VaultEntries;
 
+import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.junit.Before;
 import org.junit.Rule;
@@ -178,4 +183,21 @@ public abstract class AegisTest {
             }
         };
     }
+
+    @NonNull
+    protected static Matcher<RecyclerView.ViewHolder> withOtpType(Class<? extends OtpInfo> otpClass) {
+        return new BoundedMatcher<RecyclerView.ViewHolder, EntryHolder>(EntryHolder.class) {
+            @Override
+            public boolean matchesSafely(EntryHolder holder) {
+                return holder != null
+                        && holder.getEntry() != null
+                        && holder.getEntry().getInfo().getClass().equals(otpClass);
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText(String.format("with otp type '%s'", otpClass.getSimpleName()));
+            }
+        };
+    }
 }
diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTestRunner.java b/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTestRunner.java
index 44c06845..970f9ff0 100644
--- a/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTestRunner.java
+++ b/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTestRunner.java
@@ -3,8 +3,8 @@ package com.beemdevelopment.aegis;
 import android.app.Application;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.preference.PreferenceManager;
 
+import androidx.preference.PreferenceManager;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.runner.AndroidJUnitRunner;
 
diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/BackupExportTest.java b/app/src/androidTest/java/com/beemdevelopment/aegis/BackupExportTest.java
index 9f15019b..e0151395 100644
--- a/app/src/androidTest/java/com/beemdevelopment/aegis/BackupExportTest.java
+++ b/app/src/androidTest/java/com/beemdevelopment/aegis/BackupExportTest.java
@@ -61,13 +61,20 @@ import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
@@ -183,7 +190,9 @@ public class BackupExportTest extends AegisTest {
         onView(withText(R.string.export_format_html)).inRoot(RootMatchers.isPlatformPopup()).perform(click());
         onView(withId(android.R.id.button1)).perform(click());
         onView(withId(R.id.checkbox_accept)).perform(click());
-        doExport();
+        File file = doExport();
+
+        checkHtmlExport(file);
     }
 
     @Test
@@ -196,7 +205,9 @@ public class BackupExportTest extends AegisTest {
         onView(withText(R.string.export_format_html)).inRoot(RootMatchers.isPlatformPopup()).perform(click());
         onView(withId(android.R.id.button1)).perform(click());
         onView(withId(R.id.checkbox_accept)).perform(click());
-        doExport();
+        File file = doExport();
+
+        checkHtmlExport(file);
     }
 
     @Test
@@ -380,6 +391,26 @@ public class BackupExportTest extends AegisTest {
         checkReadEntries(entries);
     }
 
+    private void checkHtmlExport(File file) {
+        try (InputStream inStream = new FileInputStream(file)) {
+            Reader inReader = new InputStreamReader(inStream, StandardCharsets.UTF_8);
+            XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+            XmlPullParser parser = factory.newPullParser();
+            parser.setInput(inReader);
+            while (parser.getEventType() != XmlPullParser.START_TAG) {
+                parser.next();
+            }
+            if (!parser.getName().toLowerCase(Locale.ROOT).equals("html")) {
+                throw new RuntimeException("not an html document!");
+            }
+            while (parser.getEventType() != XmlPullParser.END_DOCUMENT) {
+                parser.next();
+            }
+        } catch (IOException | XmlPullParserException e) {
+            throw new RuntimeException("Unable to read html export file", e);
+        }
+    }
+
     private void checkReadEntries(Collection<VaultEntry> entries) {
         List<VaultEntry> vectors = VaultEntries.get();
         assertEquals(vectors.size(), entries.size());
diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java b/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java
index 643adb49..016eb5c6 100644
--- a/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java
+++ b/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java
@@ -1,13 +1,13 @@
 package com.beemdevelopment.aegis;
 
 import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static androidx.test.espresso.Espresso.openContextualActionModeOverflowMenu;
 import static androidx.test.espresso.action.ViewActions.clearText;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
 import static androidx.test.espresso.action.ViewActions.longClick;
 import static androidx.test.espresso.action.ViewActions.pressBack;
+import static androidx.test.espresso.action.ViewActions.scrollTo;
 import static androidx.test.espresso.action.ViewActions.typeText;
 import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
@@ -18,19 +18,17 @@ import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
-
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
 
 import androidx.annotation.IdRes;
-import androidx.test.core.app.ApplicationProvider;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.espresso.matcher.RootMatchers;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.beemdevelopment.aegis.encoding.Base32;
 import com.beemdevelopment.aegis.encoding.Hex;
@@ -41,6 +39,7 @@ import com.beemdevelopment.aegis.otp.TotpInfo;
 import com.beemdevelopment.aegis.otp.YandexInfo;
 import com.beemdevelopment.aegis.rules.ScreenshotTestRule;
 import com.beemdevelopment.aegis.ui.MainActivity;
+import com.beemdevelopment.aegis.ui.views.EntryAdapter;
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.beemdevelopment.aegis.vault.VaultRepository;
 import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
@@ -55,6 +54,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import dagger.hilt.android.testing.HiltAndroidTest;
 
@@ -104,19 +104,26 @@ public class OverallTest extends AegisTest {
         }
 
         for (int i = 0; i < 10; i++) {
-            onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(1, clickChildViewWithId(R.id.buttonRefresh)));
+            onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnHolderItem(withOtpType(HotpInfo.class), clickChildViewWithId(R.id.buttonRefresh)));
         }
 
-        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
+        AtomicBoolean isErrorCardShown = new AtomicBoolean(false);
+        _activityRule.getScenario().onActivity(activity -> {
+            isErrorCardShown.set(((EntryAdapter)((RecyclerView) activity.findViewById(R.id.rvKeyProfiles)).getAdapter()).isErrorCardShown());
+        });
+
+        int entryPosOffset = isErrorCardShown.get() ? 1 : 0;
+        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(entryPosOffset + 0, longClick()));
         onView(withId(R.id.action_copy)).perform(click());
 
-        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(1, longClick()));
+        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(entryPosOffset + 1, longClick()));
         onView(withId(R.id.action_edit)).perform(click());
         onView(withId(R.id.text_name)).perform(clearText(), typeText("Bob"), closeSoftKeyboard());
-        onView(withId(R.id.dropdown_group)).perform(click());
-        onView(withText(R.string.new_group)).inRoot(RootMatchers.isPlatformPopup()).perform(click());
+        onView(withId(R.id.text_group)).perform(click());
+        onView(withId(R.id.addGroup)).inRoot(RootMatchers.isDialog()).perform(click());
         onView(withId(R.id.text_input)).perform(typeText(_groupName), closeSoftKeyboard());
         onView(withId(android.R.id.button1)).perform(click());
+        onView(withText(R.string.save)).perform(click());
         onView(isRoot()).perform(pressBack());
         onView(withId(android.R.id.button1)).perform(click());
 
@@ -129,13 +136,13 @@ public class OverallTest extends AegisTest {
         changeGroupFilter(_groupName);
         changeGroupFilter(null);
 
-        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(2, longClick()));
-        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(3, click()));
-        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(4, click()));
+        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(entryPosOffset + 2, longClick()));
+        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(entryPosOffset + 3, click()));
+        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(entryPosOffset + 4, click()));
         onView(withId(R.id.action_share_qr)).perform(click());
         onView(withId(R.id.btnNext)).perform(click()).perform(click()).perform(click());
 
-        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
+        onView(withId(R.id.rvKeyProfiles)).perform(RecyclerViewActions.actionOnItemAtPosition(entryPosOffset + 0, longClick()));
         onView(allOf(isDescendantOfA(withClassName(containsString("ActionBarContextView"))), withClassName(containsString("OverflowMenuButton")))).perform(click());
         onView(withText(R.string.action_delete)).perform(click());
         onView(withId(android.R.id.button1)).perform(click());
@@ -170,12 +177,10 @@ public class OverallTest extends AegisTest {
     }
 
     private void changeGroupFilter(String text) {
-        onView(withId(R.id.chip_group)).perform(click());
         if (text == null) {
-            onView(withId(R.id.btnClear)).perform(click());
+            onView(allOf(withText(R.string.no_group), isDescendantOfA(withId(R.id.groupChipGroup)))).perform(click());
         } else {
-            onView(withText(text)).perform(click());
-            onView(isRoot()).perform(pressBack());
+            onView(allOf(withText(text), isDescendantOfA(withId(R.id.groupChipGroup)))).perform(click());
         }
     }
 
@@ -183,7 +188,7 @@ public class OverallTest extends AegisTest {
         onView(withId(R.id.fab)).perform(click());
         onView(withId(R.id.fab_enter)).perform(click());
 
-        onView(withId(R.id.accordian_header)).perform(click());
+        onView(withId(R.id.accordian_header)).perform(scrollTo(), click());
         onView(withId(R.id.text_name)).perform(typeText(entry.getName()), closeSoftKeyboard());
         onView(withId(R.id.text_issuer)).perform(typeText(entry.getIssuer()), closeSoftKeyboard());
 
@@ -203,7 +208,7 @@ public class OverallTest extends AegisTest {
                 throw new RuntimeException(String.format("Unexpected entry type: %s", entry.getInfo().getClass().getSimpleName()));
             }
 
-            onView(withId(R.id.dropdown_type)).perform(click());
+            onView(withId(R.id.dropdown_type)).perform(scrollTo(), click());
             onView(withText(otpType)).inRoot(RootMatchers.isPlatformPopup()).perform(click());
         }
 
diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/PanicTriggerTest.java b/app/src/androidTest/java/com/beemdevelopment/aegis/PanicTriggerTest.java
index 4a16356c..39feca57 100644
--- a/app/src/androidTest/java/com/beemdevelopment/aegis/PanicTriggerTest.java
+++ b/app/src/androidTest/java/com/beemdevelopment/aegis/PanicTriggerTest.java
@@ -1,7 +1,6 @@
 package com.beemdevelopment.aegis;
 
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
@@ -32,11 +31,10 @@ public class PanicTriggerTest extends AegisTest {
     @Test
     public void testPanicTriggerDisabled() {
         assertFalse(_prefs.isPanicTriggerEnabled());
+        assertTrue(_vaultManager.isVaultLoaded());
         launchPanic();
         assertTrue(_vaultManager.isVaultLoaded());
         _vaultManager.getVault();
-        assertFalse(_vaultManager.isVaultFileLoaded());
-        assertNull(_vaultManager.getVaultFileError());
         assertTrue(VaultRepository.fileExists(getApp()));
     }
 
@@ -44,11 +42,10 @@ public class PanicTriggerTest extends AegisTest {
     public void testPanicTriggerEnabled() {
         _prefs.setIsPanicTriggerEnabled(true);
         assertTrue(_prefs.isPanicTriggerEnabled());
+        assertTrue(_vaultManager.isVaultLoaded());
         launchPanic();
         assertFalse(_vaultManager.isVaultLoaded());
         assertThrows(IllegalStateException.class, () -> _vaultManager.getVault());
-        assertFalse(_vaultManager.isVaultFileLoaded());
-        assertNull(_vaultManager.getVaultFileError());
         assertFalse(VaultRepository.fileExists(getApp()));
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 724e935c..09337184 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <!-- NOTE: Disabled for now. See issue: #1047
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -27,8 +28,8 @@
         android:icon="@mipmap/${iconName}"
         android:label="Aegis"
         android:supportsRtl="true"
+        android:largeHeap="true"
         android:theme="@style/Theme.Aegis.Launch"
-        tools:replace="android:theme"
         tools:targetApi="tiramisu">
         <activity android:name=".ui.TransferEntriesActivity"
             android:label="@string/title_activity_transfer" />
@@ -82,6 +83,10 @@
         <activity
             android:name=".ui.GroupManagerActivity"
             android:label="@string/title_activity_manage_groups" />
+        <activity android:name=".ui.AssignIconsActivity"
+            android:label="@string/title_activity_assign_icons"/>
+        <activity android:name=".ui.LicensesActivity"
+            android:label="@string/title_activity_licenses"/>
         <activity
             android:name=".ui.PanicResponderActivity"
             android:exported="true"
@@ -146,7 +151,7 @@
     </application>
 
     <queries>
-        <package android:name="me.jmh.authenticatorpro" />
+        <package android:name="com.stratumauth.app" />
         <package android:name="com.authy.authy" />
         <package android:name="org.fedorahosted.freeotp" />
         <package android:name="org.liberty.android.freeotpplus" />
@@ -155,7 +160,7 @@
         <package android:name="com.valvesoftware.android.steam.community" />
         <package android:name="com.authenticator.authservice2" />
         <package android:name="com.duosecurity.duomobile" />
-        <package android:name="com.blizzard.bma" />
+        <package android:name="com.blizzard.messenger" />
     </queries>
 
 </manifest>
diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 63f508dd..62cbe4d2 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -31,6 +31,169 @@
     </head>
     <body>
         <div></div>
+        <h3>Version 3.4</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Haptic feedback when an entry is about to expire</li>
+            <li>Brightness increase is now toggleable in the entry transfer view</li>
+            <li>Filter on multiple groups simultaneously</li>
+            <li>Color contrast on hidden codes has been improved</li>
+            <li>Prompt before the user is about to save an entry with a duplicate name/issuer combination</li>
+            <li>New languages: Estonian, Korean, Malayalam, Norwegian (Bokmål) and Serbian</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>A crash could occur if an entry with period 7 exists and code expiry indication is enabled</li>
+            <li>The Portuguese (Brazilian) locale was used even if Portuguese was configured</li>
+            <li>FreeOTP import would fail if the algorithm or digits field was not specified for an entry</li>
+            <li>The divider between entries would be missing in certain filter configurations</li>
+            <li>The snackbar in try entry importing view could obstruct the name of an entry</li>
+        </ul>
+        <h4>Miscellaneous</h4>
+        <ul>
+            <li>Android 6 or newer is now required the run the app</li>
+        </ul>
+        <h3>Version 3.3.4</h3>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Icons are now resized to 512x512 to reduce the size of the vault file and to reduce the chance of encountering out of memory conditions</li>
+        </ul>
+        <h3>Version 3.3.3</h3>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Some users ran into out of memory conditions due to large icons in their vault file. We've introduced a temporary measure that should help in most cases, but we'll follow up with a more comprehensive fix soon.</li>
+            <li>Window insets were not always applied correctly, causing parts of the UI to appear off-screen</li>
+            <li>The 2FAS importer did not tolerate spaces for secrets and was not always able to extract the issuer</li>
+        </ul>
+        <h3>Version 3.3.2</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Find entries by searching in multiple fields simultaneously</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Entries would not actually be added to the Aegis vault in some cases when importing from Google Authenticator export QR codes</li>
+            <li>The lock button was sometimes shown for unencrypted vaults</li>
+            <li>The sort category menu item did not always reflect the current sorting</li>
+            <li>The next code was not always easy to read because its color had low contrast with the background</li>
+            <li>Entry selection was not cancelled when changing the group filter</li>
+        </ul>
+        <h3>Version 3.3.1</h3>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Codes were not shown in case the tiles view mode was combined with hidden account names</li>
+        </ul>
+        <h3>Version 3.3</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Significant improvements to group filtering
+                <ul>
+                    <li>Groups can now be filtered on straight from the main view instead of through a dialog</li>
+                    <li>Ability to assign multiple entries to a group in one go</li>
+                    <li>Support for reordering groups</li>
+                </ul>
+            </li>
+            <li>Codes now change color when they're about to expire</li>
+            <li>Option to show the next code ahead of time</li>
+            <li>Support for backing up to a single file (This enables support for more cloud providers, such as Google Drive)</li>
+            <li>Various minor improvements to make QR code exports easier to scan</li>
+            <li>Support for importing from Ente Auth</li>
+            <li>Support for importing FreeOTP 2 backups</li>
+            <li>Updated translations</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>QR codes exported for Google Authenticator could not be scanned on iOS</li>
+            <li>The code would be copied after a single tap in case "Tap to reveal" and "Copy tokens to the clipboard" were enabled simultaneously</li>
+            <li>Various other minor UI, stability and performance improvements</li>
+        </ul>
+        <h3>Version 3.2</h3>
+        <h4>New</h4>
+        <ul>
+            <li>The ability to add a single entry to multiple groups</li>
+            <li>Option to keep an infinite number of backups</li>
+            <li>Option to customize which fields to search for in entries</li>
+            <li>Allow hiding entry names in the tiled view mode</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>With "Tap to reveal" enabled, the size of the shown dots would not be consistent with the size of the code digits, on some devices</li>
+            <li>After importing a backup, the UI would in some cases incorrectly claim that biometric unlock is enabled</li>
+            <li>The export dialog was not fully visible on some devices</li>
+            <li>Various other minor UI, stability and performance improvements</li>
+        </ul>
+        <h3>Version 3.1.1</h3>
+        <h4>Fixes</h4>
+        <p>
+            A recent Android Pixel update introduced a bug causing Aegis to sometimes show a black screen after unlocking the vault.
+            We have reported this issue to the Google Issue Tracker (<a href="https://issuetracker.google.com/issues/352963108">link</a>) and
+            are awaiting a response from Google. In the meantime, we have implemented a workaround that eliminates this bug.
+        </p>
+        <ul>
+            <li>Group filter now gets applied properly upon unlocking the vault</li>
+            <li>Advanced entry settings now gets shown correctly</li>
+            <li>Keyboard when searching for entries now gets hidden when the user starts scrolling through the list</li>
+        </ul>
+        <h3>Version 3.1</h3>
+        <h4>New</h4>
+        <ul>
+            <li>A new audit log has been added to check all important events that occurred in your vault</li>
+            <li>Added the ability to rename groups</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Group selection will now be remembered again upon launch</li>
+            <li>Various UI improvements</li>
+            <li>Stability fixes</li>
+        </ul>
+        <h3>Version 3.0.1</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Support for importing from the new Battle.net app</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Visual glitches when AMOLED theme was used on old Android versions</li>
+            <li>Minor UI improvements</li>
+        </ul>
+        <h3>Version 3.0</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Material 3 (and Material You)</li>
+            <li>Automatic assignment of icons to entries</li>
+            <li>Ability to select all entries in one go</li>
+            <li>Support for importing 2FAS schema v4 backups</li>
+            <li>Sort entries based on the last time they were used</li>
+            <li>Some clarifications related to importing and backup permission errors</li>
+            <li>Preparations for the ability to assign a single entry to multiple groups</li>
+            <li>Performance improvements when scrolling through an entry list with lots of icons</li>
+            <li>A new look for the third-party licenses list</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Directly importing from Authy using root would fail</li>
+            <li>Minor glitches related to animation duration scale settings</li>
+            <li>Various stability improvements</li>
+        </ul>
+        <h3>Version 2.2.2</h3>
+        <h4>New</h4>
+        <ul>
+            <li>An optional name field for icon packs to bypass filename character restrictions</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>The Authenticator Pro importer only supported the legacy backup format</li>
+            <li>A crash could occur in the tile service</li>
+        </ul>
+        <h3>Version 2.2.1</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Ability to automatically skip potential duplicates when importing entries</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Biometrics button on the unlock screen was unresponsive</li>
+        </ul>
         <h3>Version 2.2</h3>
         <h4>New</h4>
         <ul>
diff --git a/app/src/main/java/com/amulyakhare/textdrawable/LICENSE b/app/src/main/java/com/amulyakhare/textdrawable/LICENSE
new file mode 100644
index 00000000..f8646616
--- /dev/null
+++ b/app/src/main/java/com/amulyakhare/textdrawable/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Amulya Khare
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/app/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java b/app/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
new file mode 100644
index 00000000..f4105715
--- /dev/null
+++ b/app/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
@@ -0,0 +1,316 @@
+package com.amulyakhare.textdrawable;
+
+import android.graphics.*;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.OvalShape;
+import android.graphics.drawable.shapes.RectShape;
+import android.graphics.drawable.shapes.RoundRectShape;
+
+/**
+ * @author amulya
+ * @datetime 14 Oct 2014, 3:53 PM
+ */
+public class TextDrawable extends ShapeDrawable {
+
+    private final Paint textPaint;
+    private final Paint borderPaint;
+    private static final float SHADE_FACTOR = 0.9f;
+    private final String text;
+    private final int color;
+    private final RectShape shape;
+    private final int height;
+    private final int width;
+    private final int fontSize;
+    private final float radius;
+    private final int borderThickness;
+
+    private TextDrawable(Builder builder) {
+        super(builder.shape);
+
+        // shape properties
+        shape = builder.shape;
+        height = builder.height;
+        width = builder.width;
+        radius = builder.radius;
+
+        // text and color
+        text = builder.toUpperCase ? builder.text.toUpperCase() : builder.text;
+        color = builder.color;
+
+        // text paint settings
+        fontSize = builder.fontSize;
+        textPaint = new Paint();
+        textPaint.setColor(builder.textColor);
+        textPaint.setAntiAlias(true);
+        textPaint.setFakeBoldText(builder.isBold);
+        textPaint.setStyle(Paint.Style.FILL);
+        textPaint.setTypeface(builder.font);
+        textPaint.setTextAlign(Paint.Align.CENTER);
+        textPaint.setStrokeWidth(builder.borderThickness);
+
+        // border paint settings
+        borderThickness = builder.borderThickness;
+        borderPaint = new Paint();
+        borderPaint.setColor(getDarkerShade(color));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(borderThickness);
+
+        // drawable paint color
+        Paint paint = getPaint();
+        paint.setColor(color);
+
+    }
+
+    private int getDarkerShade(int color) {
+        return Color.rgb((int)(SHADE_FACTOR * Color.red(color)),
+                (int)(SHADE_FACTOR * Color.green(color)),
+                (int)(SHADE_FACTOR * Color.blue(color)));
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        Rect r = getBounds();
+
+
+        // draw border
+        if (borderThickness > 0) {
+            drawBorder(canvas);
+        }
+
+        int count = canvas.save();
+        canvas.translate(r.left, r.top);
+
+        // draw text
+        int width = this.width < 0 ? r.width() : this.width;
+        int height = this.height < 0 ? r.height() : this.height;
+        int fontSize = this.fontSize < 0 ? (Math.min(width, height) / 2) : this.fontSize;
+        textPaint.setTextSize(fontSize);
+        canvas.drawText(text, width / 2, height / 2 - ((textPaint.descent() + textPaint.ascent()) / 2), textPaint);
+
+        canvas.restoreToCount(count);
+
+    }
+
+    private void drawBorder(Canvas canvas) {
+        RectF rect = new RectF(getBounds());
+        rect.inset(borderThickness/2, borderThickness/2);
+
+        if (shape instanceof OvalShape) {
+            canvas.drawOval(rect, borderPaint);
+        }
+        else if (shape instanceof RoundRectShape) {
+            canvas.drawRoundRect(rect, radius, radius, borderPaint);
+        }
+        else {
+            canvas.drawRect(rect, borderPaint);
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        textPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+        textPaint.setColorFilter(cf);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return width;
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return height;
+    }
+
+    public static IShapeBuilder builder() {
+        return new Builder();
+    }
+
+    public static class Builder implements IConfigBuilder, IShapeBuilder, IBuilder {
+
+        private String text;
+
+        private int color;
+
+        private int borderThickness;
+
+        private int width;
+
+        private int height;
+
+        private Typeface font;
+
+        private RectShape shape;
+
+        public int textColor;
+
+        private int fontSize;
+
+        private boolean isBold;
+
+        private boolean toUpperCase;
+
+        public float radius;
+
+        private Builder() {
+            text = "";
+            color = Color.GRAY;
+            textColor = Color.WHITE;
+            borderThickness = 0;
+            width = -1;
+            height = -1;
+            shape = new RectShape();
+            font = Typeface.create("sans-serif-light", Typeface.NORMAL);
+            fontSize = -1;
+            isBold = false;
+            toUpperCase = false;
+        }
+
+        public IConfigBuilder width(int width) {
+            this.width = width;
+            return this;
+        }
+
+        public IConfigBuilder height(int height) {
+            this.height = height;
+            return this;
+        }
+
+        public IConfigBuilder textColor(int color) {
+            this.textColor = color;
+            return this;
+        }
+
+        public IConfigBuilder withBorder(int thickness) {
+            this.borderThickness = thickness;
+            return this;
+        }
+
+        public IConfigBuilder useFont(Typeface font) {
+            this.font = font;
+            return this;
+        }
+
+        public IConfigBuilder fontSize(int size) {
+            this.fontSize = size;
+            return this;
+        }
+
+        public IConfigBuilder bold() {
+            this.isBold = true;
+            return this;
+        }
+
+        public IConfigBuilder toUpperCase() {
+            this.toUpperCase = true;
+            return this;
+        }
+
+        @Override
+        public IConfigBuilder beginConfig() {
+            return this;
+        }
+
+        @Override
+        public IShapeBuilder endConfig() {
+            return this;
+        }
+
+        @Override
+        public IBuilder rect() {
+            this.shape = new RectShape();
+            return this;
+        }
+
+        @Override
+        public IBuilder round() {
+            this.shape = new OvalShape();
+            return this;
+        }
+
+        @Override
+        public IBuilder roundRect(int radius) {
+            this.radius = radius;
+            float[] radii = {radius, radius, radius, radius, radius, radius, radius, radius};
+            this.shape = new RoundRectShape(radii, null, null);
+            return this;
+        }
+
+        @Override
+        public TextDrawable buildRect(String text, int color) {
+            rect();
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable buildRoundRect(String text, int color, int radius) {
+            roundRect(radius);
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable buildRound(String text, int color) {
+            round();
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable build(String text, int color) {
+            this.color = color;
+            this.text = text;
+            return new TextDrawable(this);
+        }
+    }
+
+    public interface IConfigBuilder {
+        public IConfigBuilder width(int width);
+
+        public IConfigBuilder height(int height);
+
+        public IConfigBuilder textColor(int color);
+
+        public IConfigBuilder withBorder(int thickness);
+
+        public IConfigBuilder useFont(Typeface font);
+
+        public IConfigBuilder fontSize(int size);
+
+        public IConfigBuilder bold();
+
+        public IConfigBuilder toUpperCase();
+
+        public IShapeBuilder endConfig();
+    }
+
+    public static interface IBuilder {
+
+        public TextDrawable build(String text, int color);
+    }
+
+    public static interface IShapeBuilder {
+
+        public IConfigBuilder beginConfig();
+
+        public IBuilder rect();
+
+        public IBuilder round();
+
+        public IBuilder roundRect(int radius);
+
+        public TextDrawable buildRect(String text, int color);
+
+        public TextDrawable buildRoundRect(String text, int color, int radius);
+
+        public TextDrawable buildRound(String text, int color);
+    }
+}
diff --git a/app/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java b/app/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
new file mode 100644
index 00000000..7efe7d5d
--- /dev/null
+++ b/app/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
@@ -0,0 +1,69 @@
+package com.amulyakhare.textdrawable.util;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * @author amulya
+ * @datetime 14 Oct 2014, 5:20 PM
+ */
+public class ColorGenerator {
+
+    public static ColorGenerator DEFAULT;
+
+    public static ColorGenerator MATERIAL;
+
+    static {
+        DEFAULT = create(Arrays.asList(
+                0xfff16364,
+                0xfff58559,
+                0xfff9a43e,
+                0xffe4c62e,
+                0xff67bf74,
+                0xff59a2be,
+                0xff2093cd,
+                0xffad62a7,
+                0xff805781
+        ));
+        MATERIAL = create(Arrays.asList(
+                0xffe57373,
+                0xfff06292,
+                0xffba68c8,
+                0xff9575cd,
+                0xff7986cb,
+                0xff64b5f6,
+                0xff4fc3f7,
+                0xff4dd0e1,
+                0xff4db6ac,
+                0xff81c784,
+                0xffaed581,
+                0xffff8a65,
+                0xffd4e157,
+                0xffffd54f,
+                0xffffb74d,
+                0xffa1887f,
+                0xff90a4ae
+        ));
+    }
+
+    private final List<Integer> mColors;
+    private final Random mRandom;
+
+    public static ColorGenerator create(List<Integer> colorList) {
+        return new ColorGenerator(colorList);
+    }
+
+    private ColorGenerator(List<Integer> colorList) {
+        mColors = colorList;
+        mRandom = new Random(System.currentTimeMillis());
+    }
+
+    public int getRandomColor() {
+        return mColors.get(mRandom.nextInt(mColors.size()));
+    }
+
+    public int getColor(Object key) {
+        return mColors.get(Math.abs(key.hashCode()) % mColors.size());
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/AegisApplicationBase.java b/app/src/main/java/com/beemdevelopment/aegis/AegisApplicationBase.java
index f7ba8ce4..2d973fa7 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/AegisApplicationBase.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/AegisApplicationBase.java
@@ -22,8 +22,6 @@ import com.beemdevelopment.aegis.receivers.VaultLockReceiver;
 import com.beemdevelopment.aegis.ui.MainActivity;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.vault.VaultManager;
-import com.mikepenz.iconics.Iconics;
-import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.Collections;
@@ -48,9 +46,6 @@ public abstract class AegisApplicationBase extends Application {
         super.onCreate();
         _vaultManager = EarlyEntryPoints.get(this, EntryPoint.class).getVaultManager();
 
-        Iconics.init(this);
-        Iconics.registerFont(new MaterialDesignIconic());
-
         VaultLockReceiver lockReceiver = new VaultLockReceiver();
         IntentFilter intentFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
         ContextCompat.registerReceiver(this, lockReceiver, intentFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/AegisBackupAgent.java b/app/src/main/java/com/beemdevelopment/aegis/AegisBackupAgent.java
index 05cf4047..3a08e6e5 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/AegisBackupAgent.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/AegisBackupAgent.java
@@ -8,6 +8,8 @@ import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
+import com.beemdevelopment.aegis.database.AppDatabase;
+import com.beemdevelopment.aegis.database.AuditLogRepository;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.vault.VaultFile;
 import com.beemdevelopment.aegis.vault.VaultRepository;
@@ -25,12 +27,16 @@ public class AegisBackupAgent extends BackupAgent {
 
     private Preferences _prefs;
 
+    private AuditLogRepository _auditLogRepository;
+
     @Override
     public void onCreate() {
         super.onCreate();
 
         // Cannot use injection with Dagger Hilt here, because the app is launched in a restricted mode on restore
         _prefs = new Preferences(this);
+        AppDatabase appDatabase = AegisModule.provideAppDatabase(this);
+        _auditLogRepository = AegisModule.provideAuditLogRepository(appDatabase);
     }
 
     @Override
@@ -53,6 +59,7 @@ public class AegisBackupAgent extends BackupAgent {
         // report any runtime exceptions, in addition to the expected IOExceptions.
         try {
             fullBackup(data);
+            _auditLogRepository.addAndroidBackupCreatedEvent();
             _prefs.setAndroidBackupResult(new Preferences.BackupResult(null));
         } catch (Exception e) {
             Log.e(TAG, String.format("onFullBackup() failed: %s", e));
diff --git a/app/src/main/java/com/beemdevelopment/aegis/AegisModule.java b/app/src/main/java/com/beemdevelopment/aegis/AegisModule.java
index 6172c122..bdaae0d4 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/AegisModule.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/AegisModule.java
@@ -2,6 +2,11 @@ package com.beemdevelopment.aegis;
 
 import android.content.Context;
 
+import androidx.room.Room;
+
+import com.beemdevelopment.aegis.database.AppDatabase;
+import com.beemdevelopment.aegis.database.AuditLogDao;
+import com.beemdevelopment.aegis.database.AuditLogRepository;
 import com.beemdevelopment.aegis.icons.IconPackManager;
 import com.beemdevelopment.aegis.vault.VaultManager;
 
@@ -24,12 +29,27 @@ public class AegisModule {
 
     @Provides
     @Singleton
-    public static VaultManager provideVaultManager(@ApplicationContext Context context) {
-        return new VaultManager(context);
+    public static AuditLogRepository provideAuditLogRepository(AppDatabase appDatabase) {
+        AuditLogDao auditLogDao = appDatabase.auditLogDao();
+        return new AuditLogRepository(auditLogDao);
+    }
+
+    @Provides
+    @Singleton
+    public static VaultManager provideVaultManager(@ApplicationContext Context context, AuditLogRepository auditLogRepository) {
+        return new VaultManager(context, auditLogRepository);
     }
 
     @Provides
     public static Preferences providePreferences(@ApplicationContext Context context) {
         return new Preferences(context);
     }
+
+    @Provides
+    @Singleton
+    public static AppDatabase provideAppDatabase(@ApplicationContext Context context) {
+        return Room.databaseBuilder(context.getApplicationContext(),
+                        AppDatabase.class, "aegis-db")
+                .build();
+    }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/BackupsVersioningStrategy.java b/app/src/main/java/com/beemdevelopment/aegis/BackupsVersioningStrategy.java
new file mode 100644
index 00000000..0e06954f
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/BackupsVersioningStrategy.java
@@ -0,0 +1,7 @@
+package com.beemdevelopment.aegis;
+
+public enum BackupsVersioningStrategy {
+    UNDEFINED,
+    MULTIPLE_BACKUPS,
+    SINGLE_BACKUP
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/EventType.java b/app/src/main/java/com/beemdevelopment/aegis/EventType.java
new file mode 100644
index 00000000..4588ee01
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/EventType.java
@@ -0,0 +1,42 @@
+package com.beemdevelopment.aegis;
+
+public enum EventType {
+
+    VAULT_UNLOCKED,
+    VAULT_BACKUP_CREATED,
+    VAULT_ANDROID_BACKUP_CREATED,
+    VAULT_EXPORTED,
+    ENTRY_SHARED,
+    VAULT_UNLOCK_FAILED_PASSWORD,
+    VAULT_UNLOCK_FAILED_BIOMETRICS;
+    private static EventType[] _values;
+
+    static {
+        _values = values();
+    }
+
+    public static EventType fromInteger(int x) {
+        return _values[x];
+    }
+
+    public static int getEventTitleRes(EventType eventType) {
+        switch (eventType) {
+            case VAULT_UNLOCKED:
+                return R.string.event_title_vault_unlocked;
+            case VAULT_BACKUP_CREATED:
+                return R.string.event_title_backup_created;
+            case VAULT_ANDROID_BACKUP_CREATED:
+                return R.string.event_title_android_backup_created;
+            case VAULT_EXPORTED:
+                return R.string.event_title_vault_exported;
+            case ENTRY_SHARED:
+                return R.string.event_title_entry_shared;
+            case VAULT_UNLOCK_FAILED_PASSWORD:
+                return R.string.event_title_vault_unlock_failed_password;
+            case VAULT_UNLOCK_FAILED_BIOMETRICS:
+                return R.string.event_title_vault_unlock_failed_biometrics;
+            default:
+                return R.string.event_unknown;
+        }
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/GroupPlaceholderType.java b/app/src/main/java/com/beemdevelopment/aegis/GroupPlaceholderType.java
new file mode 100644
index 00000000..6169e808
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/GroupPlaceholderType.java
@@ -0,0 +1,20 @@
+package com.beemdevelopment.aegis;
+
+public enum GroupPlaceholderType {
+    ALL,
+    NEW_GROUP,
+    NO_GROUP;
+
+    public int getStringRes() {
+        switch (this) {
+            case ALL:
+                return R.string.all;
+            case NEW_GROUP:
+                return R.string.new_group;
+            case NO_GROUP:
+                return R.string.no_group;
+            default:
+                throw new IllegalArgumentException("Unexpected placeholder type: " + this);
+        }
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/Preferences.java b/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
index e2339212..7ccda05f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
@@ -5,12 +5,15 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
-import android.preference.PreferenceManager;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.provider.DocumentsContractCompat;
+import androidx.preference.PreferenceManager;
 
 import com.beemdevelopment.aegis.util.JsonUtils;
 import com.beemdevelopment.aegis.util.TimeUtils;
+import com.beemdevelopment.aegis.vault.VaultBackupPermissionException;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -20,9 +23,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
 public class Preferences {
@@ -31,12 +36,26 @@ public class Preferences {
     public static final int AUTO_LOCK_ON_MINIMIZE = 1 << 2;
     public static final int AUTO_LOCK_ON_DEVICE_LOCK = 1 << 3;
 
+    public static final int SEARCH_IN_ISSUER = 1 << 0;
+    public static final int SEARCH_IN_NAME = 1 << 1;
+    public static final int SEARCH_IN_NOTE = 1 << 2;
+    public static final int SEARCH_IN_GROUPS = 1 << 3;
+
+    public static final int BACKUPS_VERSIONS_INFINITE = -1;
+
     public static final int[] AUTO_LOCK_SETTINGS = {
             AUTO_LOCK_ON_BACK_BUTTON,
             AUTO_LOCK_ON_MINIMIZE,
             AUTO_LOCK_ON_DEVICE_LOCK
     };
 
+    public static final int[] SEARCH_BEHAVIOR_SETTINGS = {
+            SEARCH_IN_ISSUER,
+            SEARCH_IN_NAME,
+            SEARCH_IN_NOTE,
+            SEARCH_IN_GROUPS
+    };
+
     private SharedPreferences _prefs;
 
     public Preferences(Context context) {
@@ -67,10 +86,18 @@ public class Preferences {
         return _prefs.getBoolean("pref_tap_to_reveal", false);
     }
 
+    public boolean isGroupMultiselectEnabled() {
+        return _prefs.getBoolean("pref_groups_multiselect", false);
+    }
+
     public boolean isEntryHighlightEnabled() {
         return _prefs.getBoolean("pref_highlight_entry", false);
     }
 
+    public boolean isHapticFeedbackEnabled() {
+        return _prefs.getBoolean("pref_haptic_feedback", true);
+    }
+
     public boolean isPauseFocusedEnabled() {
         boolean dependenciesEnabled = isTapToRevealEnabled() || isEntryHighlightEnabled();
         if (!dependenciesEnabled) return false;
@@ -136,12 +163,24 @@ public class Preferences {
         return _prefs.getBoolean("pref_show_icons", true);
     }
 
+    public boolean getShowNextCode() {
+        return _prefs.getBoolean("pref_show_next_code", false);
+    }
+
+    public boolean getShowExpirationState() {
+        return _prefs.getBoolean("pref_expiration_state", true);
+    }
+
     public CodeGrouping getCodeGroupSize() {
         String value = _prefs.getString("pref_code_group_size_string", "GROUPING_THREES");
 
         return CodeGrouping.valueOf(value);
     }
 
+    public void setCodeGroupSize(CodeGrouping codeGroupSize) {
+        _prefs.edit().putString("pref_code_group_size_string", codeGroupSize.name()).apply();
+    }
+
     public boolean isIntroDone() {
         return _prefs.getBoolean("pref_intro", false);
     }
@@ -155,6 +194,20 @@ public class Preferences {
         return _prefs.getInt("pref_auto_lock_mask", def);
     }
 
+    public int getSearchBehaviorMask() {
+        final int def = SEARCH_IN_ISSUER | SEARCH_IN_NAME;
+
+        return _prefs.getInt("pref_search_behavior_mask", def);
+    }
+
+    public boolean isSearchBehaviorTypeEnabled(int searchBehaviorType) {
+        return (getSearchBehaviorMask() & searchBehaviorType) == searchBehaviorType;
+    }
+
+    public void setSearchBehaviorMask(int searchBehavior) {
+        _prefs.edit().putInt("pref_search_behavior_mask", searchBehavior).apply();
+    }
+
     public boolean isAutoLockEnabled() {
         return getAutoLockMask() != AUTO_LOCK_OFF;
     }
@@ -195,6 +248,10 @@ public class Preferences {
         _prefs.edit().putInt("pref_current_theme", theme.ordinal()).apply();
     }
 
+    public boolean isDynamicColorsEnabled() {
+        return _prefs.getBoolean("pref_dynamic_colors", false);
+    }
+
     public ViewMode getCurrentViewMode() {
         return ViewMode.fromInteger(_prefs.getInt("pref_current_view_mode", 0));
     }
@@ -224,10 +281,51 @@ public class Preferences {
         setUsageCount(usageCounts);
     }
 
+    public long getLastUsedTimestamp(UUID uuid) {
+        Map<UUID, Long> timestamps = getLastUsedTimestamps();
+        if (timestamps != null && timestamps.size() > 0){
+            Long timestamp = timestamps.get(uuid);
+            return timestamp != null ? timestamp : 0;
+        }
+
+        return 0;
+    }
+
     public void clearUsageCount() {
         _prefs.edit().remove("pref_usage_count").apply();
     }
 
+    public Map<UUID, Long> getLastUsedTimestamps() {
+        Map<UUID, Long> lastUsedTimestamps = new HashMap<>();
+        String lastUsedTimestamp = _prefs.getString("pref_last_used_timestamps", "");
+        try {
+            JSONArray arr = new JSONArray(lastUsedTimestamp);
+            for (int i = 0; i < arr.length(); i++) {
+                JSONObject json = arr.getJSONObject(i);
+                lastUsedTimestamps.put(UUID.fromString(json.getString("uuid")), json.getLong("timestamp"));
+            }
+        } catch (JSONException ignored) {
+        }
+
+        return lastUsedTimestamps;
+    }
+
+    public void setLastUsedTimestamps(Map<UUID, Long> lastUsedTimestamps) {
+        JSONArray lastUsedTimestampJson = new JSONArray();
+        for (Map.Entry<UUID, Long> entry : lastUsedTimestamps.entrySet()) {
+            JSONObject entryJson = new JSONObject();
+            try {
+                entryJson.put("uuid", entry.getKey());
+                entryJson.put("timestamp", entry.getValue());
+                lastUsedTimestampJson.put(entryJson);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+
+        _prefs.edit().putString("pref_last_used_timestamps", lastUsedTimestampJson.toString()).apply();
+    }
+
     public Map<UUID, Integer> getUsageCounts() {
         Map<UUID, Integer> usageCounts = new HashMap<>();
         String usageCount = _prefs.getString("pref_usage_count", "");
@@ -263,8 +361,16 @@ public class Preferences {
         return _prefs.getInt("pref_timeout", -1);
     }
 
+    public String getLanguage() {
+        return _prefs.getString("pref_lang", "system");
+    }
+
+    public void setLanguage(String lang) {
+        _prefs.edit().putString("pref_lang", lang).apply();
+    }
+
     public Locale getLocale() {
-        String lang = _prefs.getString("pref_lang", "system");
+        String lang = getLanguage();
 
         if (lang.equals("system")) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -478,26 +584,39 @@ public class Preferences {
         return _prefs.getBoolean("pref_minimize_on_copy", false);
     }
 
-    public void setGroupFilter(List<String> groupFilter) {
+    public void setGroupFilter(Set<UUID> groupFilter) {
         JSONArray json = new JSONArray(groupFilter);
-        _prefs.edit().putString("pref_group_filter", json.toString()).apply();
+        _prefs.edit().putString("pref_group_filter_uuids", json.toString()).apply();
     }
 
-    public List<String> getGroupFilter() {
-        String raw = _prefs.getString("pref_group_filter", null);
+    public Set<UUID> getGroupFilter() {
+        String raw = _prefs.getString("pref_group_filter_uuids", null);
         if (raw == null || raw.isEmpty()) {
-            return Collections.emptyList();
+            return Collections.emptySet();
         }
 
         try {
             JSONArray json = new JSONArray(raw);
-            List<String> filter = new ArrayList<>();
+            Set<UUID> filter = new HashSet<>();
             for (int i = 0; i < json.length(); i++) {
-                filter.add(json.isNull(i) ? null : json.optString(i));
+                filter.add(json.isNull(i) ? null : UUID.fromString(json.getString(i)));
             }
             return filter;
         } catch (JSONException e) {
-            return Collections.emptyList();
+            return Collections.emptySet();
+        }
+    }
+
+    @NonNull
+    public BackupsVersioningStrategy getBackupVersioningStrategy() {
+        Uri uri = getBackupsLocation();
+        if (uri == null) {
+            return BackupsVersioningStrategy.UNDEFINED;
+        }
+        if (DocumentsContractCompat.isTreeUri(uri)) {
+            return BackupsVersioningStrategy.MULTIPLE_BACKUPS;
+        } else {
+            return BackupsVersioningStrategy.SINGLE_BACKUP;
         }
     }
 
@@ -505,14 +624,16 @@ public class Preferences {
         private final Date _time;
         private boolean _isBuiltIn;
         private final String _error;
+        private final boolean _isPermissionError;
 
         public BackupResult(@Nullable Exception e) {
-            this(new Date(), e == null ? null : e.toString());
+            this(new Date(), e == null ? null : e.toString(), e instanceof VaultBackupPermissionException);
         }
 
-        private BackupResult(Date time, @Nullable String error) {
+        private BackupResult(Date time, @Nullable String error, boolean isPermissionError) {
             _time = time;
             _error = error;
+            _isPermissionError = isPermissionError;
         }
 
         @Nullable
@@ -540,12 +661,17 @@ public class Preferences {
             _isBuiltIn = isBuiltIn;
         }
 
+        public boolean isPermissionError() {
+            return _isPermissionError;
+        }
+
         public String toJson() {
             JSONObject obj = new JSONObject();
 
             try {
                 obj.put("time", _time.getTime());
                 obj.put("error", _error == null ? JSONObject.NULL : _error);
+                obj.put("isPermissionError", _isPermissionError);
             } catch (JSONException e) {
                 throw new RuntimeException(e);
             }
@@ -557,7 +683,8 @@ public class Preferences {
             JSONObject obj = new JSONObject(json);
             long time = obj.getLong("time");
             String error = JsonUtils.optString(obj, "error");
-            return new BackupResult(new Date(time), error);
+            boolean isPermissionError = obj.optBoolean("isPermissionError");
+            return new BackupResult(new Date(time), error, isPermissionError);
         }
     }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/SortCategory.java b/app/src/main/java/com/beemdevelopment/aegis/SortCategory.java
index 5b3a9a90..a7b3f664 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/SortCategory.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/SortCategory.java
@@ -1,5 +1,6 @@
 package com.beemdevelopment.aegis;
 
+import com.beemdevelopment.aegis.helpers.comparators.LastUsedComparator;
 import com.beemdevelopment.aegis.helpers.comparators.UsageCountComparator;
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.beemdevelopment.aegis.helpers.comparators.AccountNameComparator;
@@ -14,7 +15,8 @@ public enum SortCategory {
     ACCOUNT_REVERSED,
     ISSUER,
     ISSUER_REVERSED,
-    USAGE_COUNT;
+    USAGE_COUNT,
+    LAST_USED;
 
     private static SortCategory[] _values;
 
@@ -31,20 +33,22 @@ public enum SortCategory {
 
         switch (this) {
             case ACCOUNT:
-                comparator = new AccountNameComparator();
+                comparator = new AccountNameComparator().thenComparing(new IssuerNameComparator());
                 break;
             case ACCOUNT_REVERSED:
-                comparator = Collections.reverseOrder(new AccountNameComparator());
+                comparator = Collections.reverseOrder(new AccountNameComparator().thenComparing(new IssuerNameComparator()));
                 break;
             case ISSUER:
-                comparator = new IssuerNameComparator();
+                comparator = new IssuerNameComparator().thenComparing(new AccountNameComparator());
                 break;
             case ISSUER_REVERSED:
-                comparator = Collections.reverseOrder(new IssuerNameComparator());
+                comparator = Collections.reverseOrder(new IssuerNameComparator().thenComparing(new AccountNameComparator()));
                 break;
             case USAGE_COUNT:
                 comparator = Collections.reverseOrder(new UsageCountComparator());
                 break;
+            case LAST_USED:
+                comparator = Collections.reverseOrder(new LastUsedComparator());
         }
 
         return comparator;
@@ -64,6 +68,8 @@ public enum SortCategory {
                 return R.id.menu_sort_alphabetically_reverse;
             case USAGE_COUNT:
                 return R.id.menu_sort_usage_count;
+            case LAST_USED:
+                return R.id.menu_sort_last_used;
             default:
                 return R.id.menu_sort_custom;
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ThemeMap.java b/app/src/main/java/com/beemdevelopment/aegis/ThemeMap.java
index 65b77625..26859bc6 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ThemeMap.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ThemeMap.java
@@ -10,20 +10,8 @@ public class ThemeMap {
     }
 
     public static final Map<Theme, Integer> DEFAULT = ImmutableMap.of(
-            Theme.LIGHT, R.style.Theme_Aegis_Light_Default,
-            Theme.DARK, R.style.Theme_Aegis_Dark_Default,
-            Theme.AMOLED, R.style.Theme_Aegis_TrueDark_Default
-    );
-
-    public static final Map<Theme, Integer> NO_ACTION_BAR = ImmutableMap.of(
-            Theme.LIGHT, R.style.Theme_Aegis_Light_NoActionBar,
-            Theme.DARK, R.style.Theme_Aegis_Dark_NoActionBar,
-            Theme.AMOLED, R.style.Theme_Aegis_TrueDark_NoActionBar
-    );
-
-    public static final Map<Theme, Integer> FULLSCREEN = ImmutableMap.of(
-            Theme.LIGHT, R.style.Theme_Aegis_Light_Fullscreen,
-            Theme.DARK, R.style.Theme_Aegis_Dark_Fullscreen,
-            Theme.AMOLED, R.style.Theme_Aegis_TrueDark_Fullscreen
+            Theme.LIGHT, R.style.Theme_Aegis_Light,
+            Theme.DARK, R.style.Theme_Aegis_Dark,
+            Theme.AMOLED, R.style.Theme_Aegis_Amoled
     );
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/VibrationPatterns.java b/app/src/main/java/com/beemdevelopment/aegis/VibrationPatterns.java
new file mode 100644
index 00000000..6e8de25f
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/VibrationPatterns.java
@@ -0,0 +1,12 @@
+package com.beemdevelopment.aegis;
+
+import java.util.Arrays;
+
+public class VibrationPatterns {
+    public static final long[] EXPIRING = {475, 20, 5, 20, 965, 20, 5, 20, 965, 20, 5, 20, 420};
+    public static final long[] REFRESH_CODE = {0, 100};
+
+    public static long getLengthInMillis(long[] pattern) {
+        return Arrays.stream(pattern).sum();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java b/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java
index 9d349850..a962aa5c 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java
@@ -35,19 +35,19 @@ public enum ViewMode {
     }
 
     /**
-     * Retrieves the height (in dp) that the divider between entries should have in this view mode.
+     * Retrieves the offset (in dp) that should exist between entries in this view mode.
      */
-    public float getDividerHeight() {
+    public float getItemOffset() {
         if (this == ViewMode.COMPACT) {
-            return 0;
+            return 1;
         } else if (this == ViewMode.TILES) {
             return 4;
         }
 
-        return 20;
+        return 8;
     }
 
-    public int getColumnSpan() {
+    public int getSpanCount() {
         if (this == ViewMode.TILES) {
             return 2;
         }
@@ -55,14 +55,6 @@ public enum ViewMode {
         return 1;
     }
 
-    public float getDividerWidth() {
-        if (this == ViewMode.TILES) {
-            return 4;
-        }
-
-        return 0;
-    }
-
     public String getFormattedAccountName(String accountName) {
         if (this == ViewMode.TILES) {
             return accountName;
diff --git a/app/src/main/java/com/beemdevelopment/aegis/crypto/CryptoUtils.java b/app/src/main/java/com/beemdevelopment/aegis/crypto/CryptoUtils.java
index 95ef8f7f..00b2bd61 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/crypto/CryptoUtils.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/crypto/CryptoUtils.java
@@ -1,7 +1,5 @@
 package com.beemdevelopment.aegis.crypto;
 
-import android.os.Build;
-
 import com.beemdevelopment.aegis.crypto.bc.SCrypt;
 
 import java.io.ByteArrayOutputStream;
@@ -23,7 +21,6 @@ import javax.crypto.KeyGenerator;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 public class CryptoUtils {
@@ -66,13 +63,7 @@ public class CryptoUtils {
         // generate the nonce if none is given
         // we are not allowed to do this ourselves as "setRandomizedEncryptionRequired" is set to true
         if (nonce != null) {
-            AlgorithmParameterSpec spec;
-            // apparently kitkat doesn't support GCMParameterSpec
-            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
-                spec = new IvParameterSpec(nonce);
-            } else {
-                spec = new GCMParameterSpec(CRYPTO_AEAD_TAG_SIZE * 8, nonce);
-            }
+            AlgorithmParameterSpec spec = new GCMParameterSpec(CRYPTO_AEAD_TAG_SIZE * 8, nonce);
             cipher.init(opmode, key, spec);
         } else {
             cipher.init(opmode, key);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/crypto/KeyStoreHandle.java b/app/src/main/java/com/beemdevelopment/aegis/crypto/KeyStoreHandle.java
index 5cb1c89b..6ed1c05c 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/crypto/KeyStoreHandle.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/crypto/KeyStoreHandle.java
@@ -1,11 +1,8 @@
 package com.beemdevelopment.aegis.crypto;
 
-import android.os.Build;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
 
-import androidx.annotation.RequiresApi;
-
 import java.io.IOException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
@@ -45,10 +42,6 @@ public class KeyStoreHandle {
     }
 
     public SecretKey generateKey(String id) throws KeyStoreHandleException {
-        if (!isSupported()) {
-            throw new KeyStoreHandleException("Symmetric KeyStore keys are not supported in this version of Android");
-        }
-
         try {
             KeyGenerator generator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, STORE_NAME);
             generator.init(new KeyGenParameterSpec.Builder(id,
@@ -87,14 +80,13 @@ public class KeyStoreHandle {
             throw new KeyStoreHandleException(e);
         }
 
-        if (isSupported() && isKeyPermanentlyInvalidated(key)) {
+        if (isKeyPermanentlyInvalidated(key)) {
             return null;
         }
 
         return key;
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.M)
     private static boolean isKeyPermanentlyInvalidated(SecretKey key) {
         // try to initialize a dummy cipher and see if an InvalidKeyException is thrown
         try {
@@ -127,8 +119,4 @@ public class KeyStoreHandle {
             throw new KeyStoreHandleException(e);
         }
     }
-
-    public static boolean isSupported() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
-    }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/YAOTP.java b/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/YAOTP.java
index c8f1f52f..676856c6 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/YAOTP.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/YAOTP.java
@@ -25,10 +25,10 @@ public class YAOTP {
     public static YAOTP generateOTP(byte[] secret, String pin, int digits, String otpAlgo, long period)
             throws NoSuchAlgorithmException, InvalidKeyException, IOException {
         long seconds = System.currentTimeMillis() / 1000;
-        return generateOTP(secret, pin, digits, otpAlgo, seconds, period);
+        return generateOTP(secret, pin, digits, otpAlgo, period, seconds);
     }
 
-    public static YAOTP generateOTP(byte[] secret, String pin, int digits, String otpAlgo, long seconds, long period)
+    public static YAOTP generateOTP(byte[] secret, String pin, int digits, String otpAlgo, long period, long seconds)
             throws NoSuchAlgorithmException, InvalidKeyException, IOException {
         byte[] pinWithHash;
         byte[] pinBytes = pin.getBytes(StandardCharsets.UTF_8);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/database/AppDatabase.java b/app/src/main/java/com/beemdevelopment/aegis/database/AppDatabase.java
new file mode 100644
index 00000000..073bb2eb
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/database/AppDatabase.java
@@ -0,0 +1,15 @@
+package com.beemdevelopment.aegis.database;
+
+import android.content.Context;
+
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Database(entities = {AuditLogEntry.class}, version = 1)
+public abstract class AppDatabase extends RoomDatabase {
+    public abstract AuditLogDao auditLogDao();
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogDao.java b/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogDao.java
new file mode 100644
index 00000000..20c4a47a
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogDao.java
@@ -0,0 +1,17 @@
+package com.beemdevelopment.aegis.database;
+
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
+
+import java.util.List;
+
+@Dao
+public interface AuditLogDao {
+    @Insert
+    void insert(AuditLogEntry log);
+
+    @Query("SELECT * FROM audit_logs WHERE timestamp >= strftime('%s', 'now', '-30 days') ORDER BY timestamp DESC")
+    LiveData<List<AuditLogEntry>> getAll();
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogEntry.java b/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogEntry.java
new file mode 100644
index 00000000..b0888eeb
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogEntry.java
@@ -0,0 +1,61 @@
+package com.beemdevelopment.aegis.database;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.PrimaryKey;
+
+import com.beemdevelopment.aegis.EventType;
+
+@Entity(tableName = "audit_logs")
+public class AuditLogEntry {
+    @PrimaryKey(autoGenerate = true)
+    protected long id;
+
+    @NonNull
+    @ColumnInfo(name = "event_type")
+    private final EventType _eventType;
+
+    @ColumnInfo(name = "reference")
+    private final String _reference;
+
+    @ColumnInfo(name = "timestamp")
+    private final long _timestamp;
+
+    @Ignore
+    public AuditLogEntry(@NonNull EventType eventType) {
+        this(eventType, null);
+    }
+
+    @Ignore
+    public AuditLogEntry(@NonNull EventType eventType, @Nullable String reference) {
+        _eventType = eventType;
+        _reference = reference;
+        _timestamp = System.currentTimeMillis();
+    }
+
+    AuditLogEntry(long id, @NonNull EventType eventType, @Nullable String reference, long timestamp) {
+        this.id = id;
+        _eventType = eventType;
+        _reference = reference;
+        _timestamp = timestamp;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public EventType getEventType() {
+        return _eventType;
+    }
+
+    public String getReference() {
+        return _reference;
+    }
+
+    public long getTimestamp() {
+        return _timestamp;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogRepository.java b/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogRepository.java
new file mode 100644
index 00000000..cde042ff
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/database/AuditLogRepository.java
@@ -0,0 +1,66 @@
+package com.beemdevelopment.aegis.database;
+
+import androidx.lifecycle.LiveData;
+
+import com.beemdevelopment.aegis.EventType;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+public class AuditLogRepository {
+    private final AuditLogDao _auditLogDao;
+    private final Executor _executor;
+
+    public AuditLogRepository(AuditLogDao auditLogDao) {
+        _auditLogDao = auditLogDao;
+        _executor = Executors.newSingleThreadExecutor();
+    }
+
+    public LiveData<List<AuditLogEntry>> getAllAuditLogEntries() {
+        return _auditLogDao.getAll();
+    }
+
+    public void addVaultUnlockedEvent() {
+        AuditLogEntry auditLogEntry = new AuditLogEntry(EventType.VAULT_UNLOCKED);
+        insert(auditLogEntry);
+    }
+
+    public void addBackupCreatedEvent() {
+        AuditLogEntry auditLogEntry = new AuditLogEntry(EventType.VAULT_BACKUP_CREATED);
+        insert(auditLogEntry);
+    }
+
+    public void addAndroidBackupCreatedEvent() {
+        AuditLogEntry auditLogEntry = new AuditLogEntry(EventType.VAULT_ANDROID_BACKUP_CREATED);
+        insert(auditLogEntry);
+    }
+
+    public void addVaultExportedEvent() {
+        AuditLogEntry auditLogEntry = new AuditLogEntry(EventType.VAULT_EXPORTED);
+        insert(auditLogEntry);
+    }
+
+    public void addEntrySharedEvent(String reference) {
+        AuditLogEntry auditLogEntry = new AuditLogEntry(EventType.ENTRY_SHARED, reference);
+        insert(auditLogEntry);
+    }
+
+    public void addVaultUnlockFailedPasswordEvent() {
+        AuditLogEntry auditLogEntry = new AuditLogEntry(EventType.VAULT_UNLOCK_FAILED_PASSWORD);
+        insert(auditLogEntry);
+
+    }
+
+    public void addVaultUnlockFailedBiometricsEvent() {
+        AuditLogEntry auditLogEntry = new AuditLogEntry(EventType.VAULT_UNLOCK_FAILED_BIOMETRICS);
+        insert(auditLogEntry);
+    }
+
+    public void insert(AuditLogEntry auditLogEntry) {
+        _executor.execute(() -> {
+            _auditLogDao.insert(auditLogEntry);
+        });
+    }
+
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/BitmapHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/BitmapHelper.java
index a97fb6a4..339c1760 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/helpers/BitmapHelper.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/BitmapHelper.java
@@ -1,6 +1,13 @@
 package com.beemdevelopment.aegis.helpers;
 
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import com.beemdevelopment.aegis.icons.IconType;
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
+
+import java.io.ByteArrayOutputStream;
+import java.util.Objects;
 
 public class BitmapHelper {
     private BitmapHelper() {
@@ -28,4 +35,29 @@ public class BitmapHelper {
 
         return Bitmap.createScaledBitmap(bitmap, width, height, true);
     }
+
+    public static boolean isVaultEntryIconOptimized(VaultEntryIcon icon) {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inJustDecodeBounds = true;
+        BitmapFactory.decodeByteArray(icon.getBytes(), 0, icon.getBytes().length, opts);
+        return opts.outWidth <= VaultEntryIcon.MAX_DIMENS && opts.outHeight <= VaultEntryIcon.MAX_DIMENS;
+    }
+
+    public static VaultEntryIcon toVaultEntryIcon(Bitmap bitmap, IconType iconType) {
+        if (bitmap.getWidth() > VaultEntryIcon.MAX_DIMENS
+                || bitmap.getHeight() > VaultEntryIcon.MAX_DIMENS) {
+            bitmap = resize(bitmap, VaultEntryIcon.MAX_DIMENS, VaultEntryIcon.MAX_DIMENS);
+        }
+
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        if (Objects.equals(iconType, IconType.PNG)) {
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
+        } else {
+            iconType = IconType.JPEG;
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 90, stream);
+        }
+
+        byte[] data = stream.toByteArray();
+        return new VaultEntryIcon(data, iconType);
+    }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/CenterVerticalSpan.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/CenterVerticalSpan.java
new file mode 100644
index 00000000..bc94a21c
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/CenterVerticalSpan.java
@@ -0,0 +1,30 @@
+package com.beemdevelopment.aegis.helpers;
+
+import android.graphics.Rect;
+import android.text.TextPaint;
+import android.text.style.MetricAffectingSpan;
+
+import androidx.annotation.NonNull;
+
+public class CenterVerticalSpan extends MetricAffectingSpan {
+    Rect _substringBounds;
+
+    public CenterVerticalSpan(Rect substringBounds) {
+        _substringBounds = substringBounds;
+    }
+
+    @Override
+    public void updateMeasureState(@NonNull TextPaint textPaint) {
+        applyBaselineShift(textPaint);
+    }
+
+    @Override
+    public void updateDrawState(@NonNull TextPaint textPaint) {
+        applyBaselineShift(textPaint);
+    }
+
+    private void applyBaselineShift(TextPaint textPaint) {
+        float topDifference = textPaint.getFontMetrics().top - _substringBounds.top;
+        textPaint.baselineShift -= (topDifference / 2f);
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/IconViewHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/IconViewHelper.java
deleted file mode 100644
index df740af4..00000000
--- a/app/src/main/java/com/beemdevelopment/aegis/helpers/IconViewHelper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.beemdevelopment.aegis.helpers;
-
-import android.os.Build;
-import android.widget.ImageView;
-
-import com.beemdevelopment.aegis.icons.IconType;
-
-public class IconViewHelper {
-    private IconViewHelper() {
-
-    }
-
-    /**
-     * Sets the layer type of the given ImageView based on the given IconType. If the
-     * icon type is SVG and SDK <= 27, the layer type is set to software. Otherwise, it
-     * is set to hardware.
-     */
-    public static void setLayerType(ImageView view, IconType iconType) {
-        if (iconType == IconType.SVG && Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) {
-            view.setLayerType(ImageView.LAYER_TYPE_SOFTWARE, null);
-            return;
-        }
-
-        view.setLayerType(ImageView.LAYER_TYPE_HARDWARE, null);
-    }
-}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/PasswordStrengthHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/PasswordStrengthHelper.java
index 518ebcc1..373ef114 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/helpers/PasswordStrengthHelper.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/PasswordStrengthHelper.java
@@ -1,14 +1,60 @@
 package com.beemdevelopment.aegis.helpers;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import com.beemdevelopment.aegis.R;
+import com.google.android.material.textfield.TextInputLayout;
+import com.google.common.base.Strings;
+import com.nulabinc.zxcvbn.Strength;
+import com.nulabinc.zxcvbn.Zxcvbn;
 
 public class PasswordStrengthHelper {
-    // Material design color palette
-    private static String[] COLORS = {"#FF5252", "#FF5252", "#FFC107", "#8BC34A", "#4CAF50"};
+    // Limit the password length to prevent zxcvbn4j from exploding
+    private static final int MAX_PASSWORD_LENGTH = 64;
 
-    public static String getString(int score, Context context) {
+    // Material design color palette
+    private final static String[] COLORS = {"#FF5252", "#FF5252", "#FFC107", "#8BC34A", "#4CAF50"};
+
+    private final Zxcvbn _zxcvbn = new Zxcvbn();
+    private final EditText _textPassword;
+    private final ProgressBar _barPasswordStrength;
+    private final TextView _textPasswordStrength;
+    private final TextInputLayout _textPasswordWrapper;
+
+    public PasswordStrengthHelper(
+            EditText textPassword,
+            ProgressBar barPasswordStrength,
+            TextView textPasswordStrength,
+            TextInputLayout textPasswordWrapper
+    ) {
+        _textPassword = textPassword;
+        _barPasswordStrength = barPasswordStrength;
+        _textPasswordStrength = textPasswordStrength;
+        _textPasswordWrapper = textPasswordWrapper;
+    }
+
+    public void measure(Context context) {
+        if (_textPassword.getText().length() > MAX_PASSWORD_LENGTH) {
+            _barPasswordStrength.setProgress(0);
+            _textPasswordStrength.setText(R.string.password_strength_unknown);
+        } else {
+            Strength strength = _zxcvbn.measure(_textPassword.getText());
+            _barPasswordStrength.setProgress(strength.getScore());
+            _barPasswordStrength.setProgressTintList(ColorStateList.valueOf(Color.parseColor(getColor(strength.getScore()))));
+            _textPasswordStrength.setText((_textPassword.getText().length() != 0) ? getString(strength.getScore(), context) : "");
+            String warning = strength.getFeedback().getWarning();
+            _textPasswordWrapper.setError(warning);
+            _textPasswordWrapper.setErrorEnabled(!Strings.isNullOrEmpty(warning));
+            strength.wipe();
+        }
+    }
+
+    private static String getString(int score, Context context) {
         if (score < 0 || score > 4) {
             throw new IllegalArgumentException("Not a valid zxcvbn score");
         }
@@ -17,7 +63,7 @@ public class PasswordStrengthHelper {
         return strings[score];
     }
 
-    public static String getColor(int score) {
+    private static String getColor(int score) {
         if (score < 0 || score > 4) {
             throw new IllegalArgumentException("Not a valid zxcvbn score");
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/SimpleItemTouchHelperCallback.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/SimpleItemTouchHelperCallback.java
index 959f2cf8..96c672bd 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/helpers/SimpleItemTouchHelperCallback.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/SimpleItemTouchHelperCallback.java
@@ -56,16 +56,20 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
         // It's not clear when this can happen, but sometimes the ViewHolder
         // that's passed to this function has a position of -1, leading
         // to a crash down the line.
-        int position = viewHolder.getAdapterPosition();
+        int position = viewHolder.getBindingAdapterPosition();
         if (position == NO_POSITION) {
             return 0;
         }
 
-        int swipeFlags = 0;
-
         EntryAdapter adapter = (EntryAdapter) recyclerView.getAdapter();
+        if (adapter == null) {
+            return 0;
+        }
+
+        int swipeFlags = 0;
         if (adapter.isPositionFooter(position)
-                || adapter.getEntryAt(position) != _selectedEntry
+                || adapter.isPositionErrorCard(position)
+                || adapter.getEntryAtPosition(position) != _selectedEntry
                 || !isLongPressDragEnabled()) {
             return makeMovementFlags(0, swipeFlags);
         }
@@ -76,12 +80,13 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
     @Override
     public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
                           RecyclerView.ViewHolder target) {
-        if (target.getAdapterPosition() < _adapter.getShownFavoritesCount()){
+        int targetIndex = _adapter.translateEntryPosToIndex(target.getBindingAdapterPosition());
+        if (targetIndex < _adapter.getShownFavoritesCount()) {
             return false;
         }
 
         int firstPosition = viewHolder.getLayoutPosition();
-        int secondPosition = target.getAdapterPosition();
+        int secondPosition = target.getBindingAdapterPosition();
 
         _adapter.onItemMove(firstPosition, secondPosition);
         _positionChanged = true;
@@ -90,7 +95,7 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
 
     @Override
     public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-        _adapter.onItemDismiss(viewHolder.getAdapterPosition());
+        _adapter.onItemDismiss(viewHolder.getBindingAdapterPosition());
     }
 
     @Override
@@ -98,7 +103,7 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
         super.clearView(recyclerView, viewHolder);
 
         if (_positionChanged) {
-            _adapter.onItemDrop(viewHolder.getAdapterPosition());
+            _adapter.onItemDrop(viewHolder.getBindingAdapterPosition());
             _positionChanged = false;
             _adapter.refresh(false);
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java
index cbef80fe..0bd1dcfc 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java
@@ -1,23 +1,58 @@
 package com.beemdevelopment.aegis.helpers;
 
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.util.TypedValue;
+import android.content.res.Configuration;
 
-import androidx.annotation.ColorInt;
+import androidx.appcompat.app.AppCompatActivity;
 
+import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.Theme;
+import com.google.android.material.color.DynamicColors;
+import com.google.android.material.color.DynamicColorsOptions;
+
+import java.util.Map;
 
 public class ThemeHelper {
-    private ThemeHelper() {
+    private final AppCompatActivity _activity;
+    private final Preferences _prefs;
 
+    public ThemeHelper(AppCompatActivity activity, Preferences prefs) {
+        _activity = activity;
+        _prefs = prefs;
     }
 
-    public static int getThemeColor(int attributeId, Resources.Theme currentTheme) {
-        TypedValue typedValue = new TypedValue();
-        currentTheme.resolveAttribute(attributeId, typedValue, true);
-        @ColorInt int color = typedValue.data;
+    /**
+     * Sets the theme of the activity. The actual style that is set is picked from the
+     * given map, based on the theme configured by the user.
+     */
+    public void setTheme(Map<Theme, Integer> themeMap) {
+        int theme = themeMap.get(getConfiguredTheme());
+        _activity.setTheme(theme);
 
-        return color;
+        if (_prefs.isDynamicColorsEnabled()) {
+            DynamicColorsOptions.Builder optsBuilder = new DynamicColorsOptions.Builder();
+            if (getConfiguredTheme().equals(Theme.AMOLED)) {
+                optsBuilder.setThemeOverlay(R.style.ThemeOverlay_Aegis_Dynamic_Amoled);
+            } else if (getConfiguredTheme().equals(Theme.DARK)) {
+                optsBuilder.setThemeOverlay(R.style.ThemeOverlay_Aegis_Dynamic_Dark);
+            }
+
+            DynamicColors.applyToActivityIfAvailable(_activity, optsBuilder.build());
+        }
+    }
+
+    public Theme getConfiguredTheme() {
+        Theme theme = _prefs.getCurrentTheme();
+
+        if (theme == Theme.SYSTEM || theme == Theme.SYSTEM_AMOLED) {
+            int currentNightMode = _activity.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            if (currentNightMode == Configuration.UI_MODE_NIGHT_YES) {
+                theme = theme == Theme.SYSTEM_AMOLED ? Theme.AMOLED : Theme.DARK;
+            } else {
+                theme = Theme.LIGHT;
+            }
+        }
+
+        return theme;
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/UiRefresher.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/UiRefresher.java
index 7669c26a..c7d0425d 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/helpers/UiRefresher.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/UiRefresher.java
@@ -2,6 +2,8 @@ package com.beemdevelopment.aegis.helpers;
 
 import android.os.Handler;
 
+import com.beemdevelopment.aegis.VibrationPatterns;
+
 public class UiRefresher {
     private boolean _running;
     private Listener _listener;
@@ -23,7 +25,6 @@ public class UiRefresher {
         }
         _running = true;
 
-        _listener.onRefresh();
         _handler.postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -31,6 +32,27 @@ public class UiRefresher {
                 _handler.postDelayed(this, _listener.getMillisTillNextRefresh());
             }
         }, _listener.getMillisTillNextRefresh());
+
+        _handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                _listener.onExpiring();
+                _handler.postDelayed(this, getNextRun());
+            }
+        },  getInitialRun());
+    }
+
+    private long getInitialRun() {
+        long sum = _listener.getMillisTillNextRefresh() - VibrationPatterns.getLengthInMillis(VibrationPatterns.EXPIRING);
+        if (sum < 0) {
+            return getNextRun();
+        }
+
+        return sum;
+    }
+
+    private long getNextRun() {
+        return (_listener.getMillisTillNextRefresh() + _listener.getPeriodMillis()) - VibrationPatterns.getLengthInMillis(VibrationPatterns.EXPIRING);
     }
 
     public void stop() {
@@ -40,6 +62,8 @@ public class UiRefresher {
 
     public interface Listener {
         void onRefresh();
+        void onExpiring();
         long getMillisTillNextRefresh();
+        long getPeriodMillis();
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/VibrationHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/VibrationHelper.java
new file mode 100644
index 00000000..9fbc7a00
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/VibrationHelper.java
@@ -0,0 +1,44 @@
+package com.beemdevelopment.aegis.helpers;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.os.VibratorManager;
+
+import com.beemdevelopment.aegis.Preferences;
+
+public class VibrationHelper {
+    private Preferences _preferences;
+
+    public VibrationHelper(Context context) {
+        _preferences = new Preferences(context);
+    }
+
+    public void vibratePattern(Context context, long[] pattern) {
+        if (!isHapticFeedbackEnabled()) {
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            VibratorManager vibratorManager = (VibratorManager) context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE);
+            if (vibratorManager != null) {
+                Vibrator vibrator = vibratorManager.getDefaultVibrator();
+                VibrationEffect effect = VibrationEffect.createWaveform(pattern, -1);
+                vibrator.vibrate(effect);
+            }
+        } else {
+            Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+            if (vibrator != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    VibrationEffect effect = VibrationEffect.createWaveform(pattern, -1);
+                    vibrator.vibrate(effect);
+                }
+            }
+        }
+    }
+
+    public boolean isHapticFeedbackEnabled() {
+        return _preferences.isHapticFeedbackEnabled();
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/ViewHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/ViewHelper.java
new file mode 100644
index 00000000..910aae2f
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/ViewHelper.java
@@ -0,0 +1,26 @@
+package com.beemdevelopment.aegis.helpers;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import com.google.android.material.appbar.AppBarLayout;
+
+public class ViewHelper {
+    private ViewHelper() {
+
+    }
+
+    public static void setupAppBarInsets(AppBarLayout appBar) {
+        ViewCompat.setOnApplyWindowInsetsListener(appBar, (targetView, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+            targetView.setPadding(
+                    insets.left,
+                    insets.top,
+                    insets.right,
+                    0
+            );
+            return WindowInsetsCompat.CONSUMED;
+        });
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/comparators/LastUsedComparator.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/comparators/LastUsedComparator.java
new file mode 100644
index 00000000..5fc85edf
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/comparators/LastUsedComparator.java
@@ -0,0 +1,12 @@
+package com.beemdevelopment.aegis.helpers.comparators;
+
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import java.util.Comparator;
+
+public class LastUsedComparator implements Comparator<VaultEntry> {
+    @Override
+    public int compare(VaultEntry a, VaultEntry b) {
+        return Long.compare(a.getLastUsedTimestamp(), b.getLastUsedTimestamp());
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/icons/IconPack.java b/app/src/main/java/com/beemdevelopment/aegis/icons/IconPack.java
index 3e3f8424..5f87ca55 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/icons/IconPack.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/icons/IconPack.java
@@ -3,6 +3,7 @@ package com.beemdevelopment.aegis.icons;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.beemdevelopment.aegis.util.JsonUtils;
 import com.google.common.base.Objects;
 import com.google.common.io.Files;
 
@@ -17,7 +18,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 public class IconPack {
     private UUID _uuid;
@@ -58,9 +58,21 @@ public class IconPack {
             return new ArrayList<>();
         }
 
-        return _icons.stream()
-                .filter(i -> i.isSuggestedFor(issuer))
-                .collect(Collectors.toList());
+        List<Icon> icons = new ArrayList<>();
+        for (Icon icon : _icons) {
+            MatchType matchType = icon.getMatchFor(issuer);
+            if (matchType != null) {
+                // Inverse matches (entry issuer contains icon name) are less likely
+                // to be good, so position them at the end of the list.
+                if (matchType.equals(MatchType.NORMAL)) {
+                    icons.add(0, icon);
+                } else if (matchType.equals(MatchType.INVERSE)) {
+                    icons.add(icon);
+                }
+            }
+        }
+
+        return icons;
     }
 
     @Nullable
@@ -120,13 +132,15 @@ public class IconPack {
 
     public static class Icon implements Serializable {
         private final String _relFilename;
+        private final String _name;
         private final String _category;
         private final List<String> _issuers;
 
         private File _file;
 
-        protected Icon(String filename, String category, List<String> issuers) {
+        protected Icon(String filename, String name, String category, List<String> issuers) {
             _relFilename = filename;
+            _name = name;
             _category = category;
             _issuers = issuers;
         }
@@ -149,6 +163,9 @@ public class IconPack {
         }
 
         public String getName() {
+            if (_name != null) {
+                return _name;
+            }
             return Files.getNameWithoutExtension(new File(_relFilename).getName());
         }
 
@@ -156,19 +173,29 @@ public class IconPack {
             return _category;
         }
 
-        public List<String> getIssuers() {
-            return Collections.unmodifiableList(_issuers);
-        }
+        private MatchType getMatchFor(String issuer) {
+            String lowerEntryIssuer = issuer.toLowerCase();
 
-        public boolean isSuggestedFor(String issuer) {
-            String lowerIssuer = issuer.toLowerCase();
-            return getIssuers().stream()
-                    .map(String::toLowerCase)
-                    .anyMatch(is -> is.contains(lowerIssuer) || lowerIssuer.contains(is));
+            boolean inverseMatch = false;
+            for (String is : _issuers) {
+                String lowerIconIssuer = is.toLowerCase();
+                if (lowerIconIssuer.contains(lowerEntryIssuer)) {
+                    return MatchType.NORMAL;
+                }
+                if (lowerEntryIssuer.contains(lowerIconIssuer)) {
+                    inverseMatch = true;
+                }
+            }
+            if (inverseMatch) {
+                return MatchType.INVERSE;
+            }
+
+            return null;
         }
 
         public static Icon fromJson(JSONObject obj) throws JSONException {
             String filename = obj.getString("filename");
+            String name = JsonUtils.optString(obj, "name");
             String category = obj.isNull("category") ? null : obj.getString("category");
             JSONArray array = obj.getJSONArray("issuer");
 
@@ -178,7 +205,12 @@ public class IconPack {
                 issuers.add(issuer);
             }
 
-            return new Icon(filename, category, issuers);
+            return new Icon(filename, name, category, issuers);
         }
     }
+
+    private enum MatchType {
+        NORMAL,
+        INVERSE
+    }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/icons/IconPackManager.java b/app/src/main/java/com/beemdevelopment/aegis/icons/IconPackManager.java
index 05b2cf29..7aa9a292 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/icons/IconPackManager.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/icons/IconPackManager.java
@@ -42,6 +42,10 @@ public class IconPackManager {
         return packs.get(0);
     }
 
+    public boolean hasIconPack() {
+        return _iconPacks.size() > 0;
+    }
+
     public List<IconPack> getIconPacks() {
         return new ArrayList<>(_iconPacks);
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/AegisImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/AegisImporter.java
index c01b13df..ac42cc87 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/AegisImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/AegisImporter.java
@@ -16,6 +16,7 @@ import com.beemdevelopment.aegis.vault.VaultEntryException;
 import com.beemdevelopment.aegis.vault.VaultFile;
 import com.beemdevelopment.aegis.vault.VaultFileCredentials;
 import com.beemdevelopment.aegis.vault.VaultFileException;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
 import com.beemdevelopment.aegis.vault.slots.SlotList;
 import com.topjohnwu.superuser.io.SuFile;
@@ -27,6 +28,7 @@ import org.json.JSONObject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
+import java.util.UUID;
 
 public class AegisImporter extends DatabaseImporter {
 
@@ -132,11 +134,31 @@ public class AegisImporter extends DatabaseImporter {
             Result result = new Result();
 
             try {
-                JSONArray array = _obj.getJSONArray("entries");
-                for (int i = 0; i < array.length(); i++) {
-                    JSONObject entryObj = array.getJSONObject(i);
+                if (_obj.has("groups")) {
+                    JSONArray groupArray = _obj.getJSONArray("groups");
+                    for (int i = 0; i < groupArray.length(); i++) {
+                        JSONObject groupObj = groupArray.getJSONObject(i);
+                        try {
+                            VaultGroup group = convertGroup(groupObj);
+                            if (!result.getGroups().has(group)) {
+                                result.addGroup(group);
+                            }
+                        } catch (DatabaseImporterEntryException e) {
+                            result.addError(e);
+                        }
+                    }
+                }
+
+                JSONArray entryArray = _obj.getJSONArray("entries");
+                for (int i = 0; i < entryArray.length(); i++) {
+                    JSONObject entryObj = entryArray.getJSONObject(i);
                     try {
                         VaultEntry entry = convertEntry(entryObj);
+                        for (UUID groupUuid : entry.getGroups()) {
+                            if (!result.getGroups().has(groupUuid)) {
+                                entry.getGroups().remove(groupUuid);
+                            }
+                        }
                         result.addEntry(entry);
                     } catch (DatabaseImporterEntryException e) {
                         result.addError(e);
@@ -156,5 +178,13 @@ public class AegisImporter extends DatabaseImporter {
                 throw new DatabaseImporterEntryException(e, obj.toString());
             }
         }
+
+        private static VaultGroup convertGroup(JSONObject obj) throws DatabaseImporterEntryException {
+            try {
+                return VaultGroup.fromJson(obj);
+            } catch (VaultEntryException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/AndOtpImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/AndOtpImporter.java
index aad90a55..2be31b0f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/AndOtpImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/AndOtpImporter.java
@@ -21,6 +21,7 @@ import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.tasks.PBKDFTask;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.topjohnwu.superuser.io.SuFile;
 
 import org.json.JSONArray;
@@ -182,7 +183,7 @@ public class AndOtpImporter extends DatabaseImporter {
                     context.getResources().getString(R.string.andotp_old_format)
             };
 
-            Dialogs.showSecureDialog(new AlertDialog.Builder(context)
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(context)
                     .setTitle(R.string.choose_andotp_importer)
                     .setSingleChoiceItems(choices, 0, null)
                     .setPositiveButton(android.R.string.ok, (dialog, which) -> {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java
index 6a75b7f0..890e9b30 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java
@@ -75,8 +75,13 @@ public class AuthyImporter extends DatabaseImporter {
         JSONArray array;
         JSONArray authyArray;
         try {
-            array = readFile(new SuFile(path, String.format("%s.xml", _authFilename)), String.format("%s.key", _authFilename));
-            authyArray = readFile(new SuFile(path, String.format("%s.xml", _authyFilename)), String.format("%s.key", _authyFilename));
+            SuFile file1 = new SuFile(path, String.format("%s.xml", _authFilename));
+            file1.setShell(shell);
+            SuFile file2 = new SuFile(path, String.format("%s.xml", _authyFilename));
+            file2.setShell(shell);
+
+            array = readFile(file1, String.format("%s.key", _authFilename));
+            authyArray = readFile(file2, String.format("%s.key", _authyFilename));
         } catch (IOException | XmlPullParserException e) {
             throw new DatabaseImporterException(e);
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/BattleNetImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/BattleNetImporter.java
index 8ff50ff4..221ed0e6 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/BattleNetImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/BattleNetImporter.java
@@ -11,6 +11,7 @@ import com.beemdevelopment.aegis.otp.OtpInfoException;
 import com.beemdevelopment.aegis.otp.TotpInfo;
 import com.beemdevelopment.aegis.util.PreferenceParser;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.google.common.base.Strings;
 import com.topjohnwu.superuser.io.SuFile;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -18,12 +19,10 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
 
 public class BattleNetImporter extends DatabaseImporter {
-    private static final String _pkgName = "com.blizzard.bma";
-    private static final String _subPath = "shared_prefs/com.blizzard.bma.AUTH_STORE.xml";
+    private static final String _pkgName = "com.blizzard.messenger";
+    private static final String _subPath = "shared_prefs/com.blizzard.messenger.authenticator_preferences.xml";
 
     private static final byte[] _key;
 
@@ -46,71 +45,80 @@ public class BattleNetImporter extends DatabaseImporter {
 
     @Override
     protected State read(InputStream stream, boolean isInternal) throws DatabaseImporterException {
+        final String serialKey = "com.blizzard.messenger.AUTHENTICATOR_SERIAL";
+        final String secretKey = "com.blizzard.messenger.AUTHENTICATOR_DEVICE_SECRET";
+
         try {
             XmlPullParser parser = Xml.newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
             parser.setInput(stream, null);
             parser.nextTag();
 
-            List<String> entries = new ArrayList<>();
+            String serial = "";
+            String secretValue = null;
             for (PreferenceParser.XmlEntry entry : PreferenceParser.parse(parser)) {
-                if (entry.Name.equals("com.blizzard.bma.AUTH_STORE.HASH")) {
-                    entries.add(entry.Value);
-                    break;
+                if (entry.Name.equals(secretKey)) {
+                    secretValue = entry.Value;
+                } else if (entry.Name.equals(serialKey)) {
+                    serial = entry.Value;
                 }
             }
-            return new BattleNetImporter.State(entries);
+
+            if (secretValue == null) {
+                throw new DatabaseImporterException(String.format("Key not found: %s", secretKey));
+            }
+
+            return new BattleNetImporter.State(serial, secretValue);
         } catch (XmlPullParserException | IOException e) {
             throw new DatabaseImporterException(e);
         }
     }
 
     public static class State extends DatabaseImporter.State {
-        private final List<String> _entries;
+        private final String _serial;
+        private final String _secretValue;
 
-        public State(List<String> entries) {
+        public State(String serial, String secretValue) {
             super(false);
-            _entries = entries;
+            _serial = serial;
+            _secretValue = secretValue;
         }
 
         @Override
         public Result convert() {
             Result result = new Result();
 
-            for (String str : _entries) {
-                try {
-                    VaultEntry entry = convertEntry(str);
-                    result.addEntry(entry);
-                } catch (DatabaseImporterEntryException e) {
-                    result.addError(e);
-                }
+            try {
+                VaultEntry entry = convertEntry(_serial, _secretValue);
+                result.addEntry(entry);
+            } catch (DatabaseImporterEntryException e) {
+                result.addError(e);
             }
 
             return result;
         }
 
-        private static VaultEntry convertEntry(String hashString) throws DatabaseImporterEntryException {
+        private static VaultEntry convertEntry(String serial, String secretString) throws DatabaseImporterEntryException {
             try {
-                byte[] hash = Hex.decode(hashString);
-                if (hash.length != _key.length) {
-                    throw new DatabaseImporterEntryException(String.format("Unexpected hash length: %d", hash.length), hashString);
+                if (!Strings.isNullOrEmpty(serial)) {
+                    serial = unmask(serial);
                 }
-
-                StringBuilder sb = new StringBuilder();
-                for (int i = 0; i < hash.length; i++) {
-                    char c = (char) (hash[i] ^ _key[i]);
-                    sb.append(c);
-                }
-
-                final int secretLen = 40;
-                byte[] secret = Hex.decode(sb.substring(0, secretLen));
-                String serial = sb.substring(secretLen);
-
+                byte[] secret = Hex.decode(unmask(secretString));
                 OtpInfo info = new TotpInfo(secret, OtpInfo.DEFAULT_ALGORITHM, 8, TotpInfo.DEFAULT_PERIOD);
                 return new VaultEntry(info, serial, "Battle.net");
             } catch (OtpInfoException | EncodingException e) {
-                throw new DatabaseImporterEntryException(e, hashString);
+                throw new DatabaseImporterEntryException(e, secretString);
             }
         }
+
+        private static String unmask(String s) throws EncodingException {
+            byte[] ds = Hex.decode(s);
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < ds.length; i++) {
+                char c = (char) (ds[i] ^ _key[i]);
+                sb.append(c);
+            }
+            return sb.toString();
+        }
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java
index f3a9de4d..fe1b5b5f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java
@@ -8,6 +8,7 @@ import androidx.annotation.StringRes;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.util.UUIDMap;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.io.SuFile;
 import com.topjohnwu.superuser.io.SuFileInputStream;
@@ -33,17 +34,18 @@ public abstract class DatabaseImporter {
         _importers.add(new Definition("Aegis", AegisImporter.class, R.string.importer_help_aegis, false));
         _importers.add(new Definition("andOTP", AndOtpImporter.class, R.string.importer_help_andotp, false));
         _importers.add(new Definition("Authenticator Plus", AuthenticatorPlusImporter.class, R.string.importer_help_authenticator_plus, false));
-        _importers.add(new Definition("Authenticator Pro", AuthenticatorProImporter.class, R.string.importer_help_authenticator_pro, true));
         _importers.add(new Definition("Authy", AuthyImporter.class, R.string.importer_help_authy, true));
         _importers.add(new Definition("Battle.net Authenticator", BattleNetImporter.class, R.string.importer_help_battle_net_authenticator, true));
         _importers.add(new Definition("Bitwarden", BitwardenImporter.class, R.string.importer_help_bitwarden, false));
         _importers.add(new Definition("Duo", DuoImporter.class, R.string.importer_help_duo, true));
+        _importers.add(new Definition("Ente Auth", EnteAuthImporter.class, R.string.importer_help_ente_auth, false));
         _importers.add(new Definition("FreeOTP", FreeOtpImporter.class, R.string.importer_help_freeotp, true));
-        _importers.add(new Definition("FreeOTP+", FreeOtpPlusImporter.class, R.string.importer_help_freeotp_plus, true));
+        _importers.add(new Definition("FreeOTP+ (JSON)", FreeOtpPlusImporter.class, R.string.importer_help_freeotp_plus, true));
         _importers.add(new Definition("Google Authenticator", GoogleAuthImporter.class, R.string.importer_help_google_authenticator, true));
         _importers.add(new Definition("Microsoft Authenticator", MicrosoftAuthImporter.class, R.string.importer_help_microsoft_authenticator, true));
         _importers.add(new Definition("Plain text", GoogleAuthUriImporter.class, R.string.importer_help_plain_text, false));
         _importers.add(new Definition("Steam", SteamImporter.class, R.string.importer_help_steam, true));
+        _importers.add(new Definition("Stratum (Authenticator Pro)", StratumImporter.class, R.string.importer_help_stratum, true));
         _importers.add(new Definition("TOTP Authenticator", TotpAuthenticatorImporter.class, R.string.importer_help_totp_authenticator, true));
         _importers.add(new Definition("WinAuth", WinAuthImporter.class, R.string.importer_help_winauth, false));
     }
@@ -168,12 +170,17 @@ public abstract class DatabaseImporter {
 
     public static class Result {
         private UUIDMap<VaultEntry> _entries = new UUIDMap<>();
+        private UUIDMap<VaultGroup> _groups = new UUIDMap<>();
         private List<DatabaseImporterEntryException> _errors = new ArrayList<>();
 
         public void addEntry(VaultEntry entry) {
             _entries.add(entry);
         }
 
+        public void addGroup(VaultGroup group) {
+            _groups.add(group);
+        }
+
         public void addError(DatabaseImporterEntryException error) {
             _errors.add(error);
         }
@@ -182,6 +189,10 @@ public abstract class DatabaseImporter {
             return _entries;
         }
 
+        public UUIDMap<VaultGroup> getGroups() {
+            return _groups;
+        }
+
         public List<DatabaseImporterEntryException> getErrors() {
             return _errors;
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/EnteAuthImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/EnteAuthImporter.java
new file mode 100644
index 00000000..e9196b51
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/EnteAuthImporter.java
@@ -0,0 +1,32 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.util.IOUtils;
+import com.topjohnwu.superuser.io.SuFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class EnteAuthImporter extends DatabaseImporter {
+    public EnteAuthImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected SuFile getAppPath() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected State read(InputStream stream, boolean isInternal) throws DatabaseImporterException {
+        try {
+            byte[] bytes = IOUtils.readAll(stream);
+            GoogleAuthUriImporter importer = new GoogleAuthUriImporter(requireContext());
+            return importer.read(new ByteArrayInputStream(bytes), isInternal);
+        } catch (IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpImporter.java
index 3fc7be18..0266ca95 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpImporter.java
@@ -4,26 +4,53 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.util.Xml;
 
+import androidx.lifecycle.Lifecycle;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.helpers.ContextHelper;
 import com.beemdevelopment.aegis.otp.HotpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
 import com.beemdevelopment.aegis.otp.SteamInfo;
 import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.beemdevelopment.aegis.ui.tasks.PBKDFTask;
 import com.beemdevelopment.aegis.util.PreferenceParser;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.topjohnwu.superuser.io.SuFile;
 
+import org.bouncycastle.asn1.ASN1Encodable;
+import org.bouncycastle.asn1.ASN1OctetString;
+import org.bouncycastle.asn1.ASN1Primitive;
+import org.bouncycastle.asn1.ASN1Sequence;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 
 public class FreeOtpImporter extends DatabaseImporter {
     private static final String _subPath = "shared_prefs/tokens.xml";
@@ -40,6 +67,24 @@ public class FreeOtpImporter extends DatabaseImporter {
 
     @Override
     public State read(InputStream stream, boolean isInternal) throws DatabaseImporterException {
+        try (BufferedInputStream bufInStream = new BufferedInputStream(stream);
+             DataInputStream dataInStream = new DataInputStream(bufInStream)) {
+
+            dataInStream.mark(2);
+            int magic = dataInStream.readUnsignedShort();
+            dataInStream.reset();
+
+            if (magic == SerializedHashMapParser.MAGIC) {
+                return readV2(dataInStream);
+            } else {
+                return readV1(bufInStream);
+            }
+        } catch (IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    private DecryptedStateV1 readV1(InputStream stream) throws DatabaseImporterException {
         try {
             XmlPullParser parser = Xml.newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
@@ -52,16 +97,184 @@ public class FreeOtpImporter extends DatabaseImporter {
                     entries.add(new JSONObject(entry.Value));
                 }
             }
-            return new State(entries);
+            return new DecryptedStateV1(entries);
         } catch (XmlPullParserException | IOException | JSONException e) {
             throw new DatabaseImporterException(e);
         }
     }
 
-    public static class State extends DatabaseImporter.State {
-        private List<JSONObject> _entries;
+    private EncryptedState readV2(DataInputStream stream) throws DatabaseImporterException {
+        try {
+            Map<String, String> entries = SerializedHashMapParser.parse(stream);
+            JSONObject mkObj = new JSONObject(entries.get("masterKey"));
+            return new EncryptedState(mkObj, entries);
+        } catch (IOException | JSONException | SerializedHashMapParser.ParseException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
 
-        public State(List<JSONObject> entries) {
+    public static class EncryptedState extends State {
+        private static final int MASTER_KEY_SIZE = 32 * 8;
+
+        private final String _mkAlgo;
+        private final String _mkCipher;
+        private final byte[] _mkCipherText;
+        private final byte[] _mkParameters;
+        private final byte[] _mkToken;
+        private final byte[] _mkSalt;
+        private final int _mkIterations;
+        private final Map<String, String> _entries;
+
+        private EncryptedState(JSONObject mkObj, Map<String, String> entries)
+                throws DatabaseImporterException, JSONException {
+            super(true);
+
+            _mkAlgo = mkObj.getString("mAlgorithm");
+            if (!_mkAlgo.equals("PBKDF2withHmacSHA1") && !_mkAlgo.equals("PBKDF2withHmacSHA512")) {
+                throw new DatabaseImporterException(String.format("Unexpected master key KDF: %s", _mkAlgo));
+            }
+            JSONObject keyObj = mkObj.getJSONObject("mEncryptedKey");
+            _mkCipher = keyObj.getString("mCipher");
+            if (!_mkCipher.equals("AES/GCM/NoPadding")) {
+                throw new DatabaseImporterException(String.format("Unexpected master key cipher: %s", _mkCipher));
+            }
+            _mkCipherText = toBytes(keyObj.getJSONArray("mCipherText"));
+            _mkParameters = toBytes(keyObj.getJSONArray("mParameters"));
+            _mkToken = keyObj.getString("mToken").getBytes(StandardCharsets.UTF_8);
+            _mkSalt = toBytes(mkObj.getJSONArray("mSalt"));
+            _mkIterations = mkObj.getInt("mIterations");
+            _entries = entries;
+        }
+
+        public State decrypt(char[] password) throws DatabaseImporterException {
+            PBKDFTask.Params params = new PBKDFTask.Params(_mkAlgo, MASTER_KEY_SIZE, password, _mkSalt, _mkIterations);
+            SecretKey passKey = PBKDFTask.deriveKey(params);
+            return decrypt(passKey);
+        }
+
+        public State decrypt(SecretKey passKey) throws DatabaseImporterException {
+            byte[] masterKeyBytes;
+            try {
+                byte[] nonce = parseNonce(_mkParameters);
+                IvParameterSpec spec = new IvParameterSpec(nonce);
+                Cipher cipher = Cipher.getInstance(_mkCipher);
+                cipher.init(Cipher.DECRYPT_MODE, passKey, spec);
+                cipher.updateAAD(_mkToken);
+                masterKeyBytes = cipher.doFinal(_mkCipherText);
+            } catch (NoSuchAlgorithmException | NoSuchPaddingException | BadPaddingException |
+                     IllegalBlockSizeException | InvalidKeyException |
+                     InvalidAlgorithmParameterException | IOException e) {
+                throw new DatabaseImporterException(e);
+            }
+
+            SecretKey masterKey = new SecretKeySpec(masterKeyBytes, 0, masterKeyBytes.length, "AES");
+            return new DecryptedStateV2(_entries, masterKey);
+        }
+
+        @Override
+        public void decrypt(Context context, DecryptListener listener) {
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
+                    .setTitle(R.string.importer_warning_title_freeotp2)
+                    .setMessage(R.string.importer_warning_message_freeotp2)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setCancelable(false)
+                    .setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                        Dialogs.showPasswordInputDialog(context, R.string.enter_password_aegis_title, 0, password -> {
+                            PBKDFTask.Params params = getKeyDerivationParams(password, _mkAlgo);
+                            PBKDFTask task = new PBKDFTask(context, key -> {
+                                try {
+                                    State state = decrypt(key);
+                                    listener.onStateDecrypted(state);
+                                } catch (DatabaseImporterException e) {
+                                    listener.onError(e);
+                                }
+                            });
+                            Lifecycle lifecycle = ContextHelper.getLifecycle(context);
+                            task.execute(lifecycle, params);
+                        }, dialog1 -> listener.onCanceled());
+                    })
+                    .create());
+        }
+
+        private PBKDFTask.Params getKeyDerivationParams(char[] password, String algo) {
+            return new PBKDFTask.Params(algo, MASTER_KEY_SIZE, password, _mkSalt, _mkIterations);
+        }
+    }
+
+    public static class DecryptedStateV2 extends DatabaseImporter.State {
+        private final Map<String, String> _entries;
+        private final SecretKey _masterKey;
+
+        public DecryptedStateV2(Map<String, String> entries, SecretKey masterKey) {
+            super(false);
+            _entries = entries;
+            _masterKey = masterKey;
+        }
+
+        @Override
+        public Result convert() throws DatabaseImporterException {
+            Result result = new Result();
+
+            for (Map.Entry<String, String> entry : _entries.entrySet()) {
+                if (entry.getKey().endsWith("-token") || entry.getKey().equals("masterKey")) {
+                    continue;
+                }
+
+                try {
+                    JSONObject encObj = new JSONObject(entry.getValue());
+                    String tokenKey = String.format("%s-token", entry.getKey());
+                    JSONObject tokenObj = new JSONObject(_entries.get(tokenKey));
+
+                    VaultEntry vaultEntry = convertEntry(encObj, tokenObj);
+                    result.addEntry(vaultEntry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                } catch (JSONException ignored) {
+                }
+            }
+
+            return result;
+        }
+
+        private VaultEntry convertEntry(JSONObject encObj, JSONObject tokenObj)
+                throws DatabaseImporterEntryException {
+            try {
+                JSONObject keyObj = new JSONObject(encObj.getString("key"));
+                String cipherName = keyObj.getString("mCipher");
+                if (!cipherName.equals("AES/GCM/NoPadding")) {
+                    throw new DatabaseImporterException(String.format("Unexpected cipher: %s", cipherName));
+                }
+                byte[] cipherText = toBytes(keyObj.getJSONArray("mCipherText"));
+                byte[] parameters = toBytes(keyObj.getJSONArray("mParameters"));
+                byte[] token = keyObj.getString("mToken").getBytes(StandardCharsets.UTF_8);
+
+                byte[] nonce = parseNonce(parameters);
+                IvParameterSpec spec = new IvParameterSpec(nonce);
+                Cipher cipher = Cipher.getInstance(cipherName);
+                cipher.init(Cipher.DECRYPT_MODE, _masterKey, spec);
+                cipher.updateAAD(token);
+                byte[] secretBytes = cipher.doFinal(cipherText);
+
+                JSONArray secretArray = new JSONArray();
+                for (byte b : secretBytes) {
+                    secretArray.put(b);
+                }
+                tokenObj.put("secret", secretArray);
+
+                return DecryptedStateV1.convertEntry(tokenObj);
+            } catch (DatabaseImporterException | JSONException | NoSuchAlgorithmException |
+                     NoSuchPaddingException | InvalidAlgorithmParameterException |
+                     InvalidKeyException | BadPaddingException | IllegalBlockSizeException |
+                     IOException e) {
+                throw new DatabaseImporterEntryException(e, tokenObj.toString());
+            }
+        }
+    }
+
+    public static class DecryptedStateV1 extends DatabaseImporter.State {
+        private final List<JSONObject> _entries;
+
+        public DecryptedStateV1(List<JSONObject> entries) {
             super(false);
             _entries = entries;
         }
@@ -85,8 +298,8 @@ public class FreeOtpImporter extends DatabaseImporter {
         private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
             try {
                 String type = obj.getString("type").toLowerCase(Locale.ROOT);
-                String algo = obj.getString("algo");
-                int digits = obj.getInt("digits");
+                String algo = obj.optString("algo", OtpInfo.DEFAULT_ALGORITHM);
+                int digits = obj.optInt("digits", OtpInfo.DEFAULT_DIGITS);
                 byte[] secret = toBytes(obj.getJSONArray("secret"));
 
                 String issuer = obj.getString("issuerExt");
@@ -95,7 +308,7 @@ public class FreeOtpImporter extends DatabaseImporter {
                 OtpInfo info;
                 switch (type) {
                     case "totp":
-                        int period = obj.getInt("period");
+                        int period = obj.optInt("period", TotpInfo.DEFAULT_PERIOD);
                         if (issuer.equals("Steam")) {
                             info = new SteamInfo(secret, algo, digits, period);
                         } else {
@@ -116,6 +329,23 @@ public class FreeOtpImporter extends DatabaseImporter {
         }
     }
 
+    private static byte[] parseNonce(byte[] parameters) throws IOException {
+        ASN1Primitive prim = ASN1Sequence.fromByteArray(parameters);
+        if (prim instanceof ASN1OctetString) {
+            return ((ASN1OctetString) prim).getOctets();
+        }
+
+        if (prim instanceof ASN1Sequence) {
+            for (ASN1Encodable enc : (ASN1Sequence) prim) {
+                if (enc instanceof ASN1OctetString) {
+                    return ((ASN1OctetString) enc).getOctets();
+                }
+            }
+        }
+
+        throw new IOException("Unable to find nonce in parameters");
+    }
+
     private static byte[] toBytes(JSONArray array) throws JSONException {
         byte[] bytes = new byte[array.length()];
         for (int i = 0; i < array.length(); i++) {
@@ -123,4 +353,119 @@ public class FreeOtpImporter extends DatabaseImporter {
         }
         return bytes;
     }
+    private static class SerializedHashMapParser {
+        private static final int MAGIC = 0xaced;
+        private static final int VERSION = 5;
+        private static final long SERIAL_VERSION_UID = 362498820763181265L;
+
+        private static final byte TC_NULL = 0x70;
+        private static final byte TC_CLASSDESC = 0x72;
+        private static final byte TC_OBJECT = 0x73;
+        private static final byte TC_STRING = 0x74;
+
+        private SerializedHashMapParser() {
+
+        }
+
+        public static Map<String, String> parse(DataInputStream inStream)
+                throws IOException, ParseException {
+            Map<String, String> map = new HashMap<>();
+
+            // Read/validate the magic number and version
+            int magic = inStream.readUnsignedShort();
+            int version = inStream.readUnsignedShort();
+            if (magic != MAGIC || version != VERSION) {
+                throw new ParseException("Not a serialized Java Object");
+            }
+
+            // Read the class descriptor info for HashMap
+            byte b = inStream.readByte();
+            if (b != TC_OBJECT) {
+                throw new ParseException("Expected an object, found: " + b);
+            }
+            b = inStream.readByte();
+            if (b != TC_CLASSDESC) {
+                throw new ParseException("Expected a class desc, found: " + b);
+            }
+            parseClassDescriptor(inStream);
+
+            // Not interested in the capacity of the map
+            inStream.readInt();
+            // Read the number of elements in the HashMap
+            int size = inStream.readInt();
+
+            // Parse each key-value pair in the map
+            for (int i = 0; i < size; i++) {
+                String key = parseStringObject(inStream);
+                String value = parseStringObject(inStream);
+                map.put(key, value);
+            }
+
+            return map;
+        }
+
+        private static void parseClassDescriptor(DataInputStream inputStream)
+                throws IOException, ParseException {
+            // Check whether we're dealing with a HashMap and a version we support
+            String className = parseUTF(inputStream);
+            if (!className.equals(HashMap.class.getName())) {
+                throw new ParseException(String.format("Unexpected class name: %s", className));
+            }
+            long serialVersionUID = inputStream.readLong();
+            if (serialVersionUID != SERIAL_VERSION_UID) {
+                throw new ParseException(String.format("Unexpected serial version UID: %d", serialVersionUID));
+            }
+
+            // Read past all of the fields in the class
+            byte fieldDescriptor = inputStream.readByte();
+            if (fieldDescriptor == TC_NULL) {
+                return;
+            }
+            int totalFieldSkip = 0;
+            int fieldCount = inputStream.readUnsignedShort();
+            for (int i = 0; i < fieldCount; i++) {
+                char fieldType = (char) inputStream.readByte();
+                parseUTF(inputStream);
+                switch (fieldType) {
+                    case 'F': // float (4 bytes)
+                    case 'I': // int (4 bytes)
+                        totalFieldSkip += 4;
+                        break;
+                    default:
+                        throw new ParseException(String.format("Unexpected field type: %s", fieldType));
+                }
+            }
+            inputStream.skipBytes(totalFieldSkip);
+
+            // Not sure what these bytes are, just skip them
+            inputStream.skipBytes(4);
+        }
+
+        private static String parseStringObject(DataInputStream inputStream)
+                throws IOException, ParseException {
+            byte objectType = inputStream.readByte();
+            if (objectType != TC_STRING) {
+                throw new ParseException(String.format("Expected a string object, found: %d", objectType));
+            }
+
+            int length = inputStream.readUnsignedShort();
+            byte[] strBytes = new byte[length];
+            inputStream.readFully(strBytes);
+
+            return new String(strBytes, StandardCharsets.UTF_8);
+        }
+
+        private static String parseUTF(DataInputStream inputStream) throws IOException {
+            int length = inputStream.readUnsignedShort();
+            byte[] strBytes = new byte[length];
+            inputStream.readFully(strBytes);
+            return new String(strBytes, StandardCharsets.UTF_8);
+        }
+
+        private static class ParseException extends Exception {
+            public ParseException(String message) {
+                super(message);
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpPlusImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpPlusImporter.java
index cd15d7ca..02cbd199 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpPlusImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpPlusImporter.java
@@ -46,7 +46,7 @@ public class FreeOtpPlusImporter extends DatabaseImporter {
                     entries.add(array.getJSONObject(i));
                 }
 
-                state = new FreeOtpImporter.State(entries);
+                state = new FreeOtpImporter.DecryptedStateV1(entries);
             } catch (IOException | JSONException e) {
                 throw new DatabaseImporterException(e);
             }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/SteamImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/SteamImporter.java
index 68a5ebc5..bdb550ef 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/SteamImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/SteamImporter.java
@@ -18,6 +18,10 @@ import org.json.JSONObject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.sql.Array;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 public class SteamImporter extends DatabaseImporter {
     private static final String _subDir = "files";
@@ -57,29 +61,43 @@ public class SteamImporter extends DatabaseImporter {
         try {
             byte[] bytes = IOUtils.readAll(stream);
             JSONObject obj = new JSONObject(new String(bytes, StandardCharsets.UTF_8));
-            return new State(obj);
+
+            List<JSONObject> objs = new ArrayList<>();
+            if (obj.has("accounts")) {
+                JSONObject accounts = obj.getJSONObject("accounts");
+                Iterator<String> keys = accounts.keys();
+                while (keys.hasNext()) {
+                    String key = keys.next();
+                    objs.add(accounts.getJSONObject(key));
+                }
+            } else {
+                objs.add(obj);
+            }
+            return new State(objs);
         } catch (IOException | JSONException e) {
             throw new DatabaseImporterException(e);
         }
     }
 
     public static class State extends DatabaseImporter.State {
-        private JSONObject _obj;
+        private final List<JSONObject> _objs;
 
-        private State(JSONObject obj) {
+        private State(List<JSONObject> objs) {
             super(false);
-            _obj = obj;
+            _objs = objs;
         }
 
         @Override
         public Result convert() {
             Result result = new Result();
 
-            try {
-                VaultEntry entry = convertEntry(_obj);
-                result.addEntry(entry);
-            } catch (DatabaseImporterEntryException e) {
-                result.addError(e);
+            for (JSONObject obj : _objs) {
+                try {
+                    VaultEntry entry = convertEntry(obj);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
             }
 
             return result;
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/AuthenticatorProImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/StratumImporter.java
similarity index 68%
rename from app/src/main/java/com/beemdevelopment/aegis/importers/AuthenticatorProImporter.java
rename to app/src/main/java/com/beemdevelopment/aegis/importers/StratumImporter.java
index 354ded2d..7504d98a 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/AuthenticatorProImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/StratumImporter.java
@@ -16,11 +16,13 @@ import com.beemdevelopment.aegis.otp.OtpInfoException;
 import com.beemdevelopment.aegis.otp.SteamInfo;
 import com.beemdevelopment.aegis.otp.TotpInfo;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.beemdevelopment.aegis.ui.tasks.Argon2Task;
 import com.beemdevelopment.aegis.ui.tasks.PBKDFTask;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.topjohnwu.superuser.io.SuFile;
 
+import org.bouncycastle.crypto.params.Argon2Parameters;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -43,12 +45,11 @@ import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 
-public class AuthenticatorProImporter extends DatabaseImporter {
-    private static final String HEADER = "AuthenticatorPro";
-    private static final int ITERATIONS = 64000;
-    private static final int KEY_SIZE = 32 * Byte.SIZE;
-    private static final String PKG_NAME = "me.jmh.authenticatorpro";
-    private static final String PKG_DB_PATH = "files/proauth.db3";
+public class StratumImporter extends DatabaseImporter {
+    private static final String HEADER = "AUTHENTICATORPRO";
+    private static final String HEADER_LEGACY = "AuthenticatorPro";
+    private static final String PKG_NAME = "com.stratumauth.app";
+    private static final String PKG_DB_PATH = "databases/authenticator.db3";
 
     private enum Algorithm {
         SHA1,
@@ -56,7 +57,7 @@ public class AuthenticatorProImporter extends DatabaseImporter {
         SHA512
     }
 
-    public AuthenticatorProImporter(Context context) {
+    public StratumImporter(Context context) {
         super(context);
     }
 
@@ -90,24 +91,19 @@ public class AuthenticatorProImporter extends DatabaseImporter {
         }
     }
 
-    private static EncryptedState readEncrypted(DataInputStream stream) throws DatabaseImporterException {
+    private static State readEncrypted(DataInputStream stream) throws DatabaseImporterException {
         try {
             byte[] headerBytes = new byte[HEADER.getBytes(StandardCharsets.UTF_8).length];
             stream.readFully(headerBytes);
             String header = new String(headerBytes, StandardCharsets.UTF_8);
-            if (!header.equals(HEADER)) {
-                throw new DatabaseImporterException("Invalid file header");
+            switch (header) {
+                case HEADER:
+                    return EncryptedState.parseHeader(stream);
+                case HEADER_LEGACY:
+                    return LegacyEncryptedState.parseHeader(stream);
+                default:
+                    throw new DatabaseImporterException("Invalid file header");
             }
-
-            int saltSize = 20;
-            byte[] salt = new byte[saltSize];
-            stream.readFully(salt);
-
-            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-            int ivSize = cipher.getBlockSize();
-            byte[] iv = new byte[ivSize];
-            stream.readFully(iv);
-            return new EncryptedState(cipher, salt, iv, IOUtils.readAll(stream));
         } catch (UTFDataFormatException e) {
             throw new DatabaseImporterException("Invalid file header");
         } catch (IOException | NoSuchPaddingException | NoSuchAlgorithmException e) {
@@ -130,6 +126,13 @@ public class AuthenticatorProImporter extends DatabaseImporter {
     }
 
     static class EncryptedState extends State {
+        private static final int KEY_SIZE = 32;
+        private static final int MEMORY_COST = 16; // 2^16 KiB = 64 MiB
+        private static final int PARALLELISM = 4;
+        private static final int ITERATIONS = 3;
+        private static final int SALT_SIZE = 16;
+        private static final int IV_SIZE = 12;
+
         private final Cipher _cipher;
         private final byte[] _salt;
         private final byte[] _iv;
@@ -143,6 +146,81 @@ public class AuthenticatorProImporter extends DatabaseImporter {
             _data = data;
         }
 
+        public JsonState decrypt(char[] password) throws DatabaseImporterException {
+            Argon2Task.Params params = getKeyDerivationParams(password);
+            SecretKey key = Argon2Task.deriveKey(params);
+            return decrypt(key);
+        }
+
+        public JsonState decrypt(SecretKey key) throws DatabaseImporterException {
+            try {
+                _cipher.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(_iv));
+                byte[] decrypted = _cipher.doFinal(_data);
+                return new JsonState(new JSONObject(new String(decrypted, StandardCharsets.UTF_8)));
+            } catch (InvalidAlgorithmParameterException | IllegalBlockSizeException
+                     | JSONException | InvalidKeyException | BadPaddingException e) {
+                throw new DatabaseImporterException(e);
+            }
+        }
+
+        @Override
+        public void decrypt(Context context, DecryptListener listener) throws DatabaseImporterException {
+            Dialogs.showPasswordInputDialog(context, R.string.enter_password_aegis_title, 0, (Dialogs.TextInputListener) password -> {
+                Argon2Task.Params params = getKeyDerivationParams(password);
+                Argon2Task task = new Argon2Task(context, key -> {
+                    try {
+                        StratumImporter.JsonState state = decrypt(key);
+                        listener.onStateDecrypted(state);
+                    } catch (DatabaseImporterException e) {
+                        listener.onError(e);
+                    }
+                });
+                Lifecycle lifecycle = ContextHelper.getLifecycle(context);
+                task.execute(lifecycle, params);
+            }, dialog -> listener.onCanceled());
+        }
+
+        private Argon2Task.Params getKeyDerivationParams(char[] password) {
+            Argon2Parameters argon2Params = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id)
+                    .withIterations(ITERATIONS)
+                    .withParallelism(PARALLELISM)
+                    .withMemoryPowOfTwo(MEMORY_COST)
+                    .withSalt(_salt)
+                    .build();
+            return new Argon2Task.Params(password, argon2Params, KEY_SIZE);
+        }
+
+        private static EncryptedState parseHeader(DataInputStream stream)
+            throws IOException, NoSuchPaddingException, NoSuchAlgorithmException {
+            byte[] salt = new byte[SALT_SIZE];
+            stream.readFully(salt);
+
+            byte[] iv = new byte[IV_SIZE];
+            stream.readFully(iv);
+
+            Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+            return new EncryptedState(cipher, salt, iv, IOUtils.readAll(stream));
+        }
+    }
+
+    static class LegacyEncryptedState extends State {
+        private static final int ITERATIONS = 64000;
+        private static final int KEY_SIZE = 32 * Byte.SIZE;
+        private static final int SALT_SIZE = 20;
+
+        private final Cipher _cipher;
+        private final byte[] _salt;
+        private final byte[] _iv;
+        private final byte[] _data;
+
+        public LegacyEncryptedState(Cipher cipher, byte[] salt, byte[] iv, byte[] data) {
+            super(true);
+            _cipher = cipher;
+            _salt = salt;
+            _iv = iv;
+            _data = data;
+        }
+
         public JsonState decrypt(char[] password) throws DatabaseImporterException {
             PBKDFTask.Params params = getKeyDerivationParams(password);
             SecretKey key = PBKDFTask.deriveKey(params);
@@ -166,7 +244,7 @@ public class AuthenticatorProImporter extends DatabaseImporter {
                 PBKDFTask.Params params = getKeyDerivationParams(password);
                 PBKDFTask task = new PBKDFTask(context, key -> {
                     try {
-                        AuthenticatorProImporter.JsonState state = decrypt(key);
+                        StratumImporter.JsonState state = decrypt(key);
                         listener.onStateDecrypted(state);
                     } catch (DatabaseImporterException e) {
                         listener.onError(e);
@@ -180,6 +258,18 @@ public class AuthenticatorProImporter extends DatabaseImporter {
         private PBKDFTask.Params getKeyDerivationParams(char[] password) {
             return new PBKDFTask.Params("PBKDF2WithHmacSHA1", KEY_SIZE, password, _salt, ITERATIONS);
         }
+
+        private static LegacyEncryptedState parseHeader(DataInputStream stream)
+            throws IOException, NoSuchPaddingException, NoSuchAlgorithmException {
+            byte[] salt = new byte[SALT_SIZE];
+            stream.readFully(salt);
+
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            int ivSize = cipher.getBlockSize();
+            byte[] iv = new byte[ivSize];
+            stream.readFully(iv);
+            return new LegacyEncryptedState(cipher, salt, iv, IOUtils.readAll(stream));
+        }
     }
 
     private static class JsonState extends State {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/TotpAuthenticatorImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/TotpAuthenticatorImporter.java
index b603eb86..699f39b2 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/TotpAuthenticatorImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/TotpAuthenticatorImporter.java
@@ -4,8 +4,6 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.util.Xml;
 
-import androidx.appcompat.app.AlertDialog;
-
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.crypto.CryptoUtils;
 import com.beemdevelopment.aegis.encoding.Base32;
@@ -18,6 +16,7 @@ import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.util.PreferenceParser;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.topjohnwu.superuser.io.SuFile;
 
 import org.json.JSONArray;
@@ -154,7 +153,7 @@ public class TotpAuthenticatorImporter extends DatabaseImporter {
 
         @Override
         public void decrypt(Context context, DecryptListener listener) {
-            Dialogs.showSecureDialog(new AlertDialog.Builder(context)
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(context)
                     .setMessage(R.string.choose_totpauth_importer)
                     .setPositiveButton(R.string.yes, (dialog, which) -> {
                         Dialogs.showPasswordInputDialog(context, password -> {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/TwoFASImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/TwoFASImporter.java
index 8c896980..f0387afb 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/TwoFASImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/TwoFASImporter.java
@@ -4,17 +4,19 @@ import android.content.Context;
 
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.crypto.CryptoUtils;
-import com.beemdevelopment.aegis.encoding.Base32;
 import com.beemdevelopment.aegis.encoding.Base64;
 import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
 import com.beemdevelopment.aegis.otp.HotpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.SteamInfo;
 import com.beemdevelopment.aegis.otp.TotpInfo;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.util.JsonUtils;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.google.common.base.Strings;
 import com.topjohnwu.superuser.io.SuFile;
 
 import org.json.JSONArray;
@@ -60,7 +62,7 @@ public class TwoFASImporter extends DatabaseImporter {
             String json = new String(IOUtils.readAll(stream), StandardCharsets.UTF_8);
             JSONObject obj = new JSONObject(json);
             int version = obj.getInt("schemaVersion");
-            if (version > 3) {
+            if (version > 4) {
                 throw new DatabaseImporterException(String.format("Unsupported schema version: %d", version));
             }
 
@@ -172,9 +174,12 @@ public class TwoFASImporter extends DatabaseImporter {
 
         private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
             try {
-                byte[] secret = Base32.decode(obj.getString("secret"));
+                byte[] secret = GoogleAuthInfo.parseSecret(obj.getString("secret"));
                 JSONObject info = obj.getJSONObject("otp");
-                String issuer = info.optString("issuer");
+                String issuer = obj.optString("name");
+                if (Strings.isNullOrEmpty(issuer)) {
+                    issuer = info.optString("issuer");
+                }
                 String name = info.optString("account");
                 int digits = info.optInt("digits", TotpInfo.DEFAULT_DIGITS);
                 String algorithm = info.optString("algorithm", TotpInfo.DEFAULT_ALGORITHM);
@@ -187,6 +192,9 @@ public class TwoFASImporter extends DatabaseImporter {
                 } else if (tokenType.equals("HOTP")) {
                     long counter = info.optLong("counter", 0);
                     otp = new HotpInfo(secret, algorithm, digits, counter);
+                } else if (tokenType.equals("STEAM")) {
+                    int period = info.optInt("period", TotpInfo.DEFAULT_PERIOD);
+                    otp = new SteamInfo(secret, algorithm, digits, period);
                 } else {
                     throw new DatabaseImporterEntryException(String.format("Unrecognized tokenType: %s", tokenType), obj.toString());
                 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/licenses/GlideLicense.java b/app/src/main/java/com/beemdevelopment/aegis/licenses/GlideLicense.java
deleted file mode 100644
index 3d3435d2..00000000
--- a/app/src/main/java/com/beemdevelopment/aegis/licenses/GlideLicense.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.beemdevelopment.aegis.licenses;
-
-import android.content.Context;
-
-import com.beemdevelopment.aegis.R;
-
-import de.psdev.licensesdialog.licenses.License;
-
-public class GlideLicense extends License {
-    @Override
-    public String getName() {
-        return "Glide License";
-    }
-
-    @Override
-    public String readSummaryTextFromResources(Context context) {
-        return getContent(context, R.raw.glide_license);
-    }
-
-    @Override
-    public String readFullTextFromResources(Context context) {
-        return getContent(context, R.raw.glide_license);
-    }
-
-    @Override
-    public String getVersion() {
-        return null;
-    }
-
-    @Override
-    public String getUrl() {
-        return "https://github.com/bumptech/glide/blob/master/LICENSE";
-    }
-}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/licenses/ProtobufLicense.java b/app/src/main/java/com/beemdevelopment/aegis/licenses/ProtobufLicense.java
deleted file mode 100644
index f6b937fa..00000000
--- a/app/src/main/java/com/beemdevelopment/aegis/licenses/ProtobufLicense.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.beemdevelopment.aegis.licenses;
-
-import android.content.Context;
-
-import com.beemdevelopment.aegis.R;
-
-import de.psdev.licensesdialog.licenses.License;
-
-public class ProtobufLicense extends License  {
-    @Override
-    public String getName() {
-        return "Protocol Buffers License";
-    }
-
-    @Override
-    public String readSummaryTextFromResources(Context context) {
-        return getContent(context, R.raw.protobuf_license);
-    }
-
-    @Override
-    public String readFullTextFromResources(Context context) {
-        return getContent(context, R.raw.protobuf_license);
-    }
-
-    @Override
-    public String getVersion() {
-        return null;
-    }
-
-    @Override
-    public String getUrl() {
-        return "https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE";
-    }
-}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/otp/MotpInfo.java b/app/src/main/java/com/beemdevelopment/aegis/otp/MotpInfo.java
index d08d912f..585d5485 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/otp/MotpInfo.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/otp/MotpInfo.java
@@ -30,20 +30,6 @@ public class MotpInfo extends TotpInfo {
         setPin(pin);
     }
 
-    @Override
-    public String getOtp() {
-        if (_pin == null) {
-            throw new IllegalStateException("PIN must be set before generating an OTP");
-        }
-
-        try {
-            MOTP otp = MOTP.generateOTP(getSecret(), getAlgorithm(false), getDigits(), getPeriod(), getPin());
-            return otp.toString();
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     @Override
     public String getOtp(long time) {
         if (_pin == null) {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/otp/SteamInfo.java b/app/src/main/java/com/beemdevelopment/aegis/otp/SteamInfo.java
index 6d345c98..1adcd983 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/otp/SteamInfo.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/otp/SteamInfo.java
@@ -20,11 +20,11 @@ public class SteamInfo extends TotpInfo {
     }
 
     @Override
-    public String getOtp() throws OtpInfoException {
+    public String getOtp(long time) throws OtpInfoException {
         checkSecret();
 
         try {
-            OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod());
+            OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod(), time);
             return otp.toSteamString();
         } catch (InvalidKeyException | NoSuchAlgorithmException e) {
             throw new RuntimeException(e);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/otp/TotpInfo.java b/app/src/main/java/com/beemdevelopment/aegis/otp/TotpInfo.java
index 5e7320f4..cba249eb 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/otp/TotpInfo.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/otp/TotpInfo.java
@@ -27,17 +27,12 @@ public class TotpInfo extends OtpInfo {
 
     @Override
     public String getOtp() throws OtpInfoException {
-        checkSecret();
-
-        try {
-            OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod());
-            return otp.toString();
-        } catch (InvalidKeyException | NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
-        }
+        return getOtp(System.currentTimeMillis() / 1000);
     }
 
-    public String getOtp(long time) {
+    public String getOtp(long time) throws OtpInfoException {
+        checkSecret();
+
         try {
             OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod(), time);
             return otp.toString();
diff --git a/app/src/main/java/com/beemdevelopment/aegis/otp/YandexInfo.java b/app/src/main/java/com/beemdevelopment/aegis/otp/YandexInfo.java
index b5da60de..0afdf615 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/otp/YandexInfo.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/otp/YandexInfo.java
@@ -38,13 +38,13 @@ public class YandexInfo extends TotpInfo {
     }
 
     @Override
-    public String getOtp() {
+    public String getOtp(long time) {
         if (_pin == null) {
             throw new IllegalStateException("PIN must be set before generating an OTP");
         }
 
         try {
-            YAOTP otp = YAOTP.generateOTP(getSecret(), getPin(), getDigits(), getAlgorithm(true), getPeriod());
+            YAOTP otp = YAOTP.generateOTP(getSecret(), getPin(), getDigits(), getAlgorithm(true), getPeriod(), time);
             return otp.toString();
         } catch (InvalidKeyException | NoSuchAlgorithmException | IOException e) {
             throw new RuntimeException(e);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/services/LaunchAppTileService.java b/app/src/main/java/com/beemdevelopment/aegis/services/LaunchAppTileService.java
index 7b86b0fa..036c2c14 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/services/LaunchAppTileService.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/services/LaunchAppTileService.java
@@ -1,5 +1,7 @@
 package com.beemdevelopment.aegis.services;
 
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
 import android.content.Intent;
 import android.os.Build;
 import android.service.quicksettings.Tile;
@@ -16,10 +18,13 @@ public class LaunchAppTileService extends TileService {
     public void onStartListening() {
         super.onStartListening();
         Tile tile = getQsTile();
-        tile.setState(Tile.STATE_INACTIVE);
-        tile.updateTile();
+        if (tile != null) {
+            tile.setState(Tile.STATE_INACTIVE);
+            tile.updateTile();
+        }
     }
 
+    @SuppressLint("StartActivityAndCollapseDeprecated")
     @Override
     public void onClick() {
         super.onClick();
@@ -28,6 +33,12 @@ public class LaunchAppTileService extends TileService {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         intent.setAction(Intent.ACTION_MAIN);
 
-        startActivityAndCollapse(intent);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            int flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
+            PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, flags);
+            startActivityAndCollapse(pendingIntent);
+        } else {
+            startActivityAndCollapse(intent);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/services/LaunchScannerTileService.java b/app/src/main/java/com/beemdevelopment/aegis/services/LaunchScannerTileService.java
index 99e07652..d0268566 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/services/LaunchScannerTileService.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/services/LaunchScannerTileService.java
@@ -1,5 +1,7 @@
 package com.beemdevelopment.aegis.services;
 
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
 import android.content.Intent;
 import android.os.Build;
 import android.service.quicksettings.Tile;
@@ -16,10 +18,13 @@ public class LaunchScannerTileService extends TileService {
     public void onStartListening() {
         super.onStartListening();
         Tile tile = getQsTile();
-        tile.setState(Tile.STATE_INACTIVE);
-        tile.updateTile();
+        if (tile != null) {
+            tile.setState(Tile.STATE_INACTIVE);
+            tile.updateTile();
+        }
     }
 
+    @SuppressLint("StartActivityAndCollapseDeprecated")
     @Override
     public void onClick() {
         super.onClick();
@@ -29,6 +34,12 @@ public class LaunchScannerTileService extends TileService {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         intent.setAction(Intent.ACTION_MAIN);
 
-        startActivityAndCollapse(intent);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            int flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
+            PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, flags);
+            startActivityAndCollapse(pendingIntent);
+        } else {
+            startActivityAndCollapse(intent);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java b/app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java
index 97ccc4a0..bcc9030a 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Intent;
-import android.os.Build;
 import android.os.IBinder;
 
 import androidx.annotation.Nullable;
@@ -29,11 +28,7 @@ public class NotificationService extends Service {
 
     @SuppressLint("LaunchActivityFromNotification")
     public void serviceMethod() {
-        int flags = PendingIntent.FLAG_ONE_SHOT;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            flags |= PendingIntent.FLAG_IMMUTABLE;
-        }
-
+        int flags = PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE;
         Intent intent = new Intent(this, VaultLockReceiver.class);
         intent.setAction(VaultLockReceiver.ACTION_LOCK_VAULT);
         intent.setPackage(BuildConfig.APPLICATION_ID);
@@ -47,7 +42,8 @@ public class NotificationService extends Service {
                 .setOngoing(true)
                 .setContentIntent(pendingIntent);
 
-        startForeground(NOTIFICATION_VAULT_UNLOCKED, builder.build());
+        // NOTE: Disabled for now. See issue: #1047
+        //startForeground(NOTIFICATION_VAULT_UNLOCKED, builder.build());
     }
 
     @Override
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java
index a3144757..4b974b68 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java
@@ -13,20 +13,16 @@ import android.widget.Toast;
 
 import androidx.annotation.AttrRes;
 import androidx.annotation.StringRes;
-import androidx.core.view.LayoutInflaterCompat;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.beemdevelopment.aegis.BuildConfig;
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.Theme;
-import com.beemdevelopment.aegis.helpers.ThemeHelper;
-import com.beemdevelopment.aegis.licenses.GlideLicense;
-import com.beemdevelopment.aegis.licenses.ProtobufLicense;
 import com.beemdevelopment.aegis.ui.dialogs.ChangelogDialog;
 import com.beemdevelopment.aegis.ui.dialogs.LicenseDialog;
-import com.mikepenz.iconics.context.IconicsLayoutInflater2;
-
-import de.psdev.licensesdialog.LicenseResolver;
-import de.psdev.licensesdialog.LicensesDialog;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
+import com.google.android.material.color.MaterialColors;
 
 public class AboutActivity extends AegisActivity {
 
@@ -40,7 +36,6 @@ public class AboutActivity extends AegisActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        LayoutInflaterCompat.setFactory2(getLayoutInflater(), new IconicsLayoutInflater2(getDelegate()));
         super.onCreate(savedInstanceState);
         if (abortIfOrphan(savedInstanceState)) {
             return;
@@ -48,6 +43,7 @@ public class AboutActivity extends AegisActivity {
 
         setContentView(R.layout.activity_about);
         setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -57,12 +53,15 @@ public class AboutActivity extends AegisActivity {
         View btnLicense = findViewById(R.id.btn_license);
         btnLicense.setOnClickListener(v -> {
             LicenseDialog.create()
-                    .setTheme(getConfiguredTheme())
+                    .setTheme(_themeHelper.getConfiguredTheme())
                     .show(getSupportFragmentManager(), null);
         });
 
         View btnThirdPartyLicenses = findViewById(R.id.btn_third_party_licenses);
-        btnThirdPartyLicenses.setOnClickListener(v -> showThirdPartyLicenseDialog());
+        btnThirdPartyLicenses.setOnClickListener(v -> {
+            Intent intent = new Intent(this, LicensesActivity.class);
+            startActivity(intent);
+        });
 
         TextView appVersion = findViewById(R.id.app_version);
         appVersion.setText(getCurrentAppVersion());
@@ -93,9 +92,20 @@ public class AboutActivity extends AegisActivity {
         View btnChangelog = findViewById(R.id.btn_changelog);
         btnChangelog.setOnClickListener(v -> {
             ChangelogDialog.create()
-                    .setTheme(getConfiguredTheme())
+                    .setTheme(_themeHelper.getConfiguredTheme())
                     .show(getSupportFragmentManager(), null);
         });
+
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.about_scroll_view), (targetView, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+            targetView.setPadding(
+                    0,
+                    0,
+                    0,
+                    insets.bottom
+            );
+            return WindowInsetsCompat.CONSUMED;
+        });
     }
 
     private static String getCurrentAppVersion() {
@@ -130,30 +140,9 @@ public class AboutActivity extends AegisActivity {
         startActivity(Intent.createChooser(mailIntent, getString(R.string.email)));
     }
 
-    private void showThirdPartyLicenseDialog() {
-        String stylesheet = getString(R.string.custom_notices_format_style);
-        int backgroundColorResource = getConfiguredTheme() == Theme.AMOLED ? R.attr.cardBackgroundFocused : R.attr.cardBackground;
-        String backgroundColor = getThemeColorAsHex(backgroundColorResource);
-        String textColor = getThemeColorAsHex(R.attr.primaryText);
-        String licenseColor = getThemeColorAsHex(R.attr.cardBackgroundFocused);
-        String linkColor = getThemeColorAsHex(R.attr.colorAccent);
-
-        stylesheet = String.format(stylesheet, backgroundColor, textColor, licenseColor, linkColor);
-
-        LicenseResolver.registerLicense(new GlideLicense());
-        LicenseResolver.registerLicense(new ProtobufLicense());
-
-        new LicensesDialog.Builder(this)
-                .setNotices(R.raw.notices)
-                .setTitle(R.string.third_party_licenses)
-                .setNoticesCssStyle(stylesheet)
-                .setIncludeOwnLicense(true)
-                .build()
-                .show();
-    }
-
     private String getThemeColorAsHex(@AttrRes int attributeId) {
-        return String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(attributeId, getTheme())));
+        int color = MaterialColors.getColor(this, attributeId, getClass().getCanonicalName());
+        return String.format("%06X", 0xFFFFFF & color);
     }
 
     @Override
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
index 33b6fe85..5a467fbc 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
@@ -4,25 +4,34 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.Toast;
 
 import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.core.view.ViewPropertyAnimatorCompat;
 
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.Theme;
 import com.beemdevelopment.aegis.ThemeMap;
+import com.beemdevelopment.aegis.database.AuditLogRepository;
+import com.beemdevelopment.aegis.helpers.ThemeHelper;
 import com.beemdevelopment.aegis.icons.IconPackManager;
 import com.beemdevelopment.aegis.vault.VaultManager;
 import com.beemdevelopment.aegis.vault.VaultRepositoryException;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.color.MaterialColors;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Locale;
-import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -35,21 +44,30 @@ import dagger.hilt.components.SingletonComponent;
 @AndroidEntryPoint
 public abstract class AegisActivity extends AppCompatActivity implements VaultManager.LockListener {
     protected Preferences _prefs;
+    protected ThemeHelper _themeHelper;
 
     @Inject
     protected VaultManager _vaultManager;
 
+    @Inject
+    protected AuditLogRepository _auditLogRepository;
+
     @Inject
     protected IconPackManager _iconPackManager;
 
+    private ActionModeStatusGuardHack _statusGuardHack;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // set the theme and locale before creating the activity
         _prefs = EarlyEntryPoints.get(getApplicationContext(), PrefEntryPoint.class).getPreferences();
+        _themeHelper = new ThemeHelper(this, _prefs);
         onSetTheme();
         setLocale(_prefs.getLocale());
         super.onCreate(savedInstanceState);
 
+        _statusGuardHack = new ActionModeStatusGuardHack();
+
         // set FLAG_SECURE on the window of every AegisActivity
         if (_prefs.isSecureScreenEnabled()) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
@@ -96,31 +114,7 @@ public abstract class AegisActivity extends AppCompatActivity implements VaultMa
      * Called when the activity is expected to set its theme.
      */
     protected void onSetTheme() {
-        setTheme(ThemeMap.DEFAULT);
-    }
-
-    /**
-     * Sets the theme of the activity. The actual style that is set is picked from the
-     * given map, based on the theme configured by the user.
-     */
-    protected void setTheme(Map<Theme, Integer> themeMap) {
-        int theme = themeMap.get(getConfiguredTheme());
-        setTheme(theme);
-    }
-
-    protected Theme getConfiguredTheme() {
-        Theme theme = _prefs.getCurrentTheme();
-
-        if (theme == Theme.SYSTEM || theme == Theme.SYSTEM_AMOLED) {
-            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-            if (currentNightMode == Configuration.UI_MODE_NIGHT_YES) {
-                theme = theme == Theme.SYSTEM_AMOLED ? Theme.AMOLED : Theme.DARK;
-            } else {
-                theme = Theme.LIGHT;
-            }
-        }
-
-        return theme;
+        _themeHelper.setTheme(ThemeMap.DEFAULT);
     }
 
     protected void setLocale(Locale locale) {
@@ -169,6 +163,79 @@ public abstract class AegisActivity extends AppCompatActivity implements VaultMa
         return true;
     }
 
+    @Override
+    public void onSupportActionModeStarted(@NonNull ActionMode mode) {
+        super.onSupportActionModeStarted(mode);
+        _statusGuardHack.apply(View.VISIBLE);
+    }
+
+    @Override
+    public void onSupportActionModeFinished(@NonNull ActionMode mode) {
+        super.onSupportActionModeFinished(mode);
+        _statusGuardHack.apply(View.GONE);
+    }
+
+    /**
+     * When starting/finishing an action mode, forcefully cancel the fade in/out animation and
+     * set the status bar color. This requires the abc_decor_view_status_guard colors to be set
+     * to transparent.
+     *
+     * This should fix any inconsistencies between the color of the action bar and the status bar
+     * when an action mode is active.
+     */
+    private class ActionModeStatusGuardHack {
+        private Field _fadeAnimField;
+        private Field _actionModeViewField;
+        private Drawable _appBarBackground;
+
+        private ActionModeStatusGuardHack() {
+            try {
+                _fadeAnimField = getDelegate().getClass().getDeclaredField("mFadeAnim");
+                _fadeAnimField.setAccessible(true);
+                _actionModeViewField = getDelegate().getClass().getDeclaredField("mActionModeView");
+                _actionModeViewField.setAccessible(true);
+            } catch (NoSuchFieldException ignored) {
+            }
+        }
+
+        private void apply(int visibility) {
+            if (_fadeAnimField == null || _actionModeViewField == null) {
+                return;
+            }
+
+            ViewPropertyAnimatorCompat fadeAnim;
+            ViewGroup actionModeView;
+            try {
+                fadeAnim = (ViewPropertyAnimatorCompat) _fadeAnimField.get(getDelegate());
+                actionModeView = (ViewGroup) _actionModeViewField.get(getDelegate());
+            } catch (IllegalAccessException e) {
+                return;
+            }
+
+            AppBarLayout appBarLayout = findViewById(R.id.app_bar_layout);
+            if (appBarLayout != null && _appBarBackground == null) {
+                _appBarBackground = appBarLayout.getBackground();
+            }
+
+            if (fadeAnim == null || actionModeView == null || appBarLayout == null || _appBarBackground == null) {
+                return;
+            }
+
+            fadeAnim.cancel();
+
+            if (visibility == View.VISIBLE) {
+                actionModeView.setVisibility(visibility);
+                actionModeView.setAlpha(1f);
+                int color = MaterialColors.getColor(appBarLayout, com.google.android.material.R.attr.colorSurfaceContainer);
+                appBarLayout.setBackgroundColor(color);
+            } else {
+                actionModeView.setVisibility(visibility);
+                actionModeView.setAlpha(0f);
+                appBarLayout.setBackground(_appBarBackground);
+            }
+        }
+    }
+
     /**
      * Reports whether this Activity instance has become an orphan. This can happen if
      * the vault was killed/locked by an external trigger while the Activity was still open.
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AssignIconsActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AssignIconsActivity.java
new file mode 100644
index 00000000..024f9200
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AssignIconsActivity.java
@@ -0,0 +1,281 @@
+package com.beemdevelopment.aegis.ui;
+
+import android.content.Intent;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.helpers.MetricsHelper;
+import com.beemdevelopment.aegis.icons.IconPack;
+import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.beemdevelopment.aegis.ui.dialogs.IconPickerDialog;
+import com.beemdevelopment.aegis.ui.glide.GlideHelper;
+import com.beemdevelopment.aegis.ui.models.AssignIconEntry;
+import com.beemdevelopment.aegis.ui.views.AssignIconAdapter;
+import com.beemdevelopment.aegis.ui.views.IconAdapter;
+import com.beemdevelopment.aegis.util.IOUtils;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.ListPreloader;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
+import com.bumptech.glide.util.ViewPreloadSizeProvider;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+public class AssignIconsActivity extends AegisActivity implements AssignIconAdapter.Listener {
+    private AssignIconAdapter _adapter;
+    private ArrayList<AssignIconEntry> _entries = new ArrayList<>();
+    private RecyclerView _entriesView;
+    private AssignIconsActivity.BackPressHandler _backPressHandler;
+    private ViewPreloadSizeProvider<AssignIconEntry> _preloadSizeProvider;
+    private IconPack _favoriteIconPack;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (abortIfOrphan(savedInstanceState)) {
+            return;
+        }
+
+        setContentView(R.layout.activity_assign_icons);
+        setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        ArrayList<UUID> assignIconEntriesIds = (ArrayList<UUID>) getIntent().getSerializableExtra("entries");
+        for (UUID entryId: assignIconEntriesIds) {
+            VaultEntry vaultEntry = _vaultManager.getVault().getEntryByUUID(entryId);
+            _entries.add(new AssignIconEntry(vaultEntry));
+        }
+
+        _backPressHandler = new AssignIconsActivity.BackPressHandler();
+        getOnBackPressedDispatcher().addCallback(this, _backPressHandler);
+
+        IconPreloadProvider modelProvider1 = new IconPreloadProvider();
+        EntryIconPreloadProvider modelProvider2 = new EntryIconPreloadProvider();
+        _preloadSizeProvider = new ViewPreloadSizeProvider<>();
+        RecyclerViewPreloader<IconPack.Icon> preloader1 = new RecyclerViewPreloader(this, modelProvider1, _preloadSizeProvider, 10);
+        RecyclerViewPreloader<VaultEntry> preloader2 = new RecyclerViewPreloader(this, modelProvider2, _preloadSizeProvider, 10);
+
+        _adapter = new AssignIconAdapter(this);
+        _entriesView = findViewById(R.id.list_assign_icons);
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        _entriesView.setLayoutManager(layoutManager);
+        _entriesView.setAdapter(_adapter);
+        _entriesView.setNestedScrollingEnabled(false);
+        _entriesView.addItemDecoration(new SpacesItemDecoration(8));
+        _entriesView.addOnScrollListener(preloader1);
+        _entriesView.addOnScrollListener(preloader2);
+
+        Optional<IconPack> favoriteIconPack = _iconPackManager.getIconPacks().stream()
+                .sorted(Comparator.comparing(IconPack::getName))
+                .findFirst();
+
+        if (!favoriteIconPack.isPresent()) {
+            throw new RuntimeException(String.format("Started %s without any icon packs present", AssignIconsActivity.class.getName()));
+        }
+
+        _favoriteIconPack = favoriteIconPack.get();
+
+        for (AssignIconEntry entry : _entries) {
+            IconPack.Icon suggestedIcon = findSuggestedIcon(entry);
+            if (suggestedIcon != null) {
+                entry.setNewIcon(suggestedIcon);
+            }
+        }
+
+        _adapter.addEntries(_entries);
+    }
+
+    private IconPack.Icon findSuggestedIcon(AssignIconEntry entry) {
+        List<IconPack.Icon> suggestedIcons = _favoriteIconPack.getSuggestedIcons(entry.getEntry().getIssuer());
+        if (suggestedIcons.size() > 0) {
+            return suggestedIcons.get(0);
+        }
+
+        return null;
+    }
+
+    private void saveAndFinish() throws IOException {
+        ArrayList<UUID> uuids = new ArrayList<>();
+        for (AssignIconEntry selectedEntry : _entries) {
+            VaultEntry entry = selectedEntry.getEntry();
+            if (selectedEntry.getNewIcon() != null) {
+                byte[] iconBytes;
+                try (FileInputStream inStream = new FileInputStream(selectedEntry.getNewIcon().getFile())){
+                    iconBytes = IOUtils.readFile(inStream);
+                }
+
+                VaultEntryIcon icon = new VaultEntryIcon(iconBytes, selectedEntry.getNewIcon().getIconType());
+                entry.setIcon(icon);
+                uuids.add(entry.getUUID());
+
+                _vaultManager.getVault().replaceEntry(entry);
+            }
+        }
+
+        Intent intent = new Intent();
+        intent.putExtra("entryUUIDs", uuids);
+
+        if (saveAndBackupVault()) {
+            setResult(RESULT_OK, intent);
+            finish();
+        }
+    }
+
+    private void discardAndFinish() {
+        Dialogs.showDiscardDialog(this,
+                (dialog, which) -> {
+                    try {
+                        saveAndFinish();
+                    } catch (IOException e) {
+                        Toast.makeText(this, R.string.saving_assign_icons_error, Toast.LENGTH_SHORT).show();
+                    }
+                },
+                (dialog, which) -> finish());
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_assign_icons, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            discardAndFinish();
+        } else if (itemId == R.id.action_save) {
+            try {
+                saveAndFinish();
+            } catch (IOException e) {
+                Toast.makeText(this, R.string.saving_assign_icons_error, Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+
+        return true;
+    }
+
+    @Override
+    public void onAssignIconEntryClick(AssignIconEntry entry) {
+        List<IconPack> iconPacks = _iconPackManager.getIconPacks().stream()
+                .sorted(Comparator.comparing(IconPack::getName))
+                .collect(Collectors.toList());
+
+        BottomSheetDialog dialog = IconPickerDialog.create(this, iconPacks, entry.getEntry().getIssuer(), false, new IconAdapter.Listener() {
+            @Override
+            public void onIconSelected(IconPack.Icon icon) {
+                entry.setNewIcon(icon);
+            }
+
+            @Override
+            public void onCustomSelected() { }
+        });
+        Dialogs.showSecureDialog(dialog);
+    }
+
+    @Override
+    public void onSetPreloadView(View view) {
+        _preloadSizeProvider.setView(view);
+    }
+
+    private class BackPressHandler extends OnBackPressedCallback {
+        public BackPressHandler() {
+            super(false);
+        }
+
+        @Override
+        public void handleOnBackPressed() {
+            discardAndFinish();
+        }
+    }
+
+    private class EntryIconPreloadProvider implements ListPreloader.PreloadModelProvider<VaultEntry> {
+        @NonNull
+        @Override
+        public List<VaultEntry> getPreloadItems(int position) {
+            VaultEntry entry = _entries.get(position).getEntry();
+            if (entry.hasIcon()) {
+                return Collections.singletonList(entry);
+            }
+            return Collections.emptyList();
+        }
+
+        @Nullable
+        @Override
+        public RequestBuilder<Drawable> getPreloadRequestBuilder(@NonNull VaultEntry entry) {
+            RequestBuilder<Drawable> rb = Glide.with(AssignIconsActivity.this)
+                    .load(entry.getIcon());
+            return GlideHelper.setCommonOptions(rb, entry.getIcon().getType());
+        }
+    }
+
+    private class IconPreloadProvider implements ListPreloader.PreloadModelProvider<IconPack.Icon> {
+        @NonNull
+        @Override
+        public List<IconPack.Icon> getPreloadItems(int position) {
+            AssignIconEntry entry = _entries.get(position);
+            if (entry.getNewIcon() != null) {
+                return Collections.singletonList(entry.getNewIcon());
+            }
+            return Collections.emptyList();
+        }
+
+        @Nullable
+        @Override
+        public RequestBuilder<Drawable> getPreloadRequestBuilder(@NonNull IconPack.Icon icon) {
+            RequestBuilder<Drawable> rb = Glide.with(AssignIconsActivity.this)
+                    .load(icon.getFile());
+            return GlideHelper.setCommonOptions(rb, icon.getIconType());
+        }
+    }
+
+    private class SpacesItemDecoration extends RecyclerView.ItemDecoration {
+        private final int _space;
+
+        public SpacesItemDecoration(int dpSpace) {
+
+            this._space = MetricsHelper.convertDpToPixels(AssignIconsActivity.this, dpSpace);
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            outRect.left = _space;
+            outRect.right = _space;
+            outRect.bottom = _space;
+
+            if (parent.getChildLayoutPosition(view) == 0) {
+                outRect.top = _space;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
index b77c9eba..57746cb1 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
@@ -2,7 +2,6 @@ package com.beemdevelopment.aegis.ui;
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.InputType;
 import android.view.KeyEvent;
@@ -20,11 +19,9 @@ import android.widget.Toast;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.biometric.BiometricPrompt;
 
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.ThemeMap;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
 import com.beemdevelopment.aegis.crypto.MasterKey;
@@ -36,6 +33,7 @@ import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.tasks.PasswordSlotDecryptTask;
 import com.beemdevelopment.aegis.vault.VaultFile;
 import com.beemdevelopment.aegis.vault.VaultFileCredentials;
+import com.beemdevelopment.aegis.vault.VaultRepository;
 import com.beemdevelopment.aegis.vault.VaultRepositoryException;
 import com.beemdevelopment.aegis.vault.slots.BiometricSlot;
 import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
@@ -43,6 +41,7 @@ import com.beemdevelopment.aegis.vault.slots.Slot;
 import com.beemdevelopment.aegis.vault.slots.SlotException;
 import com.beemdevelopment.aegis.vault.slots.SlotIntegrityException;
 import com.beemdevelopment.aegis.vault.slots.SlotList;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.List;
 
@@ -55,10 +54,13 @@ public class AuthActivity extends AegisActivity {
 
     private EditText _textPassword;
 
+    private VaultFile _vaultFile;
     private SlotList _slots;
+
     private SecretKey _bioKey;
     private BiometricSlot _bioSlot;
     private BiometricPrompt _bioPrompt;
+    private Button _decryptButton;
 
     private int _failedUnlockAttempts;
 
@@ -72,14 +74,14 @@ public class AuthActivity extends AegisActivity {
         setContentView(R.layout.activity_auth);
         _textPassword = findViewById(R.id.text_password);
         LinearLayout boxBiometricInfo = findViewById(R.id.box_biometric_info);
-        Button decryptButton = findViewById(R.id.button_decrypt);
+        _decryptButton = findViewById(R.id.button_decrypt);
         TextView biometricsButton = findViewById(R.id.button_biometrics);
 
         getOnBackPressedDispatcher().addCallback(this, new BackPressHandler());
 
         _textPassword.setOnEditorActionListener((v, actionId, event) -> {
             if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
-                decryptButton.performClick();
+                _decryptButton.performClick();
             }
             return false;
         });
@@ -104,17 +106,17 @@ public class AuthActivity extends AegisActivity {
             _inhibitBioPrompt = savedInstanceState.getBoolean("inhibitBioPrompt", false);
         }
 
-        if (_vaultManager.getVaultFileError() != null) {
-            Dialogs.showErrorDialog(this, R.string.vault_load_error, _vaultManager.getVaultFileError(), (dialog, which) -> {
+        try {
+            _vaultFile = VaultRepository.readVaultFile(this);
+        } catch (VaultRepositoryException e) {
+            Dialogs.showErrorDialog(this, R.string.vault_load_error, e, (dialog, which) -> {
                 getOnBackPressedDispatcher().onBackPressed();
             });
             return;
         }
 
-        VaultFile vaultFile = _vaultManager.getVaultFile();
-        _slots = vaultFile.getHeader().getSlots();
-
         // only show the biometric prompt if the api version is new enough, permission is granted, a scanner is found and a biometric slot is found
+        _slots = _vaultFile.getHeader().getSlots();
         if (_slots.has(BiometricSlot.class) && BiometricsHelper.isAvailable(this)) {
             boolean invalidated = false;
 
@@ -150,7 +152,7 @@ public class AuthActivity extends AegisActivity {
             }
         }
 
-        decryptButton.setOnClickListener(v -> {
+        _decryptButton.setOnClickListener(v -> {
             InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
             imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
 
@@ -159,18 +161,23 @@ public class AuthActivity extends AegisActivity {
             PasswordSlotDecryptTask.Params params = new PasswordSlotDecryptTask.Params(slots, password);
             PasswordSlotDecryptTask task = new PasswordSlotDecryptTask(AuthActivity.this, new PasswordDerivationListener());
             task.execute(getLifecycle(), params);
+
+            _decryptButton.setEnabled(false);
         });
 
         biometricsButton.setOnClickListener(v -> {
             if (_prefs.isPasswordReminderNeeded()) {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                         .setTitle(getString(R.string.password_reminder_dialog_title))
                         .setMessage(getString(R.string.password_reminder_dialog_message))
                         .setCancelable(false)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setPositiveButton(android.R.string.ok, (dialog1, which) -> {
                             showBiometricPrompt();
                         })
                         .create());
+            } else {
+                showBiometricPrompt();
             }
         });
     }
@@ -181,11 +188,6 @@ public class AuthActivity extends AegisActivity {
         outState.putBoolean("inhibitBioPrompt", _inhibitBioPrompt);
     }
 
-    @Override
-    protected void onSetTheme() {
-        setTheme(ThemeMap.NO_ACTION_BAR);
-    }
-
     private void selectPassword() {
         _textPassword.selectAll();
 
@@ -238,11 +240,8 @@ public class AuthActivity extends AegisActivity {
         PopupWindow popup = new PopupWindow(popupLayout, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         popup.setFocusable(false);
         popup.setOutsideTouchable(true);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
-            popup.setElevation(5.0f);
-        }
         _textPassword.post(() -> {
-            if (isFinishing()) {
+            if (isFinishing() || !_textPassword.isAttachedToWindow()) {
                 return;
             }
 
@@ -285,7 +284,7 @@ public class AuthActivity extends AegisActivity {
         VaultFileCredentials creds = new VaultFileCredentials(key, _slots);
 
         try {
-            _vaultManager.unlock(creds);
+            _vaultManager.loadFrom(_vaultFile, creds);
             if (isSlotRepaired) {
                 saveAndBackupVault();
             }
@@ -300,10 +299,11 @@ public class AuthActivity extends AegisActivity {
     }
 
     private void onInvalidPassword() {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(AuthActivity.this)
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(AuthActivity.this, R.style.ThemeOverlay_Aegis_AlertDialog_Error)
                 .setTitle(getString(R.string.unlock_vault_error))
                 .setMessage(getString(R.string.unlock_vault_error_description))
                 .setCancelable(false)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.ok, (dialog, which) -> selectPassword())
                 .create());
 
@@ -343,6 +343,9 @@ public class AuthActivity extends AegisActivity {
 
                 finish(result.getKey(), result.isSlotRepaired());
             } else {
+                _decryptButton.setEnabled(true);
+
+                _auditLogRepository.addVaultUnlockFailedPasswordEvent();
                 onInvalidPassword();
             }
         }
@@ -355,6 +358,7 @@ public class AuthActivity extends AegisActivity {
             _bioPrompt = null;
 
             if (!BiometricsHelper.isCanceled(errorCode)) {
+                _auditLogRepository.addVaultUnlockFailedBiometricsEvent();
                 Toast.makeText(AuthActivity.this, errString, Toast.LENGTH_LONG).show();
             }
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
index 95de25e2..36011861 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
@@ -15,13 +15,16 @@ import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
-import android.widget.AdapterView;
 import android.widget.AutoCompleteTextView;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import androidx.activity.OnBackPressedCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -34,13 +37,14 @@ import com.beemdevelopment.aegis.encoding.Base32;
 import com.beemdevelopment.aegis.encoding.EncodingException;
 import com.beemdevelopment.aegis.encoding.Hex;
 import com.beemdevelopment.aegis.helpers.AnimationsHelper;
+import com.beemdevelopment.aegis.helpers.BitmapHelper;
 import com.beemdevelopment.aegis.helpers.DropdownHelper;
 import com.beemdevelopment.aegis.helpers.EditTextHelper;
-import com.beemdevelopment.aegis.helpers.IconViewHelper;
 import com.beemdevelopment.aegis.helpers.SafHelper;
 import com.beemdevelopment.aegis.helpers.SimpleAnimationEndListener;
 import com.beemdevelopment.aegis.helpers.SimpleTextWatcher;
 import com.beemdevelopment.aegis.helpers.TextDrawableHelper;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
 import com.beemdevelopment.aegis.icons.IconPack;
 import com.beemdevelopment.aegis.icons.IconType;
 import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
@@ -53,53 +57,63 @@ import com.beemdevelopment.aegis.otp.TotpInfo;
 import com.beemdevelopment.aegis.otp.YandexInfo;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.dialogs.IconPickerDialog;
-import com.beemdevelopment.aegis.ui.glide.IconLoader;
+import com.beemdevelopment.aegis.ui.glide.GlideHelper;
+import com.beemdevelopment.aegis.ui.models.VaultGroupModel;
 import com.beemdevelopment.aegis.ui.tasks.ImportFileTask;
 import com.beemdevelopment.aegis.ui.views.IconAdapter;
 import com.beemdevelopment.aegis.util.Cloner;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 import com.beemdevelopment.aegis.vault.VaultRepository;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.chip.Chip;
+import com.google.android.material.chip.ChipGroup;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import java.util.TreeSet;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import de.hdodenhof.circleimageview.CircleImageView;
-
 public class EditEntryActivity extends AegisActivity {
-    private static final int PICK_IMAGE_REQUEST = 0;
-
     private boolean _isNew = false;
     private boolean _isManual = false;
     private VaultEntry _origEntry;
-    private TreeSet<String> _groups;
+    private Collection<VaultGroup> _groups;
     private boolean _hasCustomIcon = false;
     // keep track of icon changes separately as the generated jpeg's are not deterministic
     private boolean _hasChangedIcon = false;
     private IconPack.Icon _selectedIcon;
-    private CircleImageView _iconView;
+    private String _pickedMimeType;
+    private ShapeableImageView _iconView;
     private ImageView _saveImageButton;
 
     private TextInputEditText _textName;
     private TextInputEditText _textIssuer;
+    private TextInputLayout _textGroupLayout;
+    private TextInputEditText _textGroup;
     private TextInputEditText _textPeriodCounter;
     private TextInputLayout _textPeriodCounterLayout;
     private TextInputEditText _textDigits;
@@ -109,21 +123,44 @@ public class EditEntryActivity extends AegisActivity {
     private LinearLayout _textPinLayout;
     private TextInputEditText _textUsageCount;
     private TextInputEditText _textNote;
+    private TextView _textLastUsed;
 
     private AutoCompleteTextView _dropdownType;
     private AutoCompleteTextView _dropdownAlgo;
     private TextInputLayout _dropdownAlgoLayout;
-    private AutoCompleteTextView _dropdownGroup;
-    private List<String> _dropdownGroupList = new ArrayList<>();
+    private List<UUID> _selectedGroups = new ArrayList<>();
 
     private KropView _kropView;
 
     private RelativeLayout _advancedSettingsHeader;
-    private RelativeLayout _advancedSettings;
+    private LinearLayout _advancedSettingsLayout;
 
     private BackPressHandler _backPressHandler;
     private IconBackPressHandler _iconBackPressHandler;
 
+    private final ActivityResultLauncher<Intent> pickImageResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                Intent data = activityResult.getData();
+                if (activityResult.getResultCode() != RESULT_OK || data == null || data.getData() == null) {
+                    return;
+                }
+                _pickedMimeType = SafHelper.getMimeType(this, data.getData());
+                if (_pickedMimeType != null && _pickedMimeType.equals(IconType.SVG.toMimeType())) {
+                    ImportFileTask.Params params = new ImportFileTask.Params(data.getData(), "icon", null);
+                    ImportFileTask task = new ImportFileTask(this, result -> {
+                        if (result.getError() == null) {
+                            CustomSvgIcon icon = new CustomSvgIcon(result.getFile());
+                            selectIcon(icon);
+                        } else {
+                            Dialogs.showErrorDialog(this, R.string.reading_file_error, result.getError());
+                        }
+                    });
+                    task.execute(getLifecycle(), params);
+                } else {
+                    startEditingIcon(data.getData());
+                }
+            });
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -132,12 +169,13 @@ public class EditEntryActivity extends AegisActivity {
         }
         setContentView(R.layout.activity_edit_entry);
         setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
 
         _groups = _vaultManager.getVault().getGroups();
 
         ActionBar bar = getSupportActionBar();
         if (bar != null) {
-            bar.setHomeAsUpIndicator(R.drawable.ic_close);
+            bar.setHomeAsUpIndicator(R.drawable.ic_outline_close_24);
             bar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -164,6 +202,8 @@ public class EditEntryActivity extends AegisActivity {
         _saveImageButton = findViewById(R.id.iv_saveImage);
         _textName = findViewById(R.id.text_name);
         _textIssuer = findViewById(R.id.text_issuer);
+        _textGroup = findViewById(R.id.text_group);
+        _textGroupLayout = findViewById(R.id.text_group_layout);
         _textPeriodCounter = findViewById(R.id.text_period_counter);
         _textPeriodCounterLayout = findViewById(R.id.text_period_counter_layout);
         _textDigits = findViewById(R.id.text_digits);
@@ -173,14 +213,12 @@ public class EditEntryActivity extends AegisActivity {
         _textPinLayout = findViewById(R.id.layout_pin);
         _textUsageCount = findViewById(R.id.text_usage_count);
         _textNote = findViewById(R.id.text_note);
+        _textLastUsed = findViewById(R.id.text_last_used);
         _dropdownType = findViewById(R.id.dropdown_type);
         DropdownHelper.fillDropdown(this, _dropdownType, R.array.otp_types_array);
         _dropdownAlgoLayout = findViewById(R.id.dropdown_algo_layout);
         _dropdownAlgo = findViewById(R.id.dropdown_algo);
         DropdownHelper.fillDropdown(this, _dropdownAlgo, R.array.otp_algo_array);
-        _dropdownGroup = findViewById(R.id.dropdown_group);
-        updateGroupDropdownList();
-        DropdownHelper.fillDropdown(this, _dropdownGroup, _dropdownGroupList);
 
         // if this is NOT a manually entered entry, move the "Secret" field from basic to advanced settings
         if (!_isNew || !_isManual) {
@@ -209,22 +247,12 @@ public class EditEntryActivity extends AegisActivity {
 
         _advancedSettingsHeader = findViewById(R.id.accordian_header);
         _advancedSettingsHeader.setOnClickListener(v -> openAdvancedSettings());
-        _advancedSettings = findViewById(R.id.expandableLayout);
+        _advancedSettingsLayout = findViewById(R.id.layout_advanced);
 
         // fill the fields with values if possible
+        GlideHelper.loadEntryIcon(Glide.with(this), _origEntry, _iconView);
         if (_origEntry.hasIcon()) {
-            IconViewHelper.setLayerType(_iconView, _origEntry.getIconType());
-            Glide.with(this)
-                .asDrawable()
-                .load(_origEntry)
-                .set(IconLoader.ICON_TYPE, _origEntry.getIconType())
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(false)
-                .into(_iconView);
             _hasCustomIcon = true;
-        } else {
-            TextDrawable drawable = TextDrawableHelper.generate(_origEntry.getIssuer(), _origEntry.getName(), _iconView);
-            _iconView.setImageDrawable(drawable);
         }
 
         _textName.setText(_origEntry.getName());
@@ -262,8 +290,18 @@ public class EditEntryActivity extends AegisActivity {
         updateAdvancedFieldStatus(_origEntry.getInfo().getTypeId());
         updatePinFieldVisibility(_origEntry.getInfo().getTypeId());
 
-        String group = _origEntry.getGroup();
-        setGroup(group);
+        Set<UUID> groups = _origEntry.getGroups();
+        if (groups.isEmpty()) {
+            _textGroup.setText(getString(R.string.no_group));
+        } else {
+            String text = groups.stream().map(uuid -> {
+                VaultGroup group = _vaultManager.getVault().getGroupByUUID(uuid);
+                return group.getName();
+            })
+            .collect(Collectors.joining(", "));
+            _selectedGroups.addAll(groups);
+            _textGroup.setText(text);
+        }
 
         // Update the icon if the issuer or name has changed
         _textIssuer.addTextChangedListener(_nameChangeListener);
@@ -271,11 +309,11 @@ public class EditEntryActivity extends AegisActivity {
 
         // Register listeners to trigger validation
         _textIssuer.addTextChangedListener(_validationListener);
+        _textGroup.addTextChangedListener(_validationListener);
         _textName.addTextChangedListener(_validationListener);
         _textNote.addTextChangedListener(_validationListener);
         _textSecret.addTextChangedListener(_validationListener);
         _dropdownType.addTextChangedListener(_validationListener);
-        _dropdownGroup.addTextChangedListener(_validationListener);
         _dropdownAlgo.addTextChangedListener(_validationListener);
         _textPeriodCounter.addTextChangedListener(_validationListener);
         _textDigits.addTextChangedListener(_validationListener);
@@ -327,28 +365,107 @@ public class EditEntryActivity extends AegisActivity {
             startIconSelection();
         });
 
-        _dropdownGroup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            private int prevPosition = _dropdownGroupList.indexOf(_dropdownGroup.getText().toString());
-
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (position == _dropdownGroupList.size() - 1) {
-                    Dialogs.showTextInputDialog(EditEntryActivity.this, R.string.set_group, R.string.group_name_hint, text -> {
-                        String groupName = new String(text);
-                        if (!groupName.isEmpty()) {
-                            _groups.add(groupName);
-                            updateGroupDropdownList();
-                            _dropdownGroup.setText(groupName, false);
-                        }
-                    });
-                    _dropdownGroup.setText(_dropdownGroupList.get(prevPosition), false);
-                } else {
-                    prevPosition = position;
-                }
+        _textGroup.setShowSoftInputOnFocus(false);
+        _textGroup.setOnClickListener(v -> showGroupSelectionDialog());
+        _textGroup.setOnFocusChangeListener((v, hasFocus) -> {
+            if (hasFocus) {
+                showGroupSelectionDialog();
             }
         });
 
+        _textGroupLayout.setOnClickListener(v -> {
+            showGroupSelectionDialog();
+        });
+
         _textUsageCount.setText(_prefs.getUsageCount(entryUUID).toString());
+        setLastUsedTimestamp(_prefs.getLastUsedTimestamp(entryUUID));
+    }
+
+    private void showGroupSelectionDialog() {
+        BottomSheetDialog dialog = new BottomSheetDialog(this);
+        View view = getLayoutInflater().inflate(R.layout.dialog_select_groups, null);
+        dialog.setContentView(view);
+
+        ChipGroup chipGroup = view.findViewById(R.id.groupChipGroup);
+        TextView addGroupInfo = view.findViewById(R.id.addGroupInfo);
+        LinearLayout addGroup = view.findViewById(R.id.addGroup);
+        Button clearButton = view.findViewById(R.id.btnClear);
+        Button saveButton = view.findViewById(R.id.btnSave);
+
+        chipGroup.removeAllViews();
+        addGroupInfo.setVisibility(View.VISIBLE);
+        addGroup.setVisibility(View.VISIBLE);
+
+        for (VaultGroup group : _groups) {
+            addChipTo(chipGroup, new VaultGroupModel(group), false);
+        }
+
+        addGroup.setOnClickListener(v1 -> {
+            Dialogs.TextInputListener onAddGroup = text -> {
+                String groupName = new String(text).trim();
+                if (!groupName.isEmpty()) {
+                    VaultGroup group = _vaultManager.getVault().findGroupByName(groupName);
+                    if (group == null) {
+                        group = new VaultGroup(groupName);
+                        _vaultManager.getVault().addGroup(group);
+                    }
+
+                    _selectedGroups.add(group.getUUID());
+                    addChipTo(chipGroup, new VaultGroupModel(group), true);
+                }
+            };
+
+            Dialogs.showTextInputDialog(EditEntryActivity.this, R.string.set_group, R.string.group_name_hint, onAddGroup);
+        });
+
+        saveButton.setOnClickListener(v1 -> {
+            if(getCheckedUUID(chipGroup).isEmpty()) {
+                _selectedGroups.clear();
+                _textGroup.setText(getString(R.string.no_group));
+            } else {
+                _selectedGroups.clear();
+                _selectedGroups.addAll(getCheckedUUID(chipGroup));
+                _textGroup.setText(getCheckedNames(chipGroup));
+            }
+            dialog.dismiss();
+        });
+
+        clearButton.setOnClickListener(v1 -> {
+            chipGroup.clearCheck();
+        });
+
+        Dialogs.showSecureDialog(dialog);
+    }
+
+    private void addChipTo(ChipGroup chipGroup, VaultGroupModel group, Boolean isNew) {
+        Chip chip = (Chip) getLayoutInflater().inflate(R.layout.chip_group_filter, null, false);
+        chip.setText(group.getName());
+        chip.setCheckable(true);
+
+        chip.setChecked((!_selectedGroups.isEmpty() && _selectedGroups.contains(group.getUUID())) || isNew);
+        chip.setCheckedIconVisible(true);
+        chip.setTag(group);
+        chipGroup.addView(chip);
+    }
+
+    private static Set<UUID> getCheckedUUID(ChipGroup chipGroup) {
+        return chipGroup.getCheckedChipIds().stream()
+                .map(i -> {
+                    Chip chip = chipGroup.findViewById(i);
+                    VaultGroupModel group = (VaultGroupModel) chip.getTag();
+                    return group.getUUID();
+                })
+                .collect(Collectors.toSet());
+    }
+
+    private static String getCheckedNames(ChipGroup chipGroup) {
+        return chipGroup.getCheckedChipIds().stream()
+                .map(i -> {
+                    Chip chip = chipGroup.findViewById(i);
+                    VaultGroupModel group = (VaultGroupModel) chip.getTag();
+                    return group.getName();
+                })
+                .collect(Collectors.joining(", "));
     }
 
     private void updateAdvancedFieldStatus(String otpType) {
@@ -365,41 +482,20 @@ public class EditEntryActivity extends AegisActivity {
         _textPin.setHint(otpType.equals(MotpInfo.ID) ? R.string.motp_pin : R.string.yandex_pin);
     }
 
-    private void setGroup(String groupName) {
-        int pos = 0;
-        if (groupName != null) {
-            pos = _groups.contains(groupName) ? _groups.headSet(groupName).size() + 1 : 0;
-        }
-
-        _dropdownGroup.setText(_dropdownGroupList.get(pos), false);
-    }
-
     private void openAdvancedSettings() {
         Animation fadeOut = new AlphaAnimation(1, 0);
         fadeOut.setInterpolator(new AccelerateInterpolator());
-        fadeOut.setDuration(220 * (long) AnimationsHelper.Scale.ANIMATOR.getValue(this));
+        fadeOut.setDuration((long) (220 * AnimationsHelper.Scale.ANIMATOR.getValue(this)));
         _advancedSettingsHeader.startAnimation(fadeOut);
 
-        Animation fadeIn = new AlphaAnimation(0, 1);
-        fadeIn.setInterpolator(new AccelerateInterpolator());
-        fadeIn.setDuration(250 * (long) AnimationsHelper.Scale.ANIMATOR.getValue(this));
-
         fadeOut.setAnimationListener(new SimpleAnimationEndListener((a) -> {
             _advancedSettingsHeader.setVisibility(View.GONE);
-            _advancedSettings.startAnimation(fadeIn);
+            _advancedSettingsLayout.setVisibility(View.VISIBLE);
+            _advancedSettingsLayout.animate()
+                    .setInterpolator(new AccelerateInterpolator())
+                    .setDuration((long) (250 * AnimationsHelper.Scale.ANIMATOR.getValue(this)))
+                    .alpha(1);
         }));
-
-        fadeIn.setAnimationListener(new SimpleAnimationEndListener((a) -> {
-            _advancedSettings.setVisibility(View.VISIBLE);
-        }));
-    }
-
-    private void updateGroupDropdownList() {
-        Resources res = getResources();
-        _dropdownGroupList.clear();
-        _dropdownGroupList.add(res.getString(R.string.no_group));
-        _dropdownGroupList.addAll(_groups);
-        _dropdownGroupList.add(res.getString(R.string.new_group));
     }
 
     private boolean hasUnsavedChanges(VaultEntry newEntry) {
@@ -437,38 +533,33 @@ public class EditEntryActivity extends AegisActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                discardAndFinish();
-                break;
-            case R.id.action_save:
-                onSave();
-                break;
-            case R.id.action_delete:
-                Dialogs.showDeleteEntriesDialog(this, Collections.singletonList(_origEntry), (dialog, which) -> {
-                    deleteAndFinish(_origEntry);
-                });
-                break;
-            case R.id.action_edit_icon:
-                startIconSelection();
-                break;
-            case R.id.action_reset_usage_count:
-                Dialogs.showSecureDialog(new AlertDialog.Builder(this)
-                        .setTitle(R.string.action_reset_usage_count)
-                        .setMessage(R.string.action_reset_usage_count_dialog)
-                        .setPositiveButton(android.R.string.yes, (dialog, which) -> resetUsageCount())
-                        .setNegativeButton(android.R.string.no, null)
-                        .create());
-                break;
-            case R.id.action_default_icon:
-                TextDrawable drawable = TextDrawableHelper.generate(_origEntry.getIssuer(), _origEntry.getName(), _iconView);
-                _iconView.setImageDrawable(drawable);
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            discardAndFinish();
+        } else if (itemId == R.id.action_save) {
+            onSave();
+        } else if (itemId == R.id.action_delete) {
+            Dialogs.showDeleteEntriesDialog(this, Collections.singletonList(_origEntry), (dialog, which) -> {
+                deleteAndFinish(_origEntry);
+            });
+        } else if (itemId == R.id.action_edit_icon) {
+            startIconSelection();
+        } else if (itemId == R.id.action_reset_usage_count) {
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.action_reset_usage_count)
+                    .setMessage(R.string.action_reset_usage_count_dialog)
+                    .setPositiveButton(android.R.string.yes, (dialog, which) -> resetUsageCount())
+                    .setNegativeButton(android.R.string.no, null)
+                    .create());
+        } else if (itemId == R.id.action_default_icon) {
+            TextDrawable drawable = TextDrawableHelper.generate(_origEntry.getIssuer(), _origEntry.getName(), _iconView);
+            _iconView.setImageDrawable(drawable);
 
-                _selectedIcon = null;
-                _hasCustomIcon = false;
-                _hasChangedIcon = true;
-            default:
-                return super.onOptionsItemSelected(item);
+            _selectedIcon = null;
+            _hasCustomIcon = false;
+            _hasChangedIcon = true;
+        } else {
+            return super.onOptionsItemSelected(item);
         }
 
         return true;
@@ -483,7 +574,7 @@ public class EditEntryActivity extends AegisActivity {
 
         Intent chooserIntent = Intent.createChooser(galleryIntent, getString(R.string.select_icon));
         chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { fileIntent });
-        _vaultManager.startActivityForResult(this, chooserIntent, PICK_IMAGE_REQUEST);
+        _vaultManager.fireIntentLauncher(this, chooserIntent, pickImageResultLauncher);
     }
 
     private void resetUsageCount() {
@@ -500,7 +591,7 @@ public class EditEntryActivity extends AegisActivity {
             return;
         }
 
-        BottomSheetDialog dialog = IconPickerDialog.create(this, iconPacks, _textIssuer.getText().toString(), new IconAdapter.Listener() {
+        BottomSheetDialog dialog = IconPickerDialog.create(this, iconPacks, _textIssuer.getText().toString(), true, new IconAdapter.Listener() {
             @Override
             public void onIconSelected(IconPack.Icon icon) {
                 selectIcon(icon);
@@ -519,14 +610,7 @@ public class EditEntryActivity extends AegisActivity {
         _hasCustomIcon = true;
         _hasChangedIcon = true;
 
-        IconViewHelper.setLayerType(_iconView, icon.getIconType());
-        Glide.with(EditEntryActivity.this)
-                .asDrawable()
-                .load(icon.getFile())
-                .set(IconLoader.ICON_TYPE, icon.getIconType())
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(false)
-                .into(_iconView);
+        GlideHelper.loadIcon(Glide.with(EditEntryActivity.this), icon, _iconView);
     }
 
     private void startEditingIcon(Uri data) {
@@ -596,6 +680,16 @@ public class EditEntryActivity extends AegisActivity {
         saveAndFinish(entry, false);
     }
 
+    private void setLastUsedTimestamp(long timestamp) {
+        String readableDate = getString(R.string.last_used_never);
+        if (timestamp != 0) {
+            DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.getDefault());
+            readableDate = dateFormat.format(new Date(timestamp));
+        }
+
+        _textLastUsed.setText(String.format("%s: %s", getString(R.string.last_used), readableDate));
+    }
+
     private void deleteAndFinish(VaultEntry entry) {
         _vaultManager.getVault().removeEntry(entry);
         saveAndFinish(entry, true);
@@ -612,29 +706,6 @@ public class EditEntryActivity extends AegisActivity {
         }
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, final int resultCode, Intent data) {
-        if (requestCode == PICK_IMAGE_REQUEST && resultCode == RESULT_OK && data != null && data.getData() != null) {
-            String fileType = SafHelper.getMimeType(this, data.getData());
-            if (fileType != null && fileType.equals(IconType.SVG.toMimeType())) {
-                ImportFileTask.Params params = new ImportFileTask.Params(data.getData(), "icon", null);
-                ImportFileTask task = new ImportFileTask(this, result -> {
-                    if (result.getError() == null) {
-                        CustomSvgIcon icon = new CustomSvgIcon(result.getFile());
-                        selectIcon(icon);
-                    } else {
-                        Dialogs.showErrorDialog(this, R.string.reading_file_error, result.getError());
-                    }
-                });
-                task.execute(getLifecycle(), params);
-            } else {
-                startEditingIcon(data.getData());
-            }
-        }
-
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
     private int parsePeriod() throws ParseException {
         try {
             return Integer.parseInt(_textPeriodCounter.getText().toString());
@@ -726,23 +797,23 @@ public class EditEntryActivity extends AegisActivity {
         entry.setName(_textName.getText().toString());
         entry.setNote(_textNote.getText().toString());
 
-        int groupPos = _dropdownGroupList.indexOf(_dropdownGroup.getText().toString());
-        if (groupPos != 0) {
-            String group = _dropdownGroupList.get(groupPos);
-            entry.setGroup(group);
+        if (_selectedGroups.isEmpty()) {
+            entry.setGroups(new HashSet<>());
         } else {
-            entry.setGroup(null);
+            entry.setGroups(new HashSet<>(_selectedGroups));
         }
 
         if (_hasChangedIcon) {
             if (_hasCustomIcon) {
+                VaultEntryIcon icon;
                 if (_selectedIcon == null) {
                     Bitmap bitmap = ((BitmapDrawable) _iconView.getDrawable()).getBitmap();
-                    ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                    // the quality parameter is ignored for PNG
-                    bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
-                    byte[] data = stream.toByteArray();
-                    entry.setIcon(data, IconType.PNG);
+                    IconType iconType = _pickedMimeType == null
+                            ? IconType.INVALID : IconType.fromMimeType(_pickedMimeType);
+                    if (iconType == IconType.INVALID) {
+                        iconType = bitmap.hasAlpha() ? IconType.PNG : IconType.JPEG;
+                    }
+                    icon = BitmapHelper.toVaultEntryIcon(bitmap, iconType);
                 } else {
                     byte[] iconBytes;
                     try (FileInputStream inStream = new FileInputStream(_selectedIcon.getFile())){
@@ -750,11 +821,12 @@ public class EditEntryActivity extends AegisActivity {
                     } catch (IOException e) {
                         throw new ParseException(e.getMessage());
                     }
-
-                    entry.setIcon(iconBytes, _selectedIcon.getIconType());
+                    icon = new VaultEntryIcon(iconBytes, _selectedIcon.getIconType());
                 }
+
+                entry.setIcon(icon);
             } else {
-                entry.setIcon(null, IconType.INVALID);
+                entry.setIcon(null);
             }
         }
 
@@ -762,9 +834,10 @@ public class EditEntryActivity extends AegisActivity {
     }
 
     private void onSaveError(String msg) {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this, R.style.ThemeOverlay_Aegis_AlertDialog_Error)
                 .setTitle(getString(R.string.saving_profile_error))
                 .setMessage(msg)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.ok, null)
                 .create());
     }
@@ -782,10 +855,92 @@ public class EditEntryActivity extends AegisActivity {
             return false;
         }
 
+        if (_isNew) {
+            for (VaultEntry existing : _vaultManager.getVault().getEntries()) {
+                if (entry.hasSameNameAndIssuer(existing)) {
+                    showDuplicateBottomSheet(entry);
+                    return false;
+                }
+            }
+        }
+
         addAndFinish(entry);
         return true;
     }
 
+    private void showDuplicateBottomSheet(VaultEntry newEntry) {
+        BottomSheetDialog dialog = new BottomSheetDialog(this);
+        View view = getLayoutInflater().inflate(R.layout.dialog_duplicate_entry, null);
+        dialog.setContentView(view);
+
+        dialog.setCancelable(false);
+
+        View overwrite = view.findViewById(R.id.overwrite_entry);
+        View addSuffix = view.findViewById(R.id.create_new_entry);
+        View cancel = view.findViewById(R.id.cancel_save);
+
+        TextView suffixSubtext = view.findViewById(R.id.duplicate_suffix_subtitle);
+
+        String baseName = newEntry.getName();
+        Set<String> existingNames = new HashSet<>();
+        for (VaultEntry e : _vaultManager.getVault().getEntries()) {
+            if (e.getIssuer().equals(newEntry.getIssuer())) {
+                existingNames.add(e.getName());
+            }
+        }
+
+        int counter = 2;
+        String newName;
+        do {
+            newName = baseName + " #" + counter++;
+        } while (existingNames.contains(newName));
+
+        suffixSubtext.setText(getString(R.string.dialog_duplicate_entry_suffix_subtitle, newName));
+
+        overwrite.setOnClickListener(v -> {
+            List<VaultEntry> duplicates = new ArrayList<>();
+            for (VaultEntry existing : _vaultManager.getVault().getEntries()) {
+                if (existing.hasSameNameAndIssuer(newEntry)) {
+                    duplicates.add(existing);
+                }
+            }
+
+            Resources res = getResources();
+            String message = res.getQuantityString(
+                    R.plurals.dialog_duplicate_entry_overwrite_dialog_message,
+                    duplicates.size(),
+                    duplicates.size(),
+                    newEntry.getIssuer(),
+                    newEntry.getName()
+            );
+
+            new MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.dialog_duplicate_entry_overwrite_dialog_title)
+                    .setMessage(message)
+                    .setPositiveButton(R.string.action_delete, (d, which) -> {
+                        for (VaultEntry dup : duplicates) {
+                            _vaultManager.getVault().removeEntry(dup);
+                        }
+
+                        dialog.dismiss();
+                        addAndFinish(newEntry);
+                    })
+                    .setNegativeButton(android.R.string.no, null)
+                    .show();
+        });
+
+        String finalNewName = newName;
+        addSuffix.setOnClickListener(v -> {
+            newEntry.setName(finalNewName);
+            dialog.dismiss();
+            addAndFinish(newEntry);
+        });
+
+        cancel.setOnClickListener(v -> dialog.dismiss());
+
+        Dialogs.showSecureDialog(dialog);
+    }
+
     private static void setViewEnabled(View view, boolean enabled) {
         view.setEnabled(enabled);
 
@@ -852,11 +1007,12 @@ public class EditEntryActivity extends AegisActivity {
         private final File _file;
 
         protected CustomSvgIcon(File file) {
-            super(file.getAbsolutePath(), null, null);
+            super(file.getAbsolutePath(), null, null, null);
             _file = file;
         }
 
         @Nullable
+        @Override
         public File getFile() {
             return _file;
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/GroupManagerActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/GroupManagerActivity.java
index 74495cac..4c29dea2 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/GroupManagerActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/GroupManagerActivity.java
@@ -7,24 +7,28 @@ import android.view.View;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.views.GroupAdapter;
-import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.util.Cloner;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
+import com.beemdevelopment.aegis.vault.VaultGroup;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 
 public class GroupManagerActivity extends AegisActivity implements GroupAdapter.Listener {
     private GroupAdapter _adapter;
-    private HashSet<String> _removedGroups;
-    private RecyclerView _slotsView;
+    private HashSet<UUID> _removedGroups;
+    private RecyclerView _groupsView;
     private View _emptyStateView;
     private BackPressHandler _backPressHandler;
 
@@ -36,6 +40,7 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
         }
         setContentView(R.layout.activity_groups);
         setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
@@ -43,22 +48,51 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
         _backPressHandler = new BackPressHandler();
         getOnBackPressedDispatcher().addCallback(this, _backPressHandler);
 
+        _removedGroups = new HashSet<>();
         if (savedInstanceState != null) {
-            List<String> groups = savedInstanceState.getStringArrayList("removedGroups");
-            _removedGroups = new HashSet<>(Objects.requireNonNull(groups));
-        } else {
-            _removedGroups = new HashSet<>();
+            List<String> removedGroups = savedInstanceState.getStringArrayList("removedGroups");
+            if (removedGroups != null) {
+                for (String uuid : removedGroups) {
+                    _removedGroups.add(UUID.fromString(uuid));
+                }
+            }
         }
 
-        _adapter = new GroupAdapter(this);
-        _slotsView= findViewById(R.id.list_slots);
-        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
-        _slotsView.setLayoutManager(layoutManager);
-        _slotsView.setAdapter(_adapter);
-        _slotsView.setNestedScrollingEnabled(false);
+        ItemTouchHelper touchHelper = new ItemTouchHelper(new ItemTouchHelper.Callback() {
+            @Override
+            public int getMovementFlags(
+                    @NonNull RecyclerView recyclerView,
+                    @NonNull RecyclerView.ViewHolder viewHolder) {
 
-        for (String group : _vaultManager.getVault().getGroups()) {
-            _adapter.addGroup(group);
+                return makeMovementFlags(ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0);
+            }
+
+            @Override
+            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+                int draggedItemIndex = viewHolder.getBindingAdapterPosition();
+                int targetIndex = target.getBindingAdapterPosition();
+
+                _adapter.onItemMove(draggedItemIndex, targetIndex);
+
+                return true;
+            }
+
+            @Override
+            public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) { }
+        });
+
+        _adapter = new GroupAdapter(this);
+        _groupsView = findViewById(R.id.list_groups);
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        _groupsView.setLayoutManager(layoutManager);
+        _groupsView.setAdapter(_adapter);
+        _groupsView.setNestedScrollingEnabled(false);
+        touchHelper.attachToRecyclerView(_groupsView);
+
+        for (VaultGroup group : _vaultManager.getVault().getGroups()) {
+            if (!_removedGroups.contains(group.getUUID())) {
+                _adapter.addGroup(group);
+            }
         }
 
         _emptyStateView = findViewById(R.id.vEmptyList);
@@ -68,16 +102,37 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putStringArrayList("removedGroups", new ArrayList<>(_removedGroups));
+        ArrayList<String> removed = new ArrayList<>();
+        for (UUID uuid : _removedGroups) {
+            removed.add(uuid.toString());
+        }
+
+        outState.putStringArrayList("removedGroups", removed);
     }
 
     @Override
-    public void onRemoveGroup(String group) {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+    public void onEditGroup(VaultGroup group) {
+        Dialogs.TextInputListener onEditGroup = text -> {
+            String newGroupName = new String(text).trim();
+            if (!newGroupName.isEmpty()) {
+                VaultGroup newGroup = Cloner.clone(group);
+                newGroup.setName(newGroupName);
+                _adapter.replaceGroup(group.getUUID(), newGroup);
+                _backPressHandler.setEnabled(true);
+            }
+        };
+
+        Dialogs.showTextInputDialog(GroupManagerActivity.this, R.string.rename_group, R.string.group_name_hint, onEditGroup, group.getName());
+    }
+
+    @Override
+    public void onRemoveGroup(VaultGroup group) {
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                 .setTitle(R.string.remove_group)
                 .setMessage(R.string.remove_group_description)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
-                    _removedGroups.add(group);
+                    _removedGroups.add(group.getUUID());
                     _adapter.removeGroup(group);
                     _backPressHandler.setEnabled(true);
                     updateEmptyState();
@@ -86,17 +141,36 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
                 .create());
     }
 
+    public void onRemoveUnusedGroups() {
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
+                .setTitle(R.string.remove_unused_groups)
+                .setMessage(R.string.remove_unused_groups_description)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
+                .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
+                    Set<VaultGroup> unusedGroups = new HashSet<>(_vaultManager.getVault().getGroups());
+                    unusedGroups.removeAll(_vaultManager.getVault().getUsedGroups());
+
+                    for (VaultGroup group : unusedGroups) {
+                        _removedGroups.add(group.getUUID());
+                        _adapter.removeGroup(group);
+                    }
+                    _backPressHandler.setEnabled(true);
+                    updateEmptyState();
+                })
+                .setNegativeButton(android.R.string.no, null)
+                .create());
+    }
+
     private void saveAndFinish() {
         if (!_removedGroups.isEmpty()) {
-            for (VaultEntry entry : _vaultManager.getVault().getEntries()) {
-                if (_removedGroups.contains(entry.getGroup())) {
-                    entry.setGroup(null);
-                }
+            for (UUID uuid : _removedGroups) {
+                _vaultManager.getVault().removeGroup(uuid);
             }
-
-            saveAndBackupVault();
         }
 
+        _vaultManager.getVault().replaceGroups(_adapter.getGroups());
+        saveAndBackupVault();
+
         finish();
     }
 
@@ -119,15 +193,15 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                discardAndFinish();
-                break;
-            case R.id.action_save:
-                saveAndFinish();
-                break;
-            default:
-                return super.onOptionsItemSelected(item);
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            discardAndFinish();
+        } else if (itemId == R.id.action_save) {
+            saveAndFinish();
+        } else if (itemId == R.id.action_delete_unused_groups) {
+            onRemoveUnusedGroups();
+        } else {
+            return super.onOptionsItemSelected(item);
         }
 
         return true;
@@ -135,10 +209,10 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
 
     private void updateEmptyState() {
         if (_adapter.getItemCount() > 0) {
-            _slotsView.setVisibility(View.VISIBLE);
+            _groupsView.setVisibility(View.VISIBLE);
             _emptyStateView.setVisibility(View.GONE);
         } else {
-            _slotsView.setVisibility(View.GONE);
+            _groupsView.setVisibility(View.GONE);
             _emptyStateView.setVisibility(View.VISIBLE);
         }
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java
index 8787c419..da04bc3c 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java
@@ -1,44 +1,63 @@
 package com.beemdevelopment.aegis.ui;
 
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.helpers.BitmapHelper;
 import com.beemdevelopment.aegis.helpers.FabScrollHelper;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
+import com.beemdevelopment.aegis.icons.IconType;
 import com.beemdevelopment.aegis.importers.DatabaseImporter;
 import com.beemdevelopment.aegis.importers.DatabaseImporterEntryException;
 import com.beemdevelopment.aegis.importers.DatabaseImporterException;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.models.ImportEntry;
+import com.beemdevelopment.aegis.ui.tasks.IconOptimizationTask;
 import com.beemdevelopment.aegis.ui.tasks.RootShellTask;
 import com.beemdevelopment.aegis.ui.views.ImportEntriesAdapter;
 import com.beemdevelopment.aegis.util.UUIDMap;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 import com.beemdevelopment.aegis.vault.VaultRepository;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 public class ImportEntriesActivity extends AegisActivity {
+    private View _view;
     private Menu _menu;
+    private RecyclerView _entriesView;
     private ImportEntriesAdapter _adapter;
     private FabScrollHelper _fabScrollHelper;
 
+    private UUIDMap<VaultGroup> _importedGroups;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -47,14 +66,17 @@ public class ImportEntriesActivity extends AegisActivity {
         }
         setContentView(R.layout.activity_import_entries);
         setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
+
+        _view = findViewById(R.id.importEntriesRootView);
 
         ActionBar bar = getSupportActionBar();
-        bar.setHomeAsUpIndicator(R.drawable.ic_close);
+        bar.setHomeAsUpIndicator(R.drawable.ic_outline_close_24);
         bar.setDisplayHomeAsUpEnabled(true);
 
         _adapter = new ImportEntriesAdapter();
-        RecyclerView entriesView = findViewById(R.id.list_entries);
-        entriesView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        _entriesView = findViewById(R.id.list_entries);
+        _entriesView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
@@ -63,9 +85,9 @@ public class ImportEntriesActivity extends AegisActivity {
         });
 
         LinearLayoutManager layoutManager = new LinearLayoutManager(this);
-        entriesView.setLayoutManager(layoutManager);
-        entriesView.setAdapter(_adapter);
-        entriesView.setNestedScrollingEnabled(false);
+        _entriesView.setLayoutManager(layoutManager);
+        _entriesView.setAdapter(_adapter);
+        _entriesView.setNestedScrollingEnabled(false);
 
         FloatingActionButton fab = findViewById(R.id.fab);
         fab.setOnClickListener(v -> {
@@ -88,10 +110,11 @@ public class ImportEntriesActivity extends AegisActivity {
             if (importer.isInstalledAppVersionSupported()) {
                 startImportApp(importer);
             } else {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                         .setTitle(R.string.warning)
                         .setMessage(getString(R.string.app_version_error, importerDef.getName()))
                         .setCancelable(false)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setPositiveButton(R.string.yes, (dialog1, which) -> {
                             startImportApp(importer);
                         })
@@ -156,7 +179,7 @@ public class ImportEntriesActivity extends AegisActivity {
                 state.decrypt(this, new DatabaseImporter.DecryptListener() {
                     @Override
                     public void onStateDecrypted(DatabaseImporter.State state) {
-                        importDatabase(state);
+                        processDecryptedImporterState(state);
                     }
 
                     @Override
@@ -171,7 +194,7 @@ public class ImportEntriesActivity extends AegisActivity {
                     }
                 });
             } else {
-                importDatabase(state);
+                processDecryptedImporterState(state);
             }
         } catch (DatabaseImporterException e) {
             e.printStackTrace();
@@ -179,7 +202,7 @@ public class ImportEntriesActivity extends AegisActivity {
         }
     }
 
-    private void importDatabase(DatabaseImporter.State state) {
+    private void processDecryptedImporterState(DatabaseImporter.State state) {
         DatabaseImporter.Result result;
         try {
             result = state.convert();
@@ -189,16 +212,43 @@ public class ImportEntriesActivity extends AegisActivity {
             return;
         }
 
-        UUIDMap<VaultEntry> entries = result.getEntries();
-        for (VaultEntry entry : entries.getValues()) {
-            _adapter.addEntry(new ImportEntry(entry));
+        Map<UUID, VaultEntryIcon> icons = result.getEntries().getValues().stream()
+                .filter(e -> e.getIcon() != null
+                        && !e.getIcon().getType().equals(IconType.SVG)
+                        && !BitmapHelper.isVaultEntryIconOptimized(e.getIcon()))
+                .collect(Collectors.toMap(VaultEntry::getUUID, VaultEntry::getIcon));
+        if (!icons.isEmpty()) {
+            IconOptimizationTask task = new IconOptimizationTask(this, newIcons -> {
+                for (Map.Entry<UUID, VaultEntryIcon> mapEntry : newIcons.entrySet()) {
+                    VaultEntry entry = result.getEntries().getByUUID(mapEntry.getKey());
+                    entry.setIcon(mapEntry.getValue());
+                }
+
+                processImporterResult(result);
+            });
+            task.execute(getLifecycle(), icons);
+        } else {
+            processImporterResult(result);
         }
+    }
+
+    private void processImporterResult(DatabaseImporter.Result result) {
+        List<ImportEntry> importEntries = new ArrayList<>();
+        for (VaultEntry entry : result.getEntries().getValues()) {
+            ImportEntry importEntry = new ImportEntry(entry);
+            _adapter.addEntry(importEntry);
+            importEntries.add(importEntry);
+        }
+
+        _importedGroups = result.getGroups();
 
         List<DatabaseImporterEntryException> errors = result.getErrors();
         if (errors.size() > 0) {
             String message = getResources().getQuantityString(R.plurals.import_error_dialog, errors.size(), errors.size());
-            Dialogs.showMultiErrorDialog(this, R.string.import_error_title, message, errors, null);
+            Dialogs.showMultiExceptionDialog(this, R.string.import_error_title, message, errors, null);
         }
+
+        findDuplicates(importEntries);
     }
 
     private void showWipeEntriesDialog() {
@@ -212,10 +262,43 @@ public class ImportEntriesActivity extends AegisActivity {
     private void saveAndFinish(boolean wipeEntries) {
         VaultRepository vault = _vaultManager.getVault();
         if (wipeEntries) {
-            vault.wipeEntries();
+            vault.wipeContents();
         }
 
+        // Given the list of selected entries, collect the UUID's of all groups
+        // that we're actually going to import
         List<ImportEntry> selectedEntries = _adapter.getCheckedEntries();
+        List<UUID> selectedGroupUuids = new ArrayList<>();
+        for (ImportEntry entry : selectedEntries) {
+            selectedGroupUuids.addAll(entry.getEntry().getGroups());
+        }
+
+        // Add all of the new groups to the vault. If a group with the same name already
+        // exists in the vault, rewrite all entries in that group to reference the existing group.
+        for (VaultGroup importedGroup : _importedGroups) {
+            if (!selectedGroupUuids.contains(importedGroup.getUUID())) {
+                continue;
+            }
+
+            VaultGroup existingGroup = vault.findGroupByUUID(importedGroup.getUUID());
+            if (existingGroup != null) {
+                continue;
+            }
+
+            existingGroup = vault.findGroupByName(importedGroup.getName());
+            if (existingGroup == null) {
+                vault.addGroup(importedGroup);
+            } else {
+                for (ImportEntry entry : selectedEntries) {
+                    Set<UUID> entryGroups = entry.getEntry().getGroups();
+                    if (entryGroups.contains(importedGroup.getUUID())) {
+                        entryGroups.remove(importedGroup.getUUID());
+                        entryGroups.add(existingGroup.getUUID());
+                    }
+                }
+            }
+        }
+
         for (ImportEntry selectedEntry : selectedEntries) {
             VaultEntry entry = selectedEntry.getEntry();
 
@@ -231,11 +314,85 @@ public class ImportEntriesActivity extends AegisActivity {
             String toastMessage = getResources().getQuantityString(R.plurals.imported_entries_count, selectedEntries.size(), selectedEntries.size());
             Toast.makeText(this, toastMessage, Toast.LENGTH_SHORT).show();
 
+
             setResult(RESULT_OK, null);
-            finish();
+
+            if (_iconPackManager.hasIconPack()) {
+                ArrayList<UUID> assignIconEntriesIds = new ArrayList<>();
+                Intent assignIconIntent = new Intent(getBaseContext(), AssignIconsActivity.class);
+                for (ImportEntry entry : selectedEntries) {
+                    assignIconEntriesIds.add(entry.getEntry().getUUID());
+                }
+
+                assignIconIntent.putExtra("entries", assignIconEntriesIds);
+
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
+                        .setTitle(R.string.import_assign_icons_dialog_title)
+                        .setMessage(R.string.import_assign_icons_dialog_text)
+                        .setPositiveButton(android.R.string.yes, (dialog, which) -> {
+                            startActivity(assignIconIntent);
+                            finish();
+                        })
+                        .setNegativeButton(android.R.string.no, ((dialogInterface, i) -> finish()))
+                        .create());
+            } else {
+                finish();
+            }
         }
     }
 
+    private void findDuplicates(List<ImportEntry> importEntries) {
+        List<UUID> duplicateEntries = new ArrayList<>();
+        for (ImportEntry importEntry: importEntries) {
+            boolean exists = _vaultManager.getVault().getEntries().stream().anyMatch(item ->
+                    item.getIssuer().equals(importEntry.getEntry().getIssuer()) &&
+                    Arrays.equals(item.getInfo().getSecret(), importEntry.getEntry().getInfo().getSecret()));
+
+            if (exists) {
+                duplicateEntries.add(importEntry.getEntry().getUUID());
+            }
+        }
+
+        if (duplicateEntries.size() == 0) {
+            return;
+        }
+
+        _adapter.setCheckboxStates(duplicateEntries, false);
+        Snackbar snackbar = Snackbar.make(_view, getResources().getQuantityString(R.plurals.import_duplicate_toast, duplicateEntries.size(), duplicateEntries.size()), Snackbar.LENGTH_INDEFINITE);
+        snackbar.addCallback(new Snackbar.Callback() {
+            @Override
+            public void onShown(Snackbar sb) {
+                int snackbarHeight = sb.getView().getHeight();
+
+                _entriesView.setPadding(
+                        _entriesView.getPaddingLeft(),
+                        _entriesView.getPaddingTop(),
+                        _entriesView.getPaddingRight(),
+                        _entriesView.getPaddingBottom() + snackbarHeight * 2
+                );
+            }
+
+            @Override
+            public void onDismissed(Snackbar sb, int event) {
+                int snackbarHeight = sb.getView().getHeight();
+
+                _entriesView.setPadding(
+                        _entriesView.getPaddingLeft(),
+                        _entriesView.getPaddingTop(),
+                        _entriesView.getPaddingRight(),
+                        _entriesView.getPaddingBottom() - snackbarHeight * 2
+                );
+            }
+        });
+        snackbar.setAction(R.string.undo, new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                _adapter.setCheckboxStates(duplicateEntries, true);
+            }
+        });
+        snackbar.show();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         _menu = menu;
@@ -245,18 +402,15 @@ public class ImportEntriesActivity extends AegisActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                break;
-            case R.id.toggle_checkboxes:
-                _adapter.toggleCheckboxes();
-                break;
-            case R.id.toggle_wipe_vault:
-                item.setChecked(!item.isChecked());
-                break;
-            default:
-                return super.onOptionsItemSelected(item);
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            finish();
+        } else if (itemId == R.id.toggle_checkboxes) {
+            _adapter.toggleCheckboxes();
+        } else if (itemId == R.id.toggle_wipe_vault) {
+            item.setChecked(!item.isChecked());
+        } else {
+            return super.onOptionsItemSelected(item);
         }
 
         return true;
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java
index 8ab26fe8..e7aecc18 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java
@@ -13,7 +13,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.ThemeMap;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.intro.IntroBaseActivity;
 import com.beemdevelopment.aegis.ui.intro.SlideFragment;
@@ -21,7 +20,9 @@ import com.beemdevelopment.aegis.ui.slides.DoneSlide;
 import com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide;
 import com.beemdevelopment.aegis.ui.slides.SecuritySetupSlide;
 import com.beemdevelopment.aegis.ui.slides.WelcomeSlide;
+import com.beemdevelopment.aegis.vault.VaultFile;
 import com.beemdevelopment.aegis.vault.VaultFileCredentials;
+import com.beemdevelopment.aegis.vault.VaultRepository;
 import com.beemdevelopment.aegis.vault.VaultRepositoryException;
 import com.beemdevelopment.aegis.vault.slots.BiometricSlot;
 import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
@@ -40,11 +41,6 @@ public class IntroActivity extends IntroBaseActivity {
         addSlide(DoneSlide.class);
     }
 
-    @Override
-    protected void onSetTheme() {
-        setTheme(ThemeMap.NO_ACTION_BAR);
-    }
-
     @Override
     protected boolean onBeforeSlideChanged(Class<? extends SlideFragment> oldSlide, @NonNull Class<? extends SlideFragment> newSlide) {
         // hide the keyboard before every slide change
@@ -108,8 +104,17 @@ public class IntroActivity extends IntroBaseActivity {
                 return;
             }
         } else {
+            VaultFile vaultFile;
             try {
-                _vaultManager.load(creds);
+                vaultFile = VaultRepository.readVaultFile(this);
+            } catch (VaultRepositoryException e) {
+                e.printStackTrace();
+                Dialogs.showErrorDialog(this, R.string.vault_load_error, e);
+                return;
+            }
+
+            try {
+                _vaultManager.loadFrom(vaultFile, creds);
             } catch (VaultRepositoryException e) {
                 e.printStackTrace();
                 Dialogs.showErrorDialog(this, R.string.vault_load_error, e);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/LicensesActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/LicensesActivity.java
new file mode 100644
index 00000000..a06ca776
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/LicensesActivity.java
@@ -0,0 +1,40 @@
+package com.beemdevelopment.aegis.ui;
+
+import android.os.Bundle;
+
+import com.beemdevelopment.aegis.Preferences;
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.ThemeMap;
+import com.beemdevelopment.aegis.helpers.ThemeHelper;
+import com.mikepenz.aboutlibraries.LibsBuilder;
+import com.mikepenz.aboutlibraries.ui.LibsActivity;
+
+import org.jetbrains.annotations.Nullable;
+
+import dagger.hilt.InstallIn;
+import dagger.hilt.android.EarlyEntryPoint;
+import dagger.hilt.android.EarlyEntryPoints;
+import dagger.hilt.components.SingletonComponent;
+
+public class LicensesActivity extends LibsActivity {
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        LibsBuilder builder = new LibsBuilder()
+                .withSearchEnabled(true)
+                .withAboutMinimalDesign(true)
+                .withActivityTitle(getString(R.string.title_activity_licenses));
+        setIntent(builder.intent(this));
+
+        Preferences _prefs = EarlyEntryPoints.get(getApplicationContext(), PrefEntryPoint.class).getPreferences();
+        ThemeHelper themeHelper = new ThemeHelper(this, _prefs);
+        themeHelper.setTheme(ThemeMap.DEFAULT);
+
+        super.onCreate(savedInstanceState);
+    }
+
+    @EarlyEntryPoint
+    @InstallIn(SingletonComponent.class)
+    public interface PrefEntryPoint {
+        Preferences getPreferences();
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
index a43b1643..592d15d7 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -23,60 +23,76 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.activity.OnBackPressedCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
-import com.beemdevelopment.aegis.CopyBehavior;
-import com.beemdevelopment.aegis.AccountNamePosition;
+import com.beemdevelopment.aegis.GroupPlaceholderType;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.SortCategory;
-import com.beemdevelopment.aegis.ViewMode;
+import com.beemdevelopment.aegis.helpers.BitmapHelper;
+import com.beemdevelopment.aegis.helpers.DropdownHelper;
 import com.beemdevelopment.aegis.helpers.FabScrollHelper;
 import com.beemdevelopment.aegis.helpers.PermissionHelper;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
+import com.beemdevelopment.aegis.icons.IconType;
 import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
 import com.beemdevelopment.aegis.otp.GoogleAuthInfoException;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.fragments.preferences.BackupsPreferencesFragment;
 import com.beemdevelopment.aegis.ui.fragments.preferences.PreferencesFragment;
+import com.beemdevelopment.aegis.ui.models.ErrorCardInfo;
+import com.beemdevelopment.aegis.ui.models.VaultGroupModel;
+import com.beemdevelopment.aegis.ui.tasks.IconOptimizationTask;
 import com.beemdevelopment.aegis.ui.tasks.QrDecodeTask;
 import com.beemdevelopment.aegis.ui.views.EntryListView;
 import com.beemdevelopment.aegis.util.TimeUtils;
+import com.beemdevelopment.aegis.util.UUIDMap;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
+import com.beemdevelopment.aegis.vault.VaultFile;
+import com.beemdevelopment.aegis.vault.VaultGroup;
+import com.beemdevelopment.aegis.vault.VaultRepository;
+import com.beemdevelopment.aegis.vault.VaultRepositoryException;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.chip.Chip;
+import com.google.android.material.chip.ChipGroup;
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
 import com.google.common.base.Strings;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.TreeSet;
+import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 public class MainActivity extends AegisActivity implements EntryListView.Listener {
-    // activity request codes
-    private static final int CODE_SCAN = 0;
-    private static final int CODE_ADD_ENTRY = 1;
-    private static final int CODE_EDIT_ENTRY = 2;
-    private static final int CODE_DO_INTRO = 3;
-    private static final int CODE_DECRYPT = 4;
-    private static final int CODE_PREFERENCES = 5;
-    private static final int CODE_SCAN_IMAGE = 6;
-
     // Permission request codes
     private static final int CODE_PERM_CAMERA = 0;
 
@@ -94,8 +110,11 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     private Menu _menu;
     private SearchView _searchView;
     private EntryListView _entryListView;
-    private LinearLayout _btnErrorBar;
-    private TextView _textErrorBar;
+
+    private Collection<VaultGroup> _groups;
+    private ChipGroup _groupChip;
+    private Set<UUID> _groupFilter;
+    private Set<UUID> _prefGroupFilter;
 
     private FabScrollHelper _fabScrollHelper;
 
@@ -106,11 +125,70 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     private SearchViewBackPressHandler _searchViewBackPressHandler;
     private ActionModeBackPressHandler _actionModeBackPressHandler;
 
+    private final ActivityResultLauncher<Intent> authResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                _isAuthenticating = false;
+                if (activityResult.getResultCode() == RESULT_OK) {
+                    onDecryptResult();
+                }
+            });
+
+    private final ActivityResultLauncher<Intent> introResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                _isDoingIntro = false;
+                if (activityResult.getResultCode() == RESULT_OK) {
+                    onIntroResult();
+                }
+            });
+
+    private final ActivityResultLauncher<Intent> scanResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
+                    return;
+                }
+                onScanResult(activityResult.getData());
+            });
+
+    private final ActivityResultLauncher<Intent> assignIconsResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
+                    return;
+                }
+                onAssignIconsResult();
+            });
+
+    private final ActivityResultLauncher<Intent> preferenceResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> onPreferencesResult());
+
+    private final ActivityResultLauncher<Intent> editEntryResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
+                    return;
+                }
+                onEditEntryResult();
+            });
+
+    private final ActivityResultLauncher<Intent> addEntryResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
+                    return;
+                }
+                onAddEntryResult(activityResult.getData());
+            });
+
+    private final ActivityResultLauncher<Intent> codeScanResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                if (activityResult.getResultCode() == RESULT_OK && activityResult.getData() != null) {
+                    onScanImageResult(activityResult.getData());
+                }
+            });
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
         _loaded = false;
         _isDPadPressed = false;
         _isDoingIntro = false;
@@ -135,15 +213,18 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         _entryListView.setCodeGroupSize(_prefs.getCodeGroupSize());
         _entryListView.setAccountNamePosition(_prefs.getAccountNamePosition());
         _entryListView.setShowIcon(_prefs.isIconVisible());
+        _entryListView.setShowExpirationState(_prefs.getShowExpirationState());
+        _entryListView.setShowNextCode(_prefs.getShowNextCode());
         _entryListView.setOnlyShowNecessaryAccountNames(_prefs.onlyShowNecessaryAccountNames());
         _entryListView.setHighlightEntry(_prefs.isEntryHighlightEnabled());
         _entryListView.setPauseFocused(_prefs.isPauseFocusedEnabled());
         _entryListView.setTapToReveal(_prefs.isTapToRevealEnabled());
         _entryListView.setTapToRevealTime(_prefs.getTapToRevealTime());
-        _entryListView.setSortCategory(_prefs.getCurrentSortCategory(), false);
         _entryListView.setViewMode(_prefs.getCurrentViewMode());
+        _entryListView.setSortCategory(_prefs.getCurrentSortCategory(), false);
         _entryListView.setCopyBehavior(_prefs.getCopyBehavior());
-        _entryListView.setPrefGroupFilter(_prefs.getGroupFilter());
+        _entryListView.setSearchBehaviorMask(_prefs.getSearchBehaviorMask());
+        _prefGroupFilter = _prefs.getGroupFilter();
 
          FloatingActionButton fab = findViewById(R.id.fab);
          fab.setOnClickListener(v -> {
@@ -153,7 +234,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
              view.findViewById(R.id.fab_enter).setOnClickListener(v1 -> {
                  dialog.dismiss();
-                 startEditEntryActivityForManual(CODE_ADD_ENTRY);
+                 startEditEntryActivityForManual();
              });
              view.findViewById(R.id.fab_scan_image).setOnClickListener(v2 -> {
                  dialog.dismiss();
@@ -167,13 +248,140 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
              Dialogs.showSecureDialog(dialog);
          });
 
-        _btnErrorBar = findViewById(R.id.btn_error_bar);
-        _textErrorBar = findViewById(R.id.text_error_bar);
-
+        _groupChip = findViewById(R.id.groupChipGroup);
         _fabScrollHelper = new FabScrollHelper(fab);
         _selectedEntries = new ArrayList<>();
     }
 
+    public void setGroups(Collection<VaultGroup> groups) {
+        _groups = groups;
+        _groupChip.setVisibility(_groups.isEmpty() ? View.GONE : View.VISIBLE);
+
+        if (_prefGroupFilter != null) {
+            Set<UUID> groupFilter = cleanGroupFilter(_prefGroupFilter);
+            _prefGroupFilter = null;
+            if (!groupFilter.isEmpty()) {
+                _groupFilter = groupFilter;
+                _entryListView.setGroupFilter(groupFilter);
+            }
+        } else if (_groupFilter != null) {
+            Set<UUID> groupFilter = cleanGroupFilter(_groupFilter);
+            if (!_groupFilter.equals(groupFilter)) {
+                _groupFilter = groupFilter;
+                _entryListView.setGroupFilter(groupFilter);
+            }
+        }
+
+        _entryListView.setGroups(groups);
+        initializeGroups();
+    }
+
+    private void initializeGroups() {
+        _groupChip.removeAllViews();
+        _groupChip.setSingleSelection(!_prefs.isGroupMultiselectEnabled());
+
+        for (VaultGroup group : _groups) {
+            addChipTo(_groupChip, new VaultGroupModel(group));
+        }
+
+        GroupPlaceholderType placeholderType = GroupPlaceholderType.NO_GROUP;
+        addChipTo(_groupChip, new VaultGroupModel(this, placeholderType));
+        addSaveChip(_groupChip);
+    }
+
+    private Set<UUID> cleanGroupFilter(Set<UUID> groupFilter) {
+        Set<UUID> groupUuids = _groups.stream().map(UUIDMap.Value::getUUID).collect(Collectors.toSet());
+
+        return groupFilter.stream()
+                .filter(g -> g == null || groupUuids.contains(g))
+                .collect(Collectors.toSet());
+    }
+
+    private void addChipTo(ChipGroup chipGroup, VaultGroupModel group) {
+        Chip chip = (Chip) getLayoutInflater().inflate(R.layout.chip_group_filter, null, false);
+        chip.setText(group.getName());
+        chip.setCheckable(true);
+        chip.setCheckedIconVisible(false);
+        chip.setChecked(_groupFilter != null && _groupFilter.contains(group.getUUID()));
+
+        if (group.isPlaceholder()) {
+            GroupPlaceholderType groupPlaceholderType = group.getPlaceholderType();
+            chip.setTag(groupPlaceholderType);
+
+            if (groupPlaceholderType == GroupPlaceholderType.ALL) {
+                chip.setChecked(_groupFilter == null);
+            } else if (groupPlaceholderType == GroupPlaceholderType.NO_GROUP) {
+                chip.setChecked(_groupFilter != null && _groupFilter.contains(null));
+            }
+        } else {
+            chip.setTag(group);
+        }
+
+        chip.setOnCheckedChangeListener((group1, isChecked) -> {
+            if (_actionMode != null) {
+                _actionMode.finish();
+            }
+
+            setSaveChipVisibility(true);
+
+            // Reset group filter if last checked group gets unchecked
+            if (!isChecked && _groupFilter.size() == 1) {
+                Set<UUID> groupFilter = new HashSet<>();
+
+                chipGroup.clearCheck();
+                _groupFilter = groupFilter;
+                _entryListView.setGroupFilter(groupFilter);
+                return;
+            }
+
+            _groupFilter = getGroupFilter(chipGroup);
+            _entryListView.setGroupFilter(_groupFilter);
+        });
+
+        chipGroup.addView(chip);
+    }
+
+    private void addSaveChip(ChipGroup chipGroup) {
+        Chip chip = (Chip) getLayoutInflater().inflate(R.layout.chip_group_filter, null, false);
+
+        chip.setText(getString(R.string.save));
+        chip.setVisibility(View.GONE);
+        chip.setChipStrokeWidth(0);
+        chip.setCheckable(false);
+        chip.setChipBackgroundColorResource(android.R.color.transparent);
+        chip.setTextColor(MaterialColors.getColor(chip.getRootView(), com.google.android.material.R.attr.colorSecondary));
+        chip.setClickable(true);
+        chip.setCheckedIconVisible(false);
+        chip.setOnClickListener(v -> {
+            onSaveGroupFilter(_groupFilter);
+            setSaveChipVisibility(false);
+        });
+
+        chipGroup.addView(chip);
+    }
+
+    private void setSaveChipVisibility(boolean visible) {
+        Chip saveChip = (Chip) _groupChip.getChildAt(_groupChip.getChildCount() - 1);
+        saveChip.setChecked(false);
+        saveChip.setVisibility(visible ? View.VISIBLE : View.GONE);
+    }
+
+    private static Set<UUID> getGroupFilter(ChipGroup chipGroup) {
+        return chipGroup.getCheckedChipIds().stream()
+                .filter(Objects::nonNull)
+                .map(i -> {
+                    Chip chip = chipGroup.findViewById(i);
+
+                    if (chip.getTag() instanceof VaultGroupModel) {
+                        VaultGroupModel group = (VaultGroupModel) chip.getTag();
+                        return group.getUUID();
+                    }
+
+                    return null;
+                })
+                .collect(Collectors.toSet());
+    }
+
     @Override
     protected void onDestroy() {
         _entryListView.setListener(null);
@@ -187,6 +395,11 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             _prefs.setUsageCount(usageMap);
         }
 
+        Map<UUID, Long> lastUsedMap = _entryListView.getLastUsedTimestamps();
+        if (lastUsedMap != null) {
+            _prefs.setLastUsedTimestamps(lastUsedMap);
+        }
+
         super.onPause();
     }
 
@@ -197,44 +410,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         instance.putString("submittedSearchQuery", _submittedSearchQuery);
         instance.putBoolean("isDoingIntro", _isDoingIntro);
         instance.putBoolean("isAuthenticating", _isAuthenticating);
-    }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == CODE_DECRYPT) {
-            _isAuthenticating = false;
+        if (_groupFilter != null) {
+            instance.putSerializable("prefGroupFilter", new HashSet<>(_groupFilter));
         }
-        if (requestCode == CODE_DO_INTRO) {
-            _isDoingIntro = false;
-        }
-        if (resultCode != RESULT_OK) {
-            return;
-        }
-
-        switch (requestCode) {
-            case CODE_SCAN:
-                onScanResult(data);
-                break;
-            case CODE_ADD_ENTRY:
-                onAddEntryResult(data);
-                break;
-            case CODE_EDIT_ENTRY:
-                onEditEntryResult(data);
-                break;
-            case CODE_DO_INTRO:
-                onIntroResult();
-                break;
-            case CODE_DECRYPT:
-                onDecryptResult();
-                break;
-            case CODE_PREFERENCES:
-                onPreferencesResult(data);
-                break;
-            case CODE_SCAN_IMAGE:
-                onScanImageResult(data);
-        }
-
-        super.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
@@ -264,63 +443,129 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     @Override
     public void onEntryListTouch() {
         _isDPadPressed = false;
-    }
 
-    private void onPreferencesResult(Intent data) {
-        // refresh the entire entry list if needed
-        if (_loaded) {
-            if (data.getBooleanExtra("needsRecreate", false)) {
-                recreate();
-            } else if (data.getBooleanExtra("needsRefresh", false)) {
-                AccountNamePosition accountNamePosition = _prefs.getAccountNamePosition();
-                boolean showIcons = _prefs.isIconVisible();
-                boolean onlyShowNecessaryAccountNames = _prefs.onlyShowNecessaryAccountNames();
-                Preferences.CodeGrouping codeGroupSize = _prefs.getCodeGroupSize();
-                boolean highlightEntry = _prefs.isEntryHighlightEnabled();
-                boolean pauseFocused = _prefs.isPauseFocusedEnabled();
-                boolean tapToReveal = _prefs.isTapToRevealEnabled();
-                int tapToRevealTime = _prefs.getTapToRevealTime();
-                ViewMode viewMode = _prefs.getCurrentViewMode();
-                CopyBehavior copyBehavior = _prefs.getCopyBehavior();
-                _entryListView.setAccountNamePosition(accountNamePosition);
-                _entryListView.setOnlyShowNecessaryAccountNames(onlyShowNecessaryAccountNames);
-                _entryListView.setShowIcon(showIcons);
-                _entryListView.setCodeGroupSize(codeGroupSize);
-                _entryListView.setHighlightEntry(highlightEntry);
-                _entryListView.setPauseFocused(pauseFocused);
-                _entryListView.setTapToReveal(tapToReveal);
-                _entryListView.setTapToRevealTime(tapToRevealTime);
-                _entryListView.setViewMode(viewMode);
-                _entryListView.setCopyBehavior(copyBehavior);
-                _entryListView.refresh(true);
+        if (_searchView != null && !_searchView.isIconified()) {
+            if (ViewCompat.getRootWindowInsets(findViewById(android.R.id.content).getRootView()).isVisible(WindowInsetsCompat.Type.ime())) {
+                InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                if (inputMethodManager != null && getCurrentFocus() != null) {
+                    inputMethodManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+                }
             }
         }
     }
 
-    private void startEditEntryActivityForNew(int requestCode, VaultEntry entry) {
+    private void onPreferencesResult() {
+        // refresh the entire entry list if needed
+        if (_loaded) {
+            recreate();
+        }
+    }
+
+    private void startEditEntryActivityForNew(VaultEntry entry) {
         Intent intent = new Intent(this, EditEntryActivity.class);
         intent.putExtra("newEntry", entry);
         intent.putExtra("isManual", false);
-        startActivityForResult(intent, requestCode);
+        addEntryResultLauncher.launch(intent);
     }
 
-    private void startEditEntryActivityForManual(int requestCode) {
+    private void startEditEntryActivityForManual() {
         Intent intent = new Intent(this, EditEntryActivity.class);
         intent.putExtra("newEntry", VaultEntry.getDefault());
         intent.putExtra("isManual", true);
-        startActivityForResult(intent, requestCode);
+        addEntryResultLauncher.launch(intent);
     }
 
-    private void startEditEntryActivity(int requestCode, VaultEntry entry) {
+    private void startEditEntryActivity(VaultEntry entry) {
         Intent intent = new Intent(this, EditEntryActivity.class);
         intent.putExtra("entryUUID", entry.getUUID());
-        startActivityForResult(intent, requestCode);
+        editEntryResultLauncher.launch(intent);
+    }
+
+    private void startAssignIconsActivity(List<VaultEntry> entries) {
+        ArrayList<UUID> assignIconEntriesIds = new ArrayList<>();
+        Intent assignIconIntent = new Intent(getBaseContext(), AssignIconsActivity.class);
+        for (VaultEntry entry : entries) {
+            assignIconEntriesIds.add(entry.getUUID());
+        }
+
+        assignIconIntent.putExtra("entries", assignIconEntriesIds);
+        assignIconsResultLauncher.launch(assignIconIntent);
+    }
+
+    private void startAssignGroupsDialog() {
+        View view = LayoutInflater.from(this).inflate(R.layout.dialog_select_group, null);
+        TextInputLayout groupSelectionLayout = view.findViewById(R.id.group_selection_layout);
+        AutoCompleteTextView groupsSelection = view.findViewById(R.id.group_selection_dropdown);
+        TextInputLayout newGroupLayout = view.findViewById(R.id.text_group_name_layout);
+        TextInputEditText newGroupText = view.findViewById(R.id.text_group_name);
+
+        Collection<VaultGroup> groups = _vaultManager.getVault().getUsedGroups();
+        List<VaultGroupModel> groupModels = new ArrayList<>();
+        groupModels.add(new VaultGroupModel(this, GroupPlaceholderType.NEW_GROUP));
+        groupModels.addAll(groups.stream().map(VaultGroupModel::new).collect(Collectors.toList()));
+        DropdownHelper.fillDropdown(this, groupsSelection, groupModels);
+
+        AtomicReference<VaultGroupModel> groupModelRef = new AtomicReference<>();
+        groupsSelection.setOnItemClickListener((parent, view1, position, id) -> {
+            VaultGroupModel groupModel = (VaultGroupModel) parent.getItemAtPosition(position);
+            groupModelRef.set(groupModel);
+
+            if (groupModel.isPlaceholder()) {
+                newGroupLayout.setVisibility(View.VISIBLE);
+                newGroupText.requestFocus();
+            } else {
+                newGroupLayout.setVisibility(View.GONE);
+            }
+
+            groupSelectionLayout.setError(null);
+        });
+
+        AlertDialog dialog = new MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.assign_groups)
+                .setView(view)
+                .setPositiveButton(android.R.string.ok, null)
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+
+        dialog.setOnShowListener(d -> {
+            Button btnPos = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+            btnPos.setOnClickListener(v -> {
+                VaultGroupModel groupModel = groupModelRef.get();
+                if (groupModel == null) {
+                    groupSelectionLayout.setError(getString(R.string.error_required_field));
+                    return;
+                }
+
+                if (groupModel.isPlaceholder()) {
+                    String newGroupName = newGroupText.getText().toString().trim();
+                    if (newGroupName.isEmpty()) {
+                        newGroupLayout.setError(getString(R.string.error_required_field));
+                        return;
+                    }
+
+                    VaultGroup group = new VaultGroup(newGroupName);
+                    _vaultManager.getVault().addGroup(group);
+                    groupModel = new VaultGroupModel(group);
+                }
+
+                for (VaultEntry selectedEntry : _selectedEntries) {
+                    selectedEntry.addGroup(groupModel.getUUID());
+                }
+
+                dialog.dismiss();
+                saveAndBackupVault();
+                _actionMode.finish();
+                setGroups(_vaultManager.getVault().getUsedGroups());
+            });
+        });
+
+        Dialogs.showSecureDialog(dialog);
     }
 
     private void startIntroActivity() {
         if (!_isDoingIntro) {
             Intent intro = new Intent(this, IntroActivity.class);
-            startActivityForResult(intro, CODE_DO_INTRO);
+            introResultLauncher.launch(intro);
             _isDoingIntro = true;
         }
     }
@@ -336,20 +581,20 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         if (_loaded) {
             UUID entryUUID = (UUID) data.getSerializableExtra("entryUUID");
             VaultEntry entry = _vaultManager.getVault().getEntryByUUID(entryUUID);
-            _entryListView.addEntry(entry, true);
+            _entryListView.setEntries(_vaultManager.getVault().getEntries());
+            _entryListView.onEntryAdded(entry);
         }
     }
 
-    private void onEditEntryResult(Intent data) {
+    private void onEditEntryResult() {
         if (_loaded) {
-            UUID entryUUID = (UUID) data.getSerializableExtra("entryUUID");
+            _entryListView.setEntries(_vaultManager.getVault().getEntries());
+        }
+    }
 
-            if (data.getBooleanExtra("delete", false)) {
-                _entryListView.removeEntry(entryUUID);
-            } else {
-                VaultEntry entry = _vaultManager.getVault().getEntryByUUID(entryUUID);
-                _entryListView.replaceEntry(entryUUID, entry);
-            }
+    private void onAssignIconsResult() {
+        if (_loaded) {
+            _entryListView.setEntries(_vaultManager.getVault().getEntries());
         }
     }
 
@@ -418,7 +663,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 boolean isSingleBatch = GoogleAuthInfo.Export.isSingleBatch(googleAuthExports);
                 if (!isSingleBatch && errors.size() > 0) {
                     errors.add(getString(R.string.unrelated_google_auth_batches_error));
-                    Dialogs.showMultiMessageDialog(this, R.string.import_error_title, getString(R.string.no_tokens_can_be_imported), errors, null);
+                    Dialogs.showMultiErrorDialog(this, R.string.import_error_title, getString(R.string.no_tokens_can_be_imported), errors, null);
                     return;
                 } else if (!isSingleBatch) {
                     Dialogs.showErrorDialog(this, R.string.import_google_auth_failure, getString(R.string.unrelated_google_auth_batches_error));
@@ -433,7 +678,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             }
 
             if ((errors.size() > 0 && results.size() > 1) || errors.size() > 1) {
-                Dialogs.showMultiMessageDialog(this, R.string.import_error_title, getString(R.string.unable_to_read_qrcode_files, uris.size() - errors.size(), uris.size()), errors, dialogDismissHandler);
+                Dialogs.showMultiErrorDialog(this, R.string.import_error_title, getString(R.string.unable_to_read_qrcode_files, uris.size() - errors.size(), uris.size()), errors, dialogDismissHandler);
             } else if (errors.size() > 0) {
                 Dialogs.showErrorDialog(this, getString(R.string.unable_to_read_qrcode_file, results.get(0).getFileName()), errors.get(0), dialogDismissHandler);
             } else {
@@ -445,27 +690,29 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
     private void importScannedEntries(List<VaultEntry> entries) {
         if (entries.size() == 1) {
-            startEditEntryActivityForNew(CODE_ADD_ENTRY, entries.get(0));
+            startEditEntryActivityForNew(entries.get(0));
         } else if (entries.size() > 1) {
             for (VaultEntry entry: entries) {
                 _vaultManager.getVault().addEntry(entry);
-                _entryListView.addEntry(entry);
             }
 
             if (saveAndBackupVault()) {
                 Toast.makeText(this, getResources().getQuantityString(R.plurals.added_new_entries, entries.size(), entries.size()), Toast.LENGTH_LONG).show();
             }
+
+            _entryListView.setEntries(_vaultManager.getVault().getEntries());
         }
     }
 
     private void updateSortCategoryMenu() {
-        SortCategory category = _prefs.getCurrentSortCategory();
-        _menu.findItem(category.getMenuItem()).setChecked(true);
+        if (_menu != null) {
+            SortCategory category = _prefs.getCurrentSortCategory();
+            _menu.findItem(category.getMenuItem()).setChecked(true);
+        }
     }
 
     private void onIntroResult() {
         loadEntries();
-        checkTimeSyncSetting();
     }
 
     private void checkTimeSyncSetting() {
@@ -478,9 +725,41 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         }
     }
 
+    private void checkIconOptimization() {
+        if (!_vaultManager.getVault().areIconsOptimized()) {
+            Map<UUID, VaultEntryIcon> oldIcons = _vaultManager.getVault().getEntries().stream()
+                    .filter(e -> e.getIcon() != null
+                            && !e.getIcon().getType().equals(IconType.SVG)
+                            && !BitmapHelper.isVaultEntryIconOptimized(e.getIcon()))
+                    .collect(Collectors.toMap(VaultEntry::getUUID, VaultEntry::getIcon));
+
+            if (!oldIcons.isEmpty()) {
+                IconOptimizationTask task = new IconOptimizationTask(this, this::onIconsOptimized);
+                task.execute(getLifecycle(), oldIcons);
+            } else {
+                onIconsOptimized(Collections.emptyMap());
+            }
+        }
+    }
+
+    private void onIconsOptimized(Map<UUID, VaultEntryIcon> newIcons) {
+        for (Map.Entry<UUID, VaultEntryIcon> mapEntry : newIcons.entrySet()) {
+            VaultEntry entry = _vaultManager.getVault().getEntryByUUID(mapEntry.getKey());
+            entry.setIcon(mapEntry.getValue());
+        }
+
+        _vaultManager.getVault().setIconsOptimized(true);
+        saveAndBackupVault();
+
+        if (!newIcons.isEmpty()) {
+            _entryListView.setEntries(_vaultManager.getVault().getEntries());
+        }
+    }
+
     private void onDecryptResult() {
+        _auditLogRepository.addVaultUnlockedEvent();
+
         loadEntries();
-        checkTimeSyncSetting();
     }
 
     private void startScanActivity() {
@@ -489,7 +768,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         }
 
         Intent scannerActivity = new Intent(getApplicationContext(), ScannerActivity.class);
-        startActivityForResult(scannerActivity, CODE_SCAN);
+        scanResultLauncher.launch(scannerActivity);
     }
 
     private void startScanImageActivity() {
@@ -503,7 +782,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
         Intent chooserIntent = Intent.createChooser(galleryIntent, getString(R.string.select_picture));
         chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { fileIntent });
-        _vaultManager.startActivityForResult(this, chooserIntent, CODE_SCAN_IMAGE);
+        _vaultManager.fireIntentLauncher(this, chooserIntent, codeScanResultLauncher);
     }
 
     private void startPreferencesActivity() {
@@ -514,7 +793,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         Intent intent = new Intent(this, PreferencesActivity.class);
         intent.putExtra("fragment", fragmentType);
         intent.putExtra("pref", preference);
-        startActivityForResult(intent, CODE_PREFERENCES);
+        preferenceResultLauncher.launch(intent);
     }
 
     private void doShortcutActions() {
@@ -561,7 +840,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                     }
 
                     VaultEntry entry = new VaultEntry(info);
-                    startEditEntryActivityForNew(CODE_ADD_ENTRY, entry);
+                    startEditEntryActivityForNew(entry);
                 }
                 break;
             case Intent.ACTION_SEND:
@@ -589,7 +868,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                         }
 
                         VaultEntry entry = new VaultEntry(info);
-                        startEditEntryActivityForNew(CODE_ADD_ENTRY, entry);
+                        startEditEntryActivityForNew(entry);
                     }
                 }
                 break;
@@ -612,8 +891,15 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    protected void onStop() {
+        super.onStop();
+
+        _entryListView.onRefreshStop();
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
 
         if (_vaultManager.isVaultInitNeeded()) {
             if (_prefs.isIntroDone()) {
@@ -623,44 +909,64 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             return;
         }
 
-        if (!_vaultManager.isVaultLoaded() && !_vaultManager.isVaultFileLoaded()) {
-            Dialogs.showErrorDialog(this, R.string.vault_load_error, _vaultManager.getVaultFileError(), (dialog1, which) -> finish());
-            return;
+        // If the vault is not loaded yet, try to load it now in case it's plain text
+        if (!_vaultManager.isVaultLoaded()) {
+            VaultFile vaultFile;
+            try {
+                vaultFile = VaultRepository.readVaultFile(this);
+            } catch (VaultRepositoryException e) {
+                e.printStackTrace();
+                Dialogs.showErrorDialog(this, R.string.vault_load_error, e, (dialog, which) -> {
+                    finish();
+                });
+                return;
+            }
+
+            if (!vaultFile.isEncrypted()) {
+                try {
+                    _vaultManager.loadFrom(vaultFile);
+                } catch (VaultRepositoryException e) {
+                    e.printStackTrace();
+                    Dialogs.showErrorDialog(this, R.string.vault_load_error, e, (dialog, which) -> {
+                        finish();
+                    });
+                    return;
+                }
+            }
         }
 
         if (!_vaultManager.isVaultLoaded()) {
             startAuthActivity(false);
         } else if (_loaded) {
             // update the list of groups in the entry list view so that the chip gets updated
-            _entryListView.setGroups(_vaultManager.getVault().getGroups());
+            setGroups(_vaultManager.getVault().getUsedGroups());
 
             // update the usage counts in case they are edited outside of the EntryListView
             _entryListView.setUsageCounts(_prefs.getUsageCounts());
 
+            _entryListView.setLastUsedTimestamps(_prefs.getLastUsedTimestamps());
+
             // refresh all codes to prevent showing old ones
             _entryListView.refresh(false);
+
+            _entryListView.onRefreshStart();
         } else {
             loadEntries();
             checkTimeSyncSetting();
+            checkIconOptimization();
+
+            _entryListView.onRefreshStart();
         }
 
         _lockBackPressHandler.setEnabled(
-                _vaultManager.isAutoLockEnabled(Preferences.AUTO_LOCK_ON_BACK_BUTTON)
+            _vaultManager.isAutoLockEnabled(Preferences.AUTO_LOCK_ON_BACK_BUTTON)
         );
 
         handleIncomingIntent();
         updateLockIcon();
+        updateSortCategoryMenu();
         doShortcutActions();
-        updateErrorBar();
-    }
-
-    private void deleteEntries(List<VaultEntry> entries) {
-        for (VaultEntry entry: entries) {
-            VaultEntry oldEntry = _vaultManager.getVault().removeEntry(entry);
-            _entryListView.removeEntry(oldEntry);
-        }
-
-        saveAndBackupVault();
+        updateErrorCard();
     }
 
     @Override
@@ -669,13 +975,9 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         getMenuInflater().inflate(R.menu.menu_main, menu);
 
         updateLockIcon();
-        if (_loaded) {
-            _entryListView.setGroups(_vaultManager.getVault().getGroups());
-            updateSortCategoryMenu();
-        }
+        updateSortCategoryMenu();
 
         MenuItem searchViewMenuItem = menu.findItem(R.id.mi_search);
-
         _searchView = (SearchView) searchViewMenuItem.getActionView();
         _searchView.setMaxWidth(Integer.MAX_VALUE);
         _searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> {
@@ -685,6 +987,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         _searchView.setOnCloseListener(() -> {
             boolean enabled = _submittedSearchQuery != null;
             _searchViewBackPressHandler.setEnabled(enabled);
+            _groupChip.setVisibility(_groups.isEmpty() ? View.GONE : View.VISIBLE);
             return false;
         });
 
@@ -718,6 +1021,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         });
         _searchView.setOnSearchClickListener(v -> {
             String query = _submittedSearchQuery != null ? _submittedSearchQuery : _pendingSearchQuery;
+            _groupChip.setVisibility(View.GONE);
             _searchView.setQuery(query, false);
         });
 
@@ -742,63 +1046,61 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_settings: {
-                startPreferencesActivity();
-                return true;
-            }
-            case R.id.action_about: {
-                Intent intent = new Intent(this, AboutActivity.class);
-                startActivity(intent);
-                return true;
-            }
-            case R.id.action_lock:
-                _vaultManager.lock(true);
-                return true;
-            default:
-                if (item.getGroupId() == R.id.action_sort_category) {
-                    item.setChecked(true);
+        int itemId = item.getItemId();
+        if (itemId == R.id.action_settings) {
+            startPreferencesActivity();
+        } else if (itemId == R.id.action_about) {
+            Intent intent = new Intent(this, AboutActivity.class);
+            startActivity(intent);
+        } else if (itemId == R.id.action_lock) {
+            _vaultManager.lock(true);
+        } else {
+            if (item.getGroupId() == R.id.action_sort_category) {
+                item.setChecked(true);
 
-                    SortCategory sortCategory;
-                    switch (item.getItemId()) {
-                        case R.id.menu_sort_alphabetically:
-                            sortCategory = SortCategory.ISSUER;
-                            break;
-                        case R.id.menu_sort_alphabetically_reverse:
-                            sortCategory = SortCategory.ISSUER_REVERSED;
-                            break;
-                        case R.id.menu_sort_alphabetically_name:
-                            sortCategory = SortCategory.ACCOUNT;
-                            break;
-                        case R.id.menu_sort_alphabetically_name_reverse:
-                            sortCategory = SortCategory.ACCOUNT_REVERSED;
-                            break;
-                        case R.id.menu_sort_usage_count:
-                            sortCategory = SortCategory.USAGE_COUNT;
-                            break;
-                        case R.id.menu_sort_custom:
-                        default:
-                            sortCategory = SortCategory.CUSTOM;
-                            break;
-                    }
-
-                    _entryListView.setSortCategory(sortCategory, true);
-                    _prefs.setCurrentSortCategory(sortCategory);
+                SortCategory sortCategory;
+                int subItemId = item.getItemId();
+                if (subItemId == R.id.menu_sort_alphabetically) {
+                    sortCategory = SortCategory.ISSUER;
+                } else if (subItemId == R.id.menu_sort_alphabetically_reverse) {
+                    sortCategory = SortCategory.ISSUER_REVERSED;
+                } else if (subItemId == R.id.menu_sort_alphabetically_name) {
+                    sortCategory = SortCategory.ACCOUNT;
+                } else if (subItemId == R.id.menu_sort_alphabetically_name_reverse) {
+                    sortCategory = SortCategory.ACCOUNT_REVERSED;
+                } else if (subItemId == R.id.menu_sort_usage_count) {
+                    sortCategory = SortCategory.USAGE_COUNT;
+                } else if (subItemId == R.id.menu_sort_last_used) {
+                    sortCategory = SortCategory.LAST_USED;
+                } else {
+                    sortCategory = SortCategory.CUSTOM;
                 }
-                return super.onOptionsItemSelected(item);
+
+                _entryListView.setSortCategory(sortCategory, true);
+                _prefs.setCurrentSortCategory(sortCategory);
+            }
+
+            return super.onOptionsItemSelected(item);
         }
+
+        return true;
     }
 
     private void collapseSearchView() {
+        _groupChip.setVisibility(_groups.isEmpty() ? View.GONE : View.VISIBLE);
         _searchView.setQuery(null, false);
         _searchView.setIconified(true);
     }
 
     private void loadEntries() {
         if (!_loaded) {
+            setGroups(_vaultManager.getVault().getUsedGroups());
             _entryListView.setUsageCounts(_prefs.getUsageCounts());
-            _entryListView.addEntries(_vaultManager.getVault().getEntries());
-            _entryListView.runEntriesAnimation();
+            _entryListView.setLastUsedTimestamps(_prefs.getLastUsedTimestamps());
+            _entryListView.setEntries(_vaultManager.getVault().getEntries());
+            if (!_isRecreated) {
+                _entryListView.runEntriesAnimation();
+            }
             _loaded = true;
         }
     }
@@ -807,7 +1109,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         if (!_isAuthenticating) {
             Intent intent = new Intent(this, AuthActivity.class);
             intent.putExtra("inhibitBioPrompt", inhibitBioPrompt);
-            startActivityForResult(intent, CODE_DECRYPT);
+            authResultLauncher.launch(intent);
             _isAuthenticating = true;
         }
     }
@@ -820,49 +1122,49 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         }
     }
 
-    private void updateErrorBar() {
-        Preferences.BackupResult backupRes = _prefs.getErroredBackupResult();
-        if (backupRes != null) {
-            _textErrorBar.setText(R.string.backup_error_bar_message);
-            _btnErrorBar.setOnClickListener(view -> {
-                Dialogs.showBackupErrorDialog(this, backupRes, (dialog, which) -> {
-                    startPreferencesActivity(BackupsPreferencesFragment.class, "pref_backups");
-                });
-            });
-            _btnErrorBar.setVisibility(View.VISIBLE);
-        } else if (_prefs.isBackupsReminderNeeded() && _prefs.isBackupReminderEnabled()) {
-            Date date = _prefs.getLatestBackupOrExportTime();
-            if (date != null) {
-                _textErrorBar.setText(getString(R.string.backup_reminder_bar_message_with_latest, TimeUtils.getElapsedSince(this, date)));
-            } else {
-                _textErrorBar.setText(R.string.backup_reminder_bar_message);
-            }
-            _btnErrorBar.setOnClickListener(view -> {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(this)
-                        .setTitle(R.string.backup_reminder_bar_dialog_title)
-                        .setMessage(R.string.backup_reminder_bar_dialog_summary)
-                        .setPositiveButton(R.string.backup_reminder_bar_dialog_accept, (dialog, whichButton) -> {
-                            startPreferencesActivity(BackupsPreferencesFragment.class, "pref_backups");
-                        })
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .create());
-            });
-            _btnErrorBar.setVisibility(View.VISIBLE);
-        } else if (_prefs.isPlaintextBackupWarningNeeded()) {
-            _textErrorBar.setText(R.string.backup_plaintext_export_warning);
-            _btnErrorBar.setOnClickListener(view -> showPlaintextExportWarningOptions());
-            _btnErrorBar.setVisibility(View.VISIBLE);
-        } else {
-            _btnErrorBar.setVisibility(View.GONE);
-        }
-    }
+   private void updateErrorCard() {
+       ErrorCardInfo info = null;
+
+       Preferences.BackupResult backupRes = _prefs.getErroredBackupResult();
+       if (backupRes != null) {
+           info = new ErrorCardInfo(getString(R.string.backup_error_bar_message), view -> {
+               Dialogs.showBackupErrorDialog(this, backupRes, (dialog, which) -> {
+                   startPreferencesActivity(BackupsPreferencesFragment.class, "pref_backups");
+               });
+           });
+       } else if (_prefs.isBackupsReminderNeeded() && _prefs.isBackupReminderEnabled()) {
+           String text;
+           Date date = _prefs.getLatestBackupOrExportTime();
+           if (date != null) {
+               text = getString(R.string.backup_reminder_bar_message_with_latest, TimeUtils.getElapsedSince(this, date));
+           } else {
+               text = getString(R.string.backup_reminder_bar_message);
+           }
+           info = new ErrorCardInfo(text, view -> {
+               Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this, R.style.ThemeOverlay_Aegis_AlertDialog_Error)
+                       .setTitle(R.string.backup_reminder_bar_dialog_title)
+                       .setMessage(R.string.backup_reminder_bar_dialog_summary)
+                       .setIconAttribute(android.R.attr.alertDialogIcon)
+                       .setPositiveButton(R.string.backup_reminder_bar_dialog_accept, (dialog, whichButton) -> {
+                           startPreferencesActivity(BackupsPreferencesFragment.class, "pref_backups");
+                       })
+                       .setNegativeButton(android.R.string.cancel, null)
+                       .create());
+           });
+       } else if (_prefs.isPlaintextBackupWarningNeeded()) {
+           info = new ErrorCardInfo(getString(R.string.backup_plaintext_export_warning), view -> showPlaintextExportWarningOptions());
+       }
+
+       _entryListView.setErrorCardInfo(info);
+   }
 
     private void showPlaintextExportWarningOptions() {
         View view = LayoutInflater.from(this).inflate(R.layout.dialog_plaintext_warning, null);
 
-        AlertDialog dialog = new AlertDialog.Builder(this)
+        AlertDialog dialog = new MaterialAlertDialogBuilder(this, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                 .setTitle(R.string.backup_plaintext_export_warning)
                 .setView(view)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.ok, null)
                 .setNegativeButton(android.R.string.cancel, null)
                 .create();
@@ -879,13 +1181,26 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 _prefs.setIsPlaintextBackupWarningDisabled(checkBox.isChecked());
                 _prefs.setIsPlaintextBackupWarningNeeded(false);
 
-                updateErrorBar();
+                updateErrorCard();
             });
         });
 
         Dialogs.showSecureDialog(dialog);
     }
 
+    @Override
+    public void onRestoreInstanceState(@Nullable Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        if (savedInstanceState == null) {
+            return;
+        }
+
+        HashSet<UUID> filter = (HashSet<UUID>) savedInstanceState.getSerializable("prefGroupFilter");
+        if (filter != null) {
+            _prefGroupFilter = filter;
+        }
+    }
+
     @Override
     public void onEntryClick(VaultEntry entry) {
         if (_actionMode != null) {
@@ -895,8 +1210,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 setFavoriteMenuItemVisiblity();
                 setIsMultipleSelected(_selectedEntries.size() > 1);
             }
-
-            return;
         }
     }
 
@@ -916,19 +1229,24 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         _actionMode.getMenu().findItem(R.id.action_copy).setVisible(!multipleSelected);
     }
 
+    private void setAssignIconsMenuItemVisibility() {
+        MenuItem assignIconsMenuItem = _actionMode.getMenu().findItem(R.id.action_assign_icons);
+        assignIconsMenuItem.setVisible(_iconPackManager.hasIconPack());
+    }
+
     private void setFavoriteMenuItemVisiblity() {
         MenuItem toggleFavoriteMenuItem = _actionMode.getMenu().findItem(R.id.action_toggle_favorite);
 
         if (_selectedEntries.size() == 1){
             if (_selectedEntries.get(0).isFavorite()) {
-                toggleFavoriteMenuItem.setIcon(R.drawable.ic_set_favorite);
+                toggleFavoriteMenuItem.setIcon(R.drawable.ic_filled_star_24);
                 toggleFavoriteMenuItem.setTitle(R.string.unfavorite);
             } else {
-                toggleFavoriteMenuItem.setIcon(R.drawable.ic_unset_favorite);
+                toggleFavoriteMenuItem.setIcon(R.drawable.ic_outline_star_24);
                 toggleFavoriteMenuItem.setTitle(R.string.favorite);
             }
         } else {
-            toggleFavoriteMenuItem.setIcon(R.drawable.ic_unset_favorite);
+            toggleFavoriteMenuItem.setIcon(R.drawable.ic_outline_star_24);
             toggleFavoriteMenuItem.setTitle(String.format("%s / %s", getString(R.string.favorite), getString(R.string.unfavorite)));
         }
     }
@@ -948,6 +1266,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         _actionMode = startSupportActionMode(_actionModeCallbacks);
         _actionModeBackPressHandler.setEnabled(true);
         setFavoriteMenuItemVisiblity();
+        setAssignIconsMenuItemVisibility();
     }
 
     @Override
@@ -980,7 +1299,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     public void onListChange() { _fabScrollHelper.setVisible(true); }
 
     @Override
-    public void onSaveGroupFilter(List<String> groupFilter) {
+    public void onSaveGroupFilter(Set<UUID> groupFilter) {
+        if (_vaultManager.getVault().isGroupsMigrationFresh()) {
+            saveAndBackupVault();
+        }
         _prefs.setGroupFilter(groupFilter);
     }
 
@@ -1003,6 +1325,13 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         }
     }
 
+    @Override
+    protected boolean saveAndBackupVault() {
+        boolean res = super.saveAndBackupVault();
+        updateErrorCard();
+        return res;
+    }
+
     @SuppressLint("InlinedApi")
     private void copyEntryCode(VaultEntry entry) {
         String otp;
@@ -1071,88 +1400,88 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     }
 
     private class ActionModeCallbacks implements ActionMode.Callback {
-            @Override
-            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                MenuInflater inflater = getMenuInflater();
-                inflater.inflate(R.menu.menu_action_mode, menu);
+        @Override
+        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.menu_action_mode, menu);
+            return true;
+        }
+
+        @Override
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            return false;
+        }
+
+        @Override
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+            if (_selectedEntries.size() == 0) {
+                mode.finish();
                 return true;
             }
 
-            @Override
-            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            int itemId = item.getItemId();
+            if (itemId == R.id.action_copy) {
+                copyEntryCode(_selectedEntries.get(0));
+                mode.finish();
+            } else if (itemId == R.id.action_edit) {
+                startEditEntryActivity(_selectedEntries.get(0));
+                mode.finish();
+            } else if (itemId == R.id.action_toggle_favorite) {
+                for (VaultEntry entry : _selectedEntries) {
+                    _vaultManager.getVault().editEntry(entry, newEntry -> {
+                        newEntry.setIsFavorite(!newEntry.isFavorite());
+                    });
+                }
+
+                saveAndBackupVault();
+                _entryListView.setEntries(_vaultManager.getVault().getEntries());
+                mode.finish();
+            } else if (itemId == R.id.action_share_qr) {
+                Intent intent = new Intent(getBaseContext(), TransferEntriesActivity.class);
+                ArrayList<GoogleAuthInfo> authInfos = new ArrayList<>();
+                for (VaultEntry entry : _selectedEntries) {
+                    GoogleAuthInfo authInfo = new GoogleAuthInfo(entry.getInfo(), entry.getName(), entry.getIssuer());
+                    authInfos.add(authInfo);
+
+                    _auditLogRepository.addEntrySharedEvent(entry.getUUID().toString());
+                }
+
+                intent.putExtra("authInfos", authInfos);
+                startActivity(intent);
+
+                mode.finish();
+            } else if (itemId == R.id.action_delete) {
+                Dialogs.showDeleteEntriesDialog(MainActivity.this, _selectedEntries, (d, which) -> {
+                    for (VaultEntry entry : _selectedEntries) {
+                        _vaultManager.getVault().removeEntry(entry);
+                    }
+                    saveAndBackupVault();
+                    _entryListView.setGroups(_vaultManager.getVault().getUsedGroups());
+                    _entryListView.setEntries(_vaultManager.getVault().getEntries());
+                    mode.finish();
+                });
+            } else if (itemId == R.id.action_select_all) {
+                _selectedEntries = _entryListView.selectAllEntries();
+                setFavoriteMenuItemVisiblity();
+                setIsMultipleSelected(_selectedEntries.size() > 1);
+            } else if (itemId == R.id.action_assign_icons) {
+                startAssignIconsActivity(_selectedEntries);
+                mode.finish();
+            } else if (itemId == R.id.action_assign_groups) {
+                startAssignGroupsDialog();
+            } else {
                 return false;
             }
 
-            @Override
-            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                if (_selectedEntries.size() == 0) {
-                    mode.finish();
-                    return true;
-                }
-                switch (item.getItemId()) {
-                    case R.id.action_copy:
-                        copyEntryCode(_selectedEntries.get(0));
-                        mode.finish();
-                        return true;
+            return true;
+        }
 
-                    case R.id.action_edit:
-                        startEditEntryActivity(CODE_EDIT_ENTRY, _selectedEntries.get(0));
-                        mode.finish();
-                        return true;
-
-                    case R.id.action_toggle_favorite:
-                        for (VaultEntry entry : _selectedEntries) {
-                            entry.setIsFavorite(!entry.isFavorite());
-                            _entryListView.replaceEntry(entry.getUUID(), entry);
-                        }
-                        _entryListView.refresh(true);
-
-                        saveAndBackupVault();
-                        mode.finish();
-                        return true;
-
-                    case R.id.action_share_qr:
-                        Intent intent = new Intent(getBaseContext(), TransferEntriesActivity.class);
-                        ArrayList<GoogleAuthInfo> authInfos = new ArrayList<>();
-                        for (VaultEntry entry : _selectedEntries) {
-                            GoogleAuthInfo authInfo = new GoogleAuthInfo(entry.getInfo(), entry.getName(), entry.getIssuer());
-                            authInfos.add(authInfo);
-                        }
-
-                        intent.putExtra("authInfos", authInfos);
-                        startActivity(intent);
-
-                        mode.finish();
-                        return true;
-
-                    case R.id.action_delete:
-                        Dialogs.showDeleteEntriesDialog(MainActivity.this, _selectedEntries, (d, which) -> {
-                            deleteEntries(_selectedEntries);
-
-                            for (VaultEntry entry : _selectedEntries) {
-                                if (entry.getGroup() != null) {
-                                    TreeSet<String> groups = _vaultManager.getVault().getGroups();
-                                    if (!groups.contains(entry.getGroup())) {
-                                        _entryListView.setGroups(groups);
-                                        break;
-                                    }
-                                }
-                            }
-
-                            mode.finish();
-                        });
-                        return true;
-                    default:
-                        return false;
-                }
-            }
-
-            @Override
-            public void onDestroyActionMode(ActionMode mode) {
-                _entryListView.setActionModeState(false, null);
-                _actionModeBackPressHandler.setEnabled(false);
-                _selectedEntries.clear();
-                _actionMode = null;
-            }
+        @Override
+        public void onDestroyActionMode(ActionMode mode) {
+            _entryListView.setActionModeState(false, null);
+            _actionModeBackPressHandler.setEnabled(false);
+            _selectedEntries.clear();
+            _actionMode = null;
+        }
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesActivity.java
index cabf338c..1e7dff67 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesActivity.java
@@ -10,12 +10,15 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.ui.fragments.preferences.AppearancePreferencesFragment;
 import com.beemdevelopment.aegis.ui.fragments.preferences.MainPreferencesFragment;
 import com.beemdevelopment.aegis.ui.fragments.preferences.PreferencesFragment;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
 
 public class PreferencesActivity extends AegisActivity implements
         PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
     private Fragment _fragment;
+    private CharSequence _prefTitle;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -25,6 +28,7 @@ public class PreferencesActivity extends AegisActivity implements
         }
         setContentView(R.layout.activity_preferences);
         setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
         getSupportFragmentManager()
                 .registerFragmentLifecycleCallbacks(new FragmentResumeListener(), true);
 
@@ -48,27 +52,16 @@ public class PreferencesActivity extends AegisActivity implements
             }
         } else {
             _fragment = getSupportFragmentManager().findFragmentById(R.id.content);
-        }
-    }
-
-    @Override
-    protected void onRestoreInstanceState(@NonNull final Bundle inState) {
-        if (_fragment instanceof PreferencesFragment) {
-            // pass the stored result intent back to the fragment
-            if (inState.containsKey("result")) {
-                ((PreferencesFragment) _fragment).setResult(inState.getParcelable("result"));
+            _prefTitle = savedInstanceState.getCharSequence("prefTitle");
+            if (_prefTitle != null) {
+                setTitle(_prefTitle);
             }
         }
-        super.onRestoreInstanceState(inState);
     }
 
     @Override
     protected void onSaveInstanceState(@NonNull final Bundle outState) {
-        if (_fragment instanceof PreferencesFragment) {
-            // save the result intent of the fragment
-            // this is done so we don't lose anything if the fragment calls recreate on this activity
-            outState.putParcelable("result", ((PreferencesFragment) _fragment).getResult());
-        }
+        outState.putCharSequence("prefTitle", _prefTitle);
         super.onSaveInstanceState(outState);
     }
 
@@ -90,7 +83,8 @@ public class PreferencesActivity extends AegisActivity implements
         _fragment.setTargetFragment(caller, 0);
         showFragment(_fragment);
 
-        setTitle(pref.getTitle());
+        _prefTitle = pref.getTitle();
+        setTitle(_prefTitle);
         return true;
     }
 
@@ -121,6 +115,9 @@ public class PreferencesActivity extends AegisActivity implements
         public void onFragmentStarted(@NonNull FragmentManager fm, @NonNull Fragment f) {
             if (f instanceof MainPreferencesFragment) {
                 setTitle(R.string.action_settings);
+            } else if (f instanceof AppearancePreferencesFragment) {
+                _prefTitle = getString(R.string.pref_section_appearance_title);
+                setTitle(_prefTitle);
             }
         }
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
index c5762bbd..cc0d6095 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
@@ -18,11 +18,11 @@ import androidx.camera.view.PreviewView;
 import androidx.core.content.ContextCompat;
 
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.ThemeMap;
 import com.beemdevelopment.aegis.helpers.QrCodeAnalyzer;
 import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
 import com.beemdevelopment.aegis.otp.GoogleAuthInfoException;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.zxing.Result;
@@ -57,6 +57,7 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis
         }
         setContentView(R.layout.activity_scanner);
         setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
 
         _entries = new ArrayList<>();
         _lenses = new ArrayList<>();
@@ -95,11 +96,6 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis
         super.onDestroy();
     }
 
-    @Override
-    protected void onSetTheme() {
-        setTheme(ThemeMap.FULLSCREEN);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         _menu = menu;
@@ -142,10 +138,10 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis
             if (dual) {
                 switch (_currentLens) {
                     case CameraSelector.LENS_FACING_BACK:
-                        item.setIcon(R.drawable.ic_camera_front_24dp);
+                        item.setIcon(R.drawable.ic_outline_camera_front_24);
                         break;
                     case CameraSelector.LENS_FACING_FRONT:
-                        item.setIcon(R.drawable.ic_camera_rear_24dp);
+                        item.setIcon(R.drawable.ic_outline_camera_rear_24);
                         break;
                 }
             }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/TransferEntriesActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/TransferEntriesActivity.java
index 20629205..a0559d7a 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/TransferEntriesActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/TransferEntriesActivity.java
@@ -10,15 +10,17 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.util.TypedValue;
+import android.provider.Settings;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.ColorInt;
+import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.Theme;
@@ -27,6 +29,9 @@ import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
 import com.beemdevelopment.aegis.otp.GoogleAuthInfoException;
 import com.beemdevelopment.aegis.otp.Transferable;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.beemdevelopment.aegis.helpers.ViewHelper;
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.imageview.ShapeableImageView;
 import com.google.zxing.WriterException;
 
 import java.util.ArrayList;
@@ -34,7 +39,7 @@ import java.util.List;
 
 public class TransferEntriesActivity extends AegisActivity {
     private List<Transferable> _authInfos;
-    private ImageView _qrImage;
+    private ShapeableImageView _qrImage;
     private TextView _description;
     private TextView _issuer;
     private TextView _accountName;
@@ -43,6 +48,8 @@ public class TransferEntriesActivity extends AegisActivity {
     private Button _previousButton;
     private Button _copyButton;
     private int _currentEntryCount = 1;
+    private float _deviceBrightness;
+    private boolean _isMaxBrightnessSet = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,6 +59,7 @@ public class TransferEntriesActivity extends AegisActivity {
         }
         setContentView(R.layout.activity_share_entry);
         setSupportActionBar(findViewById(R.id.toolbar));
+        ViewHelper.setupAppBarInsets(findViewById(R.id.app_bar_layout));
 
         _qrImage = findViewById(R.id.ivQrCode);
         _description = findViewById(R.id.tvDescription);
@@ -62,7 +70,7 @@ public class TransferEntriesActivity extends AegisActivity {
         _previousButton = findViewById(R.id.btnPrevious);
         _copyButton = findViewById(R.id.btnCopyClipboard);
 
-        if (getSupportActionBar() != null){
+        if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
@@ -88,7 +96,7 @@ public class TransferEntriesActivity extends AegisActivity {
         });
 
         _previousButton.setOnClickListener(v -> {
-            if (_currentEntryCount > 1 ) {
+            if (_currentEntryCount > 1) {
                 _nextButton.setText(R.string.next);
                 _currentEntryCount--;
                 generateQR();
@@ -116,14 +124,59 @@ public class TransferEntriesActivity extends AegisActivity {
                 if (clipboard != null) {
                     clipboard.setPrimaryClip(clip);
                 }
-                Toast.makeText(this,R.string.uri_copied_to_clipboard, Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, R.string.uri_copied_to_clipboard, Toast.LENGTH_SHORT).show();
 
             } catch (GoogleAuthInfoException e) {
                 Dialogs.showErrorDialog(this, R.string.unable_to_copy_uri_to_clipboard, e);
             }
         });
 
-        generateQR();
+        // Calculate sensible dimensions for the QR code depending on whether we're in landscape
+        _qrImage.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                ConstraintLayout layout = findViewById(R.id.layoutShareEntry);
+                if (layout.getWidth() > layout.getHeight()) {
+                    int squareSize = (int) (0.5 * layout.getHeight());
+                    ViewGroup.LayoutParams params = _qrImage.getLayoutParams();
+                    params.width = squareSize;
+                    params.height = squareSize;
+                    _qrImage.setLayoutParams(params);
+                }
+
+                generateQR();
+
+                _qrImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+            }
+        });
+
+        _deviceBrightness = getSystemBrightness();
+        _qrImage.setOnClickListener(v -> {
+            if (!_isMaxBrightnessSet) {
+                setBrightness(1f);
+                _isMaxBrightnessSet = true;
+            } else {
+                setBrightness(_deviceBrightness);
+                _isMaxBrightnessSet = false;
+            }
+        });
+    }
+
+    private float getSystemBrightness() {
+        int brightness = 0;
+        try {
+            brightness = Settings.System.getInt(getContentResolver(), Settings.System.SCREEN_BRIGHTNESS);
+        } catch (Settings.SettingNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        return brightness / 255f;
+    }
+
+    private void setBrightness(float brightnessAmount) {
+        WindowManager.LayoutParams attrs = getWindow().getAttributes();
+        attrs.screenBrightness = brightnessAmount;
+        getWindow().setAttributes(attrs);
     }
 
     @Override
@@ -151,16 +204,13 @@ public class TransferEntriesActivity extends AegisActivity {
 
         _entriesCount.setText(getResources().getQuantityString(R.plurals.qr_count, _authInfos.size(), _currentEntryCount, _authInfos.size()));
 
-        @ColorInt int backgroundColor = Color.WHITE;
-        if (getConfiguredTheme() == Theme.LIGHT) {
-            TypedValue typedValue = new TypedValue();
-            getTheme().resolveAttribute(R.attr.background, typedValue, true);
-            backgroundColor = typedValue.data;
-        }
+        int backgroundColor = _themeHelper.getConfiguredTheme() == Theme.LIGHT
+                ? MaterialColors.getColor(_qrImage, com.google.android.material.R.attr.colorSurfaceContainer)
+                : Color.WHITE;
 
         Bitmap bitmap;
         try {
-            bitmap = QrCodeHelper.encodeToBitmap(selectedEntry.getUri().toString(), 512, 512, backgroundColor);
+            bitmap = QrCodeHelper.encodeToBitmap(selectedEntry.getUri().toString(), _qrImage.getWidth(), _qrImage.getWidth(), backgroundColor);
         } catch (WriterException | GoogleAuthInfoException e) {
             Dialogs.showErrorDialog(this, R.string.unable_to_generate_qrcode, e);
             return;
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/components/DropdownCheckBoxes.java b/app/src/main/java/com/beemdevelopment/aegis/ui/components/DropdownCheckBoxes.java
index d61998fd..06249985 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/components/DropdownCheckBoxes.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/components/DropdownCheckBoxes.java
@@ -18,19 +18,19 @@ import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
 import com.beemdevelopment.aegis.R;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-public class DropdownCheckBoxes extends AppCompatAutoCompleteTextView {
+public class DropdownCheckBoxes<T> extends AppCompatAutoCompleteTextView {
     private @PluralsRes int _selectedCountPlural = R.plurals.dropdown_checkboxes_default_count;
 
     private boolean _allowFiltering = false;
 
-    private final List<String> _items = new ArrayList<>();
-    private List<String> _visibleItems = new ArrayList<>();
-    private final Set<String> _checkedItems = new TreeSet<>();
+    private final List<T> _items = new ArrayList<>();
+    private List<T> _visibleItems = new ArrayList<>();
+    private final Set<T> _checkedItems = new HashSet<>();
 
     private CheckboxAdapter _adapter;
 
@@ -70,7 +70,15 @@ public class DropdownCheckBoxes extends AppCompatAutoCompleteTextView {
         }
     }
 
-    public void addItems(List<String> items, boolean startChecked) {
+    /**
+     * Add parameterized items to be displayed as a checkbox in the dropdown view
+     * the label for the checkbox is determined by the toString() method of the items
+     * you add.
+     *
+     * @param items a list of the items you want to show in the dropdown
+     * @param startChecked whether the checkbox should be checked initially
+     */
+    public void addItems(List<T> items, boolean startChecked) {
         _items.addAll(items);
         _visibleItems.addAll(items);
 
@@ -97,7 +105,7 @@ public class DropdownCheckBoxes extends AppCompatAutoCompleteTextView {
         _selectedCountPlural = resId;
     }
 
-    public Set<String> getCheckedItems() {
+    public Set<T> getCheckedItems() {
         return _checkedItems;
     }
 
@@ -109,7 +117,7 @@ public class DropdownCheckBoxes extends AppCompatAutoCompleteTextView {
         }
 
         @Override
-        public String getItem(int i) {
+        public T getItem(int i) {
             return _visibleItems.get(i);
         }
 
@@ -124,19 +132,18 @@ public class DropdownCheckBoxes extends AppCompatAutoCompleteTextView {
                 convertView = LayoutInflater.from(getContext()).inflate(R.layout.dropdown_checkbox, viewGroup, false);
             }
 
-            String item = _visibleItems.get(i);
+            T item = _visibleItems.get(i);
 
             CheckBox checkBox = convertView.findViewById(R.id.checkbox_in_dropdown);
-            checkBox.setText(item);
+            checkBox.setText(item.toString());
+            checkBox.setTag(item);
             checkBox.setChecked(_checkedItems.contains(item));
 
             checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                String label = buttonView.getText().toString();
-
                 if (isChecked) {
-                    _checkedItems.add(label);
+                    _checkedItems.add((T) buttonView.getTag());
                 } else {
-                    _checkedItems.remove(label);
+                    _checkedItems.remove((T) buttonView.getTag());
                 }
 
                 updateCheckedItemsCountText();
@@ -153,9 +160,9 @@ public class DropdownCheckBoxes extends AppCompatAutoCompleteTextView {
                     FilterResults results = new FilterResults();
                     results.values = (query == null || query.toString().isEmpty())
                                    ? _items
-                                   : _items.stream().filter(str -> {
+                                   : _items.stream().filter(item -> {
                                                         String q = query.toString().toLowerCase();
-                                                        String strLower = str.toLowerCase();
+                                                        String strLower = item.toString().toLowerCase();
 
                                                         return strLower.contains(q);
                                                     })
@@ -166,7 +173,7 @@ public class DropdownCheckBoxes extends AppCompatAutoCompleteTextView {
 
                 @Override
                 protected void publishResults(CharSequence charSequence, FilterResults filterResults) {
-                    _visibleItems = (List<String>) filterResults.values;
+                    _visibleItems = (List<T>) filterResults.values;
                     notifyDataSetChanged();
                 }
             };
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/ChangelogDialog.java b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/ChangelogDialog.java
index 1d6f6ee5..d26d24b8 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/ChangelogDialog.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/ChangelogDialog.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import com.beemdevelopment.aegis.R;
 
 public class ChangelogDialog extends SimpleWebViewDialog {
-    private ChangelogDialog() {
+    public ChangelogDialog() {
         super(R.string.changelog);
     }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/Dialogs.java b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/Dialogs.java
index 3b9d8ab0..692ba3a5 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/Dialogs.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/Dialogs.java
@@ -5,8 +5,6 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.text.InputType;
 import android.text.SpannableStringBuilder;
 import android.text.TextWatcher;
@@ -21,13 +19,17 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.NumberPicker;
 import android.widget.ProgressBar;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.activity.ComponentActivity;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 
+import com.beemdevelopment.aegis.BackupsVersioningStrategy;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.helpers.EditTextHelper;
@@ -39,10 +41,9 @@ import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
 import com.beemdevelopment.aegis.vault.slots.Slot;
 import com.beemdevelopment.aegis.vault.slots.SlotException;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
-import com.nulabinc.zxcvbn.Strength;
-import com.nulabinc.zxcvbn.Zxcvbn;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -86,9 +87,10 @@ public class Dialogs {
         }
         textMessage.setText(message);
 
-        showSecureDialog(new AlertDialog.Builder(context)
+        showSecureDialog(new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                 .setTitle(title)
                 .setView(view)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.yes, onDelete)
                 .setNegativeButton(android.R.string.no, null)
                 .create());
@@ -107,16 +109,16 @@ public class Dialogs {
     }
 
     public static void showDiscardDialog(Context context, DialogInterface.OnClickListener onSave, DialogInterface.OnClickListener onDiscard) {
-        showSecureDialog(new AlertDialog.Builder(context)
+        showSecureDialog(new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                 .setTitle(context.getString(R.string.discard_changes))
                 .setMessage(context.getString(R.string.discard_changes_description))
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(R.string.save, onSave)
                 .setNegativeButton(R.string.discard, onDiscard)
                 .create());
     }
 
     public static void showSetPasswordDialog(ComponentActivity activity, PasswordSlotListener listener) {
-        Zxcvbn zxcvbn = new Zxcvbn();
         View view = activity.getLayoutInflater().inflate(R.layout.dialog_password, null);
         EditText textPassword = view.findViewById(R.id.text_password);
         EditText textPasswordConfirm = view.findViewById(R.id.text_password_confirm);
@@ -124,6 +126,8 @@ public class Dialogs {
         TextView textPasswordStrength = view.findViewById(R.id.text_password_strength);
         TextInputLayout textPasswordWrapper = view.findViewById(R.id.text_password_wrapper);
         CheckBox switchToggleVisibility = view.findViewById(R.id.check_toggle_visibility);
+        PasswordStrengthHelper passStrength = new PasswordStrengthHelper(
+                textPassword, barPasswordStrength, textPasswordStrength, textPasswordWrapper);
 
         switchToggleVisibility.setOnCheckedChangeListener((buttonView, isChecked) -> {
             if (isChecked) {
@@ -137,7 +141,7 @@ public class Dialogs {
             }
         });
 
-        AlertDialog dialog = new AlertDialog.Builder(activity)
+        AlertDialog dialog = new MaterialAlertDialogBuilder(activity)
                 .setTitle(R.string.set_password)
                 .setView(view)
                 .setPositiveButton(android.R.string.ok, null)
@@ -179,13 +183,7 @@ public class Dialogs {
         TextWatcher watcher = new SimpleTextWatcher(text -> {
             boolean equal = EditTextHelper.areEditTextsEqual(textPassword, textPasswordConfirm);
             buttonOK.get().setEnabled(equal);
-
-            Strength strength = zxcvbn.measure(textPassword.getText());
-            barPasswordStrength.setProgress(strength.getScore());
-            barPasswordStrength.setProgressTintList(ColorStateList.valueOf(Color.parseColor(PasswordStrengthHelper.getColor(strength.getScore()))));
-            textPasswordStrength.setText((textPassword.getText().length() != 0) ? PasswordStrengthHelper.getString(strength.getScore(), activity) : "");
-            textPasswordWrapper.setError(strength.getFeedback().getWarning());
-            strength.wipe();
+            passStrength.measure(activity);
         });
         textPassword.addTextChangedListener(watcher);
         textPasswordConfirm.addTextChangedListener(watcher);
@@ -193,10 +191,13 @@ public class Dialogs {
         showSecureDialog(dialog);
     }
 
-    private static void showTextInputDialog(Context context, @StringRes int titleId, @StringRes int messageId, @StringRes int hintId, TextInputListener listener, DialogInterface.OnCancelListener cancelListener, boolean isSecret) {
+    private static void showTextInputDialog(Context context, @StringRes int titleId, @StringRes int messageId, @StringRes int hintId, TextInputListener listener, DialogInterface.OnCancelListener cancelListener, boolean isSecret,@Nullable String hint) {
         final AtomicReference<Button> buttonOK = new AtomicReference<>();
         View view = LayoutInflater.from(context).inflate(R.layout.dialog_text_input, null);
         TextInputEditText input = view.findViewById(R.id.text_input);
+        if(hint != null) {
+            input.setText(hint);
+        }
         input.addTextChangedListener(new SimpleTextWatcher(text -> {
             if (buttonOK.get() != null) {
                 buttonOK.get().setEnabled(!text.toString().isEmpty());
@@ -208,7 +209,7 @@ public class Dialogs {
         }
         inputLayout.setHint(hintId);
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(context)
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context)
                 .setTitle(titleId)
                 .setView(view)
                 .setPositiveButton(android.R.string.ok, null);
@@ -238,12 +239,16 @@ public class Dialogs {
         showSecureDialog(dialog);
     }
 
+    public static void showTextInputDialog(Context context, @StringRes int titleId, @StringRes int hintId, TextInputListener listener, String text) {
+        showTextInputDialog(context, titleId, 0, hintId, listener, null, false, text);
+    }
+
     private static void showTextInputDialog(Context context, @StringRes int titleId, @StringRes int hintId, TextInputListener listener, boolean isSecret) {
-        showTextInputDialog(context, titleId, 0, hintId, listener, null, isSecret);
+        showTextInputDialog(context, titleId, 0, hintId, listener, null, isSecret, null);
     }
 
     public static void showTextInputDialog(Context context, @StringRes int titleId, @StringRes int hintId, TextInputListener listener) {
-        showTextInputDialog(context, titleId, hintId, listener, false);
+        showTextInputDialog(context, titleId, 0, hintId, listener, null, false, null);
     }
 
     public static void showPasswordInputDialog(Context context, TextInputListener listener) {
@@ -251,19 +256,19 @@ public class Dialogs {
     }
 
     public static void showPasswordInputDialog(Context context, TextInputListener listener, DialogInterface.OnCancelListener cancelListener) {
-        showTextInputDialog(context, R.string.set_password, 0, R.string.password, listener, cancelListener, true);
+        showTextInputDialog(context, R.string.set_password, 0, R.string.password, listener, cancelListener, true, null);
     }
 
     public static void showPasswordInputDialog(Context context, @StringRes int messageId, TextInputListener listener) {
-        showTextInputDialog(context, R.string.set_password, messageId, R.string.password, listener, null, true);
+        showTextInputDialog(context, R.string.set_password, messageId, R.string.password, listener, null, true, null);
     }
 
     public static void showPasswordInputDialog(Context context, @StringRes int messageId, TextInputListener listener, DialogInterface.OnCancelListener cancelListener) {
-        showTextInputDialog(context, R.string.set_password, messageId, R.string.password, listener, cancelListener, true);
+        showTextInputDialog(context, R.string.set_password, messageId, R.string.password, listener, cancelListener, true, null);
     }
 
     public static void showPasswordInputDialog(Context context, @StringRes int titleId, @StringRes int messageId, TextInputListener listener, DialogInterface.OnCancelListener cancelListener) {
-        showTextInputDialog(context, titleId, messageId, R.string.password, listener, cancelListener, true);
+        showTextInputDialog(context, titleId, messageId, R.string.password, listener, cancelListener, true, null);
     }
 
     public static void showCheckboxDialog(Context context, @StringRes int titleId, @StringRes int messageId, @StringRes int checkboxMessageId, CheckboxInputListener listener) {
@@ -271,7 +276,7 @@ public class Dialogs {
         CheckBox checkBox = view.findViewById(R.id.checkbox);
         checkBox.setText(checkboxMessageId);
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(context)
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context)
                 .setTitle(titleId)
                 .setView(view)
                 .setNegativeButton(R.string.no, (dialog1, which) ->
@@ -305,7 +310,7 @@ public class Dialogs {
         numberPicker.setValue(currentValue);
         numberPicker.setWrapSelectorWheel(true);
 
-        AlertDialog dialog = new AlertDialog.Builder(context)
+        AlertDialog dialog = new MaterialAlertDialogBuilder(context)
                 .setTitle(R.string.set_number)
                 .setView(view)
                 .setPositiveButton(android.R.string.ok, (dialog1, which) ->
@@ -316,25 +321,32 @@ public class Dialogs {
     }
 
     public static void showBackupVersionsPickerDialog(Context context, int currentVersionCount, NumberInputListener listener) {
-        final int max = 30;
-        String[] numbers = new String[max / 5];
-        for (int i = 0; i < numbers.length; i++) {
-            numbers[i] = Integer.toString(i * 5 + 5);
+        String infinite = context.getString(R.string.pref_backups_versions_infinite);
+        String[] values = {"5", "10", "15", "20", "25", "30", infinite};
+        int[] numbers = {5, 10, 15, 20, 25, 30, Preferences.BACKUPS_VERSIONS_INFINITE};
+        int selectedIndex;
+        if (currentVersionCount == Preferences.BACKUPS_VERSIONS_INFINITE) {
+            selectedIndex = numbers.length - 1;
+        } else {
+            selectedIndex = currentVersionCount / 5 - 1;
         }
 
         View view = LayoutInflater.from(context).inflate(R.layout.dialog_number_picker, null);
         NumberPicker numberPicker = view.findViewById(R.id.numberPicker);
-        numberPicker.setDisplayedValues(numbers);
-        numberPicker.setMaxValue(numbers.length - 1);
+        numberPicker.setDisplayedValues(values);
+        numberPicker.setMaxValue(values.length - 1);
         numberPicker.setMinValue(0);
-        numberPicker.setValue(currentVersionCount / 5 - 1);
+        numberPicker.setValue(selectedIndex);
         numberPicker.setWrapSelectorWheel(false);
 
-        AlertDialog dialog = new AlertDialog.Builder(context)
+        AlertDialog dialog = new MaterialAlertDialogBuilder(context)
                 .setTitle(R.string.set_number)
                 .setView(view)
-                .setPositiveButton(android.R.string.ok, (dialog1, which) ->
-                        listener.onNumberInputResult(numberPicker.getValue()))
+                .setPositiveButton(android.R.string.ok, (dialog1, which) -> {
+                    int index = numberPicker.getValue();
+                    int number = numbers[index];
+                    listener.onNumberInputResult(number);
+                })
                 .create();
 
         showSecureDialog(dialog);
@@ -371,10 +383,11 @@ public class Dialogs {
         TextView textMessage = view.findViewById(R.id.error_message);
         textMessage.setText(message);
 
-        AlertDialog dialog = new AlertDialog.Builder(context)
+        AlertDialog dialog = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Aegis_AlertDialog_Error)
                 .setTitle(R.string.error_occurred)
                 .setView(view)
                 .setCancelable(false)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.ok, (dialog1, which) -> {
                     if (listener != null) {
                         listener.onClick(dialog1, which);
@@ -406,38 +419,40 @@ public class Dialogs {
 
     public static void showBackupErrorDialog(Context context, Preferences.BackupResult backupRes, DialogInterface.OnClickListener listener) {
         String system = context.getString(backupRes.isBuiltIn() ? R.string.backup_system_builtin : R.string.backup_system_android);
-        String message = context.getString(R.string.backup_error_dialog_details, system, backupRes.getElapsedSince(context));
+        @StringRes int details = backupRes.isPermissionError() ? R.string.backup_permission_error_dialog_details : R.string.backup_error_dialog_details;
+        String message = context.getString(details, system, backupRes.getElapsedSince(context));
         Dialogs.showErrorDialog(context, message, backupRes.getError(), listener);
     }
 
-    public static void showMultiMessageDialog(
+    public static void showMultiErrorDialog(
             Context context, @StringRes int title, String message, List<CharSequence> messages, DialogInterface.OnClickListener listener) {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(context)
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Aegis_AlertDialog_Error)
                 .setTitle(title)
                 .setMessage(message)
                 .setCancelable(false)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.ok, (dialog, which) -> {
                     if (listener != null) {
                         listener.onClick(dialog, which);
                     }
                 })
                 .setNeutralButton(context.getString(R.string.details), (dialog, which) -> {
-                    showDetailedMultiMessageDialog(context, title, messages, listener);
+                    showDetailedMultiErrorDialog(context, title, messages, listener);
                 })
                 .create());
     }
 
-    public static <T extends Throwable> void showMultiErrorDialog(
+    public static <T extends Throwable> void showMultiExceptionDialog(
             Context context, @StringRes int title, String message, List<T> errors, DialogInterface.OnClickListener listener) {
         List<CharSequence> messages = new ArrayList<>();
         for (Throwable e : errors) {
             messages.add(e.toString());
         }
 
-        showMultiMessageDialog(context, title, message, messages, listener);
+        showMultiErrorDialog(context, title, message, messages, listener);
     }
 
-    private static void showDetailedMultiMessageDialog(
+    private static void showDetailedMultiErrorDialog(
             Context context, @StringRes int title, List<CharSequence> messages, DialogInterface.OnClickListener listener) {
         SpannableStringBuilder builder = new SpannableStringBuilder();
         for (CharSequence message : messages) {
@@ -445,10 +460,11 @@ public class Dialogs {
             builder.append("\n\n");
         }
 
-        AlertDialog dialog = new AlertDialog.Builder(context)
+        AlertDialog dialog = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Aegis_AlertDialog_Error)
                 .setTitle(title)
                 .setMessage(builder)
                 .setCancelable(false)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.ok, (dialog1, which) -> {
                     if (listener != null) {
                         listener.onClick(dialog1, which);
@@ -475,10 +491,11 @@ public class Dialogs {
         View view = LayoutInflater.from(context).inflate(R.layout.dialog_time_sync, null);
         CheckBox checkBox = view.findViewById(R.id.check_warning_disable);
 
-        showSecureDialog(new AlertDialog.Builder(context)
+        showSecureDialog(new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                 .setTitle(R.string.time_sync_warning_title)
                 .setView(view)
                 .setCancelable(false)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(R.string.yes, (dialog, which) -> {
                     if (checkBox.isChecked()) {
                         prefs.setIsTimeSyncWarningEnabled(false);
@@ -513,7 +530,7 @@ public class Dialogs {
             setImporterHelpText(helpText, importers.get(position), isDirect);
         });
 
-        Dialogs.showSecureDialog(new AlertDialog.Builder(context)
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(context)
                 .setTitle(R.string.choose_application)
                 .setView(view)
                 .setPositiveButton(android.R.string.ok, (dialog1, which) -> {
@@ -534,12 +551,13 @@ public class Dialogs {
             errorDetails.append("\n\n");
         }
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(context)
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                 .setTitle(R.string.partial_google_auth_import)
                 .setMessage(context.getString(R.string.partial_google_auth_import_warning, missingIndexesAsString))
                 .setView(view)
                 .setCancelable(false)
-                .setPositiveButton(context.getString(R.string.import_partial_export_anyway, entries), (dialog, which) -> {
+                .setIconAttribute(android.R.attr.alertDialogIcon)
+                .setPositiveButton(context.getResources().getQuantityString(R.plurals.import_partial_export_anyway, entries, entries), (dialog, which) -> {
                     dismissHandler.onClick(dialog, which);
                 })
                 .setNegativeButton(android.R.string.cancel, null);
@@ -562,6 +580,54 @@ public class Dialogs {
         showSecureDialog(dialog);
     }
 
+    public static void showBackupsVersioningStrategy(Context context, BackupsVersioningStrategy currentStrategy, BackupsVersioningStrategyListener listener) {
+        View view = LayoutInflater.from(context).inflate(R.layout.dialog_backups_versioning_strategy, null);
+        RadioGroup radioGroup = view.findViewById(R.id.radio_group);
+        RadioButton keepXVersionsButton = view.findViewById(R.id.keep_x_versions_button);
+        RadioButton singleBackupButton = view.findViewById(R.id.single_backup_button);
+        TextView warningText = view.findViewById(R.id.warning_text);
+        CheckBox riskAccept = view.findViewById(R.id.risk_accept);
+        final AtomicReference<Button> positiveButtonRef = new AtomicReference<>();
+        radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
+            Button positiveButton = positiveButtonRef.get();
+            if (positiveButton != null) {
+                positiveButton.setEnabled(checkedId == keepXVersionsButton.getId());
+            }
+            int visibility = checkedId == singleBackupButton.getId() ? View.VISIBLE : View.GONE;
+            warningText.setVisibility(visibility);
+            riskAccept.setVisibility(visibility);
+        });
+        riskAccept.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            Button positiveButton = positiveButtonRef.get();
+            if (positiveButton != null) {
+                positiveButton.setEnabled(isChecked);
+            }
+        });
+        AlertDialog alertDialog = new MaterialAlertDialogBuilder(context)
+                .setTitle(R.string.pref_backups_versioning_strategy_dialog_title)
+                .setView(view)
+                .setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                    int checkedId = radioGroup.getCheckedRadioButtonId();
+                    if (checkedId == keepXVersionsButton.getId()) {
+                        listener.onStrategySelectionResult(BackupsVersioningStrategy.MULTIPLE_BACKUPS);
+                    } else if (checkedId == singleBackupButton.getId()) {
+                        listener.onStrategySelectionResult(BackupsVersioningStrategy.SINGLE_BACKUP);
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+        alertDialog.setOnShowListener(dialog -> {
+            Button positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+            positiveButtonRef.set(positiveButton);
+            if (currentStrategy == BackupsVersioningStrategy.MULTIPLE_BACKUPS) {
+                radioGroup.check(keepXVersionsButton.getId());
+            } else if (currentStrategy == BackupsVersioningStrategy.SINGLE_BACKUP) {
+                radioGroup.check(singleBackupButton.getId());
+            }
+        });
+        showSecureDialog(alertDialog);
+    }
+
     private static void setImporterHelpText(TextView view, DatabaseImporter.Definition definition, boolean isDirect) {
         if (isDirect) {
             view.setText(view.getResources().getString(R.string.importer_help_direct, definition.getName()));
@@ -590,4 +656,8 @@ public class Dialogs {
     public interface ImporterListener {
         void onImporterSelectionResult(DatabaseImporter.Definition definition);
     }
+
+    public interface BackupsVersioningStrategyListener {
+        void onStrategySelectionResult(BackupsVersioningStrategy strategy);
+    }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/IconPickerDialog.java b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/IconPickerDialog.java
index fbcd148d..d08059ce 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/IconPickerDialog.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/IconPickerDialog.java
@@ -18,14 +18,13 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.icons.IconPack;
-import com.beemdevelopment.aegis.ui.glide.IconLoader;
+import com.beemdevelopment.aegis.ui.glide.GlideHelper;
 import com.beemdevelopment.aegis.ui.views.IconAdapter;
 import com.beemdevelopment.aegis.ui.views.IconRecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.ListPreloader;
 import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.util.ViewPreloadSizeProvider;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -40,7 +39,7 @@ public class IconPickerDialog {
 
     }
 
-    public static BottomSheetDialog create(Activity activity, List<IconPack> iconPacks, String issuer, IconAdapter.Listener listener) {
+    public static BottomSheetDialog create(Activity activity, List<IconPack> iconPacks, String issuer, boolean showAddCustom, IconAdapter.Listener listener) {
         View view = LayoutInflater.from(activity).inflate(R.layout.dialog_icon_picker, null);
         TextView textIconPack = view.findViewById(R.id.text_icon_pack);
 
@@ -76,12 +75,9 @@ public class IconPickerDialog {
             @Nullable
             @Override
             public RequestBuilder<Drawable> getPreloadRequestBuilder(@NonNull IconPack.Icon icon) {
-                return Glide.with(dialog.getContext())
-                        .asDrawable()
-                        .load(icon.getFile())
-                        .set(IconLoader.ICON_TYPE, icon.getIconType())
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .skipMemoryCache(false);
+                RequestBuilder<Drawable> rb = Glide.with(dialog.getContext())
+                        .load(icon.getFile());
+                return GlideHelper.setCommonOptions(rb, icon.getIconType());
             }
         }
 
@@ -128,7 +124,7 @@ public class IconPickerDialog {
         recyclerView.setLayoutManager(layoutManager);
         recyclerView.setAdapter(adapter);
         recyclerView.addOnScrollListener(preloader);
-        adapter.loadIcons(iconPacks.get(0));
+        adapter.loadIcons(iconPacks.get(0), showAddCustom);
         textIconPack.setText(iconPacks.get(0).getName());
 
         view.findViewById(R.id.btn_icon_pack).setOnClickListener(v -> {
@@ -139,7 +135,7 @@ public class IconPickerDialog {
             PopupMenu popupMenu = new PopupMenu(activity, v);
             popupMenu.setOnMenuItemClickListener(item -> {
                 IconPack pack = iconPacks.get(iconPackNames.indexOf(item.getTitle().toString()));
-                adapter.loadIcons(pack);
+                adapter.loadIcons(pack, showAddCustom);
 
                 String query = iconSearch.getText().toString();
                 if (!query.isEmpty()) {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/LicenseDialog.java b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/LicenseDialog.java
index 11ba9ca0..ee947ddb 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/LicenseDialog.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/LicenseDialog.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import com.beemdevelopment.aegis.R;
 
 public class LicenseDialog extends SimpleWebViewDialog {
-    private LicenseDialog() {
+    public LicenseDialog() {
         super(R.string.license);
     }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/SimpleWebViewDialog.java b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/SimpleWebViewDialog.java
index 930da65e..8f3f7129 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/SimpleWebViewDialog.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/SimpleWebViewDialog.java
@@ -17,7 +17,8 @@ import androidx.fragment.app.DialogFragment;
 
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.Theme;
-import com.beemdevelopment.aegis.helpers.ThemeHelper;
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.common.io.CharStreams;
 
 import java.io.IOException;
@@ -44,14 +45,14 @@ public abstract class SimpleWebViewDialog extends DialogFragment {
             view = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_web_view, null);
         } catch (InflateException e) {
             e.printStackTrace();
-            return new AlertDialog.Builder(requireContext())
+            return new MaterialAlertDialogBuilder(requireContext())
                     .setTitle(android.R.string.dialog_alert_title)
                     .setMessage(getString(R.string.webview_error))
                     .setPositiveButton(android.R.string.ok, null)
                     .show();
         }
 
-        AlertDialog dialog = new AlertDialog.Builder(requireContext())
+        AlertDialog dialog = new MaterialAlertDialogBuilder(requireContext())
                 .setTitle(_title)
                 .setView(view)
                 .setPositiveButton(android.R.string.ok, null)
@@ -69,12 +70,21 @@ public abstract class SimpleWebViewDialog extends DialogFragment {
     }
 
     protected String getBackgroundColor() {
-        int backgroundColorResource = _theme == Theme.AMOLED ? R.attr.cardBackgroundFocused : R.attr.cardBackground;
-        return colorToCSS(ThemeHelper.getThemeColor(backgroundColorResource, requireContext().getTheme()));
+        int color = MaterialColors.getColor(
+                requireContext(),
+                com.google.android.material.R.attr.colorSurfaceContainerHigh,
+                getClass().getCanonicalName()
+        );
+        return colorToCSS(color);
     }
 
     protected String getTextColor() {
-        return colorToCSS(0xFFFFFF & ThemeHelper.getThemeColor(R.attr.primaryText, requireContext().getTheme()));
+        int color = MaterialColors.getColor(
+                requireContext(),
+                com.google.android.material.R.attr.colorOnSurface,
+                getClass().getCanonicalName()
+        );
+        return colorToCSS(0xFFFFFF & color);
     }
 
     @SuppressLint("DefaultLocale")
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AppearancePreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AppearancePreferencesFragment.java
index 3c99f55b..7518ddf6 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AppearancePreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AppearancePreferencesFragment.java
@@ -8,11 +8,17 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 
 import com.beemdevelopment.aegis.AccountNamePosition;
+import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.Theme;
 import com.beemdevelopment.aegis.ViewMode;
 import com.beemdevelopment.aegis.ui.GroupManagerActivity;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.google.android.material.color.DynamicColors;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.Arrays;
+import java.util.List;
 
 public class AppearancePreferencesFragment extends PreferencesFragment {
     private Preference _groupsPreference;
@@ -21,7 +27,6 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
         addPreferencesFromResource(R.xml.preferences_appearance);
 
         _groupsPreference = requirePreference("pref_groups");
@@ -33,7 +38,7 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
 
         _resetUsageCountPreference = requirePreference("pref_reset_usage_count");
         _resetUsageCountPreference.setOnPreferenceClickListener(preference -> {
-            Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.preference_reset_usage_count)
                     .setMessage(R.string.preference_reset_usage_count_dialog)
                     .setPositiveButton(android.R.string.yes, (dialog, which) -> _prefs.clearUsageCount())
@@ -48,7 +53,7 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
         darkModePreference.setOnPreferenceClickListener(preference -> {
             int currentTheme1 = _prefs.getCurrentTheme().ordinal();
 
-            Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.choose_theme)
                     .setSingleChoiceItems(R.array.theme_titles, currentTheme1, (dialog, which) -> {
                         int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
@@ -56,7 +61,6 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
 
                         dialog.dismiss();
 
-                        getResult().putExtra("needsRecreate", true);
                         requireActivity().recreate();
                     })
                     .setNegativeButton(android.R.string.cancel, null)
@@ -65,11 +69,34 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
             return true;
         });
 
+        Preference dynamicColorsPreference = requirePreference("pref_dynamic_colors");
+        dynamicColorsPreference.setEnabled(DynamicColors.isDynamicColorAvailable());
+        dynamicColorsPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+            requireActivity().recreate();
+            return true;
+        });
+
         Preference langPreference = requirePreference("pref_lang");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            langPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                getResult().putExtra("needsRecreate", true);
-                requireActivity().recreate();
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
+            String[] langs = getResources().getStringArray(R.array.pref_lang_values);
+            String[] langNames = getResources().getStringArray(R.array.pref_lang_entries);
+            List<String> langList = Arrays.asList(langs);
+            int curLangIndex = langList.contains(_prefs.getLanguage()) ? langList.indexOf(_prefs.getLanguage()) : 0;
+            langPreference.setSummary(langNames[curLangIndex]);
+            langPreference.setOnPreferenceClickListener(preference -> {
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext())
+                        .setTitle(R.string.pref_lang_title)
+                        .setSingleChoiceItems(langNames, curLangIndex, (dialog, which) -> {
+                            int newLangIndex = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
+                            _prefs.setLanguage(langs[newLangIndex]);
+                            langPreference.setSummary(langNames[newLangIndex]);
+
+                            dialog.dismiss();
+
+                            requireActivity().recreate();
+                        })
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .create());
                 return true;
             });
         } else {
@@ -83,14 +110,13 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
         viewModePreference.setOnPreferenceClickListener(preference -> {
             int currentViewMode1 = _prefs.getCurrentViewMode().ordinal();
 
-            Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.choose_view_mode)
                     .setSingleChoiceItems(R.array.view_mode_titles, currentViewMode1, (dialog, which) -> {
                         int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
                         _prefs.setCurrentViewMode(ViewMode.fromInteger(i));
                         viewModePreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.view_mode_titles)[i]));
-                        getResult().putExtra("needsRefresh", true);
-                        overrideAccountNamePosition(ViewMode.fromInteger(i) == ViewMode.TILES);
+                        refreshAccountNamePositionText();
                         dialog.dismiss();
                     })
                     .setNegativeButton(android.R.string.cancel, null)
@@ -99,15 +125,27 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
             return true;
         });
 
-        Preference codeDigitGroupingPreference = requirePreference("pref_code_group_size_string");
-        codeDigitGroupingPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            getResult().putExtra("needsRefresh", true);
-            return true;
-        });
+        Preference showExpirationStatePreference = requirePreference("pref_expiration_state");
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            showExpirationStatePreference.setSummary(getString(R.string.pref_expiration_state_fallback));
+        }
 
-        Preference onlyShowNecessaryAccountNames = requirePreference("pref_shared_issuer_account_name");
-        onlyShowNecessaryAccountNames.setOnPreferenceChangeListener((preference, newValue) -> {
-            getResult().putExtra("needsRefresh", true);
+        String[] codeGroupings = getResources().getStringArray(R.array.pref_code_groupings_values);
+        String[] codeGroupingNames = getResources().getStringArray(R.array.pref_code_groupings);
+        Preference codeDigitGroupingPreference = requirePreference("pref_code_group_size_string");
+        codeDigitGroupingPreference.setOnPreferenceClickListener(preference -> {
+            int currentCodeGroupingIndex = Arrays.asList(codeGroupings).indexOf(_prefs.getCodeGroupSize().name());
+
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext())
+                    .setTitle(R.string.pref_code_group_size_title)
+                    .setSingleChoiceItems(codeGroupingNames, currentCodeGroupingIndex, (dialog, which) -> {
+                        int newCodeGroupingIndex = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
+                        _prefs.setCodeGroupSize(Preferences.CodeGrouping.valueOf(codeGroupings[newCodeGroupingIndex]));
+
+                        dialog.dismiss();
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create());
             return true;
         });
 
@@ -117,13 +155,13 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
         _currentAccountNamePositionPreference.setOnPreferenceClickListener(preference -> {
             int currentAccountNamePosition1 = _prefs.getAccountNamePosition().ordinal();
 
-            Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext())
                     .setTitle(getString(R.string.choose_account_name_position))
                     .setSingleChoiceItems(R.array.account_name_position_titles, currentAccountNamePosition1, (dialog, which) -> {
                         int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
                         _prefs.setAccountNamePosition(AccountNamePosition.fromInteger(i));
                         _currentAccountNamePositionPreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.account_name_position_titles)[i]));
-                        getResult().putExtra("needsRefresh", true);
+                        refreshAccountNamePositionText();
                         dialog.dismiss();
                     })
                     .setNegativeButton(android.R.string.cancel, null)
@@ -132,21 +170,15 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
             return true;
         });
 
-        Preference showIconsPreference = requirePreference("pref_show_icons");
-        showIconsPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            getResult().putExtra("needsRefresh", true);
-            return true;
-        });
-
-        overrideAccountNamePosition(_prefs.getCurrentViewMode() == ViewMode.TILES);
+        refreshAccountNamePositionText();
     }
 
-    private void overrideAccountNamePosition(boolean override) {
+    private void refreshAccountNamePositionText() {
+        boolean override = (_prefs.getCurrentViewMode() == ViewMode.TILES && _prefs.getAccountNamePosition() == AccountNamePosition.END);
+
         if (override) {
-            _currentAccountNamePositionPreference.setEnabled(false);
-            _currentAccountNamePositionPreference.setSummary(getString(R.string.pref_account_name_position_summary_override));
+            _currentAccountNamePositionPreference.setSummary(String.format("%s: %s. %s", getString(R.string.selected), getResources().getStringArray(R.array.account_name_position_titles)[_prefs.getAccountNamePosition().ordinal()], getString(R.string.pref_account_name_position_summary_override)));
         } else {
-            _currentAccountNamePositionPreference.setEnabled(true);
             _currentAccountNamePositionPreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.account_name_position_titles)[_prefs.getAccountNamePosition().ordinal()]));
         }
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AuditLogPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AuditLogPreferencesFragment.java
new file mode 100644
index 00000000..8199dfa1
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AuditLogPreferencesFragment.java
@@ -0,0 +1,111 @@
+package com.beemdevelopment.aegis.ui.fragments.preferences;
+
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LiveData;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.database.AuditLogEntry;
+import com.beemdevelopment.aegis.database.AuditLogRepository;
+import com.beemdevelopment.aegis.helpers.MetricsHelper;
+import com.beemdevelopment.aegis.ui.models.AuditLogEntryModel;
+import com.beemdevelopment.aegis.ui.views.AuditLogAdapter;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultManager;
+
+import java.util.List;
+import java.util.UUID;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+
+@AndroidEntryPoint
+public class AuditLogPreferencesFragment extends Fragment {
+
+    @Inject
+    AuditLogRepository _auditLogRepository;
+
+    private AuditLogAdapter _adapter;
+
+    private RecyclerView _auditLogRecyclerView;
+    private LinearLayout _noAuditLogsView;
+
+    @Inject
+    VaultManager _vaultManager;
+
+    public AuditLogPreferencesFragment() {
+        super(R.layout.fragment_audit_log);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+        LiveData<List<AuditLogEntry>> entries = _auditLogRepository.getAllAuditLogEntries();
+
+        _adapter = new AuditLogAdapter();
+        _noAuditLogsView = view.findViewById(R.id.vEmptyList);
+        _auditLogRecyclerView = view.findViewById(R.id.list_audit_log);
+        LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext());
+        _auditLogRecyclerView.addItemDecoration(new SpacesItemDecoration(8));
+        _auditLogRecyclerView.setLayoutManager(layoutManager);
+        _auditLogRecyclerView.setAdapter(_adapter);
+        _auditLogRecyclerView.setNestedScrollingEnabled(false);
+
+        ViewCompat.setOnApplyWindowInsetsListener(_auditLogRecyclerView, (targetView, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+            targetView.setPadding(
+                    0,
+                    0,
+                    0,
+                    insets.bottom
+            );
+            return WindowInsetsCompat.CONSUMED;
+        });
+
+        entries.observe(getViewLifecycleOwner(), entries1 -> {
+            _noAuditLogsView.setVisibility(entries1.isEmpty() ? View.VISIBLE : View.GONE);
+
+            for (AuditLogEntry entry : entries1) {
+                VaultEntry referencedEntry = null;
+                if (entry.getReference() != null) {
+                    UUID referencedEntryUUID = UUID.fromString(entry.getReference());
+                    if (_vaultManager.getVault().hasEntryByUUID(referencedEntryUUID)) {
+                        referencedEntry = _vaultManager.getVault().getEntryByUUID(referencedEntryUUID);
+                    }
+                }
+
+                AuditLogEntryModel auditLogEntryModel = new AuditLogEntryModel(entry, referencedEntry);
+                _adapter.addAuditLogEntryModel(auditLogEntryModel);
+            }
+        });
+    }
+
+    private class SpacesItemDecoration extends RecyclerView.ItemDecoration {
+        private final int _space;
+
+        public SpacesItemDecoration(int dpSpace) {
+            _space = MetricsHelper.convertDpToPixels(getContext(), dpSpace);
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            outRect.left = _space;
+            outRect.right = _space;
+            outRect.bottom = _space;
+
+            if (parent.getChildLayoutPosition(view) == 0) {
+                outRect.top = _space;
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BackupsPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BackupsPreferencesFragment.java
index 48a4032c..fe342599 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BackupsPreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BackupsPreferencesFragment.java
@@ -11,19 +11,25 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreferenceCompat;
 
+import com.beemdevelopment.aegis.BackupsVersioningStrategy;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.beemdevelopment.aegis.vault.VaultBackupManager;
 import com.beemdevelopment.aegis.vault.VaultRepositoryException;
+import com.google.android.material.color.MaterialColors;
 
 public class BackupsPreferencesFragment extends PreferencesFragment {
     private SwitchPreferenceCompat _androidBackupsPreference;
     private SwitchPreferenceCompat _backupsPreference;
     private SwitchPreferenceCompat _backupReminderPreference;
+    private Preference _versioningStrategyPreference;
     private Preference _backupsLocationPreference;
     private Preference _backupsTriggerPreference;
     private Preference _backupsVersionsPreference;
@@ -32,6 +38,15 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
     private Preference _builtinBackupStatusPreference;
     private Preference _androidBackupStatusPreference;
 
+    private final ActivityResultLauncher<Intent> backupsResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                Intent data = activityResult.getData();
+                int resultCode = activityResult.getResultCode();
+                if (data != null) {
+                    onSelectBackupsLocationResult(resultCode, data);
+                }
+            });
+
     @Override
     public void onResume() {
         super.onResume();
@@ -40,7 +55,6 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
         addPreferencesFromResource(R.xml.preferences_backups);
 
         _backupsPasswordWarningPreference = requirePreference("pref_backups_warning_password");
@@ -64,7 +78,13 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
         _backupsPreference = requirePreference("pref_backups");
         _backupsPreference.setOnPreferenceChangeListener((preference, newValue) -> {
             if ((boolean) newValue) {
-                selectBackupsLocation();
+                Dialogs.showBackupsVersioningStrategy(requireContext(), BackupsVersioningStrategy.MULTIPLE_BACKUPS, strategy -> {
+                    if (strategy == BackupsVersioningStrategy.MULTIPLE_BACKUPS) {
+                        selectBackupsLocation();
+                    } else if (strategy == BackupsVersioningStrategy.SINGLE_BACKUP) {
+                        createBackupFile();
+                    }
+                });
             } else {
                 _prefs.setIsBackupsEnabled(false);
                 updateBackupPreference();
@@ -89,6 +109,24 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
             return false;
         });
 
+        _versioningStrategyPreference = requirePreference("pref_versioning_strategy");
+        updateBackupsVersioningStrategySummary();
+        _versioningStrategyPreference.setOnPreferenceClickListener(preference -> {
+            BackupsVersioningStrategy currentStrategy = _prefs.getBackupVersioningStrategy();
+            Dialogs.showBackupsVersioningStrategy(requireContext(), currentStrategy, strategy -> {
+                if (strategy == currentStrategy) {
+                    return;
+                }
+                if (strategy == BackupsVersioningStrategy.MULTIPLE_BACKUPS) {
+                    selectBackupsLocation();
+                } else if (strategy == BackupsVersioningStrategy.SINGLE_BACKUP) {
+                    createBackupFile();
+                }
+            });
+            return true;
+        });
+
+
         _androidBackupsPreference = requirePreference("pref_android_backups");
         _androidBackupsPreference.setOnPreferenceChangeListener((preference, newValue) -> {
             _prefs.setIsAndroidBackupsEnabled((boolean) newValue);
@@ -99,13 +137,15 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
             return false;
         });
 
-        Uri backupLocation = _prefs.getBackupsLocation();
         _backupsLocationPreference = requirePreference("pref_backups_location");
-        if (backupLocation != null) {
-            _backupsLocationPreference.setSummary(String.format("%s: %s", getString(R.string.pref_backups_location_summary), Uri.decode(backupLocation.toString())));
-        }
+        updateBackupsLocationSummary();
         _backupsLocationPreference.setOnPreferenceClickListener(preference -> {
-            selectBackupsLocation();
+            BackupsVersioningStrategy currentStrategy = _prefs.getBackupVersioningStrategy();
+            if (currentStrategy == BackupsVersioningStrategy.MULTIPLE_BACKUPS) {
+                selectBackupsLocation();
+            } else if (currentStrategy == BackupsVersioningStrategy.SINGLE_BACKUP) {
+                createBackupFile();
+            }
             return false;
         });
 
@@ -119,12 +159,11 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
         });
 
         _backupsVersionsPreference = requirePreference("pref_backups_versions");
-        _backupsVersionsPreference.setSummary(getResources().getQuantityString(R.plurals.pref_backups_versions_summary, _prefs.getBackupsVersionCount(), _prefs.getBackupsVersionCount()));
+        updateBackupsVersionsSummary();
         _backupsVersionsPreference.setOnPreferenceClickListener(preference -> {
             Dialogs.showBackupVersionsPickerDialog(requireContext(), _prefs.getBackupsVersionCount(), number -> {
-                number = number * 5 + 5;
                 _prefs.setBackupsVersionCount(number);
-                _backupsVersionsPreference.setSummary(getResources().getQuantityString(R.plurals.pref_backups_versions_summary, _prefs.getBackupsVersionCount(), _prefs.getBackupsVersionCount()));
+                updateBackupsVersionsSummary();
             });
             return false;
         });
@@ -137,13 +176,6 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
         }
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (data != null && requestCode == CODE_BACKUPS) {
-            onSelectBackupsLocationResult(resultCode, data);
-        }
-    }
-
     private void onSelectBackupsLocationResult(int resultCode, Intent data) {
         Uri uri = data.getData();
         if (resultCode != Activity.RESULT_OK || uri == null) {
@@ -155,9 +187,10 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
 
         _prefs.setBackupsLocation(uri);
         _prefs.setIsBackupsEnabled(true);
-        _backupsLocationPreference.setSummary(String.format("%s: %s", getString(R.string.pref_backups_location_summary), Uri.decode(uri.toString())));
         updateBackupPreference();
         scheduleBackup();
+        updateBackupsVersioningStrategySummary();
+        updateBackupsLocationSummary();
     }
 
     private void updateBackupPreference() {
@@ -171,9 +204,10 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
         _backupsPreference.setChecked(backupEnabled);
         _backupsPreference.setEnabled(encrypted);
         _backupReminderPreference.setChecked(backupReminderEnabled);
+        _versioningStrategyPreference.setVisible(backupEnabled);
         _backupsLocationPreference.setVisible(backupEnabled);
         _backupsTriggerPreference.setVisible(backupEnabled);
-        _backupsVersionsPreference.setVisible(backupEnabled);
+        _backupsVersionsPreference.setVisible(backupEnabled && _prefs.getBackupVersioningStrategy() != BackupsVersioningStrategy.SINGLE_BACKUP);
         if (backupEnabled) {
             updateBackupStatus(_builtinBackupStatusPreference, _prefs.getBuiltInBackupResult());
         }
@@ -191,9 +225,9 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
 
         // TODO: Find out why setting the tint of the icon doesn't work
         if (backupFailed) {
-            pref.setIcon(R.drawable.ic_info_outline_black_24dp);
+            pref.setIcon(R.drawable.ic_outline_error_24);
         } else if (res != null) {
-            pref.setIcon(R.drawable.ic_check_black_24dp);
+            pref.setIcon(R.drawable.ic_outline_check_24);
         } else {
             pref.setIcon(null);
         }
@@ -201,24 +235,31 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
 
     private CharSequence getBackupStatusMessage(@Nullable Preferences.BackupResult res) {
         String message;
-        int color = R.color.warning_color;
+        int colorAttr = com.google.android.material.R.attr.colorError;
         if (res == null) {
             message = getString(R.string.backup_status_none);
         } else if (res.isSuccessful()) {
-            color = R.color.success_color;
+            colorAttr = R.attr.colorSuccess;
             message = getString(R.string.backup_status_success, res.getElapsedSince(requireContext()));
         } else {
             message = getString(R.string.backup_status_failed, res.getElapsedSince(requireContext()));
         }
 
+        int color = MaterialColors.getColor(requireContext(), colorAttr, getClass().getCanonicalName());
         Spannable spannable = new SpannableString(message);
-        spannable.setSpan(new ForegroundColorSpan(getResources().getColor(color)), 0, message.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        if (color == R.color.warning_color) {
-            spannable.setSpan(new StyleSpan(Typeface.BOLD), 0, message.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        }
+        spannable.setSpan(new ForegroundColorSpan(color), 0, message.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        spannable.setSpan(new StyleSpan(Typeface.BOLD), 0, message.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         return spannable;
     }
 
+    private void createBackupFile() {
+        Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
+                .addCategory(Intent.CATEGORY_OPENABLE)
+                .setType("application/json")
+                .putExtra(Intent.EXTRA_TITLE, VaultBackupManager.FILENAME_SINGLE);
+        _vaultManager.fireIntentLauncher(this, intent, backupsResultLauncher);
+    }
+
     private void selectBackupsLocation() {
         Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
@@ -226,7 +267,7 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
                 | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
                 | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
 
-        _vaultManager.startActivityForResult(this, intent, CODE_BACKUPS);
+        _vaultManager.fireIntentLauncher(this, intent, backupsResultLauncher);
     }
 
     private void scheduleBackup() {
@@ -238,4 +279,38 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
             Dialogs.showErrorDialog(requireContext(), R.string.backup_error, e);
         }
     }
+
+    private void updateBackupsVersioningStrategySummary() {
+        BackupsVersioningStrategy currentStrategy = _prefs.getBackupVersioningStrategy();
+        if (currentStrategy == BackupsVersioningStrategy.MULTIPLE_BACKUPS) {
+            _versioningStrategyPreference.setSummary(R.string.pref_backups_versioning_strategy_keep_x_versions);
+        } else if (currentStrategy == BackupsVersioningStrategy.SINGLE_BACKUP) {
+            _versioningStrategyPreference.setSummary(R.string.pref_backups_versioning_strategy_single_backup);
+        }
+    }
+
+    private void updateBackupsLocationSummary() {
+        Uri backupsLocation = _prefs.getBackupsLocation();
+        BackupsVersioningStrategy currentStrategy = _prefs.getBackupVersioningStrategy();
+        String text;
+        if (currentStrategy == BackupsVersioningStrategy.MULTIPLE_BACKUPS) {
+            text = getString(R.string.pref_backups_location_summary);
+        } else if (currentStrategy == BackupsVersioningStrategy.SINGLE_BACKUP) {
+            text = getString(R.string.pref_backup_location_summary);
+        } else {
+            return;
+        }
+        String summary = String.format("%s: %s", text, Uri.decode(backupsLocation.toString()));
+        _backupsLocationPreference.setSummary(summary);
+    }
+
+    private void updateBackupsVersionsSummary() {
+        int count = _prefs.getBackupsVersionCount();
+        if (count == Preferences.BACKUPS_VERSIONS_INFINITE) {
+            _backupsVersionsPreference.setSummary(R.string.pref_backups_versions_infinite_summary);
+        } else {
+            String summary = getResources().getQuantityString(R.plurals.pref_backups_versions_summary, count, count);
+            _backupsVersionsPreference.setSummary(summary);
+        }
+    }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BehaviorPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BehaviorPreferencesFragment.java
index 47646418..8fa73cda 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BehaviorPreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BehaviorPreferencesFragment.java
@@ -1,35 +1,80 @@
 package com.beemdevelopment.aegis.ui.fragments.preferences;
 
 import android.os.Bundle;
+import android.widget.Button;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 
 import com.beemdevelopment.aegis.CopyBehavior;
+import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 public class BehaviorPreferencesFragment extends PreferencesFragment {
-    private Preference _entryPausePreference;
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
         addPreferencesFromResource(R.xml.preferences_behavior);
 
+        Preference currentSearchBehaviorPreference = requirePreference("pref_search_behavior");
+        currentSearchBehaviorPreference.setSummary(getSearchBehaviorSummary());
+        currentSearchBehaviorPreference.setOnPreferenceClickListener((preference) -> {
+            final int[] items = Preferences.SEARCH_BEHAVIOR_SETTINGS;
+            final String[] textItems = getResources().getStringArray(R.array.pref_search_behavior_types);
+            final boolean[] checkedItems = new boolean[items.length];
+            for (int i = 0; i < items.length; i++) {
+                checkedItems[i] = _prefs.isSearchBehaviorTypeEnabled(items[i]);
+            }
+
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext())
+                    .setTitle(R.string.pref_search_behavior_prompt)
+                    .setMultiChoiceItems(textItems, checkedItems, (dialog, index, isChecked) -> {
+                        checkedItems[index] = isChecked;
+
+                        boolean containsAtLeastOneCheckedItem = false;
+                        for(boolean b: checkedItems) {
+                            if (b) {
+                                containsAtLeastOneCheckedItem = true;
+                                break;
+                            }
+                        }
+
+                        AlertDialog alertDialog = (AlertDialog) dialog;
+                        Button positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+
+                        positiveButton.setEnabled(containsAtLeastOneCheckedItem);
+                    })
+                    .setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                        int searchBehavior = 0;
+                        for (int i = 0; i < checkedItems.length; i++) {
+                            if (checkedItems[i]) {
+                                searchBehavior |= items[i];
+                            }
+                        }
+
+                        _prefs.setSearchBehaviorMask(searchBehavior);
+                        currentSearchBehaviorPreference.setSummary(getSearchBehaviorSummary());
+                    })
+                    .setNegativeButton(android.R.string.cancel, null);
+
+            Dialogs.showSecureDialog(builder.create());
+            return true;
+        });
+
         int currentCopyBehavior = _prefs.getCopyBehavior().ordinal();
         Preference copyBehaviorPreference = requirePreference("pref_copy_behavior");
         copyBehaviorPreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.copy_behavior_titles)[currentCopyBehavior]));
         copyBehaviorPreference.setOnPreferenceClickListener(preference -> {
             int currentCopyBehavior1 = _prefs.getCopyBehavior().ordinal();
 
-            Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext())
                     .setTitle(getString(R.string.choose_copy_behavior))
                     .setSingleChoiceItems(R.array.copy_behavior_titles, currentCopyBehavior1, (dialog, which) -> {
                         int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
                         _prefs.setCopyBehavior(CopyBehavior.fromInteger(i));
                         copyBehaviorPreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.copy_behavior_titles)[i]));
-                        getResult().putExtra("needsRefresh", true);
                         dialog.dismiss();
                     })
                     .setNegativeButton(android.R.string.cancel, null)
@@ -38,18 +83,31 @@ public class BehaviorPreferencesFragment extends PreferencesFragment {
             return true;
         });
 
+        Preference entryPausePreference = requirePreference("pref_pause_entry");
+        entryPausePreference.setEnabled(_prefs.isTapToRevealEnabled() || _prefs.isEntryHighlightEnabled());
+
         Preference entryHighlightPreference = requirePreference("pref_highlight_entry");
         entryHighlightPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            getResult().putExtra("needsRefresh", true);
-            _entryPausePreference.setEnabled(_prefs.isTapToRevealEnabled() || (boolean) newValue);
+            entryPausePreference.setEnabled(_prefs.isTapToRevealEnabled() || (boolean) newValue);
             return true;
         });
+    }
 
-        _entryPausePreference = requirePreference("pref_pause_entry");
-        _entryPausePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            getResult().putExtra("needsRefresh", true);
-            return true;
-        });
-        _entryPausePreference.setEnabled(_prefs.isTapToRevealEnabled() || _prefs.isEntryHighlightEnabled());
+    private String getSearchBehaviorSummary() {
+        final int[] settings = Preferences.SEARCH_BEHAVIOR_SETTINGS;
+        final String[] descriptions = getResources().getStringArray(R.array.pref_search_behavior_types);
+
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < settings.length; i++) {
+            if (_prefs.isSearchBehaviorTypeEnabled(settings[i])) {
+                if (builder.length() != 0) {
+                    builder.append(", ");
+                }
+
+                builder.append(descriptions[i].toLowerCase());
+            }
+        }
+
+        return getString(R.string.pref_search_behavior_summary, builder.toString());
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/IconPacksManagerFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/IconPacksManagerFragment.java
index acff93c5..a95713a1 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/IconPacksManagerFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/IconPacksManagerFragment.java
@@ -6,13 +6,18 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
+import android.view.ViewGroup.MarginLayoutParams;
 import android.view.animation.Animation;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -28,6 +33,7 @@ import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.tasks.ImportIconPackTask;
 import com.beemdevelopment.aegis.ui.views.IconPackAdapter;
 import com.beemdevelopment.aegis.vault.VaultManager;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import javax.inject.Inject;
@@ -36,20 +42,25 @@ import dagger.hilt.android.AndroidEntryPoint;
 
 @AndroidEntryPoint
 public class IconPacksManagerFragment extends Fragment implements IconPackAdapter.Listener {
-    private static final int CODE_IMPORT = 0;
-
     @Inject
     IconPackManager _iconPackManager;
 
     @Inject
     VaultManager _vaultManager;
 
-    private View _iconPacksView;
     private RecyclerView _iconPacksRecyclerView;
     private IconPackAdapter _adapter;
     private LinearLayout _noIconPacksView;
     private FabScrollHelper _fabScrollHelper;
 
+    private final ActivityResultLauncher<Intent> importResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                Intent data = activityResult.getData();
+                if (activityResult.getResultCode() == Activity.RESULT_OK && data != null && data.getData() != null) {
+                    importIconPack(data.getData());
+                }
+            });
+
     public IconPacksManagerFragment() {
         super(R.layout.fragment_icon_packs);
     }
@@ -60,9 +71,21 @@ public class IconPacksManagerFragment extends Fragment implements IconPackAdapte
         fab.setOnClickListener(v -> startImportIconPack());
         _fabScrollHelper = new FabScrollHelper(fab);
 
+        final MarginLayoutParams fabInitialMargin = (MarginLayoutParams) fab.getLayoutParams();
+        ViewCompat.setOnApplyWindowInsetsListener(fab, (targetView, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+
+            MarginLayoutParams marginParams = (MarginLayoutParams) targetView.getLayoutParams();
+            marginParams.leftMargin = fabInitialMargin.leftMargin + insets.left;
+            marginParams.bottomMargin = fabInitialMargin.bottomMargin + insets.bottom;
+            marginParams.rightMargin = fabInitialMargin.rightMargin + insets.right;
+            targetView.setLayoutParams(marginParams);
+
+            return WindowInsetsCompat.CONSUMED;
+        });
+
         _noIconPacksView = view.findViewById(R.id.vEmptyList);
         ((TextView) view.findViewById(R.id.txt_no_icon_packs)).setMovementMethod(LinkMovementMethod.getInstance());
-        _iconPacksView = view.findViewById(R.id.view_icon_packs);
         _adapter = new IconPackAdapter(this);
         _iconPacksRecyclerView = view.findViewById(R.id.list_icon_packs);
         LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext());
@@ -96,40 +119,25 @@ public class IconPacksManagerFragment extends Fragment implements IconPackAdapte
 
     @Override
     public void onRemoveIconPack(IconPack pack) {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                 .setTitle(R.string.remove_icon_pack)
                 .setMessage(R.string.remove_icon_pack_description)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
-                    try {
-                        _iconPackManager.removeIconPack(pack);
-                    } catch (IconPackException e) {
-                        e.printStackTrace();
-                        Dialogs.showErrorDialog(requireContext(), R.string.icon_pack_delete_error, e);
-                        return;
-                    }
-                    _adapter.removeIconPack(pack);
-                    updateEmptyState();
+                    removeIconPack(pack);
                 })
                 .setNegativeButton(android.R.string.no, null)
                 .create());
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == CODE_IMPORT && resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
-            importIconPack(data.getData());
-        }
-    }
-
     private void importIconPack(Uri uri) {
         ImportIconPackTask task = new ImportIconPackTask(requireContext(), result -> {
             Exception e = result.getException();
             if (e instanceof IconPackExistsException) {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Aegis_AlertDialog_Error)
                         .setTitle(R.string.error_occurred)
                         .setMessage(R.string.icon_pack_import_exists_error)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setPositiveButton(R.string.yes, (dialog, which) -> {
                             if (removeIconPack(((IconPackExistsException) e).getIconPack())) {
                                 importIconPack(uri);
@@ -164,15 +172,15 @@ public class IconPacksManagerFragment extends Fragment implements IconPackAdapte
     private void startImportIconPack() {
         Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
         intent.setType("*/*");
-        _vaultManager.startActivityForResult(this, intent, CODE_IMPORT);
+        _vaultManager.fireIntentLauncher(this, intent, importResultLauncher);
     }
 
     private void updateEmptyState() {
         if (_adapter.getItemCount() > 0) {
-            _iconPacksView.setVisibility(View.VISIBLE);
+            _iconPacksRecyclerView.setVisibility(View.VISIBLE);
             _noIconPacksView.setVisibility(View.GONE);
         } else {
-            _iconPacksView.setVisibility(View.GONE);
+            _iconPacksRecyclerView.setVisibility(View.GONE);
             _noIconPacksView.setVisibility(View.VISIBLE);
         }
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/ImportExportPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/ImportExportPreferencesFragment.java
index 7e15f04f..b995b235 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/ImportExportPreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/ImportExportPreferencesFragment.java
@@ -12,6 +12,8 @@ import android.widget.CheckBox;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.ArrayRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -20,6 +22,7 @@ import androidx.core.content.FileProvider;
 import androidx.preference.Preference;
 
 import com.beemdevelopment.aegis.BuildConfig;
+import com.beemdevelopment.aegis.GroupPlaceholderType;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.helpers.DropdownHelper;
 import com.beemdevelopment.aegis.importers.DatabaseImporter;
@@ -31,16 +34,19 @@ import com.beemdevelopment.aegis.ui.ImportEntriesActivity;
 import com.beemdevelopment.aegis.ui.TransferEntriesActivity;
 import com.beemdevelopment.aegis.ui.components.DropdownCheckBoxes;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.beemdevelopment.aegis.ui.models.VaultGroupModel;
 import com.beemdevelopment.aegis.ui.tasks.ExportTask;
 import com.beemdevelopment.aegis.ui.tasks.ImportFileTask;
 import com.beemdevelopment.aegis.vault.Vault;
 import com.beemdevelopment.aegis.vault.VaultBackupManager;
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.beemdevelopment.aegis.vault.VaultFileCredentials;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 import com.beemdevelopment.aegis.vault.VaultRepository;
 import com.beemdevelopment.aegis.vault.VaultRepositoryException;
 import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
 import com.beemdevelopment.aegis.vault.slots.SlotException;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputLayout;
 
 import java.io.File;
@@ -48,12 +54,14 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
-import java.util.TreeSet;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 import javax.crypto.Cipher;
 
@@ -62,9 +70,32 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
     private DatabaseImporter.Definition _importerDef;
     private Vault.EntryFilter _exportFilter;
 
+    private final ActivityResultLauncher<Intent> importSelectResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                Intent data = activityResult.getData();
+                if (data != null) {
+                    onImportSelectResult(activityResult.getResultCode(), data);
+                }
+            });
+
+    private final ActivityResultLauncher<Intent> exportResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult ->
+                    onExportResult(CODE_EXPORT, activityResult.getResultCode(), activityResult.getData()));
+
+    private final ActivityResultLauncher<Intent> exportPlainResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult ->
+                    onExportResult(CODE_EXPORT_PLAIN, activityResult.getResultCode(), activityResult.getData()));
+
+    private final ActivityResultLauncher<Intent> exportHtmlResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult ->
+                    onExportResult(CODE_EXPORT_HTML, activityResult.getResultCode(), activityResult.getData()));
+
+    private final ActivityResultLauncher<Intent> exportGoogleUriResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult ->
+                    onExportResult(CODE_EXPORT_GOOGLE_URI, activityResult.getResultCode(), activityResult.getData()));
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
         addPreferencesFromResource(R.xml.preferences_import_export);
 
         if (savedInstanceState != null) {
@@ -78,7 +109,7 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
 
                 Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
                 intent.setType("*/*");
-                _vaultManager.startActivityForResult(this, intent, CODE_IMPORT_SELECT);
+                _vaultManager.fireIntentLauncher(this, intent, importSelectResultLauncher);
             });
             return true;
         });
@@ -110,28 +141,6 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
         outState.putSerializable("importerDef", _importerDef);
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == CODE_IMPORT) {
-            getResult().putExtra("needsRecreate", true);
-        } else if (data != null) {
-            switch (requestCode) {
-                case CODE_IMPORT_SELECT:
-                    onImportSelectResult(resultCode, data);
-                    break;
-                case CODE_EXPORT:
-                    // intentional fallthrough
-                case CODE_EXPORT_PLAIN:
-                    // intentional fallthrough
-                case CODE_EXPORT_HTML:
-                    // intentional fallthrough
-                case CODE_EXPORT_GOOGLE_URI:
-                    onExportResult(requestCode, resultCode, data);
-                    break;
-            }
-        }
-    }
-
     private void onImportSelectResult(int resultCode, Intent data) {
         Uri uri = data.getData();
         if (resultCode != Activity.RESULT_OK || uri == null) {
@@ -153,7 +162,7 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
         Intent intent = new Intent(requireContext(), ImportEntriesActivity.class);
         intent.putExtra("importerDef", importerDef);
         intent.putExtra("file", file);
-        startActivityForResult(intent, CODE_IMPORT);
+        startActivity(intent);
     }
 
     private void startExport() {
@@ -164,7 +173,7 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
         CheckBox checkBoxAccept = view.findViewById(R.id.checkbox_accept);
         CheckBox checkBoxExportAllGroups = view.findViewById(R.id.export_selected_groups);
         TextInputLayout groupsSelectionLayout = view.findViewById(R.id.group_selection_layout);
-        DropdownCheckBoxes groupsSelection = view.findViewById(R.id.group_selection_dropdown);
+        DropdownCheckBoxes<VaultGroupModel> groupsSelection = view.findViewById(R.id.group_selection_dropdown);
         TextView passwordInfoText = view.findViewById(R.id.text_separate_password);
         passwordInfoText.setVisibility(checkBoxEncrypt.isChecked() && isBackupPasswordSet ? View.VISIBLE : View.GONE);
         AutoCompleteTextView dropdown = view.findViewById(R.id.dropdown_export_format);
@@ -177,19 +186,19 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
             passwordInfoText.setVisibility(checkBoxEncrypt.isChecked() && isBackupPasswordSet ? View.VISIBLE : View.GONE);
         });
 
-        TreeSet<String> groups = _vaultManager.getVault().getGroups();
+        Collection<VaultGroup> groups = _vaultManager.getVault().getUsedGroups();
         if (groups.size() > 0) {
             checkBoxExportAllGroups.setVisibility(View.VISIBLE);
 
-            ArrayList<String> groupsArray = new ArrayList<>();
-            groupsArray.add(getString(R.string.no_group));
-            groupsArray.addAll(groups);
+            ArrayList<VaultGroupModel> groupsArray = new ArrayList<>();
+            groupsArray.add(new VaultGroupModel(requireContext(), GroupPlaceholderType.NO_GROUP));
+            groupsArray.addAll(groups.stream().map(VaultGroupModel::new).collect(Collectors.toList()));
 
             groupsSelection.setCheckedItemsCountTextRes(R.plurals.export_groups_selected_count);
             groupsSelection.addItems(groupsArray, false);
         }
 
-        AlertDialog dialog = new AlertDialog.Builder(requireContext())
+        AlertDialog dialog = new MaterialAlertDialogBuilder(requireContext())
                 .setTitle(R.string.pref_export_summary)
                 .setView(view)
                 .setNeutralButton(R.string.share, null)
@@ -256,14 +265,16 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
                 }
 
                 int pos = getStringResourceIndex(R.array.export_formats, dropdown.getText().toString());
-                int requestCode = getExportRequestCode(pos, checkBoxEncrypt.isChecked());
-                VaultBackupManager.FileInfo fileInfo = getExportFileInfo(pos, checkBoxEncrypt.isChecked());
+                boolean encrypt = checkBoxEncrypt.isChecked();
+                VaultBackupManager.FileInfo fileInfo = getExportFileInfo(pos, encrypt);
                 Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
                         .addCategory(Intent.CATEGORY_OPENABLE)
-                        .setType(getExportMimeType(requestCode))
+                        .setType(getExportMimeType(getExportRequestCode(pos, encrypt)))
                         .putExtra(Intent.EXTRA_TITLE, fileInfo.toString());
 
-                _vaultManager.startActivityForResult(this, intent, requestCode);
+                _auditLogRepository.addVaultExportedEvent();
+                ActivityResultLauncher<Intent> resultLauncher = getExportRequestLauncher(pos, encrypt);
+                _vaultManager.fireIntentLauncher(this, intent, resultLauncher);
             });
 
             btnNeutral.setOnClickListener(v -> {
@@ -282,16 +293,18 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
                 }
 
                 File file;
+                boolean encrypt = checkBoxEncrypt.isChecked();
                 try {
-                    VaultBackupManager.FileInfo fileInfo = getExportFileInfo(pos, checkBoxEncrypt.isChecked());
-                    file = File.createTempFile(fileInfo.getFilename() + "-", "." + fileInfo.getExtension(), getExportCacheDir());
+                    VaultBackupManager.FileInfo fileInfo = getExportFileInfo(pos, encrypt);
+                    file = new File(getExportCacheDir(), fileInfo.toString());
                 } catch (IOException e) {
                     e.printStackTrace();
                     Dialogs.showErrorDialog(requireContext(), R.string.exporting_vault_error, e);
                     return;
                 }
 
-                int requestCode = getExportRequestCode(pos, checkBoxEncrypt.isChecked());
+                int requestCode = getExportRequestCode(pos, encrypt);
+                ActivityResultLauncher<Intent> resultLauncher = getExportRequestLauncher(pos, encrypt);
                 startExportVault(requestCode, cb -> {
                     try (OutputStream stream = new FileOutputStream(file)) {
                         cb.exportVault(stream);
@@ -303,14 +316,14 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
 
                     // if the user creates an export, hide the backup reminder
                     _prefs.setLatestExportTimeNow();
-
+                    _auditLogRepository.addVaultExportedEvent();
                     Uri uri = FileProvider.getUriForFile(requireContext(), BuildConfig.FILE_PROVIDER_AUTHORITY, file);
                     Intent intent = new Intent(Intent.ACTION_SEND)
                             .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                             .setType(getExportMimeType(requestCode))
                             .putExtra(Intent.EXTRA_STREAM, uri);
                     Intent chooser = Intent.createChooser(intent, getString(R.string.pref_export_summary));
-                    _vaultManager.startActivity(this, chooser);
+                    _vaultManager.fireIntentLauncher(this, chooser, resultLauncher);
                 }, _exportFilter);
                 _exportFilter = null;
             });
@@ -319,17 +332,19 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
         Dialogs.showSecureDialog(dialog);
     }
 
-    private Vault.EntryFilter getVaultEntryFilter(DropdownCheckBoxes dropdownCheckBoxes) {
-        Set<String> groups = new HashSet<>();
-        for (String group: dropdownCheckBoxes.getCheckedItems()) {
-            if (group.equals(getString(R.string.no_group))) {
-                groups.add(null);
-            } else  {
-                groups.add(group);
-            }
+    private Vault.EntryFilter getVaultEntryFilter(DropdownCheckBoxes<VaultGroupModel> dropdownCheckBoxes) {
+        Set<UUID> groups = new HashSet<>();
+        for (VaultGroupModel group : dropdownCheckBoxes.getCheckedItems()) {
+            groups.add(group.getUUID());
         }
 
-        return groups.isEmpty() ? null : entry -> groups.contains(entry.getGroup());
+        return groups.isEmpty() ? null : entry -> {
+            if (entry.getGroups().isEmpty()) {
+                return groups.contains(null);
+            } else {
+                return entry.getGroups().stream().anyMatch(groups::contains);
+            }
+        };
     }
 
     private void startGoogleAuthenticatorStyleExport() {
@@ -385,6 +400,16 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
         return CODE_EXPORT_GOOGLE_URI;
     }
 
+    private ActivityResultLauncher<Intent> getExportRequestLauncher(int spinnerPos, boolean encrypt) {
+        if (spinnerPos == 0) {
+            return encrypt ? exportResultLauncher : exportPlainResultLauncher;
+        } else if (spinnerPos == 1) {
+            return exportHtmlResultLauncher;
+        }
+
+        return exportGoogleUriResultLauncher;
+    }
+
     private static VaultBackupManager.FileInfo getExportFileInfo(int spinnerPos, boolean encrypt) {
         if (spinnerPos == 0) {
             String filename = encrypt ? VaultRepository.FILENAME_PREFIX_EXPORT : VaultRepository.FILENAME_PREFIX_EXPORT_PLAIN;
@@ -477,7 +502,10 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
         }
     }
 
-    private void onExportResult(int requestCode, int resultCode, Intent data) {
+    private void onExportResult(int requestCode, int resultCode, @Nullable Intent data) {
+        if (data == null) {
+            return;
+        }
         Uri uri = data.getData();
         if (resultCode != Activity.RESULT_OK || uri == null) {
             return;
@@ -490,11 +518,10 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
                 file = File.createTempFile(VaultRepository.FILENAME_PREFIX_EXPORT + "-", ".json", getExportCacheDir());
                 outStream = new FileOutputStream(file);
                 cb.exportVault(outStream);
-
-                new ExportTask(requireContext(), new ExportResultListener()).execute(getLifecycle(), new ExportTask.Params(file, uri));
             } catch (VaultRepositoryException | IOException e) {
                 e.printStackTrace();
                 Dialogs.showErrorDialog(requireContext(), R.string.exporting_vault_error, e);
+                return;
             } finally {
                 try {
                     if (outStream != null) {
@@ -504,6 +531,8 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
                     e.printStackTrace();
                 }
             }
+
+            new ExportTask(requireContext(), new ExportResultListener()).execute(getLifecycle(), new ExportTask.Params(file, uri));
         }, _exportFilter);
         _exportFilter = null;
     }
@@ -527,7 +556,7 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
             } else {
                 // if the user creates an export, hide the backup reminder
                 _prefs.setLatestExportTimeNow();
-
+                _auditLogRepository.addVaultExportedEvent();
                 Toast.makeText(requireContext(), getString(R.string.exported_vault), Toast.LENGTH_SHORT).show();
             }
         }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/MainPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/MainPreferencesFragment.java
index 3172fd85..980c7f02 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/MainPreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/MainPreferencesFragment.java
@@ -7,7 +7,6 @@ import com.beemdevelopment.aegis.R;
 public class MainPreferencesFragment extends PreferencesFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
         addPreferencesFromResource(R.xml.preferences);
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/PreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/PreferencesFragment.java
index 4b693e2a..63069160 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/PreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/PreferencesFragment.java
@@ -1,18 +1,24 @@
 package com.beemdevelopment.aegis.ui.fragments.preferences;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
 import android.view.animation.Animation;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.database.AuditLogRepository;
 import com.beemdevelopment.aegis.helpers.AnimationsHelper;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.vault.VaultManager;
@@ -25,16 +31,10 @@ import dagger.hilt.android.AndroidEntryPoint;
 @AndroidEntryPoint
 public abstract class PreferencesFragment extends PreferenceFragmentCompat {
     // activity request codes
-    public static final int CODE_IMPORT_SELECT = 0;
-    public static final int CODE_GROUPS = 3;
-    public static final int CODE_IMPORT = 4;
     public static final int CODE_EXPORT = 5;
     public static final int CODE_EXPORT_PLAIN = 6;
     public static final int CODE_EXPORT_GOOGLE_URI = 7;
     public static final int CODE_EXPORT_HTML = 8;
-    public static final int CODE_BACKUPS = 9;
-
-    private Intent _result;
 
     @Inject
     Preferences _prefs;
@@ -42,11 +42,8 @@ public abstract class PreferencesFragment extends PreferenceFragmentCompat {
     @Inject
     VaultManager _vaultManager;
 
-    @Override
-    @CallSuper
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        setResult(new Intent());
-    }
+    @Inject
+    protected AuditLogRepository _auditLogRepository;
 
     @Override
     @CallSuper
@@ -61,10 +58,6 @@ public abstract class PreferencesFragment extends PreferenceFragmentCompat {
         }
     }
 
-    public Intent getResult() {
-        return _result;
-    }
-
     @Override
     @Nullable
     public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
@@ -75,9 +68,21 @@ public abstract class PreferencesFragment extends PreferenceFragmentCompat {
         return super.onCreateAnimation(transit, enter, nextAnim);
     }
 
-    public void setResult(Intent result) {
-        _result = result;
-        requireActivity().setResult(Activity.RESULT_OK, _result);
+    @NonNull
+    @Override
+    public RecyclerView onCreateRecyclerView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent, @Nullable Bundle savedInstanceState) {
+        RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, savedInstanceState);
+        ViewCompat.setOnApplyWindowInsetsListener(recyclerView, (targetView, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+            targetView.setPadding(
+                    0,
+                    0,
+                    0,
+                    insets.bottom
+            );
+            return WindowInsetsCompat.CONSUMED;
+        });
+        return recyclerView;
     }
 
     protected boolean saveAndBackupVault() {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/SecurityPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/SecurityPreferencesFragment.java
index f1786017..e1123ca2 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/SecurityPreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/SecurityPreferencesFragment.java
@@ -30,6 +30,7 @@ import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
 import com.beemdevelopment.aegis.vault.slots.Slot;
 import com.beemdevelopment.aegis.vault.slots.SlotException;
 import com.beemdevelopment.aegis.vault.slots.SlotList;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.Arrays;
 import java.util.List;
@@ -54,18 +55,10 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.onCreatePreferences(savedInstanceState, rootKey);
         addPreferencesFromResource(R.xml.preferences_security);
 
-        Preference tapToRevealPreference = requirePreference("pref_tap_to_reveal");
-        tapToRevealPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            getResult().putExtra("needsRefresh", true);
-            return true;
-        });
-
         Preference screenPreference = requirePreference("pref_secure_screen");
         screenPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            getResult().putExtra("needsRecreate", true);
             Window window = requireActivity().getWindow();
             if ((boolean) newValue) {
                 window.addFlags(WindowManager.LayoutParams.FLAG_SECURE);
@@ -81,7 +74,6 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
             Dialogs.showTapToRevealTimeoutPickerDialog(requireContext(), _prefs.getTapToRevealTime(), number -> {
                 _prefs.setTapToRevealTime(number);
                 tapToRevealTimePreference.setSummary(number + " seconds");
-                getResult().putExtra("needsRefresh", true);
             });
             return false;
         });
@@ -91,9 +83,10 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
             if (!_vaultManager.getVault().isEncryptionEnabled()) {
                 Dialogs.showSetPasswordDialog(requireActivity(), new EnableEncryptionListener());
             } else {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Aegis_AlertDialog_Warning)
                         .setTitle(R.string.disable_encryption)
                         .setMessage(getText(R.string.disable_encryption_description))
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setPositiveButton(android.R.string.yes, (dialog, which) -> {
                             try {
                                 _vaultManager.disableEncryption();
@@ -169,9 +162,10 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
                     task.execute(getLifecycle(), params);
                 } else {
                     _pinKeyboardPreference.setChecked(false);
-                    Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+                    Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Aegis_AlertDialog_Error)
                             .setTitle(R.string.pin_keyboard_error)
                             .setMessage(R.string.pin_keyboard_error_description)
+                            .setIconAttribute(android.R.attr.alertDialogIcon)
                             .setCancelable(false)
                             .setPositiveButton(android.R.string.ok, null)
                             .create());
@@ -192,7 +186,7 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
                 checkedItems[i] = _prefs.isAutoLockTypeEnabled(items[i]);
             }
 
-            AlertDialog.Builder builder = new AlertDialog.Builder(requireContext())
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.pref_auto_lock_prompt)
                     .setMultiChoiceItems(textItems, checkedItems, (dialog, index, isChecked) -> checkedItems[index] = isChecked)
                     .setPositiveButton(android.R.string.ok, (dialog, which) -> {
@@ -221,7 +215,7 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
                     .map(f -> getString(f.getStringRes()))
                     .toArray(String[]::new);
 
-            AlertDialog.Builder builder = new AlertDialog.Builder(requireContext())
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.pref_password_reminder_title)
                     .setSingleChoiceItems(textItems, currFreq.ordinal(), (dialog, which) -> {
                         int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
@@ -459,9 +453,10 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
             if (result != null) {
                 _pinKeyboardPreference.setChecked(true);
             } else {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Aegis_AlertDialog_Error)
                         .setTitle(R.string.pin_keyboard_error)
                         .setMessage(R.string.invalid_password)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setCancelable(false)
                         .setPositiveButton(android.R.string.ok, null)
                         .create());
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/AegisGlideModule.java b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/AegisGlideModule.java
index b6de07b5..509a4f78 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/AegisGlideModule.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/AegisGlideModule.java
@@ -6,6 +6,7 @@ import android.graphics.drawable.PictureDrawable;
 import androidx.annotation.NonNull;
 
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.Registry;
 import com.bumptech.glide.annotation.GlideModule;
@@ -19,7 +20,7 @@ import java.nio.ByteBuffer;
 public class AegisGlideModule extends AppGlideModule {
     @Override
     public void registerComponents(@NonNull Context context, @NonNull Glide glide, @NonNull Registry registry) {
-        registry.prepend(VaultEntry.class, ByteBuffer.class, new IconLoader.Factory());
+        registry.prepend(VaultEntryIcon.class, ByteBuffer.class, new VaultEntryIconLoader.Factory());
         registry.register(SVG.class, PictureDrawable.class, new SvgDrawableTranscoder())
                 .append(InputStream.class, SVG.class, new SvgDecoder())
                 .append(ByteBuffer.class, SVG.class, new SvgBytesDecoder());
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/GlideHelper.java b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/GlideHelper.java
new file mode 100644
index 00000000..9170c146
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/GlideHelper.java
@@ -0,0 +1,111 @@
+package com.beemdevelopment.aegis.ui.glide;
+
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.beemdevelopment.aegis.helpers.TextDrawableHelper;
+import com.beemdevelopment.aegis.icons.IconPack;
+import com.beemdevelopment.aegis.icons.IconType;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.RequestManager;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.DrawableImageViewTarget;
+import com.bumptech.glide.request.target.Target;
+
+import java.io.File;
+
+public class GlideHelper {
+    private GlideHelper() {
+
+    }
+
+    public static void loadIconFile(RequestManager rm, File file, IconType iconType, ImageView targetView) {
+        load(rm.load(file), iconType, targetView);
+    }
+
+    public static void loadIcon(RequestManager rm, IconPack.Icon icon, ImageView targetView) {
+        loadIconFile(rm, icon.getFile(), icon.getIconType(), targetView);
+    }
+
+    public static void loadEntryIcon(RequestManager rm, VaultEntry entry, ImageView targetView) {
+        if (entry.hasIcon()) {
+            setCommonOptions(rm.load(entry.getIcon()), entry.getIcon().getType()).into(targetView);
+        } else {
+            // Clear any pending loads for targetView, so that the TextDrawable
+            // we're about to display doesn't get overwritten when that pending load finishes
+            rm.clear(targetView);
+
+            setLayerType(targetView, IconType.INVALID);
+            TextDrawable drawable = TextDrawableHelper.generate(entry.getIssuer(), entry.getName(), targetView);
+            targetView.setImageDrawable(drawable);
+        }
+    }
+
+    private static void load(RequestBuilder<Drawable> rb, IconType iconType, ImageView targetView) {
+        setCommonOptions(rb, iconType).into(targetView);
+    }
+
+    public static RequestBuilder<Drawable> setCommonOptions(RequestBuilder<Drawable> rb, IconType iconType) {
+        if (iconType != null) {
+            rb = rb.set(VaultEntryIconLoader.ICON_TYPE, iconType)
+                    .listener(new ViewReadyListener<>(targetView -> {
+                        targetView.setImageTintList(null);
+                        setLayerType(targetView, iconType);
+                    }));
+        }
+
+        return rb.diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(false);
+    }
+
+    /**
+     * Sets the layer type of the given ImageView based on the given IconType. If the
+     * icon type is SVG and SDK <= 27, the layer type is set to software. Otherwise, it
+     * is set to hardware.
+     */
+    private static void setLayerType(ImageView view, IconType iconType) {
+        if (iconType == IconType.SVG && Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) {
+            view.setLayerType(ImageView.LAYER_TYPE_SOFTWARE, null);
+            return;
+        }
+
+        view.setLayerType(ImageView.LAYER_TYPE_HARDWARE, null);
+    }
+
+    private static class ViewReadyListener<T> implements RequestListener<T> {
+        private final Listener<T> _listener;
+
+        public ViewReadyListener(Listener<T> listener) {
+            _listener = listener;
+        }
+
+        @Override
+        public boolean onLoadFailed(@Nullable GlideException e, @Nullable Object model, @NonNull Target<T> target, boolean isFirstResource) {
+            return false;
+        }
+
+        @Override
+        public boolean onResourceReady(@NonNull T resource, @NonNull Object model, Target<T> target, @NonNull DataSource dataSource, boolean isFirstResource) {
+            if (target instanceof DrawableImageViewTarget) {
+                DrawableImageViewTarget viewTarget = (DrawableImageViewTarget) target;
+                if (_listener != null) {
+                    _listener.onConfigureImageView(viewTarget.getView());
+                }
+            }
+            return false;
+        }
+
+        public interface Listener<T> {
+            void onConfigureImageView(ImageView targetView);
+        }
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/SvgDecoder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/SvgDecoder.java
index 2eac92ab..99fc236b 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/SvgDecoder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/SvgDecoder.java
@@ -22,7 +22,7 @@ public class SvgDecoder implements ResourceDecoder<InputStream, SVG> {
 
     @Override
     public boolean handles(@NonNull InputStream source, @NonNull Options options) {
-        return options.get(IconLoader.ICON_TYPE) == IconType.SVG;
+        return options.get(VaultEntryIconLoader.ICON_TYPE) == IconType.SVG;
     }
 
     public Resource<SVG> decode(
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/UUIDKey.java b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/VaultEntryIconKey.java
similarity index 52%
rename from app/src/main/java/com/beemdevelopment/aegis/ui/glide/UUIDKey.java
rename to app/src/main/java/com/beemdevelopment/aegis/ui/glide/VaultEntryIconKey.java
index 1ff10d59..a816b0cc 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/UUIDKey.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/VaultEntryIconKey.java
@@ -2,30 +2,30 @@ package com.beemdevelopment.aegis.ui.glide;
 
 import androidx.annotation.NonNull;
 
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
 import com.bumptech.glide.load.Key;
 
 import java.security.MessageDigest;
-import java.util.UUID;
 
-public class UUIDKey implements Key {
-    private UUID _uuid;
+public class VaultEntryIconKey implements Key {
+    private final VaultEntryIcon _icon;
 
-    public UUIDKey(UUID uuid) {
-        _uuid = uuid;
+    public VaultEntryIconKey(VaultEntryIcon icon) {
+        _icon = icon;
     }
 
     @Override
     public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
-        messageDigest.update(_uuid.toString().getBytes(CHARSET));
+        messageDigest.update(_icon.getHash());
     }
 
     @Override
     public boolean equals(Object o) {
-        return _uuid.equals(o);
+        return _icon.equals(o);
     }
 
     @Override
     public int hashCode() {
-        return _uuid.hashCode();
+        return _icon.hashCode();
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/IconLoader.java b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/VaultEntryIconLoader.java
similarity index 70%
rename from app/src/main/java/com/beemdevelopment/aegis/ui/glide/IconLoader.java
rename to app/src/main/java/com/beemdevelopment/aegis/ui/glide/VaultEntryIconLoader.java
index 2eb08036..b8b13c58 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/glide/IconLoader.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/glide/VaultEntryIconLoader.java
@@ -3,7 +3,7 @@ package com.beemdevelopment.aegis.ui.glide;
 import androidx.annotation.NonNull;
 
 import com.beemdevelopment.aegis.icons.IconType;
-import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.Option;
@@ -15,29 +15,29 @@ import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 
 import java.nio.ByteBuffer;
 
-public class IconLoader implements ModelLoader<VaultEntry, ByteBuffer> {
+public class VaultEntryIconLoader implements ModelLoader<VaultEntryIcon, ByteBuffer> {
     public static final Option<IconType> ICON_TYPE = Option.memory("ICON_TYPE", IconType.INVALID);
 
     @Override
-    public LoadData<ByteBuffer> buildLoadData(@NonNull VaultEntry model, int width, int height, @NonNull Options options) {
-        return new LoadData<>(new UUIDKey(model.getUUID()), new Fetcher(model));
+    public LoadData<ByteBuffer> buildLoadData(@NonNull VaultEntryIcon icon, int width, int height, @NonNull Options options) {
+        return new LoadData<>(new VaultEntryIconKey(icon), new Fetcher(icon));
     }
 
     @Override
-    public boolean handles(@NonNull VaultEntry model) {
+    public boolean handles(@NonNull VaultEntryIcon icon) {
         return true;
     }
 
     public static class Fetcher implements DataFetcher<ByteBuffer> {
-        private final VaultEntry _model;
+        private final VaultEntryIcon _icon;
 
-        private Fetcher(VaultEntry model) {
-            _model = model;
+        private Fetcher(VaultEntryIcon icon) {
+            _icon = icon;
         }
 
         @Override
         public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super ByteBuffer> callback) {
-            byte[] bytes = _model.getIcon();
+            byte[] bytes = _icon.getBytes();
             ByteBuffer buf = ByteBuffer.wrap(bytes);
             callback.onDataReady(buf);
         }
@@ -65,11 +65,11 @@ public class IconLoader implements ModelLoader<VaultEntry, ByteBuffer> {
         }
     }
 
-    public static class Factory implements ModelLoaderFactory<VaultEntry, ByteBuffer> {
+    public static class Factory implements ModelLoaderFactory<VaultEntryIcon, ByteBuffer> {
         @NonNull
         @Override
-        public ModelLoader<VaultEntry, ByteBuffer> build(@NonNull MultiModelLoaderFactory unused) {
-            return new IconLoader();
+        public ModelLoader<VaultEntryIcon, ByteBuffer> build(@NonNull MultiModelLoaderFactory unused) {
+            return new VaultEntryIconLoader();
         }
 
         @Override
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/intro/IntroBaseActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/intro/IntroBaseActivity.java
index ce4c89c1..d187e87c 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/intro/IntroBaseActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/intro/IntroBaseActivity.java
@@ -2,7 +2,6 @@ package com.beemdevelopment.aegis.ui.intro;
 
 import android.os.Bundle;
 import android.view.View;
-import android.widget.ImageButton;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
@@ -16,6 +15,7 @@ import androidx.viewpager2.widget.ViewPager2;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.helpers.AnimationsHelper;
 import com.beemdevelopment.aegis.ui.AegisActivity;
+import com.google.android.material.button.MaterialButton;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -28,8 +28,8 @@ public abstract class IntroBaseActivity extends AegisActivity implements IntroAc
     private List<Class<? extends SlideFragment>> _slides;
     private WeakReference<SlideFragment> _currentSlide;
 
-    private ImageButton _btnPrevious;
-    private ImageButton _btnNext;
+    private MaterialButton _btnPrevious;
+    private MaterialButton _btnNext;
     private SlideIndicator _slideIndicator;
 
     @Override
@@ -158,7 +158,7 @@ public abstract class IntroBaseActivity extends AegisActivity implements IntroAc
                         ? View.VISIBLE
                         : View.INVISIBLE);
         if (pos == _slides.size() - 1) {
-            _btnNext.setImageResource(R.drawable.circular_button_done);
+            _btnNext.setIconResource(R.drawable.ic_outline_check_24);
         }
         _slideIndicator.setSlideCount(_slides.size());
         _slideIndicator.setCurrentSlide(pos);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/models/AssignIconEntry.java b/app/src/main/java/com/beemdevelopment/aegis/ui/models/AssignIconEntry.java
new file mode 100644
index 00000000..04e74a4b
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/models/AssignIconEntry.java
@@ -0,0 +1,40 @@
+package com.beemdevelopment.aegis.ui.models;
+
+import com.beemdevelopment.aegis.icons.IconPack;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import java.io.Serializable;
+
+public class AssignIconEntry implements Serializable {
+    private final VaultEntry _entry;
+
+    private IconPack.Icon _newIcon;
+
+    private transient AssignIconEntry.Listener _listener;
+
+    public void setOnResetListener(AssignIconEntry.Listener listener) {
+        _listener = listener;
+    }
+
+    public AssignIconEntry(VaultEntry entry) {
+        _entry = entry;
+    }
+
+    public VaultEntry getEntry() {
+        return _entry;
+    }
+
+    public IconPack.Icon getNewIcon() { return _newIcon; }
+
+    public void setNewIcon(IconPack.Icon icon) {
+        _newIcon = icon;
+
+        if (_listener != null) {
+            _listener.onNewIconChanged();
+        }
+    }
+
+    public interface Listener {
+        void onNewIconChanged();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/models/AuditLogEntryModel.java b/app/src/main/java/com/beemdevelopment/aegis/ui/models/AuditLogEntryModel.java
new file mode 100644
index 00000000..a020d3a0
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/models/AuditLogEntryModel.java
@@ -0,0 +1,24 @@
+package com.beemdevelopment.aegis.ui.models;
+
+import com.beemdevelopment.aegis.database.AuditLogEntry;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import javax.annotation.Nullable;
+
+public class AuditLogEntryModel {
+    private AuditLogEntry _auditLogEntry;
+    private VaultEntry _referencedVaultEntry;
+
+    public AuditLogEntryModel(AuditLogEntry auditLogEntry, @Nullable VaultEntry referencedVaultEntry) {
+        _auditLogEntry = auditLogEntry;
+        _referencedVaultEntry = referencedVaultEntry;
+    }
+
+    public AuditLogEntry getAuditLogEntry() {
+        return _auditLogEntry;
+    }
+
+    public VaultEntry getReferencedVaultEntry() {
+        return _referencedVaultEntry;
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/models/ErrorCardInfo.java b/app/src/main/java/com/beemdevelopment/aegis/ui/models/ErrorCardInfo.java
new file mode 100644
index 00000000..f4642335
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/models/ErrorCardInfo.java
@@ -0,0 +1,44 @@
+package com.beemdevelopment.aegis.ui.models;
+
+import android.view.View;
+
+import com.google.common.hash.HashCode;
+
+import java.util.Objects;
+
+public class ErrorCardInfo {
+    private final String _message;
+    private final View.OnClickListener _listener;
+
+    public ErrorCardInfo(String message, View.OnClickListener listener) {
+        _message = message;
+        _listener = listener;
+    }
+
+    public String getMessage() {
+        return _message;
+    }
+
+    public View.OnClickListener getListener() {
+        return _listener;
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCode.fromString(_message).asInt();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        }
+        if (!(o instanceof ErrorCardInfo)) {
+            return false;
+        }
+
+        // This equality check purposefully ignores the onclick listener
+        ErrorCardInfo info = (ErrorCardInfo) o;
+        return Objects.equals(getMessage(), info.getMessage());
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/models/VaultGroupModel.java b/app/src/main/java/com/beemdevelopment/aegis/ui/models/VaultGroupModel.java
new file mode 100644
index 00000000..43e234a0
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/models/VaultGroupModel.java
@@ -0,0 +1,57 @@
+package com.beemdevelopment.aegis.ui.models;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.beemdevelopment.aegis.GroupPlaceholderType;
+import com.beemdevelopment.aegis.vault.VaultGroup;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public class VaultGroupModel implements Serializable {
+    private final VaultGroup _group;
+    private final GroupPlaceholderType _placeholderType;
+    private final String _placeholderText;
+
+    public VaultGroupModel(VaultGroup group) {
+        _group = group;
+        _placeholderText = null;
+        _placeholderType = null;
+    }
+
+    public VaultGroupModel(Context context, GroupPlaceholderType placeholderType) {
+        _group = null;
+        _placeholderType = placeholderType;
+        _placeholderText = context.getString(placeholderType.getStringRes());
+    }
+
+    public VaultGroup getGroup() {
+        return _group;
+    }
+
+    public String getName() {
+        return _group != null ? _group.getName() : _placeholderText;
+    }
+
+    public GroupPlaceholderType getPlaceholderType() {
+        return _placeholderType;
+    }
+
+    public boolean isPlaceholder() {
+        return _placeholderType != null;
+    }
+
+    @Nullable
+    public UUID getUUID() {
+        return _group == null ? null : _group.getUUID();
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getName();
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/preferences/SwitchPreference.java b/app/src/main/java/com/beemdevelopment/aegis/ui/preferences/SwitchPreference.java
index 044230e6..a2c590a6 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/preferences/SwitchPreference.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/preferences/SwitchPreference.java
@@ -1,17 +1,14 @@
 package com.beemdevelopment.aegis.ui.preferences;
 
 import android.content.Context;
-import android.os.Build;
 import android.util.AttributeSet;
 
-import androidx.annotation.RequiresApi;
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreferenceCompat;
 
 public class SwitchPreference extends SwitchPreferenceCompat {
     private Preference.OnPreferenceChangeListener _listener;
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public SwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/slides/SecurityPickerSlide.java b/app/src/main/java/com/beemdevelopment/aegis/ui/slides/SecurityPickerSlide.java
index 9af0a5dd..6c9afce4 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/slides/SecurityPickerSlide.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/slides/SecurityPickerSlide.java
@@ -74,18 +74,14 @@ public class SecurityPickerSlide extends SlideFragment {
         int buttonId = _buttonGroup.getCheckedRadioButtonId();
 
         int type;
-        switch (buttonId) {
-            case R.id.rb_none:
-                type = CRYPT_TYPE_NONE;
-                break;
-            case R.id.rb_password:
-                type = CRYPT_TYPE_PASS;
-                break;
-            case R.id.rb_biometrics:
-                type = CRYPT_TYPE_BIOMETRIC;
-                break;
-            default:
-                throw new RuntimeException(String.format("Unsupported security type: %d", buttonId));
+        if (buttonId == R.id.rb_none) {
+            type = CRYPT_TYPE_NONE;
+        } else if (buttonId == R.id.rb_password) {
+            type = CRYPT_TYPE_PASS;
+        } else if (buttonId == R.id.rb_biometrics) {
+            type = CRYPT_TYPE_BIOMETRIC;
+        } else {
+            throw new RuntimeException(String.format("Unsupported security type: %d", buttonId));
         }
 
         introState.putInt("cryptType", type);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/slides/SecuritySetupSlide.java b/app/src/main/java/com/beemdevelopment/aegis/ui/slides/SecuritySetupSlide.java
index 8611299c..23082fa4 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/slides/SecuritySetupSlide.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/slides/SecuritySetupSlide.java
@@ -1,10 +1,12 @@
 package com.beemdevelopment.aegis.ui.slides;
 
-import android.content.res.ColorStateList;
-import android.graphics.Color;
+import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_BIOMETRIC;
+import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_INVALID;
+import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_NONE;
+import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_PASS;
+
 import android.os.Bundle;
 import android.text.Editable;
-import android.text.TextWatcher;
 import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,6 +25,7 @@ import com.beemdevelopment.aegis.helpers.BiometricSlotInitializer;
 import com.beemdevelopment.aegis.helpers.BiometricsHelper;
 import com.beemdevelopment.aegis.helpers.EditTextHelper;
 import com.beemdevelopment.aegis.helpers.PasswordStrengthHelper;
+import com.beemdevelopment.aegis.helpers.SimpleTextWatcher;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.intro.SlideFragment;
 import com.beemdevelopment.aegis.ui.tasks.KeyDerivationTask;
@@ -32,17 +35,10 @@ import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
 import com.beemdevelopment.aegis.vault.slots.Slot;
 import com.beemdevelopment.aegis.vault.slots.SlotException;
 import com.google.android.material.textfield.TextInputLayout;
-import com.nulabinc.zxcvbn.Strength;
-import com.nulabinc.zxcvbn.Zxcvbn;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 
-import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_BIOMETRIC;
-import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_INVALID;
-import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_NONE;
-import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_PASS;
-
 public class SecuritySetupSlide extends SlideFragment {
     private EditText _textPassword;
     private EditText _textPasswordConfirm;
@@ -76,27 +72,15 @@ public class SecuritySetupSlide extends SlideFragment {
             }
         });
 
-        _textPassword.addTextChangedListener(new TextWatcher() {
-            private Zxcvbn _zxcvbn = new Zxcvbn();
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                Strength strength = _zxcvbn.measure(_textPassword.getText());
-                _barPasswordStrength.setProgress(strength.getScore());
-                _barPasswordStrength.setProgressTintList(ColorStateList.valueOf(Color.parseColor(PasswordStrengthHelper.getColor(strength.getScore()))));
-                _textPasswordStrength.setText((_textPassword.getText().length() != 0) ? PasswordStrengthHelper.getString(strength.getScore(), requireContext()) : "");
-                _textPasswordWrapper.setError(strength.getFeedback().getWarning());
-                strength.wipe();
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
+        _textPassword.addTextChangedListener(new SimpleTextWatcher(new SimpleTextWatcher.Listener() {
+            private final PasswordStrengthHelper passStrength = new PasswordStrengthHelper(
+                    _textPassword, _barPasswordStrength, _textPasswordStrength, _textPasswordWrapper);
 
             @Override
             public void afterTextChanged(Editable s) {
+                passStrength.measure(requireContext());
             }
-        });
+        }));
 
         return view;
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/slides/WelcomeSlide.java b/app/src/main/java/com/beemdevelopment/aegis/ui/slides/WelcomeSlide.java
index 26832aab..0fc753bd 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/slides/WelcomeSlide.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/slides/WelcomeSlide.java
@@ -7,6 +7,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 
 import com.beemdevelopment.aegis.R;
@@ -24,29 +26,28 @@ import java.io.FileInputStream;
 import java.io.IOException;
 
 public class WelcomeSlide extends SlideFragment {
-    public static final int CODE_IMPORT_VAULT = 0;
-
     private boolean _imported;
     private VaultFileCredentials _creds;
 
+    private final ActivityResultLauncher<Intent> vaultImportResultLauncher =
+            registerForActivityResult(new StartActivityForResult(), activityResult -> {
+                Intent data = activityResult.getData();
+                if (data != null && data.getData() != null) {
+                    startImportVault(data.getData());
+                }
+            });
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_welcome_slide, container, false);
         view.findViewById(R.id.btnImport).setOnClickListener(v -> {
             Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("*/*");
-            startActivityForResult(intent, CODE_IMPORT_VAULT);
+            vaultImportResultLauncher.launch(intent);
         });
         return view;
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == CODE_IMPORT_VAULT && data != null && data.getData() != null) {
-            startImportVault(data.getData());
-        }
-    }
-
     @Override
     public void onSaveIntroState(@NonNull Bundle introState) {
         introState.putBoolean("imported", _imported);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/Argon2Task.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/Argon2Task.java
new file mode 100644
index 00000000..98b35b6a
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/Argon2Task.java
@@ -0,0 +1,71 @@
+package com.beemdevelopment.aegis.ui.tasks;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.R;
+
+import org.bouncycastle.crypto.generators.Argon2BytesGenerator;
+import org.bouncycastle.crypto.params.Argon2Parameters;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+public class Argon2Task extends ProgressDialogTask<Argon2Task.Params, SecretKey> {
+    private final Callback _cb;
+
+    public Argon2Task(Context context, Callback cb) {
+        super(context, context.getString(R.string.unlocking_vault));
+        _cb = cb;
+    }
+
+    @Override
+    protected SecretKey doInBackground(Params... args) {
+        setPriority();
+
+        Params params = args[0];
+        return deriveKey(params);
+    }
+
+    public static SecretKey deriveKey(Params params) {
+        Argon2BytesGenerator gen = new Argon2BytesGenerator();
+        gen.init(params.getArgon2Params());
+
+        byte[] key = new byte[params.getKeySize()];
+        gen.generateBytes(params.getPassword(), key);
+        return new SecretKeySpec(key, 0, key.length, "AES");
+    }
+
+    @Override
+    protected void onPostExecute(SecretKey key) {
+        super.onPostExecute(key);
+        _cb.onTaskFinished(key);
+    }
+
+    public interface Callback {
+        void onTaskFinished(SecretKey key);
+    }
+
+    public static class Params {
+        private final char[] _password;
+        private final Argon2Parameters _argon2Params;
+        private final int _keySize;
+
+        public Params(char[] password, Argon2Parameters argon2Params, int keySize) {
+            _password = password;
+            _argon2Params = argon2Params;
+            _keySize = keySize;
+        }
+
+        public char[] getPassword() {
+            return _password;
+        }
+
+        public Argon2Parameters getArgon2Params() {
+            return _argon2Params;
+        }
+
+        public int getKeySize() {
+            return _keySize;
+        }
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java
index 590e05d0..79943ac2 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java
@@ -34,6 +34,8 @@ public class ExportTask extends ProgressDialogTask<ExportTask.Params, Exception>
             return null;
         } catch (IOException e) {
             return e;
+        } finally {
+            boolean ignored = params.getFile().delete();
         }
     }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/IconOptimizationTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/IconOptimizationTask.java
new file mode 100644
index 00000000..d7be90d5
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/IconOptimizationTask.java
@@ -0,0 +1,63 @@
+package com.beemdevelopment.aegis.ui.tasks;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.helpers.BitmapHelper;
+import com.beemdevelopment.aegis.icons.IconType;
+import com.beemdevelopment.aegis.vault.VaultEntryIcon;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class IconOptimizationTask extends ProgressDialogTask<Map<UUID, VaultEntryIcon>, Map<UUID, VaultEntryIcon>> {
+    private final Callback _cb;
+
+    public IconOptimizationTask(Context context, Callback cb) {
+        super(context, context.getString(R.string.optimizing_icon));
+        _cb = cb;
+    }
+
+    @Override
+    protected Map<UUID, VaultEntryIcon> doInBackground(Map<UUID, VaultEntryIcon>... params) {
+        Map<UUID, VaultEntryIcon> res = new HashMap<>();
+        Context context = getDialog().getContext();
+
+        int i = 0;
+        Map<UUID, VaultEntryIcon> icons = params[0];
+        for (Map.Entry<UUID, VaultEntryIcon> entry : icons.entrySet()) {
+            if (icons.size() > 1) {
+                publishProgress(context.getString(R.string.optimizing_icon_multiple, i + 1, icons.size()));
+            }
+            i++;
+
+            VaultEntryIcon oldIcon = entry.getValue();
+            if (oldIcon == null || oldIcon.getType().equals(IconType.SVG)) {
+                continue;
+            }
+            if (BitmapHelper.isVaultEntryIconOptimized(oldIcon)) {
+                continue;
+            }
+
+            Bitmap bitmap = BitmapFactory.decodeByteArray(oldIcon.getBytes(), 0, oldIcon.getBytes().length);
+            VaultEntryIcon newIcon = BitmapHelper.toVaultEntryIcon(bitmap, oldIcon.getType());
+            bitmap.recycle();
+            res.put(entry.getKey(), newIcon);
+        }
+
+        return res;
+    }
+
+    @Override
+    protected void onPostExecute(Map<UUID, VaultEntryIcon> results) {
+        super.onPostExecute(results);
+        _cb.onTaskFinished(results);
+    }
+
+    public interface Callback {
+        void onTaskFinished(Map<UUID, VaultEntryIcon> results);
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/PBKDFTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/PBKDFTask.java
index da05e58c..4de6ebcb 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/PBKDFTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/PBKDFTask.java
@@ -3,6 +3,11 @@ package com.beemdevelopment.aegis.ui.tasks;
 import android.content.Context;
 
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.crypto.CryptoUtils;
+
+import org.bouncycastle.crypto.digests.SHA512Digest;
+import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
@@ -31,6 +36,15 @@ public class PBKDFTask extends ProgressDialogTask<PBKDFTask.Params, SecretKey> {
 
     public static SecretKey deriveKey(Params params) {
         try {
+            // Some older versions of Android (< 26) do not support PBKDF2withHmacSHA512, so use
+            // BouncyCastle's implementation instead.
+            if (params.getAlgorithm().equals("PBKDF2withHmacSHA512")) {
+                PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator(new SHA512Digest());
+                gen.init(CryptoUtils.toBytes(params.getPassword()), params.getSalt(), params.getIterations());
+                byte[] key = ((KeyParameter) gen.generateDerivedParameters(params.getKeySize())).getKey();
+                return new SecretKeySpec(key, "AES");
+            }
+
             SecretKeyFactory factory = SecretKeyFactory.getInstance(params.getAlgorithm());
             KeySpec spec = new PBEKeySpec(params.getPassword(), params.getSalt(), params.getIterations(), params.getKeySize());
             SecretKey key = factory.generateSecret(spec);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java
index d7d6cf86..ddd9001f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java
@@ -1,26 +1,38 @@
 package com.beemdevelopment.aegis.ui.tasks;
 
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Process;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 
+import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Params, String, Result> {
-    private ProgressDialog _dialog;
+    private final AlertDialog _dialog;
+    private final TextView _textProgress;
 
     public ProgressDialogTask(Context context, String message) {
-        _dialog = new ProgressDialog(context);
-        _dialog.setCancelable(false);
-        _dialog.setMessage(message);
+        View view = LayoutInflater.from(context).inflate(R.layout.dialog_progress, null);
+        _textProgress = view.findViewById(R.id.text_progress);
+        _textProgress.setText(message);
+
+        _dialog = new MaterialAlertDialogBuilder(context)
+                .setView(view)
+                .setCancelable(false)
+                .create();
+
         Dialogs.secureDialog(_dialog);
     }
 
@@ -41,7 +53,7 @@ public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Param
     @Override
     protected void onProgressUpdate(String... values) {
         if (values.length == 1) {
-            _dialog.setMessage(values[0]);
+            _textProgress.setText(values[0]);
         }
     }
 
@@ -49,7 +61,7 @@ public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Param
         Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND + Process.THREAD_PRIORITY_MORE_FAVORABLE);
     }
 
-    protected final ProgressDialog getDialog() {
+    protected final AlertDialog getDialog() {
         return _dialog;
     }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/AssignIconAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AssignIconAdapter.java
new file mode 100644
index 00000000..40e935a1
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AssignIconAdapter.java
@@ -0,0 +1,55 @@
+package com.beemdevelopment.aegis.ui.views;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.ui.models.AssignIconEntry;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class AssignIconAdapter extends RecyclerView.Adapter<AssignIconHolder> {
+    private AssignIconAdapter.Listener _listener;
+    private ArrayList<AssignIconEntry> _entries;
+
+    public AssignIconAdapter(AssignIconAdapter.Listener listener) {
+        _listener = listener;
+        _entries = new ArrayList<>();
+    }
+
+    public void addEntries(Collection<AssignIconEntry> entries) {
+        _entries.addAll(entries);
+    }
+
+    @Override
+    public AssignIconHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_assign_icon_entry, parent, false);
+        AssignIconHolder holder = new AssignIconHolder(view);
+        // NOTE: This assumes that the old and new icon views are the same size
+        _listener.onSetPreloadView(holder.getOldIconView());
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(AssignIconHolder holder, int position) {
+        holder.setData(_entries.get(position));
+        holder.itemView.setOnClickListener(view -> {
+            _listener.onAssignIconEntryClick(_entries.get(position));
+        });
+        _entries.get(position).setOnResetListener(holder);
+    }
+
+    @Override
+    public int getItemCount() {
+        return _entries.size();
+    }
+
+    public interface Listener {
+        void onAssignIconEntryClick(AssignIconEntry entry);
+        void onSetPreloadView(View view);
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/AssignIconHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AssignIconHolder.java
new file mode 100644
index 00000000..fc41f375
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AssignIconHolder.java
@@ -0,0 +1,65 @@
+package com.beemdevelopment.aegis.ui.views;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.ui.glide.GlideHelper;
+import com.beemdevelopment.aegis.ui.models.AssignIconEntry;
+import com.bumptech.glide.Glide;
+
+public class AssignIconHolder extends RecyclerView.ViewHolder implements AssignIconEntry.Listener {
+    private View _view;
+
+    private AssignIconEntry _entry;
+    private TextView _issuer;
+    private TextView _accountName;
+    private ImageView _oldIcon;
+    private ImageView _newIcon;
+    private ImageView _btnReset;
+
+    public AssignIconHolder(final View view) {
+        super(view);
+
+        _view = view.findViewById(R.id.rlCardEntry);
+
+        _issuer = view.findViewById(R.id.tvIssuer);
+        _accountName = view.findViewById(R.id.tvAccountName);
+        _oldIcon = view.findViewById(R.id.ivOldImage);
+        _newIcon = view.findViewById(R.id.ivNewImage);
+        _btnReset = view.findViewById(R.id.btnReset);
+        _btnReset.setOnClickListener(l -> _entry.setNewIcon(null));
+    }
+
+    public void setData(AssignIconEntry entry) {
+        _entry = entry;
+        _issuer.setText(entry.getEntry().getIssuer());
+        _accountName.setText(entry.getEntry().getName());
+
+        GlideHelper.loadEntryIcon(Glide.with(_view.getContext()), _entry.getEntry(), _oldIcon);
+        setNewIcon();
+    }
+
+    private void setNewIcon() {
+        if (_entry.getNewIcon() != null) {
+            GlideHelper.loadIcon(Glide.with(_view.getContext()), _entry.getNewIcon(), _newIcon);
+        } else {
+            Glide.with(_view.getContext()).clear(_newIcon);
+            _newIcon.setImageResource(R.drawable.ic_unselected);
+        }
+
+        _btnReset.setVisibility(_entry.getNewIcon() != null ? View.VISIBLE : View.INVISIBLE);
+    }
+
+    public View getOldIconView() {
+        return _oldIcon;
+    }
+
+    @Override
+    public void onNewIconChanged() {
+        setNewIcon();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogAdapter.java
new file mode 100644
index 00000000..a2950d37
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogAdapter.java
@@ -0,0 +1,62 @@
+package com.beemdevelopment.aegis.ui.views;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.database.AuditLogEntry;
+import com.beemdevelopment.aegis.ui.models.AuditLogEntryModel;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class AuditLogAdapter extends RecyclerView.Adapter<AuditLogHolder> {
+    private List<AuditLogEntryModel> _auditLogEntryModels;
+    private List<VaultEntry> _referencedEntries;
+
+    public AuditLogAdapter() {
+        _auditLogEntryModels = new ArrayList<>();
+        _referencedEntries = new ArrayList<>();
+    }
+
+    public void addAuditLogEntryModel(AuditLogEntryModel auditLogEntryModel) {
+        _auditLogEntryModels.add(auditLogEntryModel);
+
+        int position = getItemCount() - 1;
+        if (position == 0) {
+            notifyDataSetChanged();
+        } else {
+            notifyItemInserted(position);
+        }
+    }
+
+    public void addReferencedEntry(VaultEntry vaultEntry) {
+        _referencedEntries.add(vaultEntry);
+    }
+
+    @NonNull
+    @Override
+    public AuditLogHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_audit_log, parent, false);
+        return new AuditLogHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull AuditLogHolder holder, int position) {
+        AuditLogEntryModel auditLogEntryModel = _auditLogEntryModels.get(position);
+
+        VaultEntry referencedEntry = null;
+        holder.setData(auditLogEntryModel);
+    }
+
+    @Override
+    public int getItemCount() {
+        return _auditLogEntryModels.size();
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogHolder.java
new file mode 100644
index 00000000..e0ae166c
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogHolder.java
@@ -0,0 +1,145 @@
+package com.beemdevelopment.aegis.ui.views;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.EventType;
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.database.AuditLogEntry;
+import com.beemdevelopment.aegis.ui.models.AuditLogEntryModel;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.google.android.material.color.MaterialColors;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.time.temporal.ChronoUnit;
+
+public class AuditLogHolder extends RecyclerView.ViewHolder {
+
+    private final CardView _cardView;
+    private final ImageView _auditLogEntryIcon;
+    private final TextView _auditLogEntryTitle;
+    private final TextView _auditLogEntryDescription;
+    private final TextView _auditLogEntryReference;
+    private final TextView _auditLogEntryTimestamp;
+    private final int _errorBackgroundColor;
+    private final ColorStateList _initialBackgroundColor;
+    private final int _initialIconColor;
+
+    public AuditLogHolder(final View view) {
+        super(view);
+
+        _cardView = (CardView)view;
+        _auditLogEntryIcon = view.findViewById(R.id.iv_icon_view);
+        _auditLogEntryTitle = view.findViewById(R.id.text_audit_log_title);
+        _auditLogEntryDescription = view.findViewById(R.id.text_audit_log_description);
+        _auditLogEntryReference = view.findViewById(R.id.text_audit_log_reference);
+        _auditLogEntryTimestamp = view.findViewById(R.id.text_audit_log_timestamp);
+
+        _initialBackgroundColor = _cardView.getCardBackgroundColor();
+        _initialIconColor = MaterialColors.getColor(view, com.google.android.material.R.attr.colorTertiaryContainer);
+        _errorBackgroundColor = MaterialColors.getColor(view, com.google.android.material.R.attr.colorErrorContainer);
+    }
+
+    public void setData(AuditLogEntryModel auditLogEntryModel) {
+        AuditLogEntry auditLogEntry = auditLogEntryModel.getAuditLogEntry();
+        _auditLogEntryIcon.setImageResource(getIconResource(auditLogEntry.getEventType()));
+        _auditLogEntryTitle.setText(EventType.getEventTitleRes(auditLogEntry.getEventType()));
+        _auditLogEntryDescription.setText(getEventTypeDescriptionRes(auditLogEntry.getEventType()));
+
+        _auditLogEntryTimestamp.setText(formatTimestamp(_cardView.getContext(), auditLogEntry.getTimestamp()).toLowerCase());
+
+        if (auditLogEntryModel.getReferencedVaultEntry() != null) {
+            VaultEntry referencedVaultEntry = auditLogEntryModel.getReferencedVaultEntry();
+            _auditLogEntryReference.setText(String.format("%s (%s)", referencedVaultEntry.getIssuer(), referencedVaultEntry.getName()));
+            _auditLogEntryReference.setVisibility(View.VISIBLE);
+        } else if (auditLogEntryModel.getAuditLogEntry().getReference() != null) {
+            _auditLogEntryReference.setText(R.string.audit_log_entry_deleted);
+            _auditLogEntryReference.setVisibility(View.VISIBLE);
+        } else {
+            _auditLogEntryReference.setVisibility(View.GONE);
+        }
+
+        setCardBackgroundColor(auditLogEntry.getEventType());
+    }
+
+    private void setCardBackgroundColor(EventType eventType) {
+        if (eventType == EventType.VAULT_UNLOCK_FAILED_PASSWORD || eventType == EventType.VAULT_UNLOCK_FAILED_BIOMETRICS) {
+            _cardView.setCardBackgroundColor(_errorBackgroundColor);
+            _auditLogEntryIcon.setBackgroundColor(_errorBackgroundColor);
+        } else {
+            _cardView.setCardBackgroundColor(_initialBackgroundColor);
+            _auditLogEntryIcon.setBackgroundColor(_initialIconColor);
+        }
+    }
+
+    private int getEventTypeDescriptionRes(EventType eventType) {
+        switch (eventType) {
+            case VAULT_UNLOCKED:
+                return R.string.event_description_vault_unlocked;
+            case VAULT_BACKUP_CREATED:
+                return R.string.event_description_backup_created;
+            case VAULT_ANDROID_BACKUP_CREATED:
+                return R.string.event_description_android_backup_created;
+            case VAULT_EXPORTED:
+                return R.string.event_description_vault_exported;
+            case ENTRY_SHARED:
+                return R.string.event_description_entry_shared;
+            case VAULT_UNLOCK_FAILED_PASSWORD:
+                return R.string.event_description_vault_unlock_failed_password;
+            case VAULT_UNLOCK_FAILED_BIOMETRICS:
+                return R.string.event_description_vault_unlock_failed_biometrics;
+            default:
+                return R.string.event_unknown;
+        }
+    }
+
+    private int getIconResource(EventType eventType) {
+        switch(eventType) {
+            case VAULT_UNLOCKED:
+                return R.drawable.ic_lock_open;
+            case VAULT_BACKUP_CREATED:
+            case VAULT_ANDROID_BACKUP_CREATED:
+                return R.drawable.ic_folder_zip;
+            case VAULT_EXPORTED:
+                return R.drawable.ic_export_notes;
+            case ENTRY_SHARED:
+                return R.drawable.ic_share;
+            case VAULT_UNLOCK_FAILED_PASSWORD:
+            case VAULT_UNLOCK_FAILED_BIOMETRICS:
+                return R.drawable.ic_lock;
+        }
+
+        return -1;
+    }
+
+    private static String formatTimestamp(Context context, long epochMilli) {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime timestamp = LocalDateTime.ofInstant(Instant.ofEpochMilli(epochMilli), ZoneId.systemDefault());
+
+        long daysBetween = ChronoUnit.DAYS.between(timestamp.toLocalDate(), now.toLocalDate());
+        DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("h:mm a");
+
+        if (daysBetween < 1) {
+            String formattedTime = timestamp.format(timeFormatter);
+            return context.getString(R.string.today_at_time, formattedTime);
+        } else if (daysBetween < 7) {
+            DateTimeFormatter dayOfWeekFormatter = DateTimeFormatter.ofPattern("EEEE");
+            String dayOfWeek = timestamp.format(dayOfWeekFormatter);
+            String formattedTime = timestamp.format(timeFormatter);
+            return context.getString(R.string.day_of_week_at_time, dayOfWeek, formattedTime);
+        } else {
+            DateTimeFormatter dateFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM);
+            return timestamp.format(dateFormatter);
+        }
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
index 3d9abfed..9fce5424 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
@@ -15,12 +15,14 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.beemdevelopment.aegis.CopyBehavior;
 import com.beemdevelopment.aegis.AccountNamePosition;
-import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.CopyBehavior;
 import com.beemdevelopment.aegis.Preferences;
+import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.SortCategory;
 import com.beemdevelopment.aegis.ViewMode;
 import com.beemdevelopment.aegis.helpers.ItemTouchHelperAdapter;
@@ -29,37 +31,47 @@ import com.beemdevelopment.aegis.otp.HotpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
 import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.ui.models.ErrorCardInfo;
 import com.beemdevelopment.aegis.util.CollectionUtils;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.TreeSet;
 import java.util.UUID;
 
 public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements ItemTouchHelperAdapter {
     private EntryListView _view;
-    private List<VaultEntry> _entries;
-    private List<VaultEntry> _shownEntries;
+    private EntryList _entryList;
     private List<VaultEntry> _selectedEntries;
+    private Collection<VaultGroup> _groups;
     private Map<UUID, Integer> _usageCounts;
+    private Map<UUID, Long> _lastUsedTimestamps;
     private VaultEntry _focusedEntry;
     private VaultEntry _clickedEntry;
     private Preferences.CodeGrouping _codeGroupSize;
     private AccountNamePosition _accountNamePosition;
     private boolean _showIcon;
+    private boolean _showNextCode;
+    private boolean _showExpirationState;
     private boolean _onlyShowNecessaryAccountNames;
     private boolean _highlightEntry;
     private boolean _tempHighlightEntry;
     private boolean _tapToReveal;
     private int _tapToRevealTime;
     private CopyBehavior _copyBehavior;
-    private List<String> _groupFilter;
+    private int _searchBehaviorMask;
+    private Set<UUID> _groupFilter;
     private SortCategory _sortCategory;
     private ViewMode _viewMode;
     private String _searchFilter;
@@ -73,10 +85,9 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     private List<EntryHolder> _holders;
 
     public EntryAdapter(EntryListView view) {
-        _entries = new ArrayList<>();
-        _shownEntries = new ArrayList<>();
+        _entryList = new EntryList();
         _selectedEntries = new ArrayList<>();
-        _groupFilter = new ArrayList<>();
+        _groupFilter = new TreeSet<>();
         _holders = new ArrayList<>();
         _dimHandler = new Handler();
         _doubleTapHandler = new Handler();
@@ -106,6 +117,14 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         _showIcon = showIcon;
     }
 
+    public void setShowNextCode(boolean showNextCode) {
+        _showNextCode = showNextCode;
+    }
+
+    public void setShowExpirationState(boolean showExpirationState) {
+        _showExpirationState = showExpirationState;
+    }
+
     public void setTapToReveal(boolean tapToReveal) {
         _tapToReveal = tapToReveal;
     }
@@ -124,148 +143,95 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
     public void setCopyBehavior(CopyBehavior copyBehavior) { _copyBehavior = copyBehavior; }
 
+    public void setSearchBehaviorMask(int searchBehaviorMask) { _searchBehaviorMask = searchBehaviorMask; }
+
     public void setPauseFocused(boolean pauseFocused) {
         _pauseFocused = pauseFocused;
     }
 
-    public VaultEntry getEntryAt(int position) {
-        return _shownEntries.get(position);
+    public void setErrorCardInfo(ErrorCardInfo info) {
+        if (Objects.equals(info, _entryList.getErrorCardInfo())) {
+            return;
+        }
+
+        replaceEntryList(new EntryList(
+                _entryList.getEntries(),
+                _entryList.getShownEntries(),
+                info
+        ));
     }
 
-    public int addEntry(VaultEntry entry) {
-        _entries.add(entry);
-        if (isEntryFiltered(entry)) {
-            return -1;
-        }
-
-        int position = -1;
-        Comparator<VaultEntry> comparator = _sortCategory.getComparator();
-        if (comparator != null) {
-            // insert the entry in the correct order
-            // note: this assumes that _shownEntries has already been sorted
-            for (int i = getShownFavoritesCount(); i < _shownEntries.size(); i++) {
-                if (comparator.compare(_shownEntries.get(i), entry) > 0) {
-                    _shownEntries.add(i, entry);
-                    notifyItemInserted(i);
-                    position = i;
-                    break;
-                }
-            }
-        }
-
-        if (position < 0){
-            _shownEntries.add(entry);
-
-            position = getItemCount() - 1;
-            if (position == 0) {
-                notifyDataSetChanged();
-            } else {
-                notifyItemInserted(position);
-            }
-        }
-
-        _view.onListChange();
-        checkPeriodUniformity();
-        updateFooter();
-        return position;
+    public VaultEntry getEntryAtPosition(int position) {
+        return _entryList.getShownEntries().get(_entryList.translateEntryPosToIndex(position));
     }
 
-    public void addEntries(Collection<VaultEntry> entries) {
-        for (VaultEntry entry: entries) {
+    public int getEntryPosition(VaultEntry entry) {
+        return _entryList.translateEntryIndexToPos(_entryList.getShownEntries().indexOf(entry));
+    }
+
+    public void setEntries(List<VaultEntry> entries) {
+        // TODO: Move these fields to separate dedicated model for the UI
+        for (VaultEntry entry : entries) {
             entry.setUsageCount(_usageCounts.containsKey(entry.getUUID()) ? _usageCounts.get(entry.getUUID()) : 0);
+            entry.setLastUsedTimestamp(_lastUsedTimestamps.containsKey(entry.getUUID()) ? _lastUsedTimestamps.get(entry.getUUID()) : 0);
         }
 
-        _entries.addAll(entries);
-        updateShownEntries();
-        checkPeriodUniformity(true);
-    }
-
-    public void removeEntry(VaultEntry entry) {
-        _entries.remove(entry);
-
-        if (_shownEntries.contains(entry)) {
-            int position = _shownEntries.indexOf(entry);
-            _shownEntries.remove(position);
-            notifyItemRemoved(position);
-            updateFooter();
-        }
-
-        _view.onListChange();
-        checkPeriodUniformity();
-    }
-
-    public void removeEntry(UUID uuid) {
-        VaultEntry entry = getEntryByUUID(uuid);
-        removeEntry(entry);
+        replaceEntryList(new EntryList(
+                entries,
+                calculateShownEntries(entries),
+                _entryList.getErrorCardInfo()
+        ));
     }
 
     public void clearEntries() {
-        _entries.clear();
-        _shownEntries.clear();
-        notifyDataSetChanged();
-        checkPeriodUniformity();
+        replaceEntryList(new EntryList());
     }
 
-    public void replaceEntry(UUID uuid, VaultEntry newEntry) {
-        VaultEntry oldEntry = getEntryByUUID(uuid);
-        _entries.set(_entries.indexOf(oldEntry), newEntry);
-
-        if (_shownEntries.contains(oldEntry)) {
-            int position = _shownEntries.indexOf(oldEntry);
-            if (isEntryFiltered(newEntry)) {
-                _shownEntries.remove(position);
-                notifyItemRemoved(position);
-            } else {
-                _shownEntries.set(position, newEntry);
-                notifyItemChanged(position);
-            }
-
-            sortShownEntries();
-            int newPosition = _shownEntries.indexOf(newEntry);
-            if (newPosition != NO_POSITION && position != newPosition) {
-                notifyItemMoved(position, newPosition);
-            }
-        } else if (!isEntryFiltered(newEntry)) {
-            _shownEntries.add(newEntry);
-
-            int position = getItemCount() - 1;
-            notifyItemInserted(position);
-        }
-        checkPeriodUniformity();
-        updateFooter();
-    }
-
-    private VaultEntry getEntryByUUID(UUID uuid) {
-        for (VaultEntry entry : _entries) {
-            if (entry.getUUID().equals(uuid)) {
-                return entry;
-            }
-        }
-
-        return null;
+    public int translateEntryPosToIndex(int position) {
+        return _entryList.translateEntryPosToIndex(position);
     }
 
     private boolean isEntryFiltered(VaultEntry entry) {
-        String group = entry.getGroup();
+        Set<UUID> groups = entry.getGroups();
         String issuer = entry.getIssuer().toLowerCase();
         String name = entry.getName().toLowerCase();
+        String note = entry.getNote().toLowerCase();
+
+        if (_searchFilter != null) {
+            String[] tokens = _searchFilter.toLowerCase().split("\\s+");
+
+            // Return true if not all tokens match at least one of the relevant fields
+            return !Arrays.stream(tokens)
+                    .allMatch(token ->
+                            ((_searchBehaviorMask & Preferences.SEARCH_IN_ISSUER) != 0 && issuer.contains(token)) ||
+                                    ((_searchBehaviorMask & Preferences.SEARCH_IN_NAME) != 0 && name.contains(token)) ||
+                                    ((_searchBehaviorMask & Preferences.SEARCH_IN_NOTE) != 0 && note.contains(token)) ||
+                                    ((_searchBehaviorMask & Preferences.SEARCH_IN_GROUPS) != 0 && doesAnyGroupMatchSearchFilter(groups, token))
+                    );
+        }
 
         if (!_groupFilter.isEmpty()) {
-            if (!_groupFilter.contains(group)) {
+            if (groups.isEmpty() && !_groupFilter.contains(null)) {
+                return true;
+            }
+            if (!groups.isEmpty() && _groupFilter.stream().filter(Objects::nonNull).noneMatch(groups::contains)) {
                 return true;
             }
         }
 
-        if (_searchFilter == null) {
-            return false;
-        }
+        return false;
+    }
 
-        return !issuer.contains(_searchFilter) && !name.contains(_searchFilter);
+    private boolean doesAnyGroupMatchSearchFilter(Set<UUID> entryGroupUUIDs, String searchFilter) {
+        return _groups.stream()
+                .filter(group -> entryGroupUUIDs.contains(group.getUUID()))
+                .map(VaultGroup::getName)
+                .anyMatch(groupName -> groupName.toLowerCase().contains(searchFilter.toLowerCase()));
     }
 
     public void refresh(boolean hard) {
         if (hard) {
-            updateShownEntries();
+            refreshEntryList();
         } else {
             for (EntryHolder holder : _holders) {
                 holder.refresh();
@@ -274,14 +240,13 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         }
     }
 
-    public void setGroupFilter(@NonNull List<String> groups) {
+    public void setGroupFilter(@NonNull Set<UUID> groups) {
         if (_groupFilter.equals(groups)) {
             return;
         }
 
         _groupFilter = groups;
-        updateShownEntries();
-        checkPeriodUniformity();
+        refreshEntryList();
     }
 
     public void setSortCategory(SortCategory category, boolean apply) {
@@ -291,7 +256,7 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
         _sortCategory = category;
         if (apply) {
-            updateShownEntries();
+            refreshEntryList();
         }
     }
 
@@ -300,24 +265,59 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     }
 
     public void setSearchFilter(String search) {
-        _searchFilter = (search != null && !search.isEmpty()) ? search.toLowerCase() : null;
-        updateShownEntries();
+        String newSearchFilter = (search != null && !search.isEmpty())
+                ? search.toLowerCase().trim() : null;
+
+        if (!Objects.equals(_searchFilter, newSearchFilter)) {
+            _searchFilter = newSearchFilter;
+            refreshEntryList();
+        }
     }
 
-    private void updateShownEntries() {
-        // clear the list of shown entries first
-        _shownEntries.clear();
+    private void refreshEntryList() {
+        replaceEntryList(new EntryList(
+                _entryList.getEntries(),
+                calculateShownEntries(_entryList.getEntries()),
+                _entryList.getErrorCardInfo()
+        ));
+    }
 
-        // add entries back that are not filtered out
-        for (VaultEntry entry : _entries) {
+    private void replaceEntryList(EntryList newEntryList) {
+        DiffUtil.DiffResult diffRes = DiffUtil.calculateDiff(new DiffCallback(_entryList, newEntryList));
+        _entryList = newEntryList;
+        updatePeriodUniformity();
+
+        // This scroll position trick is required in order to not have the recycler view
+        // jump to some random position after a large change (like resorting entries)
+        // Related: https://issuetracker.google.com/issues/70149059
+        int scrollPos = _view.getScrollPosition();
+        diffRes.dispatchUpdatesTo(this);
+        _view.scrollToPosition(scrollPos);
+        _view.onListChange();
+    }
+
+    private List<VaultEntry> calculateShownEntries(List<VaultEntry> entries) {
+        List<VaultEntry> res = new ArrayList<>();
+        for (VaultEntry entry : entries) {
             if (!isEntryFiltered(entry)) {
-                _shownEntries.add(entry);
+                res.add(entry);
             }
         }
 
-        sortShownEntries();
-        _view.onListChange();
-        notifyDataSetChanged();
+        sortEntries(res, _sortCategory);
+        return res;
+    }
+
+    private static void sortEntries(List<VaultEntry> entries, SortCategory sortCategory) {
+        if (sortCategory != null) {
+            Comparator<VaultEntry> comparator = sortCategory.getComparator();
+            if (comparator != null) {
+                Collections.sort(entries, comparator);
+            }
+        }
+
+        Comparator<VaultEntry> favoriteComparator = new FavoriteComparator();
+        Collections.sort(entries, favoriteComparator);
     }
 
     private boolean isEntryDraggable(VaultEntry entry) {
@@ -328,18 +328,6 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                 && _selectedEntries.get(0) == entry;
     }
 
-    private void sortShownEntries() {
-        if (_sortCategory != null) {
-            Comparator<VaultEntry> comparator = _sortCategory.getComparator();
-            if (comparator != null) {
-                Collections.sort(_shownEntries, comparator);
-            }
-        }
-
-        Comparator<VaultEntry> favoriteComparator = new FavoriteComparator();
-        Collections.sort(_shownEntries, favoriteComparator);
-    }
-
     public void setViewMode(ViewMode viewMode) {
         _viewMode = viewMode;
     }
@@ -348,12 +336,14 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
     public Map<UUID, Integer> getUsageCounts() { return _usageCounts; }
 
-    public int getShownFavoritesCount() {
-        return (int) _shownEntries.stream().filter(VaultEntry::isFavorite).count();
-    }
+    public void setGroups(Collection<VaultGroup> groups) { _groups = groups; }
 
-    public void setGroups(TreeSet<String> groups) {
-        _view.setGroups(groups);
+    public void setLastUsedTimestamps(Map<UUID, Long> lastUsedTimestamps) { _lastUsedTimestamps = lastUsedTimestamps; }
+
+    public Map<UUID, Long> getLastUsedTimestamps() { return _lastUsedTimestamps; }
+
+    public int getShownFavoritesCount() {
+        return (int) _entryList.getShownEntries().stream().filter(VaultEntry::isFavorite).count();
     }
 
     @Override
@@ -365,34 +355,48 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     public void onItemDrop(int position) {
         // moving entries is not allowed when a filter is applied
         // footer cant be moved, nor can items be moved below it
-        if (!_groupFilter.isEmpty() || isPositionFooter(position)) {
+        if (!_groupFilter.isEmpty() || _entryList.isPositionFooter(position) || _entryList.isPositionErrorCard(position)) {
             return;
         }
 
-        _view.onEntryDrop(_shownEntries.get(position));
+        int index = _entryList.translateEntryPosToIndex(position);
+        _view.onEntryDrop(_entryList.getShownEntries().get(index));
     }
 
     @Override
     public void onItemMove(int firstPosition, int secondPosition) {
-        // moving entries is not allowed when a filter is applied
-        // footer cant be moved, nor can items be moved below it
-        if (!_groupFilter.isEmpty() || isPositionFooter(firstPosition) || isPositionFooter(secondPosition)) {
+        // Moving entries is not allowed when a filter is applied. The footer can't be
+        // moved, nor can items be moved below it
+        if (!_groupFilter.isEmpty()
+                || _entryList.isPositionFooter(firstPosition) || _entryList.isPositionFooter(secondPosition)
+                || _entryList.isPositionErrorCard(firstPosition) || _entryList.isPositionErrorCard(secondPosition)) {
             return;
         }
 
-        // notify the vault first
-        _view.onEntryMove(_entries.get(firstPosition), _entries.get(secondPosition));
+        // Notify the vault about the entry position change first
+        int firstIndex = _entryList.translateEntryPosToIndex(firstPosition);
+        int secondIndex = _entryList.translateEntryPosToIndex(secondPosition);
+        VaultEntry firstEntry = _entryList.getShownEntries().get(firstIndex);
+        VaultEntry secondEntry = _entryList.getShownEntries().get(secondIndex);
+        _view.onEntryMove(firstEntry, secondEntry);
 
-        // then update our end
-        CollectionUtils.move(_entries, firstPosition, secondPosition);
-        CollectionUtils.move(_shownEntries, firstPosition, secondPosition);
-
-        notifyItemMoved(firstPosition, secondPosition);
+        // Then update the visual end
+        List<VaultEntry> newEntries = new ArrayList<>(_entryList.getEntries());
+        CollectionUtils.move(newEntries, newEntries.indexOf(firstEntry), newEntries.indexOf(secondEntry));
+        replaceEntryList(new EntryList(
+                newEntries,
+                calculateShownEntries(newEntries),
+                _entryList.getErrorCardInfo()
+        ));
     }
 
     @Override
     public int getItemViewType(int position) {
-        if (isPositionFooter(position)) {
+        if (_entryList.isPositionErrorCard(position)) {
+            return R.layout.card_error;
+        }
+
+        if (_entryList.isPositionFooter(position)) {
             return R.layout.card_footer;
         }
 
@@ -405,7 +409,15 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
         RecyclerView.ViewHolder holder;
         View view = inflater.inflate(viewType, parent, false);
-        holder = viewType == R.layout.card_footer ? new FooterView(view) : new EntryHolder(view);
+
+        if (viewType == R.layout.card_error) {
+            holder = new ErrorCardHolder(view, Objects.requireNonNull(_entryList.getErrorCardInfo()));
+        }  else if (viewType == R.layout.card_footer) {
+            holder = new FooterView(view);
+        } else {
+            holder = new EntryHolder(view);
+        }
+
         if (_showIcon && holder instanceof EntryHolder) {
             _view.setPreloadView(((EntryHolder) holder).getIconView());
         }
@@ -425,22 +437,23 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof EntryHolder) {
             EntryHolder entryHolder = (EntryHolder) holder;
-            VaultEntry entry = _shownEntries.get(position);
+            int index = _entryList.translateEntryPosToIndex(position);
+            VaultEntry entry = _entryList.getShownEntries().get(index);
 
-            boolean hidden = _tapToReveal && entry != _focusedEntry;
-            boolean paused = _pauseFocused && entry == _focusedEntry;
-            boolean dimmed = (_highlightEntry || _tempHighlightEntry) && _focusedEntry != null && _focusedEntry != entry;
+            boolean hidden = _tapToReveal && !entry.equals(_focusedEntry);
+            boolean paused = _pauseFocused && entry.equals(_focusedEntry);
+            boolean dimmed = (_highlightEntry || _tempHighlightEntry) && _focusedEntry != null && !_focusedEntry.equals(entry);
             boolean showProgress = entry.getInfo() instanceof TotpInfo && ((TotpInfo) entry.getInfo()).getPeriod() != getMostFrequentPeriod();
             boolean showAccountName = true;
             if (_onlyShowNecessaryAccountNames) {
                 // Only show account name when there's multiple entries found with the same issuer.
-                showAccountName = _entries.stream()
+                showAccountName = _entryList.getEntries().stream()
                         .filter(x -> x.getIssuer().equals(entry.getIssuer()))
                         .count() > 1;
             }
 
             AccountNamePosition accountNamePosition = showAccountName ? _accountNamePosition : AccountNamePosition.HIDDEN;
-            entryHolder.setData(entry, _codeGroupSize, _viewMode, accountNamePosition, _showIcon, showProgress, hidden, paused, dimmed);
+            entryHolder.setData(entry, _codeGroupSize, _viewMode, accountNamePosition, _showIcon, showProgress, hidden, paused, dimmed, _showExpirationState, _showNextCode);
             entryHolder.setFocused(_selectedEntries.contains(entry));
             entryHolder.setShowDragHandle(isEntryDraggable(entry));
 
@@ -455,13 +468,13 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
                     if (_selectedEntries.isEmpty()) {
                         if (_highlightEntry || _tempHighlightEntry || _tapToReveal) {
-                            if (_focusedEntry == entry) {
+                            if (_focusedEntry != null && _focusedEntry.equals(entry)) {
                                 resetFocus();
-
-                                // Prevent copying when singletap is set and focus is reset
-                                handled = _copyBehavior == CopyBehavior.SINGLETAP;
                             } else {
                                 focusEntry(entry, _tapToRevealTime);
+
+                                // Prevent copying when singletap is set and the entry is being revealed
+                                handled = _copyBehavior == CopyBehavior.SINGLETAP && _tapToReveal;
                             }
                         }
 
@@ -469,7 +482,7 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                             case SINGLETAP:
                                 if (!handled) {
                                     _view.onEntryCopy(entry);
-                                    entryHolder.animateCopyText(_viewMode != ViewMode.TILES);
+                                    entryHolder.animateCopyText();
                                     _clickedEntry = null;
                                 }
                                 break;
@@ -478,7 +491,7 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
                                 if(entry == _clickedEntry) {
                                     _view.onEntryCopy(entry);
-                                    entryHolder.animateCopyText(_viewMode != ViewMode.TILES);
+                                    entryHolder.animateCopyText();
                                     _clickedEntry = null;
                                 } else {
                                     _clickedEntry = entry;
@@ -507,12 +520,13 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             entryHolder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
-                    int position = holder.getAdapterPosition();
+                    int position = holder.getBindingAdapterPosition();
                     if (_selectedEntries.isEmpty()) {
                         entryHolder.setFocusedAndAnimate(true);
                     }
 
-                    boolean returnVal = _view.onLongEntryClick(_shownEntries.get(position));
+                    int index = _entryList.translateEntryPosToIndex(position);
+                    boolean returnVal = _view.onLongEntryClick(_entryList.getShownEntries().get(index));
                     if (_selectedEntries.size() == 0 || isEntryDraggable(entry)) {
                         _view.startDrag(entryHolder);
                     }
@@ -558,15 +572,10 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         }
     }
 
-    private void checkPeriodUniformity() {
-        checkPeriodUniformity(false);
-    }
-
-    private void checkPeriodUniformity(boolean force) {
+    private void updatePeriodUniformity() {
         int mostFrequentPeriod = getMostFrequentPeriod();
         boolean uniform = isPeriodUniform();
-
-        if (!force && uniform == _isPeriodUniform && mostFrequentPeriod == _uniformPeriod) {
+        if (uniform == _isPeriodUniform && mostFrequentPeriod == _uniformPeriod) {
             return;
         }
 
@@ -584,7 +593,7 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
     public int getMostFrequentPeriod() {
         List<TotpInfo> infos = new ArrayList<>();
-        for (VaultEntry entry : _shownEntries) {
+        for (VaultEntry entry : _entryList.getShownEntries()) {
             OtpInfo info = entry.getInfo();
             if (info instanceof TotpInfo) {
                 infos.add((TotpInfo) info);
@@ -595,6 +604,10 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             return -1;
         }
 
+        if (infos.size() == 1) {
+            return infos.get(0).getPeriod();
+        }
+
         Map<Integer, Integer> occurrences = new HashMap<>();
         for (TotpInfo info : infos) {
             int period = info.getPeriod();
@@ -622,7 +635,7 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         _dimHandler.removeCallbacksAndMessages(null);
 
         for (EntryHolder holder : _holders) {
-            if (holder.getEntry() != _focusedEntry) {
+            if (!holder.getEntry().equals(_focusedEntry)) {
                 if (_highlightEntry || _tempHighlightEntry) {
                     holder.dim();
                 }
@@ -692,10 +705,27 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         updateDraggableStatus();
     }
 
+    public List<VaultEntry> selectAllEntries() {
+        _selectedEntries.clear();
+
+        for (VaultEntry entry: _entryList.getShownEntries()) {
+            for (EntryHolder holder: _holders) {
+                if (holder.getEntry().equals(entry)) {
+                    holder.setFocused(true);
+                }
+            }
+
+            _selectedEntries.add(entry);
+            updateDraggableStatus();
+        }
+
+        return new ArrayList<>(_selectedEntries);
+    }
+
     public void deselectAllEntries() {
         for (VaultEntry entry: _selectedEntries) {
             for (EntryHolder holder : _holders) {
-                if (holder.getEntry() == entry) {
+                if (holder.getEntry().equals(entry)) {
                     holder.setFocusedAndAnimate(false);
                     break;
                 }
@@ -714,6 +744,8 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             int usageCount = _usageCounts.get(entry.getUUID());
             _usageCounts.put(entry.getUUID(), ++usageCount);
         }
+
+        _lastUsedTimestamps.put(entry.getUUID(), new Date().getTime());
     }
 
     public boolean isDragAndDropAllowed() {
@@ -730,19 +762,23 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
     @Override
     public int getItemCount() {
-        return getEntriesCount() + 1;
+        return _entryList.getItemCount();
     }
 
-    public int getEntriesCount() {
-        return _shownEntries.size();
+    public int getShownEntriesCount() {
+        return _entryList.getShownEntries().size();
     }
 
     public boolean isPositionFooter(int position) {
-        return position == getEntriesCount();
+        return _entryList.isPositionFooter(position);
     }
 
-    private void updateFooter() {
-        notifyItemChanged(getItemCount() - 1);
+    public boolean isPositionErrorCard(int position) {
+        return _entryList.isPositionErrorCard(position);
+    }
+
+    public boolean isErrorCardShown() {
+        return _entryList.isErrorCardShown();
     }
 
     private class FooterView extends RecyclerView.ViewHolder {
@@ -754,19 +790,166 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         }
 
         public void refresh() {
-            int entriesShown = getEntriesCount();
+            int entriesShown = getShownEntriesCount();
             SpannableString entriesShownSpannable = new SpannableString(_footerView.getResources().getQuantityString(R.plurals.entries_shown, entriesShown, entriesShown));
 
             String entriesShownString = String.format("%d", entriesShown);
             int spanStart = entriesShownSpannable.toString().indexOf(entriesShownString);
-            int spanEnd = spanStart + entriesShownString.length();
-            entriesShownSpannable.setSpan(new StyleSpan(Typeface.BOLD), spanStart, spanEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            if (spanStart >= 0) {
+                int spanEnd = spanStart + entriesShownString.length();
+                entriesShownSpannable.setSpan(new StyleSpan(Typeface.BOLD), spanStart, spanEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
 
             TextView textView = _footerView.findViewById(R.id.entries_shown_count);
             textView.setText(entriesShownSpannable);
         }
     }
 
+    private static class EntryList {
+        private final List<VaultEntry> _entries;
+        private final List<VaultEntry> _shownEntries;
+        private final ErrorCardInfo _errorCardInfo;
+
+        public EntryList() {
+            this(new ArrayList<>(), new ArrayList<>(), null);
+        }
+
+        public EntryList(
+                @NonNull List<VaultEntry> entries,
+                @NonNull List<VaultEntry> shownEntries,
+                @Nullable ErrorCardInfo errorCardInfo
+        ) {
+            _entries = entries;
+            _shownEntries = shownEntries;
+            _errorCardInfo = errorCardInfo;
+        }
+
+        public List<VaultEntry> getEntries() {
+            return _entries;
+        }
+
+        public List<VaultEntry> getShownEntries() {
+            return _shownEntries;
+        }
+
+        public int getItemCount() {
+            // Always at least one item because of the footer
+            // Two in case there's also an error card
+            int baseCount = 1;
+            if (isErrorCardShown()) {
+                baseCount++;
+            }
+
+            return baseCount + getShownEntries().size();
+        }
+
+        @Nullable
+        public ErrorCardInfo getErrorCardInfo() {
+            return _errorCardInfo;
+        }
+
+        public boolean isErrorCardShown() {
+            return _errorCardInfo != null;
+        }
+
+        public boolean isPositionErrorCard(int position) {
+            return isErrorCardShown() && position == 0;
+        }
+
+        public boolean isPositionFooter(int position) {
+            return position == (getItemCount() - 1);
+        }
+
+        /**
+         * Translates the given entry position in the recycler view, to its index in the shown entries list.
+         */
+        public int translateEntryPosToIndex(int position) {
+            if (position == NO_POSITION) {
+                return NO_POSITION;
+            }
+
+            if (isErrorCardShown()) {
+                position -= 1;
+            }
+
+            return position;
+        }
+
+        /**
+         * Translates the given entry index in the shown entries list, to its position in the recycler view.
+         */
+        public int translateEntryIndexToPos(int index) {
+            if (index == NO_POSITION) {
+                return NO_POSITION;
+            }
+
+            if (isErrorCardShown()) {
+                index += 1;
+            }
+
+            return index;
+        }
+
+    }
+
+    private static class DiffCallback extends DiffUtil.Callback {
+        private final EntryList _old;
+        private final EntryList _new;
+
+        public DiffCallback(EntryList oldList, EntryList newList) {
+            _old = oldList;
+            _new = newList;
+        }
+
+        @Override
+        public int getOldListSize() {
+            return _old.getItemCount();
+        }
+
+        @Override
+        public int getNewListSize() {
+            return _new.getItemCount();
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            if (_old.isPositionErrorCard(oldItemPosition) != _new.isPositionErrorCard(newItemPosition)
+                    || _old.isPositionFooter(oldItemPosition) != _new.isPositionFooter(newItemPosition)) {
+                return false;
+            }
+
+            if ((_old.isPositionFooter(oldItemPosition) && _new.isPositionFooter(newItemPosition))
+                    || (_old.isPositionErrorCard(oldItemPosition) && _new.isPositionErrorCard(newItemPosition))) {
+                return true;
+            }
+
+            int oldEntryIndex = _old.translateEntryPosToIndex(oldItemPosition);
+            int newEntryIndex = _new.translateEntryPosToIndex(newItemPosition);
+            if (oldEntryIndex < 0 || newEntryIndex < 0) {
+                return false;
+            }
+
+            return _old.getShownEntries().get(oldEntryIndex).getUUID()
+                    .equals(_new.getShownEntries().get(newEntryIndex).getUUID());
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            if (_old.isPositionFooter(oldItemPosition) && _new.isPositionFooter(newItemPosition)) {
+                return _old.getShownEntries().size() == _new.getShownEntries().size();
+            }
+
+            if (_old.isPositionErrorCard(oldItemPosition) && _new.isPositionErrorCard(newItemPosition)) {
+                return Objects.equals(_old.getErrorCardInfo(), _new.getErrorCardInfo());
+            }
+
+            int oldEntryIndex = _old.translateEntryPosToIndex(oldItemPosition);
+            int newEntryIndex = _new.translateEntryPosToIndex(newItemPosition);
+            return _old.getShownEntries().get(oldEntryIndex)
+                    .equals(_new.getShownEntries().get(newEntryIndex));
+        }
+    }
+
     public interface Listener {
         void onEntryClick(VaultEntry entry);
         boolean onLongEntryClick(VaultEntry entry);
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
index 25bdf2ab..6e9bd1bd 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
@@ -1,8 +1,19 @@
 package com.beemdevelopment.aegis.ui.views;
 
-import android.graphics.PorterDuff;
+import android.animation.AnimatorSet;
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.os.Build;
 import android.os.Handler;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.RelativeSizeSpan;
+import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -11,15 +22,13 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.amulyakhare.textdrawable.TextDrawable;
 import com.beemdevelopment.aegis.AccountNamePosition;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.ViewMode;
 import com.beemdevelopment.aegis.helpers.AnimationsHelper;
-import com.beemdevelopment.aegis.helpers.IconViewHelper;
-import com.beemdevelopment.aegis.helpers.TextDrawableHelper;
-import com.beemdevelopment.aegis.helpers.ThemeHelper;
+import com.beemdevelopment.aegis.helpers.CenterVerticalSpan;
+import com.beemdevelopment.aegis.helpers.SimpleAnimationEndListener;
 import com.beemdevelopment.aegis.helpers.UiRefresher;
 import com.beemdevelopment.aegis.otp.HotpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
@@ -27,10 +36,11 @@ import com.beemdevelopment.aegis.otp.OtpInfoException;
 import com.beemdevelopment.aegis.otp.SteamInfo;
 import com.beemdevelopment.aegis.otp.TotpInfo;
 import com.beemdevelopment.aegis.otp.YandexInfo;
-import com.beemdevelopment.aegis.ui.glide.IconLoader;
+import com.beemdevelopment.aegis.ui.glide.GlideHelper;
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.color.MaterialColors;
 
 public class EntryHolder extends RecyclerView.ViewHolder {
     private static final float DEFAULT_ALPHA = 1.0f;
@@ -40,6 +50,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     private View _favoriteIndicator;
     private TextView _profileName;
     private TextView _profileCode;
+    private TextView _nextProfileCode;
     private TextView _profileIssuer;
     private TextView _profileCopied;
     private ImageView _profileDrawable;
@@ -48,21 +59,23 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     private RelativeLayout _description;
     private ImageView _dragHandle;
     private ViewMode _viewMode;
-  
+
     private final ImageView _selected;
-    private final Handler _selectedHandler;
 
     private Preferences.CodeGrouping _codeGrouping = Preferences.CodeGrouping.NO_GROUPING;
     private AccountNamePosition _accountNamePosition = AccountNamePosition.HIDDEN;
 
     private boolean _hidden;
     private boolean _paused;
-
     private TotpProgressBar _progressBar;
-    private View _view;
+    private MaterialCardView _view;
 
     private UiRefresher _refresher;
-    private Handler _animationHandler;
+    private Handler _copyAnimationHandler;
+    private Handler _expirationHandler;
+    private AnimatorSet _expirationAnimSet;
+    private boolean _showNextCode;
+    private boolean _showExpirationState;
 
     private Animation _scaleIn;
     private Animation _scaleOut;
@@ -70,10 +83,10 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     public EntryHolder(final View view) {
         super(view);
 
-        _view = view.findViewById(R.id.rlCardEntry);
-
+        _view = (MaterialCardView) view;
         _profileName = view.findViewById(R.id.profile_account_name);
         _profileCode = view.findViewById(R.id.profile_code);
+        _nextProfileCode = view.findViewById(R.id.next_profile_code);
         _profileIssuer = view.findViewById(R.id.profile_issuer);
         _profileCopied = view.findViewById(R.id.profile_copied);
         _description = view.findViewById(R.id.description);
@@ -83,13 +96,10 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         _dragHandle = view.findViewById(R.id.drag_handle);
         _favoriteIndicator = view.findViewById(R.id.favorite_indicator);
 
-        _selectedHandler = new Handler();
-        _animationHandler = new Handler();
+        _copyAnimationHandler = new Handler();
+        _expirationHandler = new Handler();
 
         _progressBar = view.findViewById(R.id.progressBar);
-        int primaryColorId = view.getContext().getResources().getColor(R.color.colorPrimary);
-        _progressBar.getProgressDrawable().setColorFilter(primaryColorId, PorterDuff.Mode.SRC_IN);
-        _view.setBackground(_view.getContext().getResources().getDrawable(R.color.card_background));
 
         _scaleIn = AnimationsHelper.loadScaledAnimation(view.getContext(), R.anim.item_scale_in);
         _scaleOut = AnimationsHelper.loadScaledAnimation(view.getContext(), R.anim.item_scale_out);
@@ -97,38 +107,51 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         _refresher = new UiRefresher(new UiRefresher.Listener() {
             @Override
             public void onRefresh() {
-                if (!_hidden && !_paused) {
-                    refreshCode();
-                }
+                refreshCode();
             }
 
+            @Override
+            public void onExpiring() { }
+
             @Override
             public long getMillisTillNextRefresh() {
                 return ((TotpInfo) _entry.getInfo()).getMillisTillNextRotation();
             }
+
+            @Override
+            public long getPeriodMillis() {
+                return ((TotpInfo) _entry.getInfo()).getPeriod() * 1000L;
+            }
         });
     }
 
-    public void setData(VaultEntry entry, Preferences.CodeGrouping groupSize, ViewMode viewMode, AccountNamePosition accountNamePosition, boolean showIcon, boolean showProgress, boolean hidden, boolean paused, boolean dimmed) {
+    public void setData(VaultEntry entry, Preferences.CodeGrouping groupSize, ViewMode viewMode, AccountNamePosition accountNamePosition, boolean showIcon, boolean nonUniform, boolean hidden, boolean paused, boolean dimmed, boolean showExpirationState, boolean showNextCode) {
         _entry = entry;
         _hidden = hidden;
         _paused = paused;
         _codeGrouping = groupSize;
         _viewMode = viewMode;
+
         _accountNamePosition = accountNamePosition;
+        if (viewMode.equals(ViewMode.TILES) && _accountNamePosition == AccountNamePosition.END) {
+            _accountNamePosition = AccountNamePosition.BELOW;
+        }
 
         _selected.clearAnimation();
         _selected.setVisibility(View.GONE);
-        _selectedHandler.removeCallbacksAndMessages(null);
-        _animationHandler.removeCallbacksAndMessages(null);
+        _copyAnimationHandler.removeCallbacksAndMessages(null);
+        _expirationHandler.removeCallbacksAndMessages(null);
+        _showNextCode = entry.getInfo() instanceof TotpInfo && showNextCode;
+        _showExpirationState = _entry.getInfo() instanceof TotpInfo && showExpirationState;
 
         _favoriteIndicator.setVisibility(_entry.isFavorite() ? View.VISIBLE : View.INVISIBLE);
 
         // only show the progress bar if there is no uniform period and the entry type is TotpInfo
-        setShowProgress(showProgress);
+        setShowProgress(nonUniform);
 
         // only show the button if this entry is of type HotpInfo
         _buttonRefresh.setVisibility(entry.getInfo() instanceof HotpInfo ? View.VISIBLE : View.GONE);
+        _nextProfileCode.setVisibility(_showNextCode ? View.VISIBLE : View.GONE);
 
         String profileIssuer = entry.getIssuer();
         String profileName = entry.getName();
@@ -137,7 +160,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         }
         _profileIssuer.setText(profileIssuer);
         _profileName.setText(profileName);
-        setAccountNameLayout(_accountNamePosition);
+        setAccountNameLayout(_accountNamePosition, !profileIssuer.isEmpty() && !profileName.isEmpty());
 
         if (_hidden) {
             hideCode();
@@ -146,20 +169,29 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         }
 
         showIcon(showIcon);
-
         itemView.setAlpha(dimmed ? DIMMED_ALPHA : DEFAULT_ALPHA);
     }
 
-    private void setAccountNameLayout(AccountNamePosition accountNamePosition) {
-        if (_viewMode == ViewMode.TILES) {
-            return;
-        }
-
+    private void setAccountNameLayout(AccountNamePosition accountNamePosition, Boolean hasBothIssuerAndName) {
         RelativeLayout.LayoutParams profileNameLayoutParams;
-        RelativeLayout.LayoutParams copiedLayoutParams;
+
         switch (accountNamePosition) {
             case HIDDEN:
                 _profileName.setVisibility(View.GONE);
+
+                if (_viewMode == ViewMode.TILES) {
+                    _profileCopied.setGravity(Gravity.CENTER_VERTICAL);
+                    ((RelativeLayout.LayoutParams)_profileCopied.getLayoutParams()).removeRule(RelativeLayout.BELOW);
+                    _profileCopied.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
+                    _profileCopied.setTextSize(14);
+
+                    _profileIssuer.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
+                    _profileIssuer.setGravity(Gravity.CENTER_VERTICAL);
+                    _profileIssuer.setTextSize(14);
+
+                    _profileName.setVisibility(View.GONE);
+                }
+
                 break;
 
             case BELOW:
@@ -169,24 +201,18 @@ public class EntryHolder extends RecyclerView.ViewHolder {
                 profileNameLayoutParams.setMarginStart(0);
                 _profileName.setLayoutParams(profileNameLayoutParams);
                 _profileName.setVisibility(View.VISIBLE);
-
-                copiedLayoutParams = (RelativeLayout.LayoutParams) _profileCopied.getLayoutParams();
-                copiedLayoutParams.addRule(RelativeLayout.ABOVE, R.id.profile_account_name);
-                _profileCopied.setLayoutParams(copiedLayoutParams);
                 break;
 
             case END:
             default:
                 profileNameLayoutParams = (RelativeLayout.LayoutParams) _profileName.getLayoutParams();
                 profileNameLayoutParams.addRule(RelativeLayout.END_OF, R.id.profile_issuer);
-                profileNameLayoutParams.setMarginStart(24);
                 profileNameLayoutParams.removeRule(RelativeLayout.BELOW);
+                if (hasBothIssuerAndName) {
+                    profileNameLayoutParams.setMarginStart(24);
+                }
                 _profileName.setLayoutParams(profileNameLayoutParams);
                 _profileName.setVisibility(View.VISIBLE);
-
-                copiedLayoutParams = (RelativeLayout.LayoutParams) _profileCopied.getLayoutParams();
-                copiedLayoutParams.addRule(RelativeLayout.ABOVE, R.id.description);
-                _profileCopied.setLayoutParams(copiedLayoutParams);
                 break;
         }
     }
@@ -196,19 +222,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     }
 
     public void loadIcon(Fragment fragment) {
-        if (_entry.hasIcon()) {
-            IconViewHelper.setLayerType(_profileDrawable, _entry.getIconType());
-            Glide.with(fragment)
-                .asDrawable()
-                .load(_entry)
-                .set(IconLoader.ICON_TYPE, _entry.getIconType())
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(false)
-                .into(_profileDrawable);
-        } else {
-            TextDrawable drawable = TextDrawableHelper.generate(_entry.getIssuer(), _entry.getName(), _profileDrawable);
-            _profileDrawable.setImageDrawable(drawable);
-        }
+        GlideHelper.loadEntryIcon(Glide.with(fragment), _entry, _profileDrawable);
     }
 
     public ImageView getIconView() {
@@ -244,11 +258,8 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     public void setFocused(boolean focused) {
         if (focused) {
             _selected.setVisibility(View.VISIBLE);
-            _view.setBackgroundColor(ThemeHelper.getThemeColor(R.attr.cardBackgroundFocused, _view.getContext().getTheme()));
-        } else {
-            _view.setBackgroundColor(ThemeHelper.getThemeColor(R.attr.cardBackground, _view.getContext().getTheme()));
         }
-        _view.setSelected(focused);
+        _view.setChecked(focused);
     }
 
     public void setFocusedAndAnimate(boolean focused) {
@@ -258,7 +269,9 @@ public class EntryHolder extends RecyclerView.ViewHolder {
             _selected.startAnimation(_scaleIn);
         } else {
             _selected.startAnimation(_scaleOut);
-            _selectedHandler.postDelayed(() -> _selected.setVisibility(View.GONE), 150);
+            _scaleOut.setAnimationListener(new SimpleAnimationEndListener(animation -> {
+                _selected.setVisibility(View.GONE);
+            }));
         }
     }
 
@@ -283,11 +296,24 @@ public class EntryHolder extends RecyclerView.ViewHolder {
 
     public void refreshCode() {
         if (!_hidden && !_paused) {
-            updateCode();
+            updateCodes();
+            startExpirationAnimation();
         }
     }
 
-    private void updateCode() {
+    private void updateCodes() {
+        _profileCode.setText(getOtp());
+
+        if (_showNextCode) {
+            _nextProfileCode.setText(getOtp(1));
+        }
+    }
+
+    private String getOtp() {
+        return getOtp(0);
+    }
+
+    private String getOtp(int offset) {
         OtpInfo info = _entry.getInfo();
 
         // In previous versions of Aegis, it was possible to import entries with an empty
@@ -296,7 +322,12 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         // the OTP, instead of crashing.
         String otp;
         try {
-            otp = info.getOtp();
+            if (info instanceof TotpInfo) {
+                otp = ((TotpInfo)info).getOtp((System.currentTimeMillis() / 1000) + ((long) (offset) * ((TotpInfo) _entry.getInfo()).getPeriod()));
+            } else {
+                otp = info.getOtp();
+            }
+
             if (!(info instanceof SteamInfo || info instanceof YandexInfo)) {
                 otp = formatCode(otp);
             }
@@ -304,7 +335,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
             otp = _view.getResources().getString(R.string.error_all_caps);
         }
 
-        _profileCode.setText(otp);
+        return otp;
     }
 
     private String formatCode(String code) {
@@ -337,17 +368,130 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     }
 
     public void revealCode() {
-        updateCode();
+        updateCodes();
+        startExpirationAnimation();
         _hidden = false;
     }
 
     public void hideCode() {
-        String hiddenText = new String(new char[_entry.getInfo().getDigits()]).replace("\0", Character.toString(HIDDEN_CHAR));
-        hiddenText = formatCode(hiddenText);
-        _profileCode.setText(hiddenText);
+        String code = getOtp();
+        String hiddenText = code.replaceAll("\\S", Character.toString(HIDDEN_CHAR));
+        stopExpirationAnimation();
+
+        updateTextViewWithDots(_profileCode,  hiddenText, code);
+        updateTextViewWithDots(_nextProfileCode,  hiddenText, code);
+
         _hidden = true;
     }
 
+    private void updateTextViewWithDots(TextView textView, String hiddenCode, String code) {
+        Paint paint = new Paint();
+        paint.setTextSize(_profileCode.getTextSize());
+
+        // Calculate the difference between the actual code width and the dots width
+        float codeWidth = paint.measureText(code);
+        float dotsWidth = paint.measureText(hiddenCode);
+        float scaleFactor = codeWidth / dotsWidth;
+        scaleFactor = (float)(Math.round(scaleFactor * 10.0) / 10.0);
+        textView.setTextColor(MaterialColors.getColor(textView, R.attr.colorCodeHidden));
+
+        // If scale is higher or equal to 0.8, do nothing and proceed with the normal text rendering
+        if (scaleFactor >= 0.8) {
+            textView.setText(hiddenCode);
+            return;
+        }
+
+        // We need to use an invisible character in order to get the height of the profileCode textview consistent
+        // Tokens without a space (ie Steam TOTP) will get misaligned without this
+        SpannableString dotsString = new SpannableString("\u200B" + hiddenCode);
+
+        // Only scale the digits/characters, skip the spaces
+        int start = 1;
+        for (int i = 0; i <= dotsString.length(); i++) {
+            if (i == dotsString.length() || dotsString.charAt(i) == ' ') {
+                if (i > start) {
+                    dotsString.setSpan(new RelativeSizeSpan(scaleFactor), start, i, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+
+                start = i + 1;
+            }
+        }
+
+        Rect dotsRectBounds = new Rect();
+        paint.getTextBounds(hiddenCode, 1, hiddenCode.length(), dotsRectBounds);
+
+        // Use custom CenterVerticalSpan to make sure the dots are vertically aligned
+        dotsString.setSpan(new CenterVerticalSpan(dotsRectBounds), 1, dotsString.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        textView.setText(dotsString);
+    }
+
+    public void startExpirationAnimation() {
+        stopExpirationAnimation();
+        if (!_showExpirationState) {
+            return;
+        }
+
+        final int totalStateDuration = 7000;
+        TotpInfo info = (TotpInfo) _entry.getInfo();
+        if (info.getPeriod() * 1000 <= totalStateDuration) {
+            _profileCode.setTextColor(MaterialColors.getColor(_profileCode, com.google.android.material.R.attr.colorError));
+            return;
+        }
+
+        // Workaround for when animations are disabled or Android version being too old
+        float durationScale = AnimationsHelper.Scale.ANIMATOR.getValue(itemView.getContext());
+        if (durationScale == 0.0 || Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            int color = MaterialColors.getColor(_profileCode, com.google.android.material.R.attr.colorError);
+            if (info.getMillisTillNextRotation() < totalStateDuration) {
+                _profileCode.setTextColor(color);
+            } else {
+                _expirationHandler.postDelayed(() -> {
+                    _profileCode.setTextColor(color);
+                }, info.getMillisTillNextRotation() - totalStateDuration);
+            }
+
+            return;
+        }
+
+        final int colorShiftDuration = 300;
+        long delayAnimDuration = info.getPeriod() * 1000L - totalStateDuration - colorShiftDuration;
+        ValueAnimator delayAnim = ValueAnimator.ofFloat(0f, 0f);
+        delayAnim.setDuration((long) (delayAnimDuration / durationScale));
+
+        int colorFrom = _profileCode.getCurrentTextColor();
+        int colorTo = MaterialColors.getColor(_profileCode, com.google.android.material.R.attr.colorError);
+        ValueAnimator colorAnim = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo);
+        colorAnim.setDuration((long) (colorShiftDuration / durationScale));
+        colorAnim.addUpdateListener(a -> _profileCode.setTextColor((int) a.getAnimatedValue()));
+
+        final int blinkDuration = 3000;
+        ValueAnimator delayAnim2 = ValueAnimator.ofFloat(0f, 0f);
+        delayAnim2.setDuration((long) ((totalStateDuration - blinkDuration) / durationScale));
+
+        ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(_profileCode, "alpha", 1f, .5f);
+        alphaAnim.setDuration((long) (500 / durationScale));
+        alphaAnim.setRepeatCount(blinkDuration / 500 - 1);
+        alphaAnim.setRepeatMode(ValueAnimator.REVERSE);
+
+        _expirationAnimSet = new AnimatorSet();
+        _expirationAnimSet.playSequentially(delayAnim, colorAnim, delayAnim2, alphaAnim);
+        _expirationAnimSet.start();
+        long currentPlayTime = (info.getPeriod() * 1000L) - info.getMillisTillNextRotation();
+        _expirationAnimSet.setCurrentPlayTime((long) (currentPlayTime / durationScale));
+    }
+
+    private void stopExpirationAnimation() {
+        _expirationHandler.removeCallbacksAndMessages(null);
+        if (_expirationAnimSet != null) {
+            _expirationAnimSet.cancel();
+            _expirationAnimSet = null;
+        }
+
+        int colorTo = MaterialColors.getColor(_profileCode, R.attr.colorCode);
+        _profileCode.setTextColor(colorTo);
+        _profileCode.setAlpha(1f);
+    }
+
     public void showIcon(boolean show) {
         if (show) {
             _profileDrawable.setVisibility(View.VISIBLE);
@@ -363,8 +507,11 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     public void setPaused(boolean paused) {
         _paused = paused;
 
-        if (!_hidden && !_paused) {
-            updateCode();
+        if (_paused) {
+            stopExpirationAnimation();
+        } else if (!_hidden) {
+            updateCodes();
+            startExpirationAnimation();
         }
     }
 
@@ -376,31 +523,33 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         animateAlphaTo(DEFAULT_ALPHA);
     }
 
-    public void animateCopyText(boolean includeSlideAnimation) {
-        _animationHandler.removeCallbacksAndMessages(null);
+    public void animateCopyText() {
+        _copyAnimationHandler.removeCallbacksAndMessages(null);
 
         Animation slideDownFadeIn = AnimationsHelper.loadScaledAnimation(itemView.getContext(), R.anim.slide_down_fade_in);
         Animation slideDownFadeOut = AnimationsHelper.loadScaledAnimation(itemView.getContext(), R.anim.slide_down_fade_out);
         Animation fadeOut = AnimationsHelper.loadScaledAnimation(itemView.getContext(), R.anim.fade_out);
         Animation fadeIn = AnimationsHelper.loadScaledAnimation(itemView.getContext(), R.anim.fade_in);
 
-        if (includeSlideAnimation) {
+        // Use slideDown animation when user is not using Tiles mode
+        if (_viewMode != ViewMode.TILES) {
             _profileCopied.startAnimation(slideDownFadeIn);
-           View fadeOutView = (_accountNamePosition == AccountNamePosition.BELOW) ? _profileName : _description;
+            View fadeOutView = (_accountNamePosition == AccountNamePosition.BELOW) ? _profileName : _description;
+            fadeOutView.startAnimation(slideDownFadeOut);
 
-        fadeOutView.startAnimation(slideDownFadeOut);
-
-            _animationHandler.postDelayed(() -> {
+            _copyAnimationHandler.postDelayed(() -> {
                 _profileCopied.startAnimation(fadeOut);
                 fadeOutView.startAnimation(fadeIn);
             }, 3000);
         } else {
-            _profileCopied.startAnimation(fadeIn);
-            _profileName.startAnimation(fadeOut);
+            View visibleProfileText = _accountNamePosition == AccountNamePosition.BELOW ? _profileName : _profileIssuer;
 
-            _animationHandler.postDelayed(() -> {
+            _profileCopied.startAnimation(fadeIn);
+            visibleProfileText.startAnimation(fadeOut);
+
+            _copyAnimationHandler.postDelayed(() -> {
                 _profileCopied.startAnimation(fadeOut);
-                _profileName.startAnimation(fadeIn);
+                visibleProfileText.startAnimation(fadeIn);
             }, 3000);
         }
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
index 4a9183a9..5b62cb9c 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
@@ -3,79 +3,80 @@ package com.beemdevelopment.aegis.ui.views;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
 import android.annotation.SuppressLint;
+import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.LayoutAnimationController;
-import android.widget.Button;
 import android.widget.LinearLayout;
 
+import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.beemdevelopment.aegis.CopyBehavior;
 import com.beemdevelopment.aegis.AccountNamePosition;
+import com.beemdevelopment.aegis.CopyBehavior;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.SortCategory;
+import com.beemdevelopment.aegis.VibrationPatterns;
 import com.beemdevelopment.aegis.ViewMode;
 import com.beemdevelopment.aegis.helpers.AnimationsHelper;
 import com.beemdevelopment.aegis.helpers.MetricsHelper;
 import com.beemdevelopment.aegis.helpers.SimpleItemTouchHelperCallback;
-import com.beemdevelopment.aegis.helpers.ThemeHelper;
 import com.beemdevelopment.aegis.helpers.UiRefresher;
+import com.beemdevelopment.aegis.helpers.VibrationHelper;
 import com.beemdevelopment.aegis.otp.TotpInfo;
-import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
-import com.beemdevelopment.aegis.ui.glide.IconLoader;
+import com.beemdevelopment.aegis.ui.glide.GlideHelper;
+import com.beemdevelopment.aegis.ui.models.ErrorCardInfo;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.ListPreloader;
 import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.util.ViewPreloadSizeProvider;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-import com.google.android.material.chip.Chip;
-import com.google.android.material.chip.ChipGroup;
-import com.google.android.material.divider.MaterialDividerItemDecoration;
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.shape.CornerFamily;
+import com.google.android.material.shape.ShapeAppearanceModel;
 import com.google.common.base.Strings;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeSet;
+import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 public class EntryListView extends Fragment implements EntryAdapter.Listener {
     private EntryAdapter _adapter;
     private Listener _listener;
     private SimpleItemTouchHelperCallback _touchCallback;
     private ItemTouchHelper _touchHelper;
+    private VibrationHelper _vibrationHelper;
 
     private RecyclerView _recyclerView;
-    private RecyclerView.ItemDecoration _verticalDividerDecoration;
-    private RecyclerView.ItemDecoration _horizontalDividerDecoration;
+    private RecyclerView.ItemDecoration _itemDecoration;
     private ViewPreloadSizeProvider<VaultEntry> _preloadSizeProvider;
     private TotpProgressBar _progressBar;
     private boolean _showProgress;
     private ViewMode _viewMode;
-    private TreeSet<String> _groups;
     private LinearLayout _emptyStateView;
-    private Chip _groupChip;
-    private List<String> _groupFilter;
-    private List<String> _prefGroupFilter;
 
     private UiRefresher _refresher;
 
@@ -96,12 +97,10 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_entry_list_view, container, false);
         _progressBar = view.findViewById(R.id.progressBar);
-        _groupChip = view.findViewById(R.id.chip_group);
-        initializeGroupChip();
+        _vibrationHelper = new VibrationHelper(getContext());
 
         // set up the recycler view
         _recyclerView = view.findViewById(R.id.rvKeyProfiles);
-        _recyclerView.setItemAnimator(null);
         _recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
@@ -129,7 +128,9 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                if (_viewMode == ViewMode.TILES && position == _adapter.getEntriesCount()) {
+                if (_viewMode == ViewMode.TILES
+                        && (_adapter.isPositionFooter(position)
+                        || _adapter.isPositionErrorCard(position))) {
                     return 2;
                 }
 
@@ -146,12 +147,40 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
             @Override
             public void onRefresh() {
                 refresh(false);
+                 _vibrationHelper.vibratePattern(getContext(), VibrationPatterns.REFRESH_CODE);
+            }
+
+            @Override
+            public void onExpiring() {
+                _vibrationHelper.vibratePattern(getContext(), VibrationPatterns.EXPIRING);
             }
 
             @Override
             public long getMillisTillNextRefresh() {
                 return TotpInfo.getMillisTillNextRotation(_adapter.getMostFrequentPeriod());
             }
+
+            @Override
+            public long getPeriodMillis() {
+                return _adapter.getMostFrequentPeriod() * 1000L;
+            }
+        });
+
+        final int rvInitialPaddingLeft = _recyclerView.getPaddingLeft();
+        final int rvInitialPaddingTop = _recyclerView.getPaddingTop();
+        final int rvInitialPaddingRight = _recyclerView.getPaddingRight();
+        final int rvInitialPaddingBottom = _recyclerView.getPaddingBottom();
+
+        ViewCompat.setOnApplyWindowInsetsListener(_recyclerView, (targetView, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+            // left and right padding seems to be handled by fitsSystemWindows="true" on the CoordinatorLayout in activity_main.xml
+            targetView.setPadding(
+                    rvInitialPaddingLeft,
+                    rvInitialPaddingTop,
+                    rvInitialPaddingRight,
+                    rvInitialPaddingBottom + insets.bottom
+            );
+            return WindowInsetsCompat.CONSUMED;
         });
 
         _emptyStateView = view.findViewById(R.id.vEmptyList);
@@ -162,22 +191,40 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _preloadSizeProvider.setView(view);
     }
 
+    public int getScrollPosition() {
+        return ((LinearLayoutManager) _recyclerView.getLayoutManager()).findFirstVisibleItemPosition();
+    }
+
+    public void scrollToPosition(int position) {
+        _recyclerView.getLayoutManager().scrollToPosition(position);
+    }
+
     @Override
     public void onDestroyView() {
         _refresher.destroy();
         super.onDestroyView();
     }
 
-    public void setGroupFilter(List<String> groups, boolean animate) {
-        _groupFilter = groups;
+    public void onRefreshStop() {
+        _refresher.stop();
+    }
+
+    public void onRefreshStart() {
+        if (_adapter.getMostFrequentPeriod() != -1){
+            _refresher.start();
+        }
+    }
+
+    public void setGroups(Collection<VaultGroup> groups) {
+        _adapter.setGroups(groups);
+        updateDividerDecoration();
+    }
+
+    public void setGroupFilter(Set<UUID> groups) {
         _adapter.setGroupFilter(groups);
         _touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
         updateEmptyState();
-        updateGroupChip();
-
-        if (animate) {
-            runEntriesAnimation();
-        }
+        updateDividerDecoration();
     }
 
     public void setIsLongPressDragEnabled(boolean enabled) {
@@ -188,6 +235,14 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _adapter.setCopyBehavior(copyBehavior);
     }
 
+    public void setSearchBehaviorMask(int searchBehaviorMask) {
+        _adapter.setSearchBehaviorMask(searchBehaviorMask);
+    }
+
+    public List<VaultEntry> selectAllEntries() {
+        return _adapter.selectAllEntries();
+    }
+
     public void setActionModeState(boolean enabled, VaultEntry entry) {
         _touchCallback.setSelectedEntry(entry);
         _touchCallback.setIsLongPressDragEnabled(enabled && _adapter.isDragAndDropAllowed());
@@ -202,10 +257,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
     public void setSortCategory(SortCategory sortCategory, boolean apply) {
         _adapter.setSortCategory(sortCategory, apply);
         _touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
-
-        if (apply) {
-            runEntriesAnimation();
-        }
+        updateDividerDecoration();
     }
 
     public void setUsageCounts(Map<UUID, Integer> usageCounts) {
@@ -216,11 +268,19 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         return _adapter.getUsageCounts();
     }
 
+    public void setLastUsedTimestamps(Map<UUID, Long> lastUsedTimestamps) {
+        _adapter.setLastUsedTimestamps(lastUsedTimestamps);
+    }
+
+    public Map<UUID, Long> getLastUsedTimestamps() {
+        return  _adapter.getLastUsedTimestamps();
+    }
+
     public void setSearchFilter(String search) {
         _adapter.setSearchFilter(search);
         _touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
-
         updateEmptyState();
+        updateDividerDecoration();
     }
 
     public void setSelectedEntry(VaultEntry entry) {
@@ -237,7 +297,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
             _touchCallback.setDragFlags(ItemTouchHelper.UP | ItemTouchHelper.DOWN);
         }
 
-        ((GridLayoutManager)_recyclerView.getLayoutManager()).setSpanCount(mode.getColumnSpan());
+        ((GridLayoutManager)_recyclerView.getLayoutManager()).setSpanCount(mode.getSpanCount());
     }
 
     public void startDrag(RecyclerView.ViewHolder viewHolder) {
@@ -319,11 +379,11 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
             _progressBar.setVisibility(View.VISIBLE);
             _progressBar.setPeriod(period);
             _progressBar.start();
-            _refresher.start();
+            onRefreshStart();
         } else {
             _progressBar.setVisibility(View.GONE);
             _progressBar.stop();
-            _refresher.stop();
+            onRefreshStop();
         }
     }
 
@@ -334,10 +394,6 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         }
     }
 
-    public void setPrefGroupFilter(List<String> groupFilter) {
-        _prefGroupFilter = groupFilter;
-    }
-
     public void setCodeGroupSize(Preferences.CodeGrouping codeGrouping) {
         _adapter.setCodeGroupSize(codeGrouping);
     }
@@ -354,6 +410,14 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _adapter.setShowIcon(showIcon);
     }
 
+    public void setShowNextCode(boolean showNextCode) {
+        _adapter.setShowNextCode(showNextCode);
+    }
+
+    public void setShowExpirationState(boolean showExpirationState) {
+        _adapter.setShowExpirationState(showExpirationState);
+    }
+
     public void setHighlightEntry(boolean highlightEntry) {
         _adapter.setHighlightEntry(highlightEntry);
     }
@@ -370,61 +434,61 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _adapter.setTapToRevealTime(number);
     }
 
-    public void addEntry(VaultEntry entry) {
-        addEntry(entry, false);
+    public void setErrorCardInfo(ErrorCardInfo info) {
+        _adapter.setErrorCardInfo(info);
     }
 
     @SuppressLint("ClickableViewAccessibility")
-    public void addEntry(VaultEntry entry, boolean focusEntry) {
-        int position = _adapter.addEntry(entry);
-        updateEmptyState();
+    public void onEntryAdded(VaultEntry entry) {
+        int position = _adapter.getEntryPosition(entry);
+        if (position < 0) {
+            return;
+        }
 
         LinearLayoutManager layoutManager = (LinearLayoutManager) _recyclerView.getLayoutManager();
-        if (focusEntry && position >= 0) {
-            if ((_recyclerView.canScrollVertically(1) && position > layoutManager.findLastCompletelyVisibleItemPosition())
-                    || (_recyclerView.canScrollVertically(-1) && position < layoutManager.findFirstCompletelyVisibleItemPosition())) {
-                boolean smoothScroll = !AnimationsHelper.Scale.TRANSITION.isZero(requireContext());
-                RecyclerView.OnScrollListener scrollListener = new RecyclerView.OnScrollListener() {
-                    private void handleScroll() {
-                        _recyclerView.removeOnScrollListener(this);
-                        _recyclerView.setOnTouchListener(null);
-                        tempHighlightEntry(entry);
-                    }
-
-                    @Override
-                    public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-                        if (smoothScroll && newState == RecyclerView.SCROLL_STATE_IDLE) {
-                            handleScroll();
-                        }
-                    }
-
-                    @Override
-                    public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                        if (!smoothScroll) {
-                            handleScroll();
-                        }
-                    }
-                };
-                _recyclerView.addOnScrollListener(scrollListener);
-                _recyclerView.setOnTouchListener((v, event) -> {
-                    if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                        _recyclerView.removeOnScrollListener(scrollListener);
-                        _recyclerView.stopScroll();
-                        _recyclerView.setOnTouchListener(null);
-                    }
-
-                    return false;
-                });
-                // We can't easily control the speed of the smooth scroll animation, but we
-                // can at least disable it if animations are disabled
-                if (smoothScroll) {
-                    _recyclerView.smoothScrollToPosition(position);
-                } else {
-                    _recyclerView.scrollToPosition(position);
+        if ((_recyclerView.canScrollVertically(1) && position > layoutManager.findLastCompletelyVisibleItemPosition())
+                || (_recyclerView.canScrollVertically(-1) && position < layoutManager.findFirstCompletelyVisibleItemPosition())) {
+            boolean smoothScroll = !AnimationsHelper.Scale.TRANSITION.isZero(requireContext());
+            RecyclerView.OnScrollListener scrollListener = new RecyclerView.OnScrollListener() {
+                private void handleScroll() {
+                    _recyclerView.removeOnScrollListener(this);
+                    _recyclerView.setOnTouchListener(null);
+                    tempHighlightEntry(entry);
                 }
+
+                @Override
+                public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+                    if (smoothScroll && newState == RecyclerView.SCROLL_STATE_IDLE) {
+                        handleScroll();
+                    }
+                }
+
+                @Override
+                public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                    if (!smoothScroll) {
+                        handleScroll();
+                    }
+                }
+            };
+            _recyclerView.addOnScrollListener(scrollListener);
+            _recyclerView.setOnTouchListener((v, event) -> {
+                if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                    _recyclerView.removeOnScrollListener(scrollListener);
+                    _recyclerView.stopScroll();
+                    _recyclerView.setOnTouchListener(null);
+                }
+
+                return false;
+            });
+            // We can't easily control the speed of the smooth scroll animation, but we
+            // can at least disable it if animations are disabled
+            if (smoothScroll) {
+                _recyclerView.smoothScrollToPosition(position);
             } else {
-                tempHighlightEntry(entry);
+                _recyclerView.scrollToPosition(position);
             }
+        } else {
+            tempHighlightEntry(entry);
         }
     }
 
@@ -435,27 +499,14 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _adapter.focusEntry(entry, secondsToFocus);
     }
 
-    public void addEntries(Collection<VaultEntry> entries) {
-        _adapter.addEntries(entries);
-        updateEmptyState();
-    }
-
-    public void removeEntry(VaultEntry entry) {
-        _adapter.removeEntry(entry);
-        updateEmptyState();
-    }
-
-    public void removeEntry(UUID uuid) {
-        _adapter.removeEntry(uuid);
+    public void setEntries(Collection<VaultEntry> entries) {
+        _adapter.setEntries(new ArrayList<>(entries));
         updateEmptyState();
     }
 
     public void clearEntries() {
         _adapter.clearEntries();
-    }
-
-    public void replaceEntry(UUID uuid, VaultEntry newEntry) {
-        _adapter.replaceEntry(uuid, newEntry);
+        updateEmptyState();
     }
 
     public void runEntriesAnimation() {
@@ -465,136 +516,28 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _recyclerView.scheduleLayoutAnimation();
     }
 
-    private void addChipTo(ChipGroup chipGroup, String group) {
-        Chip chip = (Chip) getLayoutInflater().inflate(R.layout.chip_material, null, false);
-        chip.setText(group == null ? getString(R.string.no_group) : group);
-        chip.setCheckable(true);
-        chip.setChecked(_groupFilter != null && _groupFilter.contains(group));
-        chip.setCheckedIconVisible(true);
-        chip.setOnCheckedChangeListener((group1, checkedId) -> {
-            List<String> groupFilter = getGroupFilter(chipGroup);
-            setGroupFilter(groupFilter, true);
-        });
-        chip.setTag(group == null ? new Object() : null);
-        chipGroup.addView(chip);
-    }
-
-    private void initializeGroupChip() {
-        View view = getLayoutInflater().inflate(R.layout.dialog_select_groups, null);
-        BottomSheetDialog dialog = new BottomSheetDialog(requireContext());
-        dialog.setContentView(view);
-
-        ChipGroup chipGroup = view.findViewById(R.id.groupChipGroup);
-        Button clearButton = view.findViewById(R.id.btnClear);
-        Button saveButton = view.findViewById(R.id.btnSave);
-        clearButton.setOnClickListener(v -> {
-            chipGroup.clearCheck();
-            List<String> groupFilter = Collections.emptyList();
-            if (_listener != null) {
-                _listener.onSaveGroupFilter(groupFilter);
-            }
-            setGroupFilter(groupFilter, true);
-            dialog.dismiss();
-        });
-
-        saveButton.setOnClickListener(v -> {
-            List<String> groupFilter = getGroupFilter(chipGroup);
-            if (_listener != null) {
-                _listener.onSaveGroupFilter(groupFilter);
-            }
-            setGroupFilter(groupFilter, true);
-            dialog.dismiss();
-        });
-
-        _groupChip.setOnClickListener(v -> {
-            chipGroup.removeAllViews();
-
-            for (String group : _groups) {
-                addChipTo(chipGroup, group);
-            }
-            addChipTo(chipGroup, null);
-
-            Dialogs.showSecureDialog(dialog);
-        });
-    }
-
-    private static List<String> getGroupFilter(ChipGroup chipGroup) {
-        return chipGroup.getCheckedChipIds().stream()
-                .map(i -> {
-                    Chip chip = chipGroup.findViewById(i);
-                    if (chip.getTag() != null) {
-                        return null;
-                    }
-                    return chip. getText().toString();
-                })
-                .collect(Collectors.toList());
-    }
-
-    private void updateGroupChip() {
-        if (_groupFilter.isEmpty()) {
-            _groupChip.setText(R.string.groups);
-        } else {
-            _groupChip.setText(String.format("%s (%d)", getString(R.string.groups), _groupFilter.size()));
-        }
-    }
-
     private void setShowProgress(boolean showProgress) {
         _showProgress = showProgress;
         updateDividerDecoration();
     }
 
-    public void setGroups(TreeSet<String> groups) {
-        _groups = groups;
-        _groupChip.setVisibility(_groups.isEmpty() ? View.GONE : View.VISIBLE);
-        updateDividerDecoration();
-
-        if (_prefGroupFilter != null) {
-            List<String> groupFilter = cleanGroupFilter(_prefGroupFilter);
-            _prefGroupFilter = null;
-            if (!groupFilter.isEmpty()) {
-                setGroupFilter(groupFilter, false);
-            }
-        } else if (_groupFilter != null) {
-            List<String> groupFilter = cleanGroupFilter(_groupFilter);
-            if (!_groupFilter.equals(groupFilter)) {
-                setGroupFilter(groupFilter, true);
-            }
-        }
-    }
-
-    private List<String> cleanGroupFilter(List<String> groupFilter) {
-       return groupFilter.stream()
-                .filter(g -> g == null || _groups.contains(g))
-                .collect(Collectors.toList());
-    }
-
     private void updateDividerDecoration() {
-        if (_verticalDividerDecoration != null) {
-            _recyclerView.removeItemDecoration(_verticalDividerDecoration);
+        if (_itemDecoration != null) {
+            _recyclerView.removeItemDecoration(_itemDecoration);
         }
 
-        if(_horizontalDividerDecoration != null) {
-            _recyclerView.removeItemDecoration(_horizontalDividerDecoration);
-        }
-
-        float height = _viewMode.getDividerHeight();
-        float width = _viewMode.getDividerWidth();
-        if (_showProgress && height == 0) {
-            _verticalDividerDecoration = new CompactDividerDecoration();
+        float offset = _viewMode.getItemOffset();
+        if (_viewMode == ViewMode.TILES) {
+            _itemDecoration = new TileSpaceItemDecoration(offset);
         } else {
-            _verticalDividerDecoration = new VerticalSpaceItemDecoration(height);
+            _itemDecoration = new VerticalSpaceItemDecoration(offset);
         }
 
-        if (width != 0) {
-            _horizontalDividerDecoration = new TileSpaceItemDecoration(width, height);
-            _recyclerView.addItemDecoration(_horizontalDividerDecoration);
-        } else {
-            _recyclerView.addItemDecoration(_verticalDividerDecoration);
-        }
+        _recyclerView.addItemDecoration(_itemDecoration);
     }
 
     private void updateEmptyState() {
-        if (_adapter.getEntriesCount() > 0) {
+        if (_adapter.getShownEntriesCount() > 0) {
             _recyclerView.setVisibility(View.VISIBLE);
             _emptyStateView.setVisibility(View.GONE);
         } else {
@@ -616,37 +559,22 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         void onSelect(VaultEntry entry);
         void onDeselect(VaultEntry entry);
         void onListChange();
-        void onSaveGroupFilter(List<String> groupFilter);
+        void onSaveGroupFilter(Set<UUID> groupFilter);
         void onEntryListTouch();
     }
 
-    private class CompactDividerDecoration extends MaterialDividerItemDecoration {
-        public CompactDividerDecoration() {
-            super(requireContext(), DividerItemDecoration.VERTICAL);
-            setDividerColor(ThemeHelper.getThemeColor(R.attr.divider, requireContext().getTheme()));
-            setLastItemDecorated(false);
-            setDividerThickness(MetricsHelper.convertDpToPixels(requireContext(), 0.5f));
-        }
-
-        @Override
-        public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
-            if (_adapter.isPositionFooter(parent.getChildAdapterPosition(view))) {
-                int pixels = MetricsHelper.convertDpToPixels(requireContext(), 20);
-                outRect.top = pixels;
-                outRect.bottom = pixels;
-                return;
-            }
-
-            super.getItemOffsets(outRect, view, parent, state);
-        }
-    }
-
     private class VerticalSpaceItemDecoration extends RecyclerView.ItemDecoration {
-        private final int _height;
+        private final int _offset;
+        private final ShapeAppearanceModel _defaultShapeModel;
 
-        private VerticalSpaceItemDecoration(float dp) {
-            // convert dp to pixels
-            _height = MetricsHelper.convertDpToPixels(requireContext(), dp);
+        private VerticalSpaceItemDecoration(float offset) {
+            _offset = MetricsHelper.convertDpToPixels(requireContext(), offset);
+
+            int shapeAppearanceId = getStyledAttrs(R.style.Widget_Aegis_EntryCardView,
+                    com.google.android.material.R.attr.shapeAppearance);
+
+            _defaultShapeModel = ShapeAppearanceModel.builder(
+                    requireContext(), shapeAppearanceId, 0).build();
         }
 
         @Override
@@ -656,54 +584,81 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
                 return;
             }
 
-            // The footer always has a top and bottom margin
+            // The error card and the footer always have a top and bottom margin
+            if (_adapter.isPositionErrorCard(adapterPosition)) {
+                outRect.top = _viewMode == ViewMode.COMPACT ? _offset * 4 : _offset;
+                outRect.bottom = _offset;
+                return;
+            }
             if (_adapter.isPositionFooter(adapterPosition)) {
-                outRect.top = _height;
-                outRect.bottom = _height;
+                outRect.top = _offset * 2;
+                outRect.bottom = _offset;
                 return;
             }
 
-            // The first entry should have a top margin, but only if the group chip is not shown
-            if (adapterPosition == 0 && (_groups == null || _groups.isEmpty())) {
-                outRect.top = _height;
+            int entryIndex = _adapter.translateEntryPosToIndex(adapterPosition);
+            // The first entry should have a top margin, but only if the error card is not shown
+            if (entryIndex == 0 && !_adapter.isErrorCardShown()) {
+                outRect.top = _offset;
             }
 
             // Only non-favorite entries have a bottom margin, except for the final favorite entry
             int totalFavorites = _adapter.getShownFavoritesCount();
             if (totalFavorites == 0
-                    || (adapterPosition < _adapter.getEntriesCount() && !_adapter.getEntryAt(adapterPosition).isFavorite())
-                    || totalFavorites == adapterPosition + 1) {
-                outRect.bottom = _height;
-            }
-
-            if (totalFavorites > 0) {
-                // If this entry is the last favorite entry in the list, it should always have
-                // a bottom margin, regardless of the view mode
-                if (adapterPosition == totalFavorites - 1) {
-                    outRect.bottom = _height;
-                }
-
-                // If this is the first non-favorite entry, it should have a top margin
-                if (adapterPosition == totalFavorites) {
-                    outRect.top = _height;
-                }
+                    || (entryIndex < _adapter.getShownEntriesCount() && !_adapter.getEntryAtPosition(adapterPosition).isFavorite())
+                    || totalFavorites == entryIndex + 1) {
+                outRect.bottom = _offset;
             }
 
             // The last entry should never have a bottom margin
-            if (_adapter.getEntriesCount() == adapterPosition + 1) {
+            if (_adapter.getShownEntriesCount() == entryIndex + 1) {
                 outRect.bottom = 0;
             }
+
+            decorateFavoriteEntries((MaterialCardView) view, parent);
+        }
+
+        private void decorateFavoriteEntries(@NonNull MaterialCardView view, @NonNull RecyclerView parent) {
+            int adapterPosition = parent.getChildAdapterPosition(view);
+            int entryIndex = _adapter.translateEntryPosToIndex(adapterPosition);
+            int totalFavorites = _adapter.getShownFavoritesCount();
+
+            ShapeAppearanceModel.Builder builder = _defaultShapeModel.toBuilder();
+            if (entryIndex < totalFavorites) {
+                if ((entryIndex == 0 && totalFavorites > 1) || (entryIndex < (totalFavorites - 1))) {
+                    builder.setBottomLeftCorner(CornerFamily.ROUNDED, 0);
+                    builder.setBottomRightCorner(CornerFamily.ROUNDED, 0);
+                }
+                if (entryIndex > 0) {
+                    builder.setTopLeftCorner(CornerFamily.ROUNDED, 0);
+                    builder.setTopRightCorner(CornerFamily.ROUNDED, 0);
+                }
+            }
+
+            view.setShapeAppearanceModel(builder.build());
+            view.setClipToOutline(true);
+        }
+
+        private int getStyledAttrs(@StyleRes int styleId, @AttrRes int attrId) {
+            TypedArray cardAttrs = null;
+            try {
+                cardAttrs = requireContext().obtainStyledAttributes(styleId, new int[]{attrId});
+                TypedValue value = new TypedValue();
+                cardAttrs.getValue(0, value);
+                return value.data;
+            } finally {
+                if (cardAttrs != null) {
+                    cardAttrs.recycle();
+                }
+            }
         }
     }
 
     private class TileSpaceItemDecoration extends RecyclerView.ItemDecoration {
-        private final int _width;
-        private final int _height;
+        private final int _offset;
 
-        private TileSpaceItemDecoration(float width, float height) {
-            // convert dp to pixels
-            _width = MetricsHelper.convertDpToPixels(requireContext(), width);
-            _height = MetricsHelper.convertDpToPixels(requireContext(), height);
+        private TileSpaceItemDecoration(float offset) {
+            _offset = MetricsHelper.convertDpToPixels(requireContext(), offset);
         }
 
         @Override
@@ -713,10 +668,21 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
                 return;
             }
 
-            outRect.left = _width;
-            outRect.right = _width;
-            outRect.top = _height;
-            outRect.bottom = _height;
+            outRect.left = _offset;
+            outRect.right = _offset;
+            outRect.top = _offset;
+            outRect.bottom = _offset;
+
+            if (_adapter.isPositionErrorCard(adapterPosition)
+                    || (isInFirstEntryRow(adapterPosition) && !_adapter.isErrorCardShown())
+                    || _adapter.isPositionFooter(adapterPosition)) {
+                outRect.top *= 2;
+            }
+        }
+
+        private boolean isInFirstEntryRow(int pos) {
+            int index = _adapter.translateEntryPosToIndex(pos);
+            return index >= 0 && index < _viewMode.getSpanCount();
         }
     }
 
@@ -728,22 +694,24 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
                 return Collections.emptyList();
             }
 
-            VaultEntry entry = _adapter.getEntryAt(position);
+            if (_adapter.getItemViewType(position) == R.layout.card_error) {
+                return Collections.emptyList();
+            }
+
+            VaultEntry entry = _adapter.getEntryAtPosition(position);
             if (!entry.hasIcon()) {
                 return Collections.emptyList();
             }
+
             return Collections.singletonList(entry);
         }
 
         @Nullable
         @Override
         public RequestBuilder<Drawable> getPreloadRequestBuilder(@NonNull VaultEntry entry) {
-            return Glide.with(EntryListView.this)
-                        .asDrawable()
-                        .load(entry)
-                        .set(IconLoader.ICON_TYPE, entry.getIconType())
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .skipMemoryCache(false);
+            RequestBuilder<Drawable> rb = Glide.with(EntryListView.this)
+                    .load(entry.getIcon());
+            return GlideHelper.setCommonOptions(rb, entry.getIcon().getType());
         }
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/ErrorCardHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/ErrorCardHolder.java
new file mode 100644
index 00000000..649212ba
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/ErrorCardHolder.java
@@ -0,0 +1,23 @@
+package com.beemdevelopment.aegis.ui.views;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.ui.models.ErrorCardInfo;
+import com.google.android.material.card.MaterialCardView;
+
+public class ErrorCardHolder extends RecyclerView.ViewHolder {
+    public ErrorCardHolder(@NonNull View itemView, ErrorCardInfo info) {
+        super(itemView);
+
+        TextView errorTextView = itemView.findViewById(R.id.text_error_bar);
+        errorTextView.setText(info.getMessage());
+
+        MaterialCardView errorCard = itemView.findViewById(R.id.card_error);
+        errorCard.setOnClickListener(info.getListener());
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/GroupAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/GroupAdapter.java
index 3d04e3a9..0e3346fc 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/GroupAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/GroupAdapter.java
@@ -7,19 +7,23 @@ import android.view.ViewGroup;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.helpers.ItemTouchHelperAdapter;
+import com.beemdevelopment.aegis.util.CollectionUtils;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 
 import java.util.ArrayList;
+import java.util.UUID;
 
-public class GroupAdapter extends RecyclerView.Adapter<GroupHolder> {
+public class GroupAdapter extends RecyclerView.Adapter<GroupHolder> implements ItemTouchHelperAdapter {
     private GroupAdapter.Listener _listener;
-    private ArrayList<String> _groups;
+    private ArrayList<VaultGroup> _groups;
 
     public GroupAdapter(GroupAdapter.Listener listener) {
         _listener = listener;
         _groups = new ArrayList<>();
     }
 
-    public void addGroup(String group) {
+    public void addGroup(VaultGroup group) {
         _groups.add(group);
 
         int position = getItemCount() - 1;
@@ -30,7 +34,18 @@ public class GroupAdapter extends RecyclerView.Adapter<GroupHolder> {
         }
     }
 
-    public void removeGroup(String group) {
+    public ArrayList<VaultGroup> getGroups() {
+        return _groups;
+    }
+
+    public void replaceGroup(UUID uuid, VaultGroup newGroup) {
+        VaultGroup oldGroup = getGroupByUUID(uuid);
+        int position = _groups.indexOf(oldGroup);
+        _groups.set(position, newGroup);
+        notifyItemChanged(position);
+    }
+
+    public void removeGroup(VaultGroup group) {
         int position = _groups.indexOf(group);
         _groups.remove(position);
         notifyItemRemoved(position);
@@ -45,18 +60,44 @@ public class GroupAdapter extends RecyclerView.Adapter<GroupHolder> {
     @Override
     public void onBindViewHolder(GroupHolder holder, int position) {
         holder.setData(_groups.get(position));
+        holder.setOnEditClickListener(v -> {
+            int position12 = holder.getAdapterPosition();
+            _listener.onEditGroup(_groups.get(position12));
+        });
         holder.setOnDeleteClickListener(v -> {
             int position12 = holder.getAdapterPosition();
             _listener.onRemoveGroup(_groups.get(position12));
         });
     }
 
+    @Override
+    public void onItemMove(int firstPosition, int secondPosition) {
+        CollectionUtils.move(_groups, firstPosition, secondPosition);
+        notifyItemMoved(firstPosition, secondPosition);
+    }
+
+    @Override
+    public void onItemDismiss(int position) { }
+
+    @Override
+    public void onItemDrop(int position) { }
+
+    private VaultGroup getGroupByUUID(UUID uuid) {
+        for (VaultGroup group : _groups) {
+            if (group.getUUID().equals(uuid)) {
+                return group;
+            }
+        }
+        return null;
+    }
+
     @Override
     public int getItemCount() {
         return _groups.size();
     }
 
     public interface Listener {
-        void onRemoveGroup(String group);
+        void onEditGroup(VaultGroup group);
+        void onRemoveGroup(VaultGroup group);
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/GroupHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/GroupHolder.java
index ed490500..3d074887 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/GroupHolder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/GroupHolder.java
@@ -7,19 +7,26 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.vault.VaultGroup;
 
 public class GroupHolder extends RecyclerView.ViewHolder {
     private TextView _slotName;
+    private ImageView _buttonEdit;
     private ImageView _buttonDelete;
 
     public GroupHolder(final View view) {
         super(view);
         _slotName = view.findViewById(R.id.text_group_name);
+        _buttonEdit = view.findViewById(R.id.button_edit);
         _buttonDelete = view.findViewById(R.id.button_delete);
     }
 
-    public void setData(String groupName) {
-        _slotName.setText(groupName);
+    public void setData(VaultGroup group) {
+        _slotName.setText(group.getName());
+    }
+
+    public void setOnEditClickListener(View.OnClickListener listener) {
+        _buttonEdit.setOnClickListener(listener);
     }
 
     public void setOnDeleteClickListener(View.OnClickListener listener) {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconAdapter.java
index a35e7a01..55043679 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconAdapter.java
@@ -18,7 +18,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class IconAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private final Context _context;
@@ -40,7 +39,7 @@ public class IconAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     /**
      * Loads all icons from the given icon pack into this adapter. Any icons added before this call will be overwritten.
      */
-    public void loadIcons(IconPack pack) {
+    public void loadIcons(IconPack pack, boolean showAddCustom) {
         _pack = pack;
         _query = null;
         _icons = new ArrayList<>(_pack.getIcons());
@@ -60,7 +59,11 @@ public class IconAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 .count();
 
         List<IconPack.Icon> suggested = pack.getSuggestedIcons(_issuer);
-        suggested.add(0, new DummyIcon(_context.getString(R.string.icon_custom)));
+
+        if (showAddCustom) {
+            suggested.add(0, new DummyIcon(_context.getString(R.string.icon_custom)));
+        }
+
         if (suggested.size() > 0) {
             CategoryHeader category = new CategoryHeader(_context.getString(R.string.suggested));
             category.setIsCollapsed(false);
@@ -90,13 +93,9 @@ public class IconAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         _query = query;
 
         if (_query == null) {
-            loadIcons(_pack);
+            loadIcons(_pack, false);
         } else {
-            _icons = _pack.getIcons().stream()
-                    .filter(i -> i.isSuggestedFor(query))
-                    .collect(Collectors.toList());
-
-            Collections.sort(_icons, Comparator.comparing(IconPack.Icon::getName));
+            _icons = _pack.getSuggestedIcons(query);
             notifyDataSetChanged();
         }
     }
@@ -232,16 +231,8 @@ public class IconAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     }
 
     public static class DummyIcon extends IconPack.Icon {
-        private final String _name;
-
         protected DummyIcon(String name) {
-            super(null, null, null);
-            _name = name;
-        }
-
-        @Override
-        public String getName() {
-            return _name;
+            super(name, null, null, null);
         }
 
         @Override
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconHolder.java
index a583d3fe..06c381cf 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconHolder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconHolder.java
@@ -8,13 +8,11 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.helpers.IconViewHelper;
-import com.beemdevelopment.aegis.helpers.ThemeHelper;
 import com.beemdevelopment.aegis.icons.IconPack;
 import com.beemdevelopment.aegis.icons.IconType;
-import com.beemdevelopment.aegis.ui.glide.IconLoader;
+import com.beemdevelopment.aegis.ui.glide.GlideHelper;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.google.android.material.color.MaterialColors;
 
 import java.io.File;
 
@@ -41,19 +39,12 @@ public class IconHolder extends RecyclerView.ViewHolder {
 
     public void loadIcon(Context context) {
         if (_isCustom) {
-            int tint = ThemeHelper.getThemeColor(R.attr.iconColorPrimary, context.getTheme());
+            Glide.with(context).clear(_imageView);
+            int tint = MaterialColors.getColor(itemView, com.google.android.material.R.attr.colorOnSurfaceVariant);
             _imageView.setColorFilter(tint);
-            _imageView.setImageResource(R.drawable.ic_plus_black_24dp);
+            _imageView.setImageResource(R.drawable.ic_outline_add_24);
         } else {
-            _imageView.setImageTintList(null);
-            IconViewHelper.setLayerType(_imageView, _iconType);
-            Glide.with(context)
-                    .asDrawable()
-                    .load(_iconFile)
-                    .set(IconLoader.ICON_TYPE, _iconType)
-                    .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    .skipMemoryCache(false)
-                    .into(_imageView);
+            GlideHelper.loadIconFile(Glide.with(context), _iconFile, _iconType, _imageView);
         }
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconPackAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconPackAdapter.java
index ec232854..3fb64f09 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconPackAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/IconPackAdapter.java
@@ -35,8 +35,10 @@ public class IconPackAdapter extends RecyclerView.Adapter<IconPackHolder> {
 
     public void removeIconPack(IconPack pack) {
         int position = _iconPacks.indexOf(pack);
-        _iconPacks.remove(position);
-        notifyItemRemoved(position);
+        if (position >= 0) {
+            _iconPacks.remove(position);
+            notifyItemRemoved(position);
+        }
     }
 
     @NonNull
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/ImportEntriesAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/ImportEntriesAdapter.java
index 024472b1..5f18160f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/ImportEntriesAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/ImportEntriesAdapter.java
@@ -12,6 +12,7 @@ import com.beemdevelopment.aegis.ui.models.ImportEntry;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 public class ImportEntriesAdapter extends RecyclerView.Adapter<ImportEntryHolder> {
     private List<ImportEntry> _entries;
@@ -67,6 +68,14 @@ public class ImportEntriesAdapter extends RecyclerView.Adapter<ImportEntryHolder
         return entries;
     }
 
+    public void setCheckboxStates(List<UUID> uuids, boolean state) {
+        for (ImportEntry entry : _entries) {
+            if(uuids.contains(entry.getEntry().getUUID())) {
+                entry.setIsChecked(state);
+            }
+        }
+    }
+
     public void toggleCheckboxes() {
         int checkedEntries = getCheckedEntries().size();
         if (checkedEntries == 0 || checkedEntries != _entries.size()) {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/TotpProgressBar.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/TotpProgressBar.java
index cbdbdb87..3ed61dd9 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/TotpProgressBar.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/TotpProgressBar.java
@@ -2,14 +2,11 @@ package com.beemdevelopment.aegis.ui.views;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.os.Build;
 import android.os.Handler;
 import android.util.AttributeSet;
 import android.view.animation.LinearInterpolator;
 import android.widget.ProgressBar;
 
-import androidx.annotation.RequiresApi;
-
 import com.beemdevelopment.aegis.helpers.AnimationsHelper;
 import com.beemdevelopment.aegis.otp.TotpInfo;
 
@@ -30,7 +27,6 @@ public class TotpProgressBar extends ProgressBar {
         super(context, attrs, defStyleAttr);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public TotpProgressBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/util/UUIDMap.java b/app/src/main/java/com/beemdevelopment/aegis/util/UUIDMap.java
index a1aea132..a8294d81 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/util/UUIDMap.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/util/UUIDMap.java
@@ -9,6 +9,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -99,7 +100,14 @@ public class UUIDMap <T extends UUIDMap.Value> implements Iterable<T>, Serializa
      * Reports whether the internal map contains a value with the UUID of the given value.
      */
     public boolean has(T value) {
-        return _map.containsKey(value.getUUID());
+        return has(value.getUUID());
+    }
+
+    /**
+     * Reports whether the internal map contains a value with the given UUID.
+     */
+    public boolean has(UUID uuid) {
+        return _map.containsKey(uuid);
     }
 
     /**
@@ -161,7 +169,7 @@ public class UUIDMap <T extends UUIDMap.Value> implements Iterable<T>, Serializa
                 return false;
             }
 
-            return getUUID().equals(((Value) o).getUUID());
+            return Objects.equals(getUUID(), ((Value) o).getUUID());
         }
     }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/Vault.java b/app/src/main/java/com/beemdevelopment/aegis/vault/Vault.java
index 74ea038c..74f8a126 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/Vault.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/Vault.java
@@ -8,9 +8,17 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Optional;
+import java.util.UUID;
+
 public class Vault {
-    private static final int VERSION = 2;
-    private UUIDMap<VaultEntry> _entries = new UUIDMap<>();
+    private static final int VERSION = 3;
+    private final UUIDMap<VaultEntry> _entries = new UUIDMap<>();
+    private final UUIDMap<VaultGroup> _groups = new UUIDMap<>();
+    private boolean _iconsOptimized = true;
+
+    // Whether we've migrated the group list to the new format while parsing the vault
+    private boolean _isGroupsMigrationFresh = false;
 
     public JSONObject toJson() {
         return toJson(null);
@@ -18,16 +26,25 @@ public class Vault {
 
     public JSONObject toJson(@Nullable EntryFilter filter) {
         try {
-            JSONArray array = new JSONArray();
+            JSONArray entriesArray = new JSONArray();
             for (VaultEntry e : _entries) {
                 if (filter == null || filter.includeEntry(e)) {
-                    array.put(e.toJson());
+                    entriesArray.put(e.toJson());
                 }
             }
 
+            // Always include all groups, even if they're not assigned to any entry (before or after the entry filter)
+            JSONArray groupsArray = new JSONArray();
+            for (VaultGroup group : _groups) {
+                groupsArray.put(group.toJson());
+            }
+
             JSONObject obj = new JSONObject();
             obj.put("version", VERSION);
-            obj.put("entries", array);
+            obj.put("entries", entriesArray);
+            obj.put("groups", groupsArray);
+            obj.put("icons_optimized", _iconsOptimized);
+
             return obj;
         } catch (JSONException e) {
             throw new RuntimeException(e);
@@ -37,6 +54,7 @@ public class Vault {
     public static Vault fromJson(JSONObject obj) throws VaultException {
         Vault vault = new Vault();
         UUIDMap<VaultEntry> entries = vault.getEntries();
+        UUIDMap<VaultGroup> groups = vault.getGroups();
 
         try {
             int ver = obj.getInt("version");
@@ -44,11 +62,36 @@ public class Vault {
                 throw new VaultException("Unsupported version");
             }
 
+            if (obj.has("groups")) {
+                JSONArray groupsArray = obj.getJSONArray("groups");
+                for (int i = 0; i < groupsArray.length(); i++) {
+                    VaultGroup group = VaultGroup.fromJson(groupsArray.getJSONObject(i));
+                    if (!groups.has(group)) {
+                        groups.add(group);
+                    }
+                }
+            }
+
             JSONArray array = obj.getJSONArray("entries");
             for (int i = 0; i < array.length(); i++) {
                 VaultEntry entry = VaultEntry.fromJson(array.getJSONObject(i));
+                if (vault.migrateOldGroup(entry)) {
+                    vault.setGroupsMigrationFresh();
+                }
+
+                // check the vault has a group corresponding to each one the entry claims to be in
+                for (UUID groupUuid: entry.getGroups()) {
+                    if (!groups.has(groupUuid)) {
+                        entry.removeGroup(groupUuid);
+                    }
+                }
+
                 entries.add(entry);
             }
+
+            if (!obj.optBoolean("icons_optimized")) {
+                vault.setIconsOptimized(false);
+            }
         } catch (VaultEntryException | JSONException e) {
             throw new VaultException(e);
         }
@@ -56,10 +99,52 @@ public class Vault {
         return vault;
     }
 
+    private void setGroupsMigrationFresh() {
+        _isGroupsMigrationFresh = true;
+    }
+
+    public boolean isGroupsMigrationFresh() {
+        return _isGroupsMigrationFresh;
+    }
+
+    public void setIconsOptimized(boolean optimized) {
+        _iconsOptimized = optimized;
+    }
+
+    public boolean areIconsOptimized() {
+        return _iconsOptimized;
+    }
+
+    public boolean migrateOldGroup(VaultEntry entry) {
+        if (entry.getOldGroup() != null) {
+            Optional<VaultGroup> optGroup = getGroups().getValues()
+                                                 .stream()
+                                                 .filter(g -> g.getName().equals(entry.getOldGroup()))
+                                                 .findFirst();
+
+            if (optGroup.isPresent()) {
+                entry.addGroup(optGroup.get().getUUID());
+            } else {
+                VaultGroup group = new VaultGroup(entry.getOldGroup());
+                getGroups().add(group);
+                entry.addGroup(group.getUUID());
+            }
+
+            entry.setOldGroup(null);
+            return true;
+        }
+
+        return false;
+    }
+
     public UUIDMap<VaultEntry> getEntries() {
         return _entries;
     }
 
+    public UUIDMap<VaultGroup> getGroups() {
+        return _groups;
+    }
+
     public interface EntryFilter {
         boolean includeEntry(VaultEntry entry);
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java
index 47d16523..813523ef 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java
@@ -1,5 +1,6 @@
 package com.beemdevelopment.aegis.vault;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.UriPermission;
 import android.net.Uri;
@@ -9,7 +10,9 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.documentfile.provider.DocumentFile;
 
+import com.beemdevelopment.aegis.BackupsVersioningStrategy;
 import com.beemdevelopment.aegis.Preferences;
+import com.beemdevelopment.aegis.database.AuditLogRepository;
 import com.beemdevelopment.aegis.util.IOUtils;
 
 import java.io.File;
@@ -37,30 +40,75 @@ public class VaultBackupManager {
             new StrictDateFormat("yyyyMMdd-HHmmss", Locale.ENGLISH);
 
     public static final String FILENAME_PREFIX = "aegis-backup";
+    public static final String FILENAME_SINGLE = String.format("%s.json", FILENAME_PREFIX);
 
     private final Context _context;
     private final Preferences _prefs;
     private final ExecutorService _executor;
+    private final AuditLogRepository _auditLogRepository;
 
-    public VaultBackupManager(Context context) {
+    public VaultBackupManager(Context context, AuditLogRepository auditLogRepository) {
         _context = context;
         _prefs = new Preferences(context);
         _executor = Executors.newSingleThreadExecutor();
+        _auditLogRepository = auditLogRepository;
     }
 
-    public void scheduleBackup(File tempFile, Uri dirUri, int versionsToKeep) {
+    public void scheduleBackup(File tempFile, BackupsVersioningStrategy strategy, Uri uri, int versionsToKeep) {
         _executor.execute(() -> {
             try {
-                createBackup(tempFile, dirUri, versionsToKeep);
+                createBackup(tempFile, strategy, uri, versionsToKeep);
+                _auditLogRepository.addBackupCreatedEvent();
                 _prefs.setBuiltInBackupResult(new Preferences.BackupResult(null));
-            } catch (VaultRepositoryException e) {
+            } catch (VaultRepositoryException | VaultBackupPermissionException e) {
                 e.printStackTrace();
                 _prefs.setBuiltInBackupResult(new Preferences.BackupResult(e));
             }
         });
     }
 
-    private void createBackup(File tempFile, Uri dirUri, int versionsToKeep) throws VaultRepositoryException {
+    private void createBackup(File tempFile, BackupsVersioningStrategy strategy, Uri uri, int versionsToKeep)
+            throws VaultRepositoryException, VaultBackupPermissionException {
+        if (uri == null) {
+            throw new VaultRepositoryException("getBackupsLocation returned null");
+        }
+        if (strategy == BackupsVersioningStrategy.SINGLE_BACKUP) {
+            createBackup(tempFile, uri);
+        } else if (strategy == BackupsVersioningStrategy.MULTIPLE_BACKUPS) {
+            createBackup(tempFile, uri, versionsToKeep);
+        } else {
+            throw new VaultRepositoryException("Invalid backups versioning strategy");
+        }
+    }
+
+    private void createBackup(File tempFile, Uri fileUri)
+            throws VaultRepositoryException, VaultBackupPermissionException {
+        Log.i(TAG, String.format("Creating backup at %s", fileUri));
+        try {
+            if (!hasPermissionsAt(fileUri)) {
+                throw new VaultBackupPermissionException("No persisted URI permissions");
+            }
+            ContentResolver resolver = _context.getContentResolver();
+            try (FileInputStream inStream = new FileInputStream(tempFile);
+                 OutputStream outStream = resolver.openOutputStream(fileUri, "wt")
+            ) {
+                if (outStream == null) {
+                    throw new IOException("openOutputStream returned null");
+                }
+                IOUtils.copy(inStream, outStream);
+            } catch (IOException exception) {
+                throw new VaultRepositoryException(exception);
+            }
+        } catch (VaultRepositoryException | VaultBackupPermissionException exception) {
+            Log.e(TAG, String.format("Unable to create backup: %s", exception));
+            throw exception;
+        } finally {
+            tempFile.delete();
+        }
+    }
+
+    private void createBackup(File tempFile, Uri dirUri, int versionsToKeep)
+            throws VaultRepositoryException, VaultBackupPermissionException {
         FileInfo fileInfo = new FileInfo(FILENAME_PREFIX);
         DocumentFile dir = DocumentFile.fromTreeUri(_context, dirUri);
 
@@ -68,7 +116,7 @@ public class VaultBackupManager {
             Log.i(TAG, String.format("Creating backup at %s: %s", Uri.decode(dir.getUri().toString()), fileInfo.toString()));
 
             if (!hasPermissionsAt(dirUri)) {
-                throw new VaultRepositoryException("No persisted URI permissions");
+                throw new VaultBackupPermissionException("No persisted URI permissions");
             }
 
             // If we create a file with a name that already exists, SAF will append a number
@@ -92,7 +140,7 @@ public class VaultBackupManager {
             } catch (IOException e) {
                 throw new VaultRepositoryException(e);
             }
-        } catch (VaultRepositoryException e) {
+        } catch (VaultRepositoryException | VaultBackupPermissionException e) {
             Log.e(TAG, String.format("Unable to create backup: %s", e.toString()));
             throw e;
         } finally {
@@ -113,6 +161,10 @@ public class VaultBackupManager {
     }
 
     private void enforceVersioning(DocumentFile dir, int versionsToKeep) {
+        if (versionsToKeep <= 0) {
+            return;
+        }
+
         Log.i(TAG, String.format("Scanning directory %s for backup files", Uri.decode(dir.getUri().toString())));
 
         List<BackupFile> files = new ArrayList<>();
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupPermissionException.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupPermissionException.java
new file mode 100644
index 00000000..93e91daa
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupPermissionException.java
@@ -0,0 +1,7 @@
+package com.beemdevelopment.aegis.vault;
+
+public class VaultBackupPermissionException extends Exception {
+    public VaultBackupPermissionException(String message) {
+        super(message);
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntry.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntry.java
index 9ad2d70b..d351ed84 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntry.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntry.java
@@ -1,8 +1,5 @@
 package com.beemdevelopment.aegis.vault;
 
-import com.beemdevelopment.aegis.encoding.Base64;
-import com.beemdevelopment.aegis.encoding.EncodingException;
-import com.beemdevelopment.aegis.icons.IconType;
 import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
@@ -10,23 +7,26 @@ import com.beemdevelopment.aegis.otp.TotpInfo;
 import com.beemdevelopment.aegis.util.JsonUtils;
 import com.beemdevelopment.aegis.util.UUIDMap;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.Arrays;
 import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.UUID;
 
 public class VaultEntry extends UUIDMap.Value {
     private String _name = "";
     private String _issuer = "";
-    private String _group;
     private OtpInfo _info;
-    private byte[] _icon;
-    private IconType _iconType = IconType.INVALID;
+    private VaultEntryIcon _icon;
     private boolean _isFavorite;
     private int _usageCount;
+    private long _lastUsedTimestamp;
     private String _note = "";
+    private String _oldGroup;
+    private Set<UUID> _groups = new TreeSet<>();
 
     private VaultEntry(UUID uuid, OtpInfo info) {
         super(uuid);
@@ -44,13 +44,6 @@ public class VaultEntry extends UUIDMap.Value {
         setIssuer(issuer);
     }
 
-    public VaultEntry(OtpInfo info, String name, String issuer, String group) {
-        this(info);
-        setName(name);
-        setIssuer(issuer);
-        setGroup(group);
-    }
-
     public VaultEntry(GoogleAuthInfo info) {
         this(info.getOtpInfo(), info.getAccountName(), info.getIssuer());
     }
@@ -63,12 +56,17 @@ public class VaultEntry extends UUIDMap.Value {
             obj.put("uuid", getUUID().toString());
             obj.put("name", _name);
             obj.put("issuer", _issuer);
-            obj.put("group", _group);
             obj.put("note", _note);
             obj.put("favorite", _isFavorite);
-            obj.put("icon", _icon == null ? JSONObject.NULL : Base64.encode(_icon));
-            obj.put("icon_mime", _icon == null ? null : _iconType.toMimeType());
+            VaultEntryIcon.toJson(_icon, obj);
             obj.put("info", _info.toJson());
+
+            JSONArray groupUuids = new JSONArray();
+            for (UUID uuid : _groups) {
+                groupUuids.put(uuid.toString());
+            }
+            obj.put("groups", groupUuids);
+
         } catch (JSONException e) {
             throw new RuntimeException(e);
         }
@@ -90,25 +88,32 @@ public class VaultEntry extends UUIDMap.Value {
             VaultEntry entry = new VaultEntry(uuid, info);
             entry.setName(obj.getString("name"));
             entry.setIssuer(obj.getString("issuer"));
-            entry.setGroup(obj.optString("group", null));
             entry.setNote(obj.optString("note", ""));
             entry.setIsFavorite(obj.optBoolean("favorite", false));
 
-            Object icon = obj.get("icon");
-            if (icon != JSONObject.NULL) {
-                String mime = JsonUtils.optString(obj, "icon_mime");
-
-                IconType iconType = mime == null ? IconType.JPEG : IconType.fromMimeType(mime);
-                if (iconType == IconType.INVALID) {
-                    throw new VaultEntryException(String.format("Bad icon MIME type: %s", mime));
+            // If the entry contains a list of group UUID's, assume conversion from the
+            // old group system has already taken place and ignore the old group field.
+            if (obj.has("groups")) {
+                JSONArray groups = obj.getJSONArray("groups");
+                for (int i = 0; i < groups.length(); i++) {
+                    String groupUuid = groups.getString(i);
+                    entry.addGroup(UUID.fromString(groupUuid));
                 }
+            } else if (obj.has("group")) {
+                entry.setOldGroup(JsonUtils.optString(obj, "group"));
+            }
 
-                byte[] iconBytes = Base64.decode((String) icon);
-                entry.setIcon(iconBytes, iconType);
+            // Silently ignore any errors that occur when trying to parse the icon of an
+            // entry. This allows us to introduce new icon types in the future (e.g. WebP)
+            // without breaking compatibility with older versions of Aegis.
+            try {
+                VaultEntryIcon icon = VaultEntryIcon.fromJson(obj);
+                entry.setIcon(icon);
+            } catch (VaultEntryIconException ignored) {
             }
 
             return entry;
-        } catch (OtpInfoException | JSONException | EncodingException e) {
+        } catch (OtpInfoException | JSONException e) {
             throw new VaultEntryException(e);
         }
     }
@@ -121,18 +126,14 @@ public class VaultEntry extends UUIDMap.Value {
         return _issuer;
     }
 
-    public String getGroup() {
-        return _group;
+    public Set<UUID> getGroups() {
+        return _groups;
     }
 
-    public byte[] getIcon() {
+    public VaultEntryIcon getIcon() {
         return _icon;
     }
 
-    public IconType getIconType() {
-        return _iconType;
-    }
-
     public OtpInfo getInfo() {
         return _info;
     }
@@ -141,9 +142,17 @@ public class VaultEntry extends UUIDMap.Value {
         return _usageCount;
     }
 
-    public String getNote() { return _note; }
+    public long getLastUsedTimestamp() {
+        return _lastUsedTimestamp;
+    }
 
-    public boolean isFavorite() { return _isFavorite; };
+    public String getNote() {
+        return _note;
+    }
+
+    public boolean isFavorite() {
+        return _isFavorite;
+    }
 
     public void setName(String name) {
         _name = name;
@@ -153,28 +162,57 @@ public class VaultEntry extends UUIDMap.Value {
         _issuer = issuer;
     }
 
-    public void setGroup(String group) {
-        _group = group;
+    public void addGroup(UUID group) {
+        if (group == null) {
+            throw new AssertionError("Attempt to add null group to entry's group list");
+        }
+        _groups.add(group);
+    }
+
+    public void removeGroup(UUID group) {
+        _groups.remove(group);
+    }
+
+    public void setGroups(Set<UUID> groups) {
+        if (groups.contains(null)) {
+            throw new AssertionError("Attempt to add null group to entry's group list");
+        }
+        _groups = groups;
     }
 
     public void setInfo(OtpInfo info) {
         _info = info;
     }
 
-    public void setIcon(byte[] icon, IconType iconType) {
+    public void setIcon(VaultEntryIcon icon) {
         _icon = icon;
-        _iconType = iconType;
     }
 
     public boolean hasIcon() {
         return _icon != null;
     }
 
-    public void setUsageCount(int usageCount) { _usageCount = usageCount; }
+    public void setUsageCount(int usageCount) {
+        _usageCount = usageCount;
+    }
 
-    public void setNote(String note) { _note = note; }
+    public void setLastUsedTimestamp(long lastUsedTimestamp) { _lastUsedTimestamp = lastUsedTimestamp; }
 
-    public void setIsFavorite(boolean isFavorite) { _isFavorite = isFavorite; }
+    public void setNote(String note) {
+        _note = note;
+    }
+
+    public void setIsFavorite(boolean isFavorite) {
+        _isFavorite = isFavorite;
+    }
+
+    void setOldGroup(String oldGroup) {
+        _oldGroup = oldGroup;
+    }
+
+    String getOldGroup() {
+        return _oldGroup;
+    }
 
     @Override
     public boolean equals(Object o) {
@@ -194,12 +232,15 @@ public class VaultEntry extends UUIDMap.Value {
     public boolean equivalates(VaultEntry entry) {
         return getName().equals(entry.getName())
                 && getIssuer().equals(entry.getIssuer())
-                && Objects.equals(getGroup(), entry.getGroup())
                 && getInfo().equals(entry.getInfo())
-                && Arrays.equals(getIcon(), entry.getIcon())
-                && getIconType().equals(entry.getIconType())
+                && Objects.equals(getIcon(), entry.getIcon())
                 && getNote().equals(entry.getNote())
-                && isFavorite() == entry.isFavorite();
+                && isFavorite() == entry.isFavorite()
+                && getGroups().equals(entry.getGroups());
+    }
+
+    public boolean hasSameNameAndIssuer(VaultEntry entry) {
+        return getName().equals(entry.getName()) && getIssuer().equals(entry.getIssuer());
     }
 
     /**
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntryIcon.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntryIcon.java
new file mode 100644
index 00000000..fd18556a
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntryIcon.java
@@ -0,0 +1,111 @@
+package com.beemdevelopment.aegis.vault;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.beemdevelopment.aegis.encoding.Base64;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.encoding.Hex;
+import com.beemdevelopment.aegis.icons.IconType;
+import com.beemdevelopment.aegis.util.JsonUtils;
+import com.google.common.hash.HashCode;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+public class VaultEntryIcon implements Serializable {
+    private final byte[] _bytes;
+    private final byte[] _hash;
+    private final IconType _type;
+
+    public static final int MAX_DIMENS = 512;
+
+    public VaultEntryIcon(@NonNull byte[] bytes, @NonNull IconType type) {
+        this(bytes, type, generateHash(bytes, type));
+    }
+
+    VaultEntryIcon(@NonNull byte[] bytes, @NonNull IconType type, @NonNull byte[] hash) {
+        _bytes = bytes;
+        _hash = hash;
+        _type = type;
+    }
+
+    public @NonNull byte[] getBytes() {
+        return _bytes;
+    }
+
+    public @NonNull byte[] getHash() {
+        return _hash;
+    }
+
+    @NonNull
+    public IconType getType() {
+        return _type;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof VaultEntryIcon)) {
+            return false;
+        }
+
+        VaultEntryIcon entry = (VaultEntryIcon) o;
+        return Arrays.equals(getHash(), entry.getHash());
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCode.fromBytes(_hash).asInt();
+    }
+
+    static void toJson(@Nullable VaultEntryIcon icon, @NonNull JSONObject obj) throws JSONException {
+        obj.put("icon", icon == null ? JSONObject.NULL : Base64.encode(icon.getBytes()));
+        if (icon != null) {
+            obj.put("icon_mime", icon.getType().toMimeType());
+            obj.put("icon_hash", Hex.encode(icon.getHash()));
+        }
+    }
+
+    @Nullable
+    static VaultEntryIcon fromJson(@NonNull JSONObject obj) throws VaultEntryIconException {
+        try {
+            Object icon = obj.get("icon");
+            if (icon == JSONObject.NULL) {
+                return null;
+            }
+
+            String mime = JsonUtils.optString(obj, "icon_mime");
+            IconType iconType = mime == null ? IconType.JPEG : IconType.fromMimeType(mime);
+            if (iconType == IconType.INVALID) {
+                throw new VaultEntryIconException(String.format("Bad icon MIME type: %s", mime));
+            }
+
+            byte[] iconBytes = Base64.decode((String) icon);
+            String iconHashStr = JsonUtils.optString(obj, "icon_hash");
+            if (iconHashStr != null) {
+                byte[] iconHash = Hex.decode(iconHashStr);
+                return new VaultEntryIcon(iconBytes, iconType, iconHash);
+            }
+
+            return new VaultEntryIcon(iconBytes, iconType);
+        } catch (JSONException | EncodingException e) {
+            throw new VaultEntryIconException(e);
+        }
+    }
+
+    private static @NonNull byte[] generateHash(@NonNull byte[] bytes, @NonNull IconType type) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            md.update(type.toMimeType().getBytes(StandardCharsets.UTF_8));
+            return md.digest(bytes);
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntryIconException.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntryIconException.java
new file mode 100644
index 00000000..2391de3e
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntryIconException.java
@@ -0,0 +1,11 @@
+package com.beemdevelopment.aegis.vault;
+
+public class VaultEntryIconException extends Exception {
+    public VaultEntryIconException(Throwable cause) {
+        super(cause);
+    }
+
+    public VaultEntryIconException(String message) {
+        super(message);
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultGroup.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultGroup.java
new file mode 100644
index 00000000..263b4eb7
--- /dev/null
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultGroup.java
@@ -0,0 +1,69 @@
+package com.beemdevelopment.aegis.vault;
+
+import com.beemdevelopment.aegis.util.UUIDMap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.UUID;
+
+public class VaultGroup extends UUIDMap.Value {
+    private String _name;
+
+    private VaultGroup(UUID uuid, String name) {
+        super(uuid);
+        _name = name;
+    }
+
+    public VaultGroup(String name) {
+        super();
+        _name = name;
+    }
+
+    public JSONObject toJson() {
+        JSONObject obj = new JSONObject();
+
+        try {
+            obj.put("uuid", getUUID().toString());
+            obj.put("name", _name);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+
+        return obj;
+    }
+
+    public static VaultGroup fromJson(JSONObject obj) throws VaultEntryException {
+        try {
+            UUID uuid = UUID.fromString(obj.getString("uuid"));
+            String groupName = obj.getString("name");
+
+            return new VaultGroup(uuid, groupName);
+        } catch (JSONException e) {
+            throw new VaultEntryException(e);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof VaultGroup)) {
+            return false;
+        }
+
+        VaultGroup entry = (VaultGroup) o;
+        return super.equals(entry) && getName().equals(entry.getName());
+    }
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    @Override
+    public String toString() {
+        return _name;
+    }
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultManager.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultManager.java
index 1a70396f..9f981e03 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultManager.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultManager.java
@@ -5,20 +5,23 @@ import android.app.backup.BackupManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import com.beemdevelopment.aegis.BackupsVersioningStrategy;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
+import com.beemdevelopment.aegis.database.AuditLogRepository;
 import com.beemdevelopment.aegis.services.NotificationService;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -29,8 +32,6 @@ public class VaultManager {
     private final Context _context;
     private final Preferences _prefs;
 
-    private VaultFile _vaultFile;
-    private VaultRepositoryException _vaultFileError;
     private VaultRepository _repo;
 
     private final VaultBackupManager _backups;
@@ -39,41 +40,20 @@ public class VaultManager {
     private final List<LockListener> _lockListeners;
     private boolean _blockAutoLock;
 
-    public VaultManager(@NonNull Context context) {
+    private final AuditLogRepository _auditLogRepository;
+
+    public VaultManager(@NonNull Context context, AuditLogRepository auditLogRepository) {
         _context = context;
         _prefs = new Preferences(_context);
-        _backups = new VaultBackupManager(_context);
+        _backups = new VaultBackupManager(_context, auditLogRepository);
         _androidBackups = new BackupManager(context);
         _lockListeners = new ArrayList<>();
-        loadVaultFile();
-    }
-
-    private void loadVaultFile() {
-        try {
-            _vaultFile = VaultRepository.readVaultFile(_context);
-        } catch (VaultRepositoryException e) {
-            if (!(e.getCause() instanceof FileNotFoundException)) {
-                _vaultFileError = e;
-                e.printStackTrace();
-            }
-        }
-
-        if (_vaultFile != null && !_vaultFile.isEncrypted()) {
-            try {
-                loadFrom(_vaultFile, null);
-            } catch (VaultRepositoryException e) {
-                e.printStackTrace();
-                _vaultFile = null;
-                _vaultFileError = e;
-            }
-        }
+        _auditLogRepository = auditLogRepository;
     }
 
     /**
      * Initializes the vault repository with a new empty vault and the given creds. It can
      * only be called if isVaultLoaded() returns false.
-     *
-     * Calling this method removes the manager's internal reference to the raw vault file (if it had one).
      */
     @NonNull
     public VaultRepository initNew(@Nullable VaultFileCredentials creds) throws VaultRepositoryException {
@@ -81,10 +61,9 @@ public class VaultManager {
             throw new IllegalStateException("Vault manager is already initialized");
         }
 
-        _vaultFile = null;
-        _vaultFileError = null;
-        _repo = new VaultRepository(_context, new Vault(), creds);
-        save();
+        VaultRepository repo = new VaultRepository(_context, new Vault(), creds);
+        repo.save();
+        _repo = repo;
 
         if (getVault().isEncryptionEnabled()) {
             startNotificationService();
@@ -96,8 +75,6 @@ public class VaultManager {
     /**
      * Initializes the vault repository by decrypting the given vaultFile with the given
      * creds. It can only be called if isVaultLoaded() returns false.
-     *
-     * Calling this method removes the manager's internal reference to the raw vault file (if it had one).
      */
     @NonNull
     public VaultRepository loadFrom(@NonNull VaultFile vaultFile, @Nullable VaultFileCredentials creds) throws VaultRepositoryException {
@@ -105,8 +82,6 @@ public class VaultManager {
             throw new IllegalStateException("Vault manager is already initialized");
         }
 
-        _vaultFile = null;
-        _vaultFileError = null;
         _repo = VaultRepository.fromFile(_context, vaultFile, creds);
 
         if (getVault().isEncryptionEnabled()) {
@@ -116,32 +91,9 @@ public class VaultManager {
         return getVault();
     }
 
-    /**
-     * Initializes the vault repository by loading and decrypting the vault file stored in
-     * internal storage, with the given creds. It can only be called if isVaultLoaded()
-     * returns false.
-     *
-     * Calling this method removes the manager's internal reference to the raw vault file (if it had one).
-     */
     @NonNull
-    public VaultRepository load(@Nullable VaultFileCredentials creds) throws VaultRepositoryException {
-        if (isVaultLoaded()) {
-            throw new IllegalStateException("Vault manager is already initialized");
-        }
-
-        loadVaultFile();
-        if (isVaultLoaded()) {
-            return _repo;
-        }
-
-        return loadFrom(getVaultFile(), creds);
-    }
-
-    @NonNull
-    public VaultRepository unlock(@NonNull VaultFileCredentials creds) throws VaultRepositoryException {
-        VaultRepository repo = loadFrom(getVaultFile(), creds);
-        startNotificationService();
-        return repo;
+    public VaultRepository loadFrom(@NonNull VaultFile vaultFile) throws VaultRepositoryException {
+        return loadFrom(vaultFile, null);
     }
 
     /**
@@ -156,7 +108,6 @@ public class VaultManager {
         }
 
         stopNotificationService();
-        loadVaultFile();
     }
 
     public void enableEncryption(VaultFileCredentials creds) throws VaultRepositoryException {
@@ -223,8 +174,11 @@ public class VaultManager {
             try (OutputStream outStream = new FileOutputStream(tempFile)) {
                 _repo.export(outStream);
             }
+            BackupsVersioningStrategy strategy = _prefs.getBackupVersioningStrategy();
+            Uri uri = _prefs.getBackupsLocation();
+            int versionsToKeep = _prefs.getBackupsVersionCount();
 
-            _backups.scheduleBackup(tempFile, _prefs.getBackupsLocation(), _prefs.getBackupsVersionCount());
+            _backups.scheduleBackup(tempFile, strategy, uri, versionsToKeep);
         } catch (IOException e) {
             throw new VaultRepositoryException(e);
         }
@@ -269,12 +223,8 @@ public class VaultManager {
         return _repo != null;
     }
 
-    public boolean isVaultFileLoaded() {
-        return _vaultFile != null;
-    }
-
     public boolean isVaultInitNeeded() {
-        return !isVaultLoaded() && !isVaultFileLoaded() && getVaultFileError() == null;
+        return !isVaultLoaded() && !VaultRepository.fileExists(_context);
     }
 
     @NonNull
@@ -286,29 +236,15 @@ public class VaultManager {
         return _repo;
     }
 
-    @NonNull
-    public VaultFile getVaultFile() {
-        if (_vaultFile == null) {
-            throw new IllegalStateException("Vault file is not in memory");
-        }
-
-        return _vaultFile;
-    }
-
-    @Nullable
-    public VaultRepositoryException getVaultFileError() {
-        return _vaultFileError;
-    }
-
     /**
      * Starts an external activity, temporarily blocks automatic lock of Aegis and
      * shows an error dialog if the target activity is not found.
      */
-    public void startActivityForResult(Activity activity, Intent intent, int requestCode) {
+    public void fireIntentLauncher(Activity activity, Intent intent, ActivityResultLauncher<Intent> resultLauncher) {
         setBlockAutoLock(true);
 
         try {
-            activity.startActivityForResult(intent, requestCode, null);
+            resultLauncher.launch(intent);
         } catch (ActivityNotFoundException e) {
             e.printStackTrace();
 
@@ -324,19 +260,11 @@ public class VaultManager {
      * Starts an external activity, temporarily blocks automatic lock of Aegis and
      * shows an error dialog if the target activity is not found.
      */
-    public void startActivity(Fragment fragment, Intent intent) {
-        startActivityForResult(fragment, intent, -1);
-    }
-
-    /**
-     * Starts an external activity, temporarily blocks automatic lock of Aegis and
-     * shows an error dialog if the target activity is not found.
-     */
-    public void startActivityForResult(Fragment fragment, Intent intent, int requestCode) {
+    public void fireIntentLauncher(Fragment fragment, Intent intent, ActivityResultLauncher<Intent> resultLauncher) {
         setBlockAutoLock(true);
 
         try {
-            fragment.startActivityForResult(intent, requestCode, null);
+            resultLauncher.launch(intent);
         } catch (ActivityNotFoundException e) {
             e.printStackTrace();
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java
index 94571e55..865d126e 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java
@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
 import androidx.core.util.AtomicFile;
 
 import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
+import com.beemdevelopment.aegis.util.Cloner;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.google.zxing.WriterException;
 
@@ -20,9 +21,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
-import java.text.Collator;
 import java.util.Collection;
-import java.util.TreeSet;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -220,9 +221,15 @@ public class VaultRepository {
     }
 
     public void addEntry(VaultEntry entry) {
+        // Entries added by importing a file may contain an old group that needs to be migrated
+        _vault.migrateOldGroup(entry);
         _vault.getEntries().add(entry);
     }
 
+    public boolean hasEntryByUUID(UUID uuid) {
+        return _vault.getEntries().has(uuid);
+    }
+
     public VaultEntry getEntryByUUID(UUID uuid) {
         return _vault.getEntries().getByUUID(uuid);
     }
@@ -231,17 +238,28 @@ public class VaultRepository {
         return _vault.getEntries().remove(entry);
     }
 
-    public void wipeEntries() {
+    /**
+     * Wipes all entries and groups from the vault.
+     */
+    public void wipeContents() {
         _vault.getEntries().wipe();
+        _vault.getGroups().wipe();
     }
 
     public VaultEntry replaceEntry(VaultEntry entry) {
         return _vault.getEntries().replace(entry);
     }
 
+    public VaultEntry editEntry(VaultEntry entry, EntryEditor editor) {
+        VaultEntry newEntry = Cloner.clone(entry);
+        editor.edit(newEntry);
+        replaceEntry(newEntry);
+        return newEntry;
+    }
+
     /**
-      * Moves entry1 to the position of entry2.
-      */
+     * Moves entry1 to the position of entry2.
+     */
     public void moveEntry(VaultEntry entry1, VaultEntry entry2) {
         _vault.getEntries().move(entry1, entry2);
     }
@@ -254,15 +272,73 @@ public class VaultRepository {
         return _vault.getEntries().getValues();
     }
 
-    public TreeSet<String> getGroups() {
-        TreeSet<String> groups = new TreeSet<>(Collator.getInstance());
-        for (VaultEntry entry : getEntries()) {
-            String group = entry.getGroup();
-            if (group != null) {
-                groups.add(group);
-            }
+    public void addGroup(VaultGroup group) {
+        _vault.getGroups().add(group);
+    }
+
+    public VaultGroup getGroupByUUID(UUID uuid) {
+        return _vault.getGroups().getByUUID(uuid);
+    }
+
+    @Nullable
+    public VaultGroup findGroupByUUID(UUID uuid) {
+        return _vault.getGroups().has(uuid) ? _vault.getGroups().getByUUID(uuid) : null;
+    }
+
+    @Nullable
+    public VaultGroup findGroupByName(String name) {
+        return _vault.getGroups().getValues()
+                .stream()
+                .filter(g -> g.getName().equals(name))
+                .findFirst()
+                .orElse(null);
+    }
+
+    public void removeGroup(UUID groupUuid) {
+        VaultGroup group = _vault.getGroups().getByUUID(groupUuid);
+        removeGroup(group);
+    }
+
+    public void replaceGroups(Collection<VaultGroup> groups) {
+        _vault.getGroups().wipe();
+        for (VaultGroup group : groups) {
+            _vault.getGroups().add(group);
         }
-        return groups;
+    }
+
+    public void removeGroup(VaultGroup group) {
+        for (VaultEntry entry : getEntries()) {
+            entry.removeGroup(group.getUUID());
+        }
+
+        _vault.getGroups().remove(group);
+    }
+
+    public Collection<VaultGroup> getGroups() {
+        return _vault.getGroups().getValues();
+    }
+
+    public Collection<VaultGroup> getUsedGroups() {
+        Set<UUID> usedGroups = new HashSet<>();
+        for (VaultEntry entry : getEntries()) {
+            usedGroups.addAll(entry.getGroups());
+        }
+
+        return getGroups().stream()
+                .filter(vg -> usedGroups.contains(vg.getUUID()))
+                .collect(Collectors.toList());
+    }
+
+    public boolean isGroupsMigrationFresh() {
+        return _vault.isGroupsMigrationFresh();
+    }
+
+    public boolean areIconsOptimized() {
+        return _vault.areIconsOptimized();
+    }
+
+    public void setIconsOptimized(boolean optimized) {
+        _vault.setIconsOptimized(optimized);
     }
 
     public VaultFileCredentials getCredentials() {
@@ -284,4 +360,8 @@ public class VaultRepository {
 
         return getCredentials().getSlots().findBackupPasswordSlots().size() > 0;
     }
+
+    public interface EntryEditor {
+        void edit(VaultEntry entry);
+    }
 }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/slots/SlotList.java b/app/src/main/java/com/beemdevelopment/aegis/vault/slots/SlotList.java
index 99037c52..f479b593 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/slots/SlotList.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/slots/SlotList.java
@@ -75,6 +75,7 @@ public class SlotList extends UUIDMap<Slot> {
 
     /**
      * Returns a copy of this SlotList that is suitable for exporting.
+     * Strips biometric slots.
      * In case there's a backup password slot, any regular password slots are stripped.
      */
     public SlotList exportable() {
@@ -85,18 +86,16 @@ public class SlotList extends UUIDMap<Slot> {
                 break;
             }
         }
-
-        if (!hasBackupSlots) {
-            return this;
-        }
-
         SlotList slots = new SlotList();
         for (Slot slot : this) {
-            if (!(slot instanceof PasswordSlot) || ((PasswordSlot) slot).isBackup()) {
-                slots.add(slot);
+            if (slot instanceof BiometricSlot) {
+                continue;
             }
+            if (hasBackupSlots && slot instanceof PasswordSlot && !((PasswordSlot) slot).isBackup()) {
+                continue;
+            }
+            slots.add(slot);
         }
-
         return slots;
     }
 }
diff --git a/app/src/main/java/info/guardianproject/GuardianProjectRSA4096.java b/app/src/main/java/info/guardianproject/GuardianProjectRSA4096.java
new file mode 100644
index 00000000..2d20f576
--- /dev/null
+++ b/app/src/main/java/info/guardianproject/GuardianProjectRSA4096.java
@@ -0,0 +1,117 @@
+
+package info.guardianproject;
+
+import info.guardianproject.trustedintents.ApkSignaturePin;
+
+/**
+ * This is the second Guardian Project APK signing key. It was generated since
+ * RSA 1024-bit keys are deprecated. So any new Guardian Project app will be
+ * signed by this key. It is used to sign these apps:
+ * <ul>
+ * <li>Checkey</li>
+ * <li>Courier</li>
+ * </ul>
+ *
+ * @author hans
+ */
+public final class GuardianProjectRSA4096 extends ApkSignaturePin {
+
+    public GuardianProjectRSA4096() {
+        fingerprints = new String[] {
+                "f006a20481c71a690de02e385ab0c9fa4ac1245240f68102682703ba0656867a",
+        };
+        certificates = new byte[][] {
+                {
+                        48, -126, 5, -84, 48, -126, 3, -108, 2, 9, 0, -126, -20, 93, -43, 112, 34,
+                        -87, 29, 48, 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, 1, 5, 5, 0, 48, -127,
+                        -105, 49, 11, 48, 9, 6, 3, 85, 4, 6, 19, 2, 85, 83, 49, 17, 48, 15, 6, 3,
+                        85, 4, 8, 12, 8, 78, 101, 119, 32, 89, 111, 114, 107, 49, 17, 48, 15, 6, 3,
+                        85, 4, 7, 12, 8, 78, 101, 119, 32, 89, 111, 114, 107, 49, 25, 48, 23, 6, 3,
+                        85, 4, 10, 12, 16, 71, 117, 97, 114, 100, 105, 97, 110, 32, 80, 114, 111,
+                        106, 101, 99, 116, 49, 29, 48, 27, 6, 3, 85, 4, 3, 12, 20, 103, 117, 97,
+                        114, 100, 105, 97, 110, 112, 114, 111, 106, 101, 99, 116, 46, 105, 110,
+                        102, 111, 49, 40, 48, 38, 6, 9, 42, -122, 72, -122, -9, 13, 1, 9, 1, 22,
+                        25, 114, 111, 111, 116, 64, 103, 117, 97, 114, 100, 105, 97, 110, 112, 114,
+                        111, 106, 101, 99, 116, 46, 105, 110, 102, 111, 48, 30, 23, 13, 49, 52, 48,
+                        53, 49, 52, 49, 55, 53, 55, 50, 57, 90, 23, 13, 52, 49, 48, 57, 50, 56, 49,
+                        55, 53, 55, 50, 57, 90, 48, -127, -105, 49, 11, 48, 9, 6, 3, 85, 4, 6, 19,
+                        2, 85, 83, 49, 17, 48, 15, 6, 3, 85, 4, 8, 12, 8, 78, 101, 119, 32, 89,
+                        111, 114, 107, 49, 17, 48, 15, 6, 3, 85, 4, 7, 12, 8, 78, 101, 119, 32, 89,
+                        111, 114, 107, 49, 25, 48, 23, 6, 3, 85, 4, 10, 12, 16, 71, 117, 97, 114,
+                        100, 105, 97, 110, 32, 80, 114, 111, 106, 101, 99, 116, 49, 29, 48, 27, 6,
+                        3, 85, 4, 3, 12, 20, 103, 117, 97, 114, 100, 105, 97, 110, 112, 114, 111,
+                        106, 101, 99, 116, 46, 105, 110, 102, 111, 49, 40, 48, 38, 6, 9, 42, -122,
+                        72, -122, -9, 13, 1, 9, 1, 22, 25, 114, 111, 111, 116, 64, 103, 117, 97,
+                        114, 100, 105, 97, 110, 112, 114, 111, 106, 101, 99, 116, 46, 105, 110,
+                        102, 111, 48, -126, 2, 34, 48, 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, 1,
+                        1, 5, 0, 3, -126, 2, 15, 0, 48, -126, 2, 10, 2, -126, 2, 1, 0, -51, 108,
+                        83, -44, 61, 81, 46, 61, 2, -61, 46, 60, 2, -30, 44, 38, -70, -63, -93,
+                        -66, -57, 1, 2, -32, -80, -82, 98, -26, -70, -34, 60, -65, -55, -43, 16,
+                        -63, -89, -104, 50, 108, -26, -2, -3, -55, -77, 47, 75, 89, 99, 12, -32,
+                        32, 120, -26, -81, 54, 95, -57, -114, -100, -39, -110, -4, 120, 90, 90,
+                        -40, -89, -53, 63, -122, -45, -80, 32, -6, -12, -29, -107, 45, 10, -23, 76,
+                        5, 112, -15, -63, 48, 35, -61, 0, -107, -110, 44, -46, -126, -30, -30, -33,
+                        86, 22, 30, 8, -72, 29, 75, 121, 31, -120, 119, 59, -57, 19, -64, 31, 84,
+                        -94, -38, 91, 82, 92, -95, 66, 2, 120, -37, -113, 126, 54, -83, 83, -125,
+                        122, 110, -106, 80, 59, -127, -72, -23, 64, 105, 20, 25, -41, -3, -61, -44,
+                        51, -28, 17, 36, -90, -18, -25, 96, 37, -93, -48, 98, 47, 27, 49, 40, -31,
+                        -62, -102, -49, 28, -55, 50, -38, -70, -83, 101, 97, 96, -122, -114, 18,
+                        47, 119, 117, -7, -55, -64, -1, 96, -120, 61, -89, -70, -7, -89, 113, -41,
+                        88, 27, 26, 95, -52, 53, 59, 7, 11, 79, 86, 31, -109, -21, 120, -15, 38,
+                        106, 33, -121, 82, 18, 45, 32, 49, 93, -26, -74, -104, 4, -122, 96, 39,
+                        126, -24, 16, 119, -45, -119, 110, -31, 55, -109, 53, 53, -11, -58, -124,
+                        -84, 41, -42, 64, 17, -5, -78, -57, -100, 118, -105, -38, -94, 84, -16,
+                        -53, -106, -11, 76, 81, 70, -83, -56, 73, -96, -100, -18, 55, -3, -3, 34,
+                        -97, -62, 59, -17, -79, 91, -9, 122, 95, -108, -121, -76, -62, -72, 61,
+                        -82, 105, -99, -59, 10, 51, 52, 77, -105, -127, 37, 79, 88, -127, 27, 39,
+                        44, 15, 123, -59, -118, -96, 61, -28, 23, -54, 124, 100, 57, 37, 123, -83,
+                        -124, 11, 123, 73, -53, 18, 119, -39, -13, 46, 123, -55, 4, -91, 114, 93,
+                        -116, -98, 21, 95, -30, -82, -108, 87, -65, -8, 30, 67, 14, 22, 79, -64,
+                        86, -128, -83, 74, 69, -42, 9, -18, -120, -52, 7, 62, 78, 88, -53, -125,
+                        41, -122, -91, -34, -110, 111, -118, -25, 25, -83, 90, -95, 84, -121, 95,
+                        72, -53, -14, -14, -48, 65, 4, 23, 99, 56, 23, -20, 9, 46, 63, 83, -26,
+                        -86, 54, -104, 79, 9, 94, -91, -69, 10, -125, -17, -28, -32, -79, 5, -11,
+                        37, 103, -46, -75, 71, -119, 39, 48, -53, -51, 118, 43, 28, 68, 14, -33,
+                        -82, -76, -98, 1, 41, 94, -128, -86, 51, -89, 17, -31, 38, -70, -2, -27,
+                        -105, -87, 103, 93, 19, 73, -106, -82, -76, 110, -48, -124, -51, 92, -91,
+                        -51, 22, 1, -48, 52, -127, -24, 26, -77, 4, 22, 33, 24, -128, -1, 9, -42,
+                        23, -53, 78, 10, -39, -115, -95, 17, 100, 90, 16, -23, -127, -38, 10, -62,
+                        -64, 113, -115, -114, 78, -11, -124, 113, 113, -42, -66, 114, -98, -40,
+                        -41, 2, 3, 1, 0, 1, 48, 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, 1, 5, 5,
+                        0, 3, -126, 2, 1, 0, -54, 125, -113, -9, -45, 82, 2, -79, -87, 31, -17,
+                        -10, 117, 16, 1, 67, -63, 57, -49, -81, -90, 48, 7, -58, 89, -29, 120, 84,
+                        116, 51, 54, -94, 74, -111, -11, 53, -13, 53, -125, -76, -64, 46, -35, 19,
+                        -19, 25, 36, -82, 66, 113, -14, -6, -63, 83, 15, 8, -77, -74, -94, -53,
+                        -35, -61, -75, 52, 13, -128, 9, 96, 66, 46, 46, -57, 24, -28, -39, -46, 96,
+                        -115, -63, 92, -70, 51, 49, -94, 96, 77, 16, 108, -59, -28, 112, -2, -3,
+                        -87, 27, 56, 118, 29, -95, -76, -70, 34, -105, -24, -104, 70, 24, -88, -29,
+                        -28, -101, -98, 24, -48, -32, -111, 97, 61, -70, -21, -111, 70, -55, 68,
+                        -76, 125, -61, 56, -122, 48, -118, 74, 61, -101, -46, -43, -12, -114, -116,
+                        -57, -108, 91, -109, -62, -117, -76, -48, 109, 81, -22, -113, -73, 64, -61,
+                        102, 92, -117, -9, -100, 62, -90, 99, 102, -50, -41, -75, 31, 5, -76, -31,
+                        -85, 118, -57, -21, 102, 71, 41, -34, -45, -92, 88, 82, -95, 65, -100, -31,
+                        -28, -85, -37, 94, -52, 72, 39, 55, -42, 18, 29, 115, 23, -106, -2, -54,
+                        -45, 61, 53, 62, 107, 109, -65, 69, 4, -123, 124, -30, -54, -44, 38, 119,
+                        49, -123, -27, -50, 77, -9, -40, -114, -50, -70, -123, 86, -115, 127, 45,
+                        42, 23, -25, -83, -81, -38, -84, -3, 99, -36, 12, -67, -39, -110, 21, -40,
+                        -128, 6, -96, -24, -116, -62, 63, 127, 39, 57, -83, -63, 0, 127, -12, 73,
+                        85, -41, -101, -70, -48, -94, -94, -73, -38, -115, -62, -34, 62, -92, 96,
+                        16, 6, -19, -84, 38, -93, -117, -52, 32, 92, -21, 123, -117, 81, 50, -71,
+                        103, 121, 127, 4, -3, -40, 62, 100, 22, -123, -68, -69, -54, -127, -67, 50,
+                        -114, 77, -30, 26, -102, 29, 106, 48, 83, 99, 73, 96, 124, -77, 51, 8, 15,
+                        40, 72, -108, 105, 62, 119, -113, -90, 57, -62, 127, -57, -21, -40, -109,
+                        96, 101, 71, -40, -101, 127, 69, 110, 43, 59, -102, -8, -42, -70, -24, 51,
+                        -51, 54, 42, -110, -119, 41, -101, 45, -101, -124, 56, -75, -26, 86, -65,
+                        54, 21, -88, -30, 79, -26, -127, 121, -102, -48, -25, -62, 99, 76, -90,
+                        -48, -37, 123, 9, 67, 51, -41, -116, 29, 69, 88, 93, -42, 23, 73, -112, 24,
+                        -85, 60, 1, 3, -95, 12, -49, -55, 95, 109, -37, 10, -124, 119, -52, -31,
+                        91, 55, -67, 99, 87, -55, 97, 25, -9, -119, -41, -98, 100, -14, 70, -44,
+                        -63, 60, -127, -99, 15, 49, 22, -118, -49, 66, -106, 36, -34, -5, 6, -48,
+                        123, -79, 115, 57, 30, -3, -34, -67, 91, 34, 3, -52, -106, 79, -63, 125,
+                        123, -16, -120, -53, -98, 34, 86, -60, 94, 78, -91, -34, 0, -8, 73, -119,
+                        -87, 12, -101, -112, -10, -79, 10, 105, -82, 120, -106, -9, 99, 57, -63,
+                        -26, 125, -80, 102, -106, -11, -91, -1, 37, 33
+                },
+        };
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/guardianproject/trustedintents/ApkSignaturePin.java b/app/src/main/java/info/guardianproject/trustedintents/ApkSignaturePin.java
new file mode 100644
index 00000000..ba72b3a2
--- /dev/null
+++ b/app/src/main/java/info/guardianproject/trustedintents/ApkSignaturePin.java
@@ -0,0 +1,87 @@
+
+package info.guardianproject.trustedintents;
+
+import android.content.pm.Signature;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+public abstract class ApkSignaturePin {
+
+    protected String[] fingerprints; // hex-encoded SHA-256 hashes of the certs
+    protected byte[][] certificates; // array of DER-encoded X.509 certificates
+    private Signature[] signatures;
+
+    public Signature[] getSignatures() {
+        if (signatures == null) {
+            signatures = new Signature[certificates.length];
+            for (int i = 0; i < certificates.length; i++)
+                signatures[i] = new Signature(certificates[i]);
+        }
+        return signatures;
+    }
+
+    /**
+     * Gets the fingerprint of the first certificate in the signature.
+     *
+     * @param algorithm - Which hash to use (e.g. MD5, SHA1, SHA-256)
+     * @return the fingerprint as hex String
+     */
+    public String getFingerprint(String algorithm) {
+        try {
+            MessageDigest md = MessageDigest.getInstance(algorithm);
+            byte[] hashBytes = md.digest(certificates[0]);
+            BigInteger bi = new BigInteger(1, hashBytes);
+            md.reset();
+            return String.format("%0" + (hashBytes.length << 1) + "x", bi);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Gets the MD5 fingerprint of the first certificate in the signature.
+     *
+     * @return the MD5 sum as hex String
+     */
+    public String getMD5Fingerprint() {
+        return getFingerprint("MD5");
+    }
+
+    /**
+     * Gets the SHA1 fingerprint of the first certificate in the signature.
+     *
+     * @return the SHA1 sum as hex String
+     */
+    public String getSHA1Fingerprint() {
+        return getFingerprint("SHA1");
+    }
+
+    /**
+     * Gets the SHA-256 fingerprint of the first certificate in the signature.
+     *
+     * @return the SHA-256 sum as hex String
+     */
+    public String getSHA256Fingerprint() {
+        return getFingerprint("SHA-256");
+    }
+
+    /**
+     * Compares the calculated SHA-256 cert fingerprint to the stored one.
+     *
+     * @return the result of the comparison
+     */
+    public boolean doFingerprintsMatchCertificates() {
+        if (fingerprints == null || certificates == null)
+            return false;
+        String[] calcedFingerprints = new String[certificates.length];
+        for (int i = 0; i < calcedFingerprints.length; i++)
+            calcedFingerprints[i] = getSHA256Fingerprint();
+        if (fingerprints.length == 0 || calcedFingerprints.length == 0)
+            return false;
+        return Arrays.equals(fingerprints, calcedFingerprints);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/guardianproject/trustedintents/LICENSE.txt b/app/src/main/java/info/guardianproject/trustedintents/LICENSE.txt
new file mode 100644
index 00000000..4362b491
--- /dev/null
+++ b/app/src/main/java/info/guardianproject/trustedintents/LICENSE.txt
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/app/src/main/java/info/guardianproject/trustedintents/TrustedIntents.java b/app/src/main/java/info/guardianproject/trustedintents/TrustedIntents.java
new file mode 100644
index 00000000..10f4b803
--- /dev/null
+++ b/app/src/main/java/info/guardianproject/trustedintents/TrustedIntents.java
@@ -0,0 +1,271 @@
+
+package info.guardianproject.trustedintents;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.pm.Signature;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.lang.reflect.Constructor;
+import java.security.cert.CertificateException;
+import java.util.LinkedHashSet;
+
+public class TrustedIntents {
+
+    private static TrustedIntents instance;
+
+    private static PackageManager pm;
+
+    private final LinkedHashSet<ApkSignaturePin> pinList;
+
+    private TrustedIntents(Context context) {
+        pm = context.getPackageManager();
+        this.pinList = new LinkedHashSet<ApkSignaturePin>();
+    }
+
+    public static TrustedIntents get(Context context) {
+        if (instance == null)
+            instance = new TrustedIntents(context);
+        return instance;
+    }
+
+    /**
+     * Check whether a resolved {@link Activity} is trusted.
+     *
+     * @param resolveInfo the one to check
+     * @return whether the {@code Intent}'s receiver is trusted
+     */
+    public boolean isReceiverTrusted(ResolveInfo resolveInfo) {
+        return isPackageNameTrusted(resolveInfo.activityInfo.packageName);
+    }
+
+    /**
+     * Check whether a resolved {@link Activity} is trusted.
+     *
+     * @param activityInfo the one to check
+     * @return whether the {@code Intent}'s receiver is trusted
+     */
+    public boolean isReceiverTrusted(ActivityInfo activityInfo) {
+        return isPackageNameTrusted(activityInfo.packageName);
+    }
+
+    /**
+     * Check an {@link Intent} is trusted based on the {@code packageName} set
+     * by {@link Intent#setPackage(String)}
+     *
+     * @param intent the one to check
+     * @return whether the {@code Intent}'s receiver is trusted
+     */
+    public boolean isReceiverTrusted(Intent intent) {
+        if (!isIntentSane(intent))
+            return false;
+        String packageName = intent.getPackage();
+        if (TextUtils.isEmpty(packageName)) {
+            packageName = intent.getComponent().getPackageName();
+        }
+        return isPackageNameTrusted(packageName);
+    }
+
+    /**
+     * Check whether a {@code packageName} is trusted.
+     *
+     * @param packageName the one to check
+     * @return whether the {@code packageName} is trusted
+     */
+    public boolean isPackageNameTrusted(String packageName) {
+        try {
+            checkTrustedSigner(packageName);
+        } catch (NameNotFoundException e) {
+            e.printStackTrace();
+            return false;
+        } catch (CertificateException e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Returns an {@link Intent} if the sending app is signed by one of
+     * the trusted signing keys as set in {@link #addTrustedSigner(Class)}.
+     *
+     * @returns {@code null} if there is no {@code Intent} or if the
+     * sender is not trusted.
+     * @see #addTrustedSigner(Class)
+     */
+    public Intent getIntentFromTrustedSender(Activity activity) {
+        Intent intent = activity.getIntent();
+        String packageName = getCallingPackageName(activity);
+        if (TextUtils.isEmpty(packageName)) {
+            return null;
+        }
+        if (isPackageNameTrusted(packageName)) {
+            return intent;
+        }
+        return null;
+    }
+
+    /**
+     * Get the package name of the {@link Activity} that sent the
+     * {@link Intent} that started this {@code Activity}.
+     * <p/>
+     * <strong>WARNING</strong>: If the {@code Activity} has
+     * {@code android:launchMode="singleInstance"} or {@code "singleTask"}, then
+     * this method will not disconnect because it is not possible to get the
+     * calling {@code Activity}, as set by
+     * {@link Activity#startActivityForResult(Intent, int)}
+     *
+     * @param activity the {@code Activity} to check for the {@code Intent}
+     * @return the package of the sending app or {@code null} if it was not a
+     * {@code ACTION_CONNECT Intent} or the {@code Intent} was not sent
+     * with {@link Activity#startActivityForResult(Intent, int)}
+     */
+    public static String getCallingPackageName(Activity activity) {
+        // getCallingPackage() was unstable until android-18, use this
+        ComponentName componentName = activity.getCallingActivity();
+        if (componentName == null)
+            return null;
+        String packageName = componentName.getPackageName();
+        if (TextUtils.isEmpty(packageName)) {
+            Log.e(activity.getClass().getSimpleName(),
+                    "Received Intent without sender! The Intent must be sent using startActivityForResult() and received without launchMode singleTask or singleInstance!");
+        }
+        return packageName;
+    }
+
+    /**
+     * This is used to check whether an {@link Intent} that will be sent is
+     * complete. It should <strong>not</strong> be used with {@code Intent}s
+     * that have been received already.
+     */
+    private boolean isIntentSane(Intent intent) {
+        if (intent == null)
+            return false;
+        if (TextUtils.isEmpty(intent.getPackage())) {
+            ComponentName componentName = intent.getComponent();
+            if (componentName == null || TextUtils.isEmpty(componentName.getPackageName())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Add an APK signature that is always trusted for any packageName.
+     *
+     * @param cls {@link Class} of the {@link ApkSignaturePin} to trust
+     * @return boolean
+     * @throws {@link IllegalArgumentException} the class cannot be instantiated
+     */
+    public boolean addTrustedSigner(Class<? extends ApkSignaturePin> cls) {
+        try {
+            Constructor<? extends ApkSignaturePin> constructor = cls.getConstructor();
+            return pinList.add((ApkSignaturePin) constructor.newInstance((Object[]) null));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Remove an APK signature from the trusted set.
+     *
+     * @param cls {@link Class} of the {@link ApkSignaturePin} to remove
+     */
+    public boolean removeTrustedSigner(Class<? extends ApkSignaturePin> cls) {
+        for (ApkSignaturePin pin : pinList) {
+            if (pin.getClass().equals(cls)) {
+                return pinList.remove(pin);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Remove all {@link ApkSignaturePin}s from the trusted set.
+     */
+    public boolean removeAllTrustedSigners() {
+        pinList.clear();
+        return pinList.isEmpty();
+    }
+
+    /**
+     * Check if a {@link ApkSignaturePin} is trusted.
+     *
+     * @param cls {@link Class} of the {@link ApkSignaturePin} to check
+     */
+    public boolean isTrustedSigner(Class<? extends ApkSignaturePin> cls) {
+        for (ApkSignaturePin pin : pinList) {
+            if (pin.getClass().equals(cls)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void checkTrustedSigner(String packageName)
+            throws NameNotFoundException, CertificateException {
+        PackageInfo packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SIGNATURES);
+        checkTrustedSigner(packageInfo.signatures);
+    }
+
+    public void checkTrustedSigner(PackageInfo packageInfo)
+            throws NameNotFoundException, CertificateException {
+        checkTrustedSigner(packageInfo.signatures);
+    }
+
+    public void checkTrustedSigner(Signature[] signatures)
+            throws NameNotFoundException, CertificateException {
+        if (signatures == null || signatures.length == 0)
+            throw new CertificateException("signatures cannot be null or empty!");
+        for (int i = 0; i < signatures.length; i++)
+            if (signatures[i] == null || signatures[i].toByteArray().length == 0)
+                throw new CertificateException("Certificates cannot be null or empty!");
+
+        // check whether the APK signer is trusted for all apps
+        for (ApkSignaturePin pin : pinList)
+            if (areSignaturesEqual(signatures, pin.getSignatures()))
+                return; // found a matching trusted APK signer
+
+        throw new CertificateException("APK signatures did not match!");
+    }
+
+    public boolean areSignaturesEqual(Signature[] sigs0, Signature[] sigs1) {
+        // TODO where is Android's implementation of this that I can just call?
+        if (sigs0 == null || sigs1 == null)
+            return false;
+        if (sigs0.length == 0 || sigs1.length == 0)
+            return false;
+        if (sigs0.length != sigs1.length)
+            return false;
+        for (int i = 0; i < sigs0.length; i++)
+            if (!sigs0[i].equals(sigs1[i]))
+                return false;
+        return true;
+    }
+
+    public void startActivity(Context context, Intent intent) throws CertificateException {
+        if (!isIntentSane(intent))
+            throw new ActivityNotFoundException("The intent was null or empty!");
+        String packageName = intent.getPackage();
+        if (TextUtils.isEmpty(packageName)) {
+            packageName = intent.getComponent().getPackageName();
+            intent.setPackage(packageName);
+        }
+        try {
+            checkTrustedSigner(packageName);
+        } catch (NameNotFoundException e) {
+            e.printStackTrace();
+            throw new ActivityNotFoundException(e.getLocalizedMessage());
+        }
+        context.startActivity(intent);
+    }
+}
diff --git a/app/src/main/proto/google_auth.proto b/app/src/main/proto/google_auth.proto
index e59f2d61..b214f554 100644
--- a/app/src/main/proto/google_auth.proto
+++ b/app/src/main/proto/google_auth.proto
@@ -37,6 +37,6 @@ message MigrationPayload {
   repeated OtpParameters otp_parameters = 1;
   int32 version = 2;
   int32 batch_size = 3;
-  int32 batch_index = 4;
+  optional int32 batch_index = 4;
   int32 batch_id = 5;
 }
diff --git a/app/src/main/res/anim/slide_down_fade_in.xml b/app/src/main/res/anim/slide_down_fade_in.xml
index 92cc4842..82b9e0a6 100644
--- a/app/src/main/res/anim/slide_down_fade_in.xml
+++ b/app/src/main/res/anim/slide_down_fade_in.xml
@@ -5,8 +5,8 @@
 
     <translate
         android:duration="300"
-        android:fromYDelta="0"
-        android:toYDelta="100%" />
+        android:fromYDelta="-200%"
+        android:toYDelta="-100%" />
 
     <alpha
         android:fromAlpha="0.0"
diff --git a/app/src/main/res/color/bg_chip_color.xml b/app/src/main/res/color/bg_chip_color.xml
deleted file mode 100644
index 49f20732..00000000
--- a/app/src/main/res/color/bg_chip_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#D7E3EF" android:state_checked="true" />
-    <item android:color="@color/background" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/bg_chip_text_color.xml b/app/src/main/res/color/bg_chip_text_color.xml
deleted file mode 100644
index 3ff71a3e..00000000
--- a/app/src/main/res/color/bg_chip_text_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorPrimary" android:state_checked="true" />
-    <item android:color="@color/primary_text"  />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/dialog_button_color.xml b/app/src/main/res/color/dialog_button_color.xml
deleted file mode 100644
index 90c773d5..00000000
--- a/app/src/main/res/color/dialog_button_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorSecondary" android:state_enabled="true"/>
-    <item android:alpha="0.38" android:color="@color/colorSecondary"/>
-</selector>
diff --git a/app/src/main/res/color/dialog_button_ripple_color.xml b/app/src/main/res/color/dialog_button_ripple_color.xml
deleted file mode 100644
index d5a3e9d9..00000000
--- a/app/src/main/res/color/dialog_button_ripple_color.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-    <!--
-        Copyright 2017 The Android Open Source Project
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:alpha="@dimen/mtrl_low_ripple_pressed_alpha" android:color="?attr/colorSecondary" android:state_pressed="true"/>
-    <item android:alpha="@dimen/mtrl_low_ripple_focused_alpha" android:color="?attr/colorSecondary" android:state_focused="true" android:state_hovered="true"/>
-    <item android:alpha="@dimen/mtrl_low_ripple_focused_alpha" android:color="?attr/colorSecondary" android:state_focused="true"/>
-    <item android:alpha="@dimen/mtrl_low_ripple_hovered_alpha" android:color="?attr/colorSecondary" android:state_hovered="true"/>
-    <item android:alpha="@dimen/mtrl_low_ripple_default_alpha" android:color="?attr/colorSecondary"/>
-
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/disabled_textview_colors.xml b/app/src/main/res/color/disabled_textview_colors.xml
deleted file mode 100644
index adbd5b7e..00000000
--- a/app/src/main/res/color/disabled_textview_colors.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_enabled="false"
-        android:color="#78efefef"
-        />
-    <item
-        android:state_enabled="true"
-        android:color="#efefef"
-        />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_input_box_icon_dark.xml b/app/src/main/res/color/text_input_box_icon_dark.xml
deleted file mode 100644
index be0cce59..00000000
--- a/app/src/main/res/color/text_input_box_icon_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/iconColorPrimary" android:state_focused="true"/>
-    <item android:color="?attr/iconColorPrimary" android:state_activated="true"/>
-    <item android:color="?attr/iconColorPrimary"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_input_box_stroke_dark.xml b/app/src/main/res/color/text_input_box_stroke_dark.xml
deleted file mode 100644
index 378a7381..00000000
--- a/app/src/main/res/color/text_input_box_stroke_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#fff" android:state_focused="true"/>
-    <item android:color="#fff" android:state_hovered="true"/>
-    <item android:color="#fff"/>
-</selector>
diff --git a/app/src/main/res/drawable-anydpi/ic_action_sort.xml b/app/src/main/res/drawable-anydpi/ic_action_sort.xml
deleted file mode 100644
index ef66d1c4..00000000
--- a/app/src/main/res/drawable-anydpi/ic_action_sort.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_set_favorite.xml b/app/src/main/res/drawable-anydpi/ic_set_favorite.xml
deleted file mode 100644
index 13942be1..00000000
--- a/app/src/main/res/drawable-anydpi/ic_set_favorite.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="1.1111112"
-      android:scaleY="1.1111112"
-      android:translateX="-1.3333334"
-      android:translateY="-1.3333334">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_unset_favorite.xml b/app/src/main/res/drawable-anydpi/ic_unset_favorite.xml
deleted file mode 100644
index 7752b92f..00000000
--- a/app/src/main/res/drawable-anydpi/ic_unset_favorite.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="1.1111112"
-      android:scaleY="1.1111112"
-      android:translateX="-1.3333334"
-      android:translateY="-1.3333334">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_action_sort.png b/app/src/main/res/drawable-hdpi/ic_action_sort.png
deleted file mode 100644
index fe9573f4..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_sort.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_sort.png b/app/src/main/res/drawable-mdpi/ic_action_sort.png
deleted file mode 100644
index a9588ed3..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_sort.png and /dev/null differ
diff --git a/app/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable-v24/ic_launcher_background.xml
deleted file mode 100644
index fd4e36ba..00000000
--- a/app/src/main/res/drawable-v24/ic_launcher_background.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="137.93103"
-    android:viewportHeight="137.93103">
-  <group android:translateX="-11.034483"
-      android:translateY="-11.034483">
-    <path
-        android:pathData="M55.78,0h48.44C120.28,0 128.31,0 137,2.73A34,34 0,0 1,157.27 23C160,31.69 160,39.72 160,55.78v48.44c0,16.06 0,24.09 -2.73,32.74A34,34 0,0 1,137 157.27C128.31,160 120.28,160 104.22,160H55.78c-16.06,0 -24.09,0 -32.74,-2.73A34,34 0,0 1,2.73 137C0,128.31 0,120.28 0,104.22V55.78C0,39.72 0,31.69 2.73,23A34,34 0,0 1,23 2.73C31.69,0 39.72,0 55.78,0h0">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="28.48"
-            android:startX="51.92"
-            android:endY="189.51"
-            android:endX="139.67"
-            android:type="linear">
-          <item android:offset="0" android:color="#FFFFFFFF"/>
-          <item android:offset="0.37" android:color="#FFF5FAFC"/>
-          <item android:offset="1" android:color="#FFDBEBF5"/>
-          <item android:offset="1" android:color="#FFDBEBF5"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable-v24/rounded_dialog.xml b/app/src/main/res/drawable-v24/rounded_dialog.xml
deleted file mode 100644
index bd708710..00000000
--- a/app/src/main/res/drawable-v24/rounded_dialog.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@android:color/white"/>
-    <corners android:topLeftRadius="16dp"
-        android:topRightRadius="16dp"/>
-
-</shape>
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_sort.png b/app/src/main/res/drawable-xhdpi/ic_action_sort.png
deleted file mode 100644
index 2184723d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_sort.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_sort.png b/app/src/main/res/drawable-xxhdpi/ic_action_sort.png
deleted file mode 100644
index ca1da315..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_sort.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_plus_black_24dp.xml b/app/src/main/res/drawable/baseline_arrow_right_24.xml
similarity index 50%
rename from app/src/main/res/drawable/ic_plus_black_24dp.xml
rename to app/src/main/res/drawable/baseline_arrow_right_24.xml
index ddd6dfe6..0c739cb2 100644
--- a/app/src/main/res/drawable/ic_plus_black_24dp.xml
+++ b/app/src/main/res/drawable/baseline_arrow_right_24.xml
@@ -1,7 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10,17l5,-5 -5,-5v10z" />
 </vector>
diff --git a/app/src/main/res/drawable/circular_button_background.xml b/app/src/main/res/drawable/circular_button_background.xml
deleted file mode 100644
index dd746464..00000000
--- a/app/src/main/res/drawable/circular_button_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#59000000" />
-    <size
-        android:width="50dp"
-        android:height="50dp" />
-</shape>
diff --git a/app/src/main/res/drawable/circular_button_done.xml b/app/src/main/res/drawable/circular_button_done.xml
deleted file mode 100644
index 9b2563eb..00000000
--- a/app/src/main/res/drawable/circular_button_done.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/circular_button_background" />
-    <item
-        android:drawable="@drawable/ic_check_black_24dp"
-        android:bottom="16dp"
-        android:top="16dp"
-        android:left="16dp"
-        android:right="16dp" />
-</layer-list>
diff --git a/app/src/main/res/drawable/circular_button_next.xml b/app/src/main/res/drawable/circular_button_next.xml
deleted file mode 100644
index 36065dc7..00000000
--- a/app/src/main/res/drawable/circular_button_next.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/circular_button_background" />
-    <item
-        android:drawable="@drawable/ic_arrow_right_black_24dp"
-        android:bottom="16dp"
-        android:top="16dp"
-        android:left="16dp"
-        android:right="16dp" />
-</layer-list>
diff --git a/app/src/main/res/drawable/circular_button_prev.xml b/app/src/main/res/drawable/circular_button_prev.xml
deleted file mode 100644
index 4fc70293..00000000
--- a/app/src/main/res/drawable/circular_button_prev.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/circular_button_background" />
-    <item
-        android:drawable="@drawable/ic_arrow_left_black_24dp"
-        android:bottom="16dp"
-        android:top="16dp"
-        android:left="16dp"
-        android:right="16dp" />
-</layer-list>
diff --git a/app/src/main/res/drawable/drag_handle.xml b/app/src/main/res/drawable/drag_handle.xml
deleted file mode 100644
index 2a8df473..00000000
--- a/app/src/main/res/drawable/drag_handle.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/divider2"/>
-    <size android:height=".1dp"/>
-
-    <padding android:left="1dp"
-        android:top="1dp"
-        android:right="1dp"
-        android:bottom="1dp" />
-
-    <corners android:radius="7dp" />
-</shape>
diff --git a/app/src/main/res/drawable/fab_label_background.xml b/app/src/main/res/drawable/fab_label_background.xml
deleted file mode 100644
index 908cf84a..00000000
--- a/app/src/main/res/drawable/fab_label_background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#B2000000"/>
-    <padding
-        android:left="16dp"
-        android:top="4dp"
-        android:right="16dp"
-        android:bottom="4dp"/>
-    <corners
-        android:radius="2dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/button_rounded_corners.xml b/app/src/main/res/drawable/favorite_indicator.xml
similarity index 52%
rename from app/src/main/res/drawable/button_rounded_corners.xml
rename to app/src/main/res/drawable/favorite_indicator.xml
index 20b385ab..ae283bcd 100644
--- a/app/src/main/res/drawable/button_rounded_corners.xml
+++ b/app/src/main/res/drawable/favorite_indicator.xml
@@ -2,9 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/auth_button"/>
-            <stroke android:color="@color/auth_button" android:width="1dp" />
-            <!--corners allow us to make the rounded corners button-->
+            <solid />
+            <stroke android:width="1dp" />
             <corners android:radius="4dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_black_24dp.xml b/app/src/main/res/drawable/ic_add_black_24dp.xml
deleted file mode 100644
index 0258249c..00000000
--- a/app/src/main/res/drawable/ic_add_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_add_photo_24px.xml b/app/src/main/res/drawable/ic_add_photo_24px.xml
deleted file mode 100644
index f7f4a1ea..00000000
--- a/app/src/main/res/drawable/ic_add_photo_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_alert_black_24dp.xml b/app/src/main/res/drawable/ic_alert_black_24dp.xml
deleted file mode 100644
index 6ed4cfd7..00000000
--- a/app/src/main/res/drawable/ic_alert_black_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_android.xml b/app/src/main/res/drawable/ic_android.xml
deleted file mode 100644
index af157bd9..00000000
--- a/app/src/main/res/drawable/ic_android.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M16.61 15.15C16.15 15.15 15.77 14.78 15.77 14.32S16.15 13.5 16.61 13.5H16.61C17.07 13.5 17.45 13.86 17.45 14.32C17.45 14.78 17.07 15.15 16.61 15.15M7.41 15.15C6.95 15.15 6.57 14.78 6.57 14.32C6.57 13.86 6.95 13.5 7.41 13.5H7.41C7.87 13.5 8.24 13.86 8.24 14.32C8.24 14.78 7.87 15.15 7.41 15.15M16.91 10.14L18.58 7.26C18.67 7.09 18.61 6.88 18.45 6.79C18.28 6.69 18.07 6.75 18 6.92L16.29 9.83C14.95 9.22 13.5 8.9 12 8.91C10.47 8.91 9 9.24 7.73 9.82L6.04 6.91C5.95 6.74 5.74 6.68 5.57 6.78C5.4 6.87 5.35 7.08 5.44 7.25L7.1 10.13C4.25 11.69 2.29 14.58 2 18H22C21.72 14.59 19.77 11.7 16.91 10.14H16.91Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_left_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_left_black_24dp.xml
deleted file mode 100644
index aff49cb5..00000000
--- a/app/src/main/res/drawable/ic_arrow_left_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- drawable/ic_arrow_left_black_24dp.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:autoMirrored="true">
-    <path android:fillColor="#000" android:pathData="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_right_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_right_black_24dp.xml
deleted file mode 100644
index 461a6018..00000000
--- a/app/src/main/res/drawable/ic_arrow_right_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- drawable/ic_arrow_right_black_24dp.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:autoMirrored="true">
-    <path android:fillColor="#000" android:pathData="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_fiber_pin_24.xml b/app/src/main/res/drawable/ic_baseline_fiber_pin_24.xml
deleted file mode 100644
index 957a249f..00000000
--- a/app/src/main/res/drawable/ic_baseline_fiber_pin_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M5.5,10.5h2v1h-2zM20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM9,11.5c0,0.85 -0.65,1.5 -1.5,1.5h-2v2L4,15L4,9h3.5c0.85,0 1.5,0.65 1.5,1.5v1zM12.5,15L11,15L11,9h1.5v6zM20,15h-1.2l-2.55,-3.5L16.25,15L15,15L15,9h1.25l2.5,3.5L18.75,9L20,9v6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_filter_list_24dp.xml b/app/src/main/res/drawable/ic_baseline_filter_list_24dp.xml
deleted file mode 100644
index 997895c9..00000000
--- a/app/src/main/res/drawable/ic_baseline_filter_list_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_menu_black_32.xml b/app/src/main/res/drawable/ic_baseline_menu_black_32.xml
deleted file mode 100644
index cde3883c..00000000
--- a/app/src/main/res/drawable/ic_baseline_menu_black_32.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="32dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_notes_black_24.xml b/app/src/main/res/drawable/ic_baseline_notes_black_24.xml
deleted file mode 100644
index c1925c7d..00000000
--- a/app/src/main/res/drawable/ic_baseline_notes_black_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M3,18h12v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h18v-2L3,11v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_brush_black_24dp.xml b/app/src/main/res/drawable/ic_brush_black_24dp.xml
deleted file mode 100644
index 913e34cf..00000000
--- a/app/src/main/res/drawable/ic_brush_black_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/brush.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M20.71,4.63L19.37,3.29C19,2.9 18.35,2.9 17.96,3.29L9,12.25L11.75,15L20.71,6.04C21.1,5.65 21.1,5 20.71,4.63M7,14A3,3 0 0,0 4,17C4,18.31 2.84,19 2,19C2.92,20.22 4.5,21 6,21A4,4 0 0,0 10,17A3,3 0 0,0 7,14Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_camera_front_24dp.xml b/app/src/main/res/drawable/ic_camera_front_24dp.xml
deleted file mode 100644
index 0f70d89b..00000000
--- a/app/src/main/res/drawable/ic_camera_front_24dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M7,2H17V12.5C17,10.83 13.67,10 12,10C10.33,10 7,10.83 7,12.5M17,0H7A2,2 0 0,0 5,2V16A2,2 0 0,0 7,18H17A2,2 0 0,0 19,16V2A2,2 0 0,0 17,0M12,8A2,2 0 0,0 14,6A2,2 0 0,0 12,4A2,2 0 0,0 10,6A2,2 0 0,0 12,8M14,20V22H19V20M10,20H5V22H10V24L13,21L10,18V20Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_camera_rear_24dp.xml b/app/src/main/res/drawable/ic_camera_rear_24dp.xml
deleted file mode 100644
index 1c9724b0..00000000
--- a/app/src/main/res/drawable/ic_camera_rear_24dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M12,6C10.89,6 10,5.1 10,4A2,2 0 0,1 12,2C13.09,2 14,2.9 14,4A2,2 0 0,1 12,6M17,0H7A2,2 0 0,0 5,2V16A2,2 0 0,0 7,18H17A2,2 0 0,0 19,16V2A2,2 0 0,0 17,0M14,20V22H19V20M10,20H5V22H10V24L13,21L10,18V20Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_check_black_24dp.xml b/app/src/main/res/drawable/ic_check_black_24dp.xml
deleted file mode 100644
index d986bb97..00000000
--- a/app/src/main/res/drawable/ic_check_black_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#F7F7F7"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down_black_24dp.xml b/app/src/main/res/drawable/ic_chevron_down_black_24dp.xml
deleted file mode 100644
index 73334a0e..00000000
--- a/app/src/main/res/drawable/ic_chevron_down_black_24dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
deleted file mode 100644
index b5c7319f..00000000
--- a/app/src/main/res/drawable/ic_close.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_cloud_upload_outline_black_24dp.xml b/app/src/main/res/drawable/ic_cloud_upload_outline_black_24dp.xml
deleted file mode 100644
index 50f2f687..00000000
--- a/app/src/main/res/drawable/ic_cloud_upload_outline_black_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/cloud_upload_outline.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.04C2.34,8.36 0,10.91 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.04M19,18H6A4,4 0 0,1 2,14C2,11.95 3.53,10.24 5.56,10.03L6.63,9.92L7.13,8.97C8.08,7.14 9.94,6 12,6C14.62,6 16.88,7.86 17.39,10.43L17.69,11.93L19.22,12.04C20.78,12.14 22,13.45 22,15A3,3 0 0,1 19,18M8,13H10.55V16H13.45V13H16L12,9L8,13Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml b/app/src/main/res/drawable/ic_content_copy_white_24dp.xml
deleted file mode 100644
index 1e689ac6..00000000
--- a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_counter_black_24dp.xml b/app/src/main/res/drawable/ic_counter_black_24.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_counter_black_24dp.xml
rename to app/src/main/res/drawable/ic_counter_black_24.xml
index 30ac856e..885620b9 100644
--- a/app/src/main/res/drawable/ic_counter_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_counter_black_24.xml
@@ -2,6 +2,7 @@
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path android:fillColor="#000" android:pathData="M4,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4M4,6V18H11V6H4M20,18V6H18.76C19,6.54 18.95,7.07 18.95,7.13C18.88,7.8 18.41,8.5 18.24,8.75L15.91,11.3L19.23,11.28L19.24,12.5L14.04,12.47L14,11.47C14,11.47 17.05,8.24 17.2,7.95C17.34,7.67 17.91,6 16.5,6C15.27,6.05 15.41,7.3 15.41,7.3L13.87,7.31C13.87,7.31 13.88,6.65 14.25,6H13V18H15.58L15.57,17.14L16.54,17.13C16.54,17.13 17.45,16.97 17.46,16.08C17.5,15.08 16.65,15.08 16.5,15.08C16.37,15.08 15.43,15.13 15.43,15.95H13.91C13.91,15.95 13.95,13.89 16.5,13.89C19.1,13.89 18.96,15.91 18.96,15.91C18.96,15.91 19,17.16 17.85,17.63L18.37,18H20M8.92,16H7.42V10.2L5.62,10.76V9.53L8.76,8.41H8.92V16Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_create_black_24dp.xml b/app/src/main/res/drawable/ic_create_black_24dp.xml
deleted file mode 100644
index 2ab2fb75..00000000
--- a/app/src/main/res/drawable/ic_create_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete_black_24dp.xml
deleted file mode 100644
index 39e64d69..00000000
--- a/app/src/main/res/drawable/ic_delete_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_white.xml b/app/src/main/res/drawable/ic_delete_white.xml
deleted file mode 100644
index 8bed121a..00000000
--- a/app/src/main/res/drawable/ic_delete_white.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_done_all_black_24dp.xml b/app/src/main/res/drawable/ic_done_all_black_24dp.xml
deleted file mode 100644
index dfe4814d..00000000
--- a/app/src/main/res/drawable/ic_done_all_black_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#F7F7F7"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done_black_24dp.xml
deleted file mode 100644
index 7affe9ba..00000000
--- a/app/src/main/res/drawable/ic_done_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_dots_vertical_black_24dp.xml b/app/src/main/res/drawable/ic_dots_vertical_black_24dp.xml
deleted file mode 100644
index 9a6a9845..00000000
--- a/app/src/main/res/drawable/ic_dots_vertical_black_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/dots_vertical.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_export_notes.xml b/app/src/main/res/drawable/ic_export_notes.xml
new file mode 100644
index 00000000..839aae1d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_export_notes.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.5" android:height="24dp"
+    android:viewportHeight="960" android:viewportWidth="960"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="m648,820 l112,-112v92h40v-160L640,640v40h92L620,792l28,28ZM200,840q-33,0 -56.5,-23.5T120,760v-560q0,-33 23.5,-56.5T200,120h560q33,0 56.5,23.5T840,200v268q-19,-9 -39,-15.5t-41,-9.5v-243L200,200v560h242q3,22 9.5,42t15.5,38L200,840ZM200,720v40,-560 243,-3 280ZM280,680h163q3,-21 9.5,-41t14.5,-39L280,600v80ZM280,520h244q32,-30 71.5,-50t84.5,-27v-3L280,440v80ZM280,360h400v-80L280,280v80ZM720,920q-83,0 -141.5,-58.5T520,720q0,-83 58.5,-141.5T720,520q83,0 141.5,58.5T920,720q0,83 -58.5,141.5T720,920Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_filled_star_24.xml b/app/src/main/res/drawable/ic_filled_star_24.xml
new file mode 100644
index 00000000..1172be74
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filled_star_24.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="@android:color/white" android:pathData="M233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_fingerprint_black_24dp.xml b/app/src/main/res/drawable/ic_fingerprint_black_24dp.xml
deleted file mode 100644
index d0f76e34..00000000
--- a/app/src/main/res/drawable/ic_fingerprint_black_24dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M11.83,1.73C8.43,1.79 6.23,3.32 6.23,3.32C5.95,3.5 5.88,3.91 6.07,4.19C6.27,4.5 6.66,4.55 6.96,4.34C6.96,4.34 11.27,1.15 17.46,4.38C17.75,4.55 18.14,4.45 18.31,4.15C18.5,3.85 18.37,3.47 18.03,3.28C16.36,2.4 14.78,1.96 13.36,1.8C12.83,1.74 12.32,1.72 11.83,1.73M12.22,4.34C6.26,4.26 3.41,9.05 3.41,9.05C3.22,9.34 3.3,9.72 3.58,9.91C3.87,10.1 4.26,10 4.5,9.68C4.5,9.68 6.92,5.5 12.2,5.59C17.5,5.66 19.82,9.65 19.82,9.65C20,9.94 20.38,10.04 20.68,9.87C21,9.69 21.07,9.31 20.9,9C20.9,9 18.15,4.42 12.22,4.34M11.5,6.82C9.82,6.94 8.21,7.55 7,8.56C4.62,10.53 3.1,14.14 4.77,19C4.88,19.33 5.24,19.5 5.57,19.39C5.89,19.28 6.07,18.92 5.95,18.6V18.6C4.41,14.13 5.78,11.2 7.8,9.5C9.77,7.89 13.25,7.5 15.84,9.1C17.11,9.9 18.1,11.28 18.6,12.64C19.11,14 19.08,15.32 18.67,15.94C18.25,16.59 17.4,16.83 16.65,16.64C15.9,16.45 15.29,15.91 15.26,14.77C15.23,13.06 13.89,12 12.5,11.84C11.16,11.68 9.61,12.4 9.21,14C8.45,16.92 10.36,21.07 14.78,22.45C15.11,22.55 15.46,22.37 15.57,22.04C15.67,21.71 15.5,21.35 15.15,21.25C11.32,20.06 9.87,16.43 10.42,14.29C10.66,13.33 11.5,13 12.38,13.08C13.25,13.18 14,13.7 14,14.79C14.05,16.43 15.12,17.54 16.34,17.85C17.56,18.16 18.97,17.77 19.72,16.62C20.5,15.45 20.37,13.8 19.78,12.21C19.18,10.61 18.07,9.03 16.5,8.04C14.96,7.08 13.19,6.7 11.5,6.82M11.86,9.25V9.26C10.08,9.32 8.3,10.24 7.28,12.18C5.96,14.67 6.56,17.21 7.44,19.04C8.33,20.88 9.54,22.1 9.54,22.1C9.78,22.35 10.17,22.35 10.42,22.11C10.67,21.87 10.67,21.5 10.43,21.23C10.43,21.23 9.36,20.13 8.57,18.5C7.78,16.87 7.3,14.81 8.38,12.77C9.5,10.67 11.5,10.16 13.26,10.67C15.04,11.19 16.53,12.74 16.5,15.03C16.46,15.38 16.71,15.68 17.06,15.7C17.4,15.73 17.7,15.47 17.73,15.06C17.79,12.2 15.87,10.13 13.61,9.47C13.04,9.31 12.45,9.23 11.86,9.25M12.08,14.25C11.73,14.26 11.46,14.55 11.47,14.89C11.47,14.89 11.5,16.37 12.31,17.8C13.15,19.23 14.93,20.59 18.03,20.3C18.37,20.28 18.64,20 18.62,19.64C18.6,19.29 18.3,19.03 17.91,19.06C15.19,19.31 14.04,18.28 13.39,17.17C12.74,16.07 12.72,14.88 12.72,14.88C12.72,14.53 12.44,14.25 12.08,14.25Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_zip.xml b/app/src/main/res/drawable/ic_folder_zip.xml
new file mode 100644
index 00000000..aab56560
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_zip.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.5" android:height="24dp"
+    android:viewportHeight="960" android:viewportWidth="960"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M640,480v-80h80v80h-80ZM640,560h-80v-80h80v80ZM640,640v-80h80v80h-80ZM447,320l-80,-80L160,240v480h400v-80h80v80h160v-400L640,320v80h-80v-80L447,320ZM160,800q-33,0 -56.5,-23.5T80,720v-480q0,-33 23.5,-56.5T160,160h240l80,80h320q33,0 56.5,23.5T880,320v400q0,33 -23.5,56.5T800,800L160,800ZM160,720v-480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_gesture_tap_24dp.xml b/app/src/main/res/drawable/ic_gesture_tap_24dp.xml
deleted file mode 100644
index 0bd74d8b..00000000
--- a/app/src/main/res/drawable/ic_gesture_tap_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/gesture_tap.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M10,9A1,1 0 0,1 11,8A1,1 0 0,1 12,9V13.47L13.21,13.6L18.15,15.79C18.68,16.03 19,16.56 19,17.14V21.5C18.97,22.32 18.32,22.97 17.5,23H11C10.62,23 10.26,22.85 10,22.57L5.1,18.37L5.84,17.6C6.03,17.39 6.3,17.28 6.58,17.28H6.8L10,19V9M11,5A4,4 0 0,1 15,9C15,10.5 14.2,11.77 13,12.46V11.24C13.61,10.69 14,9.89 14,9A3,3 0 0,0 11,6A3,3 0 0,0 8,9C8,9.89 8.39,10.69 9,11.24V12.46C7.8,11.77 7,10.5 7,9A4,4 0 0,1 11,5Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml b/app/src/main/res/drawable/ic_info_outline_black_24dp.xml
deleted file mode 100644
index ab95f29e..00000000
--- a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M0 0h24v24H0z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zM11 9h2V7h-2v2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
deleted file mode 100644
index ad33063c..00000000
--- a/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index c7bd21db..00000000
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_layers_black_24dp.xml b/app/src/main/res/drawable/ic_layers_black_24dp.xml
deleted file mode 100644
index 84f5bb50..00000000
--- a/app/src/main/res/drawable/ic_layers_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 1987c062..96617192 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -1,5 +1,5 @@
-<!-- licensed under CC BY-SA 3.0 by WPZOOM (http://www.wpzoom.com/) -->
-<vector android:height="24dp" android:viewportHeight="500.0"
-    android:viewportWidth="500.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M131.9,150.1v63.6h-27.3c-20.1,0 -36.3,16.3 -36.3,36.3v181.7c0,20.1 16.3,36.3 36.3,36.3h290.7c20.1,0 36.3,-16.3 36.3,-36.3V250c0,-20.1 -16.3,-36.3 -36.3,-36.3h-27.3v-63.6c0,-65.2 -52.9,-118.1 -118.1,-118.1S131.9,84.8 131.9,150.1zM177.3,213.7v-63.6c0,-40.2 32.5,-72.7 72.7,-72.7c40.2,0 72.7,32.5 72.7,72.7v63.6H177.3zM213.7,313.6c0,-20.1 16.3,-36.3 36.3,-36.3s36.3,16.3 36.3,36.3c0,12.8 -6.6,24.1 -16.6,30.5c0,0 3.5,21.4 7.5,46.7c0,7.5 -6.1,13.6 -13.6,13.6h-27.3c-7.5,0 -13.6,-6.1 -13.6,-13.6l7.5,-46.7C220.3,337.7 213.7,326.4 213.7,313.6z"/>
+<vector android:alpha="0.5" android:height="24dp"
+    android:viewportHeight="960" android:viewportWidth="960"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M240,880q-33,0 -56.5,-23.5T160,800v-400q0,-33 23.5,-56.5T240,320h40v-80q0,-83 58.5,-141.5T480,40q83,0 141.5,58.5T680,240v80h40q33,0 56.5,23.5T800,400v400q0,33 -23.5,56.5T720,880L240,880ZM240,800h480v-400L240,400v400ZM480,680q33,0 56.5,-23.5T560,600q0,-33 -23.5,-56.5T480,520q-33,0 -56.5,23.5T400,600q0,33 23.5,56.5T480,680ZM360,320h240v-80q0,-50 -35,-85t-85,-35q-50,0 -85,35t-35,85v80ZM240,800v-400,400Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock_open.xml b/app/src/main/res/drawable/ic_lock_open.xml
new file mode 100644
index 00000000..e2cec03e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_open.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.5" android:height="24dp"
+    android:viewportHeight="960" android:viewportWidth="960"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M240,320h360v-80q0,-50 -35,-85t-85,-35q-50,0 -85,35t-35,85h-80q0,-83 58.5,-141.5T480,40q83,0 141.5,58.5T680,240v80h40q33,0 56.5,23.5T800,400v400q0,33 -23.5,56.5T720,880L240,880q-33,0 -56.5,-23.5T160,800v-400q0,-33 23.5,-56.5T240,320ZM240,800h480v-400L240,400v400ZM480,680q33,0 56.5,-23.5T560,600q0,-33 -23.5,-56.5T480,520q-33,0 -56.5,23.5T400,600q0,33 23.5,56.5T480,680ZM240,800v-400,400Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mode_edit.xml b/app/src/main/res/drawable/ic_mode_edit.xml
deleted file mode 100644
index 46462b57..00000000
--- a/app/src/main/res/drawable/ic_mode_edit.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_outline_add_24.xml b/app/src/main/res/drawable/ic_outline_add_24.xml
new file mode 100644
index 00000000..40c23537
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_add_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_add_photo_alternate_24.xml b/app/src/main/res/drawable/ic_outline_add_photo_alternate_24.xml
new file mode 100644
index 00000000..93980c52
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_add_photo_alternate_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L560,120L560,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L760,760Q760,760 760,760Q760,760 760,760L760,400L840,400L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM680,360L680,280L600,280L600,200L680,200L680,120L760,120L760,200L840,200L840,280L760,280L760,360L680,360ZM240,680L720,680L570,480L450,640L360,520L240,680ZM200,200L200,320L200,320L200,400L200,400L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200L200,200Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_android_24.xml b/app/src/main/res/drawable/ic_outline_android_24.xml
new file mode 100644
index 00000000..f2c7005d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_android_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M40,720Q49,613 105.5,523Q162,433 256,380L182,252Q176,243 179,233Q182,223 192,218Q200,213 210,216Q220,219 226,228L300,356Q386,320 480,320Q574,320 660,356L734,228Q740,219 750,216Q760,213 768,218Q778,223 781,233Q784,243 778,252L704,380Q798,433 854.5,523Q911,613 920,720L40,720ZM280,610Q301,610 315.5,595.5Q330,581 330,560Q330,539 315.5,524.5Q301,510 280,510Q259,510 244.5,524.5Q230,539 230,560Q230,581 244.5,595.5Q259,610 280,610ZM680,610Q701,610 715.5,595.5Q730,581 730,560Q730,539 715.5,524.5Q701,510 680,510Q659,510 644.5,524.5Q630,539 630,560Q630,581 644.5,595.5Q659,610 680,610Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_arrow_left_alt_24.xml b/app/src/main/res/drawable/ic_outline_arrow_left_alt_24.xml
new file mode 100644
index 00000000..88603a45
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_arrow_left_alt_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M400,720L160,480L400,240L456,298L314,440L800,440L800,520L314,520L456,662L400,720Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_arrow_right_alt_24.xml b/app/src/main/res/drawable/ic_outline_arrow_right_alt_24.xml
new file mode 100644
index 00000000..aff8e219
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_arrow_right_alt_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M560,720L504,662L646,520L160,520L160,440L646,440L504,298L560,240L800,480L560,720Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_brush_24.xml b/app/src/main/res/drawable/ic_outline_brush_24.xml
new file mode 100644
index 00000000..4ba51513
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_brush_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M240,840Q195,840 151,818Q107,796 80,760Q106,760 133,739.5Q160,719 160,680Q160,630 195,595Q230,560 280,560Q330,560 365,595Q400,630 400,680Q400,746 353,793Q306,840 240,840ZM240,760Q273,760 296.5,736.5Q320,713 320,680Q320,663 308.5,651.5Q297,640 280,640Q263,640 251.5,651.5Q240,663 240,680Q240,703 234.5,722Q229,741 220,758Q225,760 230,760Q235,760 240,760ZM470,600L360,490L718,132Q729,121 745.5,120.5Q762,120 774,132L828,186Q840,198 840,214Q840,230 828,242L470,600ZM280,680Q280,680 280,680Q280,680 280,680Q280,680 280,680Q280,680 280,680Q280,680 280,680Q280,680 280,680Q280,680 280,680Q280,680 280,680Q280,680 280,680Q280,680 280,680Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_camera_front_24.xml b/app/src/main/res/drawable/ic_outline_camera_front_24.xml
new file mode 100644
index 00000000..2dc5475b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_camera_front_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M394,900L338,844L382,800L200,800L200,720L382,720L338,676L394,620L534,760L394,900ZM200,680L200,160Q200,127 223.5,103.5Q247,80 280,80L680,80Q713,80 736.5,103.5Q760,127 760,160L760,680L680,680L680,618Q640,589 589.5,574.5Q539,560 480,560Q421,560 370.5,574.5Q320,589 280,618L280,680L280,680L200,680ZM280,526Q328,503 378.5,491.5Q429,480 480,480Q531,480 581.5,491.5Q632,503 680,526L680,160Q680,160 680,160Q680,160 680,160L280,160Q280,160 280,160Q280,160 280,160L280,526ZM560,800L560,720L760,720L760,800L560,800ZM480,440Q430,440 395,405Q360,370 360,320Q360,270 395,235Q430,200 480,200Q530,200 565,235Q600,270 600,320Q600,370 565,405Q530,440 480,440ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,560Q480,560 480,560Q480,560 480,560L480,560L480,560L480,560L480,560L480,560L480,560Q480,560 480,560Q480,560 480,560ZM480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_camera_rear_24.xml b/app/src/main/res/drawable/ic_outline_camera_rear_24.xml
new file mode 100644
index 00000000..c4e7cb02
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_camera_rear_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,680L200,160Q200,127 223.5,103.5Q247,80 280,80L680,80Q713,80 736.5,103.5Q760,127 760,160L760,680L680,680L680,160Q680,160 680,160Q680,160 680,160L280,160Q280,160 280,160Q280,160 280,160L280,680L280,680L200,680ZM480,400Q513,400 536.5,376.5Q560,353 560,320Q560,287 536.5,263.5Q513,240 480,240Q447,240 423.5,263.5Q400,287 400,320Q400,353 423.5,376.5Q447,400 480,400ZM394,900L338,844L382,800L200,800L200,720L382,720L338,676L394,620L534,760L394,900ZM560,800L560,720L760,720L760,800L560,800ZM480,420L480,420Q480,420 480,420Q480,420 480,420L480,420L480,420L480,420L480,420L480,420L480,420Q480,420 480,420Q480,420 480,420Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_check_24.xml b/app/src/main/res/drawable/ic_outline_check_24.xml
new file mode 100644
index 00000000..034ea238
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_check_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M382,720L154,492L211,435L382,606L749,239L806,296L382,720Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_close_24.xml b/app/src/main/res/drawable/ic_outline_close_24.xml
new file mode 100644
index 00000000..fe302f56
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_close_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_cloud_upload_24.xml b/app/src/main/res/drawable/ic_outline_cloud_upload_24.xml
new file mode 100644
index 00000000..87071b00
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_cloud_upload_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q235,274 310,217Q385,160 480,160Q597,160 678.5,241.5Q760,323 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L520,800Q487,800 463.5,776.5Q440,753 440,720L440,514L376,576L320,520L480,360L640,520L584,576L520,514L520,720Q520,720 520,720Q520,720 520,720L740,720Q782,720 811,691Q840,662 840,620Q840,578 811,549Q782,520 740,520L680,520L680,440Q680,357 621.5,298.5Q563,240 480,240Q397,240 338.5,298.5Q280,357 280,440L260,440Q202,440 161,481Q120,522 120,580Q120,638 161,679Q202,720 260,720L360,720L360,800L260,800ZM480,520L480,520L480,520Q480,520 480,520Q480,520 480,520L480,520L480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520L480,520L480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520L480,520L480,520Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_code_24.xml b/app/src/main/res/drawable/ic_outline_code_24.xml
new file mode 100644
index 00000000..b1c70298
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_code_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M320,720L80,480L320,240L377,297L193,481L376,664L320,720ZM640,720L583,663L767,479L584,296L640,240L880,480L640,720Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_construction_24.xml b/app/src/main/res/drawable/ic_outline_construction_24.xml
new file mode 100644
index 00000000..2d6a3d3b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_construction_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M756,840L537,621L621,537L840,756L756,840ZM204,840L120,756L396,480L328,412L300,440L249,389L249,471L221,499L100,378L128,350L210,350L160,300L302,158Q322,138 345,129Q368,120 392,120Q416,120 439,129Q462,138 482,158L390,250L440,300L412,328L480,396L570,306Q566,295 563.5,283Q561,271 561,259Q561,200 601.5,159.5Q642,119 701,119Q716,119 729.5,122Q743,125 757,131L658,230L730,302L829,203Q836,217 838.5,230.5Q841,244 841,259Q841,318 800.5,358.5Q760,399 701,399Q689,399 677,397Q665,395 654,390L204,840Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_content_copy_24.xml b/app/src/main/res/drawable/ic_outline_content_copy_24.xml
new file mode 100644
index 00000000..be8d9ba9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_content_copy_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M360,720Q327,720 303.5,696.5Q280,673 280,640L280,160Q280,127 303.5,103.5Q327,80 360,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,640Q800,673 776.5,696.5Q753,720 720,720L360,720ZM360,640L720,640Q720,640 720,640Q720,640 720,640L720,160Q720,160 720,160Q720,160 720,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640ZM200,880Q167,880 143.5,856.5Q120,833 120,800L120,240L200,240L200,800Q200,800 200,800Q200,800 200,800L640,800L640,880L200,880ZM360,640Q360,640 360,640Q360,640 360,640L360,160Q360,160 360,160Q360,160 360,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640L360,640Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_delete_24.xml b/app/src/main/res/drawable/ic_outline_delete_24.xml
new file mode 100644
index 00000000..d7de5795
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_delete_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_description_24.xml b/app/src/main/res/drawable/ic_outline_description_24.xml
new file mode 100644
index 00000000..54604506
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_description_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M320,720L640,720L640,640L320,640L320,720ZM320,560L640,560L640,480L320,480L320,560ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L560,80L800,320L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM520,360L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L720,800Q720,800 720,800Q720,800 720,800L720,360L520,360ZM240,160L240,160L240,360L240,360L240,160L240,360L240,360L240,800Q240,800 240,800Q240,800 240,800L240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_done_all_24.xml b/app/src/main/res/drawable/ic_outline_done_all_24.xml
new file mode 100644
index 00000000..646f4c5f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_done_all_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M268,720L42,494L99,438L269,608L269,608L325,664L268,720ZM494,720L268,494L324,437L494,607L862,239L918,296L494,720ZM494,494L437,438L635,240L692,296L494,494Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_edit_24.xml b/app/src/main/res/drawable/ic_outline_edit_24.xml
new file mode 100644
index 00000000..ce76cb6d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_edit_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,760L257,760L648,369L591,312L200,703L200,760ZM120,840L120,670L648,143Q660,132 674.5,126Q689,120 705,120Q721,120 736,126Q751,132 762,144L817,200Q829,211 834.5,226Q840,241 840,256Q840,272 834.5,286.5Q829,301 817,313L290,840L120,840ZM760,256L760,256L704,200L704,200L760,256ZM619,341L591,312L591,312L648,369L648,369L619,341Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_error_24.xml b/app/src/main/res/drawable/ic_outline_error_24.xml
new file mode 100644
index 00000000..4d0faf6e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_error_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM440,520L520,520L520,280L440,280L440,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_expand_more_24.xml b/app/src/main/res/drawable/ic_outline_expand_more_24.xml
new file mode 100644
index 00000000..fff246ca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_expand_more_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,615L240,375L296,319L480,503L664,319L720,375L480,615Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_fiber_pin_24.xml b/app/src/main/res/drawable/ic_outline_fiber_pin_24.xml
new file mode 100644
index 00000000..25eb5f1d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_fiber_pin_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,600L260,600L260,520L360,520Q377,520 388.5,508.5Q400,497 400,480L400,400Q400,383 388.5,371.5Q377,360 360,360L200,360L200,600ZM450,600L510,600L510,360L450,360L450,600ZM560,600L610,600L610,460L712,600L760,600L760,360L710,360L710,500L610,360L560,360L560,600ZM260,460L260,420L340,420Q340,420 340,420Q340,420 340,420L340,460Q340,460 340,460Q340,460 340,460L260,460ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L160,720Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_group_24.xml b/app/src/main/res/drawable/ic_outline_group_24.xml
new file mode 100644
index 00000000..5c60ea3e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_group_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M40,800L40,688Q40,654 57.5,625.5Q75,597 104,582Q166,551 230,535.5Q294,520 360,520Q426,520 490,535.5Q554,551 616,582Q645,597 662.5,625.5Q680,654 680,688L680,800L40,800ZM760,800L760,680Q760,636 735.5,595.5Q711,555 666,526Q717,532 762,546.5Q807,561 846,582Q882,602 901,626.5Q920,651 920,680L920,800L760,800ZM360,480Q294,480 247,433Q200,386 200,320Q200,254 247,207Q294,160 360,160Q426,160 473,207Q520,254 520,320Q520,386 473,433Q426,480 360,480ZM760,320Q760,386 713,433Q666,480 600,480Q589,480 572,477.5Q555,475 544,472Q571,440 585.5,401Q600,362 600,320Q600,278 585.5,239Q571,200 544,168Q558,163 572,161.5Q586,160 600,160Q666,160 713,207Q760,254 760,320ZM120,720L600,720L600,688Q600,677 594.5,668Q589,659 580,654Q526,627 471,613.5Q416,600 360,600Q304,600 249,613.5Q194,627 140,654Q131,659 125.5,668Q120,677 120,688L120,720ZM360,400Q393,400 416.5,376.5Q440,353 440,320Q440,287 416.5,263.5Q393,240 360,240Q327,240 303.5,263.5Q280,287 280,320Q280,353 303.5,376.5Q327,400 360,400ZM360,720L360,720L360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720L360,720ZM360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_history_24.xml b/app/src/main/res/drawable/ic_outline_history_24.xml
new file mode 100644
index 00000000..f6a2288f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_history_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,840Q342,840 239.5,748.5Q137,657 122,520L204,520Q218,624 296.5,692Q375,760 480,760Q597,760 678.5,678.5Q760,597 760,480Q760,363 678.5,281.5Q597,200 480,200Q411,200 351,232Q291,264 250,320L360,320L360,400L120,400L120,160L200,160L200,254Q251,190 324.5,155Q398,120 480,120Q555,120 620.5,148.5Q686,177 734.5,225.5Q783,274 811.5,339.5Q840,405 840,480Q840,555 811.5,620.5Q783,686 734.5,734.5Q686,783 620.5,811.5Q555,840 480,840ZM592,648L440,496L440,280L520,280L520,464L648,592L592,648Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_info_24.xml b/app/src/main/res/drawable/ic_outline_info_24.xml
new file mode 100644
index 00000000..4b939194
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_info_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,680L520,680L520,440L440,440L440,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_key_24.xml b/app/src/main/res/drawable/ic_outline_key_24.xml
new file mode 100644
index 00000000..c2890642
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_key_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M280,560Q247,560 223.5,536.5Q200,513 200,480Q200,447 223.5,423.5Q247,400 280,400Q313,400 336.5,423.5Q360,447 360,480Q360,513 336.5,536.5Q313,560 280,560ZM280,720Q180,720 110,650Q40,580 40,480Q40,380 110,310Q180,240 280,240Q347,240 401.5,273Q456,306 488,360L840,360L960,480L780,660L700,600L620,660L535,600L488,600Q456,654 401.5,687Q347,720 280,720ZM280,640Q336,640 378.5,606Q421,572 435,520L560,520L618,561L700,500L771,555L846,480L806,440L435,440Q421,388 378.5,354Q336,320 280,320Q214,320 167,367Q120,414 120,480Q120,546 167,593Q214,640 280,640Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_layers_24.xml b/app/src/main/res/drawable/ic_outline_layers_24.xml
new file mode 100644
index 00000000..89074479
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_layers_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,842L120,562L186,512L480,740L774,512L840,562L480,842ZM480,640L120,360L480,80L840,360L480,640ZM480,360L480,360L480,360L480,360L480,360ZM480,538L710,360L480,182L250,360L480,538Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_lock_24.xml b/app/src/main/res/drawable/ic_outline_lock_24.xml
new file mode 100644
index 00000000..cbf45968
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_lock_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,367 183.5,343.5Q207,320 240,320L280,320L280,240Q280,157 338.5,98.5Q397,40 480,40Q563,40 621.5,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,400Q720,400 720,400Q720,400 720,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800ZM480,680Q513,680 536.5,656.5Q560,633 560,600Q560,567 536.5,543.5Q513,520 480,520Q447,520 423.5,543.5Q400,567 400,600Q400,633 423.5,656.5Q447,680 480,680ZM360,320L600,320L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,320ZM240,800Q240,800 240,800Q240,800 240,800L240,400Q240,400 240,400Q240,400 240,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800L240,800Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_mail_24.xml b/app/src/main/res/drawable/ic_outline_mail_24.xml
new file mode 100644
index 00000000..62da4745
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_mail_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM480,520L160,320L160,720Q160,720 160,720Q160,720 160,720L800,720Q800,720 800,720Q800,720 800,720L800,320L480,520ZM480,440L800,240L160,240L480,440ZM160,320L160,240L160,240L160,320L160,720Q160,720 160,720Q160,720 160,720L160,720Q160,720 160,720Q160,720 160,720L160,320Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_menu_24.xml b/app/src/main/res/drawable/ic_outline_menu_24.xml
new file mode 100644
index 00000000..b33cfc1f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_menu_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,720L120,640L840,640L840,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_more_vert_24.xml b/app/src/main/res/drawable/ic_outline_more_vert_24.xml
new file mode 100644
index 00000000..1ff4b01a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_more_vert_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_notes_24.xml b/app/src/main/res/drawable/ic_outline_notes_24.xml
new file mode 100644
index 00000000..0b9beb2d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_notes_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,720L120,640L600,640L600,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_package_variant_24.xml b/app/src/main/res/drawable/ic_outline_package_variant_24.xml
new file mode 100644
index 00000000..a87b00d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_package_variant_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="#000"
+        android:pathData="M2,10.96C1.5,10.68 1.35,10.07 1.63,9.59L3.13,7C3.24,6.8 3.41,6.66 3.6,6.58L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.66,6.72 20.82,6.88 20.91,7.08L22.36,9.6C22.64,10.08 22.47,10.69 22,10.96L21,11.54V16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V10.96C2.7,11.13 2.32,11.14 2,10.96M12,4.15V4.15L12,10.85V10.85L17.96,7.5L12,4.15M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V12.69L14,15.59C13.67,15.77 13.3,15.76 13,15.6V19.29L19,15.91M13.85,13.36L20.13,9.73L19.55,8.72L13.27,12.35L13.85,13.36Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_outline_person_24.xml b/app/src/main/res/drawable/ic_outline_person_24.xml
new file mode 100644
index 00000000..c1a494a4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_person_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,480Q414,480 367,433Q320,386 320,320Q320,254 367,207Q414,160 480,160Q546,160 593,207Q640,254 640,320Q640,386 593,433Q546,480 480,480ZM160,800L160,688Q160,654 177.5,625.5Q195,597 224,582Q286,551 350,535.5Q414,520 480,520Q546,520 610,535.5Q674,551 736,582Q765,597 782.5,625.5Q800,654 800,688L800,800L160,800ZM240,720L720,720L720,688Q720,677 714.5,668Q709,659 700,654Q646,627 591,613.5Q536,600 480,600Q424,600 369,613.5Q314,627 260,654Q251,659 245.5,668Q240,677 240,688L240,720ZM480,400Q513,400 536.5,376.5Q560,353 560,320Q560,287 536.5,263.5Q513,240 480,240Q447,240 423.5,263.5Q400,287 400,320Q400,353 423.5,376.5Q447,400 480,400ZM480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320ZM480,720L480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720L480,720L480,720Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_public_24.xml b/app/src/main/res/drawable/ic_outline_public_24.xml
new file mode 100644
index 00000000..5f047654
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_public_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM440,798L440,720Q407,720 383.5,696.5Q360,673 360,640L360,600L168,408Q165,426 162.5,444Q160,462 160,480Q160,601 239.5,692Q319,783 440,798ZM716,696Q736,674 752,648.5Q768,623 778.5,595.5Q789,568 794.5,539Q800,510 800,480Q800,382 745.5,301Q691,220 600,184L600,200Q600,233 576.5,256.5Q553,280 520,280L440,280L440,360Q440,377 428.5,388.5Q417,400 400,400L320,400L320,480L560,480Q577,480 588.5,491.5Q600,503 600,520L600,640L640,640Q666,640 687,655.5Q708,671 716,696Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_qr_code_2_24.xml b/app/src/main/res/drawable/ic_outline_qr_code_2_24.xml
new file mode 100644
index 00000000..ba2653ea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_qr_code_2_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M520,840L520,760L600,760L600,840L520,840ZM440,760L440,560L520,560L520,760L440,760ZM760,640L760,480L840,480L840,640L760,640ZM680,480L680,400L760,400L760,480L680,480ZM200,560L200,480L280,480L280,560L200,560ZM120,480L120,400L200,400L200,480L120,480ZM480,200L480,120L560,120L560,200L480,200ZM180,300L300,300L300,180L180,180L180,300ZM120,360L120,120L360,120L360,360L120,360ZM180,780L300,780L300,660L180,660L180,780ZM120,840L120,600L360,600L360,840L120,840ZM660,300L780,300L780,180L660,180L660,300ZM600,360L600,120L840,120L840,360L600,360ZM680,840L680,720L600,720L600,640L760,640L760,760L840,760L840,840L680,840ZM520,560L520,480L680,480L680,560L520,560ZM360,560L360,480L280,480L280,400L520,400L520,480L440,480L440,560L360,560ZM400,360L400,200L480,200L480,280L560,280L560,360L400,360ZM210,270L210,210L270,210L270,270L210,270ZM210,750L210,690L270,690L270,750L210,750ZM690,270L690,210L750,210L750,270L690,270Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_refresh_24.xml b/app/src/main/res/drawable/ic_outline_refresh_24.xml
new file mode 100644
index 00000000..c70bd4e6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_refresh_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,800Q346,800 253,707Q160,614 160,480Q160,346 253,253Q346,160 480,160Q549,160 612,188.5Q675,217 720,270L720,160L800,160L800,440L520,440L520,360L688,360Q656,304 600.5,272Q545,240 480,240Q380,240 310,310Q240,380 240,480Q240,580 310,650Q380,720 480,720Q557,720 619,676Q681,632 706,560L790,560Q762,666 676,733Q590,800 480,800Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_reset_image_24.xml b/app/src/main/res/drawable/ic_outline_reset_image_24.xml
new file mode 100644
index 00000000..76050c2e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_reset_image_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,360L120,120L200,120L200,254Q250,192 322.5,156Q395,120 480,120Q598,120 690.5,187Q783,254 820,360L733,360Q699,288 632,244Q565,200 480,200Q423,200 372.5,221Q322,242 284,280L360,280L360,360L120,360ZM240,720L720,720L570,520L450,680L360,560L240,720ZM200,880Q167,880 143.5,856.5Q120,833 120,800L120,480L200,480L200,800Q200,800 200,800Q200,800 200,800L760,800Q760,800 760,800Q760,800 760,800L760,480L840,480L840,800Q840,833 816.5,856.5Q793,880 760,880L200,880Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_sort_24.xml b/app/src/main/res/drawable/ic_outline_sort_24.xml
new file mode 100644
index 00000000..955f3c64
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_sort_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,720L120,640L360,640L360,720L120,720ZM120,520L120,440L600,440L600,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_star_24.xml b/app/src/main/res/drawable/ic_outline_star_24.xml
new file mode 100644
index 00000000..7757a988
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_star_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M354,673L480,597L606,674L573,530L684,434L538,421L480,285L422,420L276,433L387,530L354,673ZM233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_touch_app_24.xml b/app/src/main/res/drawable/ic_outline_touch_app_24.xml
new file mode 100644
index 00000000..d9046698
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_touch_app_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M419,880Q391,880 366.5,868Q342,856 325,834L107,557L126,537Q146,516 174,512Q202,508 226,523L300,568L300,240Q300,223 311.5,211.5Q323,200 340,200Q357,200 369,211.5Q381,223 381,240L381,712L284,652L388,785Q394,792 402,796Q410,800 419,800L640,800Q673,800 696.5,776.5Q720,753 720,720L720,560Q720,543 708.5,531.5Q697,520 680,520L461,520L461,440L680,440Q730,440 765,475Q800,510 800,560L800,720Q800,786 753,833Q706,880 640,880L419,880ZM167,340Q154,318 147,292.5Q140,267 140,240Q140,157 198.5,98.5Q257,40 340,40Q423,40 481.5,98.5Q540,157 540,240Q540,267 533,292.5Q526,318 513,340L444,300Q452,286 456,271.5Q460,257 460,240Q460,190 425,155Q390,120 340,120Q290,120 255,155Q220,190 220,240Q220,257 224,271.5Q228,286 236,300L167,340ZM502,620L502,620L502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620L502,620L502,620Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_warning_24.xml b/app/src/main/res/drawable/ic_outline_warning_24.xml
new file mode 100644
index 00000000..f53029a6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_warning_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M40,840L480,80L920,840L40,840ZM178,760L782,760L480,240L178,760ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM440,600L520,600L520,400L440,400L440,600ZM480,500L480,500L480,500L480,500Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_package_variant_black_24dp.xml b/app/src/main/res/drawable/ic_package_variant_black_24dp.xml
deleted file mode 100644
index ee927181..00000000
--- a/app/src/main/res/drawable/ic_package_variant_black_24dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M2,10.96C1.5,10.68 1.35,10.07 1.63,9.59L3.13,7C3.24,6.8 3.41,6.66 3.6,6.58L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.66,6.72 20.82,6.88 20.91,7.08L22.36,9.6C22.64,10.08 22.47,10.69 22,10.96L21,11.54V16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V10.96C2.7,11.13 2.32,11.14 2,10.96M12,4.15V4.15L12,10.85V10.85L17.96,7.5L12,4.15M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V12.69L14,15.59C13.67,15.77 13.3,15.76 13,15.6V19.29L19,15.91M13.85,13.36L20.13,9.73L19.55,8.72L13.27,12.35L13.85,13.36Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml
deleted file mode 100644
index b2cb337b..00000000
--- a/app/src/main/res/drawable/ic_person_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code_full.xml b/app/src/main/res/drawable/ic_qr_code_full.xml
deleted file mode 100644
index 9b5e128f..00000000
--- a/app/src/main/res/drawable/ic_qr_code_full.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:top="7dp" android:left="7dp" android:right="7dp" android:bottom="7dp">
-    <vector android:height="24dp" android:viewportHeight="3328"  android:tint="#FFFFFF"
-        android:viewportWidth="3333" android:width="24.036058dp">
-        <path android:fillColor="#FF000000" android:fillType="evenOdd" android:pathData="M5,0h1211v1206L5,1206L5,0zM3025,3025h309v304h-309v-304zM2432,3025h309v290h-618v-592h299v-300h304v-598h309v294h294v304h-294v304h-603v299zM1515,2417h299v-304h-289v-304h289v-304h-294v304h-309v-304h304L1515,603h309v902h299v304h294v-304h309v304h-294v304h-309v598h-299v603h-309v-897zM3020,1505h309v304h-309v-304zM608,1505h309v304L608,1809v-304zM5,1505h309v304L5,1809v-304zM1515,0h309v304h-309L1515,0zM0,2118h1211v1206L0,3324L0,2118zM294,2411h623v620L294,3031v-620zM2118,0h1211v1206L2118,1206L2118,0zM2412,293h623v620h-623L2412,293zM299,293h623v620L299,913L299,293z"/>
-    </vector>
-</item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_qrcode_scan.xml b/app/src/main/res/drawable/ic_qrcode_scan.xml
index ee1670e0..69281097 100644
--- a/app/src/main/res/drawable/ic_qrcode_scan.xml
+++ b/app/src/main/res/drawable/ic_qrcode_scan.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z" />
+    <path
+        android:fillColor="#000"
+        android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_refresh_black_24dp.xml b/app/src/main/res/drawable/ic_refresh_black_24dp.xml
deleted file mode 100644
index 5e434f43..00000000
--- a/app/src/main/res/drawable/ic_refresh_black_24dp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 00000000..27610432
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.5" android:height="24dp"
+    android:viewportHeight="960" android:viewportWidth="960"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M720,880q-50,0 -85,-35t-35,-85q0,-7 1,-14.5t3,-13.5L322,568q-17,15 -38,23.5t-44,8.5q-50,0 -85,-35t-35,-85q0,-50 35,-85t85,-35q23,0 44,8.5t38,23.5l282,-164q-2,-6 -3,-13.5t-1,-14.5q0,-50 35,-85t85,-35q50,0 85,35t35,85q0,50 -35,85t-85,35q-23,0 -44,-8.5T638,288L356,452q2,6 3,13.5t1,14.5q0,7 -1,14.5t-3,13.5l282,164q17,-15 38,-23.5t44,-8.5q50,0 85,35t35,85q0,50 -35,85t-85,35ZM720,240q17,0 28.5,-11.5T760,200q0,-17 -11.5,-28.5T720,160q-17,0 -28.5,11.5T680,200q0,17 11.5,28.5T720,240ZM240,520q17,0 28.5,-11.5T280,480q0,-17 -11.5,-28.5T240,440q-17,0 -28.5,11.5T200,480q0,17 11.5,28.5T240,520ZM720,800q17,0 28.5,-11.5T760,760q0,-17 -11.5,-28.5T720,720q-17,0 -28.5,11.5T680,760q0,17 11.5,28.5T720,800ZM720,200ZM240,480ZM720,760Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tag_24.xml b/app/src/main/res/drawable/ic_tag_24.xml
new file mode 100644
index 00000000..66360540
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tag_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m240,800 l40,-160L120,640l20,-80h160l40,-160L180,400l20,-80h160l40,-160h80l-40,160h160l40,-160h80l-40,160h160l-20,80L660,400l-40,160h160l-20,80L600,640l-40,160h-80l40,-160L360,640l-40,160h-80ZM380,560h160l40,-160L420,400l-40,160Z"
+      android:fillColor="#e3e3e3"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_timeline_24.xml b/app/src/main/res/drawable/ic_timeline_24.xml
new file mode 100644
index 00000000..1657a3a7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timeline_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,720Q87,720 63.5,696.5Q40,673 40,640Q40,607 63.5,583.5Q87,560 120,560Q126,560 130.5,560Q135,560 140,562L322,380Q320,375 320,370.5Q320,366 320,360Q320,327 343.5,303.5Q367,280 400,280Q433,280 456.5,303.5Q480,327 480,360Q480,362 478,380L580,482Q585,480 589.5,480Q594,480 600,480Q606,480 610.5,480Q615,480 620,482L762,340Q760,335 760,330.5Q760,326 760,320Q760,287 783.5,263.5Q807,240 840,240Q873,240 896.5,263.5Q920,287 920,320Q920,353 896.5,376.5Q873,400 840,400Q834,400 829.5,400Q825,400 820,398L678,540Q680,545 680,549.5Q680,554 680,560Q680,593 656.5,616.5Q633,640 600,640Q567,640 543.5,616.5Q520,593 520,560Q520,554 520,549.5Q520,545 522,540L420,438Q415,440 410.5,440Q406,440 400,440Q398,440 380,438L198,620Q200,625 200,629.5Q200,634 200,640Q200,673 176.5,696.5Q153,720 120,720Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tools_black_24dp.xml b/app/src/main/res/drawable/ic_tools_black_24dp.xml
deleted file mode 100644
index 42af86dd..00000000
--- a/app/src/main/res/drawable/ic_tools_black_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/tools.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M21.71 20.29L20.29 21.71A1 1 0 0 1 18.88 21.71L7 9.85A3.81 3.81 0 0 1 6 10A4 4 0 0 1 2.22 4.7L4.76 7.24L5.29 6.71L6.71 5.29L7.24 4.76L4.7 2.22A4 4 0 0 1 10 6A3.81 3.81 0 0 1 9.85 7L21.71 18.88A1 1 0 0 1 21.71 20.29M2.29 18.88A1 1 0 0 0 2.29 20.29L3.71 21.71A1 1 0 0 0 5.12 21.71L10.59 16.25L7.76 13.42M20 2L16 4V6L13.83 8.17L15.83 10.17L18 8H20L22 4Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_unselected.xml b/app/src/main/res/drawable/ic_unselected.xml
new file mode 100644
index 00000000..5ea9582f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unselected.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="891.87dp"
+    android:height="896dp"
+    android:alpha="0.5"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="891.87"
+    android:viewportHeight="896">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M443.86,0 L443.41,0 443.22,0 442.9,0 442.84,0c0,0 -0.38,0 -0.51,0L442.26,0 441.81,0 441.68,0 441.3,0 441.24,0C441.11,0 440.98,0 440.98,0L440.72,0 440.28,0 440.21,0c0,0 -0.26,0 -0.45,0L439.64,0 439.25,0 439.19,0C439,0 438.87,0 438.87,0L438.68,0C438.55,0 438.42,0 438.42,0S438.23,0 438.16,0.06L437.72,0.06 437.65,0.06c0,0 -0.32,0 -0.45,0L437.08,0.06 436.69,0.06 436.63,0.06c-0.19,0 -0.32,0 -0.32,0L436.05,0.06c-0.13,0 -0.26,0 -0.26,0L435.67,0.06 435.16,0.06 435.09,0.06c0,0 -0.26,0 -0.38,0.06L434.52,0.13 434.13,0.13 434.07,0.13c-0.13,0 -0.32,0 -0.32,0L433.49,0.13c-0.13,0 -0.26,0 -0.26,0L433.11,0.13 432.6,0.13 432.47,0.13 432.21,0.13c-0.13,0 -0.19,0 -0.19,0L431.57,0.19 431.51,0.19c-0.19,0 -0.32,0 -0.32,0L430.93,0.19c-0.13,0 -0.26,0 -0.26,0L430.48,0.19 430.1,0.19 429.91,0.19c0,0 -0.19,0.06 -0.32,0.06L429.46,0.26 429.01,0.26 428.95,0.26c-0.19,0 -0.26,0 -0.26,0L428.37,0.26c-0.13,0 -0.26,0 -0.26,0L427.99,0.26 427.54,0.32 427.35,0.32 427.09,0.32 426.9,0.32 426.45,0.32 426.32,0.32 426,0.38 425.81,0.38c-0.13,0 -0.26,0 -0.26,0L425.36,0.38 424.98,0.38 424.85,0.38 424.53,0.38C424.47,0.45 424.47,0.45 424.47,0.45L423.96,0.45 423.83,0.45 423.57,0.45 423.32,0.45 422.87,0.51 422.8,0.51c0,0 -0.26,0 -0.38,0L422.36,0.51 421.97,0.51 421.84,0.51C421.72,0.58 421.59,0.58 421.59,0.58L421.27,0.58 420.95,0.58 420.82,0.58 420.37,0.64 420.18,0.64 419.99,0.64c-0.13,0 -0.19,0 -0.19,0L419.41,0.64 419.22,0.7 418.9,0.7 418.71,0.7 418.52,0.7 418.32,0.7 417.88,0.77 417.68,0.77 417.43,0.77 417.24,0.77 416.85,0.83 416.66,0.83 416.47,0.83 416.21,0.83C416.08,0.9 416.02,0.9 416.02,0.9L415.64,0.9 415.32,0.9 415.12,0.9 414.87,0.96 414.68,0.96 414.36,0.96 414.1,1.02 413.91,1.02 413.72,1.02c-0.13,0 -0.19,0 -0.19,0s-0.32,0 -0.45,0.06c0,0 -0.13,0 -0.26,0L412.63,1.09 412.44,1.09 412.05,1.15 411.86,1.15 411.6,1.15 411.41,1.15 411.22,1.22 411.09,1.22c-0.26,0 -0.38,0 -0.58,0.06 0,0 -0.06,0 -0.19,0L410.07,1.28 409.94,1.28 409.49,1.34 409.36,1.34 409.17,1.34c-0.13,0 -0.19,0 -0.26,0.06L408.53,1.41 408.28,1.41 408.02,1.41c0,0 -0.06,0.06 -0.19,0.06L407.57,1.47 407.44,1.47C407.32,1.47 407.12,1.47 407.12,1.47L406.8,1.47 406.61,1.47 406.42,1.54 405.97,1.54c0,0 -0.13,0 -0.13,0.06L405.52,1.6 405.46,1.6c-0.38,0 -0.7,0.06 -1.02,0.06 0,0 -0.06,0 -0.13,0.06L404.12,1.73 403.99,1.73c-0.26,0 -0.45,0 -0.45,0L403.35,1.79 403.03,1.79 402.96,1.86c-0.26,0 -0.45,0 -0.45,0L402.26,1.86c0,0 -0.19,0.06 -0.32,0.06L401.81,1.92c-0.26,0.06 -0.64,0.06 -0.64,0.06L400.85,2.05c-0.13,0 -0.19,0 -0.19,0L400.47,2.05C400.21,2.11 400.02,2.11 400.02,2.11L399.83,2.11c0,0 -0.26,0 -0.38,0.06L399.38,2.18 398.48,2.24 398.42,2.24 398.04,2.3l0,0L397.33,2.37l0,0L396.95,2.43l0,0c-0.32,0 -0.7,0.06 -0.7,0.06L395.92,2.56c-0.32,0 -0.7,0.06 -1.09,0.06l0,0C394.39,2.69 393.94,2.75 393.43,2.82l0,0C393.11,2.88 392.79,2.88 392.4,2.94l0,0C366.68,5.89 341.65,11.01 317.46,18.05c-16.96,5.06 -26.56,22.78 -21.63,39.68 4.1,14.02 16.9,22.98 30.66,22.98 3.01,0 6.08,-0.38 9.09,-1.34C370.52,69.18 406.93,64 443.86,64c17.66,0 32,-14.34 32,-32S461.52,0 443.86,0L443.86,0 443.86,0zM218.84,65.98c-5.89,0 -11.9,1.6 -17.28,5.06C198.8,72.9 196.05,74.69 193.36,76.48L193.36,76.48c-3.71,2.5 -7.36,5.12 -11.01,7.74l0,0C180.69,85.38 179.09,86.59 177.43,87.81l0,0C177.17,88 176.92,88.19 176.6,88.38l0,0c-0.26,0.19 -0.51,0.45 -0.77,0.64L175.76,89.02C174.36,90.05 172.95,91.14 171.54,92.22l0,0C171.35,92.35 171.16,92.48 170.96,92.61l0,0c-0.64,0.51 -1.28,1.02 -1.79,1.47L169.11,94.08C168.85,94.34 168.6,94.53 168.34,94.66L168.34,94.72C168.08,94.91 167.76,95.1 167.57,95.3L167.44,95.36C167.25,95.55 167,95.74 166.74,95.94L166.68,96C166.48,96.19 166.23,96.38 165.97,96.58L165.97,96.64C165.72,96.83 165.46,97.02 165.2,97.22L165.08,97.28C164.88,97.41 164.63,97.6 164.37,97.79L164.31,97.86C164.05,98.05 163.86,98.24 163.6,98.43c0,0.06 0,0.06 0,0.06C163.35,98.69 163.09,98.88 162.84,99.07c0,0.06 -0.06,0.06 -0.06,0.06C162.52,99.33 162.26,99.52 162.07,99.71 162,99.78 161.94,99.78 161.94,99.78 161.68,99.97 161.49,100.1 161.3,100.29c0,0 -0.06,0.06 -0.06,0.13 0,0 -0.13,0.06 -0.26,0.13L160.92,100.61C160.79,100.74 160.66,100.86 160.53,100.93c0,0 -0.06,0.06 -0.13,0.13 0,0 -0.13,0.06 -0.19,0.19 0,0 -0.06,0 -0.13,0.06 0,0 -0.26,0.19 -0.38,0.32 0,0 -0.06,0 -0.13,0.06L159.44,101.89 159.32,101.95C159.19,102.08 159.06,102.14 158.93,102.21L158.8,102.4 158.68,102.53c0,0 -0.06,0.06 -0.19,0.13 0,0 -0.13,0.13 -0.26,0.26 0,0 -0.13,0.06 -0.13,0.13 0,0 -0.13,0.06 -0.19,0.13 0,0 -0.13,0.06 -0.19,0.13 0,0 -0.19,0.19 -0.26,0.26 0,0 -0.13,0.06 -0.19,0.13L157.08,103.74 156.95,103.87C156.82,104 156.76,104.06 156.63,104.13L156.56,104.26 156.31,104.45 156.18,104.51C156.05,104.64 156.05,104.7 155.92,104.77L155.73,104.96c0,0.06 -0.06,0.06 -0.06,0.06L155.48,105.15C155.35,105.28 155.22,105.34 155.22,105.34 155.09,105.41 155.03,105.47 154.96,105.54c0,0 -0.13,0.06 -0.13,0.13L154.64,105.86C154.58,105.92 154.45,105.98 154.39,106.05c0,0 -0.13,0.06 -0.19,0.13L154,106.37 153.88,106.5C153.75,106.56 153.68,106.62 153.62,106.69L153.43,106.88 153.3,107.01C153.24,107.07 153.17,107.14 153.17,107.14 153.04,107.2 152.98,107.26 152.92,107.33L152.72,107.52C152.6,107.58 152.6,107.65 152.6,107.65 152.47,107.71 152.4,107.78 152.4,107.78 152.28,107.9 152.21,107.9 152.21,107.9 152.08,108.03 152.02,108.03 151.89,108.16L151.76,108.29C151.7,108.35 151.64,108.35 151.64,108.35 151.51,108.48 151.44,108.54 151.44,108.54 151.32,108.61 151.19,108.74 151.19,108.74 151.06,108.86 151.06,108.93 151.06,108.93 150.93,108.99 150.87,109.06 150.8,109.12c0,0 -0.13,0.06 -0.13,0.13 0,0 -0.26,0.13 -0.32,0.26 0,0 -0.13,0.06 -0.13,0.13L150.1,109.76 149.97,109.89C149.84,110.02 149.72,110.08 149.65,110.14L149.59,110.27 149.33,110.4C149.27,110.53 149.2,110.53 149.2,110.53 149.08,110.66 148.95,110.72 148.88,110.78L148.76,110.85C148.69,110.98 148.56,111.04 148.56,111.04L148.44,111.17C148.31,111.3 148.18,111.36 148.05,111.49L147.99,111.55 147.8,111.74C147.73,111.81 147.73,111.81 147.73,111.81 147.6,111.94 147.48,112.06 147.35,112.13c0,0.06 0,0.06 0,0.06C147.22,112.32 147.09,112.38 147.03,112.45L146.96,112.51C146.84,112.64 146.71,112.7 146.58,112.83l0,0.06C146.45,112.96 146.32,113.02 146.26,113.15L146.2,113.22C146.07,113.28 145.94,113.34 145.81,113.47l0,0C145.68,113.6 145.56,113.66 145.49,113.73c0,0 -0.06,0.06 -0.06,0.13C145.36,113.92 145.24,114.05 145.11,114.11l0,0.06C144.98,114.24 144.85,114.37 144.85,114.37 144.72,114.5 144.72,114.5 144.72,114.5 144.6,114.62 144.47,114.69 144.34,114.82c0,0 0,0 0,0.06 0,0 -0.26,0.13 -0.32,0.26L143.96,115.14C143.7,115.39 143.44,115.65 143.25,115.84L143.19,115.9C142.93,116.03 142.74,116.22 142.55,116.48L142.48,116.48C142.29,116.74 142.04,116.93 141.78,117.12c0,0.06 0,0.06 0,0.06 -0.26,0.19 -0.51,0.45 -0.77,0.64l0,0.06c-0.26,0.19 -0.51,0.45 -0.7,0.64L140.24,118.53C140.05,118.72 139.86,118.98 139.6,119.17l0,0c-12.1,11.2 -23.62,23.04 -34.37,35.52 -11.65,13.38 -10.11,33.54 3.2,45.18 6.08,5.25 13.5,7.81 20.93,7.81 9.02,0 17.86,-3.78 24.19,-11.07 24.06,-27.78 51.9,-51.9 82.69,-71.68C251.09,115.39 255.32,95.55 245.78,80.7 239.64,71.17 229.33,65.98 218.84,65.98L218.84,65.98zM65.3,243.33c-12.1,0 -23.74,6.91 -29.12,18.69 -17.41,38.27 -29.7,79.3 -35.84,122.43C-2.16,401.92 9.94,418.11 27.48,420.61 29.01,420.8 30.55,420.93 32.02,420.93c15.68,0 29.38,-11.58 31.68,-27.52C68.82,357.12 79.12,321.86 94.36,288.64c7.36,-16.13 0.32,-35.07 -15.74,-42.43C74.26,244.22 69.72,243.33 65.3,243.33L65.3,243.33zM32.08,475.46c-1.47,0 -3.01,0.13 -4.54,0.38C10,478.34 -2.16,494.53 0.4,512 1.24,517.89 2.2,523.78 3.22,529.54l0,0c0.13,0.32 0.13,0.64 0.26,0.96L3.48,530.56c0,0.32 0.13,0.64 0.13,0.96l0,0.06c0.06,0.19 0.13,0.32 0.13,0.32 0,0.19 0,0.13 0,0.19 0,0.13 0.06,0.32 0.13,0.45 0,0.06 0,0.06 0,0.06 0,0.13 0,0.32 0.06,0.45l0,0.06c0.06,0.13 0.06,0.32 0.06,0.45 0,0.06 0,0.06 0,0.06 0.06,0.13 0.13,0.26 0.13,0.45l0,0.06c0.06,0.32 0.13,0.64 0.19,0.96L4.31,535.04c0,0.19 0,0.32 0.06,0.45l0,0c0,0.19 0.06,0.32 0.06,0.45 0,0.06 0,0.13 0,0.13C4.5,536.19 4.5,536.32 4.56,536.45c0,0.06 0,0.06 0,0.06 0,0.19 0.06,0.32 0.13,0.51l0,0.06c0,0.13 0,0.26 0.06,0.38 0,0 0,0.06 0,0.13 0.06,0.13 0.06,0.26 0.13,0.38l0,0.13c0.06,0.13 0.06,0.26 0.06,0.38 0,0 0,0.06 0,0.13 0.06,0.13 0.13,0.26 0.13,0.38l0,0.13C5.14,539.2 5.14,539.33 5.14,539.33 5.2,539.46 5.2,539.52 5.2,539.58c0,0 0,0.19 0.06,0.32l0,0.13C5.33,540.16 5.33,540.22 5.4,540.35l0,0.19c0.06,0.13 0.06,0.19 0.06,0.32 0,0 0,0.06 0.06,0.13 0,0.13 0.06,0.26 0.06,0.38l0.06,0.19c0,0.06 0,0.19 0,0.19 0.06,0.13 0.06,0.19 0.06,0.26 0,0.13 0.06,0.26 0.13,0.38l0,0.19c0,0 0.06,0.19 0.06,0.26l0.06,0.19c0,0.13 0,0.26 0.06,0.32 0,0 0,0.19 0.06,0.26 0,0 0,0.19 0,0.26L6.16,544c0.06,0.13 0.06,0.19 0.06,0.19 0,0.19 0.06,0.32 0.06,0.38 0,0 0.06,0.19 0.06,0.26l0,0.19C6.42,545.15 6.42,545.22 6.42,545.22c0.06,0.13 0.06,0.26 0.06,0.38 0.06,0.06 0.06,0.19 0.06,0.19C6.61,545.86 6.61,545.92 6.61,545.98c0,0.13 0.06,0.13 0.06,0.26l0.06,0.19c0,0.13 0,0.26 0.06,0.38 0,0.06 0.06,0.13 0.06,0.19 0,0 0,0.13 0,0.26l0.06,0.13c0.06,0.13 0.06,0.19 0.06,0.26 0,0.13 0.06,0.26 0.06,0.26C7.06,548.1 7.06,548.1 7.06,548.16c0,0 0.06,0.19 0.06,0.26l0.06,0.19c0,0.13 0,0.26 0.06,0.38 0,0.06 0.06,0.13 0.06,0.19 0,0.13 0,0.19 0.06,0.26l0,0.19C7.44,549.76 7.44,549.95 7.51,550.08c0,0 0,0.06 0.06,0.13 0,0.13 0,0.19 0,0.26l0.06,0.19C7.7,550.78 7.7,550.98 7.76,551.17l0,0c0.06,0.13 0.06,0.19 0.06,0.32l0.06,0.06c0.06,0.32 0.13,0.64 0.19,0.9 0,0.06 0,0.13 0,0.19 0,0 0.06,0.13 0.13,0.26 0,0 0,0.06 0,0.13 0,0 0.06,0.32 0.13,0.45L8.34,553.6c0.06,0.06 0.06,0.13 0.13,0.26l0,0.13c0,0.13 0.06,0.32 0.13,0.45l0,0.19c0,0.06 0.06,0.13 0.06,0.26l0.06,0.06c0.06,0.38 0.13,0.64 0.19,0.96L8.98,556.03c0.06,0.26 0.13,0.58 0.19,0.9 0,0 0.06,0.06 0.06,0.13 0,0 0,0.13 0.06,0.26l0,0.06c0.06,0.19 0.06,0.38 0.13,0.58l0.06,0.06c0,0.13 0,0.19 0.06,0.32l0,0.06c0.06,0.19 0.06,0.38 0.19,0.58 0,0.06 0,0.06 0,0.06 0,0.13 0,0.19 0.06,0.32l0,0.06c0.06,0.19 0.13,0.45 0.19,0.64l0,0c0,0.13 0,0.19 0.06,0.32l0,0.06C10.07,560.64 10.2,560.96 10.26,561.28l0.06,0.06c0.06,0.32 0.13,0.64 0.19,0.96l0.06,0.06c0,0.13 0,0.19 0.06,0.32l0,0c0.06,0.26 0.13,0.45 0.19,0.64l0,0.06c0,0.13 0,0.19 0.06,0.32l0,0.06c0.06,0.32 0.19,0.64 0.26,0.96 0,0 0.06,0 0.06,0.06 0.06,0.32 0.13,0.64 0.26,0.96 0,0 0,0 0,0.06 0.06,0.32 0.19,0.64 0.26,0.96l0,0c0.13,0.38 0.19,0.7 0.26,1.02l0,0c0.06,0.13 0.13,0.26 0.13,0.26 0,0.13 0,0.13 0,0.13C12.18,568.32 12.24,568.64 12.31,568.96c0,0.06 0,0.06 0,0.06C12.44,569.34 12.56,569.6 12.63,569.92l0,0.06C12.69,570.3 12.82,570.62 12.88,570.94l0.06,0.06c0.06,0.32 0.13,0.64 0.26,0.96l0,0.06C13.33,572.42 13.46,572.8 13.59,573.25l0,0.06c0.13,0.32 0.19,0.64 0.32,0.96l0,0.06c0.06,0.32 0.19,0.64 0.32,0.96l0,0c0.06,0.38 0.13,0.7 0.26,1.02l0,0c0.13,0.38 0.19,0.7 0.32,1.02l0,0c0.06,0.13 0.06,0.26 0.06,0.26l0,0.06c0.13,0.38 0.26,0.7 0.32,1.02 0,0 0.06,0 0.06,0.06 0.06,0.26 0.13,0.64 0.26,0.9l0,0.06c0.13,0.32 0.26,0.64 0.32,0.96l0,0.06c0.13,0.32 0.19,0.64 0.32,0.96 0,0 0,0 0,0.06 0,0 0.06,0.19 0.13,0.32l0,0c0.06,0.32 0.19,0.64 0.26,1.02l0,0c0.13,0.32 0.26,0.64 0.38,0.96 0,0 0,0 0,0.06 0.06,0.32 0.19,0.64 0.26,0.96l0,0c0.13,0.32 0.26,0.64 0.38,1.02l0,0c0.13,0.45 0.26,0.9 0.38,1.34l0,0c0.26,0.64 0.45,1.28 0.7,1.92l0,0c0.32,1.15 0.7,2.18 1.09,3.26l0,0c0.13,0.32 0.26,0.7 0.38,1.02l0,0c0.06,0.32 0.19,0.64 0.32,0.96l0,0c4.74,13.76 10.11,27.14 16.13,40.26 5.38,11.71 16.96,18.56 29.06,18.56 4.42,0 9.02,-0.96 13.31,-2.94 16.06,-7.36 23.1,-26.3 15.74,-42.37 -15.23,-33.34 -25.6,-68.54 -30.78,-104.83C61.46,486.98 47.76,475.46 32.08,475.46L32.08,475.46zM129.56,688.64c-7.36,0 -14.85,2.56 -20.93,7.81 -13.31,11.65 -14.72,31.81 -3.2,45.12l0,0.06c0.13,0.13 0.26,0.26 0.32,0.32l0.06,0.06c0.06,0.13 0.19,0.19 0.26,0.32L106.13,742.4c0.13,0.13 0.19,0.26 0.32,0.38l0,0c0.13,0.13 0.19,0.19 0.32,0.32 0,0.06 0,0.06 0,0.06 0.13,0.13 0.26,0.26 0.32,0.38l0,0c0.13,0.13 0.26,0.19 0.38,0.32 0,0.06 0,0.06 0,0.06 0.19,0.26 0.45,0.51 0.64,0.7l0.06,0.06c0.19,0.26 0.38,0.51 0.64,0.7l0,0.06c0.19,0.26 0.45,0.45 0.64,0.7l0.06,0.06c0.19,0.26 0.38,0.45 0.64,0.7l0,0.06c0.26,0.26 0.45,0.45 0.64,0.7l0.06,0.06c0.26,0.26 0.45,0.45 0.7,0.7 0,0 0,0 0,0.06 0.19,0.19 0.45,0.45 0.64,0.7l0,0c0.26,0.26 0.51,0.51 0.7,0.77l0,0c0.26,0.26 0.45,0.51 0.7,0.7l0,0.06c0.26,0.26 0.45,0.51 0.7,0.7l0,0.06c0.19,0.19 0.45,0.45 0.7,0.7l0,0c0.19,0.26 0.45,0.51 0.64,0.77l0,0c0.26,0.26 0.51,0.51 0.7,0.77l0.06,0c0.19,0.26 0.45,0.51 0.64,0.7l0,0c25.28,27.01 53.89,50.82 85.06,70.91 5.38,3.46 11.39,5.06 17.34,5.06 10.5,0 20.8,-5.18 26.94,-14.66 9.54,-14.85 5.25,-34.69 -9.6,-44.22 -30.78,-19.84 -58.69,-43.9 -82.75,-71.62C147.48,692.35 138.58,688.64 129.56,688.64L129.56,688.64zM326.93,815.36c-13.89,0 -26.62,9.02 -30.72,22.98 -4.93,16.96 4.74,34.69 21.7,39.68 0.45,0.13 0.9,0.26 1.34,0.38l0,0c0,0 0.19,0.06 0.32,0.06l0.06,0c0.32,0.13 0.64,0.19 0.9,0.32l0.13,0 0.19,0.06c0.13,0 0.13,0 0.13,0.06 0,0 0.38,0.06 0.58,0.13l0.13,0.06c0,0 0.19,0 0.26,0.06L321.94,879.17c0.13,0.06 0.26,0.13 0.26,0.13L322.58,879.36l0.19,0.06 0.19,0.06 0.26,0.06 0.26,0.06c0.13,0.06 0.19,0.06 0.19,0.06l0.32,0.06c0.06,0.06 0.13,0.06 0.13,0.06l0.38,0.06c0.06,0.06 0.13,0.06 0.13,0.06 0.13,0.06 0.26,0.06 0.38,0.13l0.13,0 0.26,0.06c0.06,0.06 0.13,0.06 0.13,0.06s0.32,0.06 0.45,0.13l0.13,0.06c0,0 0.19,0 0.32,0.06l0.13,0c0.13,0.06 0.26,0.13 0.26,0.13l0.26,0c0,0 0.26,0.06 0.38,0.13l0.13,0.06 0.38,0.06 0,0c0.13,0.06 0.32,0.06 0.45,0.13L328.34,880.96c0,0 0.26,0.06 0.38,0.13l0.13,0c0,0 0.26,0.13 0.38,0.13l0.06,0c0.13,0.06 0.32,0.06 0.32,0.06l0.19,0.06c0.32,0.13 0.58,0.19 0.9,0.26l0.06,0c0.13,0.06 0.26,0.13 0.45,0.13l0,0c0.32,0.06 0.64,0.19 0.64,0.19l0.32,0.06c0.32,0.06 0.64,0.19 0.96,0.26l0.06,0c25.28,6.46 51.46,10.75 78.27,12.61l0,0.06c0.38,0 0.7,0 1.02,0l0,0.06c0,0 1.02,0.06 1.47,0.06l0,0 1.02,0.06 0.06,0c0,0 1.02,0.06 1.47,0.13l0,0 1.02,0.06 0,0c0.32,0 0.7,0 1.02,0.06l0.06,0c0,0 0.26,0 0.45,0l0,0 1.02,0.06 0.06,0c0.32,0 0.64,0 0.96,0.06l0.06,0c0,0 0.32,0 0.51,0l0,0c0,0 0.32,0.06 0.51,0.06l0,0L422.42,895.55l0.06,0c0.32,0 0.64,0 1.02,0.06l0.06,0 0.96,0 0.06,0.06L424.98,895.68l0,0c0.19,0 0.38,0 0.38,0l0.19,0 0.45,0 0.06,0c0.32,0.06 0.64,0.06 0.64,0.06l0.38,0c0.19,0 0.32,0 0.32,0L427.54,895.74c0.19,0 0.32,0.06 0.32,0.06l0.26,0 0.38,0 0.06,0 1.02,0 0.06,0c0.13,0 0.32,0.06 0.32,0.06L430.1,895.87l0.45,0 0.06,0 0.45,0 0.06,0c0,0 0.38,0 0.51,0l0,0 0.45,0.06 0.13,0c0.13,0 0.32,0 0.32,0l0.13,0 0.51,0 0.06,0 0.45,0 0.06,0c0,0 0.32,0 0.45,0l0.13,0L434.58,895.94l0.13,0c0.13,0.06 0.26,0.06 0.26,0.06l0.19,0 0.45,0 0.13,0c0,0 0.26,0 0.38,0l0.13,0c0,0 0.26,0 0.45,0l0.06,0 0.38,0 0.13,0c0.19,0 0.32,0 0.32,0l0.19,0 0.45,0L438.29,896c0,0 0.26,0 0.38,0l0.06,0c0,0 0.32,0 0.51,0l0.13,0 0.32,0 0.13,0c0.19,0 0.32,0 0.32,0L440.34,896l0.38,0 0.13,0c0,0 0.26,0 0.38,0l0.06,0 0.45,0 0.13,0 0.38,0 0.13,0c0.13,0 0.32,0 0.32,0L442.9,896l0.38,0 0.13,0 0.45,0c17.66,0 32,-14.34 32,-32S461.52,832 443.86,832c-36.74,0 -73.09,-5.18 -107.97,-15.36C332.88,815.74 329.88,815.36 326.93,815.36L326.93,815.36zM669.08,765.76c-5.95,0 -11.97,1.66 -17.34,5.12 -30.78,19.97 -64.26,35.26 -99.33,45.57 -16.96,4.99 -26.62,22.72 -21.63,39.74 4.03,13.95 16.83,22.91 30.66,22.91 3.01,0 6.02,-0.38 9.02,-1.28 41.47,-12.22 80.58,-30.34 116.1,-53.31 14.72,-9.54 19.01,-29.31 9.41,-44.1C689.88,770.94 679.57,765.76 669.08,765.76L669.08,765.76zM822.61,588.29c-12.1,0 -23.74,6.98 -29.12,18.75 -15.17,33.34 -35.07,64.26 -59.14,92.03 -11.52,13.38 -10.05,33.6 3.33,45.18 6.08,5.18 13.5,7.74 20.93,7.74 8.96,0 17.86,-3.78 24.19,-11.07 0.13,-0.13 0.19,-0.26 0.32,-0.38l0,0c0.13,-0.13 0.26,-0.26 0.32,-0.38l0,0c0.13,-0.13 0.26,-0.26 0.32,-0.38l0.06,0c0.06,-0.13 0.19,-0.19 0.32,-0.32 0,-0.06 0,-0.06 0,-0.06 0.13,-0.13 0.19,-0.26 0.32,-0.38l0,0c0.06,-0.13 0.19,-0.19 0.32,-0.32 0,-0.06 0,-0.06 0,-0.06 0.13,-0.13 0.26,-0.26 0.32,-0.38l0.06,-0.06c0.06,-0.06 0.13,-0.19 0.13,-0.19 0.13,-0.13 0.13,-0.13 0.13,-0.13 0.13,-0.13 0.26,-0.26 0.38,-0.38l0,-0.06c0.13,-0.06 0.19,-0.19 0.19,-0.19l0.13,-0.19c0.13,-0.13 0.19,-0.19 0.32,-0.32l0,-0.06c0.13,-0.13 0.19,-0.19 0.26,-0.26l0.13,-0.13c0.06,-0.13 0.13,-0.26 0.13,-0.26 0.13,-0.13 0.13,-0.13 0.13,-0.13 0.13,-0.13 0.19,-0.19 0.26,-0.26l0.13,-0.13c0.06,-0.13 0.13,-0.19 0.19,-0.26l0.19,-0.19c0,-0.06 0.13,-0.13 0.13,-0.19l0.13,-0.19c0.13,-0.06 0.13,-0.13 0.13,-0.13 0.13,-0.13 0.19,-0.19 0.19,-0.19s0.19,-0.26 0.26,-0.32c0,0 0.06,-0.06 0.13,-0.13l0.06,-0.13c0.13,-0.19 0.19,-0.26 0.19,-0.26 0.13,-0.13 0.19,-0.19 0.26,-0.26l0.13,-0.19c0.06,-0.06 0.06,-0.13 0.06,-0.13 0.13,-0.13 0.19,-0.19 0.19,-0.19 0.13,-0.13 0.19,-0.19 0.26,-0.26l0.13,-0.19c0.06,-0.06 0.06,-0.13 0.06,-0.13 0.19,-0.13 0.26,-0.26 0.38,-0.38l0.06,-0.13 0.19,-0.19 0.06,-0.06c0.19,-0.26 0.38,-0.51 0.58,-0.7 0,-0.06 0.06,-0.06 0.06,-0.06 0.19,-0.32 0.38,-0.51 0.58,-0.77l0.06,-0.06c0.19,-0.26 0.45,-0.51 0.64,-0.77l0,0c0.45,-0.58 0.83,-1.09 1.28,-1.54l0,0c10.37,-12.99 20.03,-26.5 28.93,-40.58 0,0 0,0 0,-0.06 0.19,-0.26 0.38,-0.51 0.51,-0.83l0.06,0c0.19,-0.32 0.32,-0.58 0.51,-0.83l0.06,-0.06c0.13,-0.26 0.32,-0.58 0.45,-0.83 0,0 0.06,0 0.06,-0.06 0,0 0.13,-0.19 0.13,-0.26l0.06,-0.06c0.13,-0.13 0.19,-0.32 0.32,-0.45l0,-0.06c0.13,-0.13 0.13,-0.19 0.19,-0.32 0,0 0.06,0 0.06,-0.06 0.06,-0.13 0.19,-0.26 0.26,-0.45 0,-0.06 0.06,-0.06 0.06,-0.06 0.06,-0.13 0.13,-0.19 0.19,-0.26l0.06,-0.13c0.06,-0.13 0.13,-0.26 0.19,-0.38l0.13,-0.13c0,-0.13 0.06,-0.19 0.13,-0.26 0,0 0.06,-0.06 0.06,-0.13 0.06,-0.13 0.19,-0.26 0.19,-0.26l0.13,-0.26c0,0 0.13,-0.13 0.13,-0.19l0.06,-0.13c0.13,-0.19 0.19,-0.26 0.19,-0.38l0.19,-0.19c0,-0.06 0.06,-0.13 0.06,-0.19l0.13,-0.13c0.06,-0.19 0.13,-0.26 0.13,-0.26 0.13,-0.13 0.13,-0.26 0.13,-0.26 0.13,-0.13 0.13,-0.19 0.19,-0.26l0.13,-0.19c0,-0.06 0.06,-0.13 0.06,-0.19 0,0 0.13,-0.19 0.26,-0.32l0.06,-0.13c0.06,-0.13 0.06,-0.19 0.13,-0.26l0.06,-0.13c0.13,-0.13 0.19,-0.26 0.26,-0.38 0,0 0.06,-0.06 0.06,-0.13 0,0 0.13,-0.19 0.19,-0.26l0.06,-0.13c0.06,-0.13 0.13,-0.26 0.19,-0.38 0,0 0.06,-0.06 0.06,-0.13 0,0 0.13,-0.13 0.19,-0.26 0,0 0,-0.06 0.06,-0.13 0.06,-0.13 0.13,-0.26 0.19,-0.38l0.06,-0.06c0.06,-0.13 0.13,-0.19 0.19,-0.32l0.06,-0.13c0.06,-0.13 0.19,-0.26 0.19,-0.38 0,0 0.06,0 0.06,-0.06 0,0 0.13,-0.19 0.19,-0.32l0.06,-0.06c0.06,-0.13 0.19,-0.26 0.26,-0.45l0,0c0.06,-0.13 0.19,-0.26 0.19,-0.38l0.06,-0.06c0.19,-0.26 0.32,-0.58 0.51,-0.83l0,-0.06c0.19,-0.26 0.32,-0.58 0.51,-0.83l0,-0.06c0.19,-0.26 0.32,-0.58 0.51,-0.83l0,0c0.19,-0.32 0.32,-0.58 0.51,-0.9l0,0c0.19,-0.32 0.32,-0.58 0.51,-0.9l0,0c6.66,-11.65 12.67,-23.55 18.3,-35.78 7.3,-16.13 0.26,-35.07 -15.87,-42.37C831.51,589.25 827.03,588.29 822.61,588.29L822.61,588.29zM855.57,356.1c-1.47,0 -3.01,0.13 -4.54,0.32 -17.47,2.56 -29.7,18.75 -27.14,36.22C826.52,410.88 827.86,429.5 827.86,448c0,18.11 -1.28,36.35 -3.84,54.27 -2.43,17.47 9.73,33.6 27.26,36.1 1.47,0.19 3.01,0.32 4.48,0.32 15.62,0 29.31,-11.52 31.62,-27.39 0.45,-3.39 0.96,-6.72 1.34,-10.05L888.72,501.18c0,-0.13 0,-0.26 0.06,-0.32L888.79,500.8c0,-0.19 0.06,-0.45 0.06,-0.64L888.85,500.1c0,-0.13 0,-0.19 0,-0.19 0,-0.13 0.06,-0.19 0.06,-0.26 0,0 0,-0.19 0,-0.26C888.98,499.33 888.98,499.2 888.98,499.07L888.98,498.88c0,-0.06 0,-0.13 0.06,-0.26 0,-0.06 0,-0.13 0,-0.19 0,0 0.06,-0.19 0.06,-0.32L889.11,497.98c0,-0.13 0,-0.26 0,-0.38 0,-0.06 0.06,-0.13 0.06,-0.19L889.17,497.22c0,0 0.06,-0.13 0.06,-0.19 0,-0.13 0,-0.26 0,-0.38 0,0 0,-0.06 0,-0.13 0.06,-0.13 0.06,-0.26 0.06,-0.38 0,0 0,-0.06 0,-0.13 0.06,-0.13 0.06,-0.26 0.06,-0.38l0,0c0,-0.19 0,-0.38 0.06,-0.51L889.43,495.04c0,-0.13 0,-0.26 0.06,-0.45l0,0c0,-0.32 0.06,-0.64 0.06,-1.02l0,0c1.02,-9.73 1.66,-19.65 2.05,-29.63l0,0c0,-0.32 0,-0.64 0,-1.02l0,0c0,-0.51 0,-1.02 0.06,-1.41L891.67,461.5c0,-0.32 0,-0.64 0,-1.02l0,0c0,-0.13 0.06,-0.32 0.06,-0.45L891.73,460.03c0,-0.32 0,-0.64 0,-0.96 0,-0.06 0,-0.06 0,-0.06 0,-0.32 0,-0.64 0,-0.96 0,-0.06 0,-0.06 0,-0.06 0,-0.13 0,-0.32 0,-0.45L891.73,457.47c0,-0.32 0,-0.64 0.06,-0.96L891.8,456.51c0,-0.13 0,-0.32 0,-0.45L891.8,456c0,-0.13 0,-0.32 0,-0.45L891.8,455.49c0,-0.13 0,-0.32 0,-0.45L891.8,454.98c0,-0.32 0,-0.64 0,-0.96l0.06,-0.13c0,-0.13 0,-0.26 0,-0.38L891.86,453.5c0,-0.13 0,-0.32 0,-0.51l0,0c0,-0.19 0,-0.32 0,-0.45L891.86,452.42c0,-0.13 0,-0.26 0,-0.38L891.86,451.97c0,0 0,-0.32 0,-0.45 0,0 0,-0.06 0,-0.13 0,-0.13 0,-0.26 0,-0.38L891.86,451.01c0,-0.19 0,-0.32 0,-0.51 0,0 0,0 0,-0.06 0,-0.13 0,-0.26 0,-0.38 0,0 0,-0.06 0,-0.13 0,-0.13 0,-0.26 0,-0.38L891.86,449.47c0,-0.19 0,-0.32 0,-0.32 0,-0.19 0,-0.26 0,-0.26 0,-0.13 0,-0.26 0,-0.38L891.86,448.45c0,-0.13 0,-0.32 0,-0.45l0,0c0,-0.13 0,-0.32 0,-0.45 0,-0.06 0,-0.13 0,-0.13 0,-0.13 0,-0.26 0,-0.38 0,-0.06 0,-0.06 0,-0.06 0,-0.19 0,-0.38 0,-0.51L891.86,446.46c0,-0.19 0,-0.32 0,-0.38L891.86,445.89c0,-0.13 0,-0.26 0,-0.45L891.86,445.38c0,-0.13 0,-0.26 0,-0.38 0,-0.06 0,-0.13 0,-0.13 0,-0.13 0,-0.26 0,-0.38 0,-0.06 0,-0.06 0,-0.06 0,-0.19 0,-0.32 0,-0.51L891.86,443.9c0,-0.19 0,-0.32 0,-0.45L891.86,443.39c0,-0.19 0,-0.32 0,-0.51L891.86,442.82c0,-0.13 0,-0.26 0,-0.38 0,-0.06 0,-0.06 0,-0.06 0,-0.19 -0.06,-0.38 -0.06,-0.51l0,0c0,-0.19 0,-0.32 0,-0.51L891.8,441.28c0,-0.13 0,-0.26 0,-0.38 0,0 0,0 0,-0.06 0,-0.19 0,-0.32 0,-0.45 0,-0.06 0,-0.06 0,-0.06 0,-0.19 0,-0.32 0,-0.45L891.8,439.74c0,-0.32 0,-0.64 -0.06,-0.96L891.73,438.72c0,-0.13 0,-0.32 0,-0.45 0,0 0,0 0,-0.06 0,-0.13 0,-0.32 0,-0.45 0,-0.06 0,-0.06 0,-0.06 0,-0.19 0,-0.32 0,-0.45L891.73,437.25c0,-0.19 0,-0.32 0,-0.51l0,0c0,-0.19 0,-0.32 0,-0.51L891.73,436.16c0,-0.32 -0.06,-0.64 -0.06,-0.96L891.67,435.2c0,-0.13 0,-0.32 0,-0.45 0,0 0,0 0,-0.06 0,-0.13 0,-0.32 0,-0.51l0,0c-0.06,-0.19 -0.06,-0.32 -0.06,-0.45L891.6,433.66c0,-0.32 0,-0.7 0,-1.02L891.6,432.64c0,-0.32 0,-0.64 -0.06,-0.96L891.54,431.62c0,-0.13 0,-0.32 0,-0.45L891.54,431.1c0,-0.32 0,-0.64 -0.06,-1.02l0,0c0,-0.32 0,-0.7 0,-1.02l0,0c0,-0.19 0,-0.38 0,-0.51l0,0c-0.06,-0.38 -0.06,-0.7 -0.06,-1.02L891.41,427.58c-0.45,-9.28 -1.15,-18.5 -2.11,-27.65l0,0c-0.06,-0.51 -0.06,-1.02 -0.13,-1.47l-0.06,0c0,-0.32 0,-0.64 -0.06,-0.96 0,-0.06 0,-0.06 0,-0.06 -0.06,-0.32 -0.06,-0.7 -0.13,-0.96 0,-0.06 0,-0.06 0,-0.06 0,-0.19 -0.06,-0.32 -0.06,-0.45L888.85,395.97c0,-0.19 0,-0.32 -0.06,-0.45 0,0 0,-0.06 0,-0.13 0,-0.13 0,-0.26 -0.06,-0.38 0,0 0,-0.06 0,-0.13 0,-0.13 0,-0.26 0,-0.38l-0.06,-0.06c0,-0.13 0,-0.26 -0.06,-0.45 0,0 0,-0.06 0,-0.13 0,-0.13 0,-0.19 0,-0.32 0,-0.06 0,-0.06 0,-0.06 -0.06,-0.19 -0.06,-0.38 -0.13,-0.51L888.47,392.9c0,-0.13 0,-0.19 0,-0.32l-0.06,-0.19c0,-0.06 0,-0.19 0,-0.19C888.34,392 888.34,391.94 888.34,391.81c0,0 0,-0.13 0,-0.26l-0.06,-0.19c0,-0.06 0,-0.13 0,-0.26 0,-0.06 -0.06,-0.13 -0.06,-0.19 0,-0.13 0,-0.26 0,-0.26 0,-0.19 -0.06,-0.26 -0.06,-0.38 0,-0.06 0,-0.06 0,-0.06 0,-0.19 -0.06,-0.26 -0.06,-0.38L888.08,389.82c0,-0.19 -0.06,-0.38 -0.06,-0.58L888.02,389.18c-0.06,-0.13 -0.06,-0.26 -0.06,-0.32L887.96,388.8c-0.06,-0.38 -0.13,-0.7 -0.13,-1.02L887.83,387.78c-0.19,-1.34 -0.38,-2.82 -0.64,-4.22C884.88,367.55 871.19,356.1 855.57,356.1L855.57,356.1zM757.78,143.04c-7.42,0 -14.91,2.56 -20.93,7.87 -13.38,11.58 -14.72,31.81 -3.2,45.12 24.13,27.78 44.03,58.62 59.39,91.9 5.38,11.78 16.96,18.62 29.06,18.62 4.48,0 9.02,-0.96 13.38,-2.94 16,-7.3 23.04,-26.24 15.74,-42.3 -2.56,-5.63 -5.25,-11.2 -8.06,-16.7l0,0c-0.19,-0.26 -0.32,-0.58 -0.45,-0.9l-0.06,0c-0.06,-0.13 -0.06,-0.19 -0.13,-0.32l0,0c-0.13,-0.19 -0.19,-0.38 -0.32,-0.58L842.2,242.82c0,0 -0.13,-0.19 -0.13,-0.26l-0.06,-0.06c-0.06,-0.19 -0.19,-0.38 -0.26,-0.51L841.68,241.92c0,-0.13 -0.06,-0.19 -0.13,-0.26 0,0 0,-0.06 -0.06,-0.13 -0.06,-0.19 -0.13,-0.32 -0.19,-0.45 0,0 -0.06,-0.06 -0.06,-0.13 0,0 -0.06,-0.13 -0.13,-0.26 0,0 -0.06,-0.06 -0.06,-0.13 -0.06,-0.13 -0.13,-0.26 -0.26,-0.38l-0.06,-0.13c-0.06,-0.13 -0.06,-0.19 -0.13,-0.26 0,0 -0.06,-0.06 -0.06,-0.13 -0.06,-0.13 -0.13,-0.26 -0.19,-0.38L840.34,239.17c-0.06,-0.06 -0.13,-0.13 -0.13,-0.19l-0.13,-0.19c0,-0.06 -0.06,-0.13 -0.06,-0.13 -0.06,-0.19 -0.13,-0.32 -0.19,-0.38L839.7,238.14c0,-0.06 -0.06,-0.13 -0.06,-0.19l-0.06,-0.13c-0.13,-0.19 -0.19,-0.32 -0.26,-0.38l-0.06,-0.19c-0.06,-0.06 -0.06,-0.13 -0.13,-0.26L839.06,236.86c-0.06,-0.13 -0.13,-0.26 -0.19,-0.38 -0.06,-0.06 -0.06,-0.06 -0.06,-0.06 -0.06,-0.19 -0.13,-0.26 -0.13,-0.26 -0.06,-0.13 -0.13,-0.19 -0.13,-0.19 -0.06,-0.13 -0.13,-0.26 -0.19,-0.38L838.36,235.52c-0.06,-0.13 -0.13,-0.19 -0.13,-0.26l-0.13,-0.19c0,-0.06 -0.13,-0.19 -0.13,-0.32l-0.13,-0.13c0,-0.13 -0.06,-0.19 -0.13,-0.32l-0.06,-0.13c-0.06,-0.13 -0.13,-0.26 -0.19,-0.32 0,0 -0.06,-0.06 -0.06,-0.13 -0.06,-0.13 -0.13,-0.19 -0.19,-0.32L837.14,233.34c-0.06,-0.13 -0.13,-0.26 -0.19,-0.38l-0.06,-0.06c-0.06,-0.13 -0.13,-0.19 -0.19,-0.32 0,0 0,-0.06 -0.06,-0.13 -0.06,-0.13 -0.13,-0.26 -0.19,-0.38l0,0c-0.06,-0.13 -0.13,-0.26 -0.26,-0.38 0,0 0,-0.06 0,-0.13 -0.13,-0.13 -0.13,-0.26 -0.26,-0.38l0,0c-0.06,-0.13 -0.13,-0.26 -0.19,-0.38 0,0 -0.06,-0.06 -0.06,-0.13 -0.13,-0.26 -0.32,-0.51 -0.45,-0.83L835.22,229.82c-0.13,-0.26 -0.26,-0.51 -0.45,-0.83l-0.06,-0.06c-0.13,-0.26 -0.26,-0.51 -0.45,-0.83l0,0c-0.19,-0.32 -0.32,-0.58 -0.51,-0.9l0,0c-0.19,-0.32 -0.32,-0.58 -0.51,-0.9l0,0c-0.19,-0.32 -0.32,-0.58 -0.51,-0.9l0,0c-12.42,-21.76 -26.69,-42.3 -42.43,-61.57l0,0c-0.26,-0.26 -0.45,-0.51 -0.64,-0.77l-0.06,0c-0.19,-0.26 -0.45,-0.51 -0.64,-0.77L788.95,162.37c-0.13,-0.13 -0.19,-0.26 -0.32,-0.38l0,0c-0.13,-0.06 -0.19,-0.19 -0.32,-0.32l-0.06,-0.06c-0.06,-0.13 -0.13,-0.26 -0.26,-0.32L787.99,161.28c-0.13,-0.13 -0.19,-0.26 -0.32,-0.38l-0.06,-0.06c-0.06,-0.06 -0.13,-0.19 -0.13,-0.19 -0.13,-0.13 -0.13,-0.13 -0.13,-0.13 -0.13,-0.13 -0.26,-0.26 -0.32,-0.38l-0.06,-0.06c-0.13,-0.06 -0.13,-0.19 -0.13,-0.19 -0.13,-0.13 -0.19,-0.13 -0.19,-0.13 -0.06,-0.13 -0.19,-0.26 -0.26,-0.38 0,0 -0.06,-0.06 -0.13,-0.13l-0.19,-0.19c0,-0.06 -0.06,-0.06 -0.06,-0.06 -0.13,-0.19 -0.19,-0.26 -0.32,-0.38l-0.06,-0.13c0,0 -0.13,-0.13 -0.19,-0.19l-0.13,-0.19c-0.06,-0.06 -0.13,-0.13 -0.19,-0.19l-0.19,-0.19c-0.06,-0.06 -0.13,-0.13 -0.13,-0.19l-0.13,-0.19c-0.06,-0.06 -0.13,-0.06 -0.13,-0.06 -0.13,-0.19 -0.19,-0.26 -0.32,-0.38 0,0 -0.06,-0.06 -0.06,-0.13l-0.19,-0.19c-0.06,-0.06 -0.06,-0.06 -0.06,-0.06 -0.13,-0.19 -0.26,-0.32 -0.38,-0.45L783.51,156.03c0,0 -0.13,-0.13 -0.26,-0.19L783.25,155.84c-0.13,-0.19 -0.26,-0.32 -0.38,-0.45l-0.06,-0.06c-0.06,-0.06 -0.13,-0.19 -0.13,-0.19l-0.06,-0.06c-0.32,-0.38 -0.64,-0.7 -0.96,-1.09C775.57,146.75 766.68,143.04 757.78,143.04L757.78,143.04zM560.34,16.51c-13.82,0 -26.62,9.15 -30.66,23.04 -4.93,17.02 4.8,34.75 21.82,39.68 35.07,10.24 68.48,25.41 99.39,45.25 5.38,3.46 11.39,5.06 17.28,5.06 10.56,0 20.86,-5.18 27.01,-14.66 9.47,-14.85 5.25,-34.62 -9.6,-44.16 -1.15,-0.77 -2.37,-1.47 -3.58,-2.3l0,0c-0.32,-0.13 -0.58,-0.32 -0.83,-0.51l-0.06,0c-0.26,-0.19 -0.58,-0.38 -0.83,-0.51l-0.06,-0.06c-0.26,-0.19 -0.58,-0.32 -0.83,-0.51l-0.06,-0.06L679.06,66.69l-0.06,-0.06c-0.19,-0.13 -0.32,-0.26 -0.51,-0.32l-0.06,-0.06c-0.13,-0.06 -0.19,-0.13 -0.19,-0.13 -0.13,-0.06 -0.19,-0.06 -0.19,-0.06 -0.13,-0.13 -0.26,-0.19 -0.38,-0.26 0,0 -0.13,-0.06 -0.13,-0.13 0,0 -0.13,-0.06 -0.26,-0.13l-0.13,-0.06c-0.13,-0.06 -0.26,-0.13 -0.38,-0.19L676.69,65.28c-0.13,-0.13 -0.13,-0.13 -0.13,-0.13 -0.13,-0.13 -0.26,-0.13 -0.26,-0.13l-0.19,-0.13c0,0 -0.19,-0.13 -0.32,-0.26l-0.19,-0.06c-0.06,-0.06 -0.13,-0.06 -0.13,-0.06 -0.13,-0.13 -0.19,-0.13 -0.19,-0.13 -0.13,-0.13 -0.26,-0.19 -0.38,-0.26l-0.13,-0.06C674.71,64 674.64,63.94 674.58,63.87l-0.13,0c-0.13,-0.13 -0.26,-0.19 -0.38,-0.26L673.94,63.55c-0.06,-0.06 -0.13,-0.13 -0.26,-0.19l-0.13,-0.06c-0.13,-0.06 -0.26,-0.13 -0.38,-0.19l-0.06,-0.06c-0.13,-0.06 -0.19,-0.13 -0.32,-0.19l-0.13,-0.06c-0.13,-0.06 -0.26,-0.19 -0.26,-0.19l-0.19,-0.06c-0.06,-0.06 -0.19,-0.13 -0.19,-0.13 -0.13,-0.13 -0.19,-0.13 -0.19,-0.13 -0.32,-0.19 -0.58,-0.32 -0.83,-0.45 0,-0.06 0,-0.06 0,-0.06 -0.32,-0.19 -0.58,-0.32 -0.83,-0.51l-0.06,0c-0.19,-0.13 -0.32,-0.19 -0.45,-0.26l0,0c0,0 -0.26,-0.19 -0.38,-0.26l-0.06,0c0,0 -0.26,-0.19 -0.38,-0.26l0,0c-0.19,-0.06 -0.32,-0.19 -0.45,-0.26l-0.06,0c0,0 -0.26,-0.19 -0.38,-0.26l0,0c0,0 -0.32,-0.19 -0.45,-0.26l0,0c-0.45,-0.26 -0.9,-0.51 -1.34,-0.77l0,0c-0.26,-0.19 -0.58,-0.32 -0.9,-0.51l0,0c-30.02,-17.15 -62.27,-30.85 -96.13,-40.77C566.36,16.96 563.35,16.51 560.34,16.51L560.34,16.51z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml b/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
deleted file mode 100644
index 2eddd16f..00000000
--- a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/item_selected.xml b/app/src/main/res/drawable/item_selected.xml
index 040cdcbe..8e17b320 100644
--- a/app/src/main/res/drawable/item_selected.xml
+++ b/app/src/main/res/drawable/item_selected.xml
@@ -9,4 +9,4 @@
         >
         <path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
     </group>
-</vector>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_horizontal.xml b/app/src/main/res/drawable/progress_horizontal.xml
index d4abd09d..f6b62766 100644
--- a/app/src/main/res/drawable/progress_horizontal.xml
+++ b/app/src/main/res/drawable/progress_horizontal.xml
@@ -1,10 +1,14 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/progress">
-        <clip>
+        <scale android:scaleWidth="100%">
             <shape>
-                <solid android:color="@color/colorAccent"/>
+                <solid android:color="?attr/colorProgressbar"/>
+                <corners
+                    android:topLeftRadius="0dp"
+                    android:topRightRadius="2dp"
+                    android:bottomLeftRadius="0dp"
+                    android:bottomRightRadius="2dp" />
             </shape>
-        </clip>
+        </scale>
     </item>
-
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_popup.xml b/app/src/main/res/drawable/rounded_popup.xml
new file mode 100644
index 00000000..1a3e3c4e
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_popup.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/colorSurfaceContainerHigh"/>
+    <corners android:radius="4dp"/>
+    <padding android:left="4dp" android:top="4dp" android:right="4dp" android:bottom="4dp"/>
+</shape>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 2caa4ad2..d4b17d0b 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -4,19 +4,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/background"
+    android:fitsSystemWindows="true"
     tools:context="com.beemdevelopment.aegis.ui.AboutActivity">
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.Aegis.AppBar">
-        <androidx.appcompat.widget.Toolbar
+        android:fitsSystemWindows="true">
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorAppBar" />
+            android:layout_height="?attr/actionBarSize" />
     </com.google.android.material.appbar.AppBarLayout>
     <ScrollView
+        android:id="@+id/about_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipToPadding="false"
diff --git a/app/src/main/res/layout/activity_assign_icons.xml b/app/src/main/res/layout/activity_assign_icons.xml
new file mode 100644
index 00000000..0ff0dee1
--- /dev/null
+++ b/app/src/main/res/layout/activity_assign_icons.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.beemdevelopment.aegis.ui.AssignIconsActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list_assign_icons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml
index 6476e9b0..45e4ae12 100644
--- a/app/src/main/res/layout/activity_auth.xml
+++ b/app/src/main/res/layout/activity_auth.xml
@@ -5,15 +5,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
+    android:fitsSystemWindows="true"
     tools:context="com.beemdevelopment.aegis.ui.AuthActivity">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/background"
         android:orientation="vertical">
 
         <LinearLayout
-            android:id="@+id/linearLayout2"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
@@ -22,22 +21,19 @@
             android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/imageView2"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
                 android:layout_marginBottom="20dp"
                 app:srcCompat="@drawable/ic_aegis_iconx" />
 
             <TextView
-                android:id="@+id/textView2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-light"
                 android:singleLine="false"
                 android:text="@string/authentication_multiline"
                 android:textStyle="bold"
-                android:textSize="@dimen/auth_leader_text_size"
-                android:textColor="?attr/authText" />
+                android:textSize="32sp"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -48,10 +44,10 @@
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="25dp"
+                    android:paddingBottom="12dp"
                     app:hintEnabled="false"
                     app:passwordToggleEnabled="true"
-                    app:passwordToggleTint="#949494">
+                    app:passwordToggleTint="?attr/colorOnSurface">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/text_password"
@@ -71,12 +67,8 @@
                         android:id="@+id/button_decrypt"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/button_rounded_corners"
-                        android:backgroundTint="@color/colorPrimary"
                         android:minWidth="125dp"
-                        android:text="@string/unlock"
-                        android:textColor="@color/primary_text_inverted"
-                        android:textStyle="bold" />
+                        android:text="@string/unlock" />
 
                 </LinearLayout>
 
@@ -109,10 +101,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center"
-            android:textStyle="bold"
-            android:textAllCaps="true"
             android:text="@string/app_name_full"
-            android:paddingVertical="50dp"
-            android:textColor="@color/divider" />
+            android:textSize="15sp"
+            android:textAllCaps="true"
+            android:textStyle="bold"
+            android:textColor="?attr/colorOnSurfaceDim"
+            android:paddingVertical="50dp" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/activity_edit_entry.xml b/app/src/main/res/layout/activity_edit_entry.xml
index 0991bf06..e9f19027 100644
--- a/app/src/main/res/layout/activity_edit_entry.xml
+++ b/app/src/main/res/layout/activity_edit_entry.xml
@@ -1,263 +1,280 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/background"
-    android:orientation="vertical"
+    android:fitsSystemWindows="true"
     tools:context="com.beemdevelopment.aegis.ui.EditEntryActivity">
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.Aegis.AppBar">
-        <androidx.appcompat.widget.Toolbar
+        android:fitsSystemWindows="true">
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorAppBar" />
+            android:layout_height="?attr/actionBarSize" />
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-        <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize">
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:descendantFocusability="beforeDescendants"
-            android:focusableInTouchMode="true">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:background="?attr/background"
-                android:layout_height="250dp">
-
-                <de.hdodenhof.circleimageview.CircleImageView
-                    android:id="@+id/profile_drawable"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:layout_centerHorizontal="true"
-                    android:layout_centerVertical="true" />
-
-                <com.avito.android.krop.KropView
-                    android:id="@+id/krop_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:visibility="invisible"
-                    app:krop_aspectX="1"
-                    app:krop_aspectY="1"
-                    app:krop_offset="70dp"
-                    app:krop_overlayColor="#aadddddd">
-
-                    <ImageView
-                        android:id="@+id/iv_saveImage"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom|end"
-                        android:layout_margin="15dp"
-                        android:src="@drawable/ic_check_black_24dp"
-                        app:tint="?attr/iconColorPrimary" />
-
-                </com.avito.android.krop.KropView>
-
-            </RelativeLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/divider" />
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:isScrollContainer="true"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
             <LinearLayout
-                android:id="@+id/layout_basic"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_margin="10dp">
-                <LinearLayout
+                android:descendantFocusability="beforeDescendants"
+                android:focusableInTouchMode="true">
+
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-                    <ImageView
+                    android:layout_height="250dp">
+
+                    <com.google.android.material.imageview.ShapeableImageView
+                        android:id="@+id/profile_drawable"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_centerHorizontal="true"
+                        android:layout_centerVertical="true"
+                        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
+
+                    <com.avito.android.krop.KropView
+                        android:id="@+id/krop_view"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/ic_person_black_24dp"
-                        app:tint="?attr/iconColorPrimary"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="15dp"
-                        android:layout_gravity="center_vertical"/>
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:hint="@string/name"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/text_name"
-                            android:layout_width="match_parent"
+                        android:layout_centerInParent="true"
+                        android:visibility="invisible"
+                        app:krop_aspectX="1"
+                        app:krop_aspectY="1"
+                        app:krop_offset="70dp"
+                        app:krop_overlayColor="#aadddddd">
+
+                        <ImageView
+                            android:id="@+id/iv_saveImage"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:inputType="text"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
+                            android:layout_gravity="bottom|end"
+                            android:layout_margin="15dp"
+                            android:src="@drawable/ic_outline_check_24"
+                            app:tint="?attr/colorOnSurface" />
+
+                    </com.avito.android.krop.KropView>
+
+                </RelativeLayout>
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
                 <LinearLayout
+                    android:id="@+id/layout_basic"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginStart="44.5dp">
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:hint="@string/issuer"
-                        android:layout_width="0dp"
+                    android:orientation="vertical"
+                    android:layout_margin="10dp">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/ic_outline_person_24"
+                            app:tint="?attr/colorOnSurface"
+                            android:layout_marginStart="5dp"
+                            android:layout_marginEnd="15dp"
+                            android:layout_gravity="center_vertical"/>
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:hint="@string/name"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/text_name"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:inputType="textCapSentences"/>
+                        </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="5dp"
-                        android:layout_weight="1">
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/text_issuer"
-                            android:layout_width="match_parent"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginStart="44.5dp">
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:hint="@string/issuer"
+                            android:layout_width="0dp"
                             android:layout_height="match_parent"
-                            android:inputType="text"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="0dp"
+                            android:layout_weight="1">
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/text_issuer"
+                                android:maxLines="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:inputType="textCapSentences"/>
+                        </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        android:layout_weight="1"
-                        android:hint="@string/group"
-                        style="?attr/dropdownStyle">
-                        <AutoCompleteTextView
-                            android:id="@+id/dropdown_group"
-                            android:layout_width="match_parent"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:inputType="none"/>
-                    </com.google.android.material.textfield.TextInputLayout>
+                            android:src="@drawable/ic_outline_group_24"
+                            app:tint="?attr/colorOnSurface"
+                            android:layout_marginStart="5dp"
+                            android:layout_marginEnd="15dp"
+                            android:layout_gravity="center_vertical"/>
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/text_group_layout"
+                            android:hint="@string/group"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/text_group"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:cursorVisible="false"
+                                android:inputType="none"/>
+                        </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/ic_outline_notes_24"
+                            app:tint="?attr/colorOnSurface"
+                            android:layout_marginStart="5dp"
+                            android:layout_marginEnd="15dp"
+                            android:layout_gravity="center_vertical"/>
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:hint="@string/note"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/text_note"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:inputType="text|textMultiLine|textCapSentences"/>
+                        </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/layout_secret"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/ic_outline_key_24"
+                            app:tint="?attr/colorOnSurface"
+                            android:layout_marginStart="5dp"
+                            android:layout_marginEnd="15dp"
+                            android:layout_gravity="center_vertical"/>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            app:passwordToggleTint="?attr/colorOnSurface"
+                            app:passwordToggleEnabled="true">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/text_secret"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/secret"
+                                android:inputType="textPassword|textMultiLine"/>
+                        </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/layout_pin"
+                        android:visibility="gone"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal"
+                        tools:visibility="visible">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/ic_outline_fiber_pin_24"
+                            app:tint="?attr/colorOnSurface"
+                            android:layout_marginStart="5dp"
+                            android:layout_marginEnd="15dp"
+                            android:layout_gravity="center_vertical"/>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            app:passwordToggleTint="?attr/colorOnSurface"
+                            app:passwordToggleEnabled="true">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/text_pin"
+                                android:maxLength="16"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:inputType="numberPassword"/>
+                        </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
                 </LinearLayout>
-                <LinearLayout
+
+                <RelativeLayout
+                    android:foreground="?android:attr/selectableItemBackground"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:orientation="horizontal">
+                    android:id="@+id/accordian_header"
+                    android:focusable="true"
+                    android:clickable="true">
+
                     <ImageView
+                        android:id="@+id/down_btn"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/ic_baseline_notes_black_24"
-                        app:tint="?attr/iconColorPrimary"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="15dp"
-                        android:layout_gravity="center_vertical"/>
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:hint="@string/note"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/text_note"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="text|textMultiLine"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:id="@+id/layout_secret"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:orientation="horizontal">
-                    <ImageView
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="14dp"
+                        android:src="@drawable/ic_outline_expand_more_24"
+                        app:tint="?attr/colorOnSurface" />
+
+                    <TextView
+                        android:id="@+id/accordian_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/ic_vpn_key_black_24dp"
-                        app:tint="?attr/iconColorPrimary"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="15dp"
-                        android:layout_gravity="center_vertical"/>
+                        android:layout_alignParentTop="true"
+                        android:layout_toEndOf="@+id/down_btn"
+                        android:padding="16dp"
+                        android:text="@string/advanced"
+                        android:textStyle="bold" />
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        app:passwordToggleTint="#949494"
-                        app:passwordToggleEnabled="true">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/text_secret"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/secret"
-                            android:inputType="textPassword"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:id="@+id/layout_pin"
-                    android:visibility="gone"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:orientation="horizontal"
-                    tools:visibility="visible">
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_baseline_fiber_pin_24"
-                        app:tint="?attr/iconColorPrimary"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="15dp"
-                        android:layout_gravity="center_vertical"/>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        app:passwordToggleTint="#949494"
-                        app:passwordToggleEnabled="true">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/text_pin"
-                            android:maxLength="16"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="numberPassword"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-            </LinearLayout>
-
-            <RelativeLayout
-                android:foreground="?android:attr/selectableItemBackground"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/accordian_header"
-                android:focusable="true"
-                android:clickable="true">
-
-                <ImageView
-                    android:id="@+id/down_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginStart="14dp"
-                    android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
-                    app:tint="?attr/iconColorPrimary"/>
-
-                <TextView
-                    android:id="@+id/accordian_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_toEndOf="@+id/down_btn"
-                    android:padding="16dp"
-                    android:text="@string/advanced"
-                    android:textStyle="bold" />
-
-            </RelativeLayout>
-            <RelativeLayout
-                android:id="@+id/expandableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="invisible">
+                </RelativeLayout>
                 <LinearLayout
                     android:id="@+id/layout_advanced"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
+                    android:visibility="gone"
+                    android:alpha="0"
                     android:layout_marginHorizontal="10dp">
                     <LinearLayout
                         android:id="@+id/layout_type_algo"
@@ -268,8 +285,8 @@
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:src="@drawable/ic_info_outline_black_24dp"
-                            app:tint="?attr/iconColorPrimary"
+                            android:src="@drawable/ic_outline_info_24"
+                            app:tint="?attr/colorOnSurface"
                             android:layout_marginStart="5dp"
                             android:layout_marginEnd="15dp"
                             android:layout_gravity="center_vertical"/>
@@ -352,8 +369,8 @@
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:src="@drawable/ic_counter_black_24dp"
-                            app:tint="?attr/iconColorPrimary"
+                            android:src="@drawable/ic_counter_black_24"
+                            app:tint="?attr/colorOnSurface"
                             android:layout_marginStart="5dp"
                             android:layout_marginEnd="15dp"
                             android:layout_gravity="center_vertical"/>
@@ -378,8 +395,19 @@
                             </com.google.android.material.textfield.TextInputLayout>
                         </LinearLayout>
                     </LinearLayout>
+                    <TextView
+                        android:id="@+id/text_last_used"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="16dp"
+                        android:paddingBottom="16dp"
+                        android:layout_centerInParent="true"
+                        android:layout_gravity="bottom|center"
+                        android:textSize="14sp" />
                 </LinearLayout>
-            </RelativeLayout>
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
+
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+    </FrameLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_groups.xml b/app/src/main/res/layout/activity_groups.xml
index 427d5e4e..c9226446 100644
--- a/app/src/main/res/layout/activity_groups.xml
+++ b/app/src/main/res/layout/activity_groups.xml
@@ -4,37 +4,25 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/background"
+    android:fitsSystemWindows="true"
     tools:context="com.beemdevelopment.aegis.ui.GroupManagerActivity">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.Aegis.AppBar">
-        <androidx.appcompat.widget.Toolbar
+        android:fitsSystemWindows="true">
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorAppBar" />
+            android:layout_height="?attr/actionBarSize" />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list_groups"
         android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/list_slots"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="vertical"/>
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+        android:layout_width="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -56,8 +44,7 @@
                 android:id="@+id/imageView"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:src="@drawable/ic_layers_black_24dp"
-                app:tint="?attr/primaryText" />
+                android:src="@drawable/ic_outline_layers_24" />
 
             <TextView
                 android:id="@+id/textView"
@@ -65,7 +52,6 @@
                 android:layout_height="wrap_content"
                 android:text="@string/empty_group_list_title"
                 android:paddingTop="17dp"
-                android:textColor="?attr/primaryText"
                 android:textSize="18sp" />
 
             <TextView
diff --git a/app/src/main/res/layout/activity_import_entries.xml b/app/src/main/res/layout/activity_import_entries.xml
index 79f47a72..deba9ac1 100644
--- a/app/src/main/res/layout/activity_import_entries.xml
+++ b/app/src/main/res/layout/activity_import_entries.xml
@@ -4,27 +4,25 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/background"
+    android:fitsSystemWindows="true"
     android:id="@+id/importEntriesRootView"
     tools:context="com.beemdevelopment.aegis.ui.ImportEntriesActivity">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.Aegis.AppBar">
-        <androidx.appcompat.widget.Toolbar
+        android:fitsSystemWindows="true">
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorAppBar" />
+            android:layout_height="?attr/actionBarSize" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list_entries"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:paddingBottom="60dp"
         android:clipToPadding="false"
         android:scrollbars="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
@@ -35,6 +33,5 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_check_black_24dp"
-        app:tint="@color/icon_primary_dark" />
+        android:src="@drawable/ic_outline_check_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml
index 79600e46..e2e4b8cc 100644
--- a/app/src/main/res/layout/activity_intro.xml
+++ b/app/src/main/res/layout/activity_intro.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/background"
+    android:fitsSystemWindows="true"
     tools:context="com.beemdevelopment.aegis.ui.IntroActivity">
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
@@ -14,17 +14,20 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/btnPrevious" />
-    <ImageButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnPrevious"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_margin="10dp"
-        android:src="@drawable/circular_button_prev"
-        app:tint="?attr/iconColorPrimary"
-        android:background="?selectableItemBackgroundBorderless"
+        android:layout_marginVertical="10dp"
+        android:layout_marginHorizontal="20dp"
         android:visibility="invisible"
+        app:icon="@drawable/ic_outline_arrow_left_alt_24"
+        app:iconSize="30dp"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        style="@style/Widget.Material3.Button.IconButton.Filled.Tonal" />
     <com.beemdevelopment.aegis.ui.intro.SlideIndicator
         android:id="@+id/slideIndicator"
         android:layout_width="0dp"
@@ -33,14 +36,17 @@
         app:layout_constraintStart_toEndOf="@+id/btnPrevious"
         app:layout_constraintEnd_toStartOf="@+id/btnNext"
         app:layout_constraintBottom_toBottomOf="parent" />
-    <ImageButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnNext"
         android:layout_width="65dp"
         android:layout_height="65dp"
-        android:layout_margin="10dp"
-        android:src="@drawable/circular_button_next"
-        app:tint="?attr/iconColorPrimary"
-        android:background="?selectableItemBackgroundBorderless"
+        android:layout_marginVertical="10dp"
+        android:layout_marginHorizontal="20dp"
+        app:icon="@drawable/ic_outline_arrow_right_alt_24"
+        app:iconSize="30dp"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        style="@style/Widget.Material3.Button.IconButton.Filled.Tonal" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f2b26f43..b2ca2d00 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,68 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context="com.beemdevelopment.aegis.ui.MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.Aegis.AppBar">
-        <androidx.appcompat.widget.Toolbar
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true"
+        app:liftOnScrollTargetViewId="@+id/rvKeyProfiles">
+
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorAppBar" />
+            android:layout_height="?attr/actionBarSize" />
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="0dp"
+            android:paddingTop="0dp"
+            android:paddingBottom="0dp"
+            android:scrollbars="none">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp">
+
+                <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/groupChipGroup"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:selectionRequired="true"/>
+            </LinearLayout>
+        </HorizontalScrollView>
     </com.google.android.material.appbar.AppBarLayout>
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:orientation="vertical">
-        <LinearLayout
-            android:id="@+id/btn_error_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            android:clickable="true"
-            android:focusable="true"
-            android:paddingHorizontal="10dp"
-            android:paddingVertical="10dp"
-            android:background="@color/colorAccent"
-            android:foreground="?android:selectableItemBackground"
-            android:gravity="center">
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:tint="@color/icon_primary_inverted"
-                android:src="@drawable/ic_info_outline_black_24dp" />
-            <TextView
-                android:id="@+id/text_error_bar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/primary_text_inverted"
-                android:textStyle="bold"
-                android:layout_marginStart="5dp" />
-        </LinearLayout>
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/groupChipGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        </com.google.android.material.chip.ChipGroup>
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <fragment
-            android:name="com.beemdevelopment.aegis.ui.views.EntryListView"
             android:id="@+id/key_profiles"
-            android:layout_height="fill_parent"
+            android:name="com.beemdevelopment.aegis.ui.views.EntryListView"
             android:layout_width="match_parent"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>
+            android:layout_height="fill_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     </LinearLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -71,7 +65,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_add_black_24dp"
-        app:tint="@color/icon_primary_dark" />
+        android:src="@drawable/ic_outline_add_24" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index b16858f8..3dc74edf 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.Aegis.AppBar">
-        <androidx.appcompat.widget.Toolbar
+        android:fitsSystemWindows="true">
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorAppBar" />
+            android:layout_height="?attr/actionBarSize" />
     </com.google.android.material.appbar.AppBarLayout>
     <FrameLayout
         android:id="@+id/content"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-</LinearLayout>
+        android:layout_height="match_parent"
+        android:isScrollContainer="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_scanner.xml b/app/src/main/res/layout/activity_scanner.xml
index 2516c89a..29b4ed7e 100644
--- a/app/src/main/res/layout/activity_scanner.xml
+++ b/app/src/main/res/layout/activity_scanner.xml
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context="com.beemdevelopment.aegis.ui.ScannerActivity">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/toolbar_layout"
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:translationZ="0.1dp"
         app:elevation="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:theme="@style/ThemeOverlay.Aegis.AppBar">
-        <androidx.appcompat.widget.Toolbar
+        android:fitsSystemWindows="true">
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="?attr/actionBarSize"
+            app:titleTextColor="?attr/colorOnDark" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.camera.view.PreviewView
         android:id="@+id/preview_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar_layout" />
+        android:layout_height="match_parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_share_entry.xml b/app/src/main/res/layout/activity_share_entry.xml
index 9044a0ec..455f3356 100644
--- a/app/src/main/res/layout/activity_share_entry.xml
+++ b/app/src/main/res/layout/activity_share_entry.xml
@@ -1,132 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/background"
+    android:fitsSystemWindows="true"
     tools:context="com.beemdevelopment.aegis.ui.TransferEntriesActivity">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/toolbar_layout"
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:theme="@style/ThemeOverlay.Aegis.AppBar">
-        <androidx.appcompat.widget.Toolbar
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorAppBar" />
+            android:layout_height="?attr/actionBarSize" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ImageView
-        android:id="@+id/ivQrCode"
-        android:layout_width="250dp"
-        android:layout_height="250dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar_layout" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layoutShareEntry"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:paddingHorizontal="30dp">
 
-    <TextView
-        android:id="@+id/tvTransfer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/transfer_entry"
-        android:textColor="?attr/primaryText"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:layout_marginBottom="5dp"
-        app:layout_constraintBottom_toTopOf="@+id/tvDescription"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <TextView
+            android:id="@+id/tvDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/transfer_entry_description"
+            app:layout_constraintBottom_toTopOf="@+id/ivQrCode"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tvDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="10dp"
-        android:text="@string/transfer_entry_description"
-        app:layout_constraintBottom_toTopOf="@+id/ivQrCode"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/ivQrCode"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.3"
+            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Rounded" />
 
-    <TextView
-        android:id="@+id/tvIssuer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        tools:text="Issuer"
-        android:textColor="?attr/primaryText"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ivQrCode" />
+        <TextView
+            android:id="@+id/tvIssuer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ivQrCode"
+            tools:text="Issuer" />
 
-    <TextView
-        android:id="@+id/tvAccountName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        tools:text="Accountname"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvIssuer" />
+        <TextView
+            android:id="@+id/tvAccountName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvIssuer"
+            tools:text="Accountname" />
 
-    <Button
-        android:id="@+id/btnCopyClipboard"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="?attr/outlineButtonStyle"
-        android:text="@string/copy_uri"
-        android:textAllCaps="false"
-        android:visibility="invisible"
-        android:textColor="@color/code_primary_text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvAccountName"
-        app:layout_constraintBottom_toTopOf="@id/tvEntriesCount" />
+        <Button
+            android:id="@+id/btnCopyClipboard"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/copy_uri"
+            android:textAllCaps="false"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toTopOf="@id/tvEntriesCount"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.497"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAccountName"
+            app:layout_constraintVertical_bias="0.134" />
 
-    <Button
-        android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="4dp"
-        android:layout_marginBottom="4dp"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:text="@string/next"
-        android:textAllCaps="false"
-        android:textColor="@color/code_primary_text"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <Button
+            android:id="@+id/btnNext"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:text="@string/next"
+            android:textAllCaps="false"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
-        android:id="@+id/btnPrevious"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="4dp"
-        android:layout_marginBottom="4dp"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:text="@string/previous"
-        android:textAllCaps="false"
-        android:visibility="invisible"
-        android:textColor="@color/code_primary_text"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <Button
+            android:id="@+id/btnPrevious"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:layout_marginBottom="4dp"
+            android:text="@string/previous"
+            android:textAllCaps="false"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
-        android:id="@+id/tvEntriesCount"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/btnNext"
-        app:layout_constraintHorizontal_bias="0.506"
-        app:layout_constraintStart_toStartOf="@+id/btnPrevious" />
+        <TextView
+            android:id="@+id/tvEntriesCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/btnNext"
+            app:layout_constraintStart_toStartOf="@+id/btnPrevious" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/transfer_entry_brightness"
+            app:layout_constraintBottom_toTopOf="@+id/tvEntriesCount"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btnCopyClipboard" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/card_assign_icon_entry.xml b/app/src/main/res/layout/card_assign_icon_entry.xml
new file mode 100644
index 00000000..fdc5d81a
--- /dev/null
+++ b/app/src/main/res/layout/card_assign_icon_entry.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="0dp"
+    android:clickable="true"
+    android:focusable="true"
+    app:checkedIcon="@null"
+    app:cardElevation="0dp"
+    style="@style/Widget.Aegis.EntryCardView">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:background="?attr/colorSurfaceContainerLow"
+        android:id="@+id/rlCardEntry"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:paddingStart="14dp">
+
+        <!-- Title -->
+        <TextView
+            android:id="@+id/tvIssuer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:text="Issuer"
+            android:textStyle="bold"
+            android:textSize="18sp"/>
+        <TextView
+            android:id="@+id/tvAccountName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:text="AccountName"
+            android:textSize="14sp"
+            android:layout_marginBottom="8dp"/>
+
+        <!-- Row with 3 columns -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/ivOldImage"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_gravity="center_vertical"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
+
+            <ImageView
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:alpha="0.7"
+                android:src="@drawable/baseline_arrow_right_24"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="15dp"
+                android:layout_gravity="center_vertical"/>
+
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/ivNewImage"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_gravity="center_vertical"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:id="@+id/btnReset"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/ic_outline_reset_image_24"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
+                android:paddingTop="12.5dp"
+                android:paddingBottom="12.5dp"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:layout_gravity="center_vertical"/>
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/card_audit_log.xml b/app/src/main/res/layout/card_audit_log.xml
new file mode 100644
index 00000000..836efbfd
--- /dev/null
+++ b/app/src/main/res/layout/card_audit_log.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:orientation="horizontal"
+    app:cardElevation="0dp"
+    style="@style/Widget.Aegis.EntryCardView">
+    <LinearLayout
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="center_vertical">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingTop="12dp"
+            android:paddingStart="14dp">
+
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/iv_icon_view"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_alignParentStart="true"
+                android:background="?attr/colorTertiaryContainer"
+                android:cropToPadding="true"
+                android:padding="2dp"
+                android:scaleType="centerInside"
+                android:src="@drawable/ic_lock_open"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Rounded" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="bottom"
+            android:id="@+id/relativeLayout"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:paddingEnd="12dp"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:paddingStart="12dp">
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/description">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/text_audit_log_title"
+                    android:text="@string/issuer"
+                    android:textStyle="bold"
+                    android:includeFontPadding="false"
+                    android:textSize="16sp"
+                    android:ellipsize="end"
+                    android:maxLines="1"/>
+
+
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/text_audit_log_description"
+                android:layoutDirection="ltr"
+                android:layout_below="@id/description"
+                android:includeFontPadding="false"
+                tools:text="The vault has been succesfully unlocked"
+                android:layout_alignParentStart="true"
+                android:layout_marginTop="4dp"
+                android:textStyle="normal"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/text_audit_log_reference"
+                android:layoutDirection="ltr"
+                android:layout_below="@id/text_audit_log_description"
+                android:includeFontPadding="false"
+                tools:text="Aegis (authenticator)"
+                android:layout_alignParentStart="true"
+                android:layout_marginTop="4dp"
+                android:textStyle="italic"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/text_audit_log_timestamp"
+                android:layoutDirection="ltr"
+                android:layout_below="@id/text_audit_log_reference"
+                android:includeFontPadding="false"
+                tools:text="Today at 5:59 PM"
+                android:textSize="12sp"
+                android:layout_alignParentStart="true"
+                android:textColor="?attr/colorOutline"
+                android:layout_marginTop="8dp"
+                android:textStyle="normal"/>
+
+        </RelativeLayout>
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml
index 9090dc3a..11f01859 100644
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="0dp"
     android:clickable="true"
     android:focusable="true"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:checkable="true"
+    app:checkedIcon="@null"
+    app:cardElevation="0dp"
+    style="@style/Widget.Aegis.EntryCardView">
 
     <LinearLayout
         android:orientation="horizontal"
-        android:background="?attr/cardBackground"
         android:id="@+id/rlCardEntry"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -23,22 +26,23 @@
             android:layout_width="15dp"
             android:layout_height="match_parent"
             android:layout_marginStart="-11dp"
-            android:backgroundTint="@color/colorFavorite"
-            android:background="@drawable/button_rounded_corners" />
+            android:backgroundTint="?attr/colorFavorite"
+            android:background="@drawable/favorite_indicator" />
 
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingStart="16dp">
+            android:paddingStart="14dp">
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivTextDrawable"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
                 android:layout_centerVertical="true"
-                android:layout_alignParentStart="true" />
+                android:layout_alignParentStart="true"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivSelected"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
@@ -46,7 +50,8 @@
                 android:layout_centerVertical="true"
                 android:src="@drawable/item_selected"
                 android:visibility="gone"
-                app:civ_circle_background_color="@color/colorPrimarySelected" />
+                android:background="?attr/colorPrimaryAlternative"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -62,24 +67,11 @@
             android:paddingRight="16dp"
             android:paddingStart="16dp">
 
-            <TextView
-                android:id="@+id/profile_copied"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:maxLines="1"
-                android:text="@string/copied"
-                android:layout_above="@+id/description"
-                android:layout_alignStart="@+id/profile_code"
-                android:textColor="?attr/secondaryText"
-                android:textSize="16sp"
-                android:visibility="invisible" />
-
             <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/description"
-                android:layout_alignStart="@+id/profile_code">
+                android:layout_alignStart="@+id/profile_codes_layout">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -87,7 +79,6 @@
                     android:id="@+id/profile_issuer"
                     android:text="@string/issuer"
                     android:textStyle="bold"
-                    android:textColor="?attr/primaryText"
                     android:includeFontPadding="false"
                     android:textSize="16sp"
                     android:ellipsize="end"
@@ -101,29 +92,64 @@
                     android:ellipsize="end"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:textColor="@color/secondary_text"
                     android:textSize="16sp"
                     tools:text=" - AccountName" />
 
             </RelativeLayout>
 
             <TextView
+                android:id="@+id/profile_copied"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:fontFamily="sans-serif-light"
-                tools:text="012 345"
-                android:id="@+id/profile_code"
-                android:layoutDirection="ltr"
-                android:layout_below="@id/description"
                 android:includeFontPadding="false"
-                android:fallbackLineSpacing="false"
-                android:textSize="34sp"
-                android:textColor="?attr/codePrimaryText"
-                android:layout_marginStart="6dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="0dp"
-                android:textStyle="normal|bold"/>
+                android:maxLines="1"
+                android:text="@string/copied"
+                android:layout_alignStart="@+id/description"
+                android:layout_below="@id/description"
+                android:textSize="16sp"
+                android:visibility="invisible" />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_marginBottom="0dp"
+                android:paddingBottom="0dp"
+                android:id="@+id/profile_codes_layout"
+                android:layout_below="@id/description"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:fontFamily="sans-serif-light"
+                    tools:text="012 345"
+                    android:id="@+id/profile_code"
+                    android:layoutDirection="ltr"
+                    android:textSize="34sp"
+                    android:layout_below="@id/description"
+                    android:textColor="?attr/colorCode"
+                    android:includeFontPadding="false"
+                    android:fallbackLineSpacing="false"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginTop="0dp"
+                    android:textStyle="normal|bold"/>
+
+                <TextView
+                    android:id="@+id/next_profile_code"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="0dp"
+                    android:paddingTop="0dp"
+                    android:paddingStart="2dp"
+                    android:layout_alignParentStart="true"
+                    android:textColor="?attr/colorOnSurfaceDim"
+                    android:textSize="20sp"
+                    android:textStyle="normal|bold"
+                    android:includeFontPadding="false"
+                    android:fallbackLineSpacing="false"
+                    tools:text="412 643"/>
+            </LinearLayout>
 
         </RelativeLayout>
 
@@ -143,8 +169,8 @@
                 android:padding="8dp"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_refresh_black_24dp"
-                app:tint="?attr/iconColorPrimary"
+                android:src="@drawable/ic_outline_refresh_24"
+                app:tint="?attr/colorOnSurface"
                 android:background="?android:attr/selectableItemBackground" />
 
             <ImageView
@@ -155,7 +181,7 @@
                 android:layout_marginEnd="-12dp"
                 android:visibility="invisible"
                 android:scaleType="fitXY"
-                android:src="@drawable/ic_baseline_menu_black_32" />
+                android:src="@drawable/ic_outline_menu_24" />
 
         </LinearLayout>
 
@@ -170,6 +196,7 @@
 
         <com.beemdevelopment.aegis.ui.views.TotpProgressBar
             style="?android:attr/progressBarStyleHorizontal"
+            android:progressDrawable="@drawable/progress_horizontal"
             android:layout_width="0dp"
             android:layout_height="4dp"
             android:id="@+id/progressBar"
@@ -177,4 +204,4 @@
             android:layout_weight="1"/>
     </LinearLayout>
 
-</LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/card_entry_compact.xml b/app/src/main/res/layout/card_entry_compact.xml
index f716f578..7769e9d2 100644
--- a/app/src/main/res/layout/card_entry_compact.xml
+++ b/app/src/main/res/layout/card_entry_compact.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="0dp"
     android:clickable="true"
     android:focusable="true"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:checkable="true"
+    app:checkedIcon="@null"
+    app:cardElevation="0dp"
+    style="@style/Widget.Aegis.CompactEntryCardView">
 
     <LinearLayout
         android:orientation="horizontal"
-        android:background="?attr/cardBackground"
         android:id="@+id/rlCardEntry"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -23,22 +26,25 @@
             android:layout_width="15dp"
             android:layout_height="match_parent"
             android:layout_marginStart="-11dp"
-            android:backgroundTint="@color/colorFavorite"
-            android:background="@drawable/button_rounded_corners" />
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
+            android:backgroundTint="?attr/colorFavorite"
+            android:background="@drawable/favorite_indicator" />
 
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingStart="16dp">
+            android:paddingStart="12dp">
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivTextDrawable"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
                 android:layout_alignParentStart="true"
-                android:layout_centerVertical="true" />
+                android:layout_centerVertical="true"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivSelected"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
@@ -46,7 +52,8 @@
                 android:layout_centerVertical="true"
                 android:src="@drawable/item_selected"
                 android:visibility="gone"
-                app:civ_circle_background_color="@color/colorPrimarySelected" />
+                android:background="?attr/colorPrimaryAlternative"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -69,9 +76,8 @@
             android:includeFontPadding="false"
             android:maxLines="1"
             android:text="@string/copied"
-            android:layout_above="@+id/description"
-            android:layout_alignStart="@+id/profile_code"
-            android:textColor="?attr/secondaryText"
+            android:layout_alignStart="@+id/description"
+            android:layout_below="@id/description"
             android:textSize="13sp"
             android:visibility="invisible" />
 
@@ -79,17 +85,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/description"
-            android:layout_alignStart="@+id/profile_code">
-
+            android:layout_alignStart="@+id/profile_codes_layout">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/profile_issuer"
                 android:text="@string/issuer"
-                android:textColor="?attr/primaryText"
                 android:textStyle="bold"
                 android:includeFontPadding="false"
+                android:fallbackLineSpacing="false"
                 android:textSize="13sp"
                 android:ellipsize="end"
                 android:maxLines="1"/>
@@ -102,29 +107,55 @@
                 android:ellipsize="end"
                 android:includeFontPadding="false"
                 android:maxLines="1"
-                android:textColor="@color/extra_info_text"
                 android:textSize="13sp"
                 tools:text=" - AccountName" />
         </RelativeLayout>
 
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:fontFamily="sans-serif-light"
-                tools:text="012 345"
-                android:id="@+id/profile_code"
-                android:layoutDirection="ltr"
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_marginBottom="0dp"
+                android:paddingBottom="0dp"
+                android:id="@+id/profile_codes_layout"
                 android:layout_below="@id/description"
-                android:includeFontPadding="false"
-                android:fallbackLineSpacing="false"
-                android:textSize="26sp"
-                android:textColor="?attr/codePrimaryText"
                 android:layout_marginStart="6dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="0dp"
-                android:textStyle="normal|bold"/>
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:fontFamily="sans-serif-light"
+                    tools:text="012 345"
+                    android:id="@+id/profile_code"
+                    android:layoutDirection="ltr"
+                    android:layout_below="@id/description"
+                    android:includeFontPadding="false"
+                    android:fallbackLineSpacing="false"
+                    android:textSize="26sp"
+                    android:textColor="?attr/colorCode"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginTop="0dp"
+                    android:textStyle="normal|bold"/>
+
+                <TextView
+                    android:id="@+id/next_profile_code"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:letterSpacing="-0.01"
+                    android:layout_marginTop="0dp"
+                    android:paddingTop="0dp"
+                    android:paddingStart="2dp"
+                    android:textColor="?attr/colorOnSurfaceDim"
+                    android:textSize="16sp"
+                    android:textStyle="normal|bold"
+                    android:fallbackLineSpacing="false"
+                    android:includeFontPadding="false"
+                    tools:text="412 643"/>
+            </LinearLayout>
+
+
 
         </RelativeLayout>
 
@@ -144,8 +175,7 @@
                 android:padding="8dp"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_refresh_black_24dp"
-                app:tint="?attr/iconColorPrimary"
+                android:src="@drawable/ic_outline_refresh_24"
                 android:background="?android:attr/selectableItemBackground" />
 
             <ImageView
@@ -156,7 +186,7 @@
                 android:layout_marginEnd="-12dp"
                 android:visibility="invisible"
                 android:scaleType="fitXY"
-                android:src="@drawable/ic_baseline_menu_black_32" />
+                android:src="@drawable/ic_outline_menu_24" />
 
         </LinearLayout>
 
@@ -171,6 +201,7 @@
 
         <com.beemdevelopment.aegis.ui.views.TotpProgressBar
             style="?android:attr/progressBarStyleHorizontal"
+            android:progressDrawable="@drawable/progress_horizontal"
             android:layout_width="0dp"
             android:layout_height="3dp"
             android:id="@+id/progressBar"
@@ -178,4 +209,4 @@
             android:layout_weight="1"/>
     </LinearLayout>
 
-</LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/card_entry_small.xml b/app/src/main/res/layout/card_entry_small.xml
index 9d76bbc5..c9b2b396 100644
--- a/app/src/main/res/layout/card_entry_small.xml
+++ b/app/src/main/res/layout/card_entry_small.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="0dp"
     android:clickable="true"
     android:focusable="true"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:checkable="true"
+    app:checkedIcon="@null"
+    app:cardElevation="0dp"
+    style="@style/Widget.Aegis.EntryCardView">
 
     <LinearLayout
         android:orientation="horizontal"
-        android:background="?attr/cardBackground"
         android:id="@+id/rlCardEntry"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
@@ -23,22 +26,25 @@
             android:layout_width="15dp"
             android:layout_height="match_parent"
             android:layout_marginStart="-11dp"
-            android:backgroundTint="@color/colorFavorite"
-            android:background="@drawable/button_rounded_corners" />
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:backgroundTint="?attr/colorFavorite"
+            android:background="@drawable/favorite_indicator" />
 
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingStart="16dp">
+            android:paddingStart="14dp">
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivTextDrawable"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
                 android:layout_centerVertical="true"
-                android:layout_alignParentStart="true"  />
+                android:layout_alignParentStart="true"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivSelected"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
@@ -46,7 +52,8 @@
                 android:layout_centerVertical="true"
                 android:src="@drawable/item_selected"
                 android:visibility="gone"
-                app:civ_circle_background_color="@color/colorPrimarySelected" />
+                android:background="?attr/colorPrimaryAlternative"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -69,9 +76,8 @@
             android:includeFontPadding="false"
             android:maxLines="1"
             android:text="@string/copied"
-            android:layout_above="@+id/description"
-            android:layout_alignStart="@+id/profile_code"
-            android:textColor="?attr/secondaryText"
+            android:layout_alignStart="@+id/description"
+            android:layout_below="@id/description"
             android:textSize="13sp"
             android:visibility="invisible" />
 
@@ -79,7 +85,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/description"
-            android:layout_alignStart="@+id/profile_code">
+            android:layout_alignStart="@+id/profile_codes_layout">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -87,7 +93,6 @@
                 android:id="@+id/profile_issuer"
                 android:text="@string/issuer"
                 android:textStyle="bold"
-                android:textColor="?attr/primaryText"
                 android:includeFontPadding="false"
                 android:textSize="13sp"
                 android:ellipsize="end"
@@ -101,28 +106,52 @@
                 android:ellipsize="end"
                 android:includeFontPadding="false"
                 android:maxLines="1"
-                android:textColor="@color/extra_info_text"
                 android:textSize="13sp"
                 tools:text=" - AccountName" />
         </RelativeLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:fontFamily="sans-serif-light"
-                tools:text="012 345"
-                android:id="@+id/profile_code"
-                android:layoutDirection="ltr"
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_marginBottom="0dp"
+                android:paddingBottom="0dp"
+                android:id="@+id/profile_codes_layout"
                 android:layout_below="@id/description"
-                android:includeFontPadding="false"
-                android:fallbackLineSpacing="false"
-                android:textSize="26sp"
-                android:textColor="?attr/codePrimaryText"
                 android:layout_marginStart="6dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="0dp"
-                android:textStyle="normal|bold"/>
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:fontFamily="sans-serif-light"
+                    tools:text="012 345"
+                    android:id="@+id/profile_code"
+                    android:layoutDirection="ltr"
+                    android:layout_below="@id/description"
+                    android:includeFontPadding="false"
+                    android:fallbackLineSpacing="false"
+                    android:textSize="26sp"
+                    android:textColor="?attr/colorCode"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginTop="0dp"
+                    android:textStyle="normal|bold"/>
+
+                <TextView
+                    android:id="@+id/next_profile_code"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:letterSpacing="-0.01"
+                    android:layout_marginTop="0dp"
+                    android:paddingTop="0dp"
+                    android:paddingStart="2dp"
+                    android:textColor="?attr/colorOnSurfaceDim"
+                    android:textSize="16sp"
+                    android:textStyle="normal|bold"
+                    android:fallbackLineSpacing="false"
+                    android:includeFontPadding="false"
+                    tools:text="412 643"/>
+            </LinearLayout>
 
         </RelativeLayout>
 
@@ -142,8 +171,7 @@
                 android:padding="8dp"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_refresh_black_24dp"
-                app:tint="?attr/iconColorPrimary"
+                android:src="@drawable/ic_outline_refresh_24"
                 android:background="?android:attr/selectableItemBackground" />
 
             <ImageView
@@ -154,7 +182,7 @@
                 android:layout_marginEnd="-12dp"
                 android:visibility="invisible"
                 android:scaleType="fitXY"
-                android:src="@drawable/ic_baseline_menu_black_32" />
+                android:src="@drawable/ic_outline_menu_24" />
 
         </LinearLayout>
 
@@ -169,10 +197,11 @@
 
         <com.beemdevelopment.aegis.ui.views.TotpProgressBar
             style="?android:attr/progressBarStyleHorizontal"
+            android:progressDrawable="@drawable/progress_horizontal"
             android:layout_width="0dp"
             android:layout_height="3dp"
             android:id="@+id/progressBar"
             android:max="5000"
             android:layout_weight="1"/>
     </LinearLayout>
-</LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/card_entry_tile.xml b/app/src/main/res/layout/card_entry_tile.xml
index 18748c0b..1f98dd40 100644
--- a/app/src/main/res/layout/card_entry_tile.xml
+++ b/app/src/main/res/layout/card_entry_tile.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="0dp"
     android:clickable="true"
     android:focusable="true"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="6dp"
-    android:clipChildren="true">
+    android:checkable="true"
+    app:checkedIcon="@null"
+    app:cardElevation="0dp"
+    style="@style/Widget.Aegis.EntryCardView">
 
     <LinearLayout
         android:orientation="horizontal"
@@ -21,8 +24,8 @@
             android:layout_width="15dp"
             android:layout_height="match_parent"
             android:layout_marginStart="-11dp"
-            android:backgroundTint="@color/colorFavorite"
-            android:background="@drawable/button_rounded_corners" />
+            android:backgroundTint="?attr/colorFavorite"
+            android:background="@drawable/favorite_indicator" />
 
         <RelativeLayout
             android:layout_width="0dp"
@@ -43,14 +46,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent">
 
-                    <de.hdodenhof.circleimageview.CircleImageView
+                    <com.google.android.material.imageview.ShapeableImageView
                         android:id="@+id/ivTextDrawable"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
                         android:layout_marginEnd="6dp"
-                        android:layout_alignParentStart="true" />
+                        android:layout_alignParentStart="true"
+                        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
-                    <de.hdodenhof.circleimageview.CircleImageView
+                    <com.google.android.material.imageview.ShapeableImageView
                         android:id="@+id/ivSelected"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
@@ -58,40 +62,36 @@
                         android:layout_alignParentStart="true"
                         android:src="@drawable/item_selected"
                         android:visibility="gone"
-                        app:civ_circle_background_color="@color/colorPrimarySelected" />
+                        android:background="?attr/colorPrimaryAlternative"
+                        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="24dp"
                 android:id="@+id/description"
-                android:layout_toEndOf="@+id/layoutImage">
+                android:layout_toEndOf="@id/layoutImage">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/profile_issuer"
                     android:text="@string/issuer"
-                    android:textColor="?attr/primaryText"
                     android:textStyle="bold"
                     android:includeFontPadding="false"
                     android:textSize="11sp"
                     android:ellipsize="end"
                     android:maxLines="1"/>
-
-
                 <TextView
                     android:id="@+id/profile_copied"
                     android:layout_width="wrap_content"
-                    android:layout_below="@id/profile_issuer"
                     android:layout_height="wrap_content"
+                    android:layout_below="@id/profile_issuer"
                     android:maxLines="1"
                     android:includeFontPadding="false"
                     android:visibility="invisible"
                     android:text="@string/copied"
-                    android:textColor="?attr/secondaryText"
                     android:textSize="9sp" />
-
                 <TextView
                     android:id="@+id/profile_account_name"
                     android:layout_width="wrap_content"
@@ -100,27 +100,51 @@
                     android:ellipsize="end"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:textColor="@color/extra_info_text"
                     android:textSize="9sp"
                     tools:text=" - AccountName" />
             </RelativeLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:fontFamily="sans-serif-light"
-                tools:text="012 345"
-                android:id="@+id/profile_code"
-                android:layoutDirection="ltr"
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_marginBottom="0dp"
+                android:paddingBottom="0dp"
+                android:id="@+id/profile_codes_layout"
                 android:layout_below="@id/description"
-                android:includeFontPadding="false"
-                android:fallbackLineSpacing="false"
-                android:textSize="26sp"
-                android:textColor="?attr/codePrimaryText"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="10dp"
-                android:textStyle="normal|bold"/>
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:fontFamily="sans-serif-light"
+                    tools:text="012 345"
+                    android:id="@+id/profile_code"
+                    android:layoutDirection="ltr"
+                    android:layout_below="@id/description"
+                    android:includeFontPadding="false"
+                    android:fallbackLineSpacing="false"
+                    android:textSize="26sp"
+                    android:textColor="?attr/colorCode"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginTop="10dp"
+                    android:textStyle="normal|bold"/>
+
+                <TextView
+                    android:id="@+id/next_profile_code"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:letterSpacing="-0.01"
+                    android:layout_marginTop="0dp"
+                    android:paddingTop="0dp"
+                    android:paddingStart="2dp"
+                    android:textColor="?attr/colorOnSurfaceDim"
+                    android:textSize="16sp"
+                    android:textStyle="normal|bold"
+                    android:includeFontPadding="false"
+                    android:fallbackLineSpacing="false"
+                    tools:text="412 643"/>
+            </LinearLayout>
 
         </RelativeLayout>
 
@@ -140,8 +164,7 @@
                 android:padding="8dp"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_refresh_black_24dp"
-                app:tint="?attr/iconColorPrimary"
+                android:src="@drawable/ic_outline_refresh_24"
                 android:background="?android:attr/selectableItemBackground" />
 
             <ImageView
@@ -152,7 +175,7 @@
                 android:layout_marginEnd="-12dp"
                 android:visibility="invisible"
                 android:scaleType="fitXY"
-                android:src="@drawable/ic_baseline_menu_black_32" />
+                android:src="@drawable/ic_outline_menu_24" />
 
         </LinearLayout>
 
@@ -167,6 +190,7 @@
 
         <com.beemdevelopment.aegis.ui.views.TotpProgressBar
             style="?android:attr/progressBarStyleHorizontal"
+            android:progressDrawable="@drawable/progress_horizontal"
             android:layout_width="0dp"
             android:layout_height="3dp"
             android:id="@+id/progressBar"
@@ -174,4 +198,4 @@
             android:layout_weight="1"/>
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/card_error.xml b/app/src/main/res/layout/card_error.xml
new file mode 100644
index 00000000..37c4e78f
--- /dev/null
+++ b/app/src/main/res/layout/card_error.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/card_error"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:clickable="true"
+    android:focusable="true"
+    android:paddingHorizontal="10dp"
+    android:paddingVertical="10dp"
+    style="@style/Widget.Aegis.ErrorCardView">
+    <LinearLayout
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="16dp"
+        android:gravity="center_vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:tint="?attr/colorOnErrorContainer"
+        android:src="@drawable/ic_outline_error_24" />
+    <TextView
+        android:id="@+id/text_error_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?attr/colorOnErrorContainer"
+        android:textStyle="bold"
+        android:layout_marginStart="5dp" />
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/card_footer.xml b/app/src/main/res/layout/card_footer.xml
index 730e6db5..4fb1336f 100644
--- a/app/src/main/res/layout/card_footer.xml
+++ b/app/src/main/res/layout/card_footer.xml
@@ -9,7 +9,6 @@
         android:layout_height="wrap_content"
         android:padding="4dp"
         android:layout_centerInParent="true"
-        android:textColor="@color/extra_info_text"
         android:textSize="14sp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_group.xml b/app/src/main/res/layout/card_group.xml
index b81bfdb4..9e867e7e 100644
--- a/app/src/main/res/layout/card_group.xml
+++ b/app/src/main/res/layout/card_group.xml
@@ -3,13 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/colorBackground"
     android:orientation="horizontal">
 
     <LinearLayout
-        android:id="@+id/button_edit"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:baselineAligned="false"
         android:clickable="true"
         android:focusable="true"
         android:orientation="horizontal"
@@ -17,26 +18,32 @@
         android:paddingEnd="10dp"
         android:paddingTop="12.5dp"
         android:paddingBottom="12.5dp"
-        android:foreground="?android:attr/selectableItemBackground">
+        android:background="?android:attr/selectableItemBackground">
 
-        <LinearLayout
-            android:layout_width="0dp"
+        <TextView
+            android:id="@+id/text_group_name"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/text_group_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/group_name_hint"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimary" />
-
-        </LinearLayout>
+            android:text="@string/group_name_hint"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorPrimary" />
 
     </LinearLayout>
 
+    <ImageView
+        android:id="@+id/button_edit"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:clickable="true"
+        android:contentDescription="@string/rename_group"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground"
+        android:paddingStart="15dp"
+        android:paddingTop="12.5dp"
+        android:paddingEnd="15dp"
+        android:paddingBottom="12.5dp"
+        android:src="@drawable/ic_outline_edit_24" />
+
     <View
         android:layout_width="1dp"
         android:layout_height="match_parent"
@@ -44,20 +51,21 @@
         android:paddingStart="15dp"
         android:paddingEnd="15dp"
         android:layout_marginTop="12.5dp"
-        android:layout_marginBottom="12.5dp"/>
+        android:layout_marginBottom="12.5dp" />
 
     <ImageView
         android:id="@+id/button_delete"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:clickable="true"
+        android:contentDescription="@string/remove_group"
         android:focusable="true"
-        android:foreground="?android:attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackground"
         android:paddingStart="15dp"
         android:paddingTop="12.5dp"
         android:paddingEnd="15dp"
         android:paddingBottom="12.5dp"
-        android:src="@drawable/ic_delete_black_24dp"
-        app:tint="?attr/iconColorPrimary" />
+        android:src="@drawable/ic_outline_delete_24"
+        app:tint="?attr/colorError" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/card_icon_category.xml b/app/src/main/res/layout/card_icon_category.xml
index 517f1ff5..dc8c842e 100644
--- a/app/src/main/res/layout/card_icon_category.xml
+++ b/app/src/main/res/layout/card_icon_category.xml
@@ -19,7 +19,7 @@
         android:id="@+id/icon_category_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_chevron_down_black_24dp"
-        app:tint="?attr/iconColorPrimary"
+        android:src="@drawable/ic_outline_expand_more_24"
+        app:tint="?attr/colorOnSurfaceVariant"
         android:layout_gravity="center_vertical" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/card_icon_pack.xml b/app/src/main/res/layout/card_icon_pack.xml
index c8d4812f..bdc74acb 100644
--- a/app/src/main/res/layout/card_icon_pack.xml
+++ b/app/src/main/res/layout/card_icon_pack.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
@@ -37,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="14sp"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" />
+                android:textAppearance="@style/TextAppearance.Material3.BodySmall" />
 
         </LinearLayout>
 
@@ -63,7 +62,6 @@
         android:paddingTop="12.5dp"
         android:paddingEnd="15dp"
         android:paddingBottom="12.5dp"
-        android:src="@drawable/ic_delete_black_24dp"
-        app:tint="?attr/iconColorPrimary" />
+        android:src="@drawable/ic_outline_delete_24" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/card_import_entry.xml b/app/src/main/res/layout/card_import_entry.xml
index 6988b47f..c6797738 100644
--- a/app/src/main/res/layout/card_import_entry.xml
+++ b/app/src/main/res/layout/card_import_entry.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="?android:attr/selectableItemBackground"
-    android:background="?attr/cardBackground"
     android:clickable="true"
     android:focusable="true"
     android:orientation="horizontal">
@@ -21,7 +20,6 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?attr/primaryText"
             android:textSize="18sp"
             android:textStyle="normal|bold"
             android:gravity="center_vertical"
@@ -33,7 +31,6 @@
             android:layout_marginTop="2dp"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@color/extra_info_text"
             android:textSize="14sp"
             tools:text="AccountName" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/card_slot.xml b/app/src/main/res/layout/card_slot.xml
deleted file mode 100644
index 40cf9697..00000000
--- a/app/src/main/res/layout/card_slot.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <LinearLayout
-        android:id="@+id/button_edit"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:paddingTop="12.5dp"
-        android:paddingBottom="12.5dp"
-        android:foreground="?android:attr/selectableItemBackground">
-
-        <ImageView
-            android:id="@+id/img_slot"
-            app:tint="?attr/iconColorPrimary"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="15dp"/>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:id="@+id/text_slot_name"
-                android:textColor="?android:attr/textColorPrimary"/>
-
-            <TextView
-                android:id="@+id/text_slot_used"
-                android:text="@string/slot_this_device"
-                android:visibility="gone"
-                android:layout_marginStart="5dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:background="@android:color/darker_gray"
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
-        android:layout_marginTop="12.5dp"
-        android:layout_marginBottom="12.5dp"/>
-
-    <ImageView
-        android:id="@+id/button_delete"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_delete_black_24dp"
-        app:tint="?attr/iconColorPrimary"
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
-        android:paddingTop="12.5dp"
-        android:paddingBottom="12.5dp"
-        android:foreground="?android:attr/selectableItemBackground"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/chip_material.xml b/app/src/main/res/layout/chip_group_filter.xml
similarity index 63%
rename from app/src/main/res/layout/chip_material.xml
rename to app/src/main/res/layout/chip_group_filter.xml
index f0346c6d..10c1b381 100644
--- a/app/src/main/res/layout/chip_material.xml
+++ b/app/src/main/res/layout/chip_group_filter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/Widget.MaterialComponents.Chip.Choice"
+    style="@style/Widget.Material3.Chip.Filter"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_about.xml b/app/src/main/res/layout/content_about.xml
index 2b778f33..fdb76311 100644
--- a/app/src/main/res/layout/content_about.xml
+++ b/app/src/main/res/layout/content_about.xml
@@ -8,19 +8,17 @@
     android:padding="8dp"
     app:cardUseCompatPadding="true">
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardUseCompatPadding="true"
-        android:background="?attr/cardBackground"
         android:layout_marginBottom="8dp"
-        tools:ignore="MissingPrefix">
+        app:cardUseCompatPadding="true"
+        style="?attr/materialCardViewOutlinedStyle">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="8dp"
-            android:background="?attr/cardBackground"
             android:orientation="vertical">
 
             <LinearLayout
@@ -61,17 +59,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-info-outline"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_info_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp">
@@ -106,17 +102,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-time-restore"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_history_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp">
@@ -148,17 +142,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-github"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_code_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp">
@@ -190,17 +182,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-file-text"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_description_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp">
@@ -233,17 +223,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-file-text"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_description_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp">
@@ -265,21 +253,19 @@
 
         </LinearLayout>
 
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardUseCompatPadding="true"
-        android:background="?attr/cardBackground"
         android:layout_marginBottom="8dp"
-        tools:ignore="MissingPrefix">
+        app:cardUseCompatPadding="true"
+        style="?attr/materialCardViewOutlinedStyle">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="8dp"
-            android:background="?attr/cardBackground"
             android:orientation="vertical">
 
             <TextView
@@ -308,17 +294,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-account"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_person_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp">
@@ -353,17 +337,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-account"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_person_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp">
@@ -398,17 +380,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-email"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_mail_24" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp"
                     android:text="@string/email_us"
@@ -430,16 +410,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-globe"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_public_24" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp"
                     android:text="@string/visit_website"
@@ -448,21 +427,19 @@
             </LinearLayout>
 
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardUseCompatPadding="true"
         android:layout_marginBottom="8dp"
-        android:background="?attr/cardBackground"
-        tools:ignore="MissingPrefix">
+        app:cardUseCompatPadding="true"
+        style="?attr/materialCardViewOutlinedStyle">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="8dp"
-            android:background="?attr/cardBackground"
             android:orientation="vertical">
 
             <TextView
@@ -491,17 +468,15 @@
                 android:focusable="true">
 
                 <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    app:ico_color="?attr/iconColorPrimary"
-                    app:ico_icon="gmi-star"
-                    app:ico_size="16dp" />
+                    android:src="@drawable/ic_outline_star_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginStart="28dp"
                     android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp">
@@ -523,6 +498,6 @@
             </LinearLayout>
 
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_add_entry.xml b/app/src/main/res/layout/dialog_add_entry.xml
index 282f779a..d36db027 100644
--- a/app/src/main/res/layout/dialog_add_entry.xml
+++ b/app/src/main/res/layout/dialog_add_entry.xml
@@ -5,6 +5,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        android:id="@+id/drag_handle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/add_new_entry"
+        android:textSize="20sp" />
     <LinearLayout
         android:id="@+id/fab_scan"
         android:layout_width="match_parent"
@@ -20,13 +30,12 @@
             android:layout_width="25dp"
             android:layout_height="match_parent"
             android:src="@drawable/ic_qrcode_scan"
-            app:tint="?attr/iconColorPrimary" />
+            app:tint="?attr/colorOnSurfaceVariant" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/scan"
             android:textSize="17sp"
-            android:textColor="?attr/primaryText"
             android:gravity="center_vertical"
             android:layout_marginStart="20dp" />
     </LinearLayout>
@@ -44,14 +53,13 @@
         <ImageView
             android:layout_width="25dp"
             android:layout_height="match_parent"
-            android:src="@drawable/ic_add_photo_24px"
-            app:tint="?attr/iconColorPrimary" />
+            android:src="@drawable/ic_outline_add_photo_alternate_24"
+            app:tint="?attr/colorOnSurfaceVariant" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/scan_image"
             android:textSize="17sp"
-            android:textColor="?attr/primaryText"
             android:gravity="center_vertical"
             android:layout_marginStart="20dp" />
     </LinearLayout>
@@ -69,14 +77,13 @@
         <ImageView
             android:layout_width="25dp"
             android:layout_height="match_parent"
-            android:src="@drawable/ic_create_black_24dp"
-            app:tint="?attr/iconColorPrimary" />
+            android:src="@drawable/ic_outline_edit_24"
+            app:tint="?attr/colorOnSurfaceVariant" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/enter_manually"
             android:textSize="17sp"
-            android:textColor="?attr/primaryText"
             android:gravity="center_vertical"
             android:layout_marginStart="20dp" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_backups_versioning_strategy.xml b/app/src/main/res/layout/dialog_backups_versioning_strategy.xml
new file mode 100644
index 00000000..8988758e
--- /dev/null
+++ b/app/src/main/res/layout/dialog_backups_versioning_strategy.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingStart="20dp"
+    android:paddingTop="20dp"
+    android:paddingEnd="20dp"
+    android:orientation="vertical">
+
+    <RadioGroup
+        android:id="@+id/radio_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <RadioButton
+            android:id="@+id/keep_x_versions_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/pref_backups_versioning_strategy_keep_x_versions" />
+
+        <RadioButton
+            android:id="@+id/single_backup_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/pref_backups_versioning_strategy_single_backup" />
+
+    </RadioGroup>
+
+    <TextView
+        android:id="@+id/warning_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
+        android:text="@string/pref_backups_versioning_strategy_single_backup_warning"
+        android:textColor="?attr/colorError" />
+
+    <CheckBox
+        android:id="@+id/risk_accept"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/understand_risk_accept" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_duplicate_entry.xml b/app/src/main/res/layout/dialog_duplicate_entry.xml
new file mode 100644
index 00000000..f55d3d71
--- /dev/null
+++ b/app/src/main/res/layout/dialog_duplicate_entry.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingTop="16dp"
+        android:text="@string/dialog_duplicate_entry_title"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/duplicate_warning_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/dialog_duplicate_entry_message"
+        android:textSize="16sp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:paddingTop="10dp"
+        android:paddingBottom="20dp" />
+
+    <LinearLayout
+        android:id="@+id/overwrite_entry"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingVertical="15dp"
+        android:paddingHorizontal="10dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_outline_brush_24"
+            app:tint="?attr/colorOnSurfaceVariant" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:layout_marginStart="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dialog_duplicate_entry_overwrite_title"
+                android:textSize="17sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dialog_duplicate_entry_overwrite_subtitle"
+                android:textSize="14sp"
+                android:textColor="?attr/colorOnSurfaceVariant" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/create_new_entry"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingVertical="15dp"
+        android:paddingHorizontal="10dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_tag_24"
+            app:tint="?attr/colorOnSurfaceVariant" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:layout_marginStart="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dialog_duplicate_entry_suffix_title"
+                android:textSize="17sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/duplicate_suffix_subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dialog_duplicate_entry_suffix_subtitle"
+                android:textSize="14sp"
+                android:textColor="?attr/colorOnSurfaceVariant" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/cancel_save"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingVertical="15dp"
+        android:paddingHorizontal="10dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_outline_close_24"
+            app:tint="?attr/colorOnSurfaceVariant" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:layout_marginStart="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dialog_duplicate_entry_cancel_title"
+                android:textSize="17sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dialog_duplicate_entry_cancel_subtitle"
+                android:textSize="14sp"
+                android:textColor="?attr/colorOnSurfaceVariant" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_export.xml b/app/src/main/res/layout/dialog_export.xml
index c89860c6..ad98847d 100644
--- a/app/src/main/res/layout/dialog_export.xml
+++ b/app/src/main/res/layout/dialog_export.xml
@@ -1,96 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:paddingBottom="10dp"
-    android:paddingTop="10dp">
-    <TextView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:text="@string/export_help" />
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginTop="15dp"
-        android:hint="@string/export_format_hint"
-        style="?attr/dropdownStyle">
-        <AutoCompleteTextView
-            android:id="@+id/dropdown_export_format"
+        android:orientation="vertical"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp">
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="none" />
-    </com.google.android.material.textfield.TextInputLayout>
-    <CheckBox
-        android:id="@+id/checkbox_export_encrypt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginTop="5dp"
-        android:text="@string/export_encrypted"
-        android:checked="true" />
-    <TextView
-        android:id="@+id/text_separate_password"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginTop="5dp"
-        android:textStyle="italic"
-        android:text="@string/export_warning_password" />
-    <TextView
-        android:id="@+id/text_export_warning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginTop="5dp"
-        android:text="@string/export_warning_unencrypted"
-        android:textColor="#FF0000"
-        android:visibility="gone" />
-    <CheckBox
-        android:id="@+id/checkbox_accept"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginTop="5dp"
-        android:text="@string/understand_risk_accept"
-        android:checked="false"
-        android:visibility="gone" />
-
-    <CheckBox
-        android:id="@+id/export_selected_groups"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginTop="5dp"
-        android:text="@string/export_all_groups"
-        android:checked="true"
-        android:visibility="gone" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/group_selection_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginTop="15dp"
-        android:hint="@string/export_choose_groups"
-        android:visibility="gone"
-        style="?attr/dropdownStyle">
-
-        <com.beemdevelopment.aegis.ui.components.DropdownCheckBoxes
-            android:id="@+id/group_selection_dropdown"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:text="@string/export_help" />
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:allow_filtering="false" />
-    </com.google.android.material.textfield.TextInputLayout>
-</LinearLayout>
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginTop="15dp"
+            android:hint="@string/export_format_hint"
+            style="?attr/dropdownStyle">
+            <AutoCompleteTextView
+                android:id="@+id/dropdown_export_format"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="none" />
+        </com.google.android.material.textfield.TextInputLayout>
+        <CheckBox
+            android:id="@+id/checkbox_export_encrypt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginTop="5dp"
+            android:text="@string/export_encrypted"
+            android:checked="true" />
+        <TextView
+            android:id="@+id/text_separate_password"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginTop="5dp"
+            android:textStyle="italic"
+            android:text="@string/export_warning_password" />
+        <TextView
+            android:id="@+id/text_export_warning"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginTop="5dp"
+            android:text="@string/export_warning_unencrypted"
+            android:textColor="?attr/colorError"
+            android:visibility="gone" />
+        <CheckBox
+            android:id="@+id/checkbox_accept"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginTop="5dp"
+            android:text="@string/understand_risk_accept"
+            android:checked="false"
+            android:visibility="gone" />
+
+        <CheckBox
+            android:id="@+id/export_selected_groups"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginTop="5dp"
+            android:text="@string/export_all_groups"
+            android:checked="true"
+            android:visibility="gone" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/group_selection_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginTop="15dp"
+            android:hint="@string/export_choose_groups"
+            android:visibility="gone"
+            style="?attr/dropdownStyle">
+
+            <com.beemdevelopment.aegis.ui.components.DropdownCheckBoxes
+                android:id="@+id/group_selection_dropdown"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:allow_filtering="false" />
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_icon_picker.xml b/app/src/main/res/layout/dialog_icon_picker.xml
index a7cedc6e..372f6c45 100644
--- a/app/src/main/res/layout/dialog_icon_picker.xml
+++ b/app/src/main/res/layout/dialog_icon_picker.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingTop="10dp"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
     <RelativeLayout
         android:layout_width="match_parent"
@@ -14,19 +13,16 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <View
-                android:layout_width="16dp"
-                android:layout_height="2dp"
-                android:layout_gravity="center"
-                android:background="@drawable/drag_handle" />
+            <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+                android:id="@+id/drag_handle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
             <TextView
-                android:paddingTop="8dp"
-                android:textSize="17sp"
-                android:gravity="center"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="?attr/primaryText"
-                android:text="@string/pick_icon" />
+                android:gravity="center"
+                android:text="@string/pick_icon"
+                android:textSize="20sp" />
             <TextView
                 android:id="@+id/text_icon_pack"
                 android:paddingTop="2dp"
@@ -46,13 +42,9 @@
             android:layout_marginTop="12dp"
             android:scaleType="centerCrop"
             android:background="?selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_dots_vertical_black_24dp"
-            app:tint="?attr/iconColorPrimary"/>
+            android:src="@drawable/ic_outline_more_vert_24"
+            app:tint="?attr/colorOnSurfaceVariant" />
     </RelativeLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/divider2" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index c7e8a14b..88c26af6 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/authentication_method_password_explanation"
-            android:textColor="#FF0000"
+            android:textColor="?attr/colorError"
             android:textStyle="bold"
             android:layout_marginStart="5dp"
             android:layout_marginEnd="5dp"
@@ -52,6 +52,7 @@
 
         <ProgressBar
             android:id="@+id/progressBar"
+            android:progressDrawable="@drawable/progress_horizontal"
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml
new file mode 100644
index 00000000..814735b9
--- /dev/null
+++ b/app/src/main/res/layout/dialog_progress.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:padding="20dp">
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:indeterminate="true" />
+    <TextView
+        android:id="@+id/text_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="15dp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_select_group.xml b/app/src/main/res/layout/dialog_select_group.xml
new file mode 100644
index 00000000..4d754634
--- /dev/null
+++ b/app/src/main/res/layout/dialog_select_group.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:text="@string/assign_groups_dialog_summary" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/group_selection_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginTop="15dp"
+            android:hint="@string/assign_groups_dialog_dropdown"
+            style="?attr/dropdownStyle">
+            <AutoCompleteTextView
+                android:id="@+id/group_selection_dropdown"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="none" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/text_group_name_layout"
+            android:hint="@string/group_name_hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginTop="10dp"
+            android:visibility="gone">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/text_group_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textCapSentences"/>
+        </com.google.android.material.textfield.TextInputLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_select_groups.xml b/app/src/main/res/layout/dialog_select_groups.xml
index 11733771..5e418a4e 100644
--- a/app/src/main/res/layout/dialog_select_groups.xml
+++ b/app/src/main/res/layout/dialog_select_groups.xml
@@ -1,71 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="12dp"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
-    <View
-        android:layout_width="16dp"
-        android:layout_height="2dp"
-        android:layout_gravity="center"
-        android:background="@drawable/drag_handle" />
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        android:id="@+id/drag_handle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:paddingTop="8dp"
-        android:paddingBottom="16dp"
-        android:textSize="17sp"
-        android:gravity="center"
-        android:id="@+id/textView3"
+        android:id="@+id/text_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?attr/primaryText"
-        android:text="@string/groups" />
+        android:gravity="center"
+        android:text="@string/groups"
+        android:textSize="20sp"
+        app:layout_constraintTop_toBottomOf="@+id/drag_handle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
-    <View
+    <TextView
+        android:id="@+id/addGroupInfo"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/divider2" />
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="8dp"
+        android:padding="8dp"
+        android:text="@string/no_group_selection"
+        app:layout_constraintTop_toBottomOf="@+id/text_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:visibility="gone"/>
 
     <LinearLayout
+        android:id="@+id/addGroup"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:minHeight="150dp"
-        android:orientation="vertical">
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="8dp"
+        android:layout_marginTop="15dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="8dp"
+        app:layout_constraintTop_toBottomOf="@+id/addGroupInfo"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:visibility="gone">
 
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/groupChipGroup"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/new_group"
+            android:src="@drawable/ic_outline_add_24" />
+
+        <TextView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        </com.google.android.material.chip.ChipGroup>
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="@string/new_group"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
     </LinearLayout>
 
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollView"
+        android:layout_marginTop="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:minWidth="150dp"
+        app:layout_constraintHeight_default="wrap"
+        app:layout_constraintTop_toBottomOf="@+id/addGroup"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="150dp"
+            android:orientation="vertical">
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/groupChipGroup"
+                android:paddingStart="8dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+            </com.google.android.material.chip.ChipGroup>
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
     <LinearLayout
-        android:layout_gravity="end"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/scrollView"
+        app:layout_constraintEnd_toEndOf="parent"
         android:orientation="horizontal">
         <Button
             android:id="@+id/btnSave"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/colorSecondary"
             android:text="@string/save"
-            app:rippleColor="@color/dialog_button_ripple_color"
-            style="@style/Widget.MaterialComponents.Button.TextButton" />
+            style="@style/Widget.Material3.Button.TextButton" />
 
         <Button
             android:id="@+id/btnClear"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/colorSecondary"
             android:text="@string/clear"
-            app:rippleColor="@color/dialog_button_ripple_color"
-            style="@style/Widget.MaterialComponents.Button.TextButton" />
+            style="@style/Widget.Material3.Button.TextButton" />
     </LinearLayout>
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_text_input.xml b/app/src/main/res/layout/dialog_text_input.xml
index 8f4b0702..0c27664e 100644
--- a/app/src/main/res/layout/dialog_text_input.xml
+++ b/app/src/main/res/layout/dialog_text_input.xml
@@ -14,6 +14,6 @@
             android:id="@+id/text_input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="text"/>
+            android:inputType="textCapSentences"/>
     </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dropdown_checkbox.xml b/app/src/main/res/layout/dropdown_checkbox.xml
index 8e398f86..cc28d4a1 100644
--- a/app/src/main/res/layout/dropdown_checkbox.xml
+++ b/app/src/main/res/layout/dropdown_checkbox.xml
@@ -6,7 +6,6 @@
     <CheckBox
         android:id="@+id/checkbox_in_dropdown"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:buttonTint="@color/colorSecondary"/>
+        android:layout_height="wrap_content" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_audit_log.xml b/app/src/main/res/layout/fragment_audit_log.xml
new file mode 100644
index 00000000..2a1c9fce
--- /dev/null
+++ b/app/src/main/res/layout/fragment_audit_log.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center|fill_vertical"
+        android:visibility="gone"
+        android:id="@+id/vEmptyList"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:paddingBottom="150dp">
+
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="75dp"
+                android:layout_height="75dp"
+                android:src="@drawable/ic_timeline_24" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/no_events_title"
+                android:paddingTop="17dp"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/txt_no_audit_logs"
+                android:layout_width="300dp"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="5dp"
+                android:paddingTop="7dp"
+                android:text="@string/no_events_description"
+                android:textAlignment="center" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list_audit_log"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        android:scrollbarStyle="outsideOverlay"
+        android:clipToPadding="false"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_entry_list_view.xml b/app/src/main/res/layout/fragment_entry_list_view.xml
index 7bca5207..4f4fc0e3 100644
--- a/app/src/main/res/layout/fragment_entry_list_view.xml
+++ b/app/src/main/res/layout/fragment_entry_list_view.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/background"
     android:orientation="vertical">
 
     <com.beemdevelopment.aegis.ui.views.TotpProgressBar
@@ -15,29 +14,13 @@
         android:visibility="gone"
         android:max="5000"/>
 
-    <com.google.android.material.chip.Chip
-        android:id="@+id/chip_group"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/groups"
-        android:layout_gravity="end"
-        android:layout_marginEnd="8dp"
-        android:textAppearance="@style/TextAppearance.Aegis.ActionChip"
-        android:textColor="?attr/primaryText"
-        android:visibility="gone"
-        app:chipBackgroundColor="?attr/cardBackground"
-        app:chipEndPadding="6dp"
-        app:chipIcon="@drawable/ic_baseline_filter_list_24dp"
-        app:chipIconSize="18dp"
-        app:chipIconTint="?attr/primaryText"
-        app:chipStrokeColor="@color/hint_text_dark"
-        app:chipStrokeWidth="1dp"
-        app:iconStartPadding="6dp" />
-
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:paddingHorizontal="8dp"
         android:scrollbars="vertical"
+        android:scrollbarStyle="outsideOverlay"
+        android:clipToPadding="false"
         android:id="@+id/rvKeyProfiles"
         android:layout_weight="1"/>
 
@@ -60,8 +43,7 @@
                 android:id="@+id/imageView"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:src="@drawable/ic_qrcode_scan"
-                app:tint="?attr/primaryText" />
+                android:src="@drawable/ic_qrcode_scan" />
 
             <TextView
                 android:id="@+id/textView"
@@ -69,7 +51,6 @@
                 android:layout_height="wrap_content"
                 android:text="@string/empty_list_title"
                 android:paddingTop="17dp"
-                android:textColor="?attr/primaryText"
                 android:textSize="18sp" />
 
             <TextView
diff --git a/app/src/main/res/layout/fragment_icon_packs.xml b/app/src/main/res/layout/fragment_icon_packs.xml
index 4d635d27..0401ef7d 100644
--- a/app/src/main/res/layout/fragment_icon_packs.xml
+++ b/app/src/main/res/layout/fragment_icon_packs.xml
@@ -2,8 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/cardBackground">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -24,15 +23,13 @@
                 android:id="@+id/imageView"
                 android:layout_width="75dp"
                 android:layout_height="75dp"
-                android:src="@drawable/ic_package_variant_black_24dp"
-                app:tint="?attr/primaryText" />
+                android:src="@drawable/ic_outline_package_variant_24" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/no_icon_packs_title"
                 android:paddingTop="17dp"
-                android:textColor="?attr/primaryText"
                 android:textSize="18sp" />
 
             <TextView
@@ -47,26 +44,11 @@
 
     </LinearLayout>
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/view_icon_packs"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list_icon_packs"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/list_icon_packs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="vertical"/>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
@@ -74,8 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_add_black_24dp"
-        app:tint="@color/icon_primary_dark">
+        android:src="@drawable/ic_outline_add_24">
     </com.google.android.material.floatingactionbutton.FloatingActionButton>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_security_setup_slide.xml b/app/src/main/res/layout/fragment_security_setup_slide.xml
index 9445fbce..7a89752e 100644
--- a/app/src/main/res/layout/fragment_security_setup_slide.xml
+++ b/app/src/main/res/layout/fragment_security_setup_slide.xml
@@ -25,7 +25,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/authentication_method_password_explanation"
-            android:textColor="@color/warning_color"
+            android:textColor="?attr/colorError"
             android:textStyle="bold"
             android:layout_marginTop="24dp" />
 
@@ -64,6 +64,7 @@
 
             <ProgressBar
                 android:id="@+id/progressBar"
+                android:progressDrawable="@drawable/progress_horizontal"
                 style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_welcome_slide.xml b/app/src/main/res/layout/fragment_welcome_slide.xml
index 22a41f28..49bec913 100644
--- a/app/src/main/res/layout/fragment_welcome_slide.xml
+++ b/app/src/main/res/layout/fragment_welcome_slide.xml
@@ -18,28 +18,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:layout_width="210dp"
-        android:layout_height="210dp"
-        android:layout_marginTop="60dp"
-        android:adjustViewBounds="true"
-        android:src="@drawable/app_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleText"/>
-
-    <Button
-        android:id="@+id/btnImport"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="32dp"
-        android:text="@string/import_vault"
-        android:textSize="11sp"
-        style="?attr/outlineButtonStyle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/descriptionText" />
-
     <TextView
         android:id="@+id/descriptionText"
         android:layout_width="match_parent"
@@ -47,8 +25,45 @@
         android:text="@string/app_description"
         android:textAlignment="center"
         android:textSize="16sp"
+        android:layout_marginTop="10dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/titleText" />
+
+    <ImageView
+        android:id="@+id/imgLogo"
+        android:layout_width="210dp"
+        android:layout_height="210dp"
+        android:layout_marginTop="60dp"
+        android:adjustViewBounds="true"
+        android:src="@drawable/app_icon"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/descriptionText"/>
+
+    <Button
+        android:id="@+id/btnImport"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:text="@string/import_vault"
+        android:textSize="11sp"
+        android:layout_marginVertical="10dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/txtImportHelp"
+        style="@style/Widget.Material3.Button.TonalButton" />
+
+    <TextView
+        android:id="@+id/txtImportHelp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/import_vault_hint"
+        android:textSize="11sp"
+        android:textAlignment="center"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/popup_password.xml b/app/src/main/res/layout/popup_password.xml
index 6e05cb7f..e78598f6 100644
--- a/app/src/main/res/layout/popup_password.xml
+++ b/app/src/main/res/layout/popup_password.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/cardBackground">
-
+    android:background="@drawable/rounded_popup">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        android:text="@string/password_reminder"/>
-</LinearLayout>
\ No newline at end of file
+        android:text="@string/password_reminder"
+        android:textColor="?attr/colorOnSurface" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/view_preference_switch.xml b/app/src/main/res/layout/view_preference_switch.xml
new file mode 100644
index 00000000..79121555
--- /dev/null
+++ b/app/src/main/res/layout/view_preference_switch.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:focusable="false"
+    android:clickable="false"
+    android:background="@null" />
diff --git a/app/src/main/res/menu/menu_action_mode.xml b/app/src/main/res/menu/menu_action_mode.xml
index bea4f31b..ef65ccde 100644
--- a/app/src/main/res/menu/menu_action_mode.xml
+++ b/app/src/main/res/menu/menu_action_mode.xml
@@ -4,36 +4,52 @@
     <item
         android:id="@+id/action_toggle_favorite"
         android:orderInCategory="70"
-        android:icon="@drawable/ic_unset_favorite"
+        android:icon="@drawable/ic_outline_star_24"
         android:title="@string/favorite"
         app:showAsAction="always" />
     <item
         android:id="@+id/action_copy"
         android:orderInCategory="80"
-        android:icon="@drawable/ic_content_copy_white_24dp"
+        android:icon="@drawable/ic_outline_content_copy_24"
         android:title="@string/copy"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_edit"
         android:orderInCategory="90"
-        android:icon="@drawable/ic_mode_edit"
+        android:icon="@drawable/ic_outline_edit_24"
         android:title="@string/edit"
         app:showAsAction="always" />
 
     <item
-        android:id="@+id/action_delete"
-        android:title="@string/action_delete"
+        android:id="@+id/action_select_all"
+        android:title="@string/select_all"
+        android:orderInCategory="95"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_assign_icons"
+        android:title="@string/assign_icons"
         android:orderInCategory="100"
-        android:icon="@drawable/ic_delete_white"
-        android:tint="?attr/iconColorPrimary"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_assign_groups"
+        android:title="@string/assign_groups"
+        android:orderInCategory="100"
+        app:showAsAction="never"/>
 
     <item
         android:id="@+id/action_share_qr"
         android:title="@string/action_transfer"
-        android:orderInCategory="100"
-        android:icon="@drawable/ic_qr_code_full"
-        android:tint="?attr/iconColorPrimary"
+        android:orderInCategory="110"
+        android:icon="@drawable/ic_outline_qr_code_2_24"
         app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/action_delete"
+        android:title="@string/action_delete"
+        android:orderInCategory="400"
+        android:icon="@drawable/ic_outline_delete_24"
+        app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_assign_icons.xml b/app/src/main/res/menu/menu_assign_icons.xml
new file mode 100644
index 00000000..1d5c11be
--- /dev/null
+++ b/app/src/main/res/menu/menu_assign_icons.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.beemdevelopment.aegis.ui.AssignIconsActivity">
+    <item
+        android:id="@+id/action_save"
+        app:showAsAction="always"
+        android:title="@string/save"/>
+</menu>
diff --git a/app/src/main/res/menu/menu_groups.xml b/app/src/main/res/menu/menu_groups.xml
index 5e614e22..d0e52da2 100644
--- a/app/src/main/res/menu/menu_groups.xml
+++ b/app/src/main/res/menu/menu_groups.xml
@@ -3,6 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.beemdevelopment.aegis.ui.GroupManagerActivity">
+    <item
+        android:id="@+id/action_delete_unused_groups"
+        app:showAsAction="collapseActionView"
+        android:title="@string/remove_unused_groups"/>
     <item
         android:id="@+id/action_save"
         app:showAsAction="ifRoom"
diff --git a/app/src/main/res/menu/menu_import_entries.xml b/app/src/main/res/menu/menu_import_entries.xml
index 034d5d52..69ac788c 100644
--- a/app/src/main/res/menu/menu_import_entries.xml
+++ b/app/src/main/res/menu/menu_import_entries.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"   >
     <item android:id="@+id/toggle_checkboxes"
-        android:icon="@drawable/ic_done_all_black_24dp"
+        android:icon="@drawable/ic_outline_done_all_24"
         android:title="@string/toggle_checkboxes"
         app:showAsAction="always" />
     <item android:id="@+id/toggle_wipe_vault"
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 0225a59d..4a650dd3 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -9,12 +9,12 @@
         app:actionViewClass="androidx.appcompat.widget.SearchView"/>
     <item
         android:id="@+id/action_lock"
-        android:icon="@drawable/ic_lock"
+        android:icon="@drawable/ic_outline_lock_24"
         app:showAsAction="ifRoom"
         android:title="@string/lock"/>
     <item
         android:id="@+id/action_sort"
-        android:icon="@drawable/ic_action_sort"
+        android:icon="@drawable/ic_outline_sort_24"
         app:showAsAction="always"
         android:title="@string/sort">
         <menu>
@@ -40,6 +40,9 @@
                 <item
                     android:id="@+id/menu_sort_usage_count"
                     android:title="@string/sort_usage_count"/>
+                <item
+                    android:id="@+id/menu_sort_last_used"
+                    android:title="@string/sort_last_used"/>
             </group>
         </menu>
     </item>
diff --git a/app/src/main/res/menu/menu_scanner.xml b/app/src/main/res/menu/menu_scanner.xml
index daa50e34..36430a1a 100644
--- a/app/src/main/res/menu/menu_scanner.xml
+++ b/app/src/main/res/menu/menu_scanner.xml
@@ -6,8 +6,8 @@
     tools:context="com.beemdevelopment.aegis.ui.ScannerActivity">
     <item
         android:id="@+id/action_camera"
-        android:icon="@drawable/ic_camera_front_24dp"
+        android:icon="@drawable/ic_outline_camera_front_24"
         android:title="@string/switch_camera"
-        app:showAsAction="always"/>
-
+        app:iconTint="?attr/colorOnDark"
+        app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/raw/aboutlibraries.json b/app/src/main/res/raw/aboutlibraries.json
new file mode 100644
index 00000000..fc7d5304
--- /dev/null
+++ b/app/src/main/res/raw/aboutlibraries.json
@@ -0,0 +1,4106 @@
+{
+    "metadata": {
+        "generated": "2025-05-23T11:52:25.992Z"
+    },
+    "libraries": [
+        {
+            "uniqueId": "androidx.activity:activity",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.10.1",
+            "description": "Provides the base Activity subclass and the relevant hooks to build a composable structure on top.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Activity",
+            "website": "https://developer.android.com/jetpack/androidx/releases/activity#1.10.1",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.activity:activity-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.10.1",
+            "description": "Kotlin extensions for 'activity' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Activity Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/activity#1.10.1",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.annotation:annotation-experimental",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.1",
+            "description": "Java annotation for use on unstable Android API surfaces. When used in conjunction with the Experimental annotation lint checks, this annotation provides functional parity with Kotlin's Experimental annotation.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Experimental annotation",
+            "website": "https://developer.android.com/jetpack/androidx/releases/annotation#1.4.1",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.annotation:annotation-jvm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.9.1",
+            "description": "Provides source annotations for tooling and readability.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Annotation",
+            "website": "https://developer.android.com/jetpack/androidx/releases/annotation#1.9.1",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.appcompat:appcompat",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.7.0",
+            "description": "Provides backwards-compatible implementations of UI-related Android SDK functionality, including dark mode and Material theming.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "AppCompat",
+            "website": "https://developer.android.com/jetpack/androidx/releases/appcompat#1.7.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.appcompat:appcompat-resources",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.7.0",
+            "description": "Provides backward-compatible implementations of resource-related Android SDKfunctionality, including color state list theming.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "AppCompat Resources",
+            "website": "https://developer.android.com/jetpack/androidx/releases/appcompat#1.7.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.arch.core:core-common",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.2.0",
+            "description": "Android Arch-Common",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Android Arch-Common",
+            "website": "https://developer.android.com/jetpack/androidx/releases/arch-core#2.2.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.arch.core:core-runtime",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.2.0",
+            "description": "Android Arch-Runtime",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Android Arch-Runtime",
+            "website": "https://developer.android.com/jetpack/androidx/releases/arch-core#2.2.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.biometric:biometric",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "The Biometric library is a static library that you can add to your Android application. It invokes BiometricPrompt on devices running P and greater, and on older devices will show a compat dialog. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Biometric",
+            "website": "https://developer.android.com/jetpack/androidx/releases/biometric#1.1.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.camera:camera-camera2",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.2",
+            "description": "Camera2 implementation and extensions for the Jetpack Camera Library, a library providing a consistent and reliable camera foundation that enables great camera driven experiences across all of Android.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Camera2",
+            "website": "https://developer.android.com/jetpack/androidx/releases/camera#1.4.2",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.camera:camera-core",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.2",
+            "description": "Core components for the Jetpack Camera Library, a library providing a consistent and reliable camera foundation that enables great camera driven experiences across all of Android.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Camera Core",
+            "website": "https://developer.android.com/jetpack/androidx/releases/camera#1.4.2",
+            "licenses": [
+                "Apache-2.0",
+                "44d1a25c593283261968a15c8cc213cd"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.camera:camera-lifecycle",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.2",
+            "description": "Lifecycle components for the Jetpack Camera Library, a library providing a consistent and reliable camera foundation that enables great camera driven experiences across all of Android.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Camera Lifecycle",
+            "website": "https://developer.android.com/jetpack/androidx/releases/camera#1.4.2",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.camera:camera-video",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.2",
+            "description": "Video components for the Jetpack Camera Library, a library providing a consistent and reliable camera foundation that enables great camera driven experiences across all of Android.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Camera Video",
+            "website": "https://developer.android.com/jetpack/androidx/releases/camera#1.4.2",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.camera:camera-view",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.2",
+            "description": "UI tools for the Jetpack Camera Library, a library providing a consistent and reliable camera foundation that enables great camera driven experiences across all of Android.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Camera View",
+            "website": "https://developer.android.com/jetpack/androidx/releases/camera#1.4.2",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.cardview:cardview",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "Android Support CardView v7",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support CardView v7",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.collection:collection-jvm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.2",
+            "description": "Standalone efficient collections.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "collections",
+            "website": "https://developer.android.com/jetpack/androidx/releases/collection#1.4.2",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.collection:collection-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.2",
+            "description": "Kotlin extensions for 'collection' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Collections Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/collection#1.4.2",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.concurrent:concurrent-futures",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "Androidx implementation of Guava's ListenableFuture",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "AndroidX Futures",
+            "website": "https://developer.android.com/topic/libraries/architecture/index.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.concurrent:concurrent-futures-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "Kotlin Extensions for Androidx implementation of Guava's ListenableFuture",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "AndroidX Futures Kotlin Extensions",
+            "website": "https://developer.android.com/topic/libraries/architecture/index.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.constraintlayout:constraintlayout",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.2.1",
+            "description": "This library offers a flexible and adaptable way to position and animate widgets",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "ConstraintLayout",
+            "website": "https://developer.android.com/jetpack/androidx/releases/constraintlayout#2.2.1",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.constraintlayout:constraintlayout-core",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.1",
+            "description": "This library contains engines and algorithms for constraint based layout and complex animations (it is used by the ConstraintLayout library)",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "ConstraintLayout Core",
+            "website": "https://developer.android.com/jetpack/androidx/releases/constraintlayout#1.1.1",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.coordinatorlayout:coordinatorlayout",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support Coordinator Layout",
+            "website": "https://developer.android.com/jetpack/androidx",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.core:core",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.16.0",
+            "description": "Provides backward-compatible implementations of Android platform APIs and features.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Core",
+            "website": "https://developer.android.com/jetpack/androidx/releases/core#1.16.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.core:core-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.16.0",
+            "description": "Kotlin extensions for 'core' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Core Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/core#1.16.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.core:core-viewtree",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "Provides ViewTree extensions packaged for use by other core androidx libraries",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "androidx.core:core-viewtree",
+            "website": "https://developer.android.com/jetpack/androidx/releases/core#1.0.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.cursoradapter:cursoradapter",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support Cursor Adapter",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.customview:customview",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support Custom View",
+            "website": "https://developer.android.com/jetpack/androidx",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.customview:customview-poolingcontainer",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "Utilities for listening to the lifecycle of containers that manage their child Views' lifecycle, such as RecyclerView",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "androidx.customview:poolingcontainer",
+            "website": "https://developer.android.com/jetpack/androidx/releases/customview#1.0.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.databinding:viewbinding",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "8.5.2",
+            "description": "",
+            "name": "androidx.databinding:viewbinding",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.documentfile:documentfile",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Document File",
+            "website": "https://developer.android.com/jetpack/androidx/releases/documentfile#1.1.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.drawerlayout:drawerlayout",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.1",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support Drawer Layout",
+            "website": "https://developer.android.com/jetpack/androidx",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.dynamicanimation:dynamicanimation",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "Physics-based animation in support library, where the animations are driven by physics force. You can use this Animation library to create smooth and realistic animations.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support DynamicAnimation",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.emoji2:emoji2",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.3.0",
+            "description": "Core library to enable emoji compatibility in Kitkat and newer devices to avoid the empty emoji characters.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Android Emoji2 Compat",
+            "website": "https://developer.android.com/jetpack/androidx/releases/emoji2#1.3.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.emoji2:emoji2-views-helper",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.3.0",
+            "description": "View helpers for Emoji2",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Android Emoji2 Compat view helpers",
+            "website": "https://developer.android.com/jetpack/androidx/releases/emoji2#1.3.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.exifinterface:exifinterface",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.3.6",
+            "description": "Android Support ExifInterface",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Support ExifInterface",
+            "website": "https://developer.android.com/jetpack/androidx/releases/exifinterface#1.3.6",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.fragment:fragment",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.6.2",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Support fragment",
+            "website": "https://developer.android.com/jetpack/androidx/releases/fragment#1.6.2",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.fragment:fragment-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.6.2",
+            "description": "Kotlin extensions for 'fragment' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Fragment Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/fragment#1.6.2",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.interpolator:interpolator",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support Interpolators",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.legacy:legacy-support-core-utils",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support core utils",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-common-jvm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Android Lifecycle-Common",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle-Common",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-livedata",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Android Lifecycle LiveData",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle LiveData",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-livedata-core",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Android Lifecycle LiveData Core",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle LiveData Core",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-livedata-core-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Kotlin extensions for 'livedata-core' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "LiveData Core Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-livedata-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Kotlin extensions for 'livedata' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "LiveData Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-process",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Android Lifecycle Process",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle Process",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-runtime-android",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Android Lifecycle Runtime",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle Runtime",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-runtime-ktx-android",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Kotlin extensions for 'lifecycle' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-viewmodel",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Android Lifecycle ViewModel",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle ViewModel",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-viewmodel-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Kotlin extensions for 'viewmodel' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle ViewModel Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.lifecycle:lifecycle-viewmodel-savedstate",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.9.0",
+            "description": "Android Lifecycle ViewModel",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Lifecycle ViewModel with SavedState",
+            "website": "https://developer.android.com/jetpack/androidx/releases/lifecycle#2.9.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.loader:loader",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support loader",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.localbroadcastmanager:localbroadcastmanager",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support Local Broadcast Manager",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.multidex:multidex",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.0.1",
+            "description": "Library for legacy multi-dex support",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/multidex",
+                "url": "http://source.android.com"
+            },
+            "name": "Android Multi-Dex Library",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.navigation:navigation-common",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.7.7",
+            "description": "Android Navigation-Common",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Navigation Common",
+            "website": "https://developer.android.com/jetpack/androidx/releases/navigation#2.7.7",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.navigation:navigation-fragment",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.7.7",
+            "description": "Android Navigation-Fragment",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Navigation Fragment",
+            "website": "https://developer.android.com/jetpack/androidx/releases/navigation#2.7.7",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.navigation:navigation-runtime",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.7.7",
+            "description": "Android Navigation-Runtime",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Navigation Runtime",
+            "website": "https://developer.android.com/jetpack/androidx/releases/navigation#2.7.7",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.preference:preference",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.2.1",
+            "description": "AndroidX Preference",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "AndroidX Preference",
+            "website": "https://developer.android.com/jetpack/androidx/releases/preference#1.2.1",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.print:print",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support Print",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.profileinstaller:profileinstaller",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.0",
+            "description": "Allows libraries to prepopulate ahead of time compilation traces to be read by ART",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Profile Installer",
+            "website": "https://developer.android.com/jetpack/androidx/releases/profileinstaller#1.4.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.recyclerview:recyclerview",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.4.0",
+            "description": "Android Support RecyclerView",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "RecyclerView",
+            "website": "https://developer.android.com/jetpack/androidx/releases/recyclerview#1.4.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.resourceinspection:resourceinspection-annotation",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.1",
+            "description": "Annotation processors for Android resource and layout inspection",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Android Resource Inspection - Annotations",
+            "website": "https://developer.android.com/jetpack/androidx/releases/resourceinspection#1.0.1",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.room:room-common-jvm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.7.1",
+            "description": "Android Room-Common",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Room-Common",
+            "website": "https://developer.android.com/jetpack/androidx/releases/room#2.7.1",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.room:room-runtime-android",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.7.1",
+            "description": "Android Room-Runtime",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Room-Runtime",
+            "website": "https://developer.android.com/jetpack/androidx/releases/room#2.7.1",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.savedstate:savedstate",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.3.0",
+            "description": "Android Lifecycle Saved State",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Saved State",
+            "website": "https://developer.android.com/jetpack/androidx/releases/savedstate#1.3.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.savedstate:savedstate-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.3.0",
+            "description": "Kotlin extensions for 'savedstate' artifact",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "SavedState Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/savedstate#1.3.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.slidingpanelayout:slidingpanelayout",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.2.0",
+            "description": "SlidingPaneLayout offers a responsive, two pane layout that automatically switches between overlapping panes on smaller devices to a side by side view on larger devices.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Support Sliding Pane Layout",
+            "website": "https://developer.android.com/jetpack/androidx/releases/slidingpanelayout#1.2.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.sqlite:sqlite-android",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.5.0",
+            "description": "SQLite API",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "SQLite",
+            "website": "https://developer.android.com/jetpack/androidx/releases/sqlite#2.5.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.sqlite:sqlite-framework-android",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "2.5.0",
+            "description": "The implementation of SQLite library using the framework code.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "SQLite Framework Integration",
+            "website": "https://developer.android.com/jetpack/androidx/releases/sqlite#2.5.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.startup:startup-runtime",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.1",
+            "description": "Android App Startup Runtime",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Android App Startup Runtime",
+            "website": "https://developer.android.com/jetpack/androidx/releases/startup#1.1.1",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.test.espresso:espresso-contrib",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "3.6.1",
+            "description": "The AndroidX Test Library provides an extensive framework for testing Android apps",
+            "name": "AndroidX Test Library",
+            "website": "https://developer.android.com/testing",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.test.ext:junit",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.2.1",
+            "description": "The AndroidX Test Library provides an extensive framework for testing Android apps",
+            "name": "AndroidX Test Library",
+            "website": "https://developer.android.com/testing",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.test.services:storage",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.5.0",
+            "description": "The AndroidX Test Library provides an extensive framework for testing Android apps",
+            "name": "AndroidX Test Library",
+            "website": "https://developer.android.com/testing",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.test:core",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.6.1",
+            "description": "The AndroidX Test Library provides an extensive framework for testing Android apps",
+            "name": "AndroidX Test Library",
+            "website": "https://developer.android.com/testing",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.tracing:tracing",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.2.0",
+            "description": "Android Tracing",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Android Tracing",
+            "website": "https://developer.android.com/jetpack/androidx/releases/tracing#1.2.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.tracing:tracing-ktx",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.2.0",
+            "description": "Android Tracing",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Android Tracing Runtime Kotlin Extensions",
+            "website": "https://developer.android.com/jetpack/androidx/releases/tracing#1.2.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.transition:transition",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.5.0",
+            "description": "Android Transition Support Library",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Transition",
+            "website": "https://developer.android.com/jetpack/androidx/releases/transition#1.5.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.vectordrawable:vectordrawable",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "Android Support VectorDrawable",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support VectorDrawable",
+            "website": "https://developer.android.com/jetpack/androidx",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.vectordrawable:vectordrawable-animated",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "Android Support AnimatedVectorDrawable",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support AnimatedVectorDrawable",
+            "website": "https://developer.android.com/jetpack/androidx",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.versionedparcelable:versionedparcelable",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.1",
+            "description": "Provides a stable but relatively compact binary serialization format that can be passed across processes or persisted safely.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "VersionedParcelable",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.viewpager2:viewpager2",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.1.0",
+            "description": "AndroidX Widget ViewPager2",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "ViewPager2",
+            "website": "https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "name": "The Android Open Source Project"
+            }
+        },
+        {
+            "uniqueId": "androidx.viewpager:viewpager",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "http://source.android.com"
+            },
+            "name": "Support View Pager",
+            "website": "http://developer.android.com/tools/extras/support-library.html",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "androidx.window:window",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "WindowManager Jetpack library. Currently only provides additional functionality on foldable devices.",
+            "scm": {
+                "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support",
+                "url": "https://cs.android.com/androidx/platform/frameworks/support"
+            },
+            "name": "Jetpack WindowManager Library",
+            "website": "https://developer.android.com/jetpack/androidx/releases/window#1.0.0",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.almworks.sqlite4java:sqlite4java",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Igor Sereda"
+                },
+                {
+                    "name": "Eugene Vagin"
+                },
+                {
+                    "name": "Dmitry Peshehonov"
+                }
+            ],
+            "artifactVersion": "1.0.392",
+            "description": "Minimalistic high-performance Java wrapper for SQLite",
+            "scm": {
+                "connection": "scm:svn:http://sqlite4java.googlecode.com/svn/trunk/",
+                "url": "http://sqlite4java.googlecode.com/svn/trunk/",
+                "developerConnection": "scm:svn:https://sqlite4java.googlecode.com/svn/trunk/"
+            },
+            "name": "sqlite4java",
+            "website": "http://code.google.com/p/sqlite4java",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "http://almworks.com",
+                "name": "ALM Works"
+            }
+        },
+        {
+            "uniqueId": "com.amulyakhare:com.amulyakhare.textdrawable",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "1.0.1",
+            "description": "This light-weight library provides images with letter/text like the Gmail app. It extends the Drawable class thus can be used with existing/custom/network ImageView classes. Also included is a fluent interface for creating drawables and a customizable ColorGenerator.",
+            "name": "textdrawable",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "com.caverock:androidsvg-aar",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Paul LeBeau"
+                }
+            ],
+            "artifactVersion": "1.4",
+            "description": "SVG rendering library for Android.",
+            "scm": {
+                "connection": "https://github.com/BigBadaboom/androidsvg.git",
+                "url": "https://github.com/BigBadaboom/androidsvg",
+                "developerConnection": "https://github.com/BigBadaboom/androidsvg.git"
+            },
+            "name": "AndroidSVG",
+            "website": "https://github.com/BigBadaboom/androidsvg",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.github.avito-tech:krop",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "0.52",
+            "description": "",
+            "name": "com.github.avito-tech:krop",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "com.github.bumptech.glide:annotations",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Sam Judd"
+                }
+            ],
+            "artifactVersion": "4.16.0",
+            "description": "A set of annotations for configuring Glide.",
+            "scm": {
+                "connection": "scm:git@github.com:bumptech/glide.git",
+                "url": "https://github.com/bumptech/glide",
+                "developerConnection": "scm:git@github.com:bumptech/glide.git"
+            },
+            "name": "Glide Annotations",
+            "website": "https://github.com/bumptech/glide",
+            "licenses": [
+                "Apache-2.0",
+                "BSD-2-Clause"
+            ]
+        },
+        {
+            "uniqueId": "com.github.bumptech.glide:disklrucache",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Sam Judd"
+                }
+            ],
+            "artifactVersion": "4.16.0",
+            "description": "A cache that uses a bounded amount of space on a filesystem. Based on Jake Wharton's tailored for Glide.",
+            "scm": {
+                "connection": "scm:git@github.com:bumptech/glide.git",
+                "url": "https://github.com/bumptech/glide",
+                "developerConnection": "scm:git@github.com:bumptech/glide.git"
+            },
+            "name": "Glide Disk LRU Cache Library",
+            "website": "https://github.com/bumptech/glide",
+            "licenses": [
+                "Apache-2.0",
+                "BSD-2-Clause"
+            ]
+        },
+        {
+            "uniqueId": "com.github.bumptech.glide:gifdecoder",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Sam Judd"
+                }
+            ],
+            "artifactVersion": "4.16.0",
+            "description": "Implementation of GifDecoder that is more memory efficient to animate for Android devices.",
+            "scm": {
+                "connection": "scm:git@github.com:bumptech/glide.git",
+                "url": "https://github.com/bumptech/glide",
+                "developerConnection": "scm:git@github.com:bumptech/glide.git"
+            },
+            "name": "Glide GIF Decoder Library",
+            "website": "https://github.com/bumptech/glide",
+            "licenses": [
+                "Apache-2.0",
+                "BSD-2-Clause"
+            ]
+        },
+        {
+            "uniqueId": "com.github.bumptech.glide:glide",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Sam Judd"
+                }
+            ],
+            "artifactVersion": "4.16.0",
+            "description": "A fast and efficient image loading library for Android focused on smooth scrolling.",
+            "scm": {
+                "connection": "scm:git@github.com:bumptech/glide.git",
+                "url": "https://github.com/bumptech/glide",
+                "developerConnection": "scm:git@github.com:bumptech/glide.git"
+            },
+            "name": "Glide",
+            "website": "https://github.com/bumptech/glide",
+            "licenses": [
+                "Apache-2.0",
+                "BSD-2-Clause"
+            ]
+        },
+        {
+            "uniqueId": "com.github.bumptech.glide:recyclerview-integration",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Sam Judd"
+                }
+            ],
+            "artifactVersion": "4.16.0",
+            "description": "An integration library to display images in RecyclerView.",
+            "scm": {
+                "connection": "scm:git@github.com:bumptech/glide.git",
+                "url": "https://github.com/bumptech/glide",
+                "developerConnection": "scm:git@github.com:bumptech/glide.git"
+            },
+            "name": "Glide RecyclerView Integration",
+            "website": "https://github.com/bumptech/glide",
+            "licenses": [
+                "Apache-2.0",
+                "BSD-2-Clause"
+            ]
+        },
+        {
+            "uniqueId": "com.github.topjohnwu.libsu:core",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "6.0.0",
+            "description": "",
+            "name": "com.github.topjohnwu.libsu:core",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.github.topjohnwu.libsu:io",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "6.0.0",
+            "description": "",
+            "name": "com.github.topjohnwu.libsu:io",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.github.topjohnwu.libsu:nio",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "6.0.0",
+            "description": "",
+            "name": "com.github.topjohnwu.libsu:nio",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.google.com",
+                    "name": "Casey Burkhardt"
+                }
+            ],
+            "artifactVersion": "3.1.2",
+            "description": "Library used to test for common accessibility issues.",
+            "scm": {
+                "connection": "scm:git:git@github.com:google/Accessibility-Test-Framework-for-Android.git",
+                "url": "https://github.com/google/Accessibility-Test-Framework-for-Android",
+                "developerConnection": "scm:git:git@github.com:google/Accessibility-Test-Framework-for-Android.git"
+            },
+            "name": "Accessibility Test Framework",
+            "website": "https://github.com/google/Accessibility-Test-Framework-for-Android",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.google.android.material:material",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Project"
+                }
+            ],
+            "artifactVersion": "1.12.0",
+            "description": "Material Components for Android is a static library that you can add to your Android application in order to use APIs that provide implementations of the Material Design specification. Compatible on devices running API 14 or later.",
+            "scm": {
+                "connection": "scm:git:https://github.com/material-components/material-components-android.git",
+                "url": "https://github.com/material-components/material-components-android"
+            },
+            "name": "Material Components for Android",
+            "website": "https://github.com/material-components/material-components-android",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.google.auto.value:auto-value-annotations",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "1.6.3",
+            "description": "Immutable value-type code generation for Java 1.6+.",
+            "scm": {
+                "connection": "scm:git:git://github.com/google/auto.git",
+                "url": "http://github.com/google/auto",
+                "developerConnection": "scm:git:ssh://git@github.com/google/auto.git"
+            },
+            "name": "AutoValue Annotations",
+            "website": "https://github.com/google/auto",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "http://www.google.com",
+                "name": "Google, Inc."
+            }
+        },
+        {
+            "uniqueId": "com.google.code.findbugs:jsr305",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "3.0.2",
+            "description": "JSR305 Annotations for Findbugs",
+            "scm": {
+                "connection": "scm:git:https://code.google.com/p/jsr-305/",
+                "url": "https://code.google.com/p/jsr-305/",
+                "developerConnection": "scm:git:https://code.google.com/p/jsr-305/"
+            },
+            "name": "FindBugs-jsr305",
+            "website": "http://findbugs.sourceforge.net/",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.google.dagger:dagger",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "2.56.2",
+            "description": "A fast dependency injector for Android and Java.",
+            "scm": {
+                "connection": "scm:git:git://github.com/google/dagger.git",
+                "url": "https://github.com/google/dagger/",
+                "developerConnection": "scm:git:ssh://git@github.com/google/dagger.git"
+            },
+            "name": "Dagger",
+            "website": "https://github.com/google/dagger",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "https://www.google.com",
+                "name": "Google, Inc."
+            }
+        },
+        {
+            "uniqueId": "com.google.dagger:dagger-lint-aar",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "2.56.2",
+            "description": "A fast dependency injector for Android and Java.",
+            "scm": {
+                "connection": "scm:git:git://github.com/google/dagger.git",
+                "url": "https://github.com/google/dagger/",
+                "developerConnection": "scm:git:ssh://git@github.com/google/dagger.git"
+            },
+            "name": "Dagger Lint Rules AAR Distribution",
+            "website": "https://github.com/google/dagger",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "https://www.google.com",
+                "name": "Google, Inc."
+            }
+        },
+        {
+            "uniqueId": "com.google.dagger:hilt-android",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "2.56.2",
+            "description": "A fast dependency injector for Android and Java.",
+            "scm": {
+                "connection": "scm:git:git://github.com/google/dagger.git",
+                "url": "https://github.com/google/dagger/",
+                "developerConnection": "scm:git:ssh://git@github.com/google/dagger.git"
+            },
+            "name": "Hilt Android",
+            "website": "https://github.com/google/dagger",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "https://www.google.com",
+                "name": "Google, Inc."
+            }
+        },
+        {
+            "uniqueId": "com.google.dagger:hilt-android-testing",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "2.56.2",
+            "description": "A fast dependency injector for Android and Java.",
+            "scm": {
+                "connection": "scm:git:git://github.com/google/dagger.git",
+                "url": "https://github.com/google/dagger/",
+                "developerConnection": "scm:git:ssh://git@github.com/google/dagger.git"
+            },
+            "name": "Hilt Android Testing",
+            "website": "https://github.com/google/dagger",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "https://www.google.com",
+                "name": "Google, Inc."
+            }
+        },
+        {
+            "uniqueId": "com.google.dagger:hilt-core",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "2.56.2",
+            "description": "A fast dependency injector for Android and Java.",
+            "scm": {
+                "connection": "scm:git:git://github.com/google/dagger.git",
+                "url": "https://github.com/google/dagger/",
+                "developerConnection": "scm:git:ssh://git@github.com/google/dagger.git"
+            },
+            "name": "Hilt Core",
+            "website": "https://github.com/google/dagger",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "https://www.google.com",
+                "name": "Google, Inc."
+            }
+        },
+        {
+            "uniqueId": "com.google.errorprone:error_prone_annotation",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "2.34.0",
+            "description": "Error Prone is a static analysis tool for Java that catches common programming mistakes at compile-time.",
+            "scm": {
+                "connection": "scm:git:https://github.com/google/error-prone.git",
+                "url": "https://github.com/google/error-prone",
+                "developerConnection": "scm:git:git@github.com:google/error-prone.git"
+            },
+            "name": "@BugPattern annotation",
+            "website": "https://errorprone.info",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "http://www.google.com",
+                "name": "Google LLC"
+            }
+        },
+        {
+            "uniqueId": "com.google.errorprone:error_prone_annotations",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "2.36.0",
+            "description": "Error Prone is a static analysis tool for Java that catches common programming mistakes at compile-time.",
+            "scm": {
+                "connection": "scm:git:https://github.com/google/error-prone.git",
+                "url": "https://github.com/google/error-prone",
+                "developerConnection": "scm:git:git@github.com:google/error-prone.git"
+            },
+            "name": "error-prone annotations",
+            "website": "https://errorprone.info",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "http://www.google.com",
+                "name": "Google LLC"
+            }
+        },
+        {
+            "uniqueId": "com.google.guava:failureaccess",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "1.0.3",
+            "description": "Contains\n    com.google.common.util.concurrent.internal.InternalFutureFailureAccess and\n    InternalFutures. Most users will never need to use this artifact. Its\n    classes are conceptually a part of Guava, but they're in this separate\n    artifact so that Android libraries can use them without pulling in all of\n    Guava (just as they can use ListenableFuture by depending on the\n    listenablefuture artifact).",
+            "scm": {
+                "connection": "scm:git:https://github.com/google/guava.git",
+                "url": "https://github.com/google/guava",
+                "developerConnection": "scm:git:git@github.com:google/guava.git"
+            },
+            "name": "Guava InternalFutureFailureAccess and InternalFutures",
+            "website": "https://github.com/google/guava",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.google.guava:guava",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "33.4.8-android",
+            "description": "Guava is a suite of core and expanded libraries that include\n    utility classes, Google's collections, I/O classes, and\n    much more.",
+            "scm": {
+                "connection": "scm:git:https://github.com/google/guava.git",
+                "url": "https://github.com/google/guava",
+                "developerConnection": "scm:git:git@github.com:google/guava.git"
+            },
+            "name": "Guava: Google Core Libraries for Java",
+            "website": "https://github.com/google/guava",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.google.guava:listenablefuture",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "9999.0-empty-to-avoid-conflict-with-guava",
+            "description": "An empty artifact that Guava depends on to signal that it is providing\n    ListenableFuture -- but is also available in a second \"version\" that\n    contains com.google.common.util.concurrent.ListenableFuture class, without\n    any other Guava classes. The idea is:\n\n    - If users want only ListenableFuture, they depend on listenablefuture-1.0.\n\n    - If users want all of Guava, they depend on guava, which, as of Guava\n    27.0, depends on\n    listenablefuture-9999.0-empty-to-avoid-conflict-with-guava. The 9999.0-...\n    version number is enough for some build systems (notably, Gradle) to select\n    that empty artifact over the \"real\" listenablefuture-1.0 -- avoiding a\n    conflict with the copy of ListenableFuture in guava itself. If users are\n    using an older version of Guava or a build system other than Gradle, they\n    may see class conflicts. If so, they can solve them by manually excluding\n    the listenablefuture artifact or manually forcing their build systems to\n    use 9999.0-....",
+            "scm": {
+                "connection": "scm:git:https://github.com/google/guava.git",
+                "url": "https://github.com/google/guava",
+                "developerConnection": "scm:git:git@github.com:google/guava.git"
+            },
+            "name": "Guava ListenableFuture only",
+            "website": "https://github.com/google/guava",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.google.j2objc:j2objc-annotations",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.google.com",
+                    "name": "Tom Ball"
+                }
+            ],
+            "artifactVersion": "3.0.0",
+            "description": "A set of annotations that provide additional information to the J2ObjC\n    translator to modify the result of translation.",
+            "scm": {
+                "connection": "scm:git:git://github.com/google/j2objc.git",
+                "url": "http://github.com/google/j2objc",
+                "developerConnection": "scm:git:ssh://git@github.com/google/j2objc.git"
+            },
+            "name": "J2ObjC Annotations",
+            "website": "https://github.com/google/j2objc/",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.google.protobuf:protobuf-javalite",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "4.31.0",
+            "description": "Lite version of Protocol Buffers library. This version is optimized for code size, but does\n    not guarantee API/ABI stability.",
+            "scm": {
+                "connection": "scm:git:https://github.com/protocolbuffers/protobuf.git",
+                "url": "https://github.com/protocolbuffers/protobuf"
+            },
+            "name": "Protocol Buffers [Lite]",
+            "website": "https://developers.google.com/protocol-buffers/",
+            "licenses": [
+                "BSD-3-Clause"
+            ]
+        },
+        {
+            "uniqueId": "com.google.testparameterinjector:test-parameter-injector",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "1.18",
+            "description": "A simple yet powerful parameterized test runner.",
+            "scm": {
+                "connection": "scm:git:git://github.com/google/testparameterinjector.git",
+                "url": "http://github.com/google/testparameterinjector/",
+                "developerConnection": "scm:git:ssh://git@github.com/google/testparameterinjector.git"
+            },
+            "name": "TestParameterInjector for JUnit4",
+            "website": "https://github.com/google/testparameterinjector",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "http://www.google.com/",
+                "name": "Google Inc."
+            }
+        },
+        {
+            "uniqueId": "com.google.zxing:core",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "3.5.3",
+            "description": "Core barcode encoding/decoding library",
+            "scm": {
+                "connection": "scm:git:https://github.com/zxing/zxing.git",
+                "url": "https://github.com/zxing/zxing",
+                "developerConnection": "scm:git:https://github.com/zxing/zxing.git"
+            },
+            "name": "ZXing Core",
+            "website": "https://github.com/zxing/zxing",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.ibm.icu:icu4j",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "75.1",
+            "description": "International Components for Unicode for Java (ICU4J) is a mature, widely used Java library\n    providing Unicode and Globalization support",
+            "scm": {
+                "connection": "scm:git:git://github.com/unicode-org/icu.git",
+                "url": "https://github.com/unicode-org/icu",
+                "developerConnection": "scm:git:git@github.com:unicode-org/icu.git"
+            },
+            "name": "${proj-title} (${project.artifactId})",
+            "website": "https://icu.unicode.org/",
+            "licenses": [
+                "5be2dcb917a8d00d01258ff45d1f55b2"
+            ],
+            "organization": {
+                "url": "https://icu.unicode.org/",
+                "name": "Unicode, Inc."
+            }
+        },
+        {
+            "uniqueId": "com.mikepenz:aboutlibraries-core-android",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Mike Penz"
+                }
+            ],
+            "artifactVersion": "11.2.3",
+            "description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
+            "scm": {
+                "connection": "scm:git@github.com:mikepenz/AboutLibraries.git",
+                "url": "https://github.com/mikepenz/AboutLibraries",
+                "developerConnection": "scm:git@github.com:mikepenz/AboutLibraries.git"
+            },
+            "name": "AboutLibraries Core Library",
+            "website": "https://github.com/mikepenz/AboutLibraries",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.mikepenz:fastadapter",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Mike Penz"
+                }
+            ],
+            "artifactVersion": "5.7.0",
+            "description": "The bullet proof, fast and easy to use adapter library, which minimizes developing time to a fraction...",
+            "scm": {
+                "connection": "scm:git@github.com:mikepenz/FastAdapter.git",
+                "url": "https://github.com/mikepenz/FastAdapter",
+                "developerConnection": "scm:git@github.com:mikepenz/FastAdapter.git"
+            },
+            "name": "FastAdapter Library",
+            "website": "https://github.com/mikepenz/FastAdapter",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "com.nulab-inc:zxcvbn",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Yuichi Watanabe"
+                }
+            ],
+            "artifactVersion": "1.9.0",
+            "description": "This is a java port of zxcvbn, which is a JavaScript password strength generator.",
+            "scm": {
+                "connection": "https://github.com/nulab/zxcvbn4j.git",
+                "url": "https://github.com/nulab/zxcvbn4j.git",
+                "developerConnection": "https://github.com/nulab/zxcvbn4j.git"
+            },
+            "name": "zxcvbn4j",
+            "website": "https://github.com/nulab/zxcvbn4j",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "info.guardianproject.trustedintents:trustedintents",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Guardian Project"
+                }
+            ],
+            "artifactVersion": "0.2",
+            "description": "TrustedIntents is a library for flexible trusted interactions between Android apps.  It is modeled after Android's `signature` protection level for permissions.  The key difference is that the framework allows the trusted signature to be set, rather than requiring to match the current app's signature.",
+            "scm": {
+                "connection": "scm:https://github.com/guardianproject/TrustedIntents.git",
+                "url": "scm:https://github.com/guardianproject/TrustedIntents",
+                "developerConnection": "scm:git@github.com:guardianproject/TrustedIntents.git"
+            },
+            "name": "TrustedIntents",
+            "website": "https://guardianproject.info/code/trustedintents",
+            "licenses": [
+                "3ca920d1875f7ad7ab04a2a331958577"
+            ]
+        },
+        {
+            "uniqueId": "jakarta.inject:jakarta.inject-api",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Antoine Sabot-Durand"
+                },
+                {
+                    "name": "Martin Kouba"
+                },
+                {
+                    "name": "Tomas Remes"
+                },
+                {
+                    "name": "Matej Novotny"
+                }
+            ],
+            "artifactVersion": "2.0.1",
+            "description": "Jakarta Dependency Injection",
+            "scm": {
+                "connection": "scm:git:ssh://git@github.com/eclipse-ee4j/injection-api.git",
+                "url": "https://github.com/eclipse-ee4j/injection-api",
+                "developerConnection": "scm:git:ssh://git@github.com/eclipse-ee4j/injection-api.git"
+            },
+            "name": "Jakarta Dependency Injection",
+            "website": "https://github.com/eclipse-ee4j/injection-api",
+            "licenses": [
+                "Apache-2.0"
+            ],
+            "organization": {
+                "url": "https://www.eclipse.org",
+                "name": "Eclipse Foundation"
+            }
+        },
+        {
+            "uniqueId": "javax.inject:javax.inject",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "1",
+            "description": "The javax.inject API",
+            "scm": {
+                "url": "http://code.google.com/p/atinject/source/checkout"
+            },
+            "name": "javax.inject",
+            "website": "http://code.google.com/p/atinject/",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "junit:junit",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "David Saff"
+                },
+                {
+                    "name": "Kevin Cooney"
+                },
+                {
+                    "name": "Stefan Birkner"
+                },
+                {
+                    "name": "Marc Philipp"
+                }
+            ],
+            "artifactVersion": "4.13.2",
+            "description": "JUnit is a unit testing framework for Java, created by Erich Gamma and Kent Beck.",
+            "scm": {
+                "connection": "scm:git:git://github.com/junit-team/junit4.git",
+                "url": "https://github.com/junit-team/junit4",
+                "developerConnection": "scm:git:git@github.com:junit-team/junit4.git"
+            },
+            "name": "JUnit",
+            "website": "http://junit.org",
+            "licenses": [
+                "EPL-1.0"
+            ],
+            "organization": {
+                "url": "http://www.junit.org",
+                "name": "JUnit"
+            }
+        },
+        {
+            "uniqueId": "net.lingala.zip4j:zip4j",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Srikanth Reddy Lingala"
+                }
+            ],
+            "artifactVersion": "2.11.5",
+            "description": "Zip4j - A Java library for zip files and streams",
+            "scm": {
+                "url": "git@github.com:srikanth-lingala/zip4j.git"
+            },
+            "name": "Zip4j",
+            "website": "https://github.com/srikanth-lingala/zip4j",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.bouncycastle:bcprov-jdk18on",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Legion of the Bouncy Castle Inc."
+                }
+            ],
+            "artifactVersion": "1.80",
+            "description": "The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains the JCA/JCE provider and low-level API for the BC Java version 1.80 for Java 8 and later.",
+            "scm": {
+                "url": "https://github.com/bcgit/bc-java"
+            },
+            "name": "Bouncy Castle Provider",
+            "website": "https://www.bouncycastle.org/download/bouncy-castle-java/",
+            "licenses": [
+                "73252b46f36df25ef51a7994de439aea"
+            ]
+        },
+        {
+            "uniqueId": "org.checkerframework:checker-qual",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.cs.washington.edu/",
+                    "name": "Michael Ernst"
+                },
+                {
+                    "organisationUrl": "http://uwaterloo.ca/",
+                    "name": "Werner M. Dietl"
+                },
+                {
+                    "organisationUrl": "https://www.cs.washington.edu/research/plse/",
+                    "name": "Suzanne Millstein"
+                }
+            ],
+            "artifactVersion": "2.5.5",
+            "description": "Checker Qual is the set of annotations (qualifiers) and supporting classes\n        used by the Checker Framework to type check Java source code.  Please\n        see artifact:\n        org.checkerframework:checker",
+            "scm": {
+                "connection": "https://github.com/typetools/checker-framework.git",
+                "url": "https://github.com/typetools/checker-framework.git"
+            },
+            "name": "Checker Qual",
+            "website": "https://checkerframework.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.conscrypt:conscrypt-openjdk-uber",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.google.com",
+                    "name": "Conscrypt Contributors"
+                }
+            ],
+            "artifactVersion": "2.5.2",
+            "description": "Conscrypt: OpenJdk UberJAR",
+            "scm": {
+                "connection": "scm:git:https://github.com/google/conscrypt.git",
+                "url": "https://github.com/google/conscrypt",
+                "developerConnection": "scm:git:git@github.com:google/conscrypt.git"
+            },
+            "name": "org.conscrypt:conscrypt-openjdk-uber",
+            "website": "https://conscrypt.org/",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.hamcrest:hamcrest",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Joe Walnes"
+                },
+                {
+                    "name": "Nat Pryce"
+                },
+                {
+                    "name": "Steve Freeman"
+                }
+            ],
+            "artifactVersion": "2.2",
+            "description": "Core API and libraries of hamcrest matcher framework.",
+            "scm": {
+                "connection": "git@github.com:hamcrest/JavaHamcrest.git",
+                "url": "https://github.com/hamcrest/JavaHamcrest"
+            },
+            "name": "Hamcrest",
+            "website": "http://hamcrest.org/JavaHamcrest/",
+            "licenses": [
+                "BSD-3-Clause"
+            ]
+        },
+        {
+            "uniqueId": "org.hamcrest:hamcrest-core",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Joe Walnes"
+                },
+                {
+                    "name": "Nat Pryce"
+                },
+                {
+                    "name": "Steve Freeman"
+                }
+            ],
+            "artifactVersion": "2.2",
+            "description": "Core Hamcrest API - deprecated, please use \"hamcrest\" instead",
+            "scm": {
+                "connection": "git@github.com:hamcrest/JavaHamcrest.git",
+                "url": "https://github.com/hamcrest/JavaHamcrest"
+            },
+            "name": "Hamcrest Core",
+            "website": "http://hamcrest.org/JavaHamcrest/",
+            "licenses": [
+                "BSD-3-Clause"
+            ]
+        },
+        {
+            "uniqueId": "org.hamcrest:hamcrest-library",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Joe Walnes"
+                },
+                {
+                    "name": "Nat Pryce"
+                },
+                {
+                    "name": "Steve Freeman"
+                }
+            ],
+            "artifactVersion": "2.2",
+            "description": "A library of Hamcrest matchers - deprecated, please use \"hamcrest\" instead",
+            "scm": {
+                "connection": "git@github.com:hamcrest/JavaHamcrest.git",
+                "url": "https://github.com/hamcrest/JavaHamcrest"
+            },
+            "name": "Hamcrest Library",
+            "website": "http://hamcrest.org/JavaHamcrest/",
+            "licenses": [
+                "BSD-3-Clause"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlin:kotlin-bom",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "1.8.22",
+            "description": "Kotlin is a statically typed programming language that compiles to JVM byte codes and JavaScript",
+            "scm": {
+                "connection": "scm:git:https://github.com/JetBrains/kotlin.git",
+                "url": "https://github.com/JetBrains/kotlin",
+                "developerConnection": "scm:git:https://github.com/JetBrains/kotlin.git"
+            },
+            "name": "Kotlin Libraries bill-of-materials",
+            "website": "https://kotlinlang.org/",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlin:kotlin-stdlib",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "Kotlin Team"
+                }
+            ],
+            "artifactVersion": "2.1.10",
+            "description": "Kotlin Standard Library",
+            "scm": {
+                "connection": "scm:git:https://github.com/JetBrains/kotlin.git",
+                "url": "https://github.com/JetBrains/kotlin",
+                "developerConnection": "scm:git:https://github.com/JetBrains/kotlin.git"
+            },
+            "name": "Kotlin Stdlib",
+            "website": "https://kotlinlang.org/",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "0.3.7",
+            "description": "Kotlin Immutable Collections multiplatform library",
+            "scm": {
+                "url": "https://github.com/Kotlin/kotlinx.collections.immutable"
+            },
+            "name": "kotlinx-collections-immutable",
+            "website": "https://github.com/Kotlin/kotlinx.collections.immutable",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlinx:kotlinx-coroutines-android",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "1.8.1",
+            "description": "Coroutines support libraries for Kotlin",
+            "scm": {
+                "url": "https://github.com/Kotlin/kotlinx.coroutines"
+            },
+            "name": "kotlinx-coroutines-android",
+            "website": "https://github.com/Kotlin/kotlinx.coroutines",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlinx:kotlinx-coroutines-bom",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "1.8.1",
+            "description": "Coroutines support libraries for Kotlin",
+            "scm": {
+                "url": "https://github.com/Kotlin/kotlinx.coroutines"
+            },
+            "name": "kotlinx-coroutines-bom",
+            "website": "https://github.com/Kotlin/kotlinx.coroutines",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "1.8.1",
+            "description": "Coroutines support libraries for Kotlin",
+            "scm": {
+                "url": "https://github.com/Kotlin/kotlinx.coroutines"
+            },
+            "name": "kotlinx-coroutines-core",
+            "website": "https://github.com/Kotlin/kotlinx.coroutines",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlinx:kotlinx-serialization-bom",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "1.7.3",
+            "description": "Kotlin multiplatform serialization runtime library",
+            "scm": {
+                "url": "https://github.com/Kotlin/kotlinx.serialization"
+            },
+            "name": "kotlinx-serialization-bom",
+            "website": "https://github.com/Kotlin/kotlinx.serialization",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "1.7.3",
+            "description": "Kotlin multiplatform serialization runtime library",
+            "scm": {
+                "url": "https://github.com/Kotlin/kotlinx.serialization"
+            },
+            "name": "kotlinx-serialization-core",
+            "website": "https://github.com/Kotlin/kotlinx.serialization",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "1.7.3",
+            "description": "Kotlin multiplatform serialization runtime library",
+            "scm": {
+                "url": "https://github.com/Kotlin/kotlinx.serialization"
+            },
+            "name": "kotlinx-serialization-json",
+            "website": "https://github.com/Kotlin/kotlinx.serialization",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.jetbrains:annotations",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "https://www.jetbrains.com",
+                    "name": "JetBrains Team"
+                }
+            ],
+            "artifactVersion": "23.0.0",
+            "description": "A set of annotations used for code inspection support and code documentation.",
+            "scm": {
+                "connection": "scm:git:git://github.com/JetBrains/java-annotations.git",
+                "url": "https://github.com/JetBrains/java-annotations",
+                "developerConnection": "scm:git:ssh://github.com:JetBrains/java-annotations.git"
+            },
+            "name": "JetBrains Java Annotations",
+            "website": "https://github.com/JetBrains/java-annotations",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.json:json",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Douglas Crockford"
+                }
+            ],
+            "artifactVersion": "20250517",
+            "description": "JSON is a light-weight, language independent, data interchange format.\n        See http://www.JSON.org/\n\n        The files in this package implement JSON encoders/decoders in Java.\n        It also includes the capability to convert between JSON and XML, HTTP\n        headers, Cookies, and CDL.\n\n        This is a reference implementation. There are a large number of JSON packages\n        in Java. Perhaps someday the Java community will standardize on one. Until\n        then, choose carefully.",
+            "scm": {
+                "connection": "scm:git:git://github.com/douglascrockford/JSON-java.git",
+                "url": "https://github.com/douglascrockford/JSON-java.git",
+                "developerConnection": "scm:git:git@github.com:douglascrockford/JSON-java.git"
+            },
+            "name": "JSON in Java",
+            "website": "https://github.com/douglascrockford/JSON-java",
+            "licenses": [
+                "2eb05b85f440c8e759fccbda7eb4f77e"
+            ]
+        },
+        {
+            "uniqueId": "org.jsoup:jsoup",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Jonathan Hedley"
+                }
+            ],
+            "artifactVersion": "1.12.2",
+            "description": "jsoup is a Java library for working with real-world HTML. It provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jquery-like methods. jsoup implements the WHATWG HTML5 specification, and parses HTML to the same DOM as modern browsers do.",
+            "scm": {
+                "connection": "scm:git:https://github.com/jhy/jsoup.git",
+                "url": "https://github.com/jhy/jsoup"
+            },
+            "name": "jsoup Java HTML Parser",
+            "website": "https://jsoup.org/",
+            "licenses": [
+                "MIT"
+            ],
+            "organization": {
+                "url": "https://jhy.io/",
+                "name": "Jonathan Hedley"
+            }
+        },
+        {
+            "uniqueId": "org.jspecify:jspecify",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Kevin Bourrillion"
+                }
+            ],
+            "artifactVersion": "1.0.0",
+            "description": "An artifact of well-named and well-specified annotations to power static analysis checks",
+            "scm": {
+                "connection": "scm:git:git@github.com:jspecify/jspecify.git",
+                "url": "https://github.com/jspecify/jspecify/",
+                "developerConnection": "scm:git:git@github.com:jspecify/jspecify.git"
+            },
+            "name": "JSpecify annotations",
+            "website": "http://jspecify.org/",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.ow2.asm:asm",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Eric Bruneton"
+                },
+                {
+                    "name": "Eugene Kuleshov"
+                },
+                {
+                    "name": "Remi Forax"
+                }
+            ],
+            "artifactVersion": "9.7.1",
+            "description": "ASM, a very small and fast Java bytecode manipulation framework",
+            "scm": {
+                "connection": "scm:git:https://gitlab.ow2.org/asm/asm/",
+                "url": "https://gitlab.ow2.org/asm/asm/",
+                "developerConnection": "scm:git:https://gitlab.ow2.org/asm/asm/"
+            },
+            "name": "asm",
+            "website": "http://asm.ow2.io/",
+            "licenses": [
+                "BSD-3-Clause"
+            ],
+            "organization": {
+                "url": "http://www.ow2.org/",
+                "name": "OW2"
+            }
+        },
+        {
+            "uniqueId": "org.ow2.asm:asm-analysis",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Eric Bruneton"
+                },
+                {
+                    "name": "Eugene Kuleshov"
+                },
+                {
+                    "name": "Remi Forax"
+                }
+            ],
+            "artifactVersion": "9.7.1",
+            "description": "Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework",
+            "scm": {
+                "connection": "scm:git:https://gitlab.ow2.org/asm/asm/",
+                "url": "https://gitlab.ow2.org/asm/asm/",
+                "developerConnection": "scm:git:https://gitlab.ow2.org/asm/asm/"
+            },
+            "name": "asm-analysis",
+            "website": "http://asm.ow2.io/",
+            "licenses": [
+                "BSD-3-Clause"
+            ],
+            "organization": {
+                "url": "http://www.ow2.org/",
+                "name": "OW2"
+            }
+        },
+        {
+            "uniqueId": "org.ow2.asm:asm-commons",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Eric Bruneton"
+                },
+                {
+                    "name": "Eugene Kuleshov"
+                },
+                {
+                    "name": "Remi Forax"
+                }
+            ],
+            "artifactVersion": "9.7.1",
+            "description": "Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework",
+            "scm": {
+                "connection": "scm:git:https://gitlab.ow2.org/asm/asm/",
+                "url": "https://gitlab.ow2.org/asm/asm/",
+                "developerConnection": "scm:git:https://gitlab.ow2.org/asm/asm/"
+            },
+            "name": "asm-commons",
+            "website": "http://asm.ow2.io/",
+            "licenses": [
+                "BSD-3-Clause"
+            ],
+            "organization": {
+                "url": "http://www.ow2.org/",
+                "name": "OW2"
+            }
+        },
+        {
+            "uniqueId": "org.ow2.asm:asm-tree",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Eric Bruneton"
+                },
+                {
+                    "name": "Eugene Kuleshov"
+                },
+                {
+                    "name": "Remi Forax"
+                }
+            ],
+            "artifactVersion": "9.7.1",
+            "description": "Tree API of ASM, a very small and fast Java bytecode manipulation framework",
+            "scm": {
+                "connection": "scm:git:https://gitlab.ow2.org/asm/asm/",
+                "url": "https://gitlab.ow2.org/asm/asm/",
+                "developerConnection": "scm:git:https://gitlab.ow2.org/asm/asm/"
+            },
+            "name": "asm-tree",
+            "website": "http://asm.ow2.io/",
+            "licenses": [
+                "BSD-3-Clause"
+            ],
+            "organization": {
+                "url": "http://www.ow2.org/",
+                "name": "OW2"
+            }
+        },
+        {
+            "uniqueId": "org.ow2.asm:asm-util",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Eric Bruneton"
+                },
+                {
+                    "name": "Eugene Kuleshov"
+                },
+                {
+                    "name": "Remi Forax"
+                }
+            ],
+            "artifactVersion": "9.7.1",
+            "description": "Utilities for ASM, a very small and fast Java bytecode manipulation framework",
+            "scm": {
+                "connection": "scm:git:https://gitlab.ow2.org/asm/asm/",
+                "url": "https://gitlab.ow2.org/asm/asm/",
+                "developerConnection": "scm:git:https://gitlab.ow2.org/asm/asm/"
+            },
+            "name": "asm-util",
+            "website": "http://asm.ow2.io/",
+            "licenses": [
+                "BSD-3-Clause"
+            ],
+            "organization": {
+                "url": "http://www.ow2.org/",
+                "name": "OW2"
+            }
+        },
+        {
+            "uniqueId": "org.robolectric:annotations",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "annotations",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:junit",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "junit",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:nativeruntime",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "nativeruntime",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:nativeruntime-dist-compat",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "The Android Open Source Projects"
+                }
+            ],
+            "artifactVersion": "1.0.16",
+            "description": "Robolectric Nativeruntime Distribution Compat",
+            "scm": {
+                "connection": "https://android.googlesource.com/platform/manifest.git",
+                "url": "https://android.googlesource.com/platform/manifest.git"
+            },
+            "name": "Robolectric Nativeruntime Distribution Compat",
+            "website": "https://source.android.com/",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:pluginapi",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "pluginapi",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:plugins-maven-dependency-resolver",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "maven-dependency-resolver",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:resources",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "resources",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:robolectric",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "robolectric",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:sandbox",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "sandbox",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:shadowapi",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "shadowapi",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:shadows-framework",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "framework",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:utils",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "utils",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.robolectric:utils-reflector",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Brett Chabot"
+                },
+                {
+                    "organisationUrl": "http://google.com",
+                    "name": "Michael Hoisie"
+                },
+                {
+                    "name": "Christian Williams"
+                }
+            ],
+            "artifactVersion": "4.14.1",
+            "description": "An alternative Android testing framework.",
+            "scm": {
+                "connection": "scm:git:git://github.com/robolectric/robolectric.git",
+                "url": "git@github.com:robolectric/robolectric.git",
+                "developerConnection": "scm:git:https://github.com/robolectric/robolectric.git"
+            },
+            "name": "reflector",
+            "website": "http://robolectric.org",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.simpleflatmapper:lightning-csv",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Arnaud Roger"
+                }
+            ],
+            "artifactVersion": "8.2.3",
+            "description": "Java library to map flat record - ResultSet, csv - to java object with minimum configuration and low footprint.",
+            "scm": {
+                "connection": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/lightning-csv",
+                "url": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/lightning-csv",
+                "developerConnection": "scm:git:git@github.com:arnaudroger/SimpleFlatMapper.git/lightning-csv"
+            },
+            "name": "lightning-csv",
+            "website": "http://github.com/arnaudroger/SimpleFlatMapper/lightning-csv",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.simpleflatmapper:ow2-asm",
+            "funding": [
+                
+            ],
+            "developers": [
+                
+            ],
+            "artifactVersion": "6.2",
+            "description": "Java library to map flat record - ResultSet, csv - to java object with minimum configuration and low\n        footprint.",
+            "scm": {
+                "connection": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git",
+                "url": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git",
+                "developerConnection": "scm:git:git@github.com:arnaudroger/SimpleFlatMapper.git"
+            },
+            "name": "Repackaged OW2 ASM Core",
+            "website": "http://github.com/arnaudroger/SimpleFlatMapper",
+            "licenses": [
+                "c7cabdb83e11115cd5e288a296a76df7"
+            ]
+        },
+        {
+            "uniqueId": "org.simpleflatmapper:sfm-converter",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Arnaud Roger"
+                }
+            ],
+            "artifactVersion": "8.2.3",
+            "description": "Java library to map flat record - ResultSet, csv - to java object with minimum configuration and low footprint.",
+            "scm": {
+                "connection": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-converter",
+                "url": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-converter",
+                "developerConnection": "scm:git:git@github.com:arnaudroger/SimpleFlatMapper.git/sfm-converter"
+            },
+            "name": "sfm-converter",
+            "website": "http://github.com/arnaudroger/SimpleFlatMapper/sfm-converter",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.simpleflatmapper:sfm-csv",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Arnaud Roger"
+                }
+            ],
+            "artifactVersion": "8.2.3",
+            "description": "Java library to map flat record - ResultSet, csv - to java object with minimum configuration and low footprint.",
+            "scm": {
+                "connection": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-csv",
+                "url": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-csv",
+                "developerConnection": "scm:git:git@github.com:arnaudroger/SimpleFlatMapper.git/sfm-csv"
+            },
+            "name": "sfm-csv",
+            "website": "http://github.com/arnaudroger/SimpleFlatMapper/sfm-csv",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.simpleflatmapper:sfm-map",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Arnaud Roger"
+                }
+            ],
+            "artifactVersion": "8.2.3",
+            "description": "Java library to map flat record - ResultSet, csv - to java object with minimum configuration and low footprint.",
+            "scm": {
+                "connection": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-map",
+                "url": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-map",
+                "developerConnection": "scm:git:git@github.com:arnaudroger/SimpleFlatMapper.git/sfm-map"
+            },
+            "name": "sfm-map",
+            "website": "http://github.com/arnaudroger/SimpleFlatMapper/sfm-map",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.simpleflatmapper:sfm-reflect",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Arnaud Roger"
+                }
+            ],
+            "artifactVersion": "8.2.3",
+            "description": "Java library to map flat record - ResultSet, csv - to java object with minimum configuration and low footprint.",
+            "scm": {
+                "connection": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-reflect",
+                "url": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-reflect",
+                "developerConnection": "scm:git:git@github.com:arnaudroger/SimpleFlatMapper.git/sfm-reflect"
+            },
+            "name": "sfm-reflect",
+            "website": "http://github.com/arnaudroger/SimpleFlatMapper/sfm-reflect",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.simpleflatmapper:sfm-tuples",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Arnaud Roger"
+                }
+            ],
+            "artifactVersion": "8.2.3",
+            "description": "Java library to map flat record - ResultSet, csv - to java object with minimum configuration and low footprint.",
+            "scm": {
+                "connection": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-tuples",
+                "url": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-tuples",
+                "developerConnection": "scm:git:git@github.com:arnaudroger/SimpleFlatMapper.git/sfm-tuples"
+            },
+            "name": "sfm-tuples",
+            "website": "http://github.com/arnaudroger/SimpleFlatMapper/sfm-tuples",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.simpleflatmapper:sfm-util",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Arnaud Roger"
+                }
+            ],
+            "artifactVersion": "8.2.3",
+            "description": "Java library to map flat record - ResultSet, csv - to java object with minimum configuration and low footprint.",
+            "scm": {
+                "connection": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-util",
+                "url": "scm:git:git://github.com/arnaudroger/SimpleFlatMapper.git/sfm-util",
+                "developerConnection": "scm:git:git@github.com:arnaudroger/SimpleFlatMapper.git/sfm-util"
+            },
+            "name": "sfm-util",
+            "website": "http://github.com/arnaudroger/SimpleFlatMapper/sfm-util",
+            "licenses": [
+                "MIT"
+            ]
+        },
+        {
+            "uniqueId": "org.yaml:snakeyaml",
+            "funding": [
+                
+            ],
+            "developers": [
+                {
+                    "name": "Andrey Somov"
+                },
+                {
+                    "name": "Alexander Maslov"
+                }
+            ],
+            "artifactVersion": "2.3",
+            "description": "YAML 1.1 parser and emitter for Java",
+            "scm": {
+                "connection": "scm:git:http://bitbucket.org/snakeyaml/snakeyaml",
+                "url": "https://bitbucket.org/snakeyaml/snakeyaml/src",
+                "developerConnection": "scm:git:ssh://git@bitbucket.org/snakeyaml/snakeyaml"
+            },
+            "name": "SnakeYAML",
+            "website": "https://bitbucket.org/snakeyaml/snakeyaml",
+            "licenses": [
+                "Apache-2.0"
+            ]
+        }
+    ],
+    "licenses": {
+        "2eb05b85f440c8e759fccbda7eb4f77e": {
+            "hash": "2eb05b85f440c8e759fccbda7eb4f77e",
+            "url": "https://github.com/stleary/JSON-java/blob/master/LICENSE",
+            "name": "Public Domain"
+        },
+        "3ca920d1875f7ad7ab04a2a331958577": {
+            "hash": "3ca920d1875f7ad7ab04a2a331958577",
+            "internalHash": "3ca920d1875f7ad7ab04a2a331958577",
+            "url": "https://github.com/guardianproject/TrustedIntents/blob/master/LICENSE.txt",
+            "name": "LGPLv2.1"
+        },
+        "44d1a25c593283261968a15c8cc213cd": {
+            "hash": "44d1a25c593283261968a15c8cc213cd",
+            "url": "https://chromium.googlesource.com/libyuv/libyuv/+/refs/heads/main/README.chromium",
+            "name": "BSD License"
+        },
+        "5be2dcb917a8d00d01258ff45d1f55b2": {
+            "hash": "5be2dcb917a8d00d01258ff45d1f55b2",
+            "url": "https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE",
+            "name": "Unicode-3.0"
+        },
+        "73252b46f36df25ef51a7994de439aea": {
+            "hash": "73252b46f36df25ef51a7994de439aea",
+            "url": "https://www.bouncycastle.org/licence.html",
+            "name": "Bouncy Castle Licence"
+        },
+        "Apache-2.0": {
+            "content": "Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n\"License\" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.\n\n\"Licensor\" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.\n\n\"Legal Entity\" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, \"control\" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.\n\n\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising permissions granted by this License.\n\n\"Source\" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.\n\n\"Object\" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.\n\n\"Work\" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).\n\n\"Derivative Works\" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.\n\n\"Contribution\" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, \"submitted\" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as \"Not a Contribution.\"\n\n\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.\n\n2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.\n\n3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.\n\n4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:\n\n     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and\n\n     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and\n\n     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and\n\n     (d) If the Work includes a \"NOTICE\" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.\n\n     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.\n\n5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.\n\n6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.\n\n8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work.\n\nTo apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets \"[]\" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same \"printed page\" as the copyright notice for easier identification within third-party archives.\n\nCopyright [yyyy] [name of copyright owner]\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.",
+            "hash": "Apache-2.0",
+            "internalHash": "Apache-2.0",
+            "url": "https://spdx.org/licenses/Apache-2.0.html",
+            "spdxId": "Apache-2.0",
+            "name": "Apache License 2.0"
+        },
+        "BSD-2-Clause": {
+            "content": "Copyright (c) <<var;name=copyright;original= <year> <owner>;match=.+>> All rights reserved.\n\nRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. \n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY <<var;name=copyrightHolderAsIs;original=THE COPYRIGHT HOLDERS AND CONTRIBUTORS;match=.+>> \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <<var;name=copyrightHolderLiability;original=THE COPYRIGHT HOLDER OR CONTRIBUTORS;match=.+>> BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+            "hash": "BSD-2-Clause",
+            "internalHash": "BSD-2-Clause",
+            "url": "https://spdx.org/licenses/BSD-2-Clause.html",
+            "spdxId": "BSD-2-Clause",
+            "name": "BSD 2-Clause \"Simplified\" License"
+        },
+        "BSD-3-Clause": {
+            "content": "Copyright (c) <<var;name=copyright;original= <year> <owner>;match=.+>>. All rights reserved. \n\nRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. \n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. \n\n3. Neither the name of <<var;name=organizationClause3;original=the copyright holder;match=.+>> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY <<var;name=copyrightHolderAsIs;original=THE COPYRIGHT HOLDERS AND CONTRIBUTORS;match=.+>> \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <<var;name=copyrightHolderLiability;original=THE COPYRIGHT HOLDER OR CONTRIBUTORS;match=.+>> BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ",
+            "hash": "BSD-3-Clause",
+            "internalHash": "BSD-3-Clause",
+            "url": "https://spdx.org/licenses/BSD-3-Clause.html",
+            "spdxId": "BSD-3-Clause",
+            "name": "BSD 3-Clause \"New\" or \"Revised\" License"
+        },
+        "EPL-1.0": {
+            "content": "Eclipse Public License - v 1.0\n\nTHE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (\"AGREEMENT\"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.\n\n1. DEFINITIONS\n\n\"Contribution\" means:\n     a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and\n     b) in the case of each subsequent Contributor:\n          i) changes to the Program, and\n          ii) additions to the Program;\n\nwhere such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.\n\"Contributor\" means any person or entity that distributes the Program.\n\n\"Licensed Patents\" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.\n\n\"Program\" means the Contributions distributed in accordance with this Agreement.\n\n\"Recipient\" means anyone who receives the Program under this Agreement, including all Contributors.\n\n2. GRANT OF RIGHTS\n\n     a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.\n \n     b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.\n\n     c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.\n\n     d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.\n\n3. REQUIREMENTS\nA Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:\n\n     a) it complies with the terms and conditions of this Agreement; and\n \n     b) its license agreement:\n          i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;\n          ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;\n          iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and\n          iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.\n\nWhen the Program is made available in source code form:\n\n     a) it must be made available under this Agreement; and\n\n     b) a copy of this Agreement must be included with each copy of the Program.\nContributors may not remove or alter any copyright notices contained within the Program.\n\nEach Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.\n\n4. COMMERCIAL DISTRIBUTION\nCommercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (\"Commercial Contributor\") hereby agrees to defend and indemnify every other Contributor (\"Indemnified Contributor\") against any losses, damages and costs (collectively \"Losses\") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.\n\nFor example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.\n\n5. NO WARRANTY\nEXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.\n\n6. DISCLAIMER OF LIABILITY\nEXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\n\n7. GENERAL\n\nIf any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.\n\nIf Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.\n\nAll Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.\n\nEveryone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.\n\nThis Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.",
+            "hash": "EPL-1.0",
+            "internalHash": "EPL-1.0",
+            "url": "https://spdx.org/licenses/EPL-1.0.html",
+            "spdxId": "EPL-1.0",
+            "name": "Eclipse Public License 1.0"
+        },
+        "MIT": {
+            "content": "MIT License\n\nCopyright (c) <year> <copyright holders>\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.",
+            "hash": "MIT",
+            "internalHash": "MIT",
+            "url": "https://spdx.org/licenses/MIT.html",
+            "spdxId": "MIT",
+            "name": "MIT License"
+        },
+        "c7cabdb83e11115cd5e288a296a76df7": {
+            "hash": "c7cabdb83e11115cd5e288a296a76df7",
+            "url": "https://asm.ow2.io/license.html",
+            "name": "BSD License"
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/raw/glide_license.txt b/app/src/main/res/raw/glide_license.txt
deleted file mode 100644
index 441c3743..00000000
--- a/app/src/main/res/raw/glide_license.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-License for everything not in third_party and not otherwise marked:
-
-Copyright 2014 Google, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, this list of
-         conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright notice, this list
-         of conditions and the following disclaimer in the documentation and/or other materials
-         provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those of the
-authors and should not be interpreted as representing official policies, either expressed
-or implied, of Google, Inc.
----------------------------------------------------------------------------------------------
-License for third_party/disklrucache:
-
-Copyright 2012 Jake Wharton
-Copyright 2011 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
----------------------------------------------------------------------------------------------
-License for third_party/gif_decoder:
-
-Copyright (c) 2013 Xcellent Creations, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
----------------------------------------------------------------------------------------------
-License for third_party/gif_encoder/AnimatedGifEncoder.java and
-third_party/gif_encoder/LZWEncoder.java:
-
-No copyright asserted on the source code of this class. May be used for any
-purpose, however, refer to the Unisys LZW patent for restrictions on use of
-the associated LZWEncoder class. Please forward any corrections to
-kweiner@fmsware.com.
-
------------------------------------------------------------------------------
-License for third_party/gif_encoder/NeuQuant.java
-
-Copyright (c) 1994 Anthony Dekker
-
-NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. See
-"Kohonen neural networks for optimal colour quantization" in "Network:
-Computation in Neural Systems" Vol. 5 (1994) pp 351-367. for a discussion of
-the algorithm.
-
-Any party obtaining a copy of these files from the author, directly or
-indirectly, is granted, free of charge, a full and unrestricted irrevocable,
-world-wide, paid up, royalty-free, nonexclusive right and license to deal in
-this software and documentation files (the "Software"), including without
-limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons who
-receive copies from any such party to do so, with the only requirement being
-that this copyright notice remain intact.
\ No newline at end of file
diff --git a/app/src/main/res/raw/notices.xml b/app/src/main/res/raw/notices.xml
deleted file mode 100644
index 8d4d2a63..00000000
--- a/app/src/main/res/raw/notices.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<notices>
-    <notice>
-        <name>Android Jetpack Libraries</name>
-        <url>https://developer.android.com/jetpack/androidx</url>
-        <copyright>Copyright (C) 2020 The Android Open Source Project</copyright>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>Bouncy Castle</name>
-        <url>https://www.bouncycastle.org/</url>
-        <copyright>Copyright (c) 2000-2020 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)</copyright>
-        <license>MIT License</license>
-    </notice>
-    <notice>
-        <name>CircleImageView</name>
-        <url>https://github.com/hdodenhof/CircleImageView</url>
-        <copyright>Copyright 2014 - 2019 Henning Dodenhof</copyright>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>FloatingActionButton</name>
-        <url>https://github.com/futuresimple/android-floating-action-button</url>
-        <copyright>Copyright 2014 Jerzy Chalupski</copyright>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>Guava</name>
-        <url>https://github.com/google/guava</url>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>Glide</name>
-        <url>https://github.com/bumptech/glide</url>
-        <license>Glide License</license>
-    </notice>
-    <notice>
-        <name>Iconics</name>
-        <url>https://github.com/mikepenz/Android-Iconics</url>
-        <copyright/>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>Krop</name>
-        <url>https://github.com/avito-tech/krop</url>
-        <copyright>Copyright (c) 2017 Avito Technology</copyright>
-        <license>MIT License</license>
-    </notice>
-    <notice>
-        <name>libsu</name>
-        <url>https://github.com/topjohnwu/libsu</url>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>LicensesDialog</name>
-        <url>https://github.com/PSDev/LicensesDialog</url>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>Material Components for Android</name>
-        <url>https://github.com/material-components/material-components-android</url>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>Protocol Buffers</name>
-        <url>https://github.com/protocolbuffers/protobuf/tree/master/java</url>
-        <license>Protocol Buffers License</license>
-    </notice>
-    <notice>
-        <name>Simple Flat Mapper</name>
-        <url>https://github.com/arnaudroger/SimpleFlatMapper</url>
-        <copyright>Copyright (c) 2014 Arnaud Roger</copyright>
-        <license>MIT License</license>
-    </notice>
-    <notice>
-        <name>TextDrawable</name>
-        <url>https://github.com/amulyakhare/TextDrawable</url>
-        <copyright>Copyright (C) 2014 Amulya Khare</copyright>
-        <license>MIT License</license>
-    </notice>
-    <notice>
-        <name>Trusted Intents</name>
-        <url>https://github.com/guardianproject/TrustedIntents</url>
-        <license>GNU Lesser General Public License 2.1</license>
-    </notice>
-    <notice>
-        <name>Zip4j</name>
-        <url>https://github.com/srikanth-lingala/zip4j</url>
-        <license>Apache Software License 2.0</license>
-    </notice>
-    <notice>
-        <name>zxcvbn4j</name>
-        <url>https://github.com/nulab/zxcvbn4j</url>
-        <copyright>Copyright (c) 2014 Nulab Inc</copyright>
-        <license>MIT License</license>
-    </notice>
-    <notice>
-        <name>ZXing Buffers</name>
-        <url>https://github.com/zxing/zxing</url>
-        <license>Apache Software License 2.0</license>
-    </notice>
-</notices>
\ No newline at end of file
diff --git a/app/src/main/res/raw/protobuf_license.txt b/app/src/main/res/raw/protobuf_license.txt
deleted file mode 100644
index 19b305b0..00000000
--- a/app/src/main/res/raw/protobuf_license.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright 2008 Google Inc.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it.  This code is not
-standalone and requires a support library to be linked with it.  This
-support library is itself covered by the above license.
diff --git a/app/src/main/res/values-ar-rSA-v29/strings.xml b/app/src/main/res/values-ar-rSA-v29/strings.xml
new file mode 100644
index 00000000..16c787ff
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">الإفتراضي للنظام</string>
+    <string name="system_amoled_theme_title">افتراضي النظام (أموليد AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index ad9b69e5..0f553348 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">الإعدادات</string>
-    <string name="action_about">عن</string>
-    <string name="action_delete">حذف</string>
-    <string name="action_transfer">نقل</string>
-    <string name="action_edit_icon">تعديل الأيقونة</string>
-    <string name="action_reset_usage_count">تصفير عداد التصويت</string>
-    <string name="action_reset_usage_count_dialog">هل أنت متأكد من أنك تريد تعيين عدد الاستخدام لهذا الإدخال إلى 0؟</string>
-    <string name="action_default_icon">استعادة الأيقونة الافتراضية</string>
+    <string name="action_about">عنّا</string>
+    <string name="action_delete">احذف</string>
+    <string name="action_transfer">انقل</string>
+    <string name="action_edit_icon">حرّر الأيقونة</string>
+    <string name="action_reset_usage_count">صفّر عداد الاستخدام</string>
+    <string name="action_reset_usage_count_dialog">هل أنت متأكد من رغبتك في تعيين عدد الاستخدام لهذا الإدخال إلى 0؟</string>
+    <string name="action_default_icon">استعد الأيقونة الافتراضية</string>
     <string name="discard">تجاهل</string>
-    <string name="save">حفظ</string>
+    <string name="save">احفظ</string>
+    <string name="all">الكل</string>
     <string name="issuer">المصدِّر</string>
     <string name="yandex_pin">رمز PIN (يتكون من 4-16 رقمًا)</string>
     <string name="motp_pin">رمز PIN (4 أرقام)</string>
@@ -21,28 +22,37 @@
     <string name="pref_cat_backups_android">أندرويد</string>
     <string name="pref_cat_backups_auto">نسخ أحتياطي تلقائي</string>
     <string name="pref_section_behavior_title">السلوك</string>
-    <string name="pref_section_behavior_summary">تخصيص السلوك عند التفاعل مع قائمة الإدخالات.</string>
+    <string name="pref_section_behavior_summary">خصِص السلوك عند التفاعل مع قائمة الإدخالات.</string>
     <string name="pref_section_appearance_title">المظهر</string>
-    <string name="pref_section_appearance_summary">ضبط السمة واللغة والإعدادات الأخرى التي تؤثر على مظهر التطبيق.</string>
+    <string name="pref_section_appearance_summary">اضبط السِمة واللغة والإعدادات الأخرى التي تؤثر على مظهر التطبيق.</string>
     <string name="pref_section_security_title">الحماية</string>
-    <string name="pref_section_security_summary">ضبط التشفير، الفتح البيومتري، القفل التلقائي وإعدادات الأمان الأخرى.</string>
-    <string name="pref_section_import_export_title">إستيراد &amp; تصدير</string>
+    <string name="pref_section_security_summary">اضبط التشفير، وفك القفل البيومتري، والقفل التلقائي وإعدادات الأمان الأخرى.</string>
+    <string name="pref_section_import_export_title">استيراد &amp; تصدير</string>
     <string name="pref_section_import_export_summary">استيراد النسخ الاحتياطية من Aegis أو من تطبيقات مصادقة أخرى. إنشاء تصدير يدوي لمخزن Aegis.</string>
-    <string name="pref_section_backups_title">النُّسَخ الإحتياطية</string>
-    <string name="pref_section_backups_summary">إعداد نسخٍ احتياطي تلقائي إلى موقع من اختيارك، أو تفعيل المشاركة في نظام النسخ الاحتياطي السحابي للأندرويد.</string>
-    <string name="pref_section_icon_packs">حزمة الأيقونات</string>
-    <string name="pref_section_icon_packs_summary">إدارة واستيراد حزمة الأيقونات</string>
-    <string name="pref_select_theme_title">النمط</string>
-    <string name="pref_view_mode_title">وضع العرض</string>
+    <string name="pref_section_audit_log_title">سجل المراجعة</string>
+    <string name="pref_section_audit_log_summary">العثور على قائمة بجميع الأحداث الهامة المبلغ عنها التي حدثت داخل التطبيق.</string>
+    <string name="pref_section_backups_title">نُسخ احتياطية</string>
+    <string name="pref_section_backups_summary">أنشئ نسخ احتياطية تلقائية إلى موقع من اختيارك أو فَعِّل المشاركة في نظام النسخ الاحتياطي السحابي للأندرويد.</string>
+    <string name="pref_section_icon_packs">حزم الأيقونات</string>
+    <string name="pref_section_icon_packs_summary">أدِر واستورد حزم الأيقونات</string>
+    <string name="pref_select_theme_title">سِمة</string>
+    <string name="pref_dynamic_colors_title">ألوان ديناميكية</string>
+    <string name="pref_dynamic_colors_summary">قم بتطبيق تراكب يعتمد على ألوان سمة الأندرويد الخاصة بك</string>
+    <string name="pref_view_mode_title">نمط العرض</string>
     <string name="pref_lang_title">اللغة</string>
-    <string name="pref_show_icons_title">إظهار الأيقونات</string>
-    <string name="pref_show_icons_summary">عرض الأيقونات بجانب كل مدخل</string>
-    <string name="pref_code_group_size_title">تجميع أرقام الكود</string>
-    <string name="pref_code_group_size_summary">اختر عدد الخانات المستخدمة في تجميع الرموز</string>
-    <string name="pref_account_name_position_title">إظهار اسم الحساب</string>
-    <string name="pref_shared_issuer_account_name_title">إظهار اسم الحساب فقط عند الضرورة</string>
-    <string name="pref_shared_issuer_account_name_summary">إظهار أسماء الحسابات فقط عندما يشاركون نفس المصدر. سيتم إخفاء أسماء الحسابات الأخرى.</string>
-    <string name="pref_account_name_position_summary_override">تجاوز هذا الإعداد عن طريق وضع عرض البلاط. سيتم عرض اسم الحساب دائمًا أسفل المصدر.</string>
+    <string name="pref_show_icons_title">أظهر الأيقونات</string>
+    <string name="pref_show_icons_summary">اعرض الأيقونات بجانب كل مدخل</string>
+    <string name="pref_code_group_size_title">تجميع أرقام الرمز</string>
+    <string name="pref_code_group_size_summary">حدد عدد الأرقام لتجميع الرموز حسبها</string>
+    <string name="pref_account_name_position_title">اضهِر اسم الحساب</string>
+    <string name="pref_show_next_code_title">أظهِر الرمز التالي</string>
+    <string name="pref_show_next_code_summary">ولّد وأظهِر الكود التالي قبل الوقت</string>
+    <string name="pref_expiration_state_title">أشر متى تكون الرموز على وشك الانتهاء</string>
+    <string name="pref_expiration_state_summary">غيّر لون الرموز البرمجية وجعلها غير واضحة عندما تكون على وشك الانتهاء</string>
+    <string name="pref_expiration_state_fallback">غيّر لون الرموز عندما تكون على وشك الانتهاء</string>
+    <string name="pref_shared_issuer_account_name_title">اضهِر اسم الحساب فقط عند الضرورة</string>
+    <string name="pref_shared_issuer_account_name_summary">أضهِر أسماء الحسابات فقط عندما يشتركون نفس المصدر. سيتم إخفاء أسماء الحسابات الأخرى.</string>
+    <string name="pref_account_name_position_summary_override">تم تجاوز هذا الإعداد بوضع عرض البلاط. سيتم عرض اسم الحساب أسفل المُصدّر.</string>
     <string name="pref_import_file_title">استيراد من ملف</string>
     <string name="pref_import_file_summary">استيراد الرموز من ملف</string>
     <string name="pref_android_backups_title">النسخ الاحتياطية السحابية للأندرويد</string>
@@ -54,19 +64,27 @@
     <string name="pref_backups_reminder_summary">أظهر تذكيرًا للاحتفاظ بنسخة احتياطية من مخزنك في حالة عدم إجراء نسخ احتياطي لآخر تغييراتك.</string>
     <string name="pref_backups_reminder_dialog_title">تعطيل تذكير النسخ الاحتياطي</string>
     <string name="pref_backups_reminder_dialog_summary">يعني تعطيل هذا التذكير أن Aegis لن يخبرك بما إذا كان لديك تغييرات لم يتم نسخها احتياطيًا حتى الآن أم لا. هذا يعرضك لخطر فقدان الوصول إلى الرموز الخاصة بك. هل أنت متأكد أنك تريد تعطيل التذكير؟</string>
-    <string name="pref_backups_location_title">مجلد ملفات النسخ الاحتياطية</string>
+    <string name="pref_backups_versioning_strategy_title">استراتيجية النسخ الاحتياطي</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">احتفظ بعدد من الإصدارات</string>
+    <string name="pref_backups_versioning_strategy_single_backup">نُسخة احتياطية واحدة</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">استراتيجية النسخ الاحتياطي المحددة غير موثوقة ولا يُنصح بها. فشل احتياطي واحد يمكن أن يؤدي إلى فقدان النسخة الاحتياطية الوحيدة.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">حدد استراتيجية النسخ الاحتياطي</string>
+    <string name="pref_backups_location_title">موقع النسخة الاحتياطية</string>
     <string name="pref_backups_location_summary">سيتم تخزين النسخ الاحتياطية في</string>
+    <string name="pref_backup_location_summary">سيتم تخزين النسخ الاحتياطي في</string>
     <string name="pref_backups_trigger_title">اصنع نسخة احتياطية</string>
     <string name="pref_backups_trigger_summary">قم بعمل نسخة احتياطية يدويًّا</string>
     <string name="pref_backups_versions_title">عدد الإصدارات المراد الاحتفاظ بها</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
-        <item quantity="zero">احتفظت 0 من بإصدار النسخ الاحتياطية</item>
-        <item quantity="one">احتفظ بإصدار %1$d من النسخة الاحتياطية</item>
-        <item quantity="two">أحتفاظ بإصدارين من النسخ الاحتياطية</item>
-        <item quantity="few">احتفظ بإصدار %1$d من النسخ الاحتياطية</item>
-        <item quantity="many">احتفظ بإصدار %1$d من النسخ الاحتياطية</item>
-        <item quantity="other">احتفظ بـ %1$d إصدارات من النسخ الاحتياطية</item>
+        <item quantity="zero">احتفظ ب%1$d إصدارات من النسخ الاحتياطية</item>
+        <item quantity="one">احتفظ بإصدار واحد من النسخ الاحتياطية</item>
+        <item quantity="two">احتفظ بإصدارين من النسخ الاحتياطية</item>
+        <item quantity="few">احتفظ ب%1$d إصدارات من النسخ الاحتياطية</item>
+        <item quantity="many">احتفظ ب%1$d إصدارات من النسخ الاحتياطية</item>
+        <item quantity="other">احتفظ ب%1$d إصدارات من النسخ الاحتياطية</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">احتفظ بعدد غير محدود من النُسخ الاحتياطية</string>
     <string name="pref_import_app_title">استيراد من تطبيق</string>
     <string name="pref_import_app_summary">استيراد الرموز من تطبيق (يتطلب الوصول إلى الجذر root)</string>
     <string name="pref_export_title">تصدير</string>
@@ -106,8 +124,34 @@
     <string name="pref_encryption_summary">قم بتشفير المخزن وفك قفله بكملة مرور أو مصادقة بيومترية</string>
     <string name="pref_biometrics_title">الفتح البيومتري</string>
     <string name="pref_biometrics_summary">السماح بالمصادقة البيومترية لفتح قفل المخزن</string>
+    <string name="pref_search_behavior_summary">البحث من خلال: %s</string>
+    <string name="pref_search_behavior_prompt">البحث في أي من الحقول التالية</string>
+    <string name="pref_search_behavior_type_name">الاسم</string>
+    <string name="pref_search_behavior_type_issuer">المصدِّر</string>
+    <string name="pref_search_behavior_type_note">ملاحظة</string>
+    <string name="pref_search_behavior_type_groups">المجموعات</string>
     <string name="pref_set_password_title">تغيير كلمة المرور</string>
     <string name="pref_set_password_summary">تعيين كلمة مرور جديدة، ستحتاجها لفتح قفل المخزن</string>
+    <string name="no_events_title">لا توجد أحداث مبلّغ عنها</string>
+    <string name="no_events_description">لم يتم الإبلاغ عن أي أحداث مهمة داخل التطبيق</string>
+    <string name="event_title_vault_unlocked">المخزن غير مقفل</string>
+    <string name="event_description_vault_unlocked">تم إلغاء قفل المخزن بنجاح</string>
+    <string name="event_title_backup_created">أُنشئت نُسخة أحتياطية</string>
+    <string name="event_description_backup_created">أُنشئت نُسخة احتياطية من المخزن بنجاح</string>
+    <string name="event_title_android_backup_created">أُنشئت نُسخة احتياطية بواسطة أندرويد</string>
+    <string name="event_description_android_backup_created">أُنشئت نُسخة احتياطية من المخزن بنجاح من قِبل أندرويد</string>
+    <string name="event_title_vault_exported">تم تصدير المخزن</string>
+    <string name="event_description_vault_exported">تم تصدير نسخة من المخزن</string>
+    <string name="event_title_entry_shared">الإدخال المشترك</string>
+    <string name="event_description_entry_shared">تم مشاركة مدخل</string>
+    <string name="event_title_vault_unlock_failed_password">فشل فتح القفل (كلمة المرور)</string>
+    <string name="event_description_vault_unlock_failed_password">فشلت محاولة لفتح المخزن بكلمة مرور</string>
+    <string name="event_title_vault_unlock_failed_biometrics">فشل فتح القفل (القياسات الحيوية)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">فشلت محاولة لفتح المخزن باستخدام القياسات الحيوية</string>
+    <string name="event_unknown">نوع الحدث غير معروف</string>
+    <string name="audit_log_entry_deleted">(محذوف)</string>
+    <string name="today_at_time">اليوم على %1$s</string>
+    <string name="day_of_week_at_time">%1$s في %2$s</string>
     <string name="export_encrypted">تشفير المخزن</string>
     <string name="export_help">هذا الإجراء سيصدر المخزن خارج ذاكرة تخزين Aegis الداخلية. حدد الصيغة التي ترغب بأن يكون التصدير عليها:</string>
     <string name="export_warning_unencrypted">أنت على وشك تصدير نسخة غير مشفرة من مخزن Aegis. <b>لا يُنصح بهذا</b>.</string>
@@ -128,7 +172,7 @@
         <item quantity="other">%d مجموعة حُددت</item>
     </plurals>
     <string name="export_no_groups_selected">لم يُحدد مجموعات للتصدير</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis تصدير أداة المصادقة</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis تصدير أداة المصادقة</string>
     <string name="choose_authentication_method">الأمان</string>
     <string name="authentication_method_explanation">تطبيق Aegis هو تطبيق مصادقة يركز على الأمان. تخزّن الرموز في مخزن، يمكن تشفيره اختياريًا بكلمة مرور من اختيارك. إذا حصل مهاجم على ملف المخزن المشفر الخاص بك، فإنه لن يتمكن من الوصول إلى المحتوى بدون معرفة كلمة المرور.\n\nلقد حددنا مسبقًا الخيار الذي نعتقد أنه يناسب جهازك.</string>
     <string name="authentication_method_none">بلا</string>
@@ -164,17 +208,23 @@
     <string name="share">شارك</string>
     <string name="yes">نعم</string>
     <string name="no">لا</string>
+    <string name="undo">تراجع</string>
     <string name="unlock">فتح القفل</string>
     <string name="advanced">متقدم</string>
     <string name="counter">العداد</string>
     <string name="digits">الأرقام</string>
     <string name="secret">السر</string>
-    <string name="scan">امسح كود QR</string>
+    <string name="scan">امسح رمز QR</string>
     <string name="scan_image">امسح الصورة</string>
     <string name="enter_manually">أدخل يدويًا</string>
     <string name="set_up_biometric">تعيين الفتح البيومتري</string>
     <string name="copy">نسخ</string>
     <string name="edit">تعديل</string>
+    <string name="select_all">حدد الكل</string>
+    <string name="assign_icons">تعيين أيقونات</string>
+    <string name="assign_groups">تعيين للمجموعة</string>
+    <string name="assign_groups_dialog_summary">حدد مجموعة ترغب في تعيين المواد المختارة إليها.</string>
+    <string name="assign_groups_dialog_dropdown">حدد المجموعة</string>
     <string name="favorite" comment="Verb">أضِف للمفضلة</string>
     <string name="unfavorite" comment="Verb">أزِل من المفضلة</string>
     <string name="error_all_caps">خطأ</string>
@@ -189,10 +239,12 @@
     <string name="snackbar_authentication_method">الرجاء تحديد طريقة مصادقة</string>
     <string name="encrypting_vault">يتم تشفير المخزن</string>
     <string name="exporting_vault">يجري تصدير المخزن</string>
+    <string name="optimizing_icon">تحسين الأيقونة</string>
+    <string name="optimizing_icon_multiple">تحسين الأيقونات %1$d/%2$d</string>
     <string name="reading_file">قراءة الملف</string>
     <string name="requesting_root_access">طلب صلاحية الجذر</string>
     <string name="analyzing_qr">تحليل رمز QR</string>
-    <string name="analyzing_qr_multiple">تحليل رمز QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">جارِ تحليل الرمز %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="zero">تم إضافة %d مدخل جديد إلى المخزن</item>
         <item quantity="one">تم إضافة %d مدخل جديد إلى المخزن</item>
@@ -217,6 +269,7 @@
     <string name="discard_changes">تجاهل التغييرات؟</string>
     <string name="discard_changes_description">لم يتم حفظ تغييراتك</string>
     <string name="saving_profile_error">حدث خطأ أثناء حفظ الملف الشخصي</string>
+    <string name="saving_assign_icons_error">خطأ في تعيين الأيقونات</string>
     <string name="welcome">مرحبًا</string>
     <string name="app_description">Aegis تطبيق مصادقة ثنائية مجاني، وآمن، ومفتوح المصدر</string>
     <string name="setup_completed">اكتمل الإعداد</string>
@@ -225,6 +278,7 @@
     <string name="copied">تم النسخ</string>
     <string name="errors_copied">تم نسخ الخطأ للحافظة</string>
     <string name="version_copied">تم نسخ الإصدار إلى الحافظة</string>
+    <string name="error_required_field">يُرجى ملء الحقل</string>
     <string name="error_occurred">حدث خطأ ما</string>
     <string name="decryption_error">حدث خطأ أثناء محاولة فك قفل المخزن</string>
     <string name="decryption_corrupt_error">حدث خطأ أثناء محاولة فك قفل المخزن. قد يكون ملف المخزن الخاص بك تالف.</string>
@@ -300,15 +354,24 @@
     <string name="partial_google_auth_import">اكتُشف تصدير Google Authenticator غير مكتمل</string>
     <string name="partial_google_auth_import_warning">بعض رموز QR مفقودة من الاستيراد. لم يتم العثور على الرموز التالية:\n\n<b>%s</b>\n\nيمكنك الاستمرار في استيراد هذا التصدير الجزئي ولكننا نوصي بإعادة المحاولة باستخدام جميع رموز QR حتى لا تخاطر بفقدان الوصول إلى أي رموز.</string>
     <string name="missing_qr_code_descriptor">• رمز QR %d</string>
-    <string name="import_partial_export_anyway">استيراد %d رموز على أي حال</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="zero">استيراد %d رموز على أي حال</item>
+        <item quantity="one">استيراد رمز %d على أي حال</item>
+        <item quantity="two">استيراد رمزين على أي حال</item>
+        <item quantity="few">استيراد %d رموز على أي حال</item>
+        <item quantity="many">استيراد %d رموز على أي حال</item>
+        <item quantity="other">استيراد %d رموز على أي حال</item>
+    </plurals>
     <string name="import_google_auth_failure">فشل استيراد تصدير Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">يحتوي التصدير على معلومات عن دُفعة غير ذات صلة. حاول استيراد دفعة واحدة في كل مرة.</string>
     <string name="no_tokens_can_be_imported">نتيجة لذلك، لا يمكن استيراد أي رموز</string>
-    <string name="authentication_method_raw">خام</string>
     <string name="unlocking_vault">يتم فتح قفل المخزن</string>
-    <string name="slot_this_device">(هذه الأجهزة)</string>
+    <string name="rename_group">إعادة تسمية المجموعة</string>
+    <string name="no_group_selection">إذا لم يكن الإدخال جزءا من أي مجموعة، يمكن العثور عليه تحت \"بلا مجموعة\".</string>
     <string name="remove_group">إزالة المجموعة</string>
-    <string name="remove_group_description">هل ترغب حقًا في إزالة هذه المجموعة؟ ستتحول المدخلات في هذه المجموعة تلقائيًا إلى &quot;غير مجمّعة&quot;</string>
+    <string name="remove_group_description">هل ترغب حقًا في إزالة هذه المجموعة؟ ستتحول المدخلات في هذه المجموعة تلقائيًا إلى \'بلا مجموعة\'.</string>
+    <string name="remove_unused_groups">حذف المجموعات غير المستخدمة</string>
+    <string name="remove_unused_groups_description">هل أنت متأكد من أنك تريد حذف جميع المجموعات التي لم يتم تعيينها إلى إدخال؟</string>
     <string name="remove_icon_pack">حذف حزمة الأيقونات</string>
     <string name="remove_icon_pack_description">هل أنت متأكد من أنك تريد إزالة حزمة الأيقونات هذه؟ لن تتأثر المدخلات التي تستخدم الرموز من هذه الحزمة.</string>
     <string name="details">التفاصيل</string>
@@ -316,13 +379,16 @@
     <string name="lock">قفل</string>
     <string name="name">الاسم</string>
     <string name="no_group">بلا مجموعة</string>
-    <string name="sort">الفرز</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">الفرز</string>
     <string name="sort_alphabetically">المصدِّر (أ إلى ي)</string>
     <string name="sort_alphabetically_reverse">المصدِّر (ي إلى أ)</string>
     <string name="sort_alphabetically_name">الحساب (أ إلى ي)</string>
     <string name="sort_alphabetically_name_reverse">الحساب (ي إلى أ)</string>
     <string name="sort_usage_count">عدد مرات الاستخدام</string>
+    <string name="sort_last_used">آخر استخدام</string>
     <string name="sort_custom">مخصص</string>
+    <string name="last_used">آخر استخدام</string>
+    <string name="last_used_never">أبدًا</string>
     <string name="new_group">مجموعة جديدة</string>
     <string name="group">مجموعة</string>
     <string name="group_name_hint">اسم المجموعة</string>
@@ -331,13 +397,35 @@
     <string name="preference_reset_usage_count">إعادة تعيين عدد الاستخدام</string>
     <string name="preference_reset_usage_count_summary">إعادة تعيين عدد الاستخدام لكل إدخال في مخزنك</string>
     <string name="preference_reset_usage_count_dialog">هل أنت متأكد من أنك تريد جعل العداد لكل مدخل في خزنتك يصبح 0؟</string>
-    <string name="note">ملاحظة</string>
+    <string name="note" comment="Users can add a note to an entry">ملاحظة</string>
     <string name="clear">مسح</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">إدخال مكرر</string>
+    <string name="dialog_duplicate_entry_message">هذا الإدخال يحمل نفس الاسم والمصدر كواحد أو أكثر من الإدخالات الموجودة. كيف ترغب في المتابعة؟</string>
+    <string name="dialog_duplicate_entry_overwrite_title">الكتابة فوق إدخال/إدخالات موجودة</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">استبدل الإدخال أو الإدخالات الموجودة بالإدخال الجديد. لا يمكن التراجع عن هذا الإجراء</string>
+    <string name="dialog_duplicate_entry_suffix_title">أضف لاحقة</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">أضف لاحقة إلى اسم هذا الإدخال الجديد. الاسم الجديد سيكون هو: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">ألغِ الحفظ</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">يسمح لك بتعديل الإدخال قبل محاولة حفظه مرة أخرى</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="zero">هل أنت متأكد من أنك تريد حذف الإدخال %d بالاسم التالي:\n\n%s - %s</item>
+        <item quantity="one">هل أنت متأكد من أنك تريد حذف مدخل بالاسم التالي:\n\n%s - %s</item>
+        <item quantity="two">هل أنت متأكد من أنك تريد حذف مدخلان بالاسم التالي:\n\n%s - %s</item>
+        <item quantity="few">هل أنت متأكد من أنك تريد حذف %d مدخلات بالاسم التالي:\n\n%s - %s</item>
+        <item quantity="many">هل أنت متأكد من أنك تريد حذف %d مدخل بالاسم التالي:\n\n%s - %s</item>
+        <item quantity="other">هل أنت متأكد من أنك تريد حذف %d مدخل بالاسم التالي:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">تأكيد الحذف</string>
+    <string name="pref_haptic_feedback_summary">اجعل جهازك يهتز عند تحديث الرموز</string>
+    <string name="pref_haptic_feedback_title">الاستجابة اللمسية</string>
     <string name="pref_highlight_entry_title">ابرز الرموز عندما تُنقر</string>
     <string name="pref_highlight_entry_summary">يسهل تمييز الرموز عن بعضها بتسليط الضوء عليهم عندما يتم النقر عليهم</string>
+    <string name="pref_groups_multiselect_title">مجموعات متعددة الإختيار</string>
+    <string name="pref_groups_multiselect_summary">السماح باختيار مجموعات متعددة في نفس الوقت</string>
     <string name="pref_minimize_on_copy_title">تصغير عند النسخ</string>
     <string name="pref_minimize_on_copy_summary">تصغير التطبيق بعد نسخ رمز</string>
     <string name="pref_copy_behavior_title">نسخ الرموز إلى الحافظة</string>
+    <string name="pref_search_behavior_title">سلوك البحث</string>
     <string name="pref_pause_entry_title">تجميد الرموز عند النقر عليها</string>
     <string name="pref_pause_entry_summary">أوقف التحديث التلقائي للرموز عن طريق النقر عليها. لن يُحديث الرموز طالما أنها مركزة. يتطلب \"تمييز الرموز عند النقر عليها\" أو \"النقر للكشف\".</string>
     <string name="pin_keyboard_description">أدخل كلمة المرور لتفعيل لوحة مفاتيح PIN. لاحظ أن هذا يعمل فقط إذا كانت كلمة المرور الخاصة بك تتكون فقط من أرقام</string>
@@ -357,23 +445,23 @@
     <string name="unknown_issuer">مصدِّر غير معروف</string>
     <string name="unknown_account_name">اسم الحساب غير معروف</string>
     <plurals name="import_error_dialog">
-        <item quantity="zero">لم يستطع Aegis استيراد 0 رموز. سيتم تخطي تلك الرموز. اضغط على \'التفاصيل\' لرؤية المزيد من المعلومات حول الأخطاء.</item>
-        <item quantity="one">لم يستطع Aegis استيراد رمز %d. سيتم تخطي ذلك الرمز. اضغط على \'التفاصيل\' لرؤية المزيد من المعلومات حول الأخطاء.</item>
-        <item quantity="two">لم يستطع Aegis استيراد رمزين. سيتم تخطي ذلك الرمز. اضغط على \'التفاصيل\' لرؤية المزيد من المعلومات حول الأخطاء.</item>
-        <item quantity="few">لم يستطع Aegis استيراد %d رموز. سيتم تخطي تلك الرموز. اضغط على \'التفاصيل\' لرؤية المزيد من المعلومات حول الأخطاء.</item>
-        <item quantity="many">لم يستطع Aegis استيراد %d رموز. سيتم تخطي تلك الرموز. اضغط على \'التفاصيل\' لرؤية المزيد من المعلومات حول الأخطاء.</item>
-        <item quantity="other">لم يستطع Aegis استيراد %d رموز. سيتم تخطي تلك الرموز. اضغط على \'التفاصيل\' لرؤية المزيد من المعلومات حول الأخطاء.</item>
+        <item quantity="zero">تعذر Aegis استيراد %d رمز. سيتم تخطي هذا الرمز. اضغط \'التفاصيل\' للاطلاع على مزيد من المعلومات حول الخطأ.</item>
+        <item quantity="one">تعذر Aegis استيراد %d رمز. سيتم تخطي هذا الرمز. اضغط \'التفاصيل\' للاطلاع على مزيد من المعلومات حول الخطأ.</item>
+        <item quantity="two">تعذر Aegis استيراد %d رمز. سيتم تخطي هذا الرمز. اضغط \'التفاصيل\' للاطلاع على مزيد من المعلومات حول الخطأ.</item>
+        <item quantity="few">تعذر Aegis استيراد %d رموز. سيتم تخطي هذا الرمز. اضغط \'التفاصيل\' للاطلاع على مزيد من المعلومات حول الخطأ.</item>
+        <item quantity="many">تعذر Aegis استيراد %d رموز. سيتم تخطي هذا الرمز. اضغط \'التفاصيل\' للاطلاع على مزيد من المعلومات حول الخطأ.</item>
+        <item quantity="other">تعذر Aegis استيراد %d رموز. سيتم تخطي هذا الرمز. اضغط \'التفاصيل\' للاطلاع على مزيد من المعلومات حول الخطأ.</item>
     </plurals>
     <string name="unable_to_process_deeplink">تعذرت معالجة الارتباط العميق</string>
     <string name="unable_to_read_qrcode_file">غير قادر على قراءة ومعالجة رمز QR من الملف: %s.</string>
     <string name="unable_to_process_shared_text">غير قادر على معالجة النص المُشارك ك OTP</string>
-    <string name="unable_to_read_qrcode_files">غير قادر على قراءة ومعالجة بعض رموز QR. سيتم استيراد %d/%d فقط من المدخلات.</string>
+    <string name="unable_to_read_qrcode_files">غير قادر على قراءة ومعالجة بعض رموز QR. سيتم استيراد %1$d/%2$d فقط من المدخلات.</string>
     <string name="unable_to_generate_qrcode">تعذّر توليد كود QR</string>
     <string name="select_picture">اختر صورة</string>
     <string name="select_icon">اختر أيقونة</string>
     <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">افتح المخزن</string>
     <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">افتح الماسح</string>
-    <string name="toggle_checkboxes">تفعيل مربعات الاختيار</string>
+    <string name="toggle_checkboxes">تبديل خانات التأشير</string>
     <string name="search">بحث</string>
     <string name="channel_name_lock_status">إشعار القفل</string>
     <string name="channel_description_lock_status">يمكن لـ Aegis عرض إشعار مستمر لتنبيهك عند قفل المخزن</string>
@@ -399,17 +487,18 @@
     <string name="time_sync_warning_disable">إيقاف تحذيري. أنا أعرف ما أفعله.</string>
     <string name="google_qr_export_unrelated">تم العثور على كود QR لا علاقة له. حاول إعادة تشغيل الماسح.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="zero">تم مسح %d/%d رمز QR</item>
-        <item quantity="one">تم مسح %d/%d رمز QR</item>
-        <item quantity="two">تم مسح %d/%d رموز QR</item>
-        <item quantity="few">تم مسح %d/%d رموز QR</item>
-        <item quantity="many">تم مسح %d/%d رمز QR</item>
-        <item quantity="other">تم مسح %d/%d رمز QR</item>
+        <item quantity="zero">تم مسح %1$d/%2$d رموز QR</item>
+        <item quantity="one">تم مسح %1$d/%2$d رمز QR</item>
+        <item quantity="two">تم مسح %1$d/%2$d رموز QR</item>
+        <item quantity="few">تم مسح %1$d/%2$d رموز QR</item>
+        <item quantity="many">تم مسح %1$d/%2$d رموز QR</item>
+        <item quantity="other">تم مسح %1$d/%2$d رموز QR</item>
     </plurals>
-    <string name="google_qr_export_unexpected">انتظرت كود QR #%d، ولكن مسحت #%d بدلًا منه</string>
+    <string name="google_qr_export_unexpected">انتظرت رمز QR #%1$d، ولكن مسحت #%2$d بدلًا منه</string>
     <string name="backup_error_bar_message"><b>النسخ الاحتياطي للمخزن فشل مؤخرًا</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">         فشلت محاولة النسخ الاحتياطي للمخزون باستخدام %s بسبب حدوث خطأ. تمت محاولة النسخ الاحتياطي %s. الرجاء التحقق من إعدادات النسخ الاحتياطي للتأكد من أن النسخ الاحتياطي يمكن أن يكتمل بنجاح.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">         فشلت محاولة النسخ الاحتياطي للمخزون باستخدام %1$s بسبب حدوث خطأ. تمت محاولة النسخ الاحتياطي %2$s. الرجاء التحقق من إعدادات النسخ الاحتياطي للتأكد من أن النسخ الاحتياطي يمكن أن يكتمل بنجاح.
     </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">فشلت محاولة النسخ الاحتياطي الأخيرة للمخزون باستخدام %1$s لأن Aegis لم يكن لديه الإذن قراءة وجهة النسخ الاحتياطي. تمت محاولة النسخ الاحتياطي %2$s. يمكن أن يحدث هذا الخطأ إذا قمت بنقل/إعادة تسمية وجهة النسخ الاحتياطي أو إذا قمت للتو باستعادة Aegis من نسخة احتياطية. الرجاء إعادة إعداد وجهة النسخ الإحتياطي.    </string>
     <string name="backup_system_builtin">النسخ الاحتياطية التلقائية المضنة في Aegis</string>
     <string name="backup_system_android">نظام النسخ الاحتياطي السحابي للأندرويد</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        أحدث نسخة احتياطية قديمة (%s)
@@ -446,14 +535,15 @@
     <string name="copy_uri">نسخ URI</string>
     <string name="unable_to_copy_uri_to_clipboard">تعذر نسخ URI إلى الحافظة</string>
     <string name="uri_copied_to_clipboard">نُسخ URI إلى الحافظة</string>
-    <string name="transfer_entry">نقل المدخل</string>
     <string name="transfer_entry_description">امسح كود QR هذا بتطبيق المصادقة الذي ترغب بنقل ذلك المدخل إليه</string>
+    <string name="transfer_entry_brightness">اضغط على رمز الاستجابة السريعة لتبديل سطوع الشاشة بالكامل</string>
     <string name="google_auth_compatible_transfer_description">امسح رموز ال QR هذه بواسطة Aegis أو Google Authenticator.\n\nبسبب القيود في تطبيق Google Authenticator، فقط رموز TOTP &amp; HOTP التي تستعمل SHA1 وتنتِج كود من 6 خانات هي من سيتم إدراجها</string>
     <string name="password_strength_very_weak">ضعيف جدًا</string>
     <string name="password_strength_weak">ضعيف</string>
     <string name="password_strength_fair">مقبول</string>
     <string name="password_strength_good">جيد</string>
     <string name="password_strength_strong">قوي</string>
+    <string name="password_strength_unknown">كلمة المرور طويلة جدًا لتحليل القوة</string>
     <string name="pref_pin_keyboard_title">استخدام لوحة المفاتيح PIN على شاشة القفل</string>
     <string name="pref_pin_keyboard_summary">قم بتمكين هذا إذا كنت تريد تمكين لوحة مفاتيح PIN على شاشة القُفْل. هذا يعمل فقط مع كلمات المرور الرقمية</string>
     <string name="title_activity_preferences">الإعدادات</string>
@@ -462,32 +552,47 @@
     <string name="title_activity_about">عن</string>
     <string name="title_activity_edit_entry">تعديل الإدخال</string>
     <string name="title_activity_scan_qr">قم بمسح رمز QR</string>
-    <string name="title_activity_manage_slots">إدارة فتحات المفاتيح</string>
     <string name="title_activity_import_entries">استيراد المدخلات</string>
+    <string name="title_activity_assign_icons">تعيين أيقونات</string>
+    <string name="title_activity_licenses">تراخيص الطرف الثالث</string>
     <string name="dialog_wipe_entries_title">حذف المدخلات</string>
     <string name="dialog_wipe_entries_message">يحتوي مخزنك بالفعل على إدخالات. هل تريد إزالة هذه الإدخالات قبل استيراد هذا المِلَفّ؟\n\n<b>عند القيام بذلك، ستفقد الوصول بشكل دائم إلى الإدخالات الموجودة في الخزنة.</b></string>
     <string name="dialog_wipe_entries_checkbox">حذف محتويات المخزن</string>
     <string name="panic_trigger_ignore_toast">تلقى Aegis حالة من الذعر ولكن الإعداد معطل، مع التجاهل</string>
     <string name="pref_panic_trigger_title">حذف المخزن على الزناد الذعر</string>
     <string name="pref_panic_trigger_summary">احذف المخزن عند تلقي مصدر ذعر من Ripple</string>
-    <string name="import_vault">استيراد مخزن</string>
+    <string name="import_vault">استيراد مخزن Aegis</string>
+    <string name="import_vault_hint">هل تريد الاستيراد من تطبيق 2FA مختلف؟ أكمل الإعداد أولاً ثم انتقل إلى قائمة الإعدادات.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="zero">لم يُؤشَّر %d من التكرار المحتمل. الرجاء مراجعة قائمة الإدخالات.</item>
+        <item quantity="one">لم يُؤشَّر %d من التكرار المحتمل. الرجاء مراجعة قائمة الإدخالات.</item>
+        <item quantity="two">لم يُؤشَّر %d من التكرار المحتمل. الرجاء مراجعة قائمة الإدخالات.</item>
+        <item quantity="few">لم يُؤشَّر %d من التكرارات المحتملة. الرجاء مراجعة قائمة الإدخالات.</item>
+        <item quantity="many">لم يُؤشَّر %d من التكرارات المحتملة. الرجاء مراجعة قائمة الإدخالات.</item>
+        <item quantity="other">لم يُؤشَّر %d من التكرارات المحتملة. الرجاء مراجعة قائمة الإدخالات.</item>
+    </plurals>
     <string name="importer_help_2fas">توفير مِلَفّ النسخ الاحتياطي 2FAS Authenticator.</string>
     <string name="importer_help_aegis">توفير مِلَفّ Aegis للتصدير / النسخ الاحتياطي.</string>
     <string name="importer_help_authenticator_plus">توفير مِلَفّ تصدير Authenticator Plus الذي تم الحصول عليه من خلال <b>الإعدادات -&gt; النسخ الاحتياطي &amp; استعادة -&gt; تصدير كنص و HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">توفير مِلَفّ تصدير Authenticator Pro الذي تم الحصول عليه من خلال &lt;b&gt;الإعدادات -&gt; النسخ الاحتياطي -&gt; النسخ الاحتياطي إلى مِلَفّ مشفر (مستحسن).</string>
     <string name="importer_help_authy">توفير نسخة من <b> /data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>، الموجود في دليل التخزين الداخلي لـ Authy.</string>
     <string name="importer_help_andotp">توفير مِلَفّ تصدير / نسخ احتياطي andOTP.</string>
     <string name="importer_help_bitwarden">توفير مِلَفّ تصدير / نسخ احتياطي لـ Bitwarden. الملفات المشفرة غير مدعومة.</string>
-    <string name="importer_help_battle_net_authenticator">قم بتوفير نسخة من <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>، الموجود في مجلد المساحة الداخلية لمصادق Battle.net.</string>
+    <string name="importer_help_battle_net_authenticator">يرجى توفير نسخة من <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>، الموجود في دليل التخزين الداخلي لـ Battle.net Authenticator.</string>
     <string name="importer_help_duo">توفير نسخة من <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>، الموجودة في دليل التخزين الداخلي لـ DUO.</string>
-    <string name="importer_help_freeotp">توفير نسخة من <b> /data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>، الموجودة في دليل التخزين الداخلي لـ FreeOTP.</string>
+    <string name="importer_help_ente_auth">قم بتوفير ملف تصدير Ente Auth. حاليا فقط الملفات غير المشفرة مدعومة.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: توفير ملف احتياطي.\nFreeOTP 1.x: توفير نسخة من <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>، الموجود في دليل التخزين الداخلي لـ FreeOTP.</string>
     <string name="importer_help_freeotp_plus">توفير ملف تصدير FreeOTP +.</string>
+    <string name="importer_warning_title_freeotp2">توافق مع FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">هناك عدد من المشاكل في FreeOTP 2 التي يمكن أن تؤدي إلى وجود نسخ احتياطية فاسدة. سوف يحاول درع إنقاذ أكبر عدد ممكن من الإدخالات، ولكن من الممكن أن يفشل البعض أو حتى الجميع في الاستيراد.</string>
     <string name="importer_help_google_authenticator"><b>يتم دعم ملفات قاعدة البيانات فقط من Google Authenticator v5.10 والإصدارات السابقة</b>.\n\nتوفير نسخة من<b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>،الموجود في دليل التخزين الداخلي لـ Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">توفير نسخة من<b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>، الموجود في دليل التخزين الداخلي لـ Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">توفير مِلَفّ نصي عادي مع Google Authenticator URI في كل سطر.</string>
     <string name="importer_help_steam"><b>لا يتم دعم Steam v3.0 والإصدارات الأحدث</b>. توفير نسخة من<b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>، الموجود في دليل التخزين الداخلي لـ Steam.</string>
+    <string name="importer_help_stratum">جهّز ملف تصدير Stratum تم الحصول عليه من خلال <b>الإعدادات -&gt; النسخ الاحتياطي -&gt; النسخ الاحتياطي للملف المشفر (موصى به)</b>.</string>
     <string name="importer_help_totp_authenticator">توفير مِلَفّ تصدير TOTP Authenticator.</string>
     <string name="importer_help_winauth">توفير مِلَفّ تصدير WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">تعيين أيقونات</string>
+    <string name="import_assign_icons_dialog_text">هل تريد تعيين أيقونات إلى المدخلات المستوردة؟</string>
     <string name="importer_encrypted_exception_google_authenticator">تخطَّى الإدخال المشفر: %s</string>
     <string name="importer_help_direct">استيراد الإدخالات مباشرة من %s. يتطلب هذا تثبيت التطبيق على هذا الجهاز ومنح حق الوصول إلى الجذر Aegis.</string>
     <string name="groups">المجموعات</string>
@@ -504,7 +609,7 @@
     <string name="pref_account_name_position_hidden">مختفي</string>
     <string name="pref_account_name_position_end">بجانب المصدر</string>
     <string name="pref_account_name_position_below">أسفل المصدر</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="zero">منذ %d ثواني</item>
         <item quantity="one">منذ %d ثانية</item>
         <item quantity="two">منذ %d ثواني</item>
@@ -512,7 +617,7 @@
         <item quantity="many">منذ %d ثانية</item>
         <item quantity="other">منذ %d ثواني</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="zero">منذ %d دقيقة</item>
         <item quantity="one">منذ %d دقيقة</item>
         <item quantity="two">منذ %d دقائق</item>
@@ -520,7 +625,7 @@
         <item quantity="many">منذ %d دقيقة</item>
         <item quantity="other">منذ %d دقيقة</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="zero">منذ %d ساعة</item>
         <item quantity="one">منذ %d ساعة</item>
         <item quantity="two">منذ %d ساعات</item>
@@ -528,7 +633,7 @@
         <item quantity="many">منذ %d ساعة</item>
         <item quantity="other">منذ %d ساعة</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="zero">منذ %d يوم</item>
         <item quantity="one">منذ %d يوم</item>
         <item quantity="two">منذ %d أيام</item>
@@ -536,7 +641,7 @@
         <item quantity="many">منذ %d يوم</item>
         <item quantity="other">منذ %d يوم</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="zero">منذ %d سنة</item>
         <item quantity="one">منذ %d سنة</item>
         <item quantity="two">منذ %d سنوات</item>
diff --git a/app/src/main/res/values-ast-rES/strings.xml b/app/src/main/res/values-ast-rES/strings.xml
index f74ff44d..f3a2fd8a 100644
--- a/app/src/main/res/values-ast-rES/strings.xml
+++ b/app/src/main/res/values-ast-rES/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Configuración</string>
     <string name="action_about">Tocante a</string>
     <string name="action_delete">Desaniciar</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Reafitar l\'iconu</string>
     <string name="discard">Escartar</string>
     <string name="save">Guardar</string>
+    <string name="all">Too</string>
     <string name="issuer">Emisor</string>
     <string name="yandex_pin">PIN (4–16 díxitos)</string>
     <string name="motp_pin">PIN (4 díxitos)</string>
@@ -28,17 +29,26 @@
     <string name="pref_section_security_summary">Configura\'l cifráu, el bloquéu biométricu, el bloquéu automáticu ya otros valores de seguranza.</string>
     <string name="pref_section_import_export_title">Importación ya esportación</string>
     <string name="pref_section_import_export_summary">Importa les copies de seguranza d\'Aeguis o d\'otres aplicaciones del mesmu tipu. Crea ficheros d\'esportación manuales de l\'arca d\'Aeguis.</string>
+    <string name="pref_section_audit_log_title">Rexistros d\'auditoría</string>
     <string name="pref_section_backups_title">Copies de seguranza</string>
     <string name="pref_section_backups_summary">Configura\'l llugar onde s\'atroxen les copies de seguranza o activa la participación nel sistema de copies de seguranza na ñube d\'Android.</string>
     <string name="pref_section_icon_packs">Paquetes d\'iconos</string>
     <string name="pref_section_icon_packs_summary">Xestiona ya importa paquetes d\'iconos</string>
     <string name="pref_select_theme_title">Estilu</string>
+    <string name="pref_dynamic_colors_title">Colores dinámicos</string>
     <string name="pref_view_mode_title">Mou de la visualización</string>
     <string name="pref_lang_title">Llingua</string>
     <string name="pref_show_icons_title">Amosar los iconos</string>
     <string name="pref_show_icons_summary">Amuesa los iconos al llau de cada entrada</string>
     <string name="pref_code_group_size_title">Agrupamientu de díxitos</string>
     <string name="pref_code_group_size_summary">Seleiciona\'l númberu de díxitos pol que s\'agrupen los códigos</string>
+    <string name="pref_account_name_position_title">Amosar el nome de la cuenta</string>
+    <string name="pref_show_next_code_title">Amosar el códigu siguiente</string>
+    <string name="pref_show_next_code_summary">Xenera y amuesa\'l códigu siguiente per adelantao</string>
+    <string name="pref_expiration_state_title">Indicar cuándo tán a piques de caducar los códigos</string>
+    <string name="pref_expiration_state_summary">Camuda\'l color de los códigos y fai que parpaguien cuando tán a piques de caducar</string>
+    <string name="pref_expiration_state_fallback">Camuda\'l color de los códigos cuando tán a piques de caducar</string>
+    <string name="pref_shared_issuer_account_name_title">Amosar el nome de la cuenta namás cuando seya necesariu</string>
     <string name="pref_import_file_title">Importar d\'un ficheru</string>
     <string name="pref_import_file_summary">Importa los pases d\'un ficheru</string>
     <string name="pref_android_backups_title">Copies de seguranza na ñube</string>
@@ -46,8 +56,12 @@
     <string name="pref_android_backups_hint"><i>Siempres se permiten les copies de seguranza D2D, independientemente de la configuración d\'arriba</i></string>
     <string name="pref_backups_title">Crear automáticamente copies de seguranza</string>
     <string name="pref_backups_summary">Crea automáticamente copies de seguranza de l\'arca nel almacenamientu esternu al facer cambeos. Esta opción namás ye compatible coles arques cifraes.</string>
-    <string name="pref_backups_location_title">Direutoriu pa les copies de seguranza</string>
+    <string name="pref_backups_reminder_title">Recordatoriu de copia de seguranza</string>
+    <string name="pref_backups_versioning_strategy_title">Estratexa de copies de seguranza</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Seleiciona una estratexa de copies de seguranza</string>
+    <string name="pref_backups_location_title">Llocalización de les copies de seguranza</string>
     <string name="pref_backups_location_summary">Les copies de seguranza van atroxase en</string>
+    <string name="pref_backup_location_summary">La copia de seguranza va atroxase en</string>
     <string name="pref_backups_trigger_title">Facer una copia de seguranza</string>
     <string name="pref_backups_trigger_summary">Fai manualmente una copia de seguranza</string>
     <string name="pref_backups_versions_title">Númberu de versiones a caltener</string>
@@ -90,8 +104,31 @@
     <string name="pref_encryption_summary">Cifra l\'arca ya desblóquiala con una contraseña o cola biometría</string>
     <string name="pref_biometrics_title">Desbloquéu biométricu</string>
     <string name="pref_biometrics_summary">Permite que l\'autenticación biométrica desbloquie l\'arca</string>
+    <string name="pref_search_behavior_type_name">Nome</string>
+    <string name="pref_search_behavior_type_issuer">Emisor</string>
+    <string name="pref_search_behavior_type_note">Nota</string>
+    <string name="pref_search_behavior_type_groups">Grupos</string>
     <string name="pref_set_password_title">Camudar la contraseña</string>
     <string name="pref_set_password_summary">Configura la contraseña que vas precisar pa desbloquiar l\'arca</string>
+    <string name="no_events_title">Nun s\'informó de nengún eventu</string>
+    <string name="no_events_description">Nun s\'informó de nengún eventu importante na aplicación</string>
+    <string name="event_title_vault_unlocked">Arca desbloquiada</string>
+    <string name="event_description_vault_unlocked">L\'arca desbloquióse correutamente</string>
+    <string name="event_title_backup_created">Copia de seguranza creada</string>
+    <string name="event_description_backup_created">Creóse una copia de seguranza de l\'arca correutamente</string>
+    <string name="event_title_android_backup_created">Copia de seguranza creada por Android</string>
+    <string name="event_description_android_backup_created">Android creó una copia de seguranza de l\'arca correutamente</string>
+    <string name="event_title_vault_exported">Arca esportada</string>
+    <string name="event_description_vault_exported">Esportóse una copia de l\'arca</string>
+    <string name="event_title_entry_shared">Entrada compartida</string>
+    <string name="event_description_entry_shared">Compartióse una entrada</string>
+    <string name="event_title_vault_unlock_failed_password">Error de desbloquéu de l\'arca (contraseña)</string>
+    <string name="event_description_vault_unlock_failed_password">Hebo un intentu de desbloquiar l\'arca con una contraseña que falló</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Error de desbloquéu de l\'arca (biometría)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Hebo un intentu de desbloquiar l\'arca cola biometría que falló</string>
+    <string name="event_unknown">Tipu d\'eventu desconocíu</string>
+    <string name="today_at_time">Güei a les %1$s</string>
+    <string name="day_of_week_at_time">%1$s a les %2$s</string>
     <string name="export_encrypted">Cifrar l\'arca</string>
     <string name="export_help">Esta aición esporta l\'arca fuera del almacenamientu internu d\'Aegis. Seleiciona\'l formatu col que quies esportar:</string>
     <string name="export_warning_unencrypted">Tas a piques d\'esportar una copia ensin cifrar de l\'arca d\'Aegis. <b>Nun s\'aconseya</b>.</string>
@@ -101,11 +138,12 @@
     <string name="export_format_google_auth_uri">Ficheru de testu (.TXT)</string>
     <string name="export_format_html">Páxina web (.HTML)</string>
     <string name="export_format_hint">Formatu de la esportación</string>
+    <string name="export_all_groups">Esportar tolos grupos</string>
     <plurals name="export_groups_selected_count">
         <item quantity="one">Seleicionóse %d grupu</item>
         <item quantity="other">Seleicionáronse %d grupos</item>
     </plurals>
-    <string name="export_html_title" context="The title of an HTML export document">Esportación d\'Aeguis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Esportación d\'Aeguis Authenticator</string>
     <string name="choose_authentication_method">Seguranza</string>
     <string name="authentication_method_explanation">Aegis ye una aplicación enfocada na seguranza p\'autenticase en dos pasos. Los pases atróxense nuna arca que se pue cifrar cola contraseña qu\'escueyas, polo que si un atacante consigue\'l ficheru cifráu de l\'arca, nun va ser a acceder al so conteníu si nun sabe la contraseña.\n\nSeleicionemos por ti la opción que nos paez más afayadiza pal preséu.</string>
     <string name="authentication_method_none">Nada</string>
@@ -138,6 +176,7 @@
     <string name="share">Compartir</string>
     <string name="yes">Sí</string>
     <string name="no">Non</string>
+    <string name="undo">Desfacer</string>
     <string name="unlock">Desbloquiar</string>
     <string name="advanced">Configuración avanzada</string>
     <string name="counter">Contador</string>
@@ -149,6 +188,7 @@
     <string name="set_up_biometric">Configuración del desbloquéu biométricu</string>
     <string name="copy">Copiar</string>
     <string name="edit">Editar</string>
+    <string name="assign_groups_dialog_dropdown">Seleiciona un grupu</string>
     <string name="favorite" comment="Verb">Meter en Favoritos</string>
     <string name="unfavorite" comment="Verb">Quitar en Favoritos</string>
     <string name="error_all_caps">ERROR</string>
@@ -164,8 +204,9 @@
     <string name="encrypting_vault">Cifrando l\'arca</string>
     <string name="exporting_vault">Esportando l\'arca</string>
     <string name="reading_file">Lleendo\'l ficheru</string>
+    <string name="requesting_root_access">Consiguiendo l\'accesu de superusuariu</string>
     <string name="analyzing_qr">Analizándo\'l códigu QR</string>
-    <string name="analyzing_qr_multiple">Analizando\'l códigu QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analizando\'l códigu QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Amestóse %d entrada nueva a l\'arca</item>
         <item quantity="other">Amestáronse %d entraes nueves a l\'arca</item>
@@ -230,6 +271,7 @@
     <string name="reading_file_error">Prodúxose un error mentanto se lleía\'l ficheru</string>
     <string name="app_lookup_error">Error: l\'aplicación nun ta instalada</string>
     <string name="app_version_error">La versión instalada de «%s» nun ye compatible. Les versiones nueves comenzaron a cifrar dalgunos ficheros nel direutoriu del almacenamientu internu, lo que fai qu\'Aegis nun seya a acceder a la información que precisa pa la importación. Ye probable qu\'al tentar d\'importar se produza un error. ¿Quies siguir de toes toes?</string>
+    <string name="root_error">Error: nun ye posible consiguir l\'accesu de superusuariu</string>
     <plurals name="imported_entries_count">
         <item quantity="one">Importóse %d entrada</item>
         <item quantity="other">Importáronse %d entraes</item>
@@ -250,15 +292,14 @@
     <string name="partial_google_auth_import">Detectóse una esportación incompleta de Google Authenticator</string>
     <string name="partial_google_auth_import_warning">Falten dalgunos códigos QR na importación. Nun s\'atoparon los códigos siguientes:\n\n<b>%s</b>\n\nPues siguir cola importación d\'esta esportación parcial mas aconseyamos volver tentalo con tolos códigos QR pa que nun t\'arriesgues a perder l\'accesu a nengún pase.</string>
     <string name="missing_qr_code_descriptor">• Códigu QR %d</string>
-    <string name="import_partial_export_anyway">Importar %d pases de toes toes</string>
     <string name="import_google_auth_failure">La importación de la esportación de Google Authenticator falló</string>
     <string name="unrelated_google_auth_batches_error">La esportación contién información d\'un llote que nun tien rellación. Prueba a importar llotes d\'unu nunu.</string>
     <string name="no_tokens_can_be_imported">Como resultáu, nun se pue importar nengún pase</string>
-    <string name="authentication_method_raw">En bruto</string>
     <string name="unlocking_vault">Desbloquiando l\'arca</string>
-    <string name="slot_this_device">(esti preséu)</string>
+    <string name="rename_group">Renomar grupu</string>
     <string name="remove_group">Desaniciu d\'un grupu</string>
     <string name="remove_group_description">¿De xuru que quies quitar esti grupu? Les entraes d\'esti grupu cambien automáticamente al grupu «Ensin grupu».</string>
+    <string name="remove_unused_groups">Desaniciar grupos ensin usu</string>
     <string name="remove_icon_pack">Desaniciu d\'un paquete d\'iconos</string>
     <string name="remove_icon_pack_description">¿De xuru que quies quitar esti paquete d\'iconos? Esta aición nun va tener nengún efeutu sobre les entraes qu\'usen iconos d\'esti paquete.</string>
     <string name="details">Detalles</string>
@@ -266,13 +307,15 @@
     <string name="lock">Bloquiar</string>
     <string name="name">Nome</string>
     <string name="no_group">Ensin grupu</string>
-    <string name="sort">Ordenar</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ordenar</string>
     <string name="sort_alphabetically">Emisor (de l\'A a la Z)</string>
     <string name="sort_alphabetically_reverse">Emisor (de la Z a l\'A)</string>
     <string name="sort_alphabetically_name">Nome de cuenta (de l\'A a la Z)</string>
     <string name="sort_alphabetically_name_reverse">Nome de cuenta (de la Z a l\'A)</string>
     <string name="sort_usage_count">Númberu d\'usos</string>
+    <string name="sort_last_used">Últimu usu</string>
     <string name="sort_custom">Orde personalizáu</string>
+    <string name="last_used">Últimu usu</string>
     <string name="new_group">Grupu nuevu…</string>
     <string name="group">Grupu</string>
     <string name="group_name_hint">Nome del grupu</string>
@@ -281,12 +324,13 @@
     <string name="preference_reset_usage_count">Reafitar el númberu d\'usos</string>
     <string name="preference_reset_usage_count_summary">Reafita\'l númberu d\'usos de toles entraes de l\'arca</string>
     <string name="preference_reset_usage_count_dialog">¿De xuru que quies reafitar el númberu d\'usos de toles entraes de l\'arca?</string>
-    <string name="note">Nota</string>
+    <string name="note" comment="Users can add a note to an entry">Nota</string>
     <string name="clear">Borrar</string>
     <string name="pref_highlight_entry_title">Rescamplar los pases al tocalos</string>
     <string name="pref_highlight_entry_summary">Fai que los pases s\'estremen meyor al rescamplalos temporalmente cuando toques nellos</string>
     <string name="pref_minimize_on_copy_title">Minimizar al copiar</string>
     <string name="pref_minimize_on_copy_summary">Minimiza l\'aplicación dempués de copiar un pase</string>
+    <string name="pref_search_behavior_title">Comportamientu de la busca</string>
     <string name="pref_pause_entry_title">Paralizar los pases al tocalos</string>
     <string name="pref_pause_entry_summary">Posa l\'anovamientu automáticu de los pases al tocar nellos y, polo tanto, nun s\'anueven mentanto tengan el focu. Esta opción rique l\'activación de les opciones «Rescamplar los pases al tocalos» o «Tocar pa desvelar».</string>
     <string name="pin_keyboard_description">Activa la contraseña p\'activar el tecláu numbéricu. Decátate qu\'esta opción namás funciona si la contraseña ta formada namás por númberos</string>
@@ -304,14 +348,10 @@
     <string name="small_mode_title">Pequeñu</string>
     <string name="unknown_issuer">Emisor desconocíu</string>
     <string name="unknown_account_name">Nome de cuenta desconocíu</string>
-    <plurals name="import_error_dialog">
-        <item quantity="one">Aegis nun pudo importar %d pase, polo que se saltó. Primi «Detalles» pa ver más información tocante a los errores.</item>
-        <item quantity="other">Aegis nun pudieron importar %d pases, polo que se saltaron. Primi «Detalles» pa ver más información tocante a los errores.</item>
-    </plurals>
     <string name="unable_to_process_deeplink">Nun ye posible procesar l\'enllaz fondu</string>
     <string name="unable_to_read_qrcode_file">Nun se posible lleer ya procesar el códigu QR del ficheru: %s.</string>
     <string name="unable_to_process_shared_text">Nun ye posible procesar el testu compartíu como cadena d\'OTP</string>
-    <string name="unable_to_read_qrcode_files">Nun ye posible lleer ya procesar dalgunos códigos QR. Namás van esportase %d/%d entraes.</string>
+    <string name="unable_to_read_qrcode_files">Nun ye posible lleer ya procesar dalgunos códigos QR. Namás van importase %1$d/%2$d entraes.</string>
     <string name="unable_to_generate_qrcode">Nun ye posible xenerar el códigu QR</string>
     <string name="select_picture">Seleición d\'una semeya</string>
     <string name="select_icon">Seleición d\'un iconu</string>
@@ -342,12 +382,10 @@
     <string name="time_sync_warning_message">Aegis encóntase na hora del sistema pa xenerar códigos correutos ya la esviación d\'unos segundos na hora podría facer que se xeneren códigos incorreutos. Paez que\'l preséu nun ta configuráu pa sincronizar automáticamente la hora. ¿Quies facelo agora?</string>
     <string name="time_sync_warning_disable">Dexar d\'alvertime, sé lo que faigo.</string>
     <string name="google_qr_export_unrelated">Atopóse un códigu QR que nun tien rellación. Prueba a reaniciar l\'escaniador.</string>
-    <plurals name="google_qr_export_scanned">
-        <item quantity="one">Escanióse %d/%d códigos QR</item>
-        <item quantity="other">Escaniáronse %d/%d códigos QR</item>
-    </plurals>
-    <string name="google_qr_export_unexpected">Esperábase\'l códigu QR #%d, mas escanióse\'l #%d</string>
+    <string name="google_qr_export_unexpected">Esperábase\'l códigu QR #%1$d, mas escanióse\'l #%2$d</string>
     <string name="backup_error_bar_message"><b>La copia de seguranza de l\'arca falló apocayá</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Falló un intentu recién de facer una copia de seguranza de l\'arca con «%1$s» porque se produxo un error (data de l\'aición: %2$s). Revisa la configuración pa que les copies de seguranza puedan facese correutamente.
+    </string>
     <string name="backup_system_builtin">Copies de seguranza automátiques d\'Aegis</string>
     <string name="backup_system_android">Sistema de copies de segurazan na ñube d\'Android</string>
     <string name="backup_plaintext_export_warning"><b>L\'arca esportóse apocayá a un ficheru de testu planu</b></string>
@@ -369,9 +407,9 @@
     </plurals>
     <string name="next">Siguiente</string>
     <string name="previous">Anterior</string>
+    <string name="copy_uri">Copiar la URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Nun ye posible copiar la URI al cartafueyu</string>
     <string name="uri_copied_to_clipboard">La URI copióse al cartafueyu</string>
-    <string name="transfer_entry">Tresferencia d\'una entrada</string>
     <string name="transfer_entry_description">Escania esti códígu QR cola aplicación autenticadora a la que quies tresferir esta entrada</string>
     <string name="google_auth_compatible_transfer_description">Escania estos códigos QR con Aegis o con Google Authenticator.\n\nPola mor de les llendes de l\'aplicación Google Authenticator, namás s\'inclúin pases TOTP ya HOTP qu\'usen el hash SHA1 ya produzan códigos de 6 díxitos</string>
     <string name="password_strength_very_weak">Perpoco segura</string>
@@ -387,25 +425,26 @@
     <string name="title_activity_about">Tocante a</string>
     <string name="title_activity_edit_entry">Edición d\'una entrada</string>
     <string name="title_activity_scan_qr">Escanéu d\'un códigu QR</string>
-    <string name="title_activity_manage_slots">Xestión de les claves</string>
     <string name="title_activity_import_entries">Importación d\'entraes</string>
+    <string name="title_activity_licenses">Llicencies de terceros</string>
     <string name="dialog_wipe_entries_title">Borráu d\'entraes</string>
     <string name="dialog_wipe_entries_message">L\'arca xá contién entraes. ¿Quies quitales enantes d\'importar esti ficheru?\n\n<b>Al facelo, vas perder permanentemente l\'accesu a les entraes esistentes de l\'arca.</b></string>
     <string name="dialog_wipe_entries_checkbox">Borrar el conteníu de l\'arca</string>
     <string name="panic_trigger_ignore_toast">Aegis recibió un eventu de pánicu mas la opción ta desactivada</string>
     <string name="pref_panic_trigger_title">Desaniciar l\'arca n\'eventos de pánicu</string>
     <string name="pref_panic_trigger_summary">Desaniciar l\'arca al recibir un eventu de pánicu de Ripple</string>
-    <string name="import_vault">Importar l\'arca</string>
+    <string name="import_vault">Importar un arca d\'Aegis</string>
     <string name="importer_help_2fas">Forni una copia de seguranza de 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Forni un ficheru d\'esportación/copia de seguranza d\'Aegis.</string>
     <string name="importer_help_authenticator_plus">Forni un ficheru d\'esportación d\'Authenticator Plus que se consigue pente <b>Configuración -&gt; Copia de seguranza ya restauración -&gt; Esportar como testu ya HTML</b>.</string>
     <string name="importer_help_authy">Forni una copia del ficheru <b>com.authy.storage.tokens.authenticator.xml</b> que s\'alluga na direición «/data/data/com.authy.authy/shared_prefs/», dientro del direutoriu del almacenamientu internu d\'Authy.</string>
     <string name="importer_help_andotp">Forni un ficheru d\'esportación/copia de seguranza d\'AndOTP.</string>
     <string name="importer_help_bitwarden">Forni un ficheru d\'esportación/copia de seguranza de Bitwarden. Los ficheros cifraos nun son compatibles.</string>
-    <string name="importer_help_battle_net_authenticator">Forni una copia del ficheru <b>com.blizzard.bma.AUTH_STORE.xml</b> que s\'alluga na direición «/data/data/com.blizzard.bma/shared_prefs/», dientro del direutoriu del almacenamientu internu de Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Forni una copia del ficheru <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, llocalizáu nel direutoriu del almacenamientu internu de Battle.net Authenticator.</string>
     <string name="importer_help_duo">Forni una copia del ficheru <b>accounts.json</b> que s\'alluga na direición «/data/data/com.duosecurity.duomobile/files/duokit/», dientro del direutoriu del almacenamientu internu de DUO.</string>
-    <string name="importer_help_freeotp">Forni una copia del ficheru <b>tokens.xml</b> que s\'alluga na direición «/data/data/org.fedorahosted.freeotp/shared_prefs/», dientro del direutoriu del almacenamientu internu de FreeOTP.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: forni una copia de seguranza.\nFreeOTP 1.x: forni una copia del ficheru <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, llocalizáu nel direutoriu del almacenamientu internu de FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Forni un ficheru d\'esportación de FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilidá con FreeOTP 2</string>
     <string name="importer_help_google_authenticator"><b>Namás les bases de datos de la versión 5.10 ya les inferiores de Google Authenticator son compatibles.</b>\n\nForni una copia de <b>databases</b> que s\'alluga na direición «/data/data/com.google.android.apps.authenticator2/databases/», dientro del direutoriu del almacenamientu internu de Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Forni una copia del ficheru <b>PhoneFactor</b> que s\'alluga na direición «/data/data/com.azure.authenticator/databases/», dientro del direutoriu del almacenamientu internu de Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Forni un ficheru en testu planu con una URI de Google Authenticator en cada llinia.</string>
@@ -422,6 +461,15 @@
     <string name="pref_grouping_size_two">Grupos de 2</string>
     <string name="pref_grouping_size_three">Grupos de 3</string>
     <string name="pref_grouping_size_four">Grupos de 4</string>
+    <string name="pref_copy_behavior_never">Enxamás</string>
+    <string name="pref_copy_behavior_single_tap">Un toque</string>
+    <string name="pref_copy_behavior_double_tap">Dos toques</string>
+    <string name="pref_account_name_position_end">Al llau l\'emisor</string>
+    <string name="pref_account_name_position_below">Embaxo l\'emisor</string>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">fai %d minutu</item>
+        <item quantity="other">fai %d minutos</item>
+    </plurals>
     <plurals name="dropdown_checkboxes_default_count">
         <item quantity="one">Seleicionóse %d elementu</item>
         <item quantity="other">Seleicionáronse %d elementos</item>
diff --git a/app/src/main/res/values-bg-rBG-v29/strings.xml b/app/src/main/res/values-bg-rBG-v29/strings.xml
new file mode 100644
index 00000000..9f566bd3
--- /dev/null
+++ b/app/src/main/res/values-bg-rBG-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Системна</string>
+    <string name="system_amoled_theme_title">Системна (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 80a46b94..c3a4864f 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Настройки</string>
     <string name="action_about">Относно</string>
     <string name="action_delete">Изтриване</string>
@@ -10,63 +10,96 @@
     <string name="action_default_icon">Възстановяване на подразбирана икона</string>
     <string name="discard">Отхвърляне</string>
     <string name="save">Запазване</string>
+    <string name="all">Всички</string>
     <string name="issuer">Издател</string>
     <string name="yandex_pin">PIN (4–16 цифри)</string>
     <string name="motp_pin">PIN (4 цифри)</string>
+    <string name="suggested">Препоръчително</string>
     <string name="usage_count">Брой използвания</string>
     <string name="warning">Внимание</string>
     <string name="pref_cat_appearance_app">Приложение</string>
     <string name="pref_cat_appearance_entries">Записи</string>
     <string name="pref_cat_backups_android">Андроид</string>
     <string name="pref_cat_backups_auto">Автоматични резервни копия</string>
-    <string name="pref_section_behavior_title">Режим на работа</string>
-    <string name="pref_section_behavior_summary">Персонализирайте режима на работа при взаимодействие със списъка с записи.</string>
+    <string name="pref_section_behavior_title">Поведение</string>
+    <string name="pref_section_behavior_summary">Настройки на поведението при взаимодействие със списъка със записи.</string>
     <string name="pref_section_appearance_title">Външен вид</string>
-    <string name="pref_section_appearance_summary">Изберете темата, езика и други настройки, които влияят на външния вид на приложението.</string>
+    <string name="pref_section_appearance_summary">Тема, език и други настройки, които влияят на външния вид на приложението.</string>
     <string name="pref_section_security_title">Сигурност</string>
-    <string name="pref_section_security_summary">Настройка на шифроване, отключване с биометрични данни, автоматично заключване и други настройки за сигурност.</string>
-    <string name="pref_section_import_export_title">Импорт &amp; Експорт</string>
-    <string name="pref_section_import_export_summary">Импортирайте резервни копия на Aegis или други приложения за удостоверяване. Създайте ръчно експортиране на своя Aegis трезор.</string>
+    <string name="pref_section_security_summary">Настройки на шифроване, отключване с биометрични данни, автоматично заключване и други настройки за сигурност.</string>
+    <string name="pref_section_import_export_title">Внасяне и изнасяне</string>
+    <string name="pref_section_import_export_summary">Внасяне на резервни копия от Aegis или други приложения за удостоверяване. Ръчно изнасяне на хранилището на Aegis.</string>
+    <string name="pref_section_audit_log_title">Одитен дневник</string>
+    <string name="pref_section_audit_log_summary">Списък с всички важни събития, докладвани от приложението.</string>
     <string name="pref_section_backups_title">Резервни копия</string>
     <string name="pref_section_backups_summary">Настройте автоматични резервни копия на избрано от вас място или се възползвайте от облачната услуга за резервни копия на Андроид.</string>
     <string name="pref_section_icon_packs">Пакети с икони</string>
     <string name="pref_section_icon_packs_summary">Управление и внасяне на пакети с икони</string>
     <string name="pref_select_theme_title">Тема</string>
-    <string name="pref_view_mode_title">Режим на преглед</string>
+    <string name="pref_dynamic_colors_title">Динамични цветове</string>
+    <string name="pref_dynamic_colors_summary">Цвета на прозрачния слой да подхожда на темата на Андроид</string>
+    <string name="pref_view_mode_title">Изглед на списъка</string>
     <string name="pref_lang_title">Език</string>
     <string name="pref_show_icons_title">Показване на икони</string>
     <string name="pref_show_icons_summary">До всеки запис да се показва икона</string>
     <string name="pref_code_group_size_title">Групиране на цифрите на кода</string>
     <string name="pref_code_group_size_summary">Изберете как да бъдат групирани цифрите на кода</string>
     <string name="pref_account_name_position_title">Име на профила</string>
+    <string name="pref_show_next_code_title">Показване на следващия код</string>
+    <string name="pref_show_next_code_summary">Предварително създаване и показване на следващия код</string>
+    <string name="pref_expiration_state_title">Индикатор за изтичащи кодове</string>
+    <string name="pref_expiration_state_summary">Променете цвета на кодовете и мигането, когато изтичат</string>
+    <string name="pref_expiration_state_fallback">Променете цвета на кодовете, когато изтичат</string>
     <string name="pref_shared_issuer_account_name_title">Показване на името на профила при необходимост</string>
     <string name="pref_shared_issuer_account_name_summary">Показва имената на профилите само когато имат един и същ издател. Другите имена на профили ще бъдат скрити.</string>
-    <string name="pref_account_name_position_summary_override">Тази настройка е заменена от режима на изглед на плочки. Името на профила винаги ще се показва под издателя.</string>
+    <string name="pref_account_name_position_summary_override">Тази настройка е заменена от режима на изглед на плочки. Името на профила ще се показва под издателя.</string>
     <string name="pref_import_file_title">Внасяне от файл</string>
-    <string name="pref_import_file_summary">Импортиране на токени от файл</string>
-    <string name="pref_backups_title">Автоматично архивирайте трезора</string>
-    <string name="pref_backups_summary">Автоматично създавайте резервни копия на трезора във външно хранилище, когато се правят промени. Това се поддържа само за шифровани трезори.</string>
+    <string name="pref_import_file_summary">Внасяне на кодове за защита от файл</string>
+    <string name="pref_android_backups_title">Облачни резервни копия на Андроид</string>
+    <string name="pref_android_backups_summary">Позволете на системата на Android за резервни копия в облака да включи хранилището на Aegis в резервните копия. Поддържа само шифровани хранилища.</string>
+    <string name="pref_android_backups_hint"><i>Резервни копия от едно устройство на друго се поддържат винаги, без значение от горната настройка.</i></string>
+    <string name="pref_backups_title">Автоматично резервно копие на хранилището</string>
+    <string name="pref_backups_summary">При промени, автоматично се създават резервни копия на хранилището във външната памет. Поддържа само шифровани хранилища.</string>
     <string name="pref_backups_reminder_title">Напомняне за резервни копия</string>
     <string name="pref_backups_reminder_summary">Покзва напомняне да направите резервно копие, в случай че нямате копие на последните промени.</string>
-    <string name="pref_backups_location_title">Директория за архивни файлове</string>
-    <string name="pref_backups_location_summary">Архивите ще се съхраняват в</string>
-    <string name="pref_backups_trigger_title">Задействайте архивиране</string>
-    <string name="pref_backups_trigger_summary">Ръчно задействайте архивиране</string>
+    <string name="pref_backups_reminder_dialog_title">Изключване на напомняне за резервно копие</string>
+    <string name="pref_backups_reminder_dialog_summary">Ако изключите напомнянето, Aegis няма да ви казва дали имате промени, за които няма резервно копие. Това ви излага на риск от загуба на достъп до съответните профили. Сигурни ли сте, че искате да изключите това напомняне?</string>
+    <string name="pref_backups_versioning_strategy_title">Стратегия за резервни копия</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Пазене на определен брой версии</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Едно резервно копие</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Избраната стеатегия е ненадеждна и не се препоръчва. Повредата да едно резервно копие ще доведе до загуба на единственото резервно копие.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Изберете стратегия за резервните копия</string>
+    <string name="pref_backups_location_title">Място на резервните копия</string>
+    <string name="pref_backups_location_summary">Резервните копия ще бъдат създавани в</string>
+    <string name="pref_backup_location_summary">Резервните копия ще бъдат създавани в</string>
+    <string name="pref_backups_trigger_title">Създаване на резервно копие</string>
+    <string name="pref_backups_trigger_summary">Ръчно създава резервни копия</string>
     <string name="pref_backups_versions_title">Брой версии, които трябва да се запазят</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
-        <item quantity="one">Запазете %1$d версия на архива</item>
-        <item quantity="other">Запазете %1$d версии на архива</item>
+        <item quantity="one">Запазва се %1$d резервно копие</item>
+        <item quantity="other">Запазват се %1$d резервни копия</item>
     </plurals>
-    <string name="pref_import_app_title">Импортиране от приложение</string>
-    <string name="pref_import_app_summary">Импортиране на токени от приложение (изисква root достъп)</string>
-    <string name="pref_export_title">Експортиране</string>
-    <string name="pref_export_summary">Експортирайте трезора</string>
-    <string name="pref_password_reminder_title">Напомняне за парола</string>
+    <string name="pref_backups_versions_infinite_summary">Пазене на неограничен брой архивни копия</string>
+    <string name="pref_import_app_title">Внасяне от приложение</string>
+    <string name="pref_import_app_summary">Внасяне на кодове за защита от приложение (изисква суперпотребител)</string>
+    <string name="pref_export_title">Изнасяне</string>
+    <string name="pref_export_summary">Изнасяне на хранилището</string>
+    <string name="pref_password_reminder_title">Припомняне на паролата</string>
+    <string name="pref_google_auth_export_title">Изнасяне за Google Authenticator</string>
+    <string name="pref_google_auth_export_descriptor">Създава кодове за QR, съвместими с Google Authenticator</string>
+    <string name="pref_google_auth_export_no_data">Няма данни, които дабъдат изнесени</string>
+    <plurals name="pref_google_auth_export_incompatible_entries">
+        <item quantity="one">Пропуснат е %d несъвместим елемент</item>
+        <item quantity="other">Пропуснати са %d несъвместими елемента</item>
+    </plurals>
+    <string name="pref_password_reminder_summary">%s показва напомняне да въведете паролата за приложението, за да не я забравите.</string>
+    <string name="pref_password_reminder_summary_disabled">Изключено</string>
     <string name="pref_secure_screen_title">Сигурност на екрана</string>
     <string name="pref_secure_screen_summary">Блокирайте екранни снимки и други опити за заснемане на екрана в приложението</string>
-    <string name="pref_tap_to_reveal_title">Докоснете, за да разкриете</string>
-    <string name="pref_tap_to_reveal_summary">Токените ще бъдат скрити по подразбиране. Докоснете токените, за да разкриете кода.</string>
-    <string name="pref_tap_to_reveal_time_title">Време за изчакване, за да се разкрие</string>
+    <string name="pref_tap_to_reveal_title">Показване при докосване</string>
+    <string name="pref_tap_to_reveal_summary">Кодовете за защита ще бъдат скрити по подразбиране. Докоснете елемент от списъка, за да се покаже кода.</string>
+    <string name="pref_tap_to_reveal_time_title">Период на показване при докосване</string>
     <string name="pref_auto_lock_title">Авт. заключване</string>
     <string name="pref_auto_lock_summary">Когато %s</string>
     <string name="pref_auto_lock_summary_disabled">Изключен</string>
@@ -74,252 +107,475 @@
     <string name="pref_auto_lock_type_back_button">Бутонът за връщане назад е натиснат</string>
     <string name="pref_auto_lock_type_minimize">Приложението е минимизирано</string>
     <string name="pref_auto_lock_type_device_lock">Устройството е заключено</string>
+    <string name="pref_backup_password_category">Резервни копия и изнасяне</string>
+    <string name="pref_backup_password_title">Отделни пароли за резервни копия и изнасяне</string>
+    <string name="pref_backup_password_summary">Ако е включено, паролата, отключваща приложението не може да бъде използвана за резервни копия и изнасяне.</string>
+    <string name="pref_backup_password_change_title">Промяна на паролата за резервни копия и изнасяне</string>
+    <string name="pref_backup_password_change_summary">Задава нова парола за шифроване на хранилището при създаване на резервни копия и изнасяне.</string>
     <string name="pref_encryption_title">Шифроване</string>
-    <string name="pref_encryption_summary">Шифроване на хранилището, отключване с парола или биометрични нанни</string>
+    <string name="pref_encryption_summary">Шифроване на хранилището, отключване с парола или биометрични данни</string>
     <string name="pref_biometrics_title">Отключване с биометрични данни</string>
     <string name="pref_biometrics_summary">Разрешава удостоверяване с биометрични данни, за отключване на хранилището</string>
+    <string name="pref_search_behavior_summary">Търсене в: %s</string>
+    <string name="pref_search_behavior_prompt">Търсене в следните полета</string>
+    <string name="pref_search_behavior_type_name">Име</string>
+    <string name="pref_search_behavior_type_issuer">Издател</string>
+    <string name="pref_search_behavior_type_note">Бележка</string>
+    <string name="pref_search_behavior_type_groups">Групи</string>
     <string name="pref_set_password_title">Смяна на паролата</string>
-    <string name="pref_set_password_summary">Задайте нова парола, която ще ви трябва, за да отключите трезора си</string>
-    <string name="export_encrypted">Шифровайте трезора</string>
-    <string name="export_help">Това действие ще експортира трезора от вътрешното хранилище на Aegis. Изберете формата, който искате да бъде експорта ви:</string>
-    <string name="export_warning_unencrypted">На път сте да експортирате нешифровано копие на своя Aegis трезор. <b>Това не се препоръчва</b>.</string>
+    <string name="pref_set_password_summary">Задайте нова парола, с която да отключвате хранилището</string>
+    <string name="no_events_title">Не са докладвани събития</string>
+    <string name="no_events_description">Няма важни събития, докладвани от приложението</string>
+    <string name="event_title_vault_unlocked">Хранилището е отключено</string>
+    <string name="event_description_vault_unlocked">Хранилището успешно е отключено</string>
+    <string name="event_title_backup_created">Създадено е резервно копие</string>
+    <string name="event_description_backup_created">Резервно копие на хранилището успешно е създадено</string>
+    <string name="event_title_android_backup_created">Създадено е резервно копие от Андроид</string>
+    <string name="event_description_android_backup_created">Резервно копие на хранилището успешно е създадено от Андроид</string>
+    <string name="event_title_vault_exported">Хранилището е изнесено</string>
+    <string name="event_description_vault_exported">Копие на хранилището е изнесено</string>
+    <string name="event_title_entry_shared">Споделен е запис</string>
+    <string name="event_description_entry_shared">Запис е споделен</string>
+    <string name="event_title_vault_unlock_failed_password">Неуспешно отключване на хранилището (парола)</string>
+    <string name="event_description_vault_unlock_failed_password">Опит за отключване на хранилището с парола е неуспешен</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Неуспешно отключване на хранилището (биометрични данни)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Опит за отключване на хранилището с биометрични данни е неуспешен</string>
+    <string name="event_unknown">Неизвестен вид събитие</string>
+    <string name="audit_log_entry_deleted">(премахнато)</string>
+    <string name="today_at_time">Днес в %1$s</string>
+    <string name="day_of_week_at_time">%1$s в %2$s</string>
+    <string name="export_encrypted">Шифроване на хранилището</string>
+    <string name="export_help">По този начин ще бъде изнесено хранилището на Aegis от вътрешната памет. Изберете формата на данните, в който искате да бъдат изнесени:</string>
+    <string name="export_warning_unencrypted">На път сте да изнесете нешифровано копие на хранилището на Aegis. <b>Това е силно непрепоръчително</b>.</string>
+    <string name="export_warning_password">Изнасяните данни се шифроват с отделна парола, която се задава в раздел Сигурност.</string>
+    <string name="understand_risk_accept">Разбирам риска</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
     <string name="export_format_google_auth_uri">Текстов файл (.TXT)</string>
-    <string name="export_format_hint">Експорт формат</string>
+    <string name="export_format_html">Интернет страница (.HTML)</string>
+    <string name="export_format_hint">Изнасяне като</string>
+    <string name="export_all_groups">Изнасяне на всички групи</string>
+    <string name="export_choose_groups">Изберете кои групи да бъдат изнесени</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="one">%d избрана група</item>
+        <item quantity="other">%d избрани групи</item>
+    </plurals>
+    <string name="export_no_groups_selected">Не са избрани групи, които да бъдат изнесени</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Изнесени данни от Aegis Authenticator</string>
     <string name="choose_authentication_method">Сигурност</string>
-    <string name="authentication_method_explanation">Aegis е 2FA приложение, фокусирано върху сигурността. Токените се съхраняват в трезор, който по желание може да бъде шифрован с избрана от вас парола. Ако нападател получи вашия шифрован файл на трезора, той няма да може да осъществи достъп до съдържанието, без да знае паролата. \n\nПодбрахме опцията, която според нас най-добре пасва на вашето устройство.</string>
+    <string name="authentication_method_explanation">Aegis е 2FA приложение, фокусирано върху сигурността. Кодовете за защита се пазят в хранилище, което по желание може да бъде шифровано с избрана от вас парола. Ако нападател получи шифрования файл на хранилището, той няма да може да осъществи достъп до съдържанието му, без паролата. \n\nПодбрахме стойността, която според нас най-добре пасва на устройството.</string>
     <string name="authentication_method_none">Нищо</string>
-    <string name="authentication_method_none_description">За отключване на трезора не е необходима парола, следователно той няма да бъде шифрован. <b>Тази опция не се препоръчва</b>.</string>
+    <string name="authentication_method_none_description">За отключване на хранилището не е необходима парола и то няма да бъде шифровано. <b>Това е силно непрепоръчително</b>.</string>
     <string name="authentication_method_password">Парола</string>
-    <string name="authentication_method_password_description">За отключване на трезора е необходима парола.</string>
-    <string name="authentication_method_password_explanation">Предупреждение: Ако забравите паролата си, ще загубите трайно достъп до вашите токени. Няма начин да ги възстановите без паролата.</string>
+    <string name="authentication_method_password_description">Хранилището се отключва с парола.</string>
+    <string name="authentication_method_password_explanation">Предупреждение: Ако забравите паролата си, ще загубите трайно достъп до кодовете за защита. Няма начин да ги възстановите без паролата.</string>
     <string name="authentication_method_biometrics">Биометрични данни</string>
-    <string name="authentication_method_biometrics_description">В допълнение към парола, биометрични данни, регистрирани на това устройство, като пръстов отпечатък или лицето Ви, могат да се използват за отключване на трезора.</string>
-    <string name="authentication">Отключете трезора</string>
-    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Отключете\nтрезора</string>
+    <string name="authentication_method_biometrics_description">В допълнение към паролата, биометрични данни, регистрирани на това устройство, като пръстов отпечатък или лицето ви, могат да се използват за отключване на хранилището.</string>
+    <string name="authentication">Отключване на хранилище</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Отключете\nхранилището</string>
     <string name="auth_use_biometrics">Или докоснете тук, за да използвате <font fgcolor="#FF0D86C1">биометрични данни</font></string>
     <string name="set_password">Моля въведете парола</string>
     <string name="set_group">Моля, въведете име на групата</string>
-    <string name="set_number">Моля въведете номер</string>
+    <string name="set_number">Въведете число</string>
     <string name="set_password_confirm">Моля, потвърдете паролата</string>
     <string name="invalid_password">Паролата е неправилна</string>
     <string name="invalidated_biometrics">Установена е промяна в настройките за защита на устройството. Посетете „Aegis -&gt; Настройки -&gt; Сигурност -&gt; Биометрично отключване“, изключете и отново включете биометричното отключване.</string>
-    <string name="password_reminder">Въведете паролата си. Понякога искаме да я въведете, за да не я забравите.</string>
+    <string name="password_reminder">Въведете паролата си. Понякога искаме от вас да я въвеждате, за да не я забравите.</string>
     <string name="password_reminder_dialog_title">Отключване с биометрични данни по подразбиране</string>
-    <string name="password_reminder_dialog_message">Понякога искаме да въведете паролата си, за да не я забравите и така да останете без достъп до трезора. След като я въведете един път, Aegis отново ще използва биометрични данни при отключване, докато не дойде време отново да си припомните паролата.</string>
+    <string name="password_reminder_dialog_message">Понякога искаме от вас да въвеждате паролата си, за да не я забравите и така да останете без достъп до хранилището. След като я въведете веднъж Aegis отново ще използва биометрични данни при отключване, докато не дойде време отново да си припомните паролата.</string>
+    <string name="password_reminder_freq_never">Никога</string>
+    <string name="password_reminder_freq_weekly">Веднъж седмично</string>
+    <string name="password_reminder_freq_biweekly">Веднъж на две седмици</string>
+    <string name="password_reminder_freq_monthly">Веднъж месечно</string>
+    <string name="password_reminder_freq_quarterly">Веднъж на тримесечие</string>
+    <string name="enter_password_2fas_message">Изглежда това резервно копие на 2FAS е шифровано. Въведете паролата.</string>
     <string name="enter_password_authy_message">Изглежда, че вашите Authy токени са шифровани. Моля, затворете Aegis, отворете Authy и отключете токените с паролата си. Вместо това Aegis може също да се опита да дешифрира вашите Authy токени вместо вас, ако въведете паролата си по-долу.</string>
+    <string name="enter_password_aegis_title">Въведете паролата за внасяне</string>
     <string name="period_hint">Период (секунди)</string>
-    <string name="algorithm_hint">Хаш функция</string>
+    <string name="algorithm_hint">Хешираща функция</string>
     <string name="type">Вид</string>
-    <string name="share">Сподели</string>
+    <string name="share">Споделяне</string>
     <string name="yes">Да</string>
     <string name="no">Не</string>
-    <string name="unlock">Отключи</string>
+    <string name="undo">Отменяне</string>
+    <string name="unlock">Отключване</string>
     <string name="advanced">Разширени</string>
     <string name="counter">Брояч</string>
     <string name="digits">Цифри</string>
-    <string name="secret">Секретен</string>
+    <string name="secret">Тайна</string>
     <string name="scan">Сканиране на код за QR</string>
     <string name="scan_image">Сканиране на изображение</string>
     <string name="enter_manually">Ръчно въвеждане</string>
-    <string name="set_up_biometric">Настройте биометрично отключване</string>
-    <string name="copy">Копирай</string>
-    <string name="edit">Промени</string>
+    <string name="set_up_biometric">Отключване с биометрични данни</string>
+    <string name="copy">Копиране</string>
+    <string name="edit">Променяне</string>
+    <string name="select_all">Избиране на всички</string>
+    <string name="assign_icons">Задаване на икони</string>
+    <string name="assign_groups">Прибавяне към група</string>
+    <string name="assign_groups_dialog_summary">Изберете групата, в която да добавите избраните записи.</string>
+    <string name="assign_groups_dialog_dropdown">Избиране на група</string>
+    <string name="favorite" comment="Verb">Добавя в избрани</string>
+    <string name="unfavorite" comment="Verb">Премахва от избраните</string>
+    <string name="error_all_caps">ГРЕШКА</string>
     <string name="password">Парола</string>
-    <string name="confirm_password">Потвърди паролата</string>
-    <string name="show_password">Покажи парола</string>
-    <string name="new_entry">Hово въвеждане</string>
-    <string name="add_new_entry">Добави ново въвеждане</string>
-    <string name="unlock_vault_error">Неуспешно отключване на трезора</string>
-    <string name="unlock_vault_error_description">Грешна парола. Уверете се, че не сте въвели неправилно паролата си.</string>
+    <string name="confirm_password">Потвърждаване на паролата</string>
+    <string name="show_password">Показване на паролата</string>
+    <string name="new_entry">Нов запис</string>
+    <string name="add_new_entry">Добавяне на запис</string>
+    <string name="unlock_vault_error">Неуспешно отключване на хранилището</string>
+    <string name="unlock_vault_error_description">Грешна парола. Уверете се, че сте въвели правилно паролата.</string>
     <string name="password_equality_error">Паролите трябва да са еднакви и да не са празни</string>
-    <string name="snackbar_authentication_method">Моля, изберете метод за удостоверяване</string>
+    <string name="snackbar_authentication_method">Изберете метод за удостоверяване</string>
     <string name="encrypting_vault">Шифроване на трезора</string>
-    <string name="exporting_vault">Експортиране на трезора</string>
-    <string name="reading_file">Четене на файла</string>
-    <string name="delete_entry">Изтрий запис</string>
-    <string name="delete_entry_description">Сигурни ли сте, че искате да изтриете този запис?</string>
-    <string name="delete_entries">Изтрий записите</string>
+    <string name="exporting_vault">Изнасяне на трезора</string>
+    <string name="optimizing_icon">Оптимизиране на пиктограма</string>
+    <string name="optimizing_icon_multiple">Оптимизиране на пиктограми %1$d/%2$d</string>
+    <string name="reading_file">Прочитане на файла</string>
+    <string name="requesting_root_access">Достъп до правата на суперпотребителя</string>
+    <string name="analyzing_qr">Анализиране на QR кода</string>
+    <string name="analyzing_qr_multiple">Анализиране на QR код %1$d/%2$d (%3$s)</string>
+    <plurals name="added_new_entries">
+        <item quantity="one">Към хранилището е добавен %d запис</item>
+        <item quantity="other">Към хранилището са добавени %d записа</item>
+    </plurals>
+    <string name="importing_icon_pack">Внасяне на пакет с икони</string>
+    <string name="delete_entry">Изтриване на запис</string>
+    <string name="delete_entry_description">Сигурни ли сте, че искате записът да бъде изтрит?</string>
+    <string name="delete_entry_explanation">Това действие не изключва 2FA в\n<b>%s</b>\n\n. За да предотвратите загуба на достъп, се уверете, че сте изключили 2FA за съответната услуга или че имате друг начин за генериране на кодове за достъп до нея.</string>
+    <string name="delete_entries">Изтриване на записи</string>
     <plurals name="delete_entries_description">
-        <item quantity="one">Наистина ли искате да изтриете %d записа?</item>
-        <item quantity="other">Наистина ли искате да изтриете %d записите?</item>
+        <item quantity="one">Наистина ли искате %d запис да бъде изтрит?</item>
+        <item quantity="other">Наистина ли искате %d записа да бъдат изтрити?</item>
     </plurals>
     <string name="discard_changes">Отхвърляне на промените?</string>
-    <string name="discard_changes_description">Промените Ви не са записани</string>
+    <string name="discard_changes_description">Промените все още не са запазени</string>
     <string name="saving_profile_error">Грешка при запазването на профила</string>
+    <string name="saving_assign_icons_error">Грешка при задаване на икони</string>
     <string name="welcome">Добре дошли</string>
-    <string name="app_description">Aegis е безплатно, сигурно и с отворен код 2FA приложение</string>
+    <string name="app_description">Aegis е безплатно, сигурно приложение за 2FA с отворен код</string>
     <string name="setup_completed">Настройката е завършена</string>
     <string name="setup_completed_description">Aegis е готов за работа.</string>
-    <string name="vault_not_found">Трезорът не е намерен, стартиране на настройване…</string>
+    <string name="vault_not_found">Не е намерено хранилище, настройване…</string>
     <string name="copied">Копирано</string>
-    <string name="errors_copied">Грешки, копирани в клипборда</string>
-    <string name="version_copied">Версия, копирани в клипборда</string>
+    <string name="errors_copied">Грешките са копирани</string>
+    <string name="version_copied">Изданието е копирано</string>
+    <string name="error_required_field">Полето е задължително</string>
     <string name="error_occurred">Възникна грешка</string>
-    <string name="decryption_error">Възникна грешка при опит за отключване на трезора</string>
-    <string name="decryption_corrupt_error">Възникна грешка при опит за отключване на трезора. Вашият трезорен файл може да е повреден.</string>
-    <string name="saving_error">Възникна грешка при опит за запазване на трезора</string>
-    <string name="vault_init_error">Възникна грешка при опит за инициализиране на трезора</string>
-    <string name="vault_load_error">Възникна грешка при опит за зареждане на трезора от хранилището</string>
-    <string name="biometric_decrypt_error">Възникна грешка при опит за дешифриране на трезора с биометрично удостоверяване. Това обикновено се случва само ако настройките за защита на вашето устройство са били променени. Моля, отключете трезора с паролата си и реконфигурирайте биометричното удостоверяване в настройките на Aegis.</string>
-    <string name="biometric_init_error">Възникна грешка при опит за изготвяне на биометрично удостоверяване. Това обикновено се случва само ако настройките за защита на вашето устройство са били променени. Моля, отключете трезора с паролата си и реконфигурирайте биометричното удостоверяване в настройките на Aegis.</string>
-    <string name="disable_encryption">Изключи шифроване</string>
-    <string name="disable_encryption_description">Наистина ли искате да деактивирате шифроването? Това ще доведе до съхранение на трезора в обикновен текст. <b>Автоматичните архиви също ще бъдат деактивирани</b>.</string>
-    <string name="enable_encryption_error">Възникна грешка при активиране на шифроване</string>
-    <string name="disable_encryption_error">Възникна грешка при деактивиране на шифроването</string>
-    <string name="backup_successful">Архивирането беше планирано успешно</string>
-    <string name="backup_error">Възникна грешка при опит за създаване на резервно копие</string>
-    <string name="documentsui_error">Изглежда, че липсва DocumentsUI от вашето устройство. Това е важен системен компонент, необходим за подбора и създаването на документи. Ако сте използвали инструмент за &quot;деблотиране&quot; на вашето устройство, може случайно да сте го изтрили и ще трябва да го преинсталирате.</string>
+    <string name="decryption_error">Грешка при отключване на хранилището</string>
+    <string name="decryption_corrupt_error">Грешка при отключване на хранилището. Възможно е файлът на хранилището да е повреден.</string>
+    <string name="saving_error">Грешка при запазване на хранилището</string>
+    <string name="vault_init_error">Грешка при начално установяване на хранилището</string>
+    <string name="vault_load_error">Грешка при прочитане на хранилището от паметта</string>
+    <string name="biometric_decrypt_error">Грешка при отключване на хранилището с биометрично удостоверяване. Така обикновено се получава в резултат на промяна на настройките за защита на устройството. Отключете хранилището с парола и пренастройте биометричното удостоверяване в настройките на Aegis.</string>
+    <string name="biometric_init_error">Грешка при подготовка за биометрично удостоверяване. Така обикновено се получава в резултат на промяна на настройките за защита на устройството. Отключете хранилището с парола и пренастройте биометричното удостоверяване в настройките на Aegis.</string>
+    <string name="disable_encryption">Изключване на шифроването</string>
+    <string name="disable_encryption_description">Наистина ли искате да изключите шифроването? Това ще доведе до съхраняване на хранилището в чист текст. <b>Автоматичните резервни копия също ще бъдат изключени.</b></string>
+    <string name="enable_encryption_error">Грешка при включване на шифроването</string>
+    <string name="disable_encryption_error">Грешка при изключване на шифроването</string>
+    <string name="backup_successful">Създаден е график за резервни копия</string>
+    <string name="backup_error">Грешка при създаване на резервно копие</string>
+    <string name="backup_status_success">Последни резервни копия: %s</string>
+    <string name="backup_status_failed">Последни неуспешни резервни копия: %s</string>
+    <string name="backup_status_none">Не са създадени резервни копия</string>
+    <string name="backup_warning_password">Резервните копия са шифровани с отделна парола, която се задава в раздел Сигурност</string>
+    <string name="documentsui_error">Изглежда, че на устройството липсва DocumentsUI. Това е важен системен компонент, който е необходим за избора и създаването на документи. Ако сте използвали инструменти за &quot;почистване&quot; на устройство, може случайно да сте го изтрили и ще трябва да го инсталирате отново.</string>
+    <string name="icon_pack_import_error">Грешка при внасяне на пакет с икони</string>
+    <string name="icon_pack_import_exists_error">Такъв пакет с икони вече съществува. Искате ли да бъде презаписан?</string>
+    <string name="icon_pack_delete_error">Грешка при изтриване на пакет с икони</string>
+    <plurals name="icon_pack_info">
+        <item quantity="one">%d икона</item>
+        <item quantity="other">%d икони</item>
+    </plurals>
+    <string name="icon_custom">Избор</string>
     <string name="permission_denied">Достъпът е отказан</string>
     <string name="andotp_new_format">Нов формат (v0.6.3 или по-нов) </string>
     <string name="andotp_old_format">Стар формат (v0.6.2 или по-стар) </string>
-    <string name="choose_andotp_importer">Кой формат има резервният файл на andOTP?</string>
-    <string name="choose_totpauth_importer">Това резервно копие на TOTP Authenticator шифровано ли е с парола?</string>
-    <string name="choose_application">Изберете приложението, от което искате да импортирате</string>
+    <string name="choose_andotp_importer">В какъв формат е резервният файл на andOTP?</string>
+    <string name="choose_totpauth_importer">Резервно копие на TOTP Authenticator шифровано ли е с парола?</string>
+    <string name="choose_application">Изберете приложението, от което искате да внесете</string>
     <string name="choose_theme">Изберете желаната тема</string>
     <string name="choose_account_name_position">Изберете къде да бъде показано името на профила</string>
-    <string name="choose_view_mode">Изберете желания режим на преглед</string>
-    <string name="choose_copy_behavior">Изберете поведение при копиране</string>
-    <string name="parsing_file_error">Възникна грешка при опит за анализиране на файла</string>
+    <string name="choose_view_mode">Изберете желания изглед на списъка</string>
+    <string name="choose_copy_behavior">Изберете действие, което да копира</string>
+    <string name="parsing_file_error">Грешка при анализиране на файла</string>
     <string name="file_not_found">Грешка: Файлът не е намерен</string>
-    <string name="reading_file_error">Възникна грешка при опит за четене на файла</string>
+    <string name="reading_file_error">Грешка при прочитане на файла</string>
     <string name="app_lookup_error">Грешка: Приложението не е инсталирано</string>
+    <string name="app_version_error">Инсталираното издание на %s не се поддържа. В последните издания някои от файловете, необходими при внасяне са шифровани и недостъпни за Aegis. Евентуален опит за внасяне би довел до грешка. Желаете ли въпреки това да продължите?</string>
+    <string name="root_error">Грешка: неуспешнополучаване на достъп до правата на суперпотребителя</string>
     <plurals name="imported_entries_count">
-        <item quantity="one">Импортиран %d запис</item>
-        <item quantity="other">Импортирани %d записа</item>
+        <item quantity="one">%d запис е внесен</item>
+        <item quantity="other">%d записа са внесени</item>
     </plurals>
-    <string name="import_error_title">По време на импортирането възникна една или повече грешки</string>
-    <string name="exporting_vault_error">Възникна грешка при опит за експортиране на трезора</string>
-    <string name="exported_vault">Трезорът е експортиран</string>
-    <string name="encryption_set_password_error">Възникна грешка при опит за задаване на паролата.</string>
-    <string name="encryption_enable_biometrics_error">Възникна грешка при опит за активиране на биометрично отключване. Някои устройства имат лоши имплементации на биометрично удостоверяване и е вероятно вашето да е едно от тях. Помислете вместо това да преминете към конфигурация само с парола.</string>
+    <plurals name="entries_shown">
+        <item quantity="one">Показан е %d запис</item>
+        <item quantity="other">Показани са %d записа</item>
+    </plurals>
+    <string name="intro_import_error_title">Грешка при внасяне на хранилището</string>
+    <string name="import_error_title">По време на внасяне възникна една или повече грешки</string>
+    <string name="exporting_vault_error">Грешка при изнасяне на хранилището</string>
+    <string name="exported_vault">Хранилището е изнесено</string>
+    <string name="encryption_set_password_error">Грешка при задаване на паролата.</string>
+    <string name="encryption_enable_biometrics_error">Грешка при включване на биометрично отключване. Някои устройства имат лоши реализации на биометрично удостоверяване и е вероятно вашето е едно от тях. Помислете дали да не използвате само парола.</string>
     <string name="no_cameras_available">Няма налични камери</string>
-    <string name="read_qr_error">Възникна грешка при опит за четене на QR кода</string>
-    <string name="read_qr_error_phonefactor">Aegis не е съвместим с частния 2FA алгоритъм на Microsoft. Моля, не забравяйте да изберете „Надстройка на приложение без известия“, когато конфигурирате 2FA в Office 365.</string>
-    <string name="authentication_method_raw">Необработен</string>
-    <string name="unlocking_vault">Отключване на трезора</string>
-    <string name="slot_this_device">(това устройство)</string>
-    <string name="remove_group">Премахни група</string>
-    <string name="remove_group_description">Наистина ли искате да премахнете тази група? Записите в тази група автоматично ще преминат към „Без група“.</string>
+    <string name="read_qr_error">Грешка при разчитане на QR кода</string>
+    <string name="read_qr_error_phonefactor">Приложението Aegis е съвместимо със собственическия алгоритъм за 2FA на Microsoft. Не забравяйте да изберете „Настройка на приложение без известия“, когато настройвате 2FA в Office 365.</string>
+    <string name="partial_google_auth_import">Установени са частично изнасени данни за Google Authenticator</string>
+    <string name="partial_google_auth_import_warning">Няколко QR кода не са внесени. Следните кодове липсват:\n\n<b>%s</b>\n\nМожете да продължите с частично внесените данни, но е препоръчително да направите нов опит с всички QR кодове без да рискувате загуба на кодове за защите.</string>
+    <string name="missing_qr_code_descriptor">• QR код %d</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Внасяне на %d код за достъп въпреки това</item>
+        <item quantity="other">Внасяне на %d кода за достъп въпреки това</item>
+    </plurals>
+    <string name="import_google_auth_failure">Грешка при внасяне към Google Authenticator</string>
+    <string name="unrelated_google_auth_batches_error">Изнесеното съдържа части от несвързана порция кодове. Внасяйте всяка порция поотделно.</string>
+    <string name="no_tokens_can_be_imported">Като резултат не са внесени кодове за защита</string>
+    <string name="unlocking_vault">Отключване на хранилището</string>
+    <string name="rename_group">Преименуване на група</string>
+    <string name="no_group_selection">Ако запис не принадлежи към никоя група, може да бъде намерен в „Без група“.</string>
+    <string name="remove_group">Премахване на група</string>
+    <string name="remove_group_description">Наистина ли искате да премахнете тази група? Записите в нея ще бъдат преместени в групата „Без група“.</string>
+    <string name="remove_unused_groups">Премахване на неизползваните групи</string>
+    <string name="remove_unused_groups_description">Да бъдат ли премахнати групите, в които няма записи?</string>
+    <string name="remove_icon_pack">Премахване на пакет с икони</string>
+    <string name="remove_icon_pack_description">Искате ли този пакет с икони да бъде премахнат? Записите, които използват икони от него няма да бъдат засегнати.</string>
     <string name="details">Подробности</string>
-    <string name="lock">Заключи</string>
+    <string name="show_error_details">Подробности за грешката</string>
+    <string name="lock">Заключва</string>
     <string name="name">Име</string>
     <string name="no_group">Без група</string>
-    <string name="sort">Сортиране</string>
-    <string name="sort_alphabetically">Издател (А до Я)</string>
-    <string name="sort_alphabetically_reverse">Издател (Я до А)</string>
-    <string name="sort_alphabetically_name">Профил (А до Я)</string>
-    <string name="sort_alphabetically_name_reverse">Профил (Я до А)</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Сортиране</string>
+    <string name="sort_alphabetically">Издател (А → Я)</string>
+    <string name="sort_alphabetically_reverse">Издател (Я → А)</string>
+    <string name="sort_alphabetically_name">Профил (А → Я)</string>
+    <string name="sort_alphabetically_name_reverse">Профил (Я → А)</string>
+    <string name="sort_usage_count">Брой използвания</string>
+    <string name="sort_last_used">Последно използване</string>
     <string name="sort_custom">По избор</string>
+    <string name="last_used">Последно използване</string>
+    <string name="last_used_never">никога</string>
     <string name="new_group">Нова група…</string>
     <string name="group">Група</string>
     <string name="group_name_hint">Име на групата</string>
-    <string name="preference_manage_groups">Редактиране на групи</string>
+    <string name="preference_manage_groups">Промяна на групите</string>
     <string name="preference_manage_groups_summary">Управлявайте и изтривайте групите си тук</string>
-    <string name="pref_highlight_entry_title">Акцентирайте токените при докосване</string>
-    <string name="pref_highlight_entry_summary">Направете токените по-лесни за различаване един от друг, като ги маркирате временно, когато ги докоснете</string>
-    <string name="pref_copy_behavior_title">Копиране на маркери в междинната памет</string>
-    <string name="pin_keyboard_description">Въведете паролата си, за да активирате PIN клавиатурата. Имайте предвид, че това работи само ако вашата парола се състои само от цифри</string>
-    <string name="pin_keyboard_error">Грешка при активиране на PIN клавиатурата</string>
-    <string name="pin_keyboard_error_description">Не е възможно да зададете PIN клавиатура. Паролата ви трябва да се състои само от цифри.</string>
-    <string name="pin_keyboard_disabled">Паролата е сменена. PIN клавиатурата вече няма да се показва.</string>
+    <string name="preference_reset_usage_count">Нулиране на броя използвания</string>
+    <string name="preference_reset_usage_count_summary">Нулира броя на използванията на всеки запис в хранилището</string>
+    <string name="preference_reset_usage_count_dialog">Сигурни ли сте, че желаете броя на използванията на всеки запис в хранилището да бъде нулиран?</string>
+    <string name="note" comment="Users can add a note to an entry">Бележка</string>
+    <string name="clear">Изчистване</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Дублирано</string>
+    <string name="dialog_duplicate_entry_message">Записът има същото име и издател като вече съществуващи записи. Как да продължим?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Презаписване на съществуващите записи</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Заменя съществуващите записи с новия. Действието е необратимо</string>
+    <string name="dialog_duplicate_entry_suffix_title">Добавяне на наставка</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Добавяне на наставка към името на записа. Новото име ще бъде: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Отказ от запазването</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Дава възможност за повторна промяна преди запазване</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Желаете ли да бъде премахнат %d елемент с име: \n\n%s - %s</item>
+        <item quantity="other">Желаете ли да бъдат премахнати %d елемента с име: \n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Потвърждаване на премахване</string>
+    <string name="pref_haptic_feedback_summary">Кара устройството да вибрира при презареждане на кодовете</string>
+    <string name="pref_haptic_feedback_title">Тактилна обратна връзка</string>
+    <string name="pref_highlight_entry_title">Осветяване на запис при докосване</string>
+    <string name="pref_highlight_entry_summary">Прави записите в списъка по-лесни за различаване един от друг, като при докосване временно ги осветява</string>
+    <string name="pref_groups_multiselect_title">Групи за множествен избор</string>
+    <string name="pref_groups_multiselect_summary">Дава възможност за избиране на няколко групи едновременно</string>
+    <string name="pref_minimize_on_copy_title">Свиване при копиране</string>
+    <string name="pref_minimize_on_copy_summary">Приложението се свива при копиране на код за достъп</string>
+    <string name="pref_copy_behavior_title">Копиране на кодове за защита в междинната памет</string>
+    <string name="pref_search_behavior_title">Начин на търсене</string>
+    <string name="pref_pause_entry_title">Замразяване на запис при докосване</string>
+    <string name="pref_pause_entry_summary">Спира автоматичното опресняване на кодовете след докосване. Необходимо е да е включено или „Осветяване на запис при докосване“, или „Показване при докосване“.</string>
+    <string name="pin_keyboard_description">За да бъде показана цифровата клавиатура въведете паролата си. Имайте предвид, че това е удачно само ако вашата парола се състои само от цифри</string>
+    <string name="pin_keyboard_error">Грешка при задаване на цифрова клавиатура</string>
+    <string name="pin_keyboard_error_description">Не е възможно да зададете цифрова клавиатура. Паролата ви трябва да се състои само от цифри.</string>
+    <string name="pin_keyboard_disabled">Паролата е променена. Цифровата клавиатура вече няма да се показва.</string>
     <string name="selected">Избрано</string>
     <string name="dark_theme_title">Тъмна тема</string>
     <string name="light_theme_title">Светла тема</string>
-    <string name="amoled_theme_title">AMOLED тема</string>
+    <string name="amoled_theme_title">Тема AMOLED</string>
     <string name="system_theme_title">Зададена от прилож. за пест. на бат.</string>
     <string name="system_amoled_theme_title">Зададена от прилож. за пест. на бат. (AMOLED)</string>
     <string name="normal_viewmode_title">Обикновен</string>
-    <string name="compact_mode_title">Компактен</string>
+    <string name="compact_mode_title">Сбит</string>
     <string name="small_mode_title">Дребен</string>
     <string name="tiles_mode_title">Плочки</string>
-    <string name="unknown_issuer">Неизвестен издател</string>
+    <string name="unknown_issuer">Непознат издател</string>
     <string name="unknown_account_name">Неизвестно име на профил</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis не можа да импортира %d токен. Тези токени ще бъдат пропуснати. Натиснете „подробности“, за да видите повече информация за грешките.</item>
-        <item quantity="other">Aegis не можа да импортира %d токена. Тези токени ще бъдат пропуснати. Натиснете „подробности“, за да видите повече информация за грешките.</item>
+        <item quantity="one">Aegis не може да внесе %d код за защита. Той ще бъде пропуснат. Докоснете „подробности“, за да видите повече за грешката.</item>
+        <item quantity="other">Aegis не може да внесе %d кода за защита. Те ще бъдат пропуснати. Докоснете „подробности“, за да видите повече за грешките.</item>
     </plurals>
-    <string name="unable_to_generate_qrcode">Не може да се генерира QR код</string>
+    <string name="unable_to_process_deeplink">Грешка при обработка на препратка към секция в приложението</string>
+    <string name="unable_to_read_qrcode_file">Грешка при прочитане и обработка на QR кода от файла: %s.</string>
+    <string name="unable_to_process_shared_text">Грешка при обработка на споделения текст като еднократна парола</string>
+    <string name="unable_to_read_qrcode_files">Грешка при прочитане и обработка на някои от кодовете за QR. %1$d от общо %2$d записа са внесени.</string>
+    <string name="unable_to_generate_qrcode">Грешка при създаване на QR код</string>
     <string name="select_picture">Изберете картина</string>
     <string name="select_icon">Изберете икона</string>
-    <string name="toggle_checkboxes">Превключете квадратчетата за отметка</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Отваряне на хранилище</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Отваряне на скенера</string>
+    <string name="toggle_checkboxes">Превключване на отметките</string>
     <string name="search">Търсене</string>
-    <string name="channel_name_lock_status">Статус на заключването</string>
-    <string name="channel_description_lock_status">Aegis може да създаде постоянно известие, за да ви уведомява, когато трезора е заключен</string>
-    <string name="vault_unlocked_state">Трезорът е отключен. Докоснете тук, за да го заключите.</string>
-    <string name="version">Версия</string>
+    <string name="channel_name_lock_status">Състояние на хранилището</string>
+    <string name="channel_description_lock_status">Aegis може да създаде постоянно известие, когато хранилището е заключено</string>
+    <string name="vault_unlocked_state">Хранилището е отключено. За да го заключите докоснете тук.</string>
+    <string name="version">Издание</string>
     <string name="changelog">Дневник на промените</string>
     <string name="whats_new">Какво ново</string>
-    <string name="github_description">Изходен код, проблеми и информация</string>
+    <string name="github_description">Изходен код, дефекти и информация</string>
     <string name="license">Лиценз</string>
     <string name="license_description">Aegis Authenticator е лицензиран под GPLv3</string>
     <string name="third_party_licenses">Лицензи на трети страни</string>
-    <string name="third_party_licenses_description">Лицензи на библиотеките от трети страни, които Aegis използва</string>
+    <string name="third_party_licenses_description">Лицензи на използвани външни библиотеки</string>
     <string name="country_netherlands">Нидерландия </string>
     <string name="email_us">Електронна поща</string>
     <string name="visit_website">Страница</string>
     <string name="about_support">Поддръжка</string>
-    <string name="support_rate">Оценете</string>
-    <string name="support_rate_description">Подкрепете ни, като оставите отзив в Google Play</string>
-    <string name="webview_error">Това устройство не поддържа уеб изглед, който е необходим за преглед на дневника с промени и лиценза. Липсва системен компонент.</string>
+    <string name="support_rate">Отзив</string>
+    <string name="support_rate_description">Подкрепете ни, като оставите своя отзив в Google Play</string>
+    <string name="webview_error">Изглежда, че на устройството липсва WebView. Това е важен системен компонент, който е необходим за преглед на дневника с промени и лиценза. Ако сте използвали инструменти за &quot;почистване&quot; на устройство, може случайно да сте го изтрили и ще трябва да го инсталирате отново.</string>
     <string name="email">Имейл</string>
-    <string name="time_sync_warning_title">Автоматична синхронизация на времето</string>
-    <string name="time_sync_warning_message">Aegis разчита на системното време, за да бъде синхронизирано за генериране на правилни кодове. Отклонение от само няколко секунди може да доведе до неправилни кодове. Изглежда устройството ви не е конфигурирано да синхронизира автоматично часа. Искате ли да го направите сега?</string>
-    <string name="time_sync_warning_disable">Спри да ме предупреждаваш. Знам какво правя.</string>
-    <string name="google_qr_export_unrelated">Намерен е несвързан QR код. Опитайте да рестартирате скенера.</string>
+    <string name="time_sync_warning_title">Автоматична синхронизация на датата и часа</string>
+    <string name="time_sync_warning_message">Aegis разчита системният часовник да бъде верен, за да може да изчислява правилните кодове. Отклонение от само няколко секунди може да доведе до грешни изчисления. Изглежда устройството не е настроено да се сверява. Искате ли да го настроите сега?</string>
+    <string name="time_sync_warning_disable">Без предупреждения. Аз зная какво правя.</string>
+    <string name="google_qr_export_unrelated">Намерен е несвързан QR код. Рестартирате скенера.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Сканирани %d/%d QR кодове</item>
-        <item quantity="other">Сканирани %d/%d QR кодове</item>
+        <item quantity="one">Сканиран %1$d/%2$d код за QR</item>
+        <item quantity="other">Сканирани %1$d/%2$d кодове за QR</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Очакван QR код #%d, но вместо това е сканиран #%d</string>
-    <string name="backup_error_bar_message"><b>Скорошно архивиране на трезора бе неуспешно</b></string>
+    <string name="google_qr_export_unexpected">Очакван е код за QR №%1$d, но е сканиран №%2$d</string>
+    <string name="backup_error_bar_message"><b>Резервно копие на хранилището е било неуспешно</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Един от последните опити за резервно копие на хранилището чрез %1$s е неуспешен поради грешка. Това се е случило %2$s. Проверете настройките и се уверете, че резервни копия могат да бъдат създавани с тези настройки.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Скорошен опит за резервно копие на хранилището с използване на %1$s е неуспешен, защото Aegis няма права за запис в местоназначението. Опитът е направен %2$s. Такава грешка може да възникне, ако сте преместили или преименували местоназначението или ако наскоро сте възстановили Aegis от резервно копие. Настройте местоназначението за резервно копие.
+    </string>
+    <string name="backup_system_builtin">Вградените резервни копия на Aegis</string>
+    <string name="backup_system_android">Облачните резервни копия на Андроид</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Последното резервно копие е остаряло (%s)
+    </string>
+    <string name="backup_reminder_bar_message">        Липсва резервно копие на последните промени
+    </string>
+    <string name="backup_reminder_bar_dialog_title">Липсва резервно копие на последните промени</string>
+    <string name="backup_reminder_bar_dialog_summary">        Последните промени на хранилището не са запазени в резерено копие. Важно е често да правите резервни копия, за да не загубите достъп до профилите си. Помислете дали да не настроите автоматични резервни копия от настройките.
+    </string>
+    <string name="backup_reminder_bar_dialog_accept">Настройки на резервни копия</string>
+    <string name="backup_plaintext_export_warning"><b>Хранилището е било изнесено в чист текст</b></string>
+    <string name="pref_show_plaintext_warning_hint">Без повторно показване на предупреждението</string>
+    <string name="backup_plaintext_warning_explanation">Скоро е правено нешифровано резервно копие на хранилището. С оглед сигурността на кодовете за защита е препоръчително да изтриете нешифрования файл след като вече не е необходим.</string>
     <string name="switch_camera">Смяна на камера</string>
-    <string name="empty_list">Няма кодове за показване. Започнете да добавяте записи, като докоснете знака плюс в долния десен ъгъл</string>
-    <string name="empty_list_title">Няма открити записи</string>
-    <string name="empty_group_list">Няма групи за показване. Добавете групи в екрана за редактиране на запис</string>
-    <string name="empty_group_list_title">Няма намерени групи</string>
+    <string name="empty_list">Няма кодове, които да бъдат показани. Добавете записи от бутона със знак плюс в долния десен ъгъл</string>
+    <string name="empty_list_title">Не са открити записи</string>
+    <string name="empty_group_list">Няма групи, които да бъдат показани. Добавете групи в екрана за промяна на запис</string>
+    <string name="empty_group_list_title">Не са намерени групи</string>
+    <string name="no_icon_packs">Не са внесени пакети с икони. Докоснете бутона със знак плюс. Съвет: пробвайте <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
+    <string name="no_icon_packs_title">Липсват икони</string>
+    <string name="pick_icon">Избор на икона</string>
+    <string name="uncategorized">Без категория</string>
     <string name="done">Готово</string>
+    <plurals name="qr_count">
+        <item quantity="one">%d / %d QR код</item>
+        <item quantity="other">%d / %d QR кода</item>
+    </plurals>
     <string name="next">Следващ</string>
     <string name="previous">Предишен</string>
-    <string name="transfer_entry">Прехвърляне на запис</string>
-    <string name="transfer_entry_description">Сканирайте кода за QR с приложението за удостоверяване, в което искате да прехвърлите този запис</string>
+    <string name="copy_uri">Копиране на адреса</string>
+    <string name="unable_to_copy_uri_to_clipboard">Грешка при копиране на адреса</string>
+    <string name="uri_copied_to_clipboard">Адресът е копиран</string>
+    <string name="transfer_entry_description">Сканирайте QR кода с приложението за удостоверяване, в което искате да прехвърлите този запис</string>
+    <string name="transfer_entry_brightness">Докоснете QR, за да превключите пълна яркост при цял екран</string>
+    <string name="google_auth_compatible_transfer_description">Сканирайте тези кодове в Aegis или Google Authenticator.\n\nПоради ограничения в приложението на Google Authenticator са включени само кодовете, които използват SHA1 и извеждат 6 цифри</string>
     <string name="password_strength_very_weak">Много слаба</string>
     <string name="password_strength_weak">Слаба</string>
-    <string name="password_strength_fair">Става</string>
+    <string name="password_strength_fair">Задоволителна</string>
     <string name="password_strength_good">Добра</string>
-    <string name="password_strength_strong">Силна</string>
-    <string name="pref_pin_keyboard_title">Използвайте PIN клавиатура при заключен екран</string>
-    <string name="pref_pin_keyboard_summary">Активирайте това, ако искате да активирате PIN клавиатурата при заключения екран. Това работи само за цифрови пароли</string>
+    <string name="password_strength_strong">Много добра</string>
+    <string name="password_strength_unknown">Паролата е твърде дълга за определяне качеството ѝ</string>
+    <string name="pref_pin_keyboard_title">Цифрова клавиатура на заключения екран</string>
+    <string name="pref_pin_keyboard_summary">Ако е включено на заключения екран ще се използва цифрова клавиатура. Това е удачно само ако вашата парола се състои само от цифри</string>
     <string name="title_activity_preferences">Настройки</string>
     <string name="title_activity_manage_groups">Управление на групи</string>
     <string name="title_activity_transfer">Прехвърляне на записи</string>
     <string name="title_activity_about">Относно</string>
-    <string name="title_activity_edit_entry">Редактиране на запис</string>
-    <string name="title_activity_scan_qr">Скенирай QR код</string>
-    <string name="title_activity_manage_slots">Управление на слотове за ключове</string>
-    <string name="title_activity_import_entries">Импортиране на записи</string>
-    <string name="dialog_wipe_entries_title">Изтрий записи</string>
-    <string name="dialog_wipe_entries_message">Трезорът ви вече съдържа записи. Искате ли да премахнете тези записи, преди да импортирате този файл?\n\n<b> По този начин ще загубите за постоянно достъп до съществуващите записи в трезора.</b></string>
-    <string name="dialog_wipe_entries_checkbox">Изтрий съдържанието на трезора</string>
-    <string name="panic_trigger_ignore_toast">Aegis получи спусък за паника, но настройката е деактивирана, игнорирайки</string>
-    <string name="pref_panic_trigger_title">Изтрийте трезора при спусъка за паника</string>
-    <string name="pref_panic_trigger_summary">Изтрийте трезора, когато от Ripple е получен спусък за паника</string>
-    <string name="importer_help_aegis">Доставете файл за експортиране/архивиране на Aegis.</string>
-    <string name="importer_help_authenticator_plus">Доставете файл за експортиране на Authenticator Plus, получен чрез <b>Настройки -&gt; Архивиране &amp; Възстановяване -&gt; Експортирайте като текст и HTML</b>.</string>
-    <string name="importer_help_authy">Доставете копие на <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, намиращо се във вътрешната директория за съхранение на Authy.</string>
-    <string name="importer_help_andotp">Доставете andOTP файл за експортиране/архивиране.</string>
-    <string name="importer_help_freeotp">Доставете копие на <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, намиращо се във вътрешната директория за съхранение на FreeOTP.</string>
-    <string name="importer_help_freeotp_plus">Доставете FreeOTP+ файл за експортиране.</string>
-    <string name="importer_help_microsoft_authenticator">Доставете копие на <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, намиращо се във вътрешната директория за съхранение на Microsoft Authenticator.</string>
-    <string name="importer_help_plain_text">Доставете обикновен текстов файл с Google Authenticator URI на всеки ред.</string>
-    <string name="importer_help_totp_authenticator">Доставете файл за експортиране на TOTP Authenticator.</string>
-    <string name="importer_help_winauth">Доставете файл за експортиране на WinAuth.</string>
-    <string name="importer_help_direct">Импортиране на записи директно от %s. Това изисква приложението да бъде инсталирано на това устройство и да бъде предоставен root достъп на Aegis.</string>
+    <string name="title_activity_edit_entry">Променяне на запис</string>
+    <string name="title_activity_scan_qr">Скениране на QR код</string>
+    <string name="title_activity_import_entries">Внасяне на записи</string>
+    <string name="title_activity_assign_icons">Задаване на икони</string>
+    <string name="title_activity_licenses">Лицензи на трети страни</string>
+    <string name="dialog_wipe_entries_title">Премахване на записи</string>
+    <string name="dialog_wipe_entries_message">Хранилището вече съдържа записи. Искате ли да бъдат премахнати, преди внасяне на файла?\n\n<b> По този начин безвъзвратно ще загубите достъп до съществуващите записи в хранилището.</b></string>
+    <string name="dialog_wipe_entries_checkbox">Изпразване на хранилището</string>
+    <string name="panic_trigger_ignore_toast">Aegis получи сигнал за тревога, но настройката е изключена, пренебрегване на сигнала</string>
+    <string name="pref_panic_trigger_title">Изтриване на хранилището при сигнал за тревога</string>
+    <string name="pref_panic_trigger_summary">Изтрива хранилището, когато от Ripple е получен сигнал за тревога</string>
+    <string name="import_vault">Внасяне на хранилище на Aegis</string>
+    <string name="import_vault_hint">Искате да внесете от друго приложение за 2FA? Завършете помощника и посетете меню Настройки.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Махната е отметката на %d вероятно дублиран запис. Прегледайте списъка.</item>
+        <item quantity="other">Махната е отметката на %d вероятно дублирани записа. Прегледайте списъка.</item>
+    </plurals>
+    <string name="importer_help_2fas">Изберете файл с резервно копие на 2FAS Authenticator.</string>
+    <string name="importer_help_aegis">Изберете изнесен файл или резервно копие на Aegis.</string>
+    <string name="importer_help_authenticator_plus">Изберете файл с резервно копие на Authenticator Plus, получен от <b>Настройки → Резервни копия и възстановяване → Изнасяне като текст и HTML</b>.</string>
+    <string name="importer_help_authy">Изберете копие на файла <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, който се намира в папката с данни на Authy.</string>
+    <string name="importer_help_andotp">Изберете изнесен файл или резервно копие на andOTP.</string>
+    <string name="importer_help_bitwarden">Изберете изнесен файл или резервно копие на Bitwarden. Шифровани файлове не се поддържат.</string>
+    <string name="importer_help_battle_net_authenticator">Изберете копие на файла <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, който се намира в папката с данни на Battle.net Authenticator.</string>
+    <string name="importer_help_duo">Изберете копие на файла <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, който се намира в папката с данни на DUO.</string>
+    <string name="importer_help_ente_auth">Изберете файл с резервно копие на Ente Auth. За момента се поддържат само нешифровани резервни копия.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Изберете резервно копие на файла.\nFreeOTP 1.x: Изберете копие на файла <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, който се намира в папката с данни на FreeOTP.</string>
+    <string name="importer_help_freeotp_plus">Изберете изнесен файл от FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Съвместимост с FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Открити са редица дефекти във FreeOTP 2, които биха могли да доведат до повреждане на резервните копия. Aegis ще се опита да възстанови възможно най-много записи, но е възможно някои или дори всички от тях да не бъдат внесени.</string>
+    <string name="importer_help_google_authenticator"><b>Поддържат се файлове на Google Authenticator v5.10 и по-предишни издания.</b>\n\nИзберете копие на файла <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, който се намира в папката с данни на Google Authenticator.</string>
+    <string name="importer_help_microsoft_authenticator">Изберете копие на файла <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, който се намира в папката с данни на Microsoft Authenticator.</string>
+    <string name="importer_help_plain_text">Изберете чист текстов файл с Google Authenticator URI, по един на ред.</string>
+    <string name="importer_help_steam"><b>Поддържат се файлове на Steam v3.0 и по-нови издания.</b>\n\nИзберете копие на файла <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, който се намира в папката с данни на Steam.</string>
+    <string name="importer_help_stratum">Изберете файл с резервно копие на Stratum, получен от <b>Настройки → Резервно копие → Резервно копие в шифрован файл (препотъчително)</b>.</string>
+    <string name="importer_help_totp_authenticator">Изберете изнесен файл от TOTP Authenticator.</string>
+    <string name="importer_help_winauth">Изберете изнесен файл от WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Задаване на икони</string>
+    <string name="import_assign_icons_dialog_text">Задаване на икони на внесените записи?</string>
+    <string name="importer_encrypted_exception_google_authenticator">Пропуснат е шифрован запис: %s</string>
+    <string name="importer_help_direct">Внасяне на записи директно от %s. Приложението трябва да бъде инсталирано на устройството и Aegis да има достъп до правата на суперпотребителя.</string>
     <string name="groups">Групи</string>
+    <string name="pref_focus_search">Търсене при отваряне на приложението</string>
+    <string name="pref_focus_search_summary">Каретката се поставя в полето за търсене при отваряне на приложението.</string>
+    <string name="pref_grouping_halves">В две групи</string>
+    <string name="pref_grouping_none">Без групиране</string>
+    <string name="pref_grouping_size_two">В групи по 2</string>
+    <string name="pref_grouping_size_three">В групи по 3</string>
+    <string name="pref_grouping_size_four">В групи по 4</string>
     <string name="pref_copy_behavior_never">Никога</string>
     <string name="pref_copy_behavior_single_tap">Единично докосване</string>
     <string name="pref_copy_behavior_double_tap">Двойно докосване</string>
     <string name="pref_account_name_position_hidden">Скрито</string>
     <string name="pref_account_name_position_end">До издателя</string>
     <string name="pref_account_name_position_below">Под издателя</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="one">преди %d секунда</item>
+        <item quantity="other">преди %d секунди</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">преди %d минута</item>
+        <item quantity="other">преди %d минути</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="one">преди %d час</item>
+        <item quantity="other">преди %d часа</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="one">преди %d ден</item>
+        <item quantity="other">преди %d дена</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="one">преди %d година</item>
+        <item quantity="other">преди %d години</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="one">%d избран елемент</item>
+        <item quantity="other">%d избрани елемента</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-ca-rES-v29/strings.xml b/app/src/main/res/values-ca-rES-v29/strings.xml
new file mode 100644
index 00000000..670ebf6b
--- /dev/null
+++ b/app/src/main/res/values-ca-rES-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Predeterminat del sistema</string>
+    <string name="system_amoled_theme_title">Predeterminat del sistema (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 04cc4781..b42d4927 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Configuració</string>
     <string name="action_about">Quant a</string>
     <string name="action_delete">Esborrar</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Restaurar l\'icona predeterminada</string>
     <string name="discard">Descartar</string>
     <string name="save">Guardar</string>
+    <string name="all">Tot</string>
     <string name="issuer">Emissor</string>
     <string name="yandex_pin">PIN (4–16 digits)</string>
     <string name="motp_pin">PIN (4 digits)</string>
@@ -21,48 +22,69 @@
     <string name="pref_cat_backups_android">Android</string>
     <string name="pref_cat_backups_auto">Còpies de seguretat automàtiques</string>
     <string name="pref_section_behavior_title">Comportament</string>
-    <string name="pref_section_behavior_summary">Configurar comportament al interactuar amb les entrades.</string>
+    <string name="pref_section_behavior_summary">Configurar comportament en interactuar amb les entrades.</string>
     <string name="pref_section_appearance_title">Aparença</string>
-    <string name="pref_section_appearance_summary">Ajustar tema, idioma i altres configuracions que afectin a l\'aparença de l\'app.</string>
+    <string name="pref_section_appearance_summary">Ajustar tema, idioma i altres configuracions que afectin l\'aparença de l\'app.</string>
     <string name="pref_section_security_title">Seguretat</string>
     <string name="pref_section_security_summary">Configurar xifrat, desbloqueig biometric i altres opcions de seguretat.</string>
     <string name="pref_section_import_export_title">Importa i exporta</string>
     <string name="pref_section_import_export_summary">Importa còpies de seguretat d\'Aegis o altres aplicacions d\'autentificació. Exporta manualment la caixa forta d\'Aegis.</string>
+    <string name="pref_section_audit_log_title">Registre d\'auditoria</string>
+    <string name="pref_section_audit_log_summary">Llista de tots els esdeveniments importants registrats de l\'aplicació.</string>
     <string name="pref_section_backups_title">Còpies de seguretat</string>
-    <string name="pref_section_backups_summary">Configura còpies de seguretat automàtiques a la ubicació que triïs o activa la copia al núvol d\'Android.</string>
+    <string name="pref_section_backups_summary">Configura còpies de seguretat automàtiques a la ubicació que triïs o activa la còpia al núvol d\'Android.</string>
     <string name="pref_section_icon_packs">Paquets d\'icones</string>
     <string name="pref_section_icon_packs_summary">Gestiona i importa paquets d\'icones</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Colors dinàmics</string>
+    <string name="pref_dynamic_colors_summary">Aplica una superposició basada en els colors del teu tema d\'Android</string>
     <string name="pref_view_mode_title">Mode de visualització</string>
     <string name="pref_lang_title">Idioma</string>
     <string name="pref_show_icons_title">Mostra icones</string>
     <string name="pref_show_icons_summary">Mostra icones al costat de cada entrada</string>
     <string name="pref_code_group_size_title">Agrupació dels dígits</string>
     <string name="pref_code_group_size_summary">Triar nombre de digits per agrupar els codis</string>
+    <string name="pref_account_name_position_title">Mostra el nom del compte</string>
+    <string name="pref_show_next_code_title">Mostrar el proper codi</string>
+    <string name="pref_show_next_code_summary">Genera i mostra el proper codi anticipadament</string>
+    <string name="pref_expiration_state_title">Avisa quan els codis són a punt de caducar</string>
+    <string name="pref_expiration_state_summary">Canvia el color dels codis i fer que parpellegin quan estan a punt de caducar</string>
+    <string name="pref_expiration_state_fallback">Canvia el color dels codis quan són a punt de caducar</string>
+    <string name="pref_shared_issuer_account_name_title">Mostra el nom del compte només quan sigui necessari</string>
+    <string name="pref_shared_issuer_account_name_summary">Mostra el nom de compte només quan es comparteixi el mateix emissor. Altres noms de compte estaran ocults.</string>
+    <string name="pref_account_name_position_summary_override">S\'omet aquesta configuració en usar la visualització en mosaic. Els noms de compte es mostraran a sota de l\'emissor.</string>
     <string name="pref_import_file_title">Importa des d\'un fitxer</string>
     <string name="pref_import_file_summary">Importar fitxes des d\'un fitxer</string>
     <string name="pref_android_backups_title">Copies al núvol d\'Android</string>
-    <string name="pref_android_backups_summary">Permetre al sistema de còpies al núvol d\'Android incloure la volta d\'Aegis a les còpies. Això només funciona per voltes xifrades.</string>
+    <string name="pref_android_backups_summary">Permetre al sistema de còpies al núvol d\'Android incloure la caixa forta d\'Aegis a les còpies. Això només funciona per caixes fortes xifrades.</string>
     <string name="pref_android_backups_hint"><i>Les còpies dispositiu-a-dispositiu (D2D) sempre estan permeses, sense tenir en compte la configuració de dalt</i></string>
-    <string name="pref_backups_title">Copia la volta automàticament</string>
-    <string name="pref_backups_summary">Crear còpies de seguretat de la volta a l\'emmagatzematge extern quan es facin canvis. Això només funciona per a voltes xifrades.</string>
+    <string name="pref_backups_title">Copia la caixa forta automàticament</string>
+    <string name="pref_backups_summary">Crear còpies de seguretat de la caixa forta a l\'emmagatzematge extern quan es facin canvis. Això només funciona per a caixes fortes xifrades.</string>
     <string name="pref_backups_reminder_title">Recordatori de còpia</string>
-    <string name="pref_backups_reminder_summary">Mostra un recordatori per a fer còpia de seguretat de la volta si no has desat els teus últims canvis.</string>
+    <string name="pref_backups_reminder_summary">Mostra un recordatori per a fer còpia de seguretat de la caixa forta si no has desat els teus últims canvis.</string>
     <string name="pref_backups_reminder_dialog_title">Desactivar recordatori de còpia</string>
-    <string name="pref_backups_reminder_dialog_summary">Desactivant aquest recordatori, Aegis no et dira si tens canvis dels que no hagis fet una copia de seguretat. Això posa en risc l\'accés als teus tokens. Segur que vols desactivar el recordatori?</string>
-    <string name="pref_backups_location_title">Directori per a les còpies</string>
+    <string name="pref_backups_reminder_dialog_summary">Desactivant aquest recordatori, l\'Aegis no t\'alertarà en cas de tenir fitxes sense còpia de seguretat. Això posa en risc l\'accés a les teves fitxes. Segur que vols desactivar el recordatori?</string>
+    <string name="pref_backups_versioning_strategy_title">Estratègia de còpia de seguretat</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Mantenir un nombre de versions</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Còpia de seguretat única</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">L\'estratègia de còpia de seguretat seleccionada no és fiable i no es recomana. Una fallada de la còpia de seguretat pot resultar en la pèrdua de la teva única còpia de seguretat.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Selecciona una estratègia de còpia de seguretat</string>
+    <string name="pref_backups_location_title">Ubicació de la còpia de seguretat</string>
     <string name="pref_backups_location_summary">Les còpies es desaran a</string>
+    <string name="pref_backup_location_summary">La còpia de seguretat es desarà a</string>
     <string name="pref_backups_trigger_title">Disparador de còpia</string>
     <string name="pref_backups_trigger_summary">Llançar còpia manualment</string>
     <string name="pref_backups_versions_title">Nombre de versions a mantenir</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Mantindre %1$d versions a la còpia</item>
         <item quantity="other">Mantindre %1$d versions a la còpia</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Mantén un nombre infinit de versions de la còpia de seguretat</string>
     <string name="pref_import_app_title">Importar des d\'app</string>
     <string name="pref_import_app_summary">Importar fitxes des d\'una aplicació (cal root)</string>
     <string name="pref_export_title">Exporta</string>
-    <string name="pref_export_summary">Exporta la volta</string>
+    <string name="pref_export_summary">Exporta la caixa forta</string>
     <string name="pref_password_reminder_title">Recordatori de contrasenya</string>
     <string name="pref_google_auth_export_title">Exportar per Google Authenticator</string>
     <string name="pref_google_auth_export_descriptor">Genera codis QR d\'exportació compatibles amb Google Authenticator</string>
@@ -71,7 +93,7 @@
         <item quantity="one">S\'ha omès %d entrada incompatible</item>
         <item quantity="other">S\'han omès %d entrades incompatibles</item>
     </plurals>
-    <string name="pref_password_reminder_summary">Mostra un %s recordatori per a introduir la contrasenya, per tal a què no se t\'oblidi.</string>
+    <string name="pref_password_reminder_summary">Mostra %s un recordatori per a introduir la contrasenya, per tal a què no se t\'oblidi.</string>
     <string name="pref_password_reminder_summary_disabled">Desactivat</string>
     <string name="pref_secure_screen_title">Seguretat de pantalla</string>
     <string name="pref_secure_screen_summary">Bloqueja les captures de pantalla de la aplicació</string>
@@ -89,16 +111,42 @@
     <string name="pref_backup_password_title">Diferent contrasenya que per còpia de seguretat i exportació</string>
     <string name="pref_backup_password_summary">Si està activat, la contrasenya que s\'utilitza per desbloquejar l\'aplicació ja no es pot utilitzar per desxifrar còpies de seguretat i exportacions.</string>
     <string name="pref_backup_password_change_title">Canviar la contrasenya per a la còpia de seguretat i exportar</string>
-    <string name="pref_backup_password_change_summary">Definir una contrasenya nova que s\'utilitzarà per xifrar la volta durant la còpia de seguretat i l\'exportació.</string>
+    <string name="pref_backup_password_change_summary">Definir una contrasenya nova que s\'utilitzarà per xifrar la caixa forta durant la còpia de seguretat i l\'exportació.</string>
     <string name="pref_encryption_title">Xifrat</string>
-    <string name="pref_encryption_summary">Xifra la volta i desbloqueja-la amb contrasenya o biometrics</string>
+    <string name="pref_encryption_summary">Xifra la caixa forta i desbloqueja-la amb contrasenya o biomètrics</string>
     <string name="pref_biometrics_title">Desbloqueig biomètric</string>
-    <string name="pref_biometrics_summary">Permet l\'autenticació biomètrica per a desbloquejar la volta</string>
+    <string name="pref_biometrics_summary">Permet l\'autenticació biomètrica per a desbloquejar la caixa forta</string>
+    <string name="pref_search_behavior_summary">Busca a: %s</string>
+    <string name="pref_search_behavior_prompt">Buscar en qualsevol d\'aquests camps</string>
+    <string name="pref_search_behavior_type_name">Nom</string>
+    <string name="pref_search_behavior_type_issuer">Emissor</string>
+    <string name="pref_search_behavior_type_note">Nota</string>
+    <string name="pref_search_behavior_type_groups">Grups</string>
     <string name="pref_set_password_title">Canvia la contrasenya</string>
-    <string name="pref_set_password_summary">Defineix una nova contrasenya per a desbloquejar la volta</string>
-    <string name="export_encrypted">Xifra la volta</string>
-    <string name="export_help">Això exportarà la volta fora d\'Aegis. Tria el format en el que s\'ha d\'exportar:</string>
-    <string name="export_warning_unencrypted">Això exportarà una còpia sense xifrar de la volta d\'Aegis. <b>No recomanat</b>.</string>
+    <string name="pref_set_password_summary">Defineix una nova contrasenya per a desbloquejar la caixa forta</string>
+    <string name="no_events_title">Cap esdeveniment registrat</string>
+    <string name="no_events_description">No s\'ha informat d\'esdeveniments importants dins l\'aplicació</string>
+    <string name="event_title_vault_unlocked">S\'ha desbloquejat la volta</string>
+    <string name="event_description_vault_unlocked">La volta s\'ha desbloquejat satisfactòriament</string>
+    <string name="event_title_backup_created">Còpia de seguretat creada</string>
+    <string name="event_description_backup_created">S\'ha creat satisfactòriament una còpia de seguretat de la volta</string>
+    <string name="event_title_android_backup_created">Còpia de seguretat creada per l\'Android</string>
+    <string name="event_description_android_backup_created">L\'Android ha creat satisfactòriament una còpia de seguretat de la volta</string>
+    <string name="event_title_vault_exported">S\'ha exportat la volta</string>
+    <string name="event_description_vault_exported">S\'ha exportat una còpia de la volta</string>
+    <string name="event_title_entry_shared">Entrada compartida</string>
+    <string name="event_description_entry_shared">S\'ha compartit una entrada</string>
+    <string name="event_title_vault_unlock_failed_password">No s\'ha pogut desbloquejar la volta (contrasenya)</string>
+    <string name="event_description_vault_unlock_failed_password">Hi ha hagut un intent de desbloquejar la volta amb una contrasenya incorrecta</string>
+    <string name="event_title_vault_unlock_failed_biometrics">No s\'ha pogut desbloquejar la volta (dades biomètriques)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Hi ha hagut un intent de desbloquejar la volta amb dades biomètriques incorrectes</string>
+    <string name="event_unknown">Tipus d\'esdeveniment desconegut</string>
+    <string name="audit_log_entry_deleted">(esborrat)</string>
+    <string name="today_at_time">Avui a les %1$s</string>
+    <string name="day_of_week_at_time">%1$s a les %2$s</string>
+    <string name="export_encrypted">Xifra la caixa forta</string>
+    <string name="export_help">Això exportarà la caixa forta fora d\'Aegis. Tria el format en el que s\'ha d\'exportar:</string>
+    <string name="export_warning_unencrypted">Això exportarà una còpia sense xifrar de la caixa forta d\'Aegis. <b>No recomanat</b>.</string>
     <string name="export_warning_password">Les exportacions es xifren fent servir una contrasenya diferent, configurada a la secció de seguretat.</string>
     <string name="understand_risk_accept">Entenc el risc</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
@@ -112,25 +160,28 @@
         <item quantity="other">%d grups seleccionats</item>
     </plurals>
     <string name="export_no_groups_selected">No s\'han triat grups per a exportar</string>
-    <string name="export_html_title" context="The title of an HTML export document">Exportat d\'Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Exportat d\'Aegis Authenticator</string>
     <string name="choose_authentication_method">Seguretat</string>
-    <string name="authentication_method_explanation">Aegis es una app d\'A2F. Les fitxes es desen a una volta que opcionalment pot ser xifrada amb una contrasenya. Si un atacant obté el fitxer de la volta, no hi podrà accedir sense la contrasenya.\n\nHem preseleccionat la opció que creiem que anirà millor al teu dispositiu.</string>
+    <string name="authentication_method_explanation">Aegis es una app d\'A2F. Les fitxes es desen a una caixa forta que opcionalment pot ser xifrada amb una contrasenya. Si un atacant obté el fitxer de la caixa forta, no hi podrà accedir sense la contrasenya.\n\nHem preseleccionat la opció que creiem que anirà millor al teu dispositiu.</string>
     <string name="authentication_method_none">Cap</string>
-    <string name="authentication_method_none_description">No cal contrasenya pet a desbloquejar la volta i no es xifrarà.<b>No recomanat</b>.</string>
+    <string name="authentication_method_none_description">No cal contrasenya pet a desbloquejar la caixa forta i no es xifrarà.<b>No recomanat</b>.</string>
     <string name="authentication_method_password">Contrasenya</string>
-    <string name="authentication_method_password_description">Cal una contrasenya per a desbloquejar la volta.</string>
+    <string name="authentication_method_password_description">Cal una contrasenya per a desbloquejar la caixa forta.</string>
     <string name="authentication_method_password_explanation">Atenció: Si t\'oblides de la contrasenya, perdràs l\'accés a les fitxes. No hi ha cap manera de recuperar la contrasenya.</string>
     <string name="authentication_method_biometrics">Dades biomètriques</string>
-    <string name="authentication_method_biometrics_description">A mśe de la contrasenya, les dades biomètriques enregistrades al dispositiu, com una emprempta digital o la cara, es poden fer servir per a desbloquejar la volta.</string>
-    <string name="authentication">Desbloqueja la volta</string>
-    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Desbloqueja\nla volta</string>
-    <string name="auth_use_biometrics">O toca aqui per a fer servir el <font fgcolor="#FF0D86C1">desbloqueig biomètric</font></string>
+    <string name="authentication_method_biometrics_description">A més de la contrasenya, les dades biomètriques enregistrades al dispositiu, com una emprempta digital o la cara, es poden fer servir per a desbloquejar la caixa forta.</string>
+    <string name="authentication">Desbloqueja la caixa forta</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Desbloqueja la \ncaixa forta</string>
+    <string name="auth_use_biometrics">O toca aquí per a fer servir el <font fgcolor="#FF0D86C1">desbloqueig biomètric</font></string>
     <string name="set_password">Si et plau, introdueix una contrasenya</string>
     <string name="set_group">Introdueix un nom de grup</string>
     <string name="set_number">Introdueix un número</string>
     <string name="set_password_confirm">Confirma la contrasenya</string>
     <string name="invalid_password">La contrasenya no és correcta</string>
     <string name="invalidated_biometrics">S\'ha detectat un canvi en la configuració de seguretat del dispositiu. Si us plau, ves a \"Aegis -&gt; Configuració -&gt; Seguretat -&gt; Desbloqueig biomètric\" per a desactivar i reactivar-lo.</string>
+    <string name="password_reminder">Introdueix la contrasenya. T\'ho demanarem ocasionalment per tal que no te n\'oblidis.</string>
+    <string name="password_reminder_dialog_title">Desbloqueig biomètric per defecte</string>
+    <string name="password_reminder_dialog_message">Ocasionalment et demanarem la contrasenya per tal que no te n\'oblidis i no perdis l\'accés a la teva caixa forta. Després d\'entrar la contrasenya, l\'Aegis tornarà al desbloqueig biomètric per defecte. Et tornarem a demanar la contrasenya en el proper recordatori.</string>
     <string name="password_reminder_freq_never">Mai</string>
     <string name="password_reminder_freq_weekly">Setmanalment</string>
     <string name="password_reminder_freq_biweekly">Cada dues setmanes</string>
@@ -145,6 +196,7 @@
     <string name="share">Comparteix</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
+    <string name="undo">Desfés</string>
     <string name="unlock">Desbloqueja</string>
     <string name="advanced">Avançat</string>
     <string name="counter">Comptador</string>
@@ -156,6 +208,11 @@
     <string name="set_up_biometric">Configura desbloqueig biomètric</string>
     <string name="copy">Copia</string>
     <string name="edit">Edita</string>
+    <string name="select_all">Seleccionar-ho tot</string>
+    <string name="assign_icons">Assignar icones</string>
+    <string name="assign_groups">Assignar a grup</string>
+    <string name="assign_groups_dialog_summary">Tria el grup on vols assignar les entrades seleccionades.</string>
+    <string name="assign_groups_dialog_dropdown">Tria un grup</string>
     <string name="favorite" comment="Verb">Preferit</string>
     <string name="unfavorite" comment="Verb">No preferit</string>
     <string name="error_all_caps">ERROR</string>
@@ -164,19 +221,21 @@
     <string name="show_password">Mostra la contrasenya</string>
     <string name="new_entry">Entrada nova</string>
     <string name="add_new_entry">Afegeix nova entrada</string>
-    <string name="unlock_vault_error">No es pot desbloquejar la volta</string>
+    <string name="unlock_vault_error">No es pot desbloquejar la caixa forta</string>
     <string name="unlock_vault_error_description">Contrasenya incorrecta. Assegura\'t de que no t\'has equivocat.</string>
     <string name="password_equality_error">Les contrasenyes han de ser idèntiques, i no estar buides</string>
     <string name="snackbar_authentication_method">Si us plau, tria un mètode d\'autenticació</string>
-    <string name="encrypting_vault">Xifrant la volta</string>
-    <string name="exporting_vault">Exporta la volta</string>
+    <string name="encrypting_vault">Xifrant la caixa forta</string>
+    <string name="exporting_vault">Exporta la caixa forta</string>
+    <string name="optimizing_icon">Optimitzant icona</string>
+    <string name="optimizing_icon_multiple">Optimitzant icones %1$d/%2$d</string>
     <string name="reading_file">S\'està llegint el fitxer</string>
     <string name="requesting_root_access">Demanant accés root</string>
     <string name="analyzing_qr">Anàlisi del codi QR</string>
-    <string name="analyzing_qr_multiple">Anàlisi del codi QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analitzant el codi QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
-        <item quantity="one">S\'ha afegit una entrada nova a la volta</item>
-        <item quantity="other">S\'han afegit %d entrades noves a la volta</item>
+        <item quantity="one">S\'ha afegit %d entrada nova a la caixa forta</item>
+        <item quantity="other">S\'han afegit %d entrades noves a la caixa forta</item>
     </plurals>
     <string name="importing_icon_pack">Important paquet d\'icones</string>
     <string name="delete_entry">Esborra l\'entrada</string>
@@ -190,24 +249,26 @@
     <string name="discard_changes">Vols descartar els canvis?</string>
     <string name="discard_changes_description">No s\'han desat els canvis</string>
     <string name="saving_profile_error">Error desant el perfil</string>
+    <string name="saving_assign_icons_error">Error en assignar icones</string>
     <string name="welcome">Benvinguts</string>
     <string name="app_description">Aegis es una app d\'A2F gratuïta, segura i de codi lliure</string>
     <string name="setup_completed">Configuració completada</string>
     <string name="setup_completed_description">S\'ha configurat Aegis i està llest per a funcionar.</string>
-    <string name="vault_not_found">No s\'ha trobat cap volta, iniciant configuració…</string>
+    <string name="vault_not_found">No s\'ha trobat cap caixa forta, iniciant configuració…</string>
     <string name="copied">Copiat</string>
     <string name="errors_copied">Errors copiant al porta-retalls</string>
     <string name="version_copied">Versió copiada al porta-retalls</string>
+    <string name="error_required_field">Aquest camp és obligatori</string>
     <string name="error_occurred">S\'ha produït un error</string>
-    <string name="decryption_error">S\'ha produït un error al desbloquejar la volta</string>
-    <string name="decryption_corrupt_error">S\'ha produït un error al desbloquejar la volta. El fitxer de volta pot estar fet malbé.</string>
-    <string name="saving_error">S\'ha produït un error al desar la volta</string>
-    <string name="vault_init_error">S\'ha produït un error al inicialitzar la volta</string>
-    <string name="vault_load_error">S\'ha produït un error al carregar la volta</string>
-    <string name="biometric_decrypt_error">S\'ha produït un error al desxifrar la volta amb l\'autenticació biomètrica. Això sol passar si la configuració de seguretat del dispositiu ha canviat. Si us plau, deslboqueja la volta amb la teva contrasenya i reconfigura l\'autenticació biomètrica.</string>
-    <string name="biometric_init_error">S\'ha produït un error al preparar l\'autenticació biomètrica. Això sol passar si la configuració de seguretat del dispositiu ha canviat. Si us plau, deslboqueja la volta amb la teva contrasenya i reconfigura l\'autenticació biomètrica.</string>
+    <string name="decryption_error">S\'ha produït un error al desbloquejar la caixa forta</string>
+    <string name="decryption_corrupt_error">S\'ha produït un error al desbloquejar la caixa forta. El fitxer pot estar fet malbé.</string>
+    <string name="saving_error">S\'ha produït un error al desar la caixa forta</string>
+    <string name="vault_init_error">S\'ha produït un error al inicialitzar la caixa forta</string>
+    <string name="vault_load_error">S\'ha produït un error al carregar la caixa forta</string>
+    <string name="biometric_decrypt_error">S\'ha produït un error al desxifrar la caixa forta amb l\'autenticació biomètrica. Això sol passar si la configuració de seguretat del dispositiu ha canviat. Si us plau, deslboqueja la caixa amb la teva contrasenya i reconfigura l\'autenticació biomètrica.</string>
+    <string name="biometric_init_error">S\'ha produït un error al preparar l\'autenticació biomètrica. Això sol passar si la configuració de seguretat del dispositiu ha canviat. Si us plau, deslboqueja la caixa forta amb la teva contrasenya i reconfigura l\'autenticació biomètrica.</string>
     <string name="disable_encryption">Desactivar xifrat</string>
-    <string name="disable_encryption_description">Segur que vols desactivar el xifrat? Això causarà que la volta s\'emmagatzemi en text clar. <b>Les copies de seguretat automàtiques es desactivaran</b>.</string>
+    <string name="disable_encryption_description">Segur que vols desactivar el xifrat? Això causarà que la caixa forta s\'emmagatzemi en text clar. <b>Les copies de seguretat automàtiques es desactivaran</b>.</string>
     <string name="enable_encryption_error">S\'ha produït un error en activar el xifrat</string>
     <string name="disable_encryption_error">S\'ha produït un error en desactivar el xifrat</string>
     <string name="backup_successful">S\'ha programat la còpia de seguretat</string>
@@ -232,7 +293,9 @@
     <string name="choose_totpauth_importer">Està la còpia del TOTP Authenticator xifrada amb una contrasenya?</string>
     <string name="choose_application">Tria l\'aplicació de la que vols importar</string>
     <string name="choose_theme">Tria l\'aparença</string>
+    <string name="choose_account_name_position">Selecciona la posició del nom del compte que desitges</string>
     <string name="choose_view_mode">Tria el mode de visualització</string>
+    <string name="choose_copy_behavior">Selecciona el comportament de còpia que desitges</string>
     <string name="parsing_file_error">S\'ha produït un error en analitzar el fitxer</string>
     <string name="file_not_found">Error: no s\'ha trobat el fitxer</string>
     <string name="reading_file_error">S\'ha produït un error mentre s\'intentava carregar el fitxer</string>
@@ -244,13 +307,13 @@
         <item quantity="other">%d entrades importades</item>
     </plurals>
     <plurals name="entries_shown">
-        <item quantity="one">Mostrant %d entrades</item>
+        <item quantity="one">Mostrant %d entrada</item>
         <item quantity="other">Mostrant %d entrades</item>
     </plurals>
-    <string name="intro_import_error_title">S\'ha produït un error en importar la volta</string>
+    <string name="intro_import_error_title">S\'ha produït un error en importar la caixa forta</string>
     <string name="import_error_title">S\'han produït errors al importar</string>
-    <string name="exporting_vault_error">S\'ha produït un error mentre s\'intentava exportar la volta</string>
-    <string name="exported_vault">S\'ha exportat la volta</string>
+    <string name="exporting_vault_error">S\'ha produït un error mentre s\'intentava exportar la caixa forta</string>
+    <string name="exported_vault">S\'ha exportat la caixa forta</string>
     <string name="encryption_set_password_error">S\'ha produït un error al intentar definir la contrasenya.</string>
     <string name="encryption_enable_biometrics_error">S\'ha produït un error al intentar activar el desbloqueig biomètric. Alguns dispositius tenen una implementació deficient i es possible que passi amb el teu. Considera canviar a una configuració amb contrasenya.</string>
     <string name="no_cameras_available">No hi ha càmeres disponibles</string>
@@ -259,15 +322,20 @@
     <string name="partial_google_auth_import">S\'ha detectat una exportació incompleta de Google Authenticator</string>
     <string name="partial_google_auth_import_warning">Falten alguns codis QR a la importació. No s\'han trobat els codis següents:\n\n<b>%s</b>\n\nPodeu continuar important aquesta exportació parcial, però us recomanem que torneu a provar amb tots els codis QR perquè no us arriscareu a perdre l\'accés a cap token.</string>
     <string name="missing_qr_code_descriptor">• codi QR %d</string>
-    <string name="import_partial_export_anyway">Importeu %d tokens de totes maneres</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importeu %d fitxa de totes maneres</item>
+        <item quantity="other">Importeu %d fitxes de totes maneres</item>
+    </plurals>
     <string name="import_google_auth_failure">No s\'ha pogut importar l\'exportació de Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">L\'exportació conté informació d\'un lot no relacionat. Proveu d\'importar 1 lot alhora.</string>
     <string name="no_tokens_can_be_imported">Com a resultat, no es poden importar tokens</string>
-    <string name="authentication_method_raw">En cru</string>
-    <string name="unlocking_vault">Desbloquejant la volta</string>
-    <string name="slot_this_device">(aquest dispositiu)</string>
+    <string name="unlocking_vault">Desbloquejant la caixa forta</string>
+    <string name="rename_group">Canvia el nom del grup</string>
+    <string name="no_group_selection">Si una entrada no pertany a cap grup, es podrà trobar a \"Sense grup\".</string>
     <string name="remove_group">Elimina el grup</string>
     <string name="remove_group_description">Segur que vols eliminar aquest grup? Les entrades canviaran automàticament a \"Sense grup\".</string>
+    <string name="remove_unused_groups">Esborrar grups no utilitzats</string>
+    <string name="remove_unused_groups_description">Estàs segur que vols esborrar tots els grups que no estan assignats a una entrada?</string>
     <string name="remove_icon_pack">Esborra el paquet d\'icones</string>
     <string name="remove_icon_pack_description">Segur que vols eliminar aquest paquet d\'icones? Les entrades que fan servir icones d\'aquest paquet no es veuran afectades.</string>
     <string name="details">Detalls</string>
@@ -275,27 +343,49 @@
     <string name="lock">Bloqueja</string>
     <string name="name">Nom</string>
     <string name="no_group">Sense grup</string>
-    <string name="sort">Ordena</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ordena</string>
     <string name="sort_alphabetically">Emissor (A a Z)</string>
     <string name="sort_alphabetically_reverse">Emissor (Z a A)</string>
     <string name="sort_alphabetically_name">Compte (A a Z)</string>
     <string name="sort_alphabetically_name_reverse">Compte (Z a A)</string>
     <string name="sort_usage_count">Utilitzacions</string>
+    <string name="sort_last_used">Últim usat</string>
     <string name="sort_custom">Personalitza</string>
+    <string name="last_used">Últim usat</string>
+    <string name="last_used_never">mai</string>
     <string name="new_group">Grup nou…</string>
     <string name="group">Grup</string>
     <string name="group_name_hint">Nom del grup</string>
     <string name="preference_manage_groups">Edita els grups</string>
-    <string name="preference_manage_groups_summary">Gestiona i elimina els grups aqui</string>
+    <string name="preference_manage_groups_summary">Gestiona i elimina els grups aquí</string>
     <string name="preference_reset_usage_count">Reiniciar comptador d\'usos</string>
     <string name="preference_reset_usage_count_summary">Reinicia el comptador d\'usos de totes les entrades</string>
     <string name="preference_reset_usage_count_dialog">Segur que vols reiniciar el comptador d\'us de cada entrada a 0?</string>
-    <string name="note">Nota</string>
+    <string name="note" comment="Users can add a note to an entry">Nota</string>
     <string name="clear">Neteja</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Entrada duplicada</string>
+    <string name="dialog_duplicate_entry_message">Aquesta entrada té el mateix nom i emissor que una altra entrada. Com vols continuar?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Sobreescriure l\'entrada/des existents</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Reemplaçar l\'entrada/des existents per la nova. Aquesta acció no es pot desfer</string>
+    <string name="dialog_duplicate_entry_suffix_title">Afegir un sufix</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Afegir un sufix al nom d\'aquesta nova entrada. El nou nom serà: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Cancel·la el guardat</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Et permet editar l\'entrada abans de tornar a intentar el guardat</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Estàs segur de voler esborrar %d entrada amb aquest nom:\n\n%s - %s</item>
+        <item quantity="other">Estàs segur de voler esborrar %d entrades amb aquests noms:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Confirma la supressió</string>
+    <string name="pref_haptic_feedback_summary">Fes que el dispositiu vibri quan s\'actualitzin els codis</string>
+    <string name="pref_haptic_feedback_title">Resposta hàptica</string>
     <string name="pref_highlight_entry_title">Il·luminar les fitxes al tocar</string>
     <string name="pref_highlight_entry_summary">Fes les fitxes més fàcils de distingir de la resta il·luminant-les temporalment quan les toquis</string>
+    <string name="pref_groups_multiselect_title">Selecció múltiple de grups</string>
+    <string name="pref_groups_multiselect_summary">Permet la selecció de múltiples grups al mateix temps</string>
     <string name="pref_minimize_on_copy_title">Minimitzar al copiar</string>
-    <string name="pref_minimize_on_copy_summary">Minimitzar l\'aplicació després de copiar un token</string>
+    <string name="pref_minimize_on_copy_summary">Minimitzar l\'aplicació després de copiar una fitxa</string>
+    <string name="pref_copy_behavior_title">Copia les fitxes al porta-retalls</string>
+    <string name="pref_search_behavior_title">Comportament de la cerca</string>
     <string name="pref_pause_entry_title">Congela la fitxa al tocar</string>
     <string name="pref_pause_entry_summary">Pausa l\'actualització automàtica de la fitxa al tocar-la. No s\'actualitzará mentre estigui marcada. Cal tenir \"Il·lumina les fitxes al tocar\" o \"Toca per a mostrar\".</string>
     <string name="pin_keyboard_description">Introdueix la teva contrasenya per a activar el teclat PIN. Això només funcionarà si la contrasenya només té dígits</string>
@@ -311,26 +401,27 @@
     <string name="normal_viewmode_title">Normal</string>
     <string name="compact_mode_title">Compacte</string>
     <string name="small_mode_title">Petit</string>
+    <string name="tiles_mode_title">Mosaic</string>
     <string name="unknown_issuer">Emissor desconegut</string>
     <string name="unknown_account_name">Nom de compte desconegut</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis no ha pogut importar %d fitxa. Toca \'detalls\' per a veure més informació sobre l\'error.</item>
-        <item quantity="other">Aegis no ha pogut importar %d fitxes. Toca \'detalls\' per a veure més informació sobre els errors.</item>
+        <item quantity="one">L\'Aegis no pot importar %d fitxa. Aquesta fitxa es descartarà. Prem \"detalls\" per a veure més informació d\'aquest error.</item>
+        <item quantity="other">L\'Aegis no pot importar %d fitxes. Aquestes fitxes es descartaran. Prem \"detalls\" per a veure més informació d\'aquest error.</item>
     </plurals>
     <string name="unable_to_process_deeplink">No es pot processar l\'enllaç profund</string>
     <string name="unable_to_read_qrcode_file">No es pot llegir i processar el codi QR del fitxer: %s.</string>
     <string name="unable_to_process_shared_text">No es pot processar el text compartit com a OTP</string>
-    <string name="unable_to_read_qrcode_files">No es poden llegir i processar alguns dels codis QR. Només s\'importaran %d/%d entrades.</string>
+    <string name="unable_to_read_qrcode_files">No es poden llegir i processar alguns dels codis QR. Només s\'importaran %1$d/%2$d entrades.</string>
     <string name="unable_to_generate_qrcode">La generació del codi QR ha fallat</string>
     <string name="select_picture">Tria imatge</string>
     <string name="select_icon">Tria icona</string>
-    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Orbir Volta</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Obrir caixa forta</string>
     <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Obrir escàner</string>
     <string name="toggle_checkboxes">Alternar selecció</string>
     <string name="search">Cerca</string>
     <string name="channel_name_lock_status">Estat del bloqueig</string>
-    <string name="channel_description_lock_status">Aegis pot crear una notificació persistent per a avisar-te de que la volta està desbloquejada</string>
-    <string name="vault_unlocked_state">La volta està desbloquejada. Toca aquí per a bloquejar-la.</string>
+    <string name="channel_description_lock_status">Aegis pot crear una notificació persistent per a avisar-te de que la caixa forta està desbloquejada</string>
+    <string name="vault_unlocked_state">La caixa forta està desbloquejada. Toca aquí per a bloquejar-la.</string>
     <string name="version">Versió</string>
     <string name="changelog">Registre de canvis</string>
     <string name="whats_new">Què hi ha de nou</string>
@@ -352,12 +443,14 @@
     <string name="time_sync_warning_disable">No cal que m\'avisis més. Sé el que estic fent.</string>
     <string name="google_qr_export_unrelated">Codi QR no vàlid. Prova-ho un altre cop.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">S\'ha escanejat %d/%d codi QR</item>
-        <item quantity="other">S\'han escanejat %d/%d codis QR</item>
+        <item quantity="one">S\'ha escanejat %1$d/%2$d codi QR</item>
+        <item quantity="other">S\'han escanejat %1$d/%2$d codis QR</item>
     </plurals>
-    <string name="google_qr_export_unexpected">S\'esperava codi QR #%d, però s\'ha trobat #%d en el seu lloc</string>
+    <string name="google_qr_export_unexpected">S\'esperava codi QR #%1$d, però s\'ha trobat #%2$d en el seu lloc</string>
     <string name="backup_error_bar_message"><b>Ha fallat la còpia de seguretat recentment</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Una còpia de seguretat de la volta utilitzant %s ha fallat. La còpia s\'ha intentat %s. Si us plau, comprova la configuració de la còpia per a assegurar-te de que les còpies es poden fer correctament.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Una còpia de seguretat de la caixa forta utilitzant %1$s ha fallat. La còpia s\'ha intentat %2$s. Si us plau, comprova la configuració de la còpia per a assegurar-te de que les còpies es poden fer correctament.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Un intent recent de còpia de seguretat de la caixa forta utilitzant %1$s ha fallat perquè l\'Aegis no té permís d\'escriptura en el destí de la còpia de seguretat. La còpia s\'ha intentat %2$s. Aquest error pot aparèixer si has mogut/reanomenat el destí de la còpia de seguretat o si has restaurat l\'Aegis recentment des d\'una còpia de seguretat. Si us plau torna a configurar el destí de la còpia de seguretat.
     </string>
     <string name="backup_system_builtin">Còpies de seguretat integrades a Aegis</string>
     <string name="backup_system_android">Còpia al núvol d\'Android</string>
@@ -367,9 +460,9 @@
     <string name="backup_reminder_bar_dialog_summary">        No s\'ha fet una còpia de seguretat dels últims canvis. Es important fer còpies regularment per a evitar perdre l\'accés als teus comptes. Si us plau, considera activar les còpies automàtiques al menú de configuració.
     </string>
     <string name="backup_reminder_bar_dialog_accept">Configurar còpies de seguretat</string>
-    <string name="backup_plaintext_export_warning"><b>La volta s\'ha exportat recentment en text sense format</b></string>
+    <string name="backup_plaintext_export_warning"><b>La caixa forta s\'ha exportat recentment en text sense format</b></string>
     <string name="pref_show_plaintext_warning_hint">No tornis a mostrar aquesta advertència</string>
-    <string name="backup_plaintext_warning_explanation">Aquest avís es mostra perquè recentment heu exportat una còpia no xifrada de la volta. Per mantenir la seguretat dels vostres tokens, us recomanem que suprimiu aquest fitxer quan ja no sigui necessari.</string>
+    <string name="backup_plaintext_warning_explanation">Aquest avís es mostra perquè recentment heu exportat una còpia no xifrada de la caixa forta. Per mantenir la seguretat dels vostres tokens, us recomanem que suprimiu aquest fitxer quan ja no sigui necessari.</string>
     <string name="switch_camera">Canvia la càmera</string>
     <string name="empty_list">No hi ha codis a mostrar. Afegeix entrades tocant el signe més de la cantonada inferior dreta</string>
     <string name="empty_list_title">No s\'ha trobat cap entrada</string>
@@ -389,14 +482,15 @@
     <string name="copy_uri">Copiar URI</string>
     <string name="unable_to_copy_uri_to_clipboard">No s\'ha pogut copiar la URI</string>
     <string name="uri_copied_to_clipboard">URI copiada al porta-retalls</string>
-    <string name="transfer_entry">Transferir entrada</string>
     <string name="transfer_entry_description">Escaneja aquest codi QR amb l\'aplicació d\'autenticació a la que vols transferir aquesta entrada</string>
+    <string name="transfer_entry_brightness">Toca el codi QR per canviar a màxima brillantor</string>
     <string name="google_auth_compatible_transfer_description">Escanegeu aquests codis QR amb Aegis o Google Authenticator.\n\n A causa de les limitacions de l\'aplicació Google Authenticator, només s\'inclouen tokens TOTP &amp; HOTP que utilitzen SHA1 i produeixen codis de 6 dígits</string>
     <string name="password_strength_very_weak">Molt feble</string>
     <string name="password_strength_weak">Feble</string>
     <string name="password_strength_fair">Correcta</string>
     <string name="password_strength_good">Bona</string>
     <string name="password_strength_strong">Forta</string>
+    <string name="password_strength_unknown">Contrasenya massa llarga per a l\'anàlisi de fortalesa</string>
     <string name="pref_pin_keyboard_title">Fes servir teclat PIN a la pantalla de bloqueig</string>
     <string name="pref_pin_keyboard_summary">Activa això si vols fer servir el teclat pin. Només funciona per a contrasenyes numèriques</string>
     <string name="title_activity_preferences">Configuració</string>
@@ -405,32 +499,43 @@
     <string name="title_activity_about">Quant a</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escaneja un codi QR</string>
-    <string name="title_activity_manage_slots">Gestiona les entrades</string>
     <string name="title_activity_import_entries">Importa entrades</string>
+    <string name="title_activity_assign_icons">Assignar icones</string>
+    <string name="title_activity_licenses">Llicències de tercers</string>
     <string name="dialog_wipe_entries_title">Elimina entrades</string>
-    <string name="dialog_wipe_entries_message">La teva volta ja té entrades. Vols eliminar les entrades abans d\'importar aquest fitxer?\n\n<b>Si ho fas, perdràs l\'accés a les entrades que tens actualment.</b></string>
-    <string name="dialog_wipe_entries_checkbox">Eliminar contingut de la volta</string>
+    <string name="dialog_wipe_entries_message">La teva caixa forta ja té entrades. Vols eliminar les entrades abans d\'importar aquest fitxer?\n\n<b>Si ho fas, perdràs l\'accés a les entrades que tens actualment.</b></string>
+    <string name="dialog_wipe_entries_checkbox">Eliminar contingut de la caixa forta</string>
     <string name="panic_trigger_ignore_toast">S\'ha rebut el botó del pànic, però està deshabilitat a la configuració, ho hem ignorat</string>
-    <string name="pref_panic_trigger_title">Eliminar la volta amb el botó del pànic</string>
-    <string name="pref_panic_trigger_summary">Eliminar la volta amb el botó del pànic si es rep des de Ripple</string>
-    <string name="import_vault">Importar volta</string>
+    <string name="pref_panic_trigger_title">Eliminar la caixa forta amb el botó del pànic</string>
+    <string name="pref_panic_trigger_summary">Eliminar la caixa forta amb el botó del pànic si es rep des de Ripple</string>
+    <string name="import_vault">Importar la caixa forta d\'Aegis</string>
+    <string name="import_vault_hint">Vols importar des d\'una app 2FA diferent? Completa primer la configuració i llavors ves al menú de configuració.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d possible duplicat desmarcat. Revisa la llista d\'entrades.</item>
+        <item quantity="other">%d possibles duplicats desmarcats. Revisa la llista d\'entrades.</item>
+    </plurals>
     <string name="importer_help_2fas">Subministra un fitxer exportat del 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Subministra un fitxer exportat del Aegis.</string>
     <string name="importer_help_authenticator_plus">Subministra un fitxer exportat del Authenticator Plus, obtingut amb <b>Settings -&gt; Backup &amp; Restore -&gt; Export as Text and HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Proveeix un fitxer exportat d\'Authenticat Pro, aconseguit a <b>Settings &gt; Back up &gt; Back up to encrypted file (recommended)</b>.</string>
     <string name="importer_help_authy">Subministra una còpia de <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, que està a l\'emmagatzematge intern del teu dispositiu, al directori del Authy.</string>
     <string name="importer_help_andotp">Subministra un fitxer exportat del andOTP.</string>
     <string name="importer_help_bitwarden">Subministreu un fitxer d\'exportació/còpia de seguretat de Bitwarden. Els fitxers xifrats no són compatibles.</string>
-    <string name="importer_help_battle_net_authenticator">Proporciona una copia de <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, trobat al directori del autenticador de Battle.net.</string>
+    <string name="importer_help_battle_net_authenticator">Proporciona una còpia de <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, que es troba al directori de l\'autenticador de Battle.net.</string>
     <string name="importer_help_duo">Subministra una còpia de <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, que està a l\'emmagatzematge intern del teu dispositiu, al directori del DUO.</string>
-    <string name="importer_help_freeotp">Subministra una còpia de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, que està a l\'emmagatzematge intern del teu dispositiu, al directori del FreeOTP.</string>
+    <string name="importer_help_ente_auth">Subministra un fitxer exportat d\'Ente Auth. Per ara només acceptem fitxers sense xifrar.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Subministra un fitxer de còpia de seguretat.\nFreeOTP 1.x: Subministra una còpia de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, que està a l\'emmagatzematge intern del teu dispositiu, al directori del FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Subministra un fitxer exportat del FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilitat FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Hi ha diversos problemes en el FreeOTP 2 que poden resultar en còpies de seguretat defectuoses. L\'Aegis provarà de recuperar el màxim d\'entrades possible, però potser algunes entrades o totes elles no es puguin importar.</string>
     <string name="importer_help_google_authenticator">&lt;b&gt;Només s\'admeten fitxers de bases de dades de Google Authenticator v5.10 i anteriors&lt;/b&gt;.\n\nProporcioneu una còpia de &lt;b&gt;/data/data/com.google.android.apps.authenticator2/databases/databases&lt; /b&gt;, situada al directori d\'emmagatzematge intern de Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Subministra una còpia de <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, que està a l\'emmagatzematge intern del teu dispositiu, al directori del Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Subministra un fitxer de text pla amb una URI de Google Authenticator a cada línia.</string>
     <string name="importer_help_steam"><b>Steam v3.0 i posteriors no són compatibles</b>. Proporcioneu una còpia de <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, que es troba al directori d\'emmagatzematge intern de Steam.</string>
+    <string name="importer_help_stratum">Proveeix un fitxer exportat de Stratum, aconseguit a <b>Settings &gt; Back up &gt; Back up to encrypted file (recommended)</b>.</string>
     <string name="importer_help_totp_authenticator">Subministra un fitxer exportat del TOTP Authenticator.</string>
     <string name="importer_help_winauth">Subministra un fitxer exportat del WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Assignar icones</string>
+    <string name="import_assign_icons_dialog_text">Vols assignar icones a les entrades importades?</string>
     <string name="importer_encrypted_exception_google_authenticator">S\'ha omès l\'entrada xifrada: %s</string>
     <string name="importer_help_direct">Importa entrades directament de %s. Per a fer això, cal que l\'aplicació estigui instal·lada i cal que l\'Aegis tingui accés root.</string>
     <string name="groups">Grups</string>
@@ -441,23 +546,29 @@
     <string name="pref_grouping_size_two">Grups de 2</string>
     <string name="pref_grouping_size_three">Grups de 3</string>
     <string name="pref_grouping_size_four">Grups de 4</string>
-    <plurals name="time_elapsed_seconds">
+    <string name="pref_copy_behavior_never">Mai</string>
+    <string name="pref_copy_behavior_single_tap">Un toc</string>
+    <string name="pref_copy_behavior_double_tap">Doble toc</string>
+    <string name="pref_account_name_position_hidden">Ocult</string>
+    <string name="pref_account_name_position_end">Al costat de l\'emissor</string>
+    <string name="pref_account_name_position_below">A sota de l\'emissor</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">fa %d segon</item>
         <item quantity="other">fa %d segons</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">fa %d minut</item>
         <item quantity="other">fa %d minuts</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">Fa %d hora</item>
         <item quantity="other">fa %d hores</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">fa %d dia</item>
         <item quantity="other">fa %d dies</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">fa %d any</item>
         <item quantity="other">fa %d anys</item>
     </plurals>
diff --git a/app/src/main/res/values-cs-rCZ-v29/strings.xml b/app/src/main/res/values-cs-rCZ-v29/strings.xml
new file mode 100644
index 00000000..d9864581
--- /dev/null
+++ b/app/src/main/res/values-cs-rCZ-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Podle systému</string>
+    <string name="system_amoled_theme_title">Podle systému (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index f8a7f593..67304d0b 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Nastavení</string>
     <string name="action_about">O aplikaci</string>
     <string name="action_delete">Odstranit</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Obnovit původní ikonu</string>
     <string name="discard">Zahodit</string>
     <string name="save">Uložit</string>
+    <string name="all">Vše</string>
     <string name="issuer">Poskytovatel</string>
     <string name="yandex_pin">PIN (4–16 číslic)</string>
     <string name="motp_pin">PIN (4 číslice)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Nastavení šifrování, biometrického odemčení, automatického uzamčení a dalších nastavení zabezpečení.</string>
     <string name="pref_section_import_export_title">Import a export</string>
     <string name="pref_section_import_export_summary">Importovat zálohy Aegisu nebo jiné ověřovací aplikace. Vytvořit ruční export vašeho trezoru Aegis.</string>
+    <string name="pref_section_audit_log_title">Protokol</string>
+    <string name="pref_section_audit_log_summary">Seznam nahlášených důležitých událostí, které se staly v aplikaci.</string>
     <string name="pref_section_backups_title">Zálohy</string>
     <string name="pref_section_backups_summary">Nastavit automatické zálohy do lokace vašeho výběru nebo povolit účast v cloudovém zálohovacím systému Androidu.</string>
     <string name="pref_section_icon_packs">Balíčky ikon</string>
     <string name="pref_section_icon_packs_summary">Správa a import balíčků ikon</string>
     <string name="pref_select_theme_title">Vzhled</string>
+    <string name="pref_dynamic_colors_title">Dynamické barvy</string>
+    <string name="pref_dynamic_colors_summary">Použít překryv založený na barvách vašeho motivu systému Android</string>
     <string name="pref_view_mode_title">Režim zobrazení</string>
     <string name="pref_lang_title">Jazyk</string>
     <string name="pref_show_icons_title">Zobrazit ikony</string>
@@ -40,9 +45,14 @@
     <string name="pref_code_group_size_title">Seskupení číslic kódu</string>
     <string name="pref_code_group_size_summary">Vyberte počet číslic, po kterých se mají seskupovat kódy</string>
     <string name="pref_account_name_position_title">Zobrazit název účtu</string>
+    <string name="pref_show_next_code_title">Zobrazit další kód</string>
+    <string name="pref_show_next_code_summary">Vygenerovat a zobrazit další kód před vypršením času</string>
+    <string name="pref_expiration_state_title">Uveďte, kdy vyprší platnost kódů</string>
+    <string name="pref_expiration_state_summary">Při vypršení kódy změní barvu a budou blikat</string>
+    <string name="pref_expiration_state_fallback">Při vypršení kódy změní barvu</string>
     <string name="pref_shared_issuer_account_name_title">Název účtu zobrazit pouze v případě potřeby</string>
     <string name="pref_shared_issuer_account_name_summary">Názvy účtů zobrazit pouze, pokud mají stejného poskytovatele. Ostatní názvy účtů budou skryty.</string>
-    <string name="pref_account_name_position_summary_override">Toto nastavení je přepsáno režimem zobrazení názvů. Název účtu bude vždy zobrazen pod poskytovatelem.</string>
+    <string name="pref_account_name_position_summary_override">Toto nastavení je přepsáno režimem zobrazení dlaždic. Název účtu bude zobrazen pod poskytovatelem.</string>
     <string name="pref_import_file_title">Importovat ze souboru</string>
     <string name="pref_import_file_summary">Importovat tokeny ze souboru</string>
     <string name="pref_android_backups_title">Cloudové zálohování systému Android</string>
@@ -54,17 +64,25 @@
     <string name="pref_backups_reminder_summary">Zobrazit připomenutí k zálohování vašeho trezoru, pokud jste nezálohovali své poslední změny.</string>
     <string name="pref_backups_reminder_dialog_title">Zakázat připomenutí zálohy</string>
     <string name="pref_backups_reminder_dialog_summary">Vypnutí tohoto připomenutí znamená, že vám Aegis neřekne, zda máte změny, které ještě nejsou zálohovány. Tím se vystavíte riziku ztráty přístupu k vašim tokenům. Opravdu chcete zakázat připomenutí?</string>
-    <string name="pref_backups_location_title">Složka pro soubory záloh</string>
+    <string name="pref_backups_versioning_strategy_title">Strategie zálohování</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Zachovat několik verzí</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Jedna záloha</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Zvolená strategie zálohování není spolehlivá a není doporučená. Selhání jedné zálohy může vést ke ztrátě vaší jediné zálohy.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Vyberte strategii zálohování</string>
+    <string name="pref_backups_location_title">Umístění záloh</string>
     <string name="pref_backups_location_summary">Zálohy budou uloženy v</string>
+    <string name="pref_backup_location_summary">Zálohy budou uloženy v adresáři</string>
     <string name="pref_backups_trigger_title">Spustit zálohování</string>
     <string name="pref_backups_trigger_summary">Ručně spustit zálohování</string>
     <string name="pref_backups_versions_title">Počet verzí k uchování</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Uchovat %1$d verzi zálohy</item>
         <item quantity="few">Uchovat %1$d verze zálohy</item>
         <item quantity="many">Uchovat %1$d verzí zálohy</item>
         <item quantity="other">Uchovat %1$d verzí zálohy</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Ponechat nekonečný počet verzí zálohy</string>
     <string name="pref_import_app_title">Importovat z aplikace</string>
     <string name="pref_import_app_summary">Importovat tokeny z aplikace (vyžaduje root přístup)</string>
     <string name="pref_export_title">Exportovat</string>
@@ -102,8 +120,34 @@
     <string name="pref_encryption_summary">Šifrovat trezor a odemykat jej pomocí hesla, nebo biometrie</string>
     <string name="pref_biometrics_title">Biometrické odemknutí</string>
     <string name="pref_biometrics_summary">Povolit biometrické ověření pro odemčení trezoru</string>
+    <string name="pref_search_behavior_summary">Hledat v: %s</string>
+    <string name="pref_search_behavior_prompt">Hledat ve kterémkoli z následujících polí</string>
+    <string name="pref_search_behavior_type_name">Název</string>
+    <string name="pref_search_behavior_type_issuer">Vydavatel</string>
+    <string name="pref_search_behavior_type_note">Poznámka</string>
+    <string name="pref_search_behavior_type_groups">Skupiny</string>
     <string name="pref_set_password_title">Změnit heslo</string>
     <string name="pref_set_password_summary">Nastavení nového hesla potřebného pro odemčení trezoru</string>
+    <string name="no_events_title">Žádné nahlášené události</string>
+    <string name="no_events_description">V aplikaci nebyly nahlášeny žádné důležité události</string>
+    <string name="event_title_vault_unlocked">Trezor odemčen</string>
+    <string name="event_description_vault_unlocked">Trezor byl úspěšně odemčen</string>
+    <string name="event_title_backup_created">Záloha vytvořena</string>
+    <string name="event_description_backup_created">Záloha trezoru byla úspěšně vytvořena</string>
+    <string name="event_title_android_backup_created">Záloha vytvořena systémem Android</string>
+    <string name="event_description_android_backup_created">Záloha trezoru byla úspěšně vytvořena systémem Android</string>
+    <string name="event_title_vault_exported">Trezor exportován</string>
+    <string name="event_description_vault_exported">Kopie trezoru byla exportována</string>
+    <string name="event_title_entry_shared">Záznam sdílen</string>
+    <string name="event_description_entry_shared">Záznam byl sdílen</string>
+    <string name="event_title_vault_unlock_failed_password">Odemčení trezoru selhalo (heslo)</string>
+    <string name="event_description_vault_unlock_failed_password">Pokus o odemknutí trezoru pomocí hesla se nezdařil</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Odemčení trezoru selhalo (biometrika)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Pokus o odemknutí trezoru pomocí biometriky se nezdařil</string>
+    <string name="event_unknown">Neznámý typ události</string>
+    <string name="audit_log_entry_deleted">(odstraněno)</string>
+    <string name="today_at_time">Dnes v %1$s</string>
+    <string name="day_of_week_at_time">%1$s v %2$s</string>
     <string name="export_encrypted">Šifrovat trezor</string>
     <string name="export_help">Trezor bude exportován mimo vnitřní úložiště Aegis. Zvolte formát, ve kterém chcete trezor exportovat:</string>
     <string name="export_warning_unencrypted">Chystáte se exportovat nešifrovanou kopii vašeho Aegis trezoru. Toto <b>není doporučeno</b>.</string>
@@ -122,7 +166,7 @@
         <item quantity="other">Vybráno %d skupin</item>
     </plurals>
     <string name="export_no_groups_selected">Nebyly vybrány žádné skupiny k exportu</string>
-    <string name="export_html_title" context="The title of an HTML export document">Export Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Export Aegis Authenticator</string>
     <string name="choose_authentication_method">Zabezpečení</string>
     <string name="authentication_method_explanation">Aegis je 2FA aplikace zaměřená na bezpečnost. Tokeny jsou uloženy v trezoru, který může být zašifrovaný vámi zvoleným heslem. Získá-li útočník váš zašifrovaný trezor, bez hesla se do něj nedostane.\n\nPředvybrali jsme možnost, která by podle nás měla nejvíce vyhovovat vašemu zařízení.</string>
     <string name="authentication_method_none">Žádné</string>
@@ -158,6 +202,7 @@
     <string name="share">Sdílet</string>
     <string name="yes">Ano</string>
     <string name="no">Ne</string>
+    <string name="undo">Zpět</string>
     <string name="unlock">Odemknout</string>
     <string name="advanced">Pokročilé</string>
     <string name="counter">Počítadlo</string>
@@ -169,6 +214,11 @@
     <string name="set_up_biometric">Nastavení biometrického odemčení</string>
     <string name="copy">Kopírovat</string>
     <string name="edit">Upravit</string>
+    <string name="select_all">Vybrat vše</string>
+    <string name="assign_icons">Přiřadit ikony</string>
+    <string name="assign_groups">Přiřadit ke skupině</string>
+    <string name="assign_groups_dialog_summary">Vyberte skupinu, do které chcete přiřadit vybrané položky.</string>
+    <string name="assign_groups_dialog_dropdown">Vybrat skupinu</string>
     <string name="favorite" comment="Verb">Oblíbené</string>
     <string name="unfavorite" comment="Verb">Odebrat z oblízených</string>
     <string name="error_all_caps">CHYBA</string>
@@ -183,10 +233,12 @@
     <string name="snackbar_authentication_method">Zvolte prosím způsob ověření</string>
     <string name="encrypting_vault">Šifrování trezoru</string>
     <string name="exporting_vault">Exportování trezoru</string>
+    <string name="optimizing_icon">Optimalizace ikony</string>
+    <string name="optimizing_icon_multiple">Optimalizace ikon %1$d/%2$d</string>
     <string name="reading_file">Čtení souboru</string>
     <string name="requesting_root_access">Žádání o přístup root</string>
     <string name="analyzing_qr">Analyzování QR kódu</string>
-    <string name="analyzing_qr_multiple">Analyzuji QR kód %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analyzuji QR kód %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Do trezoru byl přidán %d nový záznam</item>
         <item quantity="few">Do trezoru byly přidány %d nové záznamy</item>
@@ -207,6 +259,7 @@
     <string name="discard_changes">Zahodit změny?</string>
     <string name="discard_changes_description">Změny nebyly uloženy</string>
     <string name="saving_profile_error">Chyba při ukládání profilu</string>
+    <string name="saving_assign_icons_error">Chyba při přiřazování ikon</string>
     <string name="welcome">Vítejte</string>
     <string name="app_description">Aegis je bezpečná, bezplatná a open source 2FA aplikace</string>
     <string name="setup_completed">Nastavení dokončeno</string>
@@ -215,6 +268,7 @@
     <string name="copied">Zkopírováno</string>
     <string name="errors_copied">Chyby zkopírovány do schránky</string>
     <string name="version_copied">Verze zkopírována do schránky</string>
+    <string name="error_required_field">Toto pole je povinné</string>
     <string name="error_occurred">Došlo k chybě</string>
     <string name="decryption_error">Při odemykání trezoru došlo k chybě</string>
     <string name="decryption_corrupt_error">Došlo k chybě při odemykání trezoru. Váš trezor může být poškozen.</string>
@@ -284,15 +338,22 @@
     <string name="partial_google_auth_import">Zjištěn neúplný export z Google Authenticator</string>
     <string name="partial_google_auth_import_warning">Ve vašem importu chybí některé QR kódy. Nebyly nalezeny následující kódy:\n\n<b>%s</b>\n\nMůžete pokračovat s importováním tohoto částečného exportu, ale doporučujeme to zkusit znovu se všemi QR kódy, abyste neriskovali ztrátu přístupu k některým tokenům.</string>
     <string name="missing_qr_code_descriptor">• QR kód %d</string>
-    <string name="import_partial_export_anyway">Přesto importovat %d tokenů</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Přesto importovat %d token</item>
+        <item quantity="few">Přesto importovat %d tokeny</item>
+        <item quantity="many">Přesto importovat %d tokenů</item>
+        <item quantity="other">Přesto importovat %d tokenů</item>
+    </plurals>
     <string name="import_google_auth_failure">Importování exportu z Google Authenticator selhalo</string>
     <string name="unrelated_google_auth_batches_error">Export obsahuje informace o nesouvisejícím balíku. Zkuste importovat 1 balík najednou.</string>
     <string name="no_tokens_can_be_imported">Nebyly importovány žádné tokeny</string>
-    <string name="authentication_method_raw">Prosté</string>
     <string name="unlocking_vault">Odemykání trezoru</string>
-    <string name="slot_this_device">(toto zařízení)</string>
+    <string name="rename_group">Přejmenovat skupinu</string>
+    <string name="no_group_selection">Pokud není záznam součástí žádné skupiny, najdete jej v kategorii „Žádná skupina“.</string>
     <string name="remove_group">Odstranit skupinu</string>
     <string name="remove_group_description">Opravdu chcete odstranit tuto skupinu? Záznamy z ní budou automaticky přemístěny do „Žádná skupina“.</string>
+    <string name="remove_unused_groups">Odstranit nepoužívané skupiny</string>
+    <string name="remove_unused_groups_description">Opravdu chcete odstranit všechny skupiny, které nemají přidělený záznam?</string>
     <string name="remove_icon_pack">Odstranit balíček ikon</string>
     <string name="remove_icon_pack_description">Opravdu chcete odstranit tento balíček ikon? Položky, které používají ikony z tohoto balíčku, nebudou dotčeny.</string>
     <string name="details">Podrobnosti</string>
@@ -300,13 +361,16 @@
     <string name="lock">Uzamknout</string>
     <string name="name">Název</string>
     <string name="no_group">Žádná skupina</string>
-    <string name="sort">Řazení</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Řazení</string>
     <string name="sort_alphabetically">Poskytovatel (A → Z)</string>
     <string name="sort_alphabetically_reverse">Poskytovatel (Z → A)</string>
     <string name="sort_alphabetically_name">Účet (A → Z)</string>
     <string name="sort_alphabetically_name_reverse">Účet (Z → A)</string>
     <string name="sort_usage_count">Počet použití</string>
+    <string name="sort_last_used">Naposledy použito</string>
     <string name="sort_custom">Vlastní</string>
+    <string name="last_used">Naposledy použito</string>
+    <string name="last_used_never">nikdy</string>
     <string name="new_group">Nová skupina…</string>
     <string name="group">Skupina</string>
     <string name="group_name_hint">Název skupiny</string>
@@ -315,13 +379,33 @@
     <string name="preference_reset_usage_count">Resetovat počet použití</string>
     <string name="preference_reset_usage_count_summary">Resetovat počet použití u každé položky ve vašem trezoru</string>
     <string name="preference_reset_usage_count_dialog">Opravdu chcete nastavit počet použití všech položek na 0?</string>
-    <string name="note">Poznámka</string>
+    <string name="note" comment="Users can add a note to an entry">Poznámka</string>
     <string name="clear">Vymazat</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Duplicitní položka</string>
+    <string name="dialog_duplicate_entry_message">Tato položka má stejný název a poskytovatele, jako jedna nebo více existujících. Jak chcete pokračovat?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Přepsat existující položky</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Nahradit existující položku nebo položky novou. Tato akce je nevratná</string>
+    <string name="dialog_duplicate_entry_suffix_title">Přidat příponu</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Přidat příponu k názvu této položky. Nový název bude: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Zrušit uložení</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Umožňuje upravit položku před pokusem o její opětovné uložení</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Opravdu chcete odstranit %d položku s následujícím názvem:\n\n%s - %s</item>
+        <item quantity="few">Opravdu chcete odstranit %d položky s následujícím názvem:\n\n%s - %s</item>
+        <item quantity="many">Opravdu chcete odstranit %d položek s následujícím názvem:\n\n%s - %s</item>
+        <item quantity="other">Opravdu chcete odstranit %d položek s následujícím názvem:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Potvrdit odstranění</string>
+    <string name="pref_haptic_feedback_summary">Vibrovat při změně kódů</string>
+    <string name="pref_haptic_feedback_title">Haptická odezva</string>
     <string name="pref_highlight_entry_title">Zvýraznit tokeny po klepnutí</string>
     <string name="pref_highlight_entry_summary">Usnadnit vzájemné rozlišení tokenů dočasným zvýrazněním po kleputí</string>
+    <string name="pref_groups_multiselect_title">Vícenásobný výběr skupin</string>
+    <string name="pref_groups_multiselect_summary">Povolit současný výběr více skupin</string>
     <string name="pref_minimize_on_copy_title">Minimalizovat při kopírování</string>
     <string name="pref_minimize_on_copy_summary">Minimalizovat aplikaci po zkopírování tokenu</string>
     <string name="pref_copy_behavior_title">Zkopírovat tokeny do schránky</string>
+    <string name="pref_search_behavior_title">Chování vyhledávání</string>
     <string name="pref_pause_entry_title">Zmrazit tokeny po klepnutí</string>
     <string name="pref_pause_entry_summary">Pozastavit automatické obnovování tokenů klepnutím na ně. Tokeny nebudou aktualizovány, dokud jsou zaměřeny. Vyžaduje \"Zvýraznit tokeny po klepnutí\" nebo \"Klepnutím zobrazit\".</string>
     <string name="pin_keyboard_description">Zadejte své heslo pro povolení PIN klávesnice. Toto funguje jen pokud používáte číselné heslo.</string>
@@ -337,19 +421,19 @@
     <string name="normal_viewmode_title">Normální</string>
     <string name="compact_mode_title">Kompaktní</string>
     <string name="small_mode_title">Malý</string>
-    <string name="tiles_mode_title">Názvy</string>
+    <string name="tiles_mode_title">Dlaždice</string>
     <string name="unknown_issuer">Neznámý poskytovatel</string>
     <string name="unknown_account_name">Neznámý název účtu</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Nepovedlo se importovat %d token. Tento token bude přeskočen. Klepněte na „podrobnosti“ pro více informací o chybách.</item>
-        <item quantity="few">Nepovedlo se importovat %d tokeny. Tyto tokeny budou přeskočeny. Klepněte na „podrobnosti“ pro více informací o chybách.</item>
-        <item quantity="many">Nepovedlo se importovat %d tokenů. Tyto tokeny budou přeskočeny. Klepněte na „podrobnosti“ pro více informací o chybách.</item>
-        <item quantity="other">Nepovedlo se importovat %d tokenů. Tyto tokeny budou přeskočeny. Klepněte na „podrobnosti“ pro více informací o chybách.</item>
+        <item quantity="one">Nepodařilo se importovat %d token. Tento token bude přeskočen. Klepněte na „podrobnosti” pro více informací o chybě.</item>
+        <item quantity="few">Nepodařilo se importovat %d tokeny. Tyto tokeny budou přeskočeny. Klepněte na „podrobnosti” pro více informací o chybách.</item>
+        <item quantity="many">Nepodařilo se importovat %d tokenů. Tyto tokeny budou přeskočeny. Klepněte na „podrobnosti” pro více informací o chybách.</item>
+        <item quantity="other">Nepodařilo se importovat %d tokenů. Tyto tokeny budou přeskočeny. Klepněte na „podrobnosti” pro více informací o chybách.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Nepodařilo se zpracovat odkaz</string>
     <string name="unable_to_read_qrcode_file">Nepodařilo se přečíst a zpracovat QR kód ze souboru: %s.</string>
     <string name="unable_to_process_shared_text">Nepodařilo se zpracovat sdílený text jako OTP</string>
-    <string name="unable_to_read_qrcode_files">Nepodařilo se přečíst a zpracovat některé QR kódy. Bude importováno pouze %d/%d položek.</string>
+    <string name="unable_to_read_qrcode_files">Nepodařilo se přečíst a zpracovat některé QR kódy. Bude importováno pouze %1$d/%2$d položek.</string>
     <string name="unable_to_generate_qrcode">QR kód nelze vygenerovat</string>
     <string name="select_picture">Vyberte obrázek</string>
     <string name="select_icon">Vybrat ikonu</string>
@@ -381,14 +465,16 @@
     <string name="time_sync_warning_disable">Už mě neupozorňujte. Vím, co dělám.</string>
     <string name="google_qr_export_unrelated">Nalezen nesouvisející QR kód. Zkuste skener restartovat.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Naskenován %d/%d QR kódu</item>
-        <item quantity="few">Naskenováno %d/%d QR kódů</item>
-        <item quantity="many">Naskenováno %d/%d QR kódů</item>
-        <item quantity="other">Naskenováno %d/%d QR kódů</item>
+        <item quantity="one">Naskenován %1$d/%2$d QR kód</item>
+        <item quantity="few">Naskenovány %1$d/%2$d QR kódy</item>
+        <item quantity="many">Naskenováno %1$d/%2$d QR kódů</item>
+        <item quantity="other">Naskenováno %1$d/%2$d QR kódů</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Očekáván QR kód #%d, avšak naskenován byl #%d</string>
+    <string name="google_qr_export_unexpected">Očekáván QR kód #%1$d, avšak naskenován byl #%2$d</string>
     <string name="backup_error_bar_message"><b>Vytvoření zálohy trezoru se nedávno nezdařilo</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Pokus o nedávnou zálohu trezoru pomocí %s selhal, protože došlo k chybě. Pokus o zálohu byl uskutečněn %s. Zkontrolujte prosím svá nastavení pro ujištění se, že zálohy mohou být úspěšně dokončeny.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Pokus o nedávnou zálohu trezoru pomocí %1$s selhal, protože došlo k chybě. Pokus o zálohu byl uskutečněn %2$s. Zkontrolujte prosím svá nastavení pro ujištění se, že zálohy mohou být úspěšně dokončeny.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Nedávný pokus o zálohu trezoru pomocí %1$s selhal, protože Aegis neměl oprávnění k zápisu do cílového adresáře. Pokus o zálohu byl proveden %2$s. Tato chyba může nastat, když přesunete/přejmenujete cíl zálohy nebo pokud jste nedávno obnovili Aegis ze zálohy. Nastavte prosím znovu cíl pro zálohu.
     </string>
     <string name="backup_system_builtin">Zabudované zálohy aplikace Aegis</string>
     <string name="backup_system_android">Cloudový zálohovací systém systému Android</string>
@@ -424,14 +510,15 @@
     <string name="copy_uri">Kopírovat URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Nepodařilo se zkopírovat URI do schránky</string>
     <string name="uri_copied_to_clipboard">URI zkopírována do schránky</string>
-    <string name="transfer_entry">Přenést položku</string>
     <string name="transfer_entry_description">Naskenujte tento QR kód ověřovací aplikací, do které chcete položku přenést</string>
+    <string name="transfer_entry_brightness">Klepnutím na QR kód přepnete na jas celé obrazovky</string>
     <string name="google_auth_compatible_transfer_description">Naskenujte tyto QR kódy s aplikací Aegis nebo Google Authenticator.\n\nKvůli limitacím aplikace Google Authenticator jsou zahrnuty pouze 6-místné tokeny TOTP a HOTP využívající SHA1</string>
     <string name="password_strength_very_weak">Velmi slabé</string>
     <string name="password_strength_weak">Slabé</string>
     <string name="password_strength_fair">Docela dobré</string>
     <string name="password_strength_good">Dobré</string>
     <string name="password_strength_strong">Silné</string>
+    <string name="password_strength_unknown">Heslo je příliš dlouhé pro analýzu bezpečnosti</string>
     <string name="pref_pin_keyboard_title">Použít PIN klávesnici na zamykací obrazovce</string>
     <string name="pref_pin_keyboard_summary">Tuto možnost povolte, chcete-li používat PIN klávesnici na zamykací obrazovce. Toto funguje jen pokud používáte číselné heslo.</string>
     <string name="title_activity_preferences">Nastavení</string>
@@ -440,32 +527,45 @@
     <string name="title_activity_about">O aplikaci</string>
     <string name="title_activity_edit_entry">Upravit položku</string>
     <string name="title_activity_scan_qr">Naskenovat QR kód</string>
-    <string name="title_activity_manage_slots">Spravovat sloty klíčů</string>
     <string name="title_activity_import_entries">Importovat položky</string>
+    <string name="title_activity_assign_icons">Přiřadit ikony</string>
+    <string name="title_activity_licenses">Licence třetích stran</string>
     <string name="dialog_wipe_entries_title">Vyčistit položky</string>
     <string name="dialog_wipe_entries_message">Váš trezor už obsahuje záznamy. Chcete tyto záznamy smazat před importem tohoto souboru?\n\n<b>Přístup ke všem stávajícím položkám v trezoru trvale ztratíte.</b></string>
     <string name="dialog_wipe_entries_checkbox">Vymazat obsah trezoru</string>
     <string name="panic_trigger_ignore_toast">Aegis zachytila signál paniky, ale ignoruje ho, protože nastavení reakce je vypnuto</string>
     <string name="pref_panic_trigger_title">Smazat trezor při signálu paniky</string>
     <string name="pref_panic_trigger_summary">Smazat trezor při obdržení signálu paniky z aplikace Ripple</string>
-    <string name="import_vault">Importovat trezor</string>
+    <string name="import_vault">Importovat trezor Aegisu</string>
+    <string name="import_vault_hint">Chcete importovat data z jiné 2FA aplikace? Dokončete nastavení a poté přejděte do nabídky nastavení.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Zrušeno označení %d možné duplicity. Zkontrolujte prosím seznam položek.</item>
+        <item quantity="few">Zrušeno označení %d možných duplicit. Zkontrolujte prosím seznam položek.</item>
+        <item quantity="many">Zrušeno označení %d možných duplicit. Zkontrolujte prosím seznam položek.</item>
+        <item quantity="other">Zrušeno označení %d možných duplicit. Zkontrolujte prosím seznam položek.</item>
+    </plurals>
     <string name="importer_help_2fas">Dodejte záložní soubor 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Dodejte soubor exportu/zálohy Aegis.</string>
     <string name="importer_help_authenticator_plus">Dodejte exportovaný soubor Authenticator Plus získaný přes <b>Nastavení -&gt; Záloha a obnovení -&gt; Exportovat jako text a HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Dodejte exportovaný soubor Authenticator Pro získaný přes <b>Nastavení -&gt; Záloha -&gt; Exportovat do šifrovaného souboru (doporučeno)</b>.</string>
     <string name="importer_help_authy">Dodejte kopii <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, která se nachází v interním úložišti Authy.</string>
     <string name="importer_help_andotp">Dodejte soubor exportu/zálohy andOTP.</string>
     <string name="importer_help_bitwarden">Vyberte soubor exportu/zálohy Bitwardenu. Šifrované soubory nejsou podporovány.</string>
-    <string name="importer_help_battle_net_authenticator">Dodejte kopii <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, která se nachází v interním úložišti Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Dodejte kopii <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, která se nachází v interním úložišti Battle.net Authenticator.</string>
     <string name="importer_help_duo">Dodejte kopii <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, která se nachází v interním úložišti DUO.</string>
-    <string name="importer_help_freeotp">Dodejte kopii <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, která se nachází v interním úložišti FreeOTP.</string>
+    <string name="importer_help_ente_auth">Dodejte soubor exportu Ente Auth. V současné odbě jsou podporovány pouze nešifrované soubory.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Dodejte záložní soubor.\nFreeOTP 1.x: Dodejte kopii souboru <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, umístěného v interním úložišti aplikace FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Dodjete soubor exportu FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Kompatibilita s FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Ve FreeOTP 2 existuje řada problémů, které mohou vést k poškození záloh. Aegis se pokusí zachránit co nejvíce záznamů, ale je možné, že se některé nebo dokonce všechny nepodaří importovat.</string>
     <string name="importer_help_google_authenticator"><b>Jsou podporovány pouze databázové soubory z aplikace Google Authenticator v5.10 a starších</b>.\n\nPoužijte kopii <b>/data/com.google.android.apps.authenticator2/databases/databases</b> umístěného v interním úložišti aplikace Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Dodejte kopii <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, která se nachází v interním úložišti Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Dodejte prostý textový soubor Google Authenticator URI na každý řádek.</string>
     <string name="importer_help_steam"><b>Steam v3.0 a novější nejsou podporovány</b>. Dodejte kopii souboru <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> umístěného v interním úložném adresáři aplikace Steam.</string>
+    <string name="importer_help_stratum">Dodejte exportovaný soubor Stratum získaný přes <b>Nastavení -&gt; Záloha -&gt; Exportovat do šifrovaného souboru (doporučeno)</b>.</string>
     <string name="importer_help_totp_authenticator">Dodejte soubor exportu TOTP.</string>
     <string name="importer_help_winauth">Dodejte soubor exportu WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Přiřadit ikony</string>
+    <string name="import_assign_icons_dialog_text">Chcete přiřadit ikony k importovaným záznamům?</string>
     <string name="importer_encrypted_exception_google_authenticator">Šifrovaná položka byla přeskočena: %s</string>
     <string name="importer_help_direct">Importovat záznamy přímo z %s. Aplikace musí být nainstalována a aplikaci Aegis musí být udělen root přístup.</string>
     <string name="groups">Skupiny</string>
@@ -482,31 +582,31 @@
     <string name="pref_account_name_position_hidden">Skryté</string>
     <string name="pref_account_name_position_end">Vedle poskytovatele</string>
     <string name="pref_account_name_position_below">Pod poskytovatelem</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">před %d sekundou</item>
         <item quantity="few">před %d sekundami</item>
         <item quantity="many">před %d sekundami</item>
         <item quantity="other">před %d sekundami</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">před %d minutou</item>
         <item quantity="few">před %d minutami</item>
         <item quantity="many">před %d minutami</item>
         <item quantity="other">před %d minutami</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">před %d hodinou</item>
         <item quantity="few">před %d hodinami</item>
         <item quantity="many">před %d hodinami</item>
         <item quantity="other">před %d hodinami</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">před %d dnem</item>
         <item quantity="few">před %d dny</item>
         <item quantity="many">před %d dny</item>
         <item quantity="other">před %d dny</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">před %d rokem</item>
         <item quantity="few">před %d lety</item>
         <item quantity="many">před %d lety</item>
diff --git a/app/src/main/res/values-da-rDK-v29/strings.xml b/app/src/main/res/values-da-rDK-v29/strings.xml
new file mode 100644
index 00000000..06865245
--- /dev/null
+++ b/app/src/main/res/values-da-rDK-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Systemstandard</string>
+    <string name="system_amoled_theme_title">Systemstandard (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 0edbc7f1..72f5a3c0 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Indstillinger</string>
     <string name="action_about">Om</string>
     <string name="action_delete">Slet</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Gendan standardikon</string>
     <string name="discard">Kassér</string>
     <string name="save">Gem</string>
+    <string name="all">Alle</string>
     <string name="issuer">Udsteder</string>
     <string name="yandex_pin">PIN-kode (4–16 cifre)</string>
     <string name="motp_pin">PIN-kode (4 cifre)</string>
@@ -21,129 +22,172 @@
     <string name="pref_cat_backups_android">Android</string>
     <string name="pref_cat_backups_auto">Automatisk sikkerhedskopiering</string>
     <string name="pref_section_behavior_title">Adfærd</string>
-    <string name="pref_section_behavior_summary">Tilpas funktionsmåden, når du interagerer med listen over poster.</string>
+    <string name="pref_section_behavior_summary">Tilpas adfærden, når du interagerer med postlisten.</string>
     <string name="pref_section_appearance_title">Udseende</string>
     <string name="pref_section_appearance_summary">Justér tema, sprog og andre indstillinger, som påvirker app-udseendet.</string>
     <string name="pref_section_security_title">Sikkerhed</string>
     <string name="pref_section_security_summary">Opsæt kryptering, biometrisk oplåsning, auto-låsning og andre sikkerhedsindstillinger.</string>
-    <string name="pref_section_import_export_title">Import og eksport</string>
-    <string name="pref_section_import_export_summary">Importér sikkerhedskopier af Aegis eller andre godkendelses-apps. Opret manuelle eksporteringer af din Aegis-boks.</string>
+    <string name="pref_section_import_export_title">Import &amp; Eksport</string>
+    <string name="pref_section_import_export_summary">Importér sikkerhedskopier af Aegis eller andre godkendelsesapps. Opret manuelle eksporter af din Aegis-boks.</string>
+    <string name="pref_section_audit_log_title">Revisionslog</string>
+    <string name="pref_section_audit_log_summary">Find en liste over alle rapporterede vigtige hændelser i appen.</string>
     <string name="pref_section_backups_title">Sikkerhedskopier</string>
-    <string name="pref_section_backups_summary">Opsæt automatisk sikkerhedskopiering til en placering efter eget valg eller aktivér deltagelse i Androids cloud-sikkerhedskopieringssystem.</string>
+    <string name="pref_section_backups_summary">Opsæt automatiske sikkerhedskopier til din foretrukne placering, eller deltag i Android\'s cloud-sikkerhedskopieringssystem.</string>
     <string name="pref_section_icon_packs">Ikonpakker</string>
-    <string name="pref_section_icon_packs_summary">Håndtere og importere ikonpakker</string>
+    <string name="pref_section_icon_packs_summary">Administrer og importér ikonpakker</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Dynamiske farver</string>
+    <string name="pref_dynamic_colors_summary">Anvend en overlejring baseret på Android-temaets farver</string>
     <string name="pref_view_mode_title">Visningstilstand</string>
     <string name="pref_lang_title">Sprog</string>
     <string name="pref_show_icons_title">Vis ikoner</string>
-    <string name="pref_show_icons_summary">Vis ikoner ved siden af hver post</string>
+    <string name="pref_show_icons_summary">Vis ikoner ud for hver post</string>
     <string name="pref_code_group_size_title">Kodeciffergruppering</string>
     <string name="pref_code_group_size_summary">Vælg antal cifre til kodegruppering</string>
     <string name="pref_account_name_position_title">Vis kontonavnet</string>
+    <string name="pref_show_next_code_title">Vis næste kode</string>
+    <string name="pref_show_next_code_summary">Generér og vis den næste kode før tid</string>
+    <string name="pref_expiration_state_title">Angiv, hvornår koder er ved at udløbe</string>
+    <string name="pref_expiration_state_summary">Skift kodefarverne og få dem til at blinke, når de er ved at udløbe</string>
+    <string name="pref_expiration_state_fallback">Skift kodefarverne, når de er ved at udløbe</string>
     <string name="pref_shared_issuer_account_name_title">Vis kun kontonavn, når nødvendigt</string>
-    <string name="pref_shared_issuer_account_name_summary">Vis kun kontonavne, som deler samme udsteder. Øvrige kontonavne vises ikke.</string>
-    <string name="pref_account_name_position_summary_override">Denne indstilling tilsidesættes i flisevisningstilstanden. Kontonavn vises altid under udstederen.</string>
+    <string name="pref_shared_issuer_account_name_summary">Vis kun kontonavne, når de har samme udsteder. Andre kontonavne skjules.</string>
+    <string name="pref_account_name_position_summary_override">Denne indstilling tilsidesættes ved visningstilstand i fliser. Kontonavnet vises under udstederen.</string>
     <string name="pref_import_file_title">Import fra fil</string>
     <string name="pref_import_file_summary">Importér tokens fra en fil</string>
-    <string name="pref_android_backups_title">Android cloud-sikkerhedskopier</string>
-    <string name="pref_android_backups_summary">Tillad Androids cloud-sikkerhedskopieringssystem at medtage Aegis\' boks i dets sikkerhedskopier (kun understøttet for krypterede bokse).</string>
-    <string name="pref_android_backups_hint"><i>Enhed-til-enhed (D2D) sikkerhedskopier er altid tilladt, uanset ovenstående indstilling</i></string>
-    <string name="pref_backups_title">Sikkerhedskopiér automatisk Boksen</string>
-    <string name="pref_backups_summary">Opret automatisk sikkerhedskopier af Boksen på ekstern lagerplads, når ændringer foretages. Dette understøttes kun for krypterede Bokse.</string>
+    <string name="pref_android_backups_title">Android-sikkerhedskopier i cloud</string>
+    <string name="pref_android_backups_summary">Lad Android\'s cloud-sikkerhedskopieringssystem medtage Aegis\' boks i sine sikkerhedskopier (understøtter kun krypterede bokse).</string>
+    <string name="pref_android_backups_hint"><i>Enhed-til-enhed-sikkerhedskopier (D2D) er altid tilladt, uanset ovenstående indstilling</i></string>
+    <string name="pref_backups_title">Sikkerhedskopiér automatisk boksen</string>
+    <string name="pref_backups_summary">Opret automatisk sikkerhedskopier af boksen på et eksternt lager, når ændringer foretages (understøtter kun krypterede bokse).</string>
     <string name="pref_backups_reminder_title">Sikkerhedskopieringspåmindelse</string>
-    <string name="pref_backups_reminder_summary">Vis en påmindelse om at sikkerhedskopiere boksen, såfremt de seneste ændringer ikke er sikkerhedskopieret.</string>
+    <string name="pref_backups_reminder_summary">Vis en påmindelse om at sikkerhedskopiere Boksen, såfremt dette ikke er sket ifm. de seneste ændringer.</string>
     <string name="pref_backups_reminder_dialog_title">Deaktivér sikkerhedskopieringspåmindelse</string>
-    <string name="pref_backups_reminder_dialog_summary">Deaktivering af denne påmindelse betyder, at Aegis ikke adviserer om endnu ikke er sikkerhedskopieret ændringer. Dette indebærer en risiko for at miste adgang til tokener. Sikker på, at påmindelsen skal deaktiveres?</string>
-    <string name="pref_backups_location_title">Mappe til sikkerhedskopifiler</string>
-    <string name="pref_backups_location_summary">Sikkerhedskopier vil blive gemt til</string>
+    <string name="pref_backups_reminder_dialog_summary">Deaktiverer du denne påmindelse, fortæller Aegis dig ikke, om nogen ændringer endnu ikke er sikkerhedskopieret. Dermed risikerer du at miste adgang til dine tokens. Er du sikker på, at du vil deaktivere påmindelsen?</string>
+    <string name="pref_backups_versioning_strategy_title">Sikkerhedskopieringsstrategi</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Behold et antal versioner</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Enkelt sikkerhedskopi</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Den valgte sikkerhedskopieringsstrategi er ikke pålidelig og anbefales ikke. En enkelt sikkerhedskopifejl kan føre til tab af den eneste eksisterende sikkerhedskopi.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Vælg en sikkerhedskopieringsstrategi</string>
+    <string name="pref_backups_location_title">Sikkerhedskopiplacering</string>
+    <string name="pref_backups_location_summary">Sikkerhedskopier gemmes på</string>
+    <string name="pref_backup_location_summary">Sikkerhedskopi gemmes på</string>
     <string name="pref_backups_trigger_title">Udløs sikkerhedskopiering</string>
     <string name="pref_backups_trigger_summary">Udløs manuelt en sikkerhedskopiering</string>
     <string name="pref_backups_versions_title">Antal versioner at beholde</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Behold %1$d version af sikkerhedskopien</item>
         <item quantity="other">Behold %1$d versioner af sikkerhedskopien</item>
     </plurals>
-    <string name="pref_import_app_title">Import fra sti</string>
+    <string name="pref_backups_versions_infinite_summary">Opbevar et uendeligt antal versioner af sikkerhedskopien</string>
+    <string name="pref_import_app_title">Importér fra app</string>
     <string name="pref_import_app_summary">Importér tokens fra en app (kræver root-adgang)</string>
-    <string name="pref_export_title">Export</string>
-    <string name="pref_export_summary">Eksportér Boksen</string>
+    <string name="pref_export_title">Eksport</string>
+    <string name="pref_export_summary">Eksportér boksen</string>
     <string name="pref_password_reminder_title">Adgangskodepåmindelse</string>
     <string name="pref_google_auth_export_title">Eksportér til Google Authenticator</string>
     <string name="pref_google_auth_export_descriptor">Genererer QR-koder kompatible med Google Authenticator til eksport</string>
     <string name="pref_google_auth_export_no_data">Ingen data at eksportere</string>
     <plurals name="pref_google_auth_export_incompatible_entries">
-        <item quantity="one">%d inkompatibel post oversprunget</item>
-        <item quantity="other">%d inkompatibel poster oversprunget</item>
+        <item quantity="one">Sprang %d inkompatibel post over</item>
+        <item quantity="other">Sprang %d inkompatible poster over</item>
     </plurals>
     <string name="pref_password_reminder_summary">Vis %s påmindelse om at angive adgangskoden, så den ikke glemmes.</string>
     <string name="pref_password_reminder_summary_disabled">Deaktiveret</string>
     <string name="pref_secure_screen_title">Skærmsikkerhed</string>
-    <string name="pref_secure_screen_summary">Blokér skærmfotos og andre forsøg på at optage skærmen inde i appen</string>
+    <string name="pref_secure_screen_summary">Bloker skærmbilleder og andre forsøg på at optage skærmen i appen</string>
     <string name="pref_tap_to_reveal_title">Tryk for at vise</string>
-    <string name="pref_tap_to_reveal_summary">Tokens vil som standard være skjulte. Tryk på dem for at afsløre kode.</string>
-    <string name="pref_tap_to_reveal_time_title">Timeout for tryk til visning</string>
-    <string name="pref_auto_lock_title">Autolås</string>
+    <string name="pref_tap_to_reveal_summary">Som standard er tokens skjult. Tryk på tokens for at vise koden.</string>
+    <string name="pref_tap_to_reveal_time_title">Timeout for tryk for at vise</string>
+    <string name="pref_auto_lock_title">Auto-lås</string>
     <string name="pref_auto_lock_summary">Når %s</string>
     <string name="pref_auto_lock_summary_disabled">Deaktiveret</string>
-    <string name="pref_auto_lock_prompt">Lås automatisk Aegis når</string>
+    <string name="pref_auto_lock_prompt">Lås automatisk Aegis, når</string>
     <string name="pref_auto_lock_type_back_button">Der trykkes på tilbage-knappen</string>
     <string name="pref_auto_lock_type_minimize">Appen minimeres</string>
-    <string name="pref_auto_lock_type_device_lock">Når enheden låses</string>
+    <string name="pref_auto_lock_type_device_lock">Enheden låses</string>
     <string name="pref_backup_password_category">Sikkerhedskopiering og Eksport</string>
     <string name="pref_backup_password_title">Forskellig adgangskode for sikkerhedskopi og eksport</string>
-    <string name="pref_backup_password_summary">Hvis aktiveret, kan app-oplåsningskoden ikke længere bruges til sikkerhedskopidekryptering samt eksporter.</string>
-    <string name="pref_backup_password_change_title">Skift adgangskode for sikkerhedskopi og eksport</string>
+    <string name="pref_backup_password_summary">Når aktiveret, kan app-oplåsningskoden ikke længere bruges til dekryptering af sikkerhedskopier og eksporter.</string>
+    <string name="pref_backup_password_change_title">Skift adgangskode for sikkerhedskopiering og eksport</string>
     <string name="pref_backup_password_change_summary">Angiv en ny adgangskode til brug for Boks-kryptering under sikkerhedskopiering og eksport.</string>
     <string name="pref_encryption_title">Kryptering</string>
-    <string name="pref_encryption_summary">Krypter boksen og lås den op med en adgangskode eller biometri</string>
+    <string name="pref_encryption_summary">Kryptér og oplås Boksen med adgangskode/biometri</string>
     <string name="pref_biometrics_title">Biometrisk oplåsning</string>
-    <string name="pref_biometrics_summary">Tillad biometrisk verifikation til oplåsning af boksen</string>
+    <string name="pref_biometrics_summary">Tillad biometrisk godkendelse for at oplåse Boksen</string>
+    <string name="pref_search_behavior_summary">Søg gennem: %s</string>
+    <string name="pref_search_behavior_prompt">Søg i ethvert af de flg. felter</string>
+    <string name="pref_search_behavior_type_name">Navn</string>
+    <string name="pref_search_behavior_type_issuer">Udsteder</string>
+    <string name="pref_search_behavior_type_note">Notat</string>
+    <string name="pref_search_behavior_type_groups">Grupper</string>
     <string name="pref_set_password_title">Skift adgangskode</string>
-    <string name="pref_set_password_summary">Indstil en ny adgangskode, som du skal bruge til at låse din boks op</string>
+    <string name="pref_set_password_summary">Sæt ny adgangskode til brug for oplåsning af din Boks</string>
+    <string name="no_events_title">Ingen rapporterede hændelser</string>
+    <string name="no_events_description">Ingen vigtige hændelser er rapporteret i appen</string>
+    <string name="event_title_vault_unlocked">Boks oplåst</string>
+    <string name="event_description_vault_unlocked">Boksen er blevet oplåst</string>
+    <string name="event_title_backup_created">Sikkerhedskopi oprettet</string>
+    <string name="event_description_backup_created">En sikkerhedskopi af boksen er blevet oprettet</string>
+    <string name="event_title_android_backup_created">Sikkerhedskopi oprettet af Android</string>
+    <string name="event_description_android_backup_created">En sikkerhedskopi af boksen er blevet oprettet af Android</string>
+    <string name="event_title_vault_exported">Boks eksporteret</string>
+    <string name="event_description_vault_exported">En kopi af boksen er eksporteret</string>
+    <string name="event_title_entry_shared">Post delt</string>
+    <string name="event_description_entry_shared">En post er delt</string>
+    <string name="event_title_vault_unlock_failed_password">Boksoplåsning mislykkedes (adgangskode)</string>
+    <string name="event_description_vault_unlock_failed_password">Et boksoplåsningsforsøg med adgangskode mislykkedes</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Boksoplåsning mislykkedes (biometri)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Et boksoplåsningsforsøg med biometri mislykkedes</string>
+    <string name="event_unknown">Ukendt hændelsestype</string>
+    <string name="audit_log_entry_deleted">(slettet)</string>
+    <string name="today_at_time">I dag kl. %1$s</string>
+    <string name="day_of_week_at_time">%1$s kl. %2$s</string>
     <string name="export_encrypted">Kryptér boksen</string>
-    <string name="export_help">Denne handling vil eksportere boksen ud af Aegis\' interne lager. Vælg det format, som du gerne vil eksportere i:</string>
+    <string name="export_help">Denne handling eksporterer Boksen ud af Aegis\' interne lager. Vælg det format Boksen skal eksportere som:</string>
     <string name="export_warning_unencrypted">Du er ved at eksportere en ukrypteret kopi af din Aegis-boks. <b>Dette er ikke anbefalet</b>.</string>
     <string name="export_warning_password">Eksporter krypteres vha. en separat adgangskode opsat i Sikkerhedsindstillinger.</string>
     <string name="understand_risk_accept">Risikoen er forstået</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
-    <string name="export_format_google_auth_uri">Tekst fil (.TXT)</string>
+    <string name="export_format_google_auth_uri">Tekstfil (.TXT)</string>
     <string name="export_format_html">Webside (.HTML)</string>
     <string name="export_format_hint">Eksportformat</string>
     <string name="export_all_groups">Eksportér alle grupper</string>
-    <string name="export_choose_groups">Vælg, hvilke grupper der skal eksporteres</string>
+    <string name="export_choose_groups">Vælg de grupper, som skal eksporteres</string>
     <plurals name="export_groups_selected_count">
         <item quantity="one">%d gruppe valgt</item>
         <item quantity="other">%d grupper valgt</item>
     </plurals>
     <string name="export_no_groups_selected">Ingen grupper valgt til eksport</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator Eksport</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator Eksport</string>
     <string name="choose_authentication_method">Sikkerhed</string>
-    <string name="authentication_method_explanation">Aegis er en sikkerhedsfokuseret 2FA-app. Tokens opbevares i en boks, som kan krypteres med en adgangskode efter dit eget valg. Hvis en angriber får adgang til din krypteret boks-fil, vil de ikke kunne få adgang til indholdet uden at kende adgangskoden.\n\nVi har på forhånd valgt den indstilling, som vi mener passer bedst til din enhed.</string>
+    <string name="authentication_method_explanation">Aegis er en sikkerhedsfokuseret 2FA-app. Tokener opbevares i en Boks, der kan krypteres med en valgfri adgangskode. Opnår en angriber adgang til den krypteret Boks-fil, vil vedkommende ikke kunne tilgå indholdet uden brug af adgangskoden.\n\nVi har på forhånd valgt den indstilling, som vi mener passer bedst til enheden.</string>
     <string name="authentication_method_none">Ingen</string>
     <string name="authentication_method_none_description">Ingen adgangskode er nødvendig for at låse op for boksen og den vil ikke blive krypteret. <b>Denne indstilling anbefales ikke</b>.</string>
     <string name="authentication_method_password">Adgangskode</string>
-    <string name="authentication_method_password_description">En adgangskode er nødvendig for at låse boksen op.</string>
-    <string name="authentication_method_password_explanation">Advarsel: Hvis du glemmer din adgangskode, vil du miste adgang til dine tokens permanent. Der er ingen mulighed for at gendanne dem uden adgangskoden.</string>
+    <string name="authentication_method_password_description">En adgangskode kræves til oplåsning af Boksen.</string>
+    <string name="authentication_method_password_explanation">Advarsel: Glemmes adgangskoden, bliver dine tokens permanent utilgængelige. De vil ikke kunne gendannes uden brug af adgangskoden.</string>
     <string name="authentication_method_biometrics">Biometri</string>
-    <string name="authentication_method_biometrics_description">Ud over en adgangskode kan biometri, der er registreret på denne enhed såsom et fingeraftryk eller dit ansigt, bruges til at låse boksen op.</string>
-    <string name="authentication">Lås op for boksen</string>
+    <string name="authentication_method_biometrics_description">Ud over en adgangskode kan denne enheds registrerede biometri, såsom fingeraftryk eller ansigt, bruges til oplåsning af Boksen.</string>
+    <string name="authentication">Lås boksen op</string>
     <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Lås\nboksen op</string>
     <string name="auth_use_biometrics">Eller tryk her for at bruge <font fgcolor="#FF0D86C1">biometri</font></string>
-    <string name="set_password">Indtast en adgangskode</string>
-    <string name="set_group">Indtast et gruppenavn</string>
-    <string name="set_number">Indtast et tal</string>
-    <string name="set_password_confirm">Bekræft venligst adgangskoden</string>
+    <string name="set_password">Angiv adgangskode</string>
+    <string name="set_group">Angiv et gruppenavn</string>
+    <string name="set_number">Angiv et tal</string>
+    <string name="set_password_confirm">Bekræft adgangskoden</string>
     <string name="invalid_password">Adgangskoden er forkert</string>
-    <string name="invalidated_biometrics">En ændring i din enheds sikkerhedsindstillinger er detekteret. Gå til \"Aegis -&gt; Indstillinger -&gt; Sikkerhed -&gt; Biometrisk oplåsning\" for at deaktivere og genaktivere biometrisk oplåsning.</string>
-    <string name="password_reminder">Angiv din adgangskode. Vi beder dig lejlighedsvis gøre dette, så du ikke glemmer den.</string>
+    <string name="invalidated_biometrics">En ændring i enhedens sikkerhedsindstillinger er detekteret. Gå til \"Aegis -&gt; Indstillinger -&gt; Sikkerhed -&gt; Biometrisk oplåsning\" for at slå biometrisk oplåsning fra og til.</string>
+    <string name="password_reminder">Angiv adgangskoden. Vi beder dig lejlighedsvis gøre dette, så du ikke glemmer den.</string>
     <string name="password_reminder_dialog_title">Biometrisk oplåsning som standard</string>
-    <string name="password_reminder_dialog_message">For at hindre, at du bliver låst ude af din boks, beder vi lejlighedsvis om din adgangskode, så du ikke glemme den. Efter du har angivet adgangskoden, fortsætter Aegis med biometrisk oplåsning som standard indtil den næste påmindelse.</string>
+    <string name="password_reminder_dialog_message">For at hindre, at du låses ude af din Boks, beder vi lejlighedsvis om adgangskoden, så den ikke glemmes. Efter du har angivet adgangskoden, fortsætter Aegis med biometrisk oplåsning som standard indtil den næste påmindelse.</string>
     <string name="password_reminder_freq_never">Aldrig</string>
     <string name="password_reminder_freq_weekly">Ugentlig</string>
-    <string name="password_reminder_freq_biweekly">14-dages</string>
+    <string name="password_reminder_freq_biweekly">14. dag</string>
     <string name="password_reminder_freq_monthly">Månedligt</string>
     <string name="password_reminder_freq_quarterly">Kvartalsvist</string>
-    <string name="enter_password_2fas_message">Det ser ud til at denne 2FAS-backup er krypteret. Indtast venligst adgangskoden nedenfor.</string>
+    <string name="enter_password_2fas_message">Det lader til, at denne 2FAS-sikkerhedskopi er krypteret. Angiv adgangskoden nedenfor.</string>
     <string name="enter_password_authy_message">Det ser ud til at Authy-tokenerne er krypterede. Luk Aegis, åbn Authy og oplås tokener med adgangskoden. Alternativ kan Aegis forsøge at dekryptere Authy-tokenerne, hvis adgangskode angives nedenfor.</string>
     <string name="enter_password_aegis_title">Angiv importadgangskoden</string>
     <string name="period_hint">Periode (sekunder)</string>
@@ -152,17 +196,23 @@
     <string name="share">Del</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
+    <string name="undo">Fortryd</string>
     <string name="unlock">Lås op</string>
     <string name="advanced">Avanceret</string>
     <string name="counter">Tæller</string>
     <string name="digits">Cifre</string>
-    <string name="secret">Hemmelig</string>
-    <string name="scan">Scan QR-kode</string>
-    <string name="scan_image">Scan billede</string>
-    <string name="enter_manually">Indtast manuelt</string>
+    <string name="secret">Hemmelighed</string>
+    <string name="scan">Skan QR-kode</string>
+    <string name="scan_image">Skan billede</string>
+    <string name="enter_manually">Angiv manuelt</string>
     <string name="set_up_biometric">Konfigurer biometrisk oplåsning</string>
     <string name="copy">Kopier</string>
     <string name="edit">Rediger</string>
+    <string name="select_all">Vælg alle</string>
+    <string name="assign_icons">Tildel ikoner</string>
+    <string name="assign_groups">Tildel til gruppe</string>
+    <string name="assign_groups_dialog_summary">Vælg en gruppe, som de valgte poster ønskes tilknyttet.</string>
+    <string name="assign_groups_dialog_dropdown">Vælg gruppe</string>
     <string name="favorite" comment="Verb">Tilføj som favorit</string>
     <string name="unfavorite" comment="Verb">Fjern som favorit</string>
     <string name="error_all_caps">FEJL</string>
@@ -171,57 +221,61 @@
     <string name="show_password">Vis adgangskode</string>
     <string name="new_entry">Ny post</string>
     <string name="add_new_entry">Tilføj ny post</string>
-    <string name="unlock_vault_error">Kunne ikke låse boksen op</string>
-    <string name="unlock_vault_error_description">Forkert adgangskode. Sørg for at du ikke har indtastet din adgangskode forkert.</string>
-    <string name="password_equality_error">Adgangskoder skal være identiske og ikke-tomme</string>
-    <string name="snackbar_authentication_method">Vælg venligst en verifikationsmetode</string>
-    <string name="encrypting_vault">Krypterer boksen</string>
-    <string name="exporting_vault">Eksporterer boksen</string>
-    <string name="reading_file">Indlæser fil</string>
+    <string name="unlock_vault_error">Kunne ikke oplåse Boksen</string>
+    <string name="unlock_vault_error_description">Forkert adgangskode. Tjek, at der ikke er slåfejl i adgangskoden.</string>
+    <string name="password_equality_error">Adgangskoder er obligatoriske og skal matche</string>
+    <string name="snackbar_authentication_method">Vælg bekræftelsesmetode</string>
+    <string name="encrypting_vault">Krypterer Boksen</string>
+    <string name="exporting_vault">Eksporterer Boksen</string>
+    <string name="optimizing_icon">Optimerer ikon</string>
+    <string name="optimizing_icon_multiple">Optimerer ikoner %1$d/%2$d</string>
+    <string name="reading_file">Læser fil</string>
     <string name="requesting_root_access">Anmoder om root-adgang</string>
     <string name="analyzing_qr">Analyserer QR-kode</string>
-    <string name="analyzing_qr_multiple">Analyserer QR-kode %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analyserer QR-kode %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Tilføjede %d ny post til boksen</item>
         <item quantity="other">Tilføjede %d nye poster til boksen</item>
     </plurals>
     <string name="importing_icon_pack">Importerer ikonpakke</string>
     <string name="delete_entry">Slet post</string>
-    <string name="delete_entry_description">Er du sikker på, du vil slette denne post?</string>
+    <string name="delete_entry_description">Sikker på, at denne post skal slettes?</string>
     <string name="delete_entry_explanation">Denne handling deaktiverer ikke 2FA for:\n<b>%s</b>\n\nFor at bevare adgang, så tjek, at 2FA er deaktiveret, eller at en alternativ kodegenereringsmetode til denne tjeneste findes.</string>
     <string name="delete_entries">Slet poster</string>
     <plurals name="delete_entries_description">
-        <item quantity="one">Er du sikker på, du vil slette %d post?</item>
-        <item quantity="other">Er du sikker på, du vil slette %d poster?</item>
+        <item quantity="one">Sikker på, at %d post skal slettes?</item>
+        <item quantity="other">Sikker på, at %d poster skal slettes?</item>
     </plurals>
     <string name="discard_changes">Kassér ændringer?</string>
-    <string name="discard_changes_description">Din ændringer er ikke blevet gemt</string>
+    <string name="discard_changes_description">Ændringer blev ikke gemt</string>
     <string name="saving_profile_error">Fejl under lagring af profil</string>
+    <string name="saving_assign_icons_error">Fejl ved tildeling af ikoner</string>
     <string name="welcome">Velkommen</string>
     <string name="app_description">Aegis er en gratis, sikker og open-source 2FA-app</string>
     <string name="setup_completed">Opsætning fuldført</string>
-    <string name="setup_completed_description">Aegis er blevet indstillet og er klar til brug.</string>
+    <string name="setup_completed_description">Aegis er blevet opsat og er klar til brug.</string>
     <string name="vault_not_found">Boks ikke fundet, starter opsætning…</string>
     <string name="copied">Kopieret</string>
     <string name="errors_copied">Fejl kopieret til udklipsholderen</string>
     <string name="version_copied">Version kopieret til udklipsholderen</string>
-    <string name="error_occurred">Der opstod en fejl</string>
-    <string name="decryption_error">Der opstod en fejl under forsøget på at låse boksen op</string>
-    <string name="decryption_corrupt_error">Der opstod en fejl under forsøget på at låse boksen op. Din boksfil kan være beskadiget.</string>
-    <string name="saving_error">Der opstod en fejl under forsøget på at gemme boksen</string>
-    <string name="vault_init_error">Der opstod en fejl under forsøget på at gøre boksen klar</string>
-    <string name="vault_load_error">Der opstod en fejl under forsøget på at indlæse boksen fra lager</string>
-    <string name="biometric_decrypt_error">Der opstod en fejl under forsøget på at dekryptere boksen med biometrisk godkendelse. Dette sker normalt kun hvis din enheds sikkerhedsindstillinger blev ændret. Lås boksen op med din adgangskode, og rekonfigurer biometrisk godkendelse i Aegis\' indstillinger.</string>
-    <string name="biometric_init_error">Der opstod en fejl under forberedelsen af biometrisk godkendelse. Dette sker normalt kun, hvis din enheds sikkerhedsindstillinger blev ændret. Lås boksen op med din adgangskode, og rekonfigurer biometrisk godkendelse i Aegis\' indstillinger.</string>
+    <string name="error_required_field">Obligatorisk felt</string>
+    <string name="error_occurred">En fejl opstod</string>
+    <string name="decryption_error">En fejl opstod under forsøget på at oplåse Boksen</string>
+    <string name="decryption_corrupt_error">En fejl opstod under forsøget på at oplåse Boksen. Boksfilen kan være beskadiget.</string>
+    <string name="saving_error">En fejl opstod under forsøget på at gemme Boksen</string>
+    <string name="vault_init_error">En fejl opstod under forsøget på at initialisere Boksen</string>
+    <string name="vault_load_error">En fejl opstod under forsøget på at indlæse Boksen fra lager</string>
+    <string name="biometric_decrypt_error">En fejl opstod under forsøget på at dekryptere Boksen via biometrisk godkendelse. Dette sker normalt kun, såfremt enhedens sikkerhedsindstillinger er blevet ændret. Oplås Boksen med adgangskoden, og genopsæt biometrisk godkendelse i Aegis-indstillingerne.</string>
+    <string name="biometric_init_error">En fejl opstod under klargøring til biometrisk godkendelse. Dette sker normalt kun, såfremt enhedens sikkerhedsindstillinger er blevet ændret. Oplås Boksen med adgangskoden, og genopsæt biometrisk godkendelse i Aegis-indstillingerne.</string>
     <string name="disable_encryption">Deaktivér kryptering</string>
-    <string name="disable_encryption_description">Er du sikker på, at du vil deaktivere kryptering? Dermed vil boksen blive gemt i almindelig tekst. <b>Automatiske sikkerhedskopier vil også blive deaktiveret</b>.</string>
-    <string name="enable_encryption_error">Der opstod en fejl under aktivering af kryptering</string>
-    <string name="disable_encryption_error">Der opstod en fejl under deaktivering af kryptering</string>
-    <string name="backup_successful">Sikkerhedskopieringen blev planlagt med succes</string>
-    <string name="backup_error">Der opstod en fejl under forsøget på at oprette en sikkerhedskopi</string>
+    <string name="disable_encryption_description">Sikker på, at kryptering skal deaktiveres? Boksen gemmes i så fald som alm. tekst. <b>Automatiske sikkerhedskopier deaktiveres ligeledes</b>.</string>
+    <string name="enable_encryption_error">En fejl opstod under aktivering af kryptering</string>
+    <string name="disable_encryption_error">En fejl opstod under deaktivering af kryptering</string>
+    <string name="backup_successful">Sikkerhedskopieringen er hermed planlagt</string>
+    <string name="backup_error">En fejl opstod under forsøget på at oprette en sikkerhedskopi</string>
     <string name="backup_status_success">Senest gennemførte sikkerhedskopiering: %s</string>
     <string name="backup_status_failed">Senest mislykket sikkerhedskopiering: %s</string>
-    <string name="backup_status_none">Ingen sikkerhedskopieringer foretaget endnu</string>
+    <string name="backup_status_none">Ingen sikkerhedskopier oprettet endnu</string>
     <string name="backup_warning_password">Sikkerhedskopier krypteres vha. en separat adgangskode opsat i Sikkerhedsindstillinger</string>
     <string name="documentsui_error">DokumenterUI synes at mangle fra din enhed. Dette er en vigtig systemkomponent, der er nødvendig for udvælgelse og oprettelse af dokumenter. Hvis du brugte et værktøj til &quot;rense&quot; din enhed, kan du ved et uheld have slettet den og bliver nødt til at geninstallere den.</string>
     <string name="icon_pack_import_error">En fejl opstod under forsøget på at importere en ikonpakke</string>
@@ -233,18 +287,18 @@
     </plurals>
     <string name="icon_custom">Tilpasset</string>
     <string name="permission_denied">Tilladelse nægtet</string>
-    <string name="andotp_new_format">Nyt format (v0.6.3 eller nyere) </string>
-    <string name="andotp_old_format">Gammelt format (v0.6.2 eller ældre) </string>
-    <string name="choose_andotp_importer">Hvilket format har andOTP backup-filen?</string>
-    <string name="choose_totpauth_importer">Er denne TOTP Authenticator backup krypteret med en adgangskode?</string>
-    <string name="choose_application">Vælg den applikation, du vil importere fra</string>
-    <string name="choose_theme">Vælg dit ønskede tema</string>
-    <string name="choose_account_name_position">Vælg den ønskede position for kontonavnet</string>
-    <string name="choose_view_mode">Vælg din ønskede visningstilstand</string>
-    <string name="choose_copy_behavior">Vælg den ønskede kopieringsadfærd</string>
-    <string name="parsing_file_error">Der opstod en fejl under forsøget på at tolke filen</string>
+    <string name="andotp_new_format">Nyt format (v0.6.3 eller senere) </string>
+    <string name="andotp_old_format">Gammelt format (v0.6.2 eller tidligere) </string>
+    <string name="choose_andotp_importer">Hvilket format har andOTP-sikkerhedskopifilen?</string>
+    <string name="choose_totpauth_importer">Er denne TOTP Authenticator-sikkerhedskopi krypteret med en adgangskode?</string>
+    <string name="choose_application">Vælg den applikation, der skal importeres fra</string>
+    <string name="choose_theme">Vælg ønskede tema</string>
+    <string name="choose_account_name_position">Vælg ønskede placering af kontonavn</string>
+    <string name="choose_view_mode">Vælg ønskede visningstilstand</string>
+    <string name="choose_copy_behavior">Vælg ønskede kopieringsadfærd</string>
+    <string name="parsing_file_error">En fejl opstod under forsøget på at fortolke filen</string>
     <string name="file_not_found">Fejl: Fil ikke fundet</string>
-    <string name="reading_file_error">Der opstod en fejl under forsøg på at læse filen</string>
+    <string name="reading_file_error">En fejl opstod under forsøg på at læse filen</string>
     <string name="app_lookup_error">Fejl: App er ikke installeret</string>
     <string name="app_version_error">Den installerede version af %s understøttes ikke. Nyere versioner er begyndt at kryptere visse filer i den interne lagermappe, hvilket gør Aegis ude af stand til at tilgå den information, den behøver til importen. Forsøg på import vil sandsynligvis resultere i en fejl. Fortsæt alligevel?</string>
     <string name="root_error">Fejl: Kan ikke opnå root-adgang</string>
@@ -258,25 +312,30 @@
     </plurals>
     <string name="intro_import_error_title">En fejl opstod under import af Boksen</string>
     <string name="import_error_title">En eller flere fejl opstod under import</string>
-    <string name="exporting_vault_error">Der opstod en fejl under forsøget på at eksportere boksen</string>
-    <string name="exported_vault">Boksen blev eksporteret</string>
-    <string name="encryption_set_password_error">Der skete en fejl under forsøget på at indstille adgangskoden.</string>
-    <string name="encryption_enable_biometrics_error">Der opstod en fejl under forsøget på at aktivere biometrisk oplåsning. Nogle enheder har dårlige implementeringer af biometrisk autentificering, og det er sandsynligt, at din er en af dem. Overvej i stedet at skifte til en adgangskode-konfiguration.</string>
+    <string name="exporting_vault_error">En fejl opstod under forsøget på at eksportere Boksen</string>
+    <string name="exported_vault">Boksen er eksporteret</string>
+    <string name="encryption_set_password_error">En fejl opstod under indstilling af adgangskoden.</string>
+    <string name="encryption_enable_biometrics_error">En fejl opstod under aktivering af biometrisk oplåsning. Nogle enheder har dårlige implementeringer af biometrisk godkendelse, hvilket sandsynligvis er fejlårsagen. Overvej i stedet at skifte til en kun-adgangskode opsætning.</string>
     <string name="no_cameras_available">Ingen kameraer tilgængelige</string>
-    <string name="read_qr_error">Der opstod en fejl under forsøg på at læse QR-koden</string>
-    <string name="read_qr_error_phonefactor">Aegis er ikke kompatibel med Microsofts proprietære 2FA-algoritme. Sørg for at vælge \"Opsæt applikation uden notifikationer\", når du konfigurerer 2FA i Office 365.</string>
+    <string name="read_qr_error">En fejl opstod under læsning af QR-koden</string>
+    <string name="read_qr_error_phonefactor">Aegis er inkompatibel med Microsofts proprietære 2FA-algoritme. Sørg for at vælge \"Opsæt applikation uden notifikationer\", når 2FA opsættes i Office 365.</string>
     <string name="partial_google_auth_import">Ufuldstændig Google Authenticator-eksport detekteret</string>
     <string name="partial_google_auth_import_warning">Nogle QR-koder mangler i importen. Flg. koder er ikke fundet:\n\n<b>%s</b>\n\nMan kan fortsætte med import af denne delvise eksport, dog anbefales det at prøve igen med alle QR-koderne, så man ikke risikerer at miste adgang til nogle tokens.</string>
     <string name="missing_qr_code_descriptor">• QR-kode %d</string>
-    <string name="import_partial_export_anyway">Importér %d tokens alligevel</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importér %d token alligevel</item>
+        <item quantity="other">Importér %d tokener alligevel</item>
+    </plurals>
     <string name="import_google_auth_failure">Import af Google Authenticator-eksport mislykkedes</string>
     <string name="unrelated_google_auth_batches_error">Eksporten indeholder information om et urelateret sæt. Prøv at importere 1 sæt ad gangen.</string>
     <string name="no_tokens_can_be_imported">Som konsekvens, kan ingen tokener importeres</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Låser boksen op</string>
-    <string name="slot_this_device">(denne enhed)</string>
+    <string name="rename_group">Omdøb gruppe</string>
+    <string name="no_group_selection">Er en post ikke en del af en gruppe, kan den findes under \"Ingen gruppe\".</string>
     <string name="remove_group">Fjern gruppe</string>
-    <string name="remove_group_description">Er du sikker på, at du vil fjerne denne gruppe? Poster i denne gruppe vil automatisk skifte til \'Ingen gruppe\'.</string>
+    <string name="remove_group_description">Sikker på, at denne gruppe skal fjernes? Poster heri vil automatisk skifte til \'Ingen gruppe\'.</string>
+    <string name="remove_unused_groups">Slet ubrugte grupper</string>
+    <string name="remove_unused_groups_description">Sikker på, at alle grupper uden en posttilknytning skal slettes?</string>
     <string name="remove_icon_pack">Fjern ikonpakke</string>
     <string name="remove_icon_pack_description">Sikker på, at du vil fjerne denne ikonpakke? Poster, som bruger ikoner fra denne pakke, påvirkes ikke.</string>
     <string name="details">Detaljer</string>
@@ -284,38 +343,59 @@
     <string name="lock">Lås</string>
     <string name="name">Navn</string>
     <string name="no_group">Ingen gruppe</string>
-    <string name="sort">Sorter</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sortér</string>
     <string name="sort_alphabetically">Udsteder (A til Z)</string>
     <string name="sort_alphabetically_reverse">Udsteder (Z til A)</string>
     <string name="sort_alphabetically_name">Konto (A til Z)</string>
     <string name="sort_alphabetically_name_reverse">Konto (Z til A)</string>
     <string name="sort_usage_count">Brugstælling</string>
+    <string name="sort_last_used">Senest brugt</string>
     <string name="sort_custom">Tilpasset</string>
+    <string name="last_used">Senest brugt</string>
+    <string name="last_used_never">aldrig</string>
     <string name="new_group">Ny gruppe…</string>
     <string name="group">Gruppe</string>
     <string name="group_name_hint">Gruppenavn</string>
     <string name="preference_manage_groups">Redigér grupper</string>
-    <string name="preference_manage_groups_summary">Håndtér og slet dine grupper her</string>
+    <string name="preference_manage_groups_summary">Håndtér og slet grupper her</string>
     <string name="preference_reset_usage_count">Nulstil brugstæller</string>
     <string name="preference_reset_usage_count_summary">Nulstil alle brugstællingsposter i din Boks</string>
     <string name="preference_reset_usage_count_dialog">Sikker på, at alle brugstællingsposter i din Boks skal nulstilles?</string>
-    <string name="note">Notat</string>
+    <string name="note" comment="Users can add a note to an entry">Notat</string>
     <string name="clear">Ryd</string>
-    <string name="pref_highlight_entry_title">Fremhæv tokens ved tryk</string>
-    <string name="pref_highlight_entry_summary">Gør tokens lettere at skelne fra hinanden ved midlertidigt at fremhæve dem, når der trykkes på dem</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Dubletpost</string>
+    <string name="dialog_duplicate_entry_message">Denne post har samme navn og udsteder som mindst én eksisterende post. Hvordan skal der fortsættes?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Overskriv eksisterende post(er)</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Erstat eksisterende post(er) med den nye. Denne handling kan ikke fortrydes</string>
+    <string name="dialog_duplicate_entry_suffix_title">Tilføj endelse</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Føj en endelse til navnet på denne nye post. Det nye navn vil være: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Afbryd gem</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Muliggør at redigere posten inden den igen forsøges gemt</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Sikker på, at der skal slettes %d post med flg. navn:\n\n%s - %s</item>
+        <item quantity="other">Sikker på, at der skal slettes %d poster med flg. navn:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Bekræft sletning</string>
+    <string name="pref_haptic_feedback_summary">Få enheden til at vibrere, når koder opdateres</string>
+    <string name="pref_haptic_feedback_title">Haptisk feedback</string>
+    <string name="pref_highlight_entry_title">Fremhæv tokener ved tryk</string>
+    <string name="pref_highlight_entry_summary">Gør tokener lettere at skelne fra hinanden ved midlertidigt at fremhæve dem, når der trykkes på dem</string>
+    <string name="pref_groups_multiselect_title">Multivalg af grupper</string>
+    <string name="pref_groups_multiselect_summary">Muliggør valg af flere grupper samtidig</string>
     <string name="pref_minimize_on_copy_title">Minimér under kopiering</string>
     <string name="pref_minimize_on_copy_summary">Minimér appen efter kopiering af et token</string>
-    <string name="pref_copy_behavior_title">Kopiér tokens til udklipsholderen</string>
-    <string name="pref_pause_entry_title">Frys tokens ved tryk</string>
-    <string name="pref_pause_entry_summary">Pausér automatisk opdatering af tokens ved at trykke på dem. Tokens opdateres ikke, så længe de er fokuseret. Kræver \"Fremhæv tokens ved tryk\" eller \"Tryk for at afsløre\".</string>
-    <string name="pin_keyboard_description">Indtast din adgangskode for at aktivere PIN-tastaturet. Bemærk at dette kun virker, hvis din adgangskode kun består af tal</string>
+    <string name="pref_copy_behavior_title">Kopiér tokener til udklipsholder</string>
+    <string name="pref_search_behavior_title">Søgeadfærd</string>
+    <string name="pref_pause_entry_title">Frys tokener ved tryk</string>
+    <string name="pref_pause_entry_summary">Pausér automatisk opdatering af tokener ved at trykke på dem. Tokener opdateres ikke, så længe de er fokuseret. Kræver \"Fremhæv tokener ved tryk\" eller \"Tryk for at vise\".</string>
+    <string name="pin_keyboard_description">Angiv adgangskoden for at aktivere PIN-tastaturet. Bemærk, at dette kun virker, såfremt adgangskoden alene består af cifre</string>
     <string name="pin_keyboard_error">Fejl under aktivering af PIN-tastatur</string>
-    <string name="pin_keyboard_error_description">Det er ikke muligt at angive PIN-tastatur. Din adgangskode må kun bestå af tal.</string>
-    <string name="pin_keyboard_disabled">Adgangskode ændret. PIN-tastaturet vil ikke længere blive vist.</string>
+    <string name="pin_keyboard_error_description">Det er ikke muligt at angive PIN-tastatur. Adgangskoden må kun bestå af cifre.</string>
+    <string name="pin_keyboard_disabled">Adgangskoden ændret. PIN-tastaturet vises ikke længere.</string>
     <string name="selected">Valgt</string>
     <string name="dark_theme_title">Mørkt tema</string>
     <string name="light_theme_title">Lyst tema</string>
-    <string name="amoled_theme_title">AMOLED tema</string>
+    <string name="amoled_theme_title">AMOLED-tema</string>
     <string name="system_theme_title">Indstillet af batterisparefunktion</string>
     <string name="system_amoled_theme_title">Indstillet af batterisparefunktion (AMOLED)</string>
     <string name="normal_viewmode_title">Normal</string>
@@ -325,13 +405,13 @@
     <string name="unknown_issuer">Ukendt udsteder</string>
     <string name="unknown_account_name">Ukendt kontonavn</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis kunne ikke importere %d token. Disse tokens vil blive sprunget over. Tryk \'detaljer\' for at se mere information om fejlene.</item>
-        <item quantity="other">Aegis kunne ikke importere %d tokens. Disse tokens vil blive sprunget over. Tryk \'detaljer\' for at se mere information om fejlene.</item>
+        <item quantity="one">Aegis kunne ikke importere %d token. Denne token vil blive sprunget over. Tryk på \'detaljer\' for at se flere oplysninger om fejlen.</item>
+        <item quantity="other">Aegis kunne ikke importere %d tokens. Disse tokens vil blive sprunget over. Tryk på \'detaljer\' for at se flere oplysninger om fejlen.</item>
     </plurals>
-    <string name="unable_to_process_deeplink">Kan ikke behandle dybt link</string>
+    <string name="unable_to_process_deeplink">Dybt link kan ikke behandles</string>
     <string name="unable_to_read_qrcode_file">Kan ikke læse og behandle QR-koden fra filen: %s.</string>
     <string name="unable_to_process_shared_text">Kan ikke behandle delt tekst som OTP</string>
-    <string name="unable_to_read_qrcode_files">Kan ikke læse og behandle nogle af QR-koderne. Kun %d/%d poster importeres.</string>
+    <string name="unable_to_read_qrcode_files">Kan ikke læse og behandle nogle af QR-koderne. Kun %1$d/%2$d poster importeres.</string>
     <string name="unable_to_generate_qrcode">Kan ikke generere QR-kode</string>
     <string name="select_picture">Vælg billede</string>
     <string name="select_icon">Vælg ikon</string>
@@ -344,31 +424,33 @@
     <string name="vault_unlocked_state">Boksen er låst op. Tryk her for at låse.</string>
     <string name="version">Version</string>
     <string name="changelog">Ændringslog</string>
-    <string name="whats_new">Hvad er nyt</string>
-    <string name="github_description">Kildekode, problemer og oplysninger</string>
+    <string name="whats_new">Nyheder</string>
+    <string name="github_description">Kildekode, problematikker og information</string>
     <string name="license">Licens</string>
     <string name="license_description">Aegis Authenticator er licenseret under GPLv3</string>
     <string name="third_party_licenses">Tredjepartslicenser</string>
     <string name="third_party_licenses_description">Licenser fra tredjepartsbibliotekerne Aegis bruger</string>
     <string name="country_netherlands">Nederlandene</string>
     <string name="email_us">Skriv en e-mail</string>
-    <string name="visit_website">Besøg vores hjemmeside</string>
+    <string name="visit_website">Besøg vores websted</string>
     <string name="about_support">Support</string>
     <string name="support_rate">Bedøm</string>
-    <string name="support_rate_description">Støt os ved at lave en anmeldelse i Google Play Store</string>
-    <string name="webview_error">Denne enhed understøtter ikke webvisning, hvilket er nødvendigt for at se ændringslog og licensen. Den mangler en systemkomponent.</string>
+    <string name="support_rate_description">Støt os ved at skrive en anmeldelse i Google Play Store</string>
+    <string name="webview_error">Denne enhed understøtter ikke webvisning, hvilket kræves for at vise ændringslog og licens. En systemkomponent mangler.</string>
     <string name="email">E-mail</string>
     <string name="time_sync_warning_title">Automatisk tidssynkronisering</string>
-    <string name="time_sync_warning_message">Aegis er afhængig af systemets tid for at være i synk til generering af korrekte koder. En afvigelse på kun et par sekunder kan resultere i forkerte koder. Det ser ud til, at din enhed ikke er konfigureret til automatisk at synkronisere tiden. Vil du gøre det nu?</string>
-    <string name="time_sync_warning_disable">Hold op med at advare mig. Jeg ved, hvad jeg gør.</string>
-    <string name="google_qr_export_unrelated">Ikke-relateret QR-kode fundet. Prøv at genstarte scanneren.</string>
+    <string name="time_sync_warning_message">Aegis er afhængig af systemtiden for at være i synk til generering af korrekte koder. En afvigelse på kun et par sekunder kan resultere i forkerte koder. Det ser ud til, at enheden ikke er opsat til auto-synk af tid. Opsæt dette nu?</string>
+    <string name="time_sync_warning_disable">Ophør med at advare mig. Jeg ved, hvad jeg gør.</string>
+    <string name="google_qr_export_unrelated">Ikke-relateret QR-kode fundet. Prøv at genstarte skanneren.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Scannede %d/%d QR-koder</item>
-        <item quantity="other">Scannede %d/%d QR-koder</item>
+        <item quantity="one">Skannede %1$d/%2$d QR-koder</item>
+        <item quantity="other">Skannede %1$d/%2$d QR-koder</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Forventede QR kode #%d, men scannede #%d i stedet</string>
-    <string name="backup_error_bar_message"><b>Boks-backup mislykkedes for nylig</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Et nyligt bokssikkerhedskopieringsforsøg vha. %s mislykkedes, da en fejl opstod. Sikkerhedskopieringen blev forsøgt: %s. Tjek sikkerhedskopieringsindstillingerne for at sikre, at sikkerhedskopieringer kan fuldføres.
+    <string name="google_qr_export_unexpected">Forventede QR-koden #%1$d, men skannede #%2$d i stedet</string>
+    <string name="backup_error_bar_message"><b>Bokssikkerhedskopiering mislykkedes for nylig</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Et nyligt Boks-sikkerhedskopieringsforsøg vha. %1$s mislykkedes grundet en fejl. Sikkerhedskopieringen blev forsøgt: %2$s. Tjek sikkerhedskopieringsindstillingerne for at sikre, at sikkerhedskopieringer kan fuldføres.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Et nyligt Boks-sikkerhedskopieringsforsøg vha. %1$s fejlede, da Aegis manglende skriverettighed på sikkerhedskopidestinationen. Sikkerhedskopieringen forsøgt %2$s. Fejlen kan opstå, hvis sikkerhedskopidestinationen er blevet flyttet/omdøbt, eller Aegis for nylig er gendannet fra en sikkerhedskopi. Genopsæt sikkerhedskopidestinationen.
     </string>
     <string name="backup_system_builtin">Aegis\' indbyggede automatiske sikkerhedskopieringer</string>
     <string name="backup_system_android">Android cloud-sikkerhedskopieringssystem</string>
@@ -377,12 +459,12 @@
     <string name="backup_reminder_bar_message">        Ændringer er ikke sikkerhedskopieret
     </string>
     <string name="backup_reminder_bar_dialog_title">Ændringer er ikke sikkerhedskopieret</string>
-    <string name="backup_reminder_bar_dialog_summary">        Nylige ændringer i boksen er endnu ikke sikkerhedskopieret. Regelmæssig sikkerhedskopiering er vigtig for at undgå at miste adgang til konti. Overvej opsætning af automatisk sikkerhedskopiering i indstillingsmenuen.
+    <string name="backup_reminder_bar_dialog_summary">        Nylige ændringer i Boksen er endnu ikke sikkerhedskopieret. Regelmæssig sikkerhedskopiering er vigtig for at undgå at miste adgang til konti. Overvej opsætning af automatisk sikkerhedskopiering i indstillingsmenuen.
     </string>
     <string name="backup_reminder_bar_dialog_accept">Opsæt sikkerhedskopiering</string>
-    <string name="backup_plaintext_export_warning"><b>Boksen blev for nylig eksporteret som simpel tekst</b></string>
+    <string name="backup_plaintext_export_warning"><b>Boksen blev for nylig eksporteret som alm. tekst</b></string>
     <string name="pref_show_plaintext_warning_hint">Vis ikke denne advarsel igen</string>
-    <string name="backup_plaintext_warning_explanation">Denne advarsel vises, da en ukrypteret kopi af Boksen for nyligt er eksporteret. For at opretholde sikkerheden for tokens, anbefales det at slette denne fil, når den ikke længere behøves.</string>
+    <string name="backup_plaintext_warning_explanation">Denne advarsel vises, da en ukrypteret kopi af Boksen for nyligt er eksporteret. For at opretholde sikkerheden for tokener, anbefales det at slette denne fil, når den ikke længere behøves.</string>
     <string name="switch_camera">Skift kamera</string>
     <string name="empty_list">Der er ingen koder at vise. Begynd at tilføje poster ved at trykke på plus-tegnet i nederste højre hjørne</string>
     <string name="empty_list_title">Ingen poster fundet</string>
@@ -402,14 +484,15 @@
     <string name="copy_uri">Kopiér URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Kunne ikke kopiere URI til udklipsholder</string>
     <string name="uri_copied_to_clipboard">URI kopieret til udklipsholder</string>
-    <string name="transfer_entry">Overfør post</string>
     <string name="transfer_entry_description">Scan denne QR-kode med den autentificerings-app, du gerne vil overføre denne post til</string>
+    <string name="transfer_entry_brightness">Tryk på QR-koden for at skifte fuldskærmslysstyrke</string>
     <string name="google_auth_compatible_transfer_description">Skan disse QR-koder med Aegis eller Google Authenticator.\n\nGrundet begrænsninger i Google Authenticator-appen inkluderes kun TOTP- og HOTP-tokener, som bruger SHA1 og genererer 6-cifrede koder</string>
     <string name="password_strength_very_weak">Meget svag</string>
     <string name="password_strength_weak">Svag</string>
     <string name="password_strength_fair">Hæderlig</string>
     <string name="password_strength_good">God</string>
     <string name="password_strength_strong">Stærk</string>
+    <string name="password_strength_unknown">Adgangskode for lang til styrkeanalyse</string>
     <string name="pref_pin_keyboard_title">Benyt pintastatur på låseskærm</string>
     <string name="pref_pin_keyboard_summary">Aktiver dette, hvis du vil aktivere pinkode-tastaturet på låseskærmen. Dette virker kun for numeriske adgangskoder</string>
     <string name="title_activity_preferences">Indstillinger</string>
@@ -418,32 +501,43 @@
     <string name="title_activity_about">Om</string>
     <string name="title_activity_edit_entry">Redigér post</string>
     <string name="title_activity_scan_qr">Scan en QR-kode</string>
-    <string name="title_activity_manage_slots">Administrér nøglepladser</string>
     <string name="title_activity_import_entries">Importer poster</string>
+    <string name="title_activity_assign_icons">Tildel ikoner</string>
+    <string name="title_activity_licenses">Tredjepartslicenser</string>
     <string name="dialog_wipe_entries_title">Ryd poster</string>
     <string name="dialog_wipe_entries_message">Din boks indeholder allerede poster. Vil du fjerne disse poster før import af denne fil?\n\n<b>Ved at gøre dette, vil du permanent miste adgang til de eksisterende poster i boksen.</b></string>
     <string name="dialog_wipe_entries_checkbox">Ryd boksens indhold</string>
     <string name="panic_trigger_ignore_toast">Aegis modtog panikudløser, men indstilling er deaktiveret, ignorerer</string>
     <string name="pref_panic_trigger_title">Slet boks ved panikudløser</string>
     <string name="pref_panic_trigger_summary">Slet boks, når en panikudløser modtages fra Ripple</string>
-    <string name="import_vault">Importér Boks</string>
+    <string name="import_vault">Importér Aegis-boks</string>
+    <string name="import_vault_hint">Ønsker du at importere fra en anden 2FA-app? Færdiggør opsætningen først, og gå derefter til indstillingsmenuen.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Afmarkerede %d potentiel dublet. Revidér listen over poster.</item>
+        <item quantity="other">Afmarkererede %d potentielle dubletter. Revidér listen over poster.</item>
+    </plurals>
     <string name="importer_help_2fas">Stil en 2FAS-godkendelse sikkerhedskopifil til rådighed.</string>
     <string name="importer_help_aegis">Levér en Aegis eksport/backup fil.</string>
     <string name="importer_help_authenticator_plus">Levér en Authenticator Plus-eksportfil opnået gennem <b>Indstillinger -&gt; Sikkerhedskopi &amp; Gendan -&gt; Eksport som tekst og HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Benyt en Authenticator Pro-eksportfil genereret via <b>Indstillinger -&gt; Sikkerhedskopiering -&gt; Sikkerhedskopiering til krypteret fil (anbefalet)</b>.</string>
     <string name="importer_help_authy">Levér en kopi af <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, der er placeret i den interne lagermappe i Authy.</string>
     <string name="importer_help_andotp">Levér en andOTP eksport/backup fil.</string>
     <string name="importer_help_bitwarden">Vælg en Bitwarden-eksport-/sikkerhedskopifil. Krypterede filer understøttes ikke.</string>
-    <string name="importer_help_battle_net_authenticator">Levér en kopi af <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, der er placeret i den interne lagermappe i Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Levér en kopi af <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, der er placeret i den interne lagermappe i Battle.net Authenticator.</string>
     <string name="importer_help_duo">Skaf en kopi af <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> fra DUOs interne lagermappe.</string>
-    <string name="importer_help_freeotp">Levér en kopi af <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, der er placeret i den interne lagermappe i Authy.</string>
+    <string name="importer_help_ente_auth">Angiv en Ente Auth-eksportfil. Kun ukrypterede filer understøttes p.t.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Levér en sikkerhedskopifil.\nFreeOTP 1.x: Levér en kopi af <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> fra FreeOTP\' interne lagermappe.</string>
     <string name="importer_help_freeotp_plus">Levér en FreeOTP+ eksportfil.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2-kompatibilitet</string>
+    <string name="importer_warning_message_freeotp2">Der er en række problemer i FreeOTP 2, som kan resultere i korruperede sikkerhedskopier. Aegis vil forsøge at redde så mange poster som muligt, men det er muligt, at nogle eller endda alle af dem ikke lader sig importere.</string>
     <string name="importer_help_google_authenticator"><b>Kun databasefiler fra Google Authenticator v5.10 og tidligere understøttes</b>.\n\nLeverer en kopi af <b>/data/data/com. google.android.apps.authenticator2/databaser/databaser</b>, placeret i Google Authenticators interne lagermappe.</string>
     <string name="importer_help_microsoft_authenticator">Levér en kopi af <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, der er placeret i den interne lagermappe i Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Levér en almindelig tekstfil med en Google Authenticator URI på hver linje.</string>
     <string name="importer_help_steam"><b>Steam v3.0 og nyere understøttes ikke</b>. Levér en kopi af <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> fra den interne lagermappe i Steam.</string>
+    <string name="importer_help_stratum">Benyt en Stratum-eksportfil genereret via <b>Indstillinger -&gt; Sikkerhedskopiering -&gt; Sikkerhedskopiering til krypteret fil (anbefalet)</b>.</string>
     <string name="importer_help_totp_authenticator">Levér en TOTP Authenticator eksportfil.</string>
     <string name="importer_help_winauth">Levér en WinAuth eksportfil.</string>
+    <string name="import_assign_icons_dialog_title">Tildel ikoner</string>
+    <string name="import_assign_icons_dialog_text">Tildel ikoner til importerede poster?</string>
     <string name="importer_encrypted_exception_google_authenticator">Krypteret post blev oversprunget: %s</string>
     <string name="importer_help_direct">Importer poster direkte fra %s. Dette kræver at appen er installeret på denne enhed og at root-adgang gives til Aegis.</string>
     <string name="groups">Grupper</string>
@@ -460,23 +554,23 @@
     <string name="pref_account_name_position_hidden">Skjult</string>
     <string name="pref_account_name_position_end">Ved siden af udstederen</string>
     <string name="pref_account_name_position_below">Under udstederen</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d sekund siden</item>
         <item quantity="other">%d sekunder siden</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minut siden</item>
         <item quantity="other">%d minutter siden</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d time siden</item>
         <item quantity="other">%d timer siden</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d dag siden</item>
         <item quantity="other">%d dage siden</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d år siden</item>
         <item quantity="other">%d år siden</item>
     </plurals>
diff --git a/app/src/main/res/values-de-rDE-v29/strings.xml b/app/src/main/res/values-de-rDE-v29/strings.xml
new file mode 100644
index 00000000..b55e8009
--- /dev/null
+++ b/app/src/main/res/values-de-rDE-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Systemvorgabe</string>
+    <string name="system_amoled_theme_title">Systemvorgabe (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index b2cb48c0..a0b210df 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Einstellungen</string>
     <string name="action_about">Über</string>
     <string name="action_delete">Löschen</string>
     <string name="action_transfer">Übertragen</string>
     <string name="action_edit_icon">Symbol bearbeiten</string>
     <string name="action_reset_usage_count">Verwendungszähler zurücksetzen</string>
-    <string name="action_reset_usage_count_dialog">Möchtest du die Anzahl der Verwendungen dieses Eintrags auf 0 setzen?</string>
+    <string name="action_reset_usage_count_dialog">Den Verwendungszähler dieses Eintrags auf 0 setzen?</string>
     <string name="action_default_icon">Standardsymbol wiederherstellen</string>
     <string name="discard">Verwerfen</string>
     <string name="save">Speichern</string>
+    <string name="all">Alle</string>
     <string name="issuer">Herausgeber</string>
     <string name="yandex_pin">PIN (4–16 Ziffern)</string>
     <string name="motp_pin">PIN (4 Ziffern)</string>
@@ -26,27 +27,36 @@
     <string name="pref_section_appearance_summary">Das Design, die Sprache und andere Einstellungen anpassen, die das Erscheinungsbild der App betreffen.</string>
     <string name="pref_section_security_title">Sicherheit</string>
     <string name="pref_section_security_summary">Verschlüsselung, biometrisches Entsperren, automatisches Sperren und andere Sicherheitseinstellungen konfigurieren.</string>
-    <string name="pref_section_import_export_title">Importieren &amp; Exportieren</string>
-    <string name="pref_section_import_export_summary">Importiere Sicherungskopien von Aegis oder anderen Authentisierungs-Apps. Erstelle manuelle Exporte der Aegis-Datenbank.</string>
+    <string name="pref_section_import_export_title">Importieren und exportieren</string>
+    <string name="pref_section_import_export_summary">Sicherungskopien von Aegis oder anderen Authentifizierungs-Apps importieren und Exportdateien der Aegis-Datenbank erstellen.</string>
+    <string name="pref_section_audit_log_title">Audit-Log</string>
+    <string name="pref_section_audit_log_summary">Liste aller wichtigen Ereignisse, die innerhalb der App registriert wurden.</string>
     <string name="pref_section_backups_title">Sicherungen</string>
-    <string name="pref_section_backups_summary">Automatisierte Sicherungen an einem Speicherort deiner Wahl einrichten oder das Verwenden von Cloud-Back-ups durch Android einrichten.</string>
+    <string name="pref_section_backups_summary">Automatisierte Sicherungen zu einem gewünschten Speicherort einrichten oder das Android-eigenen Cloud-Sicherungssystems aktivieren.</string>
     <string name="pref_section_icon_packs">Symbolpakete</string>
     <string name="pref_section_icon_packs_summary">Symbolpakete verwalten und importieren.</string>
     <string name="pref_select_theme_title">Design</string>
+    <string name="pref_dynamic_colors_title">Dynamische Farben</string>
+    <string name="pref_dynamic_colors_summary">Design basierend auf den Systemfarben anpassen</string>
     <string name="pref_view_mode_title">Darstellungsstil</string>
     <string name="pref_lang_title">Sprache</string>
     <string name="pref_show_icons_title">Symbole anzeigen</string>
     <string name="pref_show_icons_summary">Symbole neben jedem Eintrag anzeigen</string>
     <string name="pref_code_group_size_title">Zifferngruppierung</string>
-    <string name="pref_code_group_size_summary">Wähle die Anzahl der Ziffern, nach denen die Codes gruppiert werden sollen</string>
+    <string name="pref_code_group_size_summary">Anzahl der Ziffern für das Gruppieren von Codes festlegen</string>
     <string name="pref_account_name_position_title">Kontonamen anzeigen</string>
-    <string name="pref_shared_issuer_account_name_title">Kontonamen nur anzeigen, wenn notwendig</string>
+    <string name="pref_show_next_code_title">Nächsten Code anzeigen</string>
+    <string name="pref_show_next_code_summary">Den nächsten Code im Voraus generieren und anzeigen</string>
+    <string name="pref_expiration_state_title">Ablaufende Codes kennzeichnen</string>
+    <string name="pref_expiration_state_summary">Ablaufende Codes mit einer anderen Farbe darstellen und blinken lassen</string>
+    <string name="pref_expiration_state_fallback">Ablaufende Codes mit einer anderen Farbe darstellen</string>
+    <string name="pref_shared_issuer_account_name_title">Kontonamen nur bei Bedarf anzeigen</string>
     <string name="pref_shared_issuer_account_name_summary">Kontonamen nur anzeigen, wenn sie denselben Herausgeber haben. Andere Kontonamen werden ausgeblendet.</string>
-    <string name="pref_account_name_position_summary_override">Diese Einstellung wird durch die Kachelansicht überschrieben. Kontonamen werden immer unterhalb des Herausgebers angezeigt.</string>
+    <string name="pref_account_name_position_summary_override">Diese Einstellung wird durch die Kachelansicht überschrieben. Der Kontoname wird unterhalb des Herausgebers angezeigt.</string>
     <string name="pref_import_file_title">Aus Datei importieren</string>
     <string name="pref_import_file_summary">Token aus einer Datei importieren</string>
-    <string name="pref_android_backups_title">Cloud-Back-ups durch Android</string>
-    <string name="pref_android_backups_summary">Erlaube das Cloud-Back-up durch Android, die Datenbank von Aegis in die Sicherungen aufzunehmen. Dies wird nur für verschlüsselte Datenbanken unterstützt.</string>
+    <string name="pref_android_backups_title">Cloud-Sicherungen von Android</string>
+    <string name="pref_android_backups_summary">Dem Cloud-Sicherungssystem von Android erlauben, die Datenbank von Aegis in die Sicherungen aufzunehmen. Das wird nur für verschlüsselte Datenbanken unterstützt.</string>
     <string name="pref_android_backups_hint"><i>Gerät-zu-Gerät-Sicherungen (D2D) sind immer erlaubt – unabhängig von der obigen Einstellung</i></string>
     <string name="pref_backups_title">Datenbank automatisch sichern</string>
     <string name="pref_backups_summary">Sicherungskopie der Datenbank automatisch bei Änderungen auf externem Speicher erstellen. Nur für verschlüsselte Datenbanken unterstützt.</string>
@@ -54,56 +64,90 @@
     <string name="pref_backups_reminder_summary">Erinnerung zur Sicherung der Datenbank anzeigen, falls die letzten Änderungen nicht gesichert wurden.</string>
     <string name="pref_backups_reminder_dialog_title">Erinnerung für Sicherungen deaktivieren</string>
     <string name="pref_backups_reminder_dialog_summary">Das Deaktivieren dieser Erinnerung bedeutet, dass Aegis nicht mitteilt, ob Änderungen vorgenommen wurden, die noch nicht gesichert sind. Dadurch besteht die Gefahr, dass der Zugriff auf deine Token verloren geht. Möchtest du die Erinnerung wirklich deaktivieren?</string>
-    <string name="pref_backups_location_title">Ordner für Sicherungsdateien</string>
+    <string name="pref_backups_versioning_strategy_title">Sicherungsstrategie</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Bestimmte Anzahl an Sicherungen behalten</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Einzelne Sicherung</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Die ausgewählte Sicherungsstrategie ist unzuverlässig und wird nicht empfohlen. Eine einzelne, fehlerhafte Sicherung könnte zum vollständigen Verlust führen.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Eine Sicherungsstrategie auswählen</string>
+    <string name="pref_backups_location_title">Speicherort für die Sicherungskopie</string>
     <string name="pref_backups_location_summary">Sicherungskopien werden gespeichert in</string>
-    <string name="pref_backups_trigger_title">Sicherungskopie auslösen</string>
-    <string name="pref_backups_trigger_summary">Löse manuell eine Sicherungskopie aus</string>
+    <string name="pref_backup_location_summary">Sicherungskopie wird gespeichert in</string>
+    <string name="pref_backups_trigger_title">Sicherung auslösen</string>
+    <string name="pref_backups_trigger_summary">Manuell eine Sicherung auslösen</string>
     <string name="pref_backups_versions_title">Anzahl der zu behaltenden Versionen</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
-        <item quantity="one">Behalte %1$d Version der Sicherung</item>
-        <item quantity="other">Behalte %1$d Versionen der Sicherung</item>
+        <item quantity="one">%1$d Version der Sicherungsdatei speichern</item>
+        <item quantity="other">%1$d Versionen der Sicherungsdatei speichern</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Unendlich viele Versionen der Sicherungsdatei speichern</string>
     <string name="pref_import_app_title">Aus App importieren</string>
     <string name="pref_import_app_summary">Token aus einer App importieren (benötigt Root-Zugriff)</string>
     <string name="pref_export_title">Exportieren</string>
-    <string name="pref_export_summary">Exportiere die Datenbank</string>
+    <string name="pref_export_summary">Datenbank exportieren</string>
     <string name="pref_password_reminder_title">Passworterinnerung</string>
-    <string name="pref_google_auth_export_title">Export für Google Authenticator</string>
+    <string name="pref_google_auth_export_title">Für Google Authenticator exportieren</string>
     <string name="pref_google_auth_export_descriptor">Generiert QR-Codes zum Exportieren, die mit Google Authenticator kompatibel sind</string>
     <string name="pref_google_auth_export_no_data">Keine Daten zu exportieren</string>
     <plurals name="pref_google_auth_export_incompatible_entries">
         <item quantity="one">%d inkompatibler Eintrag wurde übersprungen</item>
         <item quantity="other">%d inkompatible Einträge wurden übersprungen</item>
     </plurals>
-    <string name="pref_password_reminder_summary">Zeigt %s eine Erinnerung zur Eingabe des Passworts an, damit du es nicht vergisst.</string>
+    <string name="pref_password_reminder_summary">Zeigt %s eine Erinnerung zur Eingabe des Passworts an, damit es nicht vergessen wird.</string>
     <string name="pref_password_reminder_summary_disabled">Deaktiviert</string>
     <string name="pref_secure_screen_title">Bildschirmsicherheit</string>
-    <string name="pref_secure_screen_summary">Blockiere Bildschirmfotos und andere Versuche, den Bildschirm innerhalb der App aufzunehmen</string>
+    <string name="pref_secure_screen_summary">Bildschirmfotos und andere Aufnahmeversuche innerhalb der App blockieren</string>
     <string name="pref_tap_to_reveal_title">Zum Aufdecken antippen</string>
-    <string name="pref_tap_to_reveal_summary">Token werden standardmäßig ausgeblendet. Tippe auf die Token, um den Code anzuzeigen.</string>
-    <string name="pref_tap_to_reveal_time_title">Zeitüberschreitung für die Anzeige durch Antippen</string>
-    <string name="pref_auto_lock_title">Automatische Sperre</string>
+    <string name="pref_tap_to_reveal_summary">Token werden standardmäßig ausgeblendet. Der Code wird durch Antippen des Tokens sichtbar.</string>
+    <string name="pref_tap_to_reveal_time_title">Zeitlimit für aufgedeckte Token</string>
+    <string name="pref_auto_lock_title">Automatisches Sperren</string>
     <string name="pref_auto_lock_summary">Wenn %s</string>
     <string name="pref_auto_lock_summary_disabled">Deaktiviert</string>
     <string name="pref_auto_lock_prompt">Aegis automatisch sperren, wenn</string>
-    <string name="pref_auto_lock_type_back_button">Die Zurück-Taste gedrückt wird</string>
+    <string name="pref_auto_lock_type_back_button">Die \"Zurück-Taste\" gedrückt wird</string>
     <string name="pref_auto_lock_type_minimize">Die App minimiert wird</string>
     <string name="pref_auto_lock_type_device_lock">Das Gerät gesperrt wird</string>
-    <string name="pref_backup_password_category">Sicherung &amp; Exportieren</string>
-    <string name="pref_backup_password_title">Separates Passwort für Sicherung &amp; Exportieren</string>
-    <string name="pref_backup_password_summary">Wenn diese Option aktiviert ist, kann das Passwort, das zum Entsperren der App verwendet wird, nicht mehr zum Entschlüsseln von Sicherungen und Exporten verwendet werden.</string>
-    <string name="pref_backup_password_change_title">Passwort für Sicherungen &amp; Exportieren ändern</string>
+    <string name="pref_backup_password_category">Sicherung und Exportdatei</string>
+    <string name="pref_backup_password_title">Separates Passwort für Sicherung und Exportdatei</string>
+    <string name="pref_backup_password_summary">Wenn diese Option aktiviert ist, kann das Passwort, das zum Entsperren der App verwendet wird, nicht mehr zum Entschlüsseln von Sicherungen und Exportdateien verwendet werden.</string>
+    <string name="pref_backup_password_change_title">Passwort für Sicherung und Exportdatei ändern</string>
     <string name="pref_backup_password_change_summary">Gib ein neues Passwort ein, mit dem die Datenbank während der Sicherung und des Exportierens verschlüsselt wird.</string>
     <string name="pref_encryption_title">Verschlüsselung</string>
-    <string name="pref_encryption_summary">Verschlüssele die Datenbank und entsperre sie mit einem Passwort oder biometrischen Daten</string>
+    <string name="pref_encryption_summary">Datenbank verschlüsseln und sie mittels eines Passworts oder biometrischen Daten entsperren</string>
     <string name="pref_biometrics_title">Biometrisches Entsperren</string>
-    <string name="pref_biometrics_summary">Erlaube die biometrische Authentisierung zum Entsperren der Datenbank</string>
+    <string name="pref_biometrics_summary">Biometrische Authentifizierung zum Entsperren der Datenbank erlauben</string>
+    <string name="pref_search_behavior_summary">Durchsuchen: %s</string>
+    <string name="pref_search_behavior_prompt">Folgende Felder durchsuchen</string>
+    <string name="pref_search_behavior_type_name">Name</string>
+    <string name="pref_search_behavior_type_issuer">Herausgeber</string>
+    <string name="pref_search_behavior_type_note">Notiz</string>
+    <string name="pref_search_behavior_type_groups">Gruppen</string>
     <string name="pref_set_password_title">Passwort ändern</string>
-    <string name="pref_set_password_summary">Lege ein neues Passwort fest, das erforderlich ist, um die Datenbank zu entsperren</string>
+    <string name="pref_set_password_summary">Ein neues Passwort zum Entsperren der Datenbank festlegen</string>
+    <string name="no_events_title">Keine gemeldeten Ereignisse</string>
+    <string name="no_events_description">Es wurden keine wichtigen Ereignisse innerhalb der App gemeldet</string>
+    <string name="event_title_vault_unlocked">Datenbank entsperrt</string>
+    <string name="event_description_vault_unlocked">Die Datenbank wurde erfolgreich entsperrt</string>
+    <string name="event_title_backup_created">Sicherungsdatei erstellt</string>
+    <string name="event_description_backup_created">Eine Sicherungsdatei wurde erfolgreich erstellt</string>
+    <string name="event_title_android_backup_created">Sicherungsdatei von Android erstellt</string>
+    <string name="event_description_android_backup_created">Eine Sicherungsdatei wurde erfolgreich von Android erstellt</string>
+    <string name="event_title_vault_exported">Datenbank exportiert</string>
+    <string name="event_description_vault_exported">Eine Kopie der Datenbank wurde exportiert</string>
+    <string name="event_title_entry_shared">Eintrag geteilt</string>
+    <string name="event_description_entry_shared">Ein Eintrag wurde geteilt</string>
+    <string name="event_title_vault_unlock_failed_password">Entsperren der Datenbank fehlgeschlagen (Passwort)</string>
+    <string name="event_description_vault_unlock_failed_password">Ein Versuch, die Datenbank mit dem Passwort zu entsperren, schlug fehl</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Entsperren der Datenbank fehlgeschlagen (Biometrie)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Ein Versuch, die Datenbank mittels Biometrie zu entsperren, schlug fehl</string>
+    <string name="event_unknown">Unbekanntes Ereignis</string>
+    <string name="audit_log_entry_deleted">(gelöscht)</string>
+    <string name="today_at_time">Heute um %1$s</string>
+    <string name="day_of_week_at_time">%1$s um %2$s</string>
     <string name="export_encrypted">Datenbank verschlüsseln</string>
     <string name="export_help">Mit dieser Aktion wird die Datenbank aus dem internen Speicher von Aegis exportiert. Wähle das Format aus, in dem der Export erfolgen soll:</string>
     <string name="export_warning_unencrypted">Du bist dabei, eine unverschlüsselte Kopie deiner Aegis-Datenbank zu exportieren. <b>Dies wird nicht empfohlen</b>.</string>
-    <string name="export_warning_password">Exporte werden mit einem separaten Passwort verschlüsselt, das in den Sicherheitseinstellungen konfiguriert wurde.</string>
+    <string name="export_warning_password">Exportdateien werden mit einem separaten Passwort verschlüsselt, das in den Sicherheitseinstellungen konfiguriert wurde.</string>
     <string name="understand_risk_accept">Ich bin mir des Risikos bewusst</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
     <string name="export_format_google_auth_uri">Textdatei (.TXT)</string>
@@ -116,7 +160,7 @@
         <item quantity="other">%d Gruppen ausgewählt</item>
     </plurals>
     <string name="export_no_groups_selected">Keine Gruppen zum Exportieren ausgewählt</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator-Export</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis-Authenticator-Exportdatei</string>
     <string name="choose_authentication_method">Sicherheit</string>
     <string name="authentication_method_explanation">Aegis ist eine auf Sicherheit ausgerichtete 2FA-App. Die Token werden in einer Datenbank gespeichert, die optional mit einem Passwort deiner Wahl verschlüsselt werden kann. Wenn ein Angreifer an deine verschlüsselte Datenbankdatei gelangt, kann er ohne Kenntnis des Passworts nicht auf den Inhalt zugreifen.\n\nWir haben die Optionen voreingestellt, die unserer Meinung nach am besten zu deinem Gerät passen.</string>
     <string name="authentication_method_none">Keine</string>
@@ -129,9 +173,9 @@
     <string name="authentication">Datenbank entsperren</string>
     <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Datenbank\nentsperren</string>
     <string name="auth_use_biometrics">Stattdessen <font fgcolor="#FF0D86C1">biometrische Daten</font> verwenden</string>
-    <string name="set_password">Bitte gib ein Passwort ein</string>
-    <string name="set_group">Bitte gib einen Gruppennamen ein</string>
-    <string name="set_number">Bitte gib eine Zahl ein</string>
+    <string name="set_password">Passwort eingeben</string>
+    <string name="set_group">Gruppennamen eingeben</string>
+    <string name="set_number">Eine Zahl eingeben</string>
     <string name="set_password_confirm">Bitte bestätige das Passwort</string>
     <string name="invalid_password">Das Passwort ist falsch</string>
     <string name="invalidated_biometrics">Es wurde eine Änderung in den Sicherheitseinstellungen deines Geräts erkannt. Bitte navigiere zu »Aegis -&gt; Einstellungen -&gt; Sicherheit -&gt; Biometrisches Entsperren«, um biometrisches Entsperren zu deaktivieren und wieder zu aktivieren.</string>
@@ -143,8 +187,8 @@
     <string name="password_reminder_freq_biweekly">alle 2 Wochen</string>
     <string name="password_reminder_freq_monthly">monatlich</string>
     <string name="password_reminder_freq_quarterly">vierteljährlich</string>
-    <string name="enter_password_2fas_message">Es sieht so aus, als ob diese 2FAS-Sicherung verschlüsselt ist. Bitte gib das Passwort unten ein.</string>
-    <string name="enter_password_authy_message">Es sieht so aus, als ob deine Authy-Token verschlüsselt sind. Bitte schließe Aegis, öffne Authy und entsperre die Token mit deinem Passwort. Ebenfalls kann Aegis versuchen, deine Authy-Token zu entschlüsseln, wenn du unten dein Passwort eingibst.</string>
+    <string name="enter_password_2fas_message">Es sieht so aus, als ob diese 2FAS-Sicherung verschlüsselt ist. Bitte das Passwort unten eingeben.</string>
+    <string name="enter_password_authy_message">Es sieht so aus, als ob deine Authy-Token verschlüsselt sind. Bitte schließe Aegis, öffne Authy und entsperre die Token mit deinem Passwort. Aegis kann ebenfalls versuchen, deine Authy-Token zu entschlüsseln, wenn du unten dein Passwort eingibst.</string>
     <string name="enter_password_aegis_title">Gib das Passwort der zu importierenden Datenbank ein</string>
     <string name="period_hint">Zeitraum (Sekunden)</string>
     <string name="algorithm_hint">Hashfunktion</string>
@@ -152,6 +196,7 @@
     <string name="share">Teilen</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
+    <string name="undo">Rückgängig machen</string>
     <string name="unlock">Entsperren</string>
     <string name="advanced">Fortgeschritten</string>
     <string name="counter">Zähler</string>
@@ -163,6 +208,11 @@
     <string name="set_up_biometric">Biometrisches Entsperren einrichten</string>
     <string name="copy">Kopieren</string>
     <string name="edit">Bearbeiten</string>
+    <string name="select_all">Alle auswählen</string>
+    <string name="assign_icons">Symbole zuweisen</string>
+    <string name="assign_groups">Einer Gruppe zuweisen</string>
+    <string name="assign_groups_dialog_summary">Wähle eine Gruppe aus, die du den ausgewählten Einträgen zuweisen möchtest.</string>
+    <string name="assign_groups_dialog_dropdown">Gruppe auswählen</string>
     <string name="favorite" comment="Verb">Zu Favoriten hinzufügen</string>
     <string name="unfavorite" comment="Verb">Aus Favoriten entfernen</string>
     <string name="error_all_caps">FEHLER</string>
@@ -174,13 +224,15 @@
     <string name="unlock_vault_error">Die Datenbank konnte nicht entsperrt werden</string>
     <string name="unlock_vault_error_description">Falsches Passwort. Achte darauf, dass du dein Passwort nicht falsch eingibst.</string>
     <string name="password_equality_error">Passwörter sollten identisch und nicht leer sein</string>
-    <string name="snackbar_authentication_method">Bitte wähle eine Authentisierungsmethode aus</string>
+    <string name="snackbar_authentication_method">Bitte wähle eine Authentifizierungsmethode aus</string>
     <string name="encrypting_vault">Verschlüsselung der Datenbank</string>
     <string name="exporting_vault">Exportieren der Datenbank</string>
+    <string name="optimizing_icon">Symbol wird optimiert</string>
+    <string name="optimizing_icon_multiple">Symbol %1$d/%2$d wird optimiert</string>
     <string name="reading_file">Datei wird gelesen</string>
     <string name="requesting_root_access">Root-Zugriff wird angefordert</string>
     <string name="analyzing_qr">QR-Code wird analysiert</string>
-    <string name="analyzing_qr_multiple">QR-Code %d/%d (%s) wird analysiert</string>
+    <string name="analyzing_qr_multiple">QR-Code %1$d von %2$d (%3$s) wird analysiert …</string>
     <plurals name="added_new_entries">
         <item quantity="one">%d neuer Eintrag zur Datenbank hinzugefügt</item>
         <item quantity="other">%d neue Einträge zur Datenbank hinzugefügt</item>
@@ -197,6 +249,7 @@
     <string name="discard_changes">Änderungen verwerfen?</string>
     <string name="discard_changes_description">Deine Änderungen wurden noch nicht gespeichert</string>
     <string name="saving_profile_error">Fehler beim Speichern des Profils</string>
+    <string name="saving_assign_icons_error">Fehler beim Zuweisen der Symbole</string>
     <string name="welcome">Willkommen</string>
     <string name="app_description">Aegis ist eine kostenlose, sichere und quelloffene 2FA-App</string>
     <string name="setup_completed">Einrichtung abgeschlossen</string>
@@ -205,14 +258,15 @@
     <string name="copied">Kopiert</string>
     <string name="errors_copied">Fehlermeldungen in die Zwischenablage kopiert</string>
     <string name="version_copied">Version in die Zwischenablage kopiert</string>
+    <string name="error_required_field">Pflichtfeld</string>
     <string name="error_occurred">Ein Fehler ist aufgetreten</string>
     <string name="decryption_error">Beim Entsperren der Datenbank ist ein Fehler aufgetreten</string>
     <string name="decryption_corrupt_error">Beim Entsperren der Datenbank ist ein Fehler aufgetreten. Deine Datenbankdatei könnte beschädigt sein.</string>
     <string name="saving_error">Beim Speichern der Datenbank ist ein Fehler aufgetreten</string>
     <string name="vault_init_error">Beim Initialisieren der Datenbank ist ein Fehler aufgetreten</string>
     <string name="vault_load_error">Beim Laden der Datenbank aus dem Speicher ist ein Fehler aufgetreten</string>
-    <string name="biometric_decrypt_error">Beim Versuch, die Datenbank mit biometrischer Authentisierung zu entschlüsseln, ist ein Fehler aufgetreten. Dies geschieht in der Regel nur, wenn die Sicherheitseinstellungen deines Geräts geändert wurden. Bitte entsperre die Datenbank mit deinem Passwort und konfiguriere die biometrische Authentisierung in den Einstellungen von Aegis neu.</string>
-    <string name="biometric_init_error">Beim Versuch, die biometrische Authentisierung vorzubereiten, ist ein Fehler aufgetreten. Dies geschieht in der Regel nur, wenn die Sicherheitseinstellungen deines Geräts geändert wurden. Bitte entsperre die Datenbank mit deinem Passwort und konfiguriere die biometrische Authentisierung in den Einstellungen von Aegis neu.</string>
+    <string name="biometric_decrypt_error">Beim Versuch, die Datenbank mit biometrischer Authentifizierung zu entschlüsseln, ist ein Fehler aufgetreten. Dies geschieht in der Regel nur, wenn die Sicherheitseinstellungen deines Geräts geändert wurden. Bitte entsperre die Datenbank mit deinem Passwort und konfiguriere die biometrische Authentifizierung in den Einstellungen von Aegis neu.</string>
+    <string name="biometric_init_error">Beim Versuch, die biometrische Authentifizierung vorzubereiten, ist ein Fehler aufgetreten. Dies geschieht in der Regel nur, wenn die Sicherheitseinstellungen deines Geräts geändert wurden. Bitte entsperre die Datenbank mit deinem Passwort und konfiguriere die biometrische Authentifizierung in den Einstellungen von Aegis neu.</string>
     <string name="disable_encryption">Verschlüsselung deaktivieren</string>
     <string name="disable_encryption_description">Möchtest du die Verschlüsselung wirklich deaktivieren? Dadurch wird die Datenbank im Klartext gespeichert. <b>Automatisierte Sicherungen werden ebenfalls deaktiviert</b>.</string>
     <string name="enable_encryption_error">Bei der Aktivierung der Verschlüsselung ist ein Fehler aufgetreten</string>
@@ -261,22 +315,27 @@
     <string name="exporting_vault_error">Beim Exportieren der Datenbank ist ein Fehler aufgetreten</string>
     <string name="exported_vault">Die Datenbank wurde exportiert</string>
     <string name="encryption_set_password_error">Beim Festlegen des Passworts ist ein Fehler aufgetreten.</string>
-    <string name="encryption_enable_biometrics_error">Beim Versuch, biometrisches Entsperren zu aktivieren, ist ein Fehler aufgetreten. Einige Geräte haben eine schlechte Implementierung der biometrischen Authentisierung und es ist wahrscheinlich, dass dieses Gerät dazu gehört. Ziehe stattdessen in Betracht, zu einer Konfiguration zu wechseln, die auf ein Passwort basiert.</string>
+    <string name="encryption_enable_biometrics_error">Beim Versuch, biometrisches Entsperren zu aktivieren, ist ein Fehler aufgetreten. Einige Geräte haben eine schlechte Implementierung der biometrischen Authentifizierung und es ist wahrscheinlich, dass dieses Gerät dazugehört. Erwäge stattdessen den Wechsel zu einer nur passwortbasierten Konfiguration.</string>
     <string name="no_cameras_available">Keine Kameras verfügbar</string>
     <string name="read_qr_error">Beim Lesen des QR-Codes ist ein Fehler aufgetreten</string>
     <string name="read_qr_error_phonefactor">Aegis ist nicht mit dem proprietären 2FA-Algorithmus von Microsoft kompatibel. Bitte vergewissere dich, dass du bei der Konfiguration von 2FA in Office 365 »Anwendung ohne Benachrichtigungen einrichten« auswählst.</string>
     <string name="partial_google_auth_import">Unvollständiger Google Authenticator-Export erkannt</string>
     <string name="partial_google_auth_import_warning">Einige QR-Codes fehlen in deinem Importversuch. Die folgenden Codes wurden nicht gefunden:\n\n<b>%s</b>\n\nDu kannst mit dem Importieren dieses Teilexports fortfahren, aber wir empfehlen es mit allen QR-Codes erneut zu versuchen, damit du nicht riskierst, den Zugriff auf Token zu verlieren.</string>
     <string name="missing_qr_code_descriptor">• QR-Code %d</string>
-    <string name="import_partial_export_anyway">%d Token trotzdem importieren</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">%d Token trotzdem importieren</item>
+        <item quantity="other">%d Token trotzdem importieren</item>
+    </plurals>
     <string name="import_google_auth_failure">Importieren von Google Authenticator-Export fehlgeschlagen</string>
-    <string name="unrelated_google_auth_batches_error">Der Export enthält Informationen über ein nicht zugehöriges Set. Versuche, jeweils 1 Set zu importieren.</string>
+    <string name="unrelated_google_auth_batches_error">Die Exportdatei enthält Informationen über ein nicht zugehöriges Set. Versuche, jeweils 1 Set zu importieren.</string>
     <string name="no_tokens_can_be_imported">Daher können keine Token importiert werden</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Entsperren der Datenbank</string>
-    <string name="slot_this_device">(Dieses Gerät)</string>
+    <string name="rename_group">Gruppe umbenennen</string>
+    <string name="no_group_selection">Wenn ein Eintrag keiner Gruppe zugewiesen ist, befindet er sich unter »Keine Gruppe«.</string>
     <string name="remove_group">Gruppe entfernen</string>
     <string name="remove_group_description">Möchtest du diese Gruppe wirklich entfernen? Einträge in dieser Gruppe wechseln automatisch zu »Keine Gruppe«.</string>
+    <string name="remove_unused_groups">Nicht verwendete Gruppen löschen</string>
+    <string name="remove_unused_groups_description">Möchtest du wirklich alle Gruppen löschen, die keinem Eintrag zugewiesen sind?</string>
     <string name="remove_icon_pack">Symbolpaket entfernen</string>
     <string name="remove_icon_pack_description">Möchtest du dieses Symbolpaket wirklich entfernen? Einträge, die Symbole aus diesem Paket verwenden, sind davon nicht betroffen.</string>
     <string name="details">Details</string>
@@ -284,28 +343,49 @@
     <string name="lock">Sperren</string>
     <string name="name">Name</string>
     <string name="no_group">Keine Gruppe</string>
-    <string name="sort">Sortieren</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sortieren</string>
     <string name="sort_alphabetically">Herausgeber (A bis Z)</string>
     <string name="sort_alphabetically_reverse">Herausgeber (Z bis A)</string>
     <string name="sort_alphabetically_name">Konto (A bis Z)</string>
     <string name="sort_alphabetically_name_reverse">Konto (Z bis A)</string>
     <string name="sort_usage_count">Verwendungszähler</string>
+    <string name="sort_last_used">Zuletzt verwendet</string>
     <string name="sort_custom">Benutzerdefiniert</string>
+    <string name="last_used">Zuletzt verwendet</string>
+    <string name="last_used_never">niemals</string>
     <string name="new_group">Neue Gruppe …</string>
     <string name="group">Gruppe</string>
     <string name="group_name_hint">Gruppenname</string>
     <string name="preference_manage_groups">Gruppen bearbeiten</string>
-    <string name="preference_manage_groups_summary">Verwalte und lösche deine Gruppen hier</string>
+    <string name="preference_manage_groups_summary">Verwalten und Löschen von Gruppen</string>
     <string name="preference_reset_usage_count">Verwendungszähler zurücksetzen</string>
-    <string name="preference_reset_usage_count_summary">Anzahl der Verwendungen für jeden Eintrag in der Datenbank zurücksetzen</string>
-    <string name="preference_reset_usage_count_dialog">Möchtest du die Anzahl der Verwendungen aller Einträge in deiner Datenbank auf 0 setzen?</string>
-    <string name="note">Notiz</string>
+    <string name="preference_reset_usage_count_summary">Verwendungszähler für jeden Eintrag in der Datenbank zurücksetzen</string>
+    <string name="preference_reset_usage_count_dialog">Den Verwendungszähler aller Einträge in der Datenbank auf 0 setzen?</string>
+    <string name="note" comment="Users can add a note to an entry">Notiz</string>
     <string name="clear">Löschen</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Eintrag bereits vorhanden</string>
+    <string name="dialog_duplicate_entry_message">Dieser Eintrag hat den gleichen Namen und Herausgeber wie ein oder mehrere bestehende Einträge. Wie möchtest du fortfahren?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Vorhandene(n) Eintrag/Einträge überschreiben</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Vorhandene(n) Eintrag/Einträge durch den neuen ersetzen. Die Aktion kann nicht rückgängig gemacht werden</string>
+    <string name="dialog_duplicate_entry_suffix_title">Suffix hinzufügen</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Dem Namen des neuen Eintrags ein Suffix hinzufügen. Der neue Name lautet: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Nicht speichern</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Ermöglicht das Bearbeiten des Eintrags, um ihn anschließend erneut zu speichern</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Möchtest du wirklich %d Eintrag mit folgendem Namen löschen?\n\n%s – %s</item>
+        <item quantity="other">Möchtest du wirklich %d Einträge mit folgendem Namen löschen?\n\n%s – %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Löschen bestätigen</string>
+    <string name="pref_haptic_feedback_summary">Gerät vibrieren lassen, wenn sich Codes aktualisieren</string>
+    <string name="pref_haptic_feedback_title">Haptisches Feedback</string>
     <string name="pref_highlight_entry_title">Token beim Antippen hervorheben</string>
     <string name="pref_highlight_entry_summary">Token beim Antippen hervorheben, um sie leichter voneinander unterscheiden zu können</string>
+    <string name="pref_groups_multiselect_title">Mehrere Gruppen auswählen</string>
+    <string name="pref_groups_multiselect_summary">Das Auswählen mehrerer Gruppen auf einmal ermöglichen</string>
     <string name="pref_minimize_on_copy_title">Beim Kopieren minimieren</string>
     <string name="pref_minimize_on_copy_summary">App nach dem Kopieren eines Tokens minimieren</string>
     <string name="pref_copy_behavior_title">Token in die Zwischenablage kopieren</string>
+    <string name="pref_search_behavior_title">Suchverhalten</string>
     <string name="pref_pause_entry_title">Token beim Antippen einfrieren</string>
     <string name="pref_pause_entry_summary">Automatisches Aktualisieren der Token durch Antippen anhalten. Die Token werden nicht aktualisiert, solange sie hervorgehoben sind. Erfordert »Token beim Antippen hervorheben« oder »Zum Aufdecken antippen«.</string>
     <string name="pin_keyboard_description">Gib dein Passwort ein, um die PIN-Tastatur zu aktivieren. Beachte, dass dies nur funktioniert, wenn dein Passwort nur aus Zahlen besteht</string>
@@ -316,8 +396,8 @@
     <string name="dark_theme_title">Dunkles Design</string>
     <string name="light_theme_title">Helles Design</string>
     <string name="amoled_theme_title">AMOLED-Design</string>
-    <string name="system_theme_title">Durch Energiesparmodus bestimmt</string>
-    <string name="system_amoled_theme_title">Durch Energiesparmodus bestimmt (AMOLED)</string>
+    <string name="system_theme_title">Durch Energiesparmodus festgelegt</string>
+    <string name="system_amoled_theme_title">Durch Energiesparmodus festgelegt (AMOLED)</string>
     <string name="normal_viewmode_title">Normal</string>
     <string name="compact_mode_title">Kompakt</string>
     <string name="small_mode_title">Klein</string>
@@ -325,13 +405,13 @@
     <string name="unknown_issuer">Unbekannter Herausgeber</string>
     <string name="unknown_account_name">Unbekannter Kontoname</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis konnte %d Token nicht importieren. Dieser Token wird übersprungen. Klicke auf Details, um weitere Informationen über die Fehler zu erhalten.</item>
-        <item quantity="other">Aegis konnte %d Token nicht importieren. Diese Token werden übersprungen. Klicke auf Details, um weitere Informationen über die Fehler zu erhalten.</item>
+        <item quantity="one">Aegis konnte %d Token nicht importieren. Dieser Token wird übersprungen. Drücke auf »Details«, um weitere Informationen über diesen Fehler zu erhalten.</item>
+        <item quantity="other">Aegis konnte %d Token nicht importieren. Diese Token werden übersprungen. Drücke auf »Details«, um weitere Informationen über diese Fehler zu erhalten.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Deep-Link konnte nicht verarbeitet werden</string>
     <string name="unable_to_read_qrcode_file">QR-Code konnte nicht aus der Datei gelesen und verarbeitet werden: %s.</string>
     <string name="unable_to_process_shared_text">Gemeinsamer Text kann nicht als OTP verarbeitet werden</string>
-    <string name="unable_to_read_qrcode_files">Einige der QR-Codes konnten nicht gelesen und verarbeitet werden. Nur %d/%d Einträge werden importiert.</string>
+    <string name="unable_to_read_qrcode_files">Einige der QR-Codes konnten nicht gelesen und verarbeitet werden. Nur %1$d von %2$d Einträge werden importiert.</string>
     <string name="unable_to_generate_qrcode">QR-Code konnte nicht generiert werden</string>
     <string name="select_picture">Bild auswählen</string>
     <string name="select_icon">Symbol auswählen</string>
@@ -348,12 +428,12 @@
     <string name="github_description">Quellcode, Probleme und Informationen</string>
     <string name="license">Lizenz</string>
     <string name="license_description">Aegis Authenticator ist lizenziert unter GPLv3</string>
-    <string name="third_party_licenses">Drittanbieter-Lizenzen</string>
-    <string name="third_party_licenses_description">Lizenzen der Drittanbieter-Bibliotheken, die Aegis verwendet</string>
+    <string name="third_party_licenses">Lizenzen von Dritten</string>
+    <string name="third_party_licenses_description">Lizenzen für die von Aegis verwendeten Bibliotheken von Dritten</string>
     <string name="country_netherlands">Niederlande</string>
     <string name="email_us">Eine E-Mail schreiben</string>
-    <string name="visit_website">Besuche unsere Website</string>
-    <string name="about_support">Support</string>
+    <string name="visit_website">Unsere Website besuchen</string>
+    <string name="about_support">Unterstützung</string>
     <string name="support_rate">Bewerten</string>
     <string name="support_rate_description">Unterstütze uns, indem du eine Bewertung im Google Play Store hinterlässt</string>
     <string name="webview_error">Dieses Gerät unterstützt kein WebView, das zum Anzeigen des Änderungsprotokolls und der Lizenz erforderlich ist. Es fehlt eine Systemkomponente.</string>
@@ -363,15 +443,17 @@
     <string name="time_sync_warning_disable">Höre auf, mich zu warnen. Ich weiß, was ich tue.</string>
     <string name="google_qr_export_unrelated">Nicht zugehöriger QR-Code gefunden. Versuche, den Scanner neu zu starten.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">1 QR-Code gescannt</item>
-        <item quantity="other">%d/%d QR-Codes gescannt</item>
+        <item quantity="one">%1$d von %2$d QR-Code gescannt</item>
+        <item quantity="other">%1$d von %2$d QR-Codes gescannt</item>
     </plurals>
-    <string name="google_qr_export_unexpected">QR-Code #%d erwartet, stattdessen wurde #%d gescannt</string>
+    <string name="google_qr_export_unexpected">QR-Code Nr. %1$d erwartet, stattdessen wurde Nr. %2$d gescannt</string>
     <string name="backup_error_bar_message"><b>Sicherungskopie ist kürzlich fehlgeschlagen</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Ein kürzlicher Sicherungsversuch der Datenbank mit %s ist fehlgeschlagen, da ein Fehler aufgetreten ist. Die Sicherung wurde am %s versucht. Bitte überprüfe deine Sicherungseinstellungen, um sicherzustellen, dass Sicherungen erfolgreich abgeschlossen werden können.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Ein kürzlicher Sicherungsversuch der Datenbank mit %1$s ist fehlgeschlagen, da ein Fehler aufgetreten ist. Das Erstellen einer Sicherung wurde am %2$s versucht. Bitte überprüfe deine Sicherungseinstellungen, damit Sicherungen erfolgreich abgeschlossen werden können.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Ein kürzlicher Sicherungsversuch der Datenbank mit %1$s ist fehlgeschlagen, da Aegis keine Berechtigung zum Schreiben auf das Sicherungsziel hatte. Das Erstellen einer Sicherung wurde am %2$s versucht. Dieser Fehler kann auftreten, wenn das Sicherungsziel verschoben/umbenannt wurde oder wenn Aegis kürzlich aus einer Sicherung wiederhergestellt wurde. Bitte konfiguriere das Sicherungsziel neu.
     </string>
     <string name="backup_system_builtin">Automatisierte Sicherungen von Aegis</string>
-    <string name="backup_system_android">Cloud-Back-ups durch Android</string>
+    <string name="backup_system_android">Cloud-Sicherungssystem von Android</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Die letzte Sicherung ist veraltet (%s)
     </string>
     <string name="backup_reminder_bar_message">        Änderungen wurden noch nicht gesichert
@@ -388,7 +470,7 @@
     <string name="empty_list_title">Keine Einträge gefunden</string>
     <string name="empty_group_list">Es gibt keine anzuzeigenden Gruppen. Füge Gruppen im Bearbeitungsbildschirm eines Eintrags hinzu</string>
     <string name="empty_group_list_title">Keine Gruppen gefunden</string>
-    <string name="no_icon_packs">Bisher wurden noch keine Symbolpakete importiert. Tippe auf das Plus-Zeichen, um eins zu importieren. Tipp: Probiere <a href="https://aegis-icons.github.io">Aegis-Icons</a>.</string>
+    <string name="no_icon_packs">Bisher wurden noch keine Symbolpakete importiert. Tippe auf das Plus-Zeichen, um eines zu importieren. Tipp: Probiere <a href="https://aegis-icons.github.io">Aegis-Icons</a>.</string>
     <string name="no_icon_packs_title">Keine Symbolpakete</string>
     <string name="pick_icon">Wähle ein Symbol aus</string>
     <string name="uncategorized">Nicht kategorisiert</string>
@@ -402,48 +484,60 @@
     <string name="copy_uri">URI kopieren</string>
     <string name="unable_to_copy_uri_to_clipboard">URI konnte nicht in die Zwischenablage kopiert werden</string>
     <string name="uri_copied_to_clipboard">URI in die Zwischenablage kopiert</string>
-    <string name="transfer_entry">Eintrag übertragen</string>
-    <string name="transfer_entry_description">Scanne diesen QR-Code mit der Authentisierungs-App, zu der du diesen Eintrag übertragen möchtest</string>
-    <string name="google_auth_compatible_transfer_description">Scanne diese QR-Codes mit Aegis oder Google Authenticator.\n\nAufgrund der Einschränkungen der Google Authenticator-App sind nur TOTP- &amp; HOTP-Token enthalten, die SHA1 verwenden und 6-stellige Codes erzeugen</string>
+    <string name="transfer_entry_description">Scanne diesen QR-Code mit der Authentifizierungs-App, zu der du diesen Eintrag übertragen möchtest</string>
+    <string name="transfer_entry_brightness">QR-Code antippen, um die Helligkeit zu ändern</string>
+    <string name="google_auth_compatible_transfer_description">Scanne diese QR-Codes mit Aegis oder Google Authenticator.\n\nAufgrund der Einschränkungen der Google Authenticator-App sind nur TOTP- und HOTP-Token enthalten, die SHA1 verwenden und 6-stellige Codes erzeugen</string>
     <string name="password_strength_very_weak">Sehr schwach</string>
     <string name="password_strength_weak">Schwach</string>
     <string name="password_strength_fair">Mittel</string>
     <string name="password_strength_good">Gut</string>
     <string name="password_strength_strong">Sicher</string>
+    <string name="password_strength_unknown">Passwort ist für das Bestimmen der Qualität zu lang</string>
     <string name="pref_pin_keyboard_title">PIN-Tastatur auf Sperrbildschirm verwenden</string>
-    <string name="pref_pin_keyboard_summary">Aktivieren, um die PIN-Tastatur auf dem Sperrbildschirm zu aktivieren. Das funktioniert nur bei numerischen Passwörtern</string>
+    <string name="pref_pin_keyboard_summary">PIN-Tastatur auf dem Sperrbildschirm aktivieren. Das funktioniert nur bei numerischen Passwörtern</string>
     <string name="title_activity_preferences">Einstellungen</string>
     <string name="title_activity_manage_groups">Gruppen verwalten</string>
     <string name="title_activity_transfer">Einträge übertragen</string>
     <string name="title_activity_about">Über</string>
     <string name="title_activity_edit_entry">Eintrag bearbeiten</string>
     <string name="title_activity_scan_qr">Scanne einen QR-Code</string>
-    <string name="title_activity_manage_slots">Schlüsselplätze verwalten</string>
     <string name="title_activity_import_entries">Einträge importieren</string>
+    <string name="title_activity_assign_icons">Symbole zuweisen</string>
+    <string name="title_activity_licenses">Lizenzen von Dritten</string>
     <string name="dialog_wipe_entries_title">Einträge löschen</string>
     <string name="dialog_wipe_entries_message">Deine Datenbank enthält bereits Einträge. Möchtest du diese Einträge entfernen, bevor diese Datei importiert wird?\n\n<b>Wenn du dies tust, verlierst du dauerhaft den Zugriff auf die vorhandenen Einträge in der Datenbank.</b></string>
     <string name="dialog_wipe_entries_checkbox">Datenbankinhalt löschen</string>
     <string name="panic_trigger_ignore_toast">Aegis hat ein Paniksignal empfangen, aber die Einstellung ist deaktiviert – Paniksignal wird ignoriert</string>
     <string name="pref_panic_trigger_title">Datenbank bei Paniksignal löschen</string>
     <string name="pref_panic_trigger_summary">Datenbank löschen, wenn ein Paniksignal von Ripple empfangen wird</string>
-    <string name="import_vault">Datenbank importieren</string>
-    <string name="importer_help_2fas">Gib eine 2FAS Authenticator-Sicherungsdatei an.</string>
+    <string name="import_vault">Aegis-Datenbank importieren</string>
+    <string name="import_vault_hint">Möchtest du Daten aus einer anderen 2FA-App importieren? Schließe zuerst die Einrichtung ab. Anschließend kannst du die Einstellungen aufrufen.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Auswahl für %d potenzielles Duplikat aufgehoben. Bitte überprüfe die Einträge.</item>
+        <item quantity="other">Auswahl für %d potenzielle Duplikate aufgehoben. Bitte überprüfe die Einträge.</item>
+    </plurals>
+    <string name="importer_help_2fas">Gib eine 2FAS-Authenticator-Sicherungsdatei an.</string>
     <string name="importer_help_aegis">Gib eine Aegis-Export-/Sicherungsdatei an.</string>
-    <string name="importer_help_authenticator_plus">Gib eine Authenticator Plus-Exportdatei an, die du über <b>Einstellungen -&gt; Sicherung &amp; Rücksicherung -&gt; Exportieren als Text und HTML Format</b> erhältst.</string>
-    <string name="importer_help_authenticator_pro">Gib eine Authenticator Pro-Exportdatei an, die du über <b>Einstellungen -&gt; Sicherung -&gt; Als verschlüsselte Datei sichern (empfohlen)</b> erhältst.</string>
+    <string name="importer_help_authenticator_plus">Gib eine Authenticator-Plus-Exportdatei an, die du über <b>Einstellungen -&gt; Sicherung &amp; Rücksicherung -&gt; Exportieren als Text und HTML Format</b> erhältst.</string>
     <string name="importer_help_authy">Gib eine Kopie von <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> an, die sich im internen Speicherverzeichnis von Authy befindet.</string>
     <string name="importer_help_andotp">Gib eine andOTP-Export-/Sicherungsdatei an.</string>
     <string name="importer_help_bitwarden">Gib eine Bitwarden-Export-/Sicherungsdatei an. Verschlüsselte Dateien werden nicht unterstützt.</string>
-    <string name="importer_help_battle_net_authenticator">Gib eine Kopie von <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b> an, die sich im internen Speicherverzeichnis von Battle.net Authenticator befindet.</string>
+    <string name="importer_help_battle_net_authenticator">Gib eine Kopie von <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b> an, die sich im internen Speicherverzeichnis von Battle.net Authenticator befindet.</string>
     <string name="importer_help_duo">Gib eine Kopie von <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> an, die sich im internen Speicherverzeichnis von DUO befindet.</string>
-    <string name="importer_help_freeotp">Gib eine Kopie von <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> an, die sich im internen Speicherverzeichnis von FreeOTP befindet.</string>
+    <string name="importer_help_ente_auth">Gib eine Ente Auth-Exportdatei an. Derzeit werden nur unverschlüsselte Dateien unterstützt.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Gib eine Sicherungsdatei an.\nFreeOTP 1.X: Gib eine Kopie von <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, die sich im internen Speicherverzeichnis von FreeOTP befindet.</string>
     <string name="importer_help_freeotp_plus">Gib eine FreeOTP+-Exportdatei an.</string>
+    <string name="importer_warning_title_freeotp2">Kompatibilität mit FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Es gibt in FreeOTP 2 eine Reihe von Problemen, die zu beschädigten Sicherungsdateien führen können. Aegis wird versuchen, so viele Einträge wie möglich zu retten. Es ist möglich, dass das Importieren einiger oder sogar aller Einträge fehlschlägt.</string>
     <string name="importer_help_google_authenticator"><b>Es werden nur Datenbankdateien von Google Authenticator bis Version 5.10 unterstützt</b>.\n\nGib eine Kopie von <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> an, die sich im internen Speicherverzeichnis von Google Authenticator befindet.</string>
     <string name="importer_help_microsoft_authenticator">Gib eine Kopie von <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> an, die sich im internen Speicherverzeichnis von Microsoft Authenticator befindet.</string>
-    <string name="importer_help_plain_text">Gib eine Klartextdatei an, die in jeder Zeile eine Google Authenticator-URI enthält.</string>
+    <string name="importer_help_plain_text">Gib eine Klartextdatei an, die in jeder Zeile eine Google-Authenticator-URI enthält.</string>
     <string name="importer_help_steam"><b>Steam v3.0 und neuer wird nicht unterstützt</b>. Gib eine Kopie von <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> an, die sich im internen Speicherverzeichnis von Steam befindet.</string>
-    <string name="importer_help_totp_authenticator">Gib eine TOTP Authenticator-Exportdatei an.</string>
+    <string name="importer_help_stratum">Gib eine Stratum-Exportdatei an, die du über <b>Einstellungen -&gt; Sicherung -&gt; Als verschlüsselte Datei sichern (empfohlen)</b> erhältst.</string>
+    <string name="importer_help_totp_authenticator">Gib eine TOTP-Authenticator-Exportdatei an.</string>
     <string name="importer_help_winauth">Gib eine WinAuth-Exportdatei an.</string>
+    <string name="import_assign_icons_dialog_title">Symbole zuweisen</string>
+    <string name="import_assign_icons_dialog_text">Möchtest du den importierten Einträgen Symbole zuweisen?</string>
     <string name="importer_encrypted_exception_google_authenticator">Verschlüsselter Eintrag wurde übersprungen: %s</string>
     <string name="importer_help_direct">Importiere Einträge direkt aus %s. Dazu muss die App auf diesem Gerät installiert sein und Aegis muss Root-Zugriff gewährt werden.</string>
     <string name="groups">Gruppen</string>
@@ -460,23 +554,23 @@
     <string name="pref_account_name_position_hidden">Ausgeblendet</string>
     <string name="pref_account_name_position_end">Neben dem Herausgeber</string>
     <string name="pref_account_name_position_below">Unterhalb des Herausgebers</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">vor %d Sekunde</item>
         <item quantity="other">vor %d Sekunden</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">vor %d Minute</item>
         <item quantity="other">vor %d Minuten</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">vor %d Stunde</item>
         <item quantity="other">vor %d Stunden</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">vor %d Tag</item>
         <item quantity="other">vor %d Tagen</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">vor %d Jahr</item>
         <item quantity="other">vor %d Jahren</item>
     </plurals>
diff --git a/app/src/main/res/values-el-rGR-v29/strings.xml b/app/src/main/res/values-el-rGR-v29/strings.xml
new file mode 100644
index 00000000..10dee592
--- /dev/null
+++ b/app/src/main/res/values-el-rGR-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Προεπιλογή συστήματος</string>
+    <string name="system_amoled_theme_title">Προεπιλογή συστήματος (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 4b7261c4..b67aa561 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Ρυθμίσεις</string>
     <string name="action_about">Σχετικά</string>
     <string name="action_delete">Διαγραφή</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Επαναφορά προεπιλεγμένου εικονιδίου</string>
     <string name="discard">Απόρριψη</string>
     <string name="save">Αποθήκευση</string>
+    <string name="all">Όλα</string>
     <string name="issuer">Εκδότης</string>
     <string name="yandex_pin">PIN (4-16 ψηφία)</string>
     <string name="motp_pin">PIN (4 ψηφία)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Ρύθμιση κρυπτογράφησης, βιομετρικού ξεκλειδώματος, αυτόματου κλειδώματος και άλλων ρυθμίσεων ασφαλείας.</string>
     <string name="pref_section_import_export_title">Εισαγωγή &amp; Εξαγωγή</string>
     <string name="pref_section_import_export_summary">Εισαγωγή αντιγράφων ασφαλείας Aegis ή άλλων εφαρμογών ελέγχου ταυτότητας. Δημιουργήστε χειροκίνητες εξαγωγές της κρύπτης Aegis.</string>
+    <string name="pref_section_audit_log_title">Αρχείο καταγραφής ελέγχου</string>
+    <string name="pref_section_audit_log_summary">Βρείτε μια λίστα με όλα τα αναφερόμενα σημαντικά γεγονότα που συνέβησαν στην εφαρμογή.</string>
     <string name="pref_section_backups_title">Αντίγραφα Ασφαλείας</string>
     <string name="pref_section_backups_summary">Ρυθμίστε αυτόματα αντίγραφα ασφαλείας σε μια τοποθεσία της επιλογής σας ή ενεργοποιήστε τη συμμετοχή στο σύστημα αντιγράφων ασφαλείας του Android.</string>
     <string name="pref_section_icon_packs">Πακέτα εικονιδίων</string>
     <string name="pref_section_icon_packs_summary">Διαχείριση και εισαγωγή πακέτων εικονιδίων</string>
     <string name="pref_select_theme_title">Θέμα</string>
+    <string name="pref_dynamic_colors_title">Δυναμικά χρώματα</string>
+    <string name="pref_dynamic_colors_summary">Εφαρμόστε μια επικάλυψη με βάση τα χρώματα του θέματός σας Android</string>
     <string name="pref_view_mode_title">Τρόπος προβολής</string>
     <string name="pref_lang_title">Γλώσσα</string>
     <string name="pref_show_icons_title">Εμφάνιση εικονιδίων</string>
@@ -40,9 +45,14 @@
     <string name="pref_code_group_size_title">Ομαδοποίηση ψηφίων κωδικού</string>
     <string name="pref_code_group_size_summary">Επιλέξτε τον αριθμό των ψηφίων για να ομαδοποιήσετε τους κωδικούς κατά</string>
     <string name="pref_account_name_position_title">Εμφάνιση του ονόματος λογαριασμού</string>
+    <string name="pref_show_next_code_title">Εμφάνιση επόμενου κώδικα</string>
+    <string name="pref_show_next_code_summary">Δημιουργία και εμφάνιση του επόμενου κώδικα νωρίτερα</string>
+    <string name="pref_expiration_state_title">Επισημαίνει πότε οι κωδικοί πρόκειται να λήξουν</string>
+    <string name="pref_expiration_state_summary">Αλλάζει το χρώμα των κωδικών και του κάνει να αναβοσβήνουν όταν πρόκειται να λήξουν</string>
+    <string name="pref_expiration_state_fallback">Αλλάζει το χρώμα των κωδικών όταν πρόκειται να λήξουν</string>
     <string name="pref_shared_issuer_account_name_title">Εμφάνιση ονόματος λογαριασμού μόνο όταν είναι απαραίτητο</string>
     <string name="pref_shared_issuer_account_name_summary">Εμφάνιση μόνο ονομάτων λογαριασμών κάθε φορά που μοιράζονται τον ίδιο εκδότη. Άλλα ονόματα λογαριασμών θα αποκρύπτονται.</string>
-    <string name="pref_account_name_position_summary_override">Αυτή η ρύθμιση αντικαθίσταται από τη λειτουργία προβολής πλακιδίων. Το όνομα λογαριασμού θα εμφανίζεται πάντα κάτω από τον εκδότη.</string>
+    <string name="pref_account_name_position_summary_override">Αυτή η ρύθμιση αντικαθίσταται από τη λειτουργία προβολής πλακιδίων. Το όνομα λογαριασμού θα εμφανίζεται κάτω από τον εκδότη.</string>
     <string name="pref_import_file_title">Εισαγωγή από αρχείο</string>
     <string name="pref_import_file_summary">Εισαγωγή αναγνωριστικών από αρχείο</string>
     <string name="pref_android_backups_title">Αντίγραφα ασφαλείας cloud Android</string>
@@ -54,15 +64,23 @@
     <string name="pref_backups_reminder_summary">Εμφάνιση υπενθύμισης για δημιουργία αντιγράφων ασφαλείας σε περίπτωση που δεν έχετε δημιουργήσει αντίγραφα ασφαλείας των τελευταίων σας αλλαγών.</string>
     <string name="pref_backups_reminder_dialog_title">Απενεργοποίηση υπενθύμισης αντιγράφων ασφαλείας</string>
     <string name="pref_backups_reminder_dialog_summary">Η απενεργοποίηση αυτής της υπενθύμισης σημαίνει ότι το Aegis δεν θα σας ενημερώσει εάν έχετε ή όχι αλλαγές για τις οποίες δεν έχουν δημιουργηθεί ακόμα αντίγραφα ασφαλείας. Αυτό σας θέτει σε κίνδυνο να χάσετε την πρόσβαση στα διακριτικά σας. Είστε βέβαιοι ότι θέλετε να απενεργοποιήσετε την υπενθύμιση;</string>
-    <string name="pref_backups_location_title">Κατάλογος για τα αντίγραφα ασφαλείας αρχείων</string>
+    <string name="pref_backups_versioning_strategy_title">Στρατηγική αντιγράφων ασφαλείας</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Διατήρηση αρκετών εκδόσεων</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Μονό αντίγραφο ασφαλείας</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Η επιλεγμένη στρατηγική δημιουργίας αντιγράφων ασφαλείας δεν είναι αξιόπιστη και δεν συνιστάται. Μια μεμονωμένη αποτυχία δημιουργίας αντιγράφων ασφαλείας μπορεί να οδηγήσει στην απώλεια του μοναδικού αντιγράφου ασφαλείας.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Επιλέξτε την στρατηγική αντιγράφου ασφαλείας</string>
+    <string name="pref_backups_location_title">Τοποθεσία αντιγράφου ασφαλείας</string>
     <string name="pref_backups_location_summary">Τα αντίγραφα ασφαλείας θα αποθηκευτούν στo</string>
+    <string name="pref_backup_location_summary">Το αντίγραφο ασφαλείας θα αποθηκευτεί στο</string>
     <string name="pref_backups_trigger_title">\'Εναυσμα αντιγράφου ασφαλείας</string>
     <string name="pref_backups_trigger_summary">Χειροκίνητη ενεργοποίηση δημιουργίας αντιγράφου ασφαλείας</string>
     <string name="pref_backups_versions_title">Αριθμός εκδόσεων που θα κρατηθούν</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Διατηρήστε την %1$d έκδοση του αντιγράφου ασφαλείας</item>
         <item quantity="other">Διατηρήστε τις %1$d εκδόσεις του αντιγράφου ασφαλείας</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Διατηρήστε έναν άπειρο αριθμό εκδόσεων του αντιγράφου ασφαλείας</string>
     <string name="pref_import_app_title">Εισαγωγή από εφαρμογή</string>
     <string name="pref_import_app_summary">Εισαγωγή αναγνωριστικών από εφαρμογή (απαιτείται πρόσβαση root)</string>
     <string name="pref_export_title">Εξαγωγή</string>
@@ -98,8 +116,34 @@
     <string name="pref_encryption_summary">Κρυπτογράφηση της κρύπτης και ξεκλείδωμα με κωδικό ή βιομετρία</string>
     <string name="pref_biometrics_title">Βιομετρικό ξεκλείδωμα</string>
     <string name="pref_biometrics_summary">Αποδοχή βιομετρικής πιστοποίησης για να ξεκλειδώσετε την κρύπτη</string>
+    <string name="pref_search_behavior_summary">Αναζήτηση μέσω: %s</string>
+    <string name="pref_search_behavior_prompt">Αναζήτηση σε οποιοδήποτε από τα ακόλουθα πεδία</string>
+    <string name="pref_search_behavior_type_name">Όνομα</string>
+    <string name="pref_search_behavior_type_issuer">Εκδότης</string>
+    <string name="pref_search_behavior_type_note">Σημείωση</string>
+    <string name="pref_search_behavior_type_groups">Ομάδες</string>
     <string name="pref_set_password_title">Αλλαγή κωδικού</string>
     <string name="pref_set_password_summary">Ορισμός νέου κωδικού που θα χρειαστεί για να ξεκλειδώσετε την κρύπτης σας</string>
+    <string name="no_events_title">Δεν έχουν αναφερθεί συμβάντα</string>
+    <string name="no_events_description">Δεν έχουν αναφερθεί σημαντικά συμβάντα στην εφαρμογή</string>
+    <string name="event_title_vault_unlocked">Η κρύπτη ξεκλειδώθηκε</string>
+    <string name="event_description_vault_unlocked">Η κρύπτη ξεκλειδώθηκε επιτυχώς</string>
+    <string name="event_title_backup_created">Δημιουργήθηκε αντίγραφο ασφαλείας</string>
+    <string name="event_description_backup_created">Ένα αντίγραφο ασφαλείας της κρύπτης δημιουργήθηκε με επιτυχία</string>
+    <string name="event_title_android_backup_created">Δημιουργήθηκε αντίγραφο ασφαλείας από το Android</string>
+    <string name="event_description_android_backup_created">Δημιουργήθηκε ένα αντίγραφο ασφαλείας επιτυχώς από το Android</string>
+    <string name="event_title_vault_exported">Η κρύπτη εξήχθη</string>
+    <string name="event_description_vault_exported">Ένα αντίγραφο της κρύπτης έχει εξαχθεί</string>
+    <string name="event_title_entry_shared">Η καταχώριση κοινοποιήθηκε</string>
+    <string name="event_description_entry_shared">Μια καταχώρηση κοινοποιήθηκε</string>
+    <string name="event_title_vault_unlock_failed_password">Το ξεκλείδωμα της κρύπτης απέτυχε (κωδικός)</string>
+    <string name="event_description_vault_unlock_failed_password">Αποτυχία προσπάθειας ξεκλειδώματος της κρύπτης με κωδικό πρόσβασης</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Το ξεκλείδωμα της κρύπτης απέτυχε (βιομετρικά)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Αποτυχία προσπάθειας ξεκλειδώματος της κρύπτης με βιομετρικά στοιχεία</string>
+    <string name="event_unknown">Άγνωστος τύπος συμβάντος</string>
+    <string name="audit_log_entry_deleted">(διαγράφηκε)</string>
+    <string name="today_at_time">Σήμερα στις %1$s</string>
+    <string name="day_of_week_at_time">%1$s στις %2$s</string>
     <string name="export_encrypted">Κρυπτογράφηση κρύπτης</string>
     <string name="export_help">Αυτή η ενέργεια θα εξάγει την κρύπτη έξω από τον εσωτερικό χώρο αποθήκευσης του Aegis. Επιλέξτε τη μορφή στην οποία θέλετε να είναι η εξαγωγή σας:</string>
     <string name="export_warning_unencrypted">Πρόκειται να εξαγάγετε ένα μη κρυπτογραφημένο αντίγραφο της Aegis κρύπτης σας. <b> Αυτό δεν συνιστάται </b>.</string>
@@ -116,7 +160,7 @@
         <item quantity="other">%d ομάδες επιλέχθηκαν</item>
     </plurals>
     <string name="export_no_groups_selected">Δεν επιλέχθηκαν ομάδες για εξαγωγή</string>
-    <string name="export_html_title" context="The title of an HTML export document">Εξαγωγή Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Εξαγωγή Aegis Authenticator</string>
     <string name="choose_authentication_method">Ασφάλεια</string>
     <string name="authentication_method_explanation">Το Aegis είναι μια εφαρμογή 2FA επικεντρωμένη στην ασφάλεια. Τα αναγνωριστικά αποθηκεύονται σε μία κρύπτη, η οποία μπορεί προαιρετικά να κρυπτογραφηθεί με έναν κωδικό της επιλογής σας. Αν κάποιος εισβολέας αποκτήσει το κρυπτογραφημένο αρχείο της κρύπτης σας, δεν θα έχει πρόσβαση στα περιεχόμενα χωρίς να γνωρίζει τον κωδικό.\n\nΈχουμε προεπιλέξει την επιλογή που νομίζουμε ότι θα ταιριάζει καλύτερα στη συσκευή σας.</string>
     <string name="authentication_method_none">Καμία</string>
@@ -152,6 +196,7 @@
     <string name="share">Κοινοποίηση</string>
     <string name="yes">Ναι</string>
     <string name="no">Όχι</string>
+    <string name="undo">Αναίρεση</string>
     <string name="unlock">Ξεκλείδωμα</string>
     <string name="advanced">Σύνθετες</string>
     <string name="counter">Μετρητής</string>
@@ -163,6 +208,11 @@
     <string name="set_up_biometric">Ρύθμιση βιομετρικού ξεκλειδώματος</string>
     <string name="copy">Αντιγραφή</string>
     <string name="edit">Επεξεργασία</string>
+    <string name="select_all">Επιλογή όλων</string>
+    <string name="assign_icons">Αντιστοίχιση εικονιδίων</string>
+    <string name="assign_groups">Αντιστοίχιση σε ομάδα</string>
+    <string name="assign_groups_dialog_summary">Επιλέξτε μια ομάδα στην οποία θέλετε να αντιστοιχίσετε τις επιλεγμένες καταχωρήσεις.</string>
+    <string name="assign_groups_dialog_dropdown">Επιλογή ομάδας</string>
     <string name="favorite" comment="Verb">Προσθήκη στα αγαπημένα</string>
     <string name="unfavorite" comment="Verb">Αφαίρεση από αγαπημένα</string>
     <string name="error_all_caps">ΣΦΑΛΜΑ</string>
@@ -177,10 +227,12 @@
     <string name="snackbar_authentication_method">Παρακαλώ επιλέξτε μέθοδο ελέγχου ταυτότητας</string>
     <string name="encrypting_vault">Κρυπτογράφηση κρύπτης</string>
     <string name="exporting_vault">Εξαγωγή της κρύπτης</string>
+    <string name="optimizing_icon">Βελτιστοποίηση εικονιδίου</string>
+    <string name="optimizing_icon_multiple">Βελτιστοποίηση εικονιδίων %1$d/%2$d</string>
     <string name="reading_file">Ανάγνωση αρχείου</string>
     <string name="requesting_root_access">Αίτηση πρόσβασης root</string>
     <string name="analyzing_qr">Ανάλυση κωδικού QR</string>
-    <string name="analyzing_qr_multiple">Ανάλυση κωδικού QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Ανάλυση κωδικού QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Προστέθηκε %d νέα καταχώρηση στην κρύπτη</item>
         <item quantity="other">Προστέθηκαν %d νέες καταχωρήσεις στην κρύπτη</item>
@@ -197,6 +249,7 @@
     <string name="discard_changes">Απόρριψη αλλαγών;</string>
     <string name="discard_changes_description">Οι αλλαγές σας δεν έχουν αποθηκευτεί</string>
     <string name="saving_profile_error">Σφάλμα κατά την αποθήκευση προφίλ</string>
+    <string name="saving_assign_icons_error">Σφάλμα κατά την αντιστοίχιση εικονιδίων</string>
     <string name="welcome">Καλώς ήρθατε</string>
     <string name="app_description">Το Aegis είναι μια δωρεάν, ασφαλής και ανοικτού κώδικα εφαρμογή 2FA</string>
     <string name="setup_completed">Η εγκατάσταση ολοκληρώθηκε</string>
@@ -205,6 +258,7 @@
     <string name="copied">Αντιγράφηκε</string>
     <string name="errors_copied">Αντιγράφηκαν σφάλματα στο πρόχειρο</string>
     <string name="version_copied">Η έκδοση αντιγράφτηκε στο πρόχειρο</string>
+    <string name="error_required_field">Αυτό το πεδίο είναι υποχρεωτικό</string>
     <string name="error_occurred">Παρουσιάστηκε σφάλμα</string>
     <string name="decryption_error">Παρουσιάστηκε σφάλμα κατά την προσπάθεια ξεκλειδώματος της κρύπτης</string>
     <string name="decryption_corrupt_error">Παρουσιάστηκε σφάλμα κατά την προσπάθεια ξεκλειδώματος της κρύπτης. Το αρχείο κρύπτης σας ενδέχεται να είναι κατεστραμμένο.</string>
@@ -268,15 +322,20 @@
     <string name="partial_google_auth_import">Εντοπίστηκε ημιτελής εξαγωγή του Επαληθευτή Google</string>
     <string name="partial_google_auth_import_warning">Ορισμένοι κωδικοί QR λείπουν από την εισαγωγή σας. Οι ακόλουθοι κωδικοί δεν βρέθηκαν:\n\n<b>%s</b>\n\nΜπορείτε να συνεχίσετε την εισαγωγή αυτής της μερικής εξαγωγής, αλλά σας συνιστούμε να ξαναδοκιμάσετε με όλους τους κωδικούς QR ώστε να μην κινδυνεύετε να χάσετε πρόσβαση σε οποιαδήποτε αναγνωστικά.</string>
     <string name="missing_qr_code_descriptor">• Κωδικός QR %d</string>
-    <string name="import_partial_export_anyway">Εισαγωγή %d αναγνωριστικών ούτως ή άλλως</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Εισαγωγή %d αναγνωριστικού ούτως ή άλλως</item>
+        <item quantity="other">Εισαγωγή %d αναγνωριστικών ούτως ή άλλως</item>
+    </plurals>
     <string name="import_google_auth_failure">Η εισαγωγή της εξαγωγής του Επαληθευτή Google απέτυχε</string>
     <string name="unrelated_google_auth_batches_error">Η εξαγωγή περιέχει πληροφορίες για μια άσχετη παρτίδα. Δοκιμάστε να εισαγάγετε 1 παρτίδα τη φορά.</string>
     <string name="no_tokens_can_be_imported">Ως αποτέλεσμα, δεν μπορούν να εισαχθούν αναγνωστικά</string>
-    <string name="authentication_method_raw">Ακατέργαστη</string>
     <string name="unlocking_vault">Ξεκλείδωμα κρύπτης</string>
-    <string name="slot_this_device">(αυτή η συσκευή)</string>
+    <string name="rename_group">Μετονομασία Ομάδας</string>
+    <string name="no_group_selection">Εάν μια καταχώρηση δεν αποτελεί μέρος οποιασδήποτε ομάδας, μπορεί να βρεθεί στο \"Χωρίς ομάδα\".</string>
     <string name="remove_group">Κατάργηση ομάδας</string>
     <string name="remove_group_description">Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτήν την ομάδα; Οι καταχωρίσεις σε αυτήν θα μεταβούν αυτόματα στο \"Χωρίς ομάδα\".</string>
+    <string name="remove_unused_groups">Διαγραφή αχρησιμοποίητων ομάδων</string>
+    <string name="remove_unused_groups_description">Είστε βέβαιοι ότι θέλετε να διαγράψετε όλες τις ομάδες που δεν έχουν αντιστοιχιστεί σε μια καταχώρηση;</string>
     <string name="remove_icon_pack">Αφαίρεση πακέτου εικονιδίων</string>
     <string name="remove_icon_pack_description">Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτό το πακέτο εικονιδίων; Καταχωρήσεις που χρησιμοποιούν εικονίδια από αυτό το πακέτο δεν θα επηρεαστούν.</string>
     <string name="details">Λεπτομέρειες</string>
@@ -284,13 +343,16 @@
     <string name="lock">Κλείδωμα</string>
     <string name="name">Όνομα</string>
     <string name="no_group">Χωρίς ομάδα</string>
-    <string name="sort">Ταξινόμηση</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ταξινόμηση</string>
     <string name="sort_alphabetically">Εκδότης (Α προς Ζ)</string>
     <string name="sort_alphabetically_reverse">Εκδότης (Ζ προς Α)</string>
     <string name="sort_alphabetically_name">Λογαριασμός (Α προς Ζ)</string>
     <string name="sort_alphabetically_name_reverse">Λογαριασμός (Z προς A)</string>
     <string name="sort_usage_count">Αριθμός χρήσεων</string>
+    <string name="sort_last_used">Τελευταία χρήση</string>
     <string name="sort_custom">Προσαρμογή</string>
+    <string name="last_used">Τελευταία χρήση</string>
+    <string name="last_used_never">ποτέ</string>
     <string name="new_group">Νέα ομάδα…</string>
     <string name="group">Ομάδα</string>
     <string name="group_name_hint">Όνομα ομάδας</string>
@@ -299,13 +361,31 @@
     <string name="preference_reset_usage_count">Επαναφορά αριθμού χρήσης</string>
     <string name="preference_reset_usage_count_summary">Επαναφορά του αριθμού χρήσης κάθε καταχώρησης στην κρύπτη σας</string>
     <string name="preference_reset_usage_count_dialog">Είστε βέβαιοι ότι θέλετε να ορίσετε τον αριθμό χρήσης κάθε εισόδου στην κρύπτη σας στο 0;</string>
-    <string name="note">Σημείωση</string>
+    <string name="note" comment="Users can add a note to an entry">Σημείωση</string>
     <string name="clear">Εκκαθάριση</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Διπλότυπη καταχώρηση</string>
+    <string name="dialog_duplicate_entry_message">Αυτή η καταχώρηση έχει το ίδιο όνομα και τον ίδιο εκδότη με μία ή περισσότερες υπάρχουσες καταχωρήσεις. Πώς θα θέλατε να προχωρήσετε;</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Αντικατάσταση υπάρχουσας/ων καταχώρησης/ων</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Αντικατάσταση της υπάρχουσας καταχώρησης ή καταχωρήσεων με τη νέα. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί</string>
+    <string name="dialog_duplicate_entry_suffix_title">Προσθήκη επιθήματος</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Προσθέστε ένα επίθημα στο όνομα αυτής της νέας καταχώρησης. Το νέο όνομα θα είναι: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Ακύρωση αποθήκευσης</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Σας επιτρέπει να επεξεργαστείτε την καταχώρηση πριν επιχειρήσετε να την αποθηκεύσετε ξανά</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Είστε βέβαιοι ότι θέλετε να διαγράψετε την καταχώρηση %d με το ακόλουθο όνομα:\n\n%s - %s</item>
+        <item quantity="other">Είστε βέβαιοι ότι θέλετε να διαγράψετε καταχωρήσεις %d με το ακόλουθο όνομα:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Επιβεβαίωση διαγραφής</string>
+    <string name="pref_haptic_feedback_summary">Κάντε τη συσκευή σας να δονείται όταν ανανεώνονται οι κωδικοί</string>
+    <string name="pref_haptic_feedback_title">Απτική ανάδραση</string>
     <string name="pref_highlight_entry_title">Επισήμανση αναγνωριστικών όταν πατηθεί</string>
     <string name="pref_highlight_entry_summary">Κάνετε τα αναγνωριστικά να ξεχωρίζουν ευκολότερα το ένα από το άλλο, επισημαίνοντας τα προσωρινά όταν τα πατήσετε</string>
+    <string name="pref_groups_multiselect_title">Πολλαπλή επιλογή ομάδων</string>
+    <string name="pref_groups_multiselect_summary">Να επιτρέπεται η επιλογή πολλαπλών ομάδων ταυτόχρονα</string>
     <string name="pref_minimize_on_copy_title">Ελαχιστοποίηση κατά την αντιγραφή</string>
     <string name="pref_minimize_on_copy_summary">Ελαχιστοποίηση της εφαρμογής μετά την αντιγραφή ενός αναγνωριστικού</string>
     <string name="pref_copy_behavior_title">Αντιγραφή αναγνωριστικών στο πρόχειρο</string>
+    <string name="pref_search_behavior_title">Συμπεριφορά αναζήτησης</string>
     <string name="pref_pause_entry_title">Πάγωμα αναγνωριστικών όταν πατηθούν</string>
     <string name="pref_pause_entry_summary">Παύση της αυτόματης ανανέωσης των αναγνωριστικών πατώντας τα. Τα αναγνωριστικά δεν θα ενημερώνονται όσο είναι συγκεντρωμένα. Απαιτεί \"Επισήμανση αναγνωριστικών όταν πατηθούν\" ή \"Πατήστε για αποκάλυψη\".</string>
     <string name="pin_keyboard_description">Εισαγάγετε τον κωδικό πρόσβασής σας για να ενεργοποιήσετε το πληκτρολόγιο PIN. Λάβετε υπόψη ότι αυτό λειτουργεί μόνο εάν ο κωδικός πρόσβασής σας αποτελείται μόνο από αριθμούς</string>
@@ -325,13 +405,13 @@
     <string name="unknown_issuer">Άγνωστος εκδότης</string>
     <string name="unknown_account_name">Άγνωστο όνομα λογαριασμού</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Το Aegis δεν μπόρεσε να εισαγάγει %d αναγνωριστικό. Αυτά θα παραληφθούν. Πατήστε \'Λεπτομέρειες\' για να δείτε περισσότερες πληροφορίες σχετικά με τα σφάλματα.</item>
+        <item quantity="one">Το Aegis δεν μπόρεσε να εισαγάγει %d αναγνωριστικό. Αυτό το αναγνωστικό θα παραληφθεί. Πατήστε \'Λεπτομέρειες\' για να δείτε περισσότερες πληροφορίες σχετικά με το σφάλμα.</item>
         <item quantity="other">Το Aegis δεν μπόρεσε να εισαγάγει %d αναγνωριστικά. Αυτά θα παραληφθούν. Πατήστε \'Λεπτομέρειες\' για να δείτε περισσότερες πληροφορίες σχετικά με τα σφάλματα.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Δεν είναι δυνατή η επεξεργασία βαθιάς σύνδεσης</string>
     <string name="unable_to_read_qrcode_file">Αδυναμία ανάγνωσης και επεξεργασίας QR κωδικού από αρχείο: %s.</string>
     <string name="unable_to_process_shared_text">Δεν είναι δυνατή η επεξεργασία κοινόχρηστου κειμένου ως OTP</string>
-    <string name="unable_to_read_qrcode_files">Δεν είναι δυνατή η ανάγνωση και επεξεργασία μερικών QR κωδικών. Θα εισαχθούν μόνο %d/%d καταχωρήσεις.</string>
+    <string name="unable_to_read_qrcode_files">Δεν είναι δυνατή η ανάγνωση και επεξεργασία μερικών QR κωδικών. Θα εισαχθούν μόνο %1$d/%2$d καταχωρήσεις.</string>
     <string name="unable_to_generate_qrcode">Δεν είναι δυνατή η δημιουργία κωδικού QR</string>
     <string name="select_picture">Επιλέξτε εικόνα</string>
     <string name="select_icon">Επιλέξτε εικονίδιο</string>
@@ -363,12 +443,14 @@
     <string name="time_sync_warning_disable">Σταμάτα να με προειδοποιείς. Ξέρω τι κάνω.</string>
     <string name="google_qr_export_unrelated">Βρέθηκε μη σχετικός κωδικός QR. Δοκιμάστε να κάνετε επανεκκίνηση του σαρωτή.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Σαρωμένος %d/%d κωδικός QR</item>
-        <item quantity="other">Σαρωμένοι %d/%d κωδικοί QR</item>
+        <item quantity="one">Σαρωμένος %1$d/%2$d κωδικός QR</item>
+        <item quantity="other">Σαρωμένοι %1$d/%2$d κωδικοί QR</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Αναμενόταν κωδικός QR #%d, αλλά σαρώθηκε #%d αντί αυτού</string>
+    <string name="google_qr_export_unexpected">Αναμενόταν κωδικός QR #%1$d, αλλά σαρώθηκε #%2$d αντί αυτού</string>
     <string name="backup_error_bar_message"><b>Η δημιουργία αντιγράφων ασφαλείας κρύπτης απέτυχε πρόσφατα</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Μια πρόσφατη προσπάθεια δημιουργίας αντιγράφων ασφαλείας κρύπτης με χρήση %s απέτυχε επειδή παρουσιάστηκε σφάλμα. Έγινε προσπάθεια δημιουργίας αντιγράφων ασφαλείας %s. Παρακαλώ ελέγξτε τις ρυθμίσεις δημιουργίας αντιγράφων ασφαλείας για να βεβαιωθείτε ότι τα αντίγραφα ασφαλείας μπορούν να ολοκληρωθούν με επιτυχία.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Μια πρόσφατη προσπάθεια δημιουργίας αντιγράφων ασφαλείας κρύπτης με χρήση %1$s απέτυχε επειδή παρουσιάστηκε σφάλμα. Έγινε προσπάθεια δημιουργίας αντιγράφων ασφαλείας %2$s. Παρακαλώ ελέγξτε τις ρυθμίσεις δημιουργίας αντιγράφων ασφαλείας για να βεβαιωθείτε ότι τα αντίγραφα ασφαλείας μπορούν να ολοκληρωθούν με επιτυχία.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Μια πρόσφατη προσπάθεια δημιουργίας αντιγράφων ασφαλείας κρύπτης με χρήση %1$s απέτυχε επειδή το Aegis δεν είχε άδεια να εγγράψει στον προορισμό αντιγράφου ασφαλείας. Το αντίγραφο ασφαλείας επιχειρήθηκε %2$s. Αυτό το σφάλμα μπορεί να συμβεί αν μετακινήσατε / μετονομάσατε τον προορισμό αντιγράφου ασφαλείας ή αν αποκαταστήσατε πρόσφατα το Aegis από ένα αντίγραφο ασφαλείας. Παρακαλώ ρυθμίστε ξανά τον προορισμό του αντιγράφου ασφαλείας.
     </string>
     <string name="backup_system_builtin">Ενσωματωμένα αυτόματα αντίγραφα ασφαλείας του Aegis</string>
     <string name="backup_system_android">Σύστημα αντιγράφων ασφαλείας στο cloud του Android</string>
@@ -401,14 +483,15 @@
     <string name="copy_uri">Αντιγραφή URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Αδυναμία αντιγραφής του URI στο πρόχειρο</string>
     <string name="uri_copied_to_clipboard">Το URI αντιγράφηκε στο πρόχειρο</string>
-    <string name="transfer_entry">Μεταφορά καταχώρησης</string>
     <string name="transfer_entry_description">Σαρώστε αυτόν τον κωδικό QR με την εφαρμογή ελέγχου ταυτότητας στην οποία θέλετε να μεταφέρετε αυτήν την καταχώριση</string>
+    <string name="transfer_entry_brightness">Πατήστε τον κωδικό QR για εναλλαγή φωτεινότητας πλήρους οθόνης</string>
     <string name="google_auth_compatible_transfer_description">Σαρώστε αυτούς τους κωδικούς QR με το Aegis ή το Google Authenticator.\n\nΛόγω περιορισμών της εφαρμογής Google Authenticator, περιλαμβάνονται μόνο αναγνωριστικά TOTP &amp; HOTP που χρησιμοποιούν SHA1 και παράγουν 6ψήφιους κωδικούς</string>
     <string name="password_strength_very_weak">Πολύ αδύναμος</string>
     <string name="password_strength_weak">Αδύναμος</string>
     <string name="password_strength_fair">Μέτριος</string>
     <string name="password_strength_good">Καλός</string>
     <string name="password_strength_strong">Ισχυρός</string>
+    <string name="password_strength_unknown">Ο κωδικός πρόσβασης είναι πολύ μεγάλος για ανάλυση της ισχύος του</string>
     <string name="pref_pin_keyboard_title">Χρησιμοποιήστε το πληκτρολόγιο PIN στην οθόνη κλειδώματος</string>
     <string name="pref_pin_keyboard_summary">Ενεργοποιήστε αυτό εάν θέλετε να ενεργοποιήσετε το πληκτρολόγιο PIN στην οθόνη κλειδώματος. Αυτό λειτουργεί μόνο για αριθμητικούς κωδικούς πρόσβασης</string>
     <string name="title_activity_preferences">Ρυθμίσεις</string>
@@ -417,32 +500,43 @@
     <string name="title_activity_about">Σχετικά</string>
     <string name="title_activity_edit_entry">Επεξεργασία καταχώρησης</string>
     <string name="title_activity_scan_qr">Σάρωση κωδικού QR</string>
-    <string name="title_activity_manage_slots">Διαχείριση κλειδιών υποδοχής</string>
     <string name="title_activity_import_entries">Εισαγωγή καταχωρήσεων</string>
+    <string name="title_activity_assign_icons">Αντιστοίχιση εικονιδίων</string>
+    <string name="title_activity_licenses">Άδειες χρήσης τρίτων</string>
     <string name="dialog_wipe_entries_title">Διαγραφή καταχωρήσεων</string>
     <string name="dialog_wipe_entries_message">Η κρύπτη σας περιέχει ήδη καταχωρήσεις. Θέλετε να καταργήσετε αυτές τις καταχωρήσεις πριν από την εισαγωγή αυτού του αρχείου;\n\n <b> Με αυτόν τον τρόπο, θα χάσετε μόνιμα την πρόσβαση στις υπάρχουσες καταχωρήσεις στην κρύπτη. </b></string>
     <string name="dialog_wipe_entries_checkbox">Διαγραφή περιεχομένων κρύπτης</string>
     <string name="panic_trigger_ignore_toast">Το Aegis έλαβε έναυσμα πανικού αλλά η ρύθμιση είναι απενεργοποιημένη, αγνόηση</string>
     <string name="pref_panic_trigger_title">Διαγραφή κρύπτης στο έναυσμα πανικού</string>
     <string name="pref_panic_trigger_summary">Διαγραφή κρύπτης όταν λαμβάνεται ένα έναυσμα πανικού από το Ripple</string>
-    <string name="import_vault">Εισαγωγή κρύπτης</string>
+    <string name="import_vault">Εισαγωγή κρύπτης Aegis</string>
+    <string name="import_vault_hint">Θέλετε να κάνετε εισαγωγή από μια διαφορετική εφαρμογή 2FA; Ολοκληρώστε πρώτα τη ρύθμιση εγκατάστασης και μετά μεταβείτε στο μενού ρυθμίσεων.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Μη επιλεγμένο %d πιθανό διπλότυπο. Παρακαλούμε εξετάστε τη λίστα καταχωρήσεων.</item>
+        <item quantity="other">Μη επιλεγμένα %d πιθανά διπλότυπα. Παρακαλούμε εξετάστε τη λίστα καταχωρήσεων.</item>
+    </plurals>
     <string name="importer_help_2fas">Παρέχετε ένα αντίγραφο ασφαλείας 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Παρέχετε ένα αρχείο εξαγωγής/αντιγράφων ασφαλείας Aegis.</string>
     <string name="importer_help_authenticator_plus">Παρέχετε ένα αρχείο εξαγωγής Authenticator Plus που αποκτήθηκε μέσω των <b> Ρυθμίσεων - &gt; Αντιγράφων ασφαλείας &amp; Επαναφορά - &gt; Εξαγωγή ως Κείμενο και HTML </b>.</string>
-    <string name="importer_help_authenticator_pro">Παρέχεται ένα αρχείο εξαγωγής Authenticator Pro που λαμβάνεται μέσω <b>Ρυθμίσεις -&gt; Δημιουργία αντιγράφων ασφαλείας -&gt; Δημιουργία σε κρυπτογραφημένο αρχείο (συνιστάται)</b>.</string>
     <string name="importer_help_authy">Παρέχετε ένα αντίγραφο του <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, που βρίσκεται στον κατάλογο εσωτερικής αποθήκευσης του Authy.</string>
     <string name="importer_help_andotp">Παρέχετε ένα αρχείο εξαγωγής/αντιγράφου ασφαλείας andOTP.</string>
     <string name="importer_help_bitwarden">Παρέχετε ένα αρχείο εξαγωγής/αντιγράφων ασφαλείας Bitwarden. Τα κρυπτογραφημένα αρχεία δεν υποστηρίζονται.</string>
-    <string name="importer_help_battle_net_authenticator">Παρέχετε ένα αντίγραφο του <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.Galax_STORE.xml</b>, που βρίσκεται στον εσωτερικό κατάλογο αποθήκευσης του Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Παρέχει ένα αντίγραφο του <b> /data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml </b>, που βρίσκεται στον κατάλογο εσωτερικού χώρου αποθήκευσης του Επαληθευτή Battle.net.</string>
     <string name="importer_help_duo">Παρέχετε ένα αντίγραφο του <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, που βρίσκεται στον εσωτερικό κατάλογο αποθήκευσης του DUO.</string>
-    <string name="importer_help_freeotp">Παρέχετε ένα αντίγραφο του <b> /data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml </b>, που βρίσκεται στον κατάλογο εσωτερικής αποθήκευσης του FreeOTP.</string>
+    <string name="importer_help_ente_auth">Παρέχετε ένα αρχείο εξαγωγής Ente Auth. Προς το παρόν υποστηρίζονται μόνο μη κρυπτογραφημένα αρχεία.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Παρέχετε ένα αρχείο αντιγράφου ασφαλείας.\nFreeOTP 1.x: Παρέχετε ένα αντίγραφο του <b>/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, που βρίσκεται στον εσωτερικό κατάλογο αποθήκευσης του FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Παρέχετε ένα αρχείο εξαγωγής FreeOTP +.</string>
+    <string name="importer_warning_title_freeotp2">Συμβατότητα FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Υπάρχουν μια σειρά από ζητήματα στο FreeOTP 2 που μπορεί να οδηγήσει σε κατεστραμμένα αντίγραφα ασφαλείας. Το Aegis θα προσπαθήσει να διασώσει όσο το δυνατόν περισσότερες καταχωρήσεις, αλλά είναι πιθανό η εισαγωγή κάποιων ή ακόμα και όλων να αποτύχει.</string>
     <string name="importer_help_google_authenticator"><b>Υποστηρίζονται μόνο αρχεία βάσης δεδομένων από το Google Authenticator έκδοση 5.10 και παλαιότερα</b>.\n\nΠαρέχετε ένα αντίγραφο του <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, που βρίσκεται στον εσωτερικό κατάλογο αποθήκευσης του Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Παρέχεi ένα αντίγραφο του <b> /data/data/com.azure.authenticator/databases/PhoneFactor </b>, που βρίσκεται στον κατάλογο εσωτερικής αποθήκευσης του Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Παρέχεi ένα αρχείο απλού κειμένου με ένα URI Επαληθευτή Google σε κάθε γραμμή.</string>
     <string name="importer_help_steam"><b>Το Steam v3.0 και νεότερα δεν υποστηρίζονται</b>. Παρέχετε αντίγραφο του <b>/data/data/com.valvesoftware. ndroid.steam.community/files/Steamguard-*.json</b>, που βρίσκεται στον εσωτερικό κατάλογο αποθήκευσης του Steam.</string>
+    <string name="importer_help_stratum">Παροχή ενός αρχείου εξαγωγής Stratum που λαμβάνεται μέσω <b>Ρυθμίσεις -&gt; Αντίγραφα ασφαλείας -&gt; Δημιουργία αντιγράφου ασφαλείας σε κρυπτογραφημένο αρχείο (συνιστάται)</b>.</string>
     <string name="importer_help_totp_authenticator">Παρέχετε ένα αρχείο εξαγωγής TOTP Authenticator.</string>
     <string name="importer_help_winauth">Παρέχετε ένα αρχείο εξαγωγής WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Αντιστοίχιση εικονιδίων</string>
+    <string name="import_assign_icons_dialog_text">Θέλετε να αντιστοιχίσετε εικονίδια στις εισαγόμενες καταχωρήσεις;</string>
     <string name="importer_encrypted_exception_google_authenticator">Η κρυπτογραφημένη καταχώρηση παραλείφθηκε: %s</string>
     <string name="importer_help_direct">Εισαγάγετε καταχωρήσεις απευθείας από το %s. Αυτό απαιτεί την εγκατάσταση της εφαρμογής σε αυτήν τη συσκευή και την πρόσβαση root στο Aegis.</string>
     <string name="groups">Ομάδες</string>
@@ -459,23 +553,23 @@
     <string name="pref_account_name_position_hidden">Κρυφό</string>
     <string name="pref_account_name_position_end">Δίπλα στον εκδότη</string>
     <string name="pref_account_name_position_below">Κάτω από τον εκδότη</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d δευτερόλεπτο πριν</item>
         <item quantity="other">%d δευτερόλεπτα πριν</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d λεπτό πριν</item>
         <item quantity="other">%d λεπτά πριν</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d ώρα πριν</item>
         <item quantity="other">%d ώρες πριν</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d ημέρα πριν</item>
         <item quantity="other">%d ημέρες πριν</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d χρόνο πριν</item>
         <item quantity="other">%d χρόνια πριν</item>
     </plurals>
diff --git a/app/src/main/res/values-es-rES-v29/strings.xml b/app/src/main/res/values-es-rES-v29/strings.xml
new file mode 100644
index 00000000..e13a37e6
--- /dev/null
+++ b/app/src/main/res/values-es-rES-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Del sistema</string>
+    <string name="system_amoled_theme_title">Del sistema (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index eb064078..e924f3af 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1,108 +1,152 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="action_settings">Configuración</string>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="action_settings">Ajustes</string>
     <string name="action_about">Acerca de</string>
     <string name="action_delete">Eliminar</string>
     <string name="action_transfer">Transferir</string>
     <string name="action_edit_icon">Editar icono</string>
     <string name="action_reset_usage_count">Reiniciar contador de uso</string>
-    <string name="action_reset_usage_count_dialog">¿Está seguro que desea establecer el contador de uso de esta entrada a 0?</string>
-    <string name="action_default_icon">Restaurar icono predeterminado</string>
+    <string name="action_reset_usage_count_dialog">¿Seguro que quieres restablecer el contador de uso de esta clave a cero?</string>
+    <string name="action_default_icon">Volver al icono original</string>
     <string name="discard">Descartar</string>
     <string name="save">Guardar</string>
+    <string name="all">Todo</string>
     <string name="issuer">Emisor</string>
     <string name="yandex_pin">PIN (4-16 dígitos)</string>
     <string name="motp_pin">PIN (4 dígitos)</string>
-    <string name="suggested">Suguerido</string>
+    <string name="suggested">Sugerido</string>
     <string name="usage_count">Contador de uso</string>
     <string name="warning">Advertencia</string>
-    <string name="pref_cat_appearance_app">App</string>
-    <string name="pref_cat_appearance_entries">Entradas</string>
+    <string name="pref_cat_appearance_app">Aplicación</string>
+    <string name="pref_cat_appearance_entries">Elementos</string>
     <string name="pref_cat_backups_android">Android</string>
     <string name="pref_cat_backups_auto">Copias de seguridad automáticas</string>
     <string name="pref_section_behavior_title">Comportamiento</string>
-    <string name="pref_section_behavior_summary">Personalice el comportamiento al interactuar con la lista de entradas.</string>
+    <string name="pref_section_behavior_summary">Personaliza la funcionalidad y cómo se interactúa con la lista de claves.</string>
     <string name="pref_section_appearance_title">Apariencia</string>
-    <string name="pref_section_appearance_summary">Ajuste el tema, idioma y otros parámetros que afectan a la apariencia de la app.</string>
+    <string name="pref_section_appearance_summary">Ajusta el esquema de colores, idioma y otros parámetros relacionados con el aspecto de la aplicación.</string>
     <string name="pref_section_security_title">Seguridad</string>
-    <string name="pref_section_security_summary">Configure el cifrado, desbloqueo biométrico, bloqueo automático y otros ajustes de seguridad.</string>
-    <string name="pref_section_import_export_title">Importar &amp; Exportar</string>
-    <string name="pref_section_import_export_summary">Importe copias de seguridad de Aegis u otras aplicaciones de autenticación. Exporte manualmente la bóveda de Aegis.</string>
+    <string name="pref_section_security_summary">Configura el cifrado, desbloqueo biométrico, bloqueo automático y otros ajustes de seguridad.</string>
+    <string name="pref_section_import_export_title">Importar y exportar</string>
+    <string name="pref_section_import_export_summary">Importa copias de seguridad de Aegis u otras aplicaciones de autenticación y exporta de forma manual la bóveda de Aegis.</string>
+    <string name="pref_section_audit_log_title">Registro de auditoría</string>
+    <string name="pref_section_audit_log_summary">Ver un listado con todos los cambios realizados en la aplicación.</string>
     <string name="pref_section_backups_title">Copias de seguridad</string>
-    <string name="pref_section_backups_summary">Configure copias de seguridad automáticas en una ubicación de su elección o habilite la participación en el sistema de copia de seguridad en la nube de Android.</string>
+    <string name="pref_section_backups_summary">Configura copias de seguridad automáticas en una carpeta local o activa el sistema de copia de seguridad en la nube de Android.</string>
     <string name="pref_section_icon_packs">Paquetes de iconos</string>
-    <string name="pref_section_icon_packs_summary">Gestione e importe paquetes de iconos.</string>
+    <string name="pref_section_icon_packs_summary">Gestiona e importa tus paquetes de iconos.</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Colores dinámicos</string>
+    <string name="pref_dynamic_colors_summary">Colorear la interfaz con el mismo esquema de colores de tu tema de Android</string>
     <string name="pref_view_mode_title">Modo de visualización</string>
     <string name="pref_lang_title">Idioma</string>
     <string name="pref_show_icons_title">Mostrar iconos</string>
-    <string name="pref_show_icons_summary">Mostrar iconos al lado de cada entrada</string>
+    <string name="pref_show_icons_summary">Mostrar iconos al lado de cada clave</string>
     <string name="pref_code_group_size_title">Agrupación de los dígitos del código</string>
-    <string name="pref_code_group_size_summary">Seleccione el número de dígitos por los que agrupar los códigos</string>
+    <string name="pref_code_group_size_summary">Elige el número de dígitos por los que agrupar los códigos, dejando un espacio entre sí</string>
     <string name="pref_account_name_position_title">Mostrar el nombre de la cuenta</string>
-    <string name="pref_shared_issuer_account_name_title">Mostrar el nombre de la cuenta solo cuando sea necesario</string>
+    <string name="pref_show_next_code_title">Ver siguiente clave</string>
+    <string name="pref_show_next_code_summary">Generar y mostrar la siguiente clave antes de tiempo</string>
+    <string name="pref_expiration_state_title">Indica cuándo están a punto de expirar los códigos</string>
+    <string name="pref_expiration_state_summary">Cambia el color de los códigos y póngalos en parpadeo cuando estén a punto de expirar</string>
+    <string name="pref_expiration_state_fallback">Cambia el color de los códigos y póngalos en parpadeo cuando estén a punto de expirar</string>
+    <string name="pref_shared_issuer_account_name_title">Solo mostrar nombres de cuenta necesarios</string>
     <string name="pref_shared_issuer_account_name_summary">Mostrar nombres de cuenta solo cuando compartan el mismo emisor. Se ocultarán otros nombres de cuenta.</string>
-    <string name="pref_account_name_position_summary_override">Este ajuste es anulado por el modo de vista de baldosas. El nombre de la cuenta siempre se mostrará debajo del emisor.</string>
+    <string name="pref_account_name_position_summary_override">Este ajuste no tiene efecto cuando aparecen en recuadros; el nombre de la cuenta se mostrará debajo del emisor.</string>
     <string name="pref_import_file_title">Importar desde un archivo</string>
-    <string name="pref_import_file_summary">Importar tokens desde un archivo</string>
+    <string name="pref_import_file_summary">Importa tus claves desde un archivo</string>
     <string name="pref_android_backups_title">Copias de seguridad en la nube de Android</string>
     <string name="pref_android_backups_summary">Permitir que el sistema de copia de seguridad en la nube de Android incluya la bóveda de Aegis en sus copias de seguridad. Esto sólo es compatible con las bóvedas cifradas.</string>
-    <string name="pref_android_backups_hint"><i>Las copias de seguridad de dispositivo a dispositivo (D2D) siempre están permitidas, independientemente de la configuración anterior</i></string>
+    <string name="pref_android_backups_hint"><i>Las copias de seguridad entre dispositivos (D2D) siempre se permiten, independientemente de la configuración anterior</i></string>
     <string name="pref_backups_title">Respaldar automáticamente la bóveda</string>
     <string name="pref_backups_summary">Crear automáticamente una copia de seguridad de la bóveda en un almacenamiento externo cuando se produzcan cambios. Esto solo está soportado para las bóvedas cifradas.</string>
     <string name="pref_backups_reminder_title">Recordatorio de copia de seguridad</string>
     <string name="pref_backups_reminder_summary">Mostrar un recordatorio para hacer una copia de seguridad de tu bóveda en caso de que no hayas hecho una copia de tus últimos cambios.</string>
     <string name="pref_backups_reminder_dialog_title">Desactivar recordatorio de copia de seguridad</string>
-    <string name="pref_backups_reminder_dialog_summary">Deshabilitar este recordatorio significa que Aegis no te dirá si tienes o no cambios que aún no están respaldados. Esto te pone en riesgo de perder el acceso a tus tokens. ¿Estás seguro de que quieres desactivar el recordatorio?</string>
-    <string name="pref_backups_location_title">Directorio para los archivos de copia de seguridad</string>
+    <string name="pref_backups_reminder_dialog_summary">Al desactivar el recordatorio Aegis no te dirá si tienes o no cambios que aún no están respaldados. Te arriesgas a perder tus claves. ¿Estás seguro de querer desactivarlo?</string>
+    <string name="pref_backups_versioning_strategy_title">Estrategia de respaldo</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Mantener varias versiones</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Respaldo único</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">La estrategia de copia de seguridad seleccionada no es fiable ni recomendable. Un único fallo de copia de seguridad podría hacer que lo pierdas todo.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Elige una estrategia de respaldo</string>
+    <string name="pref_backups_location_title">Ubicación del respaldo</string>
     <string name="pref_backups_location_summary">Las copias de seguridad se guardarán en</string>
+    <string name="pref_backup_location_summary">La copia de seguridad se guardará en</string>
     <string name="pref_backups_trigger_title">Lanzar una copia de seguridad</string>
     <string name="pref_backups_trigger_summary">Lanzar una copia de seguridad manualmente</string>
     <string name="pref_backups_versions_title">Número de versiones a conservar</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Conservar %1$d versión de la copia de seguridad</item>
         <item quantity="other">Conservar %1$d versiones de la copia de seguridad</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">No borrar ninguna copia de seguridad antigua</string>
     <string name="pref_import_app_title">Importar desde una aplicación</string>
-    <string name="pref_import_app_summary">Importar tokens desde una aplicación (requiere acceso root)</string>
+    <string name="pref_import_app_summary">Importa tus claves desde una aplicación (mediante superusuario o «root»)</string>
     <string name="pref_export_title">Exportar</string>
     <string name="pref_export_summary">Exportar la bóveda</string>
     <string name="pref_password_reminder_title">Recordatorio de contraseña</string>
-    <string name="pref_google_auth_export_title">Exportar para Google Authenticator</string>
+    <string name="pref_google_auth_export_title">Exportar a Google Authenticator</string>
     <string name="pref_google_auth_export_descriptor">Genera códigos QR de exportación compatibles con Google Authenticator</string>
-    <string name="pref_google_auth_export_no_data">No hay datos para exportar</string>
+    <string name="pref_google_auth_export_no_data">No hay datos que exportar</string>
     <plurals name="pref_google_auth_export_incompatible_entries">
         <item quantity="one">Omitida %d entrada incompatible</item>
-        <item quantity="other">Omitidas %d entradas incompatibles</item>
+        <item quantity="other">Se han omitido %d claves incompatibles</item>
     </plurals>
     <string name="pref_password_reminder_summary">Para evitar olvidarla, solicitarme la contraseña con esta frecuencia: %s.</string>
     <string name="pref_password_reminder_summary_disabled">Desactivado</string>
-    <string name="pref_secure_screen_title">Seguridad en pantalla</string>
+    <string name="pref_secure_screen_title">Pantalla protegida</string>
     <string name="pref_secure_screen_summary">Bloquea las capturas de pantalla y otros intentos de captura dentro de la aplicación</string>
-    <string name="pref_tap_to_reveal_title">Pulsar para mostrar</string>
+    <string name="pref_tap_to_reveal_title">Pulsa para mostrar</string>
     <string name="pref_tap_to_reveal_summary">Los tokens se ocultarán por defecto. Pulse sobre ellos para revelar el código.</string>
     <string name="pref_tap_to_reveal_time_title">Tiempo de espera de pulsar para mostrar</string>
     <string name="pref_auto_lock_title">Bloqueo automático</string>
     <string name="pref_auto_lock_summary">Cuando %s</string>
     <string name="pref_auto_lock_summary_disabled">Desactivado</string>
     <string name="pref_auto_lock_prompt">Bloquear automáticamente Aegis cuando</string>
-    <string name="pref_auto_lock_type_back_button">Al presionar el botón Atrás</string>
-    <string name="pref_auto_lock_type_minimize">Al minimizar la app</string>
+    <string name="pref_auto_lock_type_back_button">Al presionar el botón para volver</string>
+    <string name="pref_auto_lock_type_minimize">Al minimizar la aplicación</string>
     <string name="pref_auto_lock_type_device_lock">Al bloquear el dispositivo</string>
-    <string name="pref_backup_password_category">Copia de seguridad &amp; Exportar</string>
-    <string name="pref_backup_password_title">Contraseña separada para la copia de seguridad &amp; la exportación</string>
+    <string name="pref_backup_password_category">Copia de seguridad y exportación</string>
+    <string name="pref_backup_password_title">Contraseña a parte para las copias de seguridad y exportación</string>
     <string name="pref_backup_password_summary">Si está activado, la contraseña que se utiliza para desbloquear la aplicación no se podrá utilizar para descifrar copias de seguridad y exportaciones.</string>
-    <string name="pref_backup_password_change_title">Cambiar la contraseña para la copia de seguridad &amp; la exportación</string>
+    <string name="pref_backup_password_change_title">Cambiar la contraseña para copias de seguridad y exportación</string>
     <string name="pref_backup_password_change_summary">Establezca una nueva contraseña que se utilizará para encriptar la bóveda durante la copia de seguridad y la exportación.</string>
     <string name="pref_encryption_title">Cifrado</string>
     <string name="pref_encryption_summary">Cifra la bóveda y la desbloquea mediante una contraseña o biometría</string>
     <string name="pref_biometrics_title">Desbloqueo biométrico</string>
     <string name="pref_biometrics_summary">Permite la autenticación biométrica para desbloquear la bóveda</string>
+    <string name="pref_search_behavior_summary">Campos a buscar: %s</string>
+    <string name="pref_search_behavior_prompt">Incluir los datos de estos campos en tus búsquedas</string>
+    <string name="pref_search_behavior_type_name">Nombre</string>
+    <string name="pref_search_behavior_type_issuer">Emisor</string>
+    <string name="pref_search_behavior_type_note">Notas</string>
+    <string name="pref_search_behavior_type_groups">Grupos</string>
     <string name="pref_set_password_title">Cambiar contraseña</string>
-    <string name="pref_set_password_summary">Establece una nueva contraseña que necesitará para desbloquear su bóveda</string>
+    <string name="pref_set_password_summary">Crea una nueva contraseña que necesitarás para desbloquear tu bóveda</string>
+    <string name="no_events_title">No parece haber ningún cambio</string>
+    <string name="no_events_description">No se han grabado eventos importantes en la aplicación</string>
+    <string name="event_title_vault_unlocked">Bóveda desbloqueada</string>
+    <string name="event_description_vault_unlocked">La bóveda se ha desbloqueado correctamente</string>
+    <string name="event_title_backup_created">Se ha creado una copia de seguridad</string>
+    <string name="event_description_backup_created">Una copia de seguridad ha terminado sin problemas</string>
+    <string name="event_title_android_backup_created">Android ha hecho una copia de seguridad</string>
+    <string name="event_description_android_backup_created">Se ha terminado de realizar una copia de seguridad del sistema Android</string>
+    <string name="event_title_vault_exported">Se han exportado los datos de la bóveda</string>
+    <string name="event_description_vault_exported">Se ha hecho una copia fuera de la aplicación</string>
+    <string name="event_title_entry_shared">Se ha compartido un código</string>
+    <string name="event_description_entry_shared">Se ha compartido un elemento</string>
+    <string name="event_title_vault_unlock_failed_password">Hubo un fallo al desbloquear la bóveda (contraseña)</string>
+    <string name="event_description_vault_unlock_failed_password">Hubo un intento fallido al escribir una contraseña de desbloqueo</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Hubo un fallo al desbloquear la bóveda (biometría)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Hubo un intento fallido al utilizar el desbloqueo biométrico</string>
+    <string name="event_unknown">Tipo de evento desconocido</string>
+    <string name="audit_log_entry_deleted">(borrado)</string>
+    <string name="today_at_time">Hoy a las %1$s</string>
+    <string name="day_of_week_at_time">%1$s a las %2$s</string>
     <string name="export_encrypted">Cifrar la bóveda</string>
     <string name="export_help">Esta acción exportará la bóveda fuera del almacenamiento interno de Aegis. Seleccione el formato al que desea exportar:</string>
-    <string name="export_warning_unencrypted">Está a punto de exportar una copia sin cifrar de su bóveda de Aegis. <b>Esto no es recomendable</b>.</string>
+    <string name="export_warning_unencrypted">Estás a punto de exportar una copia sin cifrar de tu bóveda de Aegis. <b>No se recomienda en absoluto</b>.</string>
     <string name="export_warning_password">Las exportaciones se cifran usando una contraseña separada configurada en la configuración de seguridad.</string>
     <string name="understand_risk_accept">Entiendo el riesgo</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
@@ -116,117 +160,127 @@
         <item quantity="other">%d grupos seleccionados</item>
     </plurals>
     <string name="export_no_groups_selected">No se han seleccionado grupos para exportar</string>
-    <string name="export_html_title" context="The title of an HTML export document">Exportación de Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Exportación de Aegis Authenticator</string>
     <string name="choose_authentication_method">Seguridad</string>
-    <string name="authentication_method_explanation">Aegis es una aplicación 2FA centrada en la seguridad. Los tokens se almacenan en una bóveda, que opcionalmente puede cifrarse con una contraseña de su elección. Si un atacante obtiene su archivo de bóveda cifrado, no podrá acceder al contenido sin conocer la contraseña.\n\nHemos preseleccionado la opción que creemos que encajaría mejor para su dispositivo.</string>
+    <string name="authentication_method_explanation">Aegis es una aplicación 2FA centrada en la seguridad. Las claves o «tokens» se almacenan en una bóveda, que de forma opcional puede cifrarse con una contraseña personal. Si algún malhechor obtiene tu archivo de bóveda cifrado no podrá acceder al contenido sin conocer dicha contraseña.\n\nHemos elegido la opción que creemos que se ajusta más a tu dispositivo.</string>
     <string name="authentication_method_none">Ninguno</string>
     <string name="authentication_method_none_description">No necesitará una contraseña para desbloquear la bóveda y no se cifrará. <b>No se recomienda esta opción</b>.</string>
     <string name="authentication_method_password">Contraseña</string>
     <string name="authentication_method_password_description">Se necesita una contraseña para desbloquear la bóveda.</string>
-    <string name="authentication_method_password_explanation">Advertencia: Si olvida su contraseña, perderá permanentemente el acceso a sus tokens. No hay forma de recuperarlos sin la contraseña.</string>
+    <string name="authentication_method_password_explanation">Advertencia: Si olvidas tu contraseña no podrás ver tus claves de acceso. Sin la contraseña no hay recuperación posible.</string>
     <string name="authentication_method_biometrics">Biometría</string>
-    <string name="authentication_method_biometrics_description">Además de una contraseña, la biometría registrada en este dispositivo, como una huella digital o su cara, pueden ser usados para desbloquear la bóveda.</string>
+    <string name="authentication_method_biometrics_description">Aparte de contraseña, se puede aprovechar el sistema biométrico del dispositivo (como huellas dactilares o fotos de la cara) para desbloquear la bóveda de forma más sencilla.</string>
     <string name="authentication">Desbloquear la bóveda</string>
     <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Desbloquear\nla bóveda</string>
-    <string name="auth_use_biometrics">O pulse aquí para utilizar la <font fgcolor="#FF0D86C1">biometría</font></string>
-    <string name="set_password">Por favor introduzca una contraseña</string>
-    <string name="set_group">Por favor introduzca un nombre de grupo</string>
-    <string name="set_number">Por favor introduzca un número</string>
-    <string name="set_password_confirm">Por favor confirme la contraseña</string>
+    <string name="auth_use_biometrics">O pulsa aquí para utilizar la <font fgcolor="#FF0D86C1">biometría</font></string>
+    <string name="set_password">Escribe una contraseña</string>
+    <string name="set_group">Escribe un nombre de grupo</string>
+    <string name="set_number">Escribe un número</string>
+    <string name="set_password_confirm">Asegúrate de que la contraseña esté bien</string>
     <string name="invalid_password">La contraseña es incorrecta</string>
-    <string name="invalidated_biometrics">Se ha detectado un cambio en la configuración de seguridad de su dispositivo. Por favor, vaya a \"Aegis -&gt; Configuración -&gt; Seguridad -&gt; Desbloqueo biométrico\" para desactivar y reactivar el desbloqueo biométrico.</string>
-    <string name="password_reminder">Por favor, introduzca su contraseña. Le pediremos que lo haga ocasionalmente para que no la olvide.</string>
+    <string name="invalidated_biometrics">Se ha detectado un cambio en la configuración de seguridad de tu dispositivo. Ve a «Aegis -&gt; Configuración -&gt; Seguridad -&gt; Desbloqueo biométrico» para desactivar y reactivar el desbloqueo biométrico.</string>
+    <string name="password_reminder">Escribe tu contraseña, te pediremos que la vuelvas a poner al abrir la aplicación de vez en cuando para que no se te olvide.</string>
     <string name="password_reminder_dialog_title">Desbloqueo biométrico por defecto</string>
-    <string name="password_reminder_dialog_message">De vez en cuando, le pedimos que introduzca su contraseña para asegurarse de que no la ha olvidado y no se quede sin acceso a su bóveda. Después de introducir su contraseña una vez, Aegis volverá al desbloqueo biométrico hasta que sea hora de otro recordatorio de contraseña.</string>
+    <string name="password_reminder_dialog_message">Te pediremos que vuelvas a escribir tu contraseña de vez en cuando para asegurarnos de que no la hayas olvidado y que no te quedes sin acceso a la bóveda en un futuro. Si está bien la aplicación volverá a seguir intentando el desbloqueo biométrico hasta el siguiente recordatorio.</string>
     <string name="password_reminder_freq_never">Nunca</string>
     <string name="password_reminder_freq_weekly">Cada semana</string>
     <string name="password_reminder_freq_biweekly">Cada dos semanas</string>
     <string name="password_reminder_freq_monthly">Cada mes</string>
     <string name="password_reminder_freq_quarterly">Cada tres meses</string>
     <string name="enter_password_2fas_message">Parece que esta copia de seguridad de 2FAS está cifrada. Introduzca la contraseña a continuación.</string>
-    <string name="enter_password_authy_message">Parece que sus tokens de Authy están cifrados. Por favor, cierre Aegis, abra Authy y desbloquee los tokens con su contraseña. En su lugar, Aegis también puede intentar descifrar sus tokens de Authy por usted, si introduce su contraseña a continuación.</string>
-    <string name="enter_password_aegis_title">Por favor ingrese la contraseña de importación</string>
+    <string name="enter_password_authy_message">Parece que tus tokens de Authy están cifrados. Cierra Aegis, abre Authy y desbloquea los tokens con tu contraseña. Si lo prefieres Aegis también puede intentar descifrar tus tokens de Authy directamente, si escribes tu contraseña a continuación.</string>
+    <string name="enter_password_aegis_title">Introduce la contraseña de importación</string>
     <string name="period_hint">Periodo (segundos)</string>
     <string name="algorithm_hint">Función hash</string>
     <string name="type">Tipo</string>
     <string name="share">Compartir</string>
-    <string name="yes">Si</string>
+    <string name="yes">Sí</string>
     <string name="no">No</string>
+    <string name="undo">Deshacer</string>
     <string name="unlock">Desbloquear</string>
     <string name="advanced">Avanzado</string>
     <string name="counter">Contador</string>
     <string name="digits">Dígitos</string>
     <string name="secret">Código secreto</string>
-    <string name="scan">Escanear código QR</string>
-    <string name="scan_image">Escanear imagen</string>
+    <string name="scan">Escanear un código QR</string>
+    <string name="scan_image">Escanear una imagen</string>
     <string name="enter_manually">Introducir manualmente</string>
     <string name="set_up_biometric">Configurar desbloqueo biométrico</string>
     <string name="copy">Copiar</string>
     <string name="edit">Editar</string>
+    <string name="select_all">Seleccionar todo</string>
+    <string name="assign_icons">Asignar iconos</string>
+    <string name="assign_groups">Asignar al grupo</string>
+    <string name="assign_groups_dialog_summary">Seleccione un grupo al que desea asignar las entradas seleccionadas.</string>
+    <string name="assign_groups_dialog_dropdown">Seleccionar grupo</string>
     <string name="favorite" comment="Verb">Marcar favorito</string>
     <string name="unfavorite" comment="Verb">Desmarcar favorito</string>
     <string name="error_all_caps">ERROR</string>
     <string name="password">Contraseña</string>
     <string name="confirm_password">Confirmar contraseña</string>
-    <string name="show_password">Mostrar contraseña</string>
-    <string name="new_entry">Nueva entrada</string>
-    <string name="add_new_entry">Añadir nueva entrada</string>
+    <string name="show_password">Ver contraseña</string>
+    <string name="new_entry">Nueva clave</string>
+    <string name="add_new_entry">Añadir nueva clave</string>
     <string name="unlock_vault_error">No se pudo desbloquear la bóveda</string>
-    <string name="unlock_vault_error_description">Contraseña incorrecta. Asegúrese de no haberla introducido erróneamente.</string>
+    <string name="unlock_vault_error_description">Contraseña incorrecta. Asegúrate de que no tenga errores de escritura.</string>
     <string name="password_equality_error">Las contraseñas deben ser idénticas y no estar en blanco</string>
-    <string name="snackbar_authentication_method">Por favor seleccione un método de autentificación</string>
+    <string name="snackbar_authentication_method">Elige una forma de autenticarte</string>
     <string name="encrypting_vault">Cifrando la bóveda</string>
     <string name="exporting_vault">Exportando la bóveda</string>
+    <string name="optimizing_icon">Optimizando el icono</string>
+    <string name="optimizing_icon_multiple">Optimizando iconos: %1$d de %2$d</string>
     <string name="reading_file">Leyendo archivo</string>
     <string name="requesting_root_access">Solicitando acceso a la raíz</string>
     <string name="analyzing_qr">Analizando código QR</string>
-    <string name="analyzing_qr_multiple">Analizando código QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analizando código QR %1$d de %2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Añadida %d nueva entrada a la bóveda</item>
-        <item quantity="other">Añadidas %d nuevas entradas a la bóveda</item>
+        <item quantity="other">Añadidas %d nuevas claves a la bóveda</item>
     </plurals>
     <string name="importing_icon_pack">Importando paquete de iconos</string>
-    <string name="delete_entry">Eliminar entrada</string>
-    <string name="delete_entry_description">¿Está seguro de que desea eliminar esta entrada?</string>
+    <string name="delete_entry">Borrar clave</string>
+    <string name="delete_entry_description">¿Seguro de que quieres borrar la clave?</string>
     <string name="delete_entry_explanation">Esta acción no desactiva 2FA para:\n<b>%s</b>\n\nPara prevenir la pérdida de acceso, asegúrate de que has desactivado 2FA o que tienes una forma alternativa de generar códigos para este servicio.</string>
-    <string name="delete_entries">Eliminar entradas</string>
+    <string name="delete_entries">Borrar claves</string>
     <plurals name="delete_entries_description">
-        <item quantity="one">¿Está seguro de que desea eliminar %d entrada?</item>
-        <item quantity="other">¿Está seguro de que desea eliminar %d entradas?</item>
+        <item quantity="one">¿Seguro de que desea eliminar %d clave?</item>
+        <item quantity="other">¿Seguro que quieres borrar %d claves?</item>
     </plurals>
     <string name="discard_changes">¿Descartar cambios?</string>
-    <string name="discard_changes_description">Sus cambios no se han guardado</string>
-    <string name="saving_profile_error">Error al guardar el perfil</string>
-    <string name="welcome">Bienvenido</string>
+    <string name="discard_changes_description">Tus cambios no se han guardado</string>
+    <string name="saving_profile_error">Hubo un error al guardar el perfil</string>
+    <string name="saving_assign_icons_error">Error al asignar iconos</string>
+    <string name="welcome">Te damos la bienvenida</string>
     <string name="app_description">Aegis es una aplicación 2FA gratuita, segura y de código abierto</string>
-    <string name="setup_completed">Configuración completada</string>
+    <string name="setup_completed">Se ha completado la configuración</string>
     <string name="setup_completed_description">Aegis se ha configurado y está listo para funcionar.</string>
     <string name="vault_not_found">Bóveda no encontrada, iniciando la configuración…</string>
     <string name="copied">Copiado</string>
-    <string name="errors_copied">Errores copiados al portapapeles</string>
+    <string name="errors_copied">Se han copiado los errores al portapapeles</string>
     <string name="version_copied">Versión copiada al portapapeles</string>
+    <string name="error_required_field">Este campo es obligatorio</string>
     <string name="error_occurred">Se ha producido un error</string>
     <string name="decryption_error">Se ha producido un error tratando de desbloquear la bóveda</string>
     <string name="decryption_corrupt_error">Se ha producido un error al intentar abrir la bóveda. El archivo podría estar dañado.</string>
     <string name="saving_error">Se ha producido un error tratando de guardar la bóveda</string>
     <string name="vault_init_error">Se ha producido un error tratando de desbloquear la bóveda</string>
     <string name="vault_load_error">Se ha producido un error al intentar cargar la bóveda desde el almacenamiento</string>
-    <string name="biometric_decrypt_error">Se ha producido un error mientras se trataba de descifrar la bóveda con autenticación biométrica. Esto normalmente solo ocurre si se cambiaron los ajustes de seguridad del dispositivo. Por favor, desbloquee la bóveda con su contraseña y reconfigure la autenticación biométrica en la configuración de Aegis.</string>
-    <string name="biometric_init_error">Se ha producido un error mientras se trataba de preparar la autenticación biométrica. Esto normalmente sólo ocurre si se cambiaron los ajustes de seguridad del dispositivo. Por favor, desbloquee la bóveda con su contraseña y reconfigure la autenticación biométrica en la configuración de Aegis.</string>
+    <string name="biometric_decrypt_error">Se ha producido un error al intentar descifrar la bóveda mediante biometría. Esto normalmente solo pasa al cambiar los ajustes de seguridad del dispositivo. Desbloquea la bóveda con tu contraseña y reactiva la autenticación biométrica en la configuración de Aegis.</string>
+    <string name="biometric_init_error">Se ha producido un error al intentar utilizar la biometría. Esto normalmente solo pasa al cambiar los ajustes de seguridad del dispositivo. Desbloquea la bóveda con tu contraseña y reactiva la autenticación biométrica en la configuración de Aegis.</string>
     <string name="disable_encryption">Desactivar cifrado</string>
     <string name="disable_encryption_description">¿Está seguro de que desea desactivar el cifrado?. Esto provocará que la bóveda sea almacenada en texto plano. <b>Las copias de seguridad automáticas también serán desactivadas</b>.</string>
-    <string name="enable_encryption_error">Se ha producido un error tratando de activar el cifrado</string>
+    <string name="enable_encryption_error">Se ha producido un error al intentar activar el cifrado</string>
     <string name="disable_encryption_error">Se ha producido un error tratando de desactivar el cifrado</string>
     <string name="backup_successful">La copia de seguridad se programó correctamente</string>
     <string name="backup_error">Se ha producido un error mientras se trataba de crear una copia de seguridad</string>
-    <string name="backup_status_success">Última copia de seguridad exitosa: %s</string>
+    <string name="backup_status_success">Última copia de seguridad completa: %s</string>
     <string name="backup_status_failed">Última copia de seguridad fallida: %s</string>
     <string name="backup_status_none">Aún no se han realizado copias de seguridad</string>
     <string name="backup_warning_password">Las copias de seguridad se cifran usando una contraseña separada configurada en la configuración de seguridad</string>
-    <string name="documentsui_error">DocumentsUI parece estar ausente en su dispositivo. Este es un componente importante del sistema necesario para la selección y creación de documentos. Si utilizaste una herramienta para &quot;desinstalar&quot; apps de fábrica de tu dispositivo, es posible que la hayas eliminado accidentalmente, y por ello, tendrás que volverla a instalarla.</string>
-    <string name="icon_pack_import_error">Se ha producido un error tratando de importar un paquete de iconos</string>
-    <string name="icon_pack_import_exists_error">El paquete de iconos que está intentando importar ya existe. ¿Desea sobreescribirlo?</string>
-    <string name="icon_pack_delete_error">Se ha producido un error tratando de eliminar un paquete de iconos</string>
+    <string name="documentsui_error">Tu dispositivo parece no tener DocumentsUI. Es un componente del sistema importante y necesario para elegir y crear archivos. Si utilizaste una herramienta para desinstalar (o hacer «debloat» de) aplicaciones que vienen de fábrica es posible que la hayas eliminado accidentalmente, tendrás que volverla a instalarla.</string>
+    <string name="icon_pack_import_error">Se ha producido un error al intentar importar un paquete de iconos</string>
+    <string name="icon_pack_import_exists_error">El paquete de iconos a importar ya existe. ¿Quieres reemplazarlo?</string>
+    <string name="icon_pack_delete_error">Se ha producido un error al intentar borrar un paquete de iconos</string>
     <plurals name="icon_pack_info">
         <item quantity="one">%d icono</item>
         <item quantity="other">%d iconos</item>
@@ -237,101 +291,127 @@
     <string name="andotp_old_format">Formato antiguo (v0.6.2 o anterior) </string>
     <string name="choose_andotp_importer">¿Qué formato tiene el archivo de copia de seguridad de andOTP?</string>
     <string name="choose_totpauth_importer">¿Está cifrada con una contraseña esta copia de seguridad de TOTP Authenticator?</string>
-    <string name="choose_application">Seleccione la aplicación desde la que desea importar</string>
-    <string name="choose_theme">Seleccione su tema deseado</string>
-    <string name="choose_account_name_position">Seleccione la posición del nombre de la cuenta deseada</string>
-    <string name="choose_view_mode">Seleccione su modo de visualización deseado</string>
+    <string name="choose_application">Elige la aplicación desde la que importar los datos</string>
+    <string name="choose_theme">Elige el esquema de colores que más te guste</string>
+    <string name="choose_account_name_position">Elige una posición para ubicar el nombre de la cuenta</string>
+    <string name="choose_view_mode">Elige un modo de visualización</string>
     <string name="choose_copy_behavior">Seleccione el comportamiento de copia deseado</string>
-    <string name="parsing_file_error">Se ha producido un error procesando el archivo</string>
+    <string name="parsing_file_error">Se ha producido un error al intentar procesar el archivo</string>
     <string name="file_not_found">Error: Archivo no encontrado</string>
-    <string name="reading_file_error">Se ha producido un error tratando de leer el archivo</string>
+    <string name="reading_file_error">Se ha producido un error al intentar leer el archivo</string>
     <string name="app_lookup_error">Error: La aplicación no está instalada</string>
     <string name="app_version_error">La versión de %s que está instalada no es compatible. Las versiones recientes han comenzado a cifrar algunos de los archivos en el directorio de almacenamiento interno, haciendo que Aegis no pueda acceder a la información que necesita para la importación. Intentar importar probablemente resultará en un error. ¿Deseas continuar de todos modos?</string>
     <string name="root_error">Error: No se puede obtener acceso a la raíz</string>
     <plurals name="imported_entries_count">
-        <item quantity="one">Importada %d entrada</item>
-        <item quantity="other">Importadas %d entradas</item>
+        <item quantity="one">Importada %d clave</item>
+        <item quantity="other">Importadas %d claves</item>
     </plurals>
     <plurals name="entries_shown">
-        <item quantity="one">Mostrando %d entrada</item>
-        <item quantity="other">Mostrando %d entradas</item>
+        <item quantity="one">Mostrando %d clave</item>
+        <item quantity="other">Mostrando %d claves</item>
     </plurals>
     <string name="intro_import_error_title">Se ha producido un error al importar la bóveda</string>
     <string name="import_error_title">Se han producido uno o más errores durante la importación</string>
     <string name="exporting_vault_error">Se ha producido un error tratando de exportar la bóveda</string>
     <string name="exported_vault">La bóveda ha sido exportada</string>
     <string name="encryption_set_password_error">Se ha producido un error tratando de establecer la contraseña.</string>
-    <string name="encryption_enable_biometrics_error">Se ha producido un error mientras se trataba de habilitar el desbloqueo biométrico. Algunos dispositivos tienen implementaciones deficientes de autenticación biométrica y es probable que el suyo sea uno de ellos. Considere cambiar a una configuración de sólo contraseña en su lugar.</string>
+    <string name="encryption_enable_biometrics_error">Se ha producido un error al intentar activar el desbloqueo biométrico. Algunos dispositivos tienen deficiencias importantes en sus sistemas de autenticación biométrica y es probable que el tuyo sea uno de ellos. Prueba desactivándolo y dejando solo el acceso por contraseña.</string>
     <string name="no_cameras_available">No hay ninguna cámara disponible</string>
-    <string name="read_qr_error">Se ha producido un error tratando de leer el código QR</string>
-    <string name="read_qr_error_phonefactor">Aegis no es compatible con el algoritmo 2FA propietario de Microsoft. Por favor, asegúrese de seleccionar \"Configurar aplicación sin notificaciones\" al configurar 2FA en Office 365.</string>
+    <string name="read_qr_error">Se ha producido un error al intentar leer el código QR</string>
+    <string name="read_qr_error_phonefactor">Aegis no es compatible con el algoritmo 2FA personalizado de Microsoft. Asegúrate de elegir «Configurar aplicación sin notificaciones» al generar tus códigos 2FA en Office 365 para que funcione.</string>
     <string name="partial_google_auth_import">Se ha detectado una exportación incompleta de Google Authenticator</string>
-    <string name="partial_google_auth_import_warning">Faltan algunos códigos QR en su importación. Los siguientes códigos no fueron encontrados:\n\n<b>%s</b>\n\nPuede continuar importando esta exportación parcial pero recomendamos volver a intentarlo con todos los códigos QR para que no se arriesgue a perder el acceso a ningún token.</string>
+    <string name="partial_google_auth_import_warning">Algunos código QR de importación no están. Faltan los siguientes códigos:\n\n<b>%s</b>\n\nPuedes seguir adelante con esta importación parcial, pero te recomendamos volver a probar otra vez a escanear todos los códigos QR para evitar que pierdas el acceso a alguno de ellos.</string>
     <string name="missing_qr_code_descriptor">• código QR %d</string>
-    <string name="import_partial_export_anyway">Importar %d tokens de todos modos</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Seguir con la importación de este código</item>
+        <item quantity="other">Seguir con la importación de estos %d códigos</item>
+    </plurals>
     <string name="import_google_auth_failure">Ha fallado la importación de lo exportado de Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">La exportación contiene información para un lote no relacionado. Intente importar 1 lote a la vez.</string>
-    <string name="no_tokens_can_be_imported">Como resultado no se puede importar ningún token</string>
-    <string name="authentication_method_raw">Raw</string>
+    <string name="no_tokens_can_be_imported">Como consecuencia no se pudo importar ninguna de las claves</string>
     <string name="unlocking_vault">Desbloqueando la bóveda</string>
-    <string name="slot_this_device">(este dispositivo)</string>
+    <string name="rename_group">Renombrar grupo</string>
+    <string name="no_group_selection">El resto de elementos que no hayas asignado apareceran como «Sin agrupar».</string>
     <string name="remove_group">Eliminar grupo</string>
-    <string name="remove_group_description">¿Está seguro de que desea eliminar este grupo? Las entradas se moverán automáticamente a \'Sin grupo\'.</string>
-    <string name="remove_icon_pack">Eliminar paquete de iconos</string>
-    <string name="remove_icon_pack_description">¿Está seguro de que desea eliminar este paquete de iconos? Las entradas que usen iconos de este paquete no se verán afectadas.</string>
-    <string name="details">Detalles</string>
+    <string name="remove_group_description">¿Seguro que quieres borrar este grupo? Sus elementos se moverán automáticamente a «Sin grupo».</string>
+    <string name="remove_unused_groups">Eliminar grupos no utilizados</string>
+    <string name="remove_unused_groups_description">¿Seguro que quieres borrar todos los grupos que estén vacíos y no tengan ninguna clave dentro?</string>
+    <string name="remove_icon_pack">Borrar paquete de iconos</string>
+    <string name="remove_icon_pack_description">¿Seguro que quieres borrar este paquete de iconos? Las claves que ya utilicen algún icono de este paquete no se verán afectadas.</string>
+    <string name="details">Más detalles</string>
     <string name="show_error_details">Mostrar detalles del error</string>
     <string name="lock">Bloquear</string>
     <string name="name">Cuenta</string>
     <string name="no_group">Sin grupo</string>
-    <string name="sort">Ordenar</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ordenar</string>
     <string name="sort_alphabetically">Emisor (A a Z)</string>
     <string name="sort_alphabetically_reverse">Emisor (Z a A)</string>
     <string name="sort_alphabetically_name">Cuenta (A a Z)</string>
     <string name="sort_alphabetically_name_reverse">Cuenta (Z a A)</string>
     <string name="sort_usage_count">Contador de uso</string>
+    <string name="sort_last_used">Último uso</string>
     <string name="sort_custom">Personalizado</string>
+    <string name="last_used">Último uso</string>
+    <string name="last_used_never">nunca</string>
     <string name="new_group">Nuevo grupo…</string>
     <string name="group">Grupo</string>
     <string name="group_name_hint">Nombre del grupo</string>
     <string name="preference_manage_groups">Editar grupos</string>
-    <string name="preference_manage_groups_summary">Gestione y elimine sus grupos aquí</string>
+    <string name="preference_manage_groups_summary">Gestiona y borra tus grupos</string>
     <string name="preference_reset_usage_count">Reiniciar contador de uso</string>
-    <string name="preference_reset_usage_count_summary">Restablece el contador de uso de cada entrada de su bóveda</string>
-    <string name="preference_reset_usage_count_dialog">¿Está seguro de que desea establecer el recuento de uso de cada entrada de su bóveda a 0?</string>
-    <string name="note">Nota</string>
+    <string name="preference_reset_usage_count_summary">Restablece el contador de uso de todas las claves de tu bóveda</string>
+    <string name="preference_reset_usage_count_dialog">¿Seguro de que quieres resetear el contador de uso de todas las claves y dejarlos a cero?</string>
+    <string name="note" comment="Users can add a note to an entry">Nota</string>
     <string name="clear">Restablecer</string>
-    <string name="pref_highlight_entry_title">Resaltar tokens al pulsarlos</string>
-    <string name="pref_highlight_entry_summary">Hace que los tokens sean más fáciles de distinguir entre ellos resaltándolos temporalmente tras ser pulsados</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Hay un código duplicado</string>
+    <string name="dialog_duplicate_entry_message">Este código tiene el mismo nombre y emisor que otros que ya están en la lista. ¿Qué quieres hacer?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Sobrescribir códigos</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Reemplazarlos. Esta acción no se puede deshacer</string>
+    <string name="dialog_duplicate_entry_suffix_title">Añadir sufijo</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Añade un sufijo al nombre de este nuevo código. El nuevo nombre será: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">No guardar</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Permite editarlo antes de volverlo a guardar</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">¿Seguro que quieres borrar %d elemento con el siguiente nombre:\n\n%s - %s?</item>
+        <item quantity="other">¿Seguro que quieres borrar %d elementos con el siguiente nombre:\n\n%s - %s?</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Confirmar borrado</string>
+    <string name="pref_haptic_feedback_summary">Hace vibrar tu dispositivo al actualizar los códigos</string>
+    <string name="pref_haptic_feedback_title">Vibración</string>
+    <string name="pref_highlight_entry_title">Resaltar códigos al pulsar</string>
+    <string name="pref_highlight_entry_summary">Resalta temporalmente cada clave que toques sobre las demás para que sea más fácil de distinguir</string>
+    <string name="pref_groups_multiselect_title">Selección multiple de grupos</string>
+    <string name="pref_groups_multiselect_summary">Permite seleccionar varios grupos a la vez</string>
     <string name="pref_minimize_on_copy_title">Minimizar al copiar</string>
-    <string name="pref_minimize_on_copy_summary">Minimiza la app después de copiar un token</string>
-    <string name="pref_copy_behavior_title">Copiar tokens al portapapeles</string>
-    <string name="pref_pause_entry_title">Congelar tokens al tocarlos</string>
-    <string name="pref_pause_entry_summary">Pausa la recarga automática de los tokens tocándolos. Las tokens no se actualizarán mientras estén enfocadas. Requiere \"Resaltar tokens al pulsarlos\" o \"Pulsar para mostrar\".</string>
-    <string name="pin_keyboard_description">Introduzca su contraseña para activar el teclado PIN. Tenga en cuenta que esto solo funciona si su contraseña contiene únicamente números</string>
+    <string name="pref_minimize_on_copy_summary">Minimiza la aplicación tras copiar claves</string>
+    <string name="pref_copy_behavior_title">Copiar claves en el portapapeles</string>
+    <string name="pref_search_behavior_title">Comportamiento de búsqueda</string>
+    <string name="pref_pause_entry_title">Congelar claves al tocarlas</string>
+    <string name="pref_pause_entry_summary">Pausa la recarga automática de las claves al tocarlas, por lo que no irán cambiando según expiran. Es necesario que también actives «Resaltar códigos al pulsar» o «Pulsar para mostrar».</string>
+    <string name="pin_keyboard_description">Escribe tu contraseña para activar el teclado PIN. Ten en cuenta que esto solo funciona si tu contraseña son todo números</string>
     <string name="pin_keyboard_error">Error al activar el teclado PIN</string>
-    <string name="pin_keyboard_error_description">No es posible establecer el teclado PIN. Su contraseña debe contener únicamente números.</string>
+    <string name="pin_keyboard_error_description">No se pudo abrir el teclado PIN. Para ello tu contraseña tiene que ser completamente numérica.</string>
     <string name="pin_keyboard_disabled">Contraseña cambiada. Ya no se mostrará el teclado PIN.</string>
     <string name="selected">Seleccionado</string>
     <string name="dark_theme_title">Tema oscuro</string>
     <string name="light_theme_title">Tema claro</string>
     <string name="amoled_theme_title">Tema AMOLED</string>
-    <string name="system_theme_title">Establecer por Ahorro de Batería</string>
-    <string name="system_amoled_theme_title">Establecer por Ahorro de Batería (AMOLED)</string>
+    <string name="system_theme_title">Cambiar según ahorro de batería</string>
+    <string name="system_amoled_theme_title">Cambiar según ahorro de batería (AMOLED)</string>
     <string name="normal_viewmode_title">Normal</string>
     <string name="compact_mode_title">Compacto</string>
     <string name="small_mode_title">Pequeño</string>
-    <string name="tiles_mode_title">Baldosas</string>
+    <string name="tiles_mode_title">Casillas</string>
     <string name="unknown_issuer">Emisor desconocido</string>
     <string name="unknown_account_name">Nombre de cuenta desconocido</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis no pudo importar %d tokens. Estos tokens se omitirán. Pulse \'detalles\' para ver más información sobre los errores.</item>
-        <item quantity="other">Aegis no pudo importar %d tokens. Estos tokens se omitirán. Pulse \'detalles\' para ver más información sobre los errores.</item>
+        <item quantity="one">Aegis no pudo importar %d clave, por lo que se omitirá. Pulsa «más detalles» para ver más información sobre este fallo.</item>
+        <item quantity="other">Aegis no pudo importar %d claves, por lo que se omitirán. Pulsa «más detalles» para ver más información sobre el error.</item>
     </plurals>
     <string name="unable_to_process_deeplink">No se puede procesar el enlace profundo</string>
     <string name="unable_to_read_qrcode_file">No se puede leer y procesar el código QR del archivo: %s.</string>
     <string name="unable_to_process_shared_text">No se puede procesar el texto compartido como OTP</string>
-    <string name="unable_to_read_qrcode_files">No se pueden leer y procesar algunos de los códigos QR. Solo se importarán %d/%d entradas.</string>
+    <string name="unable_to_read_qrcode_files">No se pueden leer y procesar algunos de los códigos QR. Solo se importarán %1$d de %2$d.</string>
     <string name="unable_to_generate_qrcode">No se puede generar el código QR</string>
     <string name="select_picture">Seleccionar imagen</string>
     <string name="select_icon">Seleccionar icono</string>
@@ -347,28 +427,30 @@
     <string name="whats_new">Novedades</string>
     <string name="github_description">Código fuente, problemas e información</string>
     <string name="license">Licencia</string>
-    <string name="license_description">Aegis Authenticator está licenciado bajo GPLv3</string>
+    <string name="license_description">Aegis Authenticator se distribuye bajo los términos de la licencia GPLv3</string>
     <string name="third_party_licenses">Licencias de terceros</string>
     <string name="third_party_licenses_description">Licencias de las bibliotecas de terceros usadas por Aegis</string>
     <string name="country_netherlands">Países Bajos</string>
-    <string name="email_us">Escríbanos un correo electrónico</string>
-    <string name="visit_website">Visite nuestra página web</string>
+    <string name="email_us">Contacta por correo electrónico</string>
+    <string name="visit_website">Visita nuestra web</string>
     <string name="about_support">Soporte</string>
     <string name="support_rate">Valorar</string>
-    <string name="support_rate_description">Ayúdenos dejando una reseña en Google Play Store</string>
+    <string name="support_rate_description">Colabora dejando tu reseña en Google Play Store</string>
     <string name="webview_error">Este dispositivo no soporta web view, lo cual es necesario para visualizar el registro de cambios y la licencia. Falta un componente del sistema.</string>
     <string name="email">Correo electrónico</string>
     <string name="time_sync_warning_title">Sincronización automática de hora</string>
-    <string name="time_sync_warning_message">Aegis depende de la sincronización de la hora del sistema para generar códigos correctos. Una desviación de solo unos segundos podría generar códigos incorrectos. Parece que su dispositivo no está configurado para sincronizar automáticamente la hora. ¿Le gustaría hacerlo ahora?</string>
-    <string name="time_sync_warning_disable">Deja de advertirme. Sé lo que estoy haciendo.</string>
+    <string name="time_sync_warning_message">Aegis depende que la hora de tu dispositivo esté bien para generar códigos válidos en cada momento. Una pequeña diferencia de unos segundos podría hacer que los códigos no se acepten. Parece que tu dispositivo no está configurado para sincronizar automáticamente la hora. ¿Quieres hacerlo ahora?</string>
+    <string name="time_sync_warning_disable">No molestar, sé muy bien lo que hago.</string>
     <string name="google_qr_export_unrelated">Encontrado código QR no relacionado. Intente reiniciar el escáner.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Escaneado %d/%d código QR</item>
-        <item quantity="other">Escaneados %d/%d códigos QR</item>
+        <item quantity="one">Se han escaneado %1$d de %2$d códigos QR</item>
+        <item quantity="other">Se han escaneado%1$d de %2$d códigos QR</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Se esperaba un código QR #%d, pero en su lugar se escaneó #%d</string>
+    <string name="google_qr_export_unexpected">Se esperaba el código QR número %1$d, pero parece que has escaneado el número %2$d</string>
     <string name="backup_error_bar_message"><b>La copia de seguridad de la bóveda ha fallado recientemente</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Un intento reciente de copia de seguridad de la bóveda usando %s falló debido a un error. La copia de seguridad se intentó en: %s. Por favor, comprueba tu configuración de copia de seguridad para asegurarte de que las copias de seguridad pueden completarse correctamente.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Ha fallado una copia de la bóveda mediante %1$s realizada %2$s. Asegúrate de que la configuración esté bien para evitar problemas.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Ha fallado una copia de la bóveda mediante %1$s realizada %2$s porque Aegis no tenía permiso para escribir la carpeta elegida. Este error puede producirse si se ha movido o renombrado la carpeta o si has importado los ajustes de Aegis desde otro dispositivo. Vuelve a configurar la carpeta destino.
     </string>
     <string name="backup_system_builtin">Copias de seguridad automáticas de Aegis</string>
     <string name="backup_system_android">Sistema de copias de seguridad en la nube de Android</string>
@@ -377,19 +459,19 @@
     <string name="backup_reminder_bar_message">        Los cambios no están respaldados
     </string>
     <string name="backup_reminder_bar_dialog_title">Los cambios no están respaldados</string>
-    <string name="backup_reminder_bar_dialog_summary">        Los cambios recientes en la bóveda no han sido respaldados aún. Es importante hacer copias de seguridad regularmente para evitar perder el acceso a tus cuentas. Por favor, considera configurar copias de seguridad automáticas en el menú de ajustes.
+    <string name="backup_reminder_bar_dialog_summary">        Los últimos en la bóveda todavía no se han respaldado. Es importante hacer copias de seguridad programadas para evitar perder el acceso a tus cuentas. Te recomendamos encarecidamente activarlas en el menú de ajustes.
     </string>
     <string name="backup_reminder_bar_dialog_accept">Configurar copias de seguridad</string>
     <string name="backup_plaintext_export_warning"><b>La bóveda fue exportada recientemente en texto plano</b></string>
     <string name="pref_show_plaintext_warning_hint">No volver a mostrar esta advertencia</string>
-    <string name="backup_plaintext_warning_explanation">Esta advertencia se muestra porque recientemente exportaste una copia no encriptada de la bóveda. Para mantener la seguridad de tus tokens, recomendamos eliminar este archivo cuando deje de ser necesario.</string>
+    <string name="backup_plaintext_warning_explanation">Esta advertencia se muestra porque recientemente exportaste una copia sin cifrar de la bóveda. Para mantener la seguridad de tus claves te recomendamos eliminar este archivo cuando deje de ser necesario.</string>
     <string name="switch_camera">Cambiar cámara</string>
-    <string name="empty_list">No hay códigos que mostrar. Comience añadiendo entradas pulsando el signo + en la esquina inferior derecha</string>
-    <string name="empty_list_title">No hay entradas</string>
-    <string name="empty_group_list">No hay grupos que mostrar. Añada grupos en la pantalla de edición de una entrada</string>
+    <string name="empty_list">Todavía no tienes ningún código; añade alguno pulsando en el botón «+» de la esquina inferior derecha</string>
+    <string name="empty_list_title">No hay ninguna clave</string>
+    <string name="empty_group_list">Todavía no hay ningún grupo; añade uno en la pantalla de editar claves</string>
     <string name="empty_group_list_title">No se encontraron grupos</string>
-    <string name="no_icon_packs">Aún no se ha importado ningún paquete de iconos. Pulse el signo + para importar uno. Consejo: pruebe <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
-    <string name="no_icon_packs_title">Sin paquetes de iconos</string>
+    <string name="no_icon_packs">Aún no se ha importado ningún paquete de iconos. Pulsa «+» para importar uno. Consejo: te recomendamos que pruebes <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
+    <string name="no_icon_packs_title">No parece haber ningún paquete de iconos</string>
     <string name="pick_icon">Seleccione un icono</string>
     <string name="uncategorized">Sin categorizar</string>
     <string name="done">Hecho</string>
@@ -399,84 +481,96 @@
     </plurals>
     <string name="next">Siguiente</string>
     <string name="previous">Anterior</string>
-    <string name="copy_uri">Copiar URI</string>
-    <string name="unable_to_copy_uri_to_clipboard">No se puede copiar el URI al portapapeles</string>
-    <string name="uri_copied_to_clipboard">Se ha copiado el URI al portapapeles</string>
-    <string name="transfer_entry">Transferir entrada</string>
-    <string name="transfer_entry_description">Escanee este código QR con la aplicación de autenticación a la que le gustaría transferir esta entrada</string>
-    <string name="google_auth_compatible_transfer_description">Escanee estos códigos QR con Aegis o Google Authenticator.\n\nDebido a las limitaciones de la aplicación Google Authenticator, solo se incluyen tokens TOTP &amp; HOTP que usan SHA1 y producen códigos de 6 dígitos</string>
+    <string name="copy_uri">Copiar dirección URI</string>
+    <string name="unable_to_copy_uri_to_clipboard">No se puede copiar la dirección URI en el portapapeles</string>
+    <string name="uri_copied_to_clipboard">Se ha copiado la dirección URI al portapapeles</string>
+    <string name="transfer_entry_description">Escanea este código QR con la aplicación de autenticación a la que vayas a importar esta clave</string>
+    <string name="transfer_entry_brightness">Pulsa el código QR para subir/bajar el brillo a pantalla completa</string>
+    <string name="google_auth_compatible_transfer_description">Escanea estos códigos QR con Aegis o Google Authenticator.\n\nDebido a limitaciones técnicas de Google Authenticator solo se incluirán claves de tipo TOTP y HOTP que usen SHA1 y produzcan códigos de 6 dígitos</string>
     <string name="password_strength_very_weak">Muy débil</string>
     <string name="password_strength_weak">Débil</string>
     <string name="password_strength_fair">Aceptable</string>
     <string name="password_strength_good">Buena</string>
     <string name="password_strength_strong">Fuerte</string>
+    <string name="password_strength_unknown">Contraseña demasiado larga para el análisis de fortaleza</string>
     <string name="pref_pin_keyboard_title">Usar teclado PIN en la pantalla de bloqueo</string>
     <string name="pref_pin_keyboard_summary">Marque esto si desea activar el teclado PIN en la pantalla de bloqueo. Ésto solo funcionará para contraseñas numéricas</string>
     <string name="title_activity_preferences">Configuración</string>
     <string name="title_activity_manage_groups">Gestionar grupos</string>
     <string name="title_activity_transfer">Transferir entradas</string>
     <string name="title_activity_about">Acerca de</string>
-    <string name="title_activity_edit_entry">Editar entrada</string>
+    <string name="title_activity_edit_entry">Editar clave</string>
     <string name="title_activity_scan_qr">Escanear un código QR</string>
-    <string name="title_activity_manage_slots">Administrar claves</string>
     <string name="title_activity_import_entries">Importar entradas</string>
-    <string name="dialog_wipe_entries_title">Limpiar entradas</string>
-    <string name="dialog_wipe_entries_message">Su bóveda ya contiene entradas. ¿Desea eliminarlas antes de importar este archivo?\n\n<b>Al hacerlo, perderá permanentemente el acceso a las entradas existentes en la bóveda.</b></string>
+    <string name="title_activity_assign_icons">Asignar iconos</string>
+    <string name="title_activity_licenses">Licencias de terceros</string>
+    <string name="dialog_wipe_entries_title">Borrado de claves</string>
+    <string name="dialog_wipe_entries_message">Tu bóveda no está vacía. ¿Quieres borrar todos las claves actuales antes de importar este archivo?\n\n<b>Al hacerlo perderás cualquiera de las claves que ya existen en la bóveda.</b></string>
     <string name="dialog_wipe_entries_checkbox">Limpiar el contenido de la bóveda</string>
     <string name="panic_trigger_ignore_toast">Aegis ha recibido el activador de pánico pero la configuración está deshabilitada, ignorando</string>
     <string name="pref_panic_trigger_title">Eliminar la bóveda al activar el pánico</string>
     <string name="pref_panic_trigger_summary">Eliminar la bóveda cuando se recibe una activación de pánico desde Ripple</string>
-    <string name="import_vault">Importar bóveda</string>
+    <string name="import_vault">Importar bóveda de Aegis</string>
+    <string name="import_vault_hint">¿Quieres importar desde una aplicación 2FA diferente? Completa la configuración primero y luego ve al menú de configuración.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d duplicado potencial sin mirar, revisa el listado.</item>
+        <item quantity="other">Hay %d duplicados potenciales sin mirar, revisa el listado.</item>
+    </plurals>
     <string name="importer_help_2fas">Suministre un archivo exportado de 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Suministre un archivo exportado/copia de seguridad de Aegis.</string>
     <string name="importer_help_authenticator_plus">Suministre un archivo exportado de Authenticator Plus obtenido a través de <b>Ajustes -&gt; Copias de seguridad -&gt; Exportar como texto y HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Suministra un archivo de exportación de Authenticator Pro obtenido a través de <b>Configuración -&gt; Copias de seguridad -&gt; Copia de seguridad en archivo cifrado (recomendado)</b>.</string>
-    <string name="importer_help_authy">Suministre una copia de <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, localizado en el directorio de almacenamiento interno de Authy.</string>
+    <string name="importer_help_authy">Proporciona una copia del archivo <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, ubicado en la carpeta de almacenamiento interno de Authy.</string>
     <string name="importer_help_andotp">Suministre un archivo exportado/copia de seguridad de andOTP.</string>
     <string name="importer_help_bitwarden">Suministra un archivo de exportación/copia de seguridad de Bitwarden. Los archivos encriptados no están soportados.</string>
-    <string name="importer_help_battle_net_authenticator">Suministre una copia de <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, ubicado en el directorio de almacenamiento interno de Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Proporciona una copia del archivo <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, ubicado en la carpeta de almacenamiento interno del Authenticator de Battle.net.</string>
     <string name="importer_help_duo">Suministre una copia de <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, localizado en el directorio de almacenamiento interno de DUO.</string>
-    <string name="importer_help_freeotp">Suministre una copia de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, localizado en el directorio de almacenamiento interno de FreeOTP.</string>
+    <string name="importer_help_ente_auth">Proporciona un archivo exportado desde Ente Auth, ten en cuenta que sólo se admiten archivos sin cifrar.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Proporciona una copia del archivo de respaldo exportado. En las versiones 1.x: Proporciona el archivo <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, ubicado en la carpeta de almacenamiento interno de FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Suministre un archivo exportado de FreeOTP+.</string>
-    <string name="importer_help_google_authenticator"><b>Solo los archivos de base de datos de Google Authenticator v5.10 y anteriores son soportados</b>.\n\nSuministra una copia de <b>/data/data/com.google.android.apps.authenticator2/databasases/databasases</b>, ubicado en el directorio de almacenamiento interno de Google Authenticator.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilidad con FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Hay una serie de problemas en FreeOTP 2 que pueden hacer que la exportación genere un archivo incompleto o no válido. Aegis intentará rescatar tantos elementos como sea posible, pero es posible que solo unos pocos (o ninguno) se pueda importar.</string>
+    <string name="importer_help_google_authenticator"><b>Solo funcionará con archivos de base de datos de Google Authenticator v5.10 e inferiores</b>.\n\nProporciona una copia del archivo <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, ubicado en la carpeta de almacenamiento interno de Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Suministre una copia de <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, localizado en el directorio de almacenamiento interno de Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Suministre un archivo de texto plano con una URI de Google Authenticator en cada línea.</string>
     <string name="importer_help_steam"><b>Steam v3.0 y posteriores no son compatibles</b>. Proporcione una copia de <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, ubicado en el directorio de almacenamiento interno de Steam.</string>
+    <string name="importer_help_stratum">Suministra un archivo de exportación de Stratum obtenido a través de <b>Configuración -&gt; Copias de seguridad -&gt; Copia de seguridad en archivo cifrado (recomendado)</b>.</string>
     <string name="importer_help_totp_authenticator">Suministre un archivo exportado de TOTP Authenticator.</string>
     <string name="importer_help_winauth">Suministre un archivo exportado de WinAuth.</string>
-    <string name="importer_encrypted_exception_google_authenticator">Se omitió esta entrada cifrada: %s</string>
+    <string name="import_assign_icons_dialog_title">Asignar iconos</string>
+    <string name="import_assign_icons_dialog_text">¿Deseas asignar iconos a las entradas importadas?</string>
+    <string name="importer_encrypted_exception_google_authenticator">Se omitió esta clave cifrada: %s</string>
     <string name="importer_help_direct">Importa entradas directamente de %s. Esto requiere que la aplicación esté instalada en este dispositivo y que se conceda acceso root a Aegis.</string>
     <string name="groups">Grupos</string>
-    <string name="pref_focus_search">Enfocar búsqueda al iniciar la aplicación</string>
+    <string name="pref_focus_search">Resaltar el buscador al inicio</string>
     <string name="pref_focus_search_summary">Enfoca la búsqueda inmediatamente después de abrir la aplicación.</string>
-    <string name="pref_grouping_halves">Mitades</string>
-    <string name="pref_grouping_none">Sin agrupación</string>
-    <string name="pref_grouping_size_two">Grupos de 2</string>
-    <string name="pref_grouping_size_three">Grupos de 3</string>
-    <string name="pref_grouping_size_four">Grupos de 4</string>
+    <string name="pref_grouping_halves">En dos mitades</string>
+    <string name="pref_grouping_none">Sin agrupar</string>
+    <string name="pref_grouping_size_two">En grupos de dos</string>
+    <string name="pref_grouping_size_three">En grupos de tres</string>
+    <string name="pref_grouping_size_four">En grupos de cuatro</string>
     <string name="pref_copy_behavior_never">Nunca</string>
     <string name="pref_copy_behavior_single_tap">Un toque</string>
     <string name="pref_copy_behavior_double_tap">Dos toques</string>
     <string name="pref_account_name_position_hidden">Oculto</string>
     <string name="pref_account_name_position_end">Junto al emisor</string>
     <string name="pref_account_name_position_below">Debajo del emisor</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">Hace %d segundo</item>
         <item quantity="other">Hace %d segundos</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">Hace %d minuto</item>
         <item quantity="other">Hace %d minutos</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">Hace %d hora</item>
         <item quantity="other">Hace %d horas</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">Hace %d día</item>
         <item quantity="other">Hace %d días</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">Hace %d año</item>
         <item quantity="other">Hace %d años</item>
     </plurals>
diff --git a/app/src/main/res/values-et-rEE-v29/strings.xml b/app/src/main/res/values-et-rEE-v29/strings.xml
new file mode 100644
index 00000000..06898d3c
--- /dev/null
+++ b/app/src/main/res/values-et-rEE-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Süsteemi vaikeseadistus</string>
+    <string name="system_amoled_theme_title">Süsteemi vaikeseadistus (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml
new file mode 100644
index 00000000..587ea969
--- /dev/null
+++ b/app/src/main/res/values-et-rEE/strings.xml
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="action_settings">Seadistused</string>
+    <string name="action_about">Rakenduse teave</string>
+    <string name="action_delete">Kustuta</string>
+    <string name="action_transfer">Teisalda</string>
+    <string name="action_edit_icon">Muuda ikooni</string>
+    <string name="action_reset_usage_count">Nulli kasutuskordade loendur</string>
+    <string name="action_reset_usage_count_dialog">Kas sa oled kindel, et soovid nullida selle kirje kasutuskordade loenduri?</string>
+    <string name="action_default_icon">Taasta vaikimisi ikoon</string>
+    <string name="discard">Loobu</string>
+    <string name="save">Salvesta</string>
+    <string name="all">Kõik</string>
+    <string name="issuer">Väljaandja</string>
+    <string name="yandex_pin">PIN-kood (4–16 numbrit)</string>
+    <string name="motp_pin">PIN-kood (4 numbrit)</string>
+    <string name="suggested">Soovitatud</string>
+    <string name="usage_count">Kasutuskordi</string>
+    <string name="warning">Hoiatus</string>
+    <string name="pref_cat_appearance_app">Rakendus</string>
+    <string name="pref_cat_appearance_entries">Kirjeid</string>
+    <string name="pref_cat_backups_android">Android</string>
+    <string name="pref_cat_backups_auto">Automaatsed varukoopiad</string>
+    <string name="pref_section_behavior_title">Käitumine</string>
+    <string name="pref_section_behavior_summary">Kirjete loendi kohendamise võimalused.</string>
+    <string name="pref_section_appearance_title">Välimus</string>
+    <string name="pref_section_appearance_summary">Muuda kujundust, keelt ja muid seadistusi, mis mõjutavad rakenduse välimust.</string>
+    <string name="pref_section_security_title">Turvalisus</string>
+    <string name="pref_section_security_summary">Seadista krüptimist, biomeetrilist tuvastust, automaatset lukustust ja muid turvaseadistusi.</string>
+    <string name="pref_section_import_export_title">Andmete import ja eksport</string>
+    <string name="pref_section_import_export_summary">Impordi Aegise või teiste autentimisrakenduste varukoopiaid. Tee Aegise andmehoidlast käsitsi varukoopia.</string>
+    <string name="pref_section_audit_log_title">Rakenduse logi</string>
+    <string name="pref_section_audit_log_summary">Kõikide oluliste rakendusega juhtunud sündmuste logi hilisema auditeerimise jaoks.</string>
+    <string name="pref_section_backups_title">Varukoopiad</string>
+    <string name="pref_section_backups_summary">Seadista varukoopiate loomine sinu valitud asukohta või võta kasutusele Androidi pilvevarunduse lahendus.</string>
+    <string name="pref_section_icon_packs">Ikoonipakid</string>
+    <string name="pref_section_icon_packs_summary">Halda ja impordi ikoonipakke</string>
+    <string name="pref_select_theme_title">Kujundus</string>
+    <string name="pref_dynamic_colors_title">Dünaamilised värvid</string>
+    <string name="pref_dynamic_colors_summary">Kasuta ülekatte jaoks Androidi kasutajaliidese kujunduse värve</string>
+    <string name="pref_view_mode_title">Kasutatav vaade</string>
+    <string name="pref_lang_title">Keel</string>
+    <string name="pref_show_icons_title">Näita ikoone</string>
+    <string name="pref_show_icons_summary">Näita iga kirje kõrval ikoone</string>
+    <string name="pref_code_group_size_title">Koodinumbrite rühmitamine</string>
+    <string name="pref_code_group_size_summary">Vali koodide rühmitamise viis</string>
+    <string name="pref_account_name_position_title">Näita kasutajakonto nime</string>
+    <string name="pref_show_next_code_title">Näita järgmist koodi</string>
+    <string name="pref_show_next_code_summary">Loo järgmine kood ja näita seda enne õiget aega</string>
+    <string name="pref_expiration_state_title">Anna märku koodide aegumisest</string>
+    <string name="pref_expiration_state_summary">Enne aegumist muuda kinnituskoodi värvi ja vilguta neid</string>
+    <string name="pref_expiration_state_fallback">Enne aegumist muuda kinnituskoodi värvi</string>
+    <string name="pref_shared_issuer_account_name_title">Näita kasutajakonto nime vaid siis, kui see vajalik on</string>
+    <string name="pref_shared_issuer_account_name_summary">Näita kasutajakontode nimesid vaid siis, kui neil on sama väljaandja. Muul juhul on kasutajakontode nimed peidetud.</string>
+    <string name="pref_account_name_position_summary_override">See seadistus ei toimi ruudustikuvaates. Kasutajakonto nimi on näha väljaandja all.</string>
+    <string name="pref_import_file_title">Impordi failist</string>
+    <string name="pref_import_file_summary">Impordi andmekirjed failist</string>
+    <string name="pref_android_backups_title">Androidi pilvevarundus</string>
+    <string name="pref_android_backups_summary">Luba kaasata Aegise varukoopiaid Androidi sisseehitatud pilvevarundusse. Kehtib vaid krüptitud andmehoidla puhul.</string>
+    <string name="pref_android_backups_hint"><i>Seadmelt seadmele (Device-to-device, D2D) varukoopiad on lubatud alati, sõltumata ülaltoodud seadistusest</i></string>
+    <string name="pref_backups_title">Tee andmehoidlast automaatselt varukoopiaid</string>
+    <string name="pref_backups_summary">Peale iga muudatust tee automaatselt andmehoidlast varukoopia. See funktsionaalsus toimib vaid krüptitud andmehoidlate puhul.</string>
+    <string name="pref_backups_reminder_title">Varunduse meeldetuletus</string>
+    <string name="pref_backups_reminder_summary">Kui sa pole viimaseid muudatusi varundanud, näita meeldetuletust sinu andmehoidla kohta.</string>
+    <string name="pref_backups_reminder_dialog_title">Lülita varunduse meeldetuletus välja</string>
+    <string name="pref_backups_reminder_dialog_summary">Selle meeldetuletuse väljalülitamisel Aegis ei anna sulle enam teada, kas muudatused on varundatud või mitte. Sellega tekib aga võimalus, et võid kaotada ligipääsu oma tunnuslubadele. Kas sa oled kindel, et soovid meeldetuletuse välja lülitada?</string>
+    <string name="pref_backups_versioning_strategy_title">Varundusplaan</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Säilita mitu varukoopiat</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Tee vaid üks varukoopia</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Sinu valitud varundusplaan pole töökindel ja me ei soovita seda. Vaid ühe varukoopia tegemisel võid selle kaotada.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Vali varundusplaan</string>
+    <string name="pref_backups_location_title">Varukoopia asukoht</string>
+    <string name="pref_backups_location_summary">Varukoopiad salvestuvad siin:</string>
+    <string name="pref_backup_location_summary">Varukoopia salvestub siin:</string>
+    <string name="pref_backups_trigger_title">Käivita kohe varundus</string>
+    <string name="pref_backups_trigger_summary">Tee varundus käsitsi</string>
+    <string name="pref_backups_versions_title">Säilitatavate versioonide arv</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
+    <plurals name="pref_backups_versions_summary">
+        <item quantity="one">Säilita varukoopiast %1$d versioon</item>
+        <item quantity="other">Säilita varukoopiast %1$d versiooni</item>
+    </plurals>
+    <string name="pref_backups_versions_infinite_summary">Säilita varukooiate lõputu arv versioone</string>
+    <string name="pref_import_app_title">Impordi rakendusest</string>
+    <string name="pref_import_app_summary">Impordi tunnusload rakendusest (eeldab juurkasutaja õigusi)</string>
+    <string name="pref_export_title">Ekspordi</string>
+    <string name="pref_export_summary">Ekspordi andmehoidla</string>
+    <string name="pref_password_reminder_title">Salasõna meeldetuletus</string>
+    <string name="pref_google_auth_export_title">Eksportimine Google Authenticatori jaoks</string>
+    <string name="pref_google_auth_export_descriptor">Selle valikuga saad luua eksportimiseks QR-koode, mis sobivad Google Authenticatori jaoks</string>
+    <string name="pref_google_auth_export_no_data">Pole andmeid, mida saaks eksportida</string>
+    <plurals name="pref_google_auth_export_incompatible_entries">
+        <item quantity="one">Jätsin vahele %d mitteühilduva kirje</item>
+        <item quantity="other">Jätsin vahele %d mitteühilduvat kirjet</item>
+    </plurals>
+    <string name="pref_password_reminder_summary">Selleks, et sa salasõna ei unustaks, näita %s meeldetuletust salasõna sisestamiseks.</string>
+    <string name="pref_password_reminder_summary_disabled">Pole kasutusel</string>
+    <string name="pref_secure_screen_title">Ekraanivaate turvalisus</string>
+    <string name="pref_secure_screen_summary">Rakenduse kasutamisel keela ekraanitõmmiste tegemine ja muul viisil ekraanipildi jäädvustamine</string>
+    <string name="pref_tap_to_reveal_title">Näitamiseks puuduta</string>
+    <string name="pref_tap_to_reveal_summary">Vaikimisi on kinnituskoodid peidetud. Selle nägemiseks klõpsi kirjel.</string>
+    <string name="pref_tap_to_reveal_time_title">Näitamise kestus peale puudutamist</string>
+    <string name="pref_auto_lock_title">Automaatne lukustus</string>
+    <string name="pref_auto_lock_summary">Kui %s</string>
+    <string name="pref_auto_lock_summary_disabled">Pole kasutusel</string>
+    <string name="pref_auto_lock_prompt">Lukusta Aegis automaatselt</string>
+    <string name="pref_auto_lock_type_back_button">Androidi „Tagasi“ nupu vajutamisel</string>
+    <string name="pref_auto_lock_type_minimize">Rakenduse minimeerimisel</string>
+    <string name="pref_auto_lock_type_device_lock">Seadme lukustamisel</string>
+    <string name="pref_backup_password_category">Varundus ja eksport</string>
+    <string name="pref_backup_password_title">Eraldi salasõna varunduse ja ekspordi jaoks</string>
+    <string name="pref_backup_password_summary">Kui see eelistus on kasutusel, siis rakenduse lukustuse eemaldamiseks kasutatav salasõna enam ei toimi varukoopiate ja ekspordifailide dekrüptimisel.</string>
+    <string name="pref_backup_password_change_title">Muuda varunduse ja ekspordi salasõna</string>
+    <string name="pref_backup_password_change_summary">Muuda salasõna, mida kasutatakse andmehoidla krüptimiseks varukoopia tegemisel ja eksportimisel.</string>
+    <string name="pref_encryption_title">Krüptimine</string>
+    <string name="pref_encryption_summary">Krüpti andmehoidla salasõna või biomeetrilise tuvastusega ning kasuta neid ka lukustuse eemaldamisel</string>
+    <string name="pref_biometrics_title">Biomeetriline tuvastus</string>
+    <string name="pref_biometrics_summary">Kasuta andmehoidla lukustuse eemaldamiseks biomeetrilist tuvastust</string>
+    <string name="pref_search_behavior_summary">Otsi väljadest: %s</string>
+    <string name="pref_search_behavior_prompt">Otsi neist märgitud väljadest</string>
+    <string name="pref_search_behavior_type_name">Nimi</string>
+    <string name="pref_search_behavior_type_issuer">Väljaandja</string>
+    <string name="pref_search_behavior_type_note">Märkus</string>
+    <string name="pref_search_behavior_type_groups">Grupid</string>
+    <string name="pref_set_password_title">Muuda salasõna</string>
+    <string name="pref_set_password_summary">Muuda salasõna, mida kasutatakse andmehoidla lukustuse eemaldamiseks</string>
+    <string name="no_events_title">Teadaolevaid sündmusi pole</string>
+    <string name="no_events_description">Raenduses pole teada ühtegi olulist sündmust</string>
+    <string name="event_title_vault_unlocked">Andmehoidla lukustus on eemaldatud</string>
+    <string name="event_description_vault_unlocked">Andmehoidla lukustus on kenasti eemaldatud</string>
+    <string name="event_title_backup_created">Varukoopia on loodud</string>
+    <string name="event_description_backup_created">Andmehoidla varukoopia loomine õnnestus</string>
+    <string name="event_title_android_backup_created">Varukoopia on loodud Androidi poolt</string>
+    <string name="event_description_android_backup_created">Androidid õnnestus luua andmehoidla varukoopia</string>
+    <string name="event_title_vault_exported">Andmehoidla on eksporditud</string>
+    <string name="event_description_vault_exported">Andmehoidla koopia on eksporditud</string>
+    <string name="event_title_entry_shared">Kirje on jagatud</string>
+    <string name="event_description_entry_shared">Kirjet jagati</string>
+    <string name="event_title_vault_unlock_failed_password">Ei õnnestunud eemaldada andmehoidla lukustust (salasõnaga)</string>
+    <string name="event_description_vault_unlock_failed_password">Katse eemaldada andmehoidla lukustust salasõnaga ei õnnestunud</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Ei õnnestunud eemaldada andmehoidla lukustust (biomeetrilise tuvastusega)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Katse eemaldada andmehoidla lukustust biomeetrilise tuvastusega ei õnnestunud</string>
+    <string name="event_unknown">Tundmastu sündmuse tüüp</string>
+    <string name="audit_log_entry_deleted">(kustutatud)</string>
+    <string name="today_at_time">Täna kell %1$s</string>
+    <string name="day_of_week_at_time">%1$s kell %2$s</string>
+    <string name="export_encrypted">Krüpti andmehoidla</string>
+    <string name="export_help">Selle toiminguga ekspordid andmehoidla Aegise sisemisest andmeruumist. Palun vali vorming, mida soovid eksportimiseks kasutada:</string>
+    <string name="export_warning_unencrypted">Sa oled eksportimas Aegise andmehoidla krüptimata koopiat. <b>Me ei soovita sellist tegevust</b>.</string>
+    <string name="export_warning_password">Ekspordifailid on krüptitud eraldi salasõnaga, mis on lisatud seadistuste sektsioonist Turvalisus.</string>
+    <string name="understand_risk_accept">Ma mõistan seda riski</string>
+    <string name="export_format_aegis">Aegis (.JSON)</string>
+    <string name="export_format_google_auth_uri">Tekstifail (.TXT)</string>
+    <string name="export_format_html">Veebileht (.HTML)</string>
+    <string name="export_format_hint">Eksportimise vorming</string>
+    <string name="export_all_groups">Ekspordi kõik grupid</string>
+    <string name="export_choose_groups">Vali eksporditavad grupid</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="one">%d grupp on valitud</item>
+        <item quantity="other">%d gruppi on valitud</item>
+    </plurals>
+    <string name="export_no_groups_selected">Sa pole eksportimiseks valinud ühtegi gruppi</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Eksport Aegis Authenticatorist</string>
+    <string name="choose_authentication_method">Turvalisus</string>
+    <string name="authentication_method_explanation">Aegis on turvalisuskeskne kaheastmelise autentimise haldusrakendus. Kirjed on salvestatud andmehoidlas, mida saad soovi korral enda valitud salasõnaga krüptida. Kui see krüptitud andmehoidla satub pahatahtlike kavatsustega kolmanda osapoole kätte, siis pole tal ilma salasõna teadmata võimalust sisu lugeda.\n\nJärgnevalt oleme eelvalinud eelistuse, mis võiks sinu nutiseadmele parimal viisil sobida.</string>
+    <string name="authentication_method_none">Puudub</string>
+    <string name="authentication_method_none_description">Andmehoidla lukustuse eemaldamiseks pole vaja kasutada salasõna ning ta on ka krüptimata. <b>Me ei soovita selle valiku kasutamist</b>.</string>
+    <string name="authentication_method_password">Salasõna</string>
+    <string name="authentication_method_password_description">Andmehoidla lukustuse eemaldamiseks pead kasutama salasõna.</string>
+    <string name="authentication_method_password_explanation">Hoiatus: Kui sa unustad oma salasõna, siis kaotad jäädavalt ligipääsu oma tunnuslubadele. Pole ühtegi viisi ligipääsuks neile ilma salasõnata.</string>
+    <string name="authentication_method_biometrics">Biomeetria</string>
+    <string name="authentication_method_biometrics_description">Lisaks salasõnale, on siin nutiseadmes biomeetrilise tuvastuse võimalus. Näiteks sõrmejälje või näotuvastusega on võimalik andmehoidlat lukust lahti võtta.</string>
+    <string name="authentication">Võta andmehoidla lukust lahti</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Võta andmehoidla\nlukust lahti</string>
+    <string name="auth_use_biometrics">Või klõpsi siin <font fgcolor="#FF0D86C1">biomeetrilise tuvastuse</font> kasutamiseks</string>
+    <string name="set_password">Palun sisesta salasõna</string>
+    <string name="set_group">Palun sisesta grupi nimi</string>
+    <string name="set_number">Palun sisesta number</string>
+    <string name="set_password_confirm">Palun korda salasõna</string>
+    <string name="invalid_password">Sisestatud salasõna pole õige</string>
+    <string name="invalidated_biometrics">Tuvastasin muudatuse sinu nutiseadme turvaseadistustes. Palun ava Aegise „Seadistused“ → „Turvalisus“ → „Biomeetriline tuvastus“ ning lülita ta korraks välja ning seejärel uuesti sisse.</string>
+    <string name="password_reminder">Palun sisesta oma salasõna. Selleks, et sa salasõna ei unustaks, me vahetevahel palume sind seda sisestada.</string>
+    <string name="password_reminder_dialog_title">Vaikimisi on lukustuse eemaldamiseks kasutusel biomeetriline tuvastus</string>
+    <string name="password_reminder_dialog_message">Selleks, et sa salasõna ei unustaks ja kaotaks ligipääsu oma andmehoidlale, me vahetevahel palume sind seda sisestada. Peale salasõna kasutamist Aegis pruugib jälle biomeetrilist tuvastust seni, kuni jõuab kätte järjekordne salasõna sisestamise hetk.</string>
+    <string name="password_reminder_freq_never">Mitte kunagi</string>
+    <string name="password_reminder_freq_weekly">kord nädalas</string>
+    <string name="password_reminder_freq_biweekly">kaks korda nädalas</string>
+    <string name="password_reminder_freq_monthly">kord kuus</string>
+    <string name="password_reminder_freq_quarterly">kord kvartalis</string>
+    <string name="enter_password_2fas_message">Tundub, et 2FAS rakenduse varukoopia on krüptitud. Palun sisesta alljärgnevalt salasõna.</string>
+    <string name="enter_password_authy_message">Tundub, et Authy rakenduse kirjed on krüptitud. Palun sulge Aegis, ava Authy ning eemalda kirjete lukustus oma salasõnaga. Võid ka proovida, kas Aegis saab dekrüptimisega hakkama. Selleks sisesta alljärgnevalt vajalik salasõna.</string>
+    <string name="enter_password_aegis_title">Palun sisesta importimise salasõna</string>
+    <string name="period_hint">Välp (sekundites)</string>
+    <string name="algorithm_hint">Räsifunktsioon</string>
+    <string name="type">Tüüp</string>
+    <string name="share">Jaga</string>
+    <string name="yes">Jah</string>
+    <string name="no">Ei</string>
+    <string name="undo">Võta toiming tagasi</string>
+    <string name="unlock">Lukusta lahti</string>
+    <string name="advanced">Lisavalikud</string>
+    <string name="counter">Loendur</string>
+    <string name="digits">Numbreid</string>
+    <string name="secret">Salakood</string>
+    <string name="scan">Skaneeri QR-koodi</string>
+    <string name="scan_image">Skaneeri pilti</string>
+    <string name="enter_manually">Sisesta käsitsi</string>
+    <string name="set_up_biometric">Seadista lukustuse eemaldamine biomeetrilise tuvastusega</string>
+    <string name="copy">Kopeeri</string>
+    <string name="edit">Muuda</string>
+    <string name="select_all">Vali kõik</string>
+    <string name="assign_icons">Lisa ikoone</string>
+    <string name="assign_groups">Lisa gruppi</string>
+    <string name="assign_groups_dialog_summary">Vali grupp, kuhu soovid antud kirjed lisada.</string>
+    <string name="assign_groups_dialog_dropdown">Vali grupp</string>
+    <string name="favorite" comment="Verb">Lisa lemmikuks</string>
+    <string name="unfavorite" comment="Verb">Eemalda lemmikutest</string>
+    <string name="error_all_caps">VIGA</string>
+    <string name="password">Salasõna</string>
+    <string name="confirm_password">Korda salasõna</string>
+    <string name="show_password">Näita salasõna</string>
+    <string name="new_entry">Uus kirje</string>
+    <string name="add_new_entry">Lisa uus kirje</string>
+    <string name="unlock_vault_error">Andmehoidla lukustuse eemaldamine ei õnnestunud</string>
+    <string name="unlock_vault_error_description">Vale salasõna. Palun kontrolli, et kasutasid õiget salasõna.</string>
+    <string name="password_equality_error">Salasõnad peavad olema identsed ega tohi olla tühjad</string>
+    <string name="snackbar_authentication_method">Palun vali autentimise meetod</string>
+    <string name="encrypting_vault">Andmehoidla on krüptimisel</string>
+    <string name="exporting_vault">Andmehoidla on eksportimisel</string>
+    <string name="optimizing_icon">Optimeerin ikoone</string>
+    <string name="optimizing_icon_multiple">Optimeerin ikoone %1$d/%2$d</string>
+    <string name="reading_file">Loen faili</string>
+    <string name="requesting_root_access">Küsin juurkasutaja õigusi</string>
+    <string name="analyzing_qr">Analüüsin QR-koodi</string>
+    <string name="analyzing_qr_multiple">Analüüsin QR-koodi %1$d/%2$d (%3$s)</string>
+    <plurals name="added_new_entries">
+        <item quantity="one">Lisasin %d uue kirje andmehoidlasse</item>
+        <item quantity="other">Lisasin %d uut kirjet andmehoidlasse</item>
+    </plurals>
+    <string name="importing_icon_pack">Impordin ikoonipakki</string>
+    <string name="delete_entry">Kustuta kirje</string>
+    <string name="delete_entry_description">Kas sa oled kindel, et soovid selle kirje kustutada?</string>
+    <string name="delete_entry_explanation">Selle tegevusega sa ei lülita kaheastmelist autentimist välja siin teenuses:\n<b>%s</b>\n\nEt sa ei kaotaks ligipääsu teenusele, siis palun kontrolli, et oleksid seal kaheastmelise autentimise välja lülitanud või sul on olemas alternatiivne viis selle teenuse jaoks autentimiskoode luua.</string>
+    <string name="delete_entries">Kustuta kirjed</string>
+    <plurals name="delete_entries_description">
+        <item quantity="one">Kas oled kindel, et soovid kustutada %d kirje?</item>
+        <item quantity="other">Kas oled kindel, et soovid kustutada %d kirjet?</item>
+    </plurals>
+    <string name="discard_changes">Kas loobud muudatustest?</string>
+    <string name="discard_changes_description">Sinu muudatused pole salvestatud</string>
+    <string name="saving_profile_error">Viga profiili salvestamisel</string>
+    <string name="saving_assign_icons_error">Viga ikoonide lisamisel</string>
+    <string name="welcome">Tere tulemast</string>
+    <string name="app_description">Aegis on vaba, turvaline ja avatud lähtekoodil põhinev kaheastmelise autentimise haldusrakendus</string>
+    <string name="setup_completed">Alseadistamine on lõppenud</string>
+    <string name="setup_completed_description">Aegis on seadistatud ja valmis tööks.</string>
+    <string name="vault_not_found">Andmehoidlat ei leidu, alustan algseadistamisega…</string>
+    <string name="copied">Kopeeritud</string>
+    <string name="errors_copied">Vead on kopeeritud lõikelauale</string>
+    <string name="version_copied">Versiooninumber on kopeeritud lõikelauale</string>
+    <string name="error_required_field">See väli on kohustuslik</string>
+    <string name="error_occurred">Tekkis viga</string>
+    <string name="decryption_error">Andmehoidla lukustuse eemaldamisel tekkis viga</string>
+    <string name="decryption_corrupt_error">Andmehoidla lukustuse eemaldamisel tekkis viga. Andmehoidla fail võib olla vigane.</string>
+    <string name="saving_error">Andmehoidla salvestamisel tekkis viga</string>
+    <string name="vault_init_error">Andmehoidla valmendamisel tekkis viga</string>
+    <string name="vault_load_error">Andmehoidla laadimisel nutiseadme andmeruumist tekkis viga</string>
+    <string name="biometric_decrypt_error">Andmehoidla dekrüptimisel biomeetrilise isikutuvastuse abil tekkis viga. Tavaliselt juhtub see siis, kui nutiseadme turvaseadistused on muutunud. Palun eemalda andmehoidla lukustus salasõnaga ja kohenda Aegise seadistustest uuesti biomeetrilist tuvastust.</string>
+    <string name="biometric_init_error">Biomeetrilise isikutuvastuse valmendamisel tekkis viga. Tavaliselt juhtub see siis, kui nutiseadme turvaseadistused on muutunud. Palun eemalda andmehoidla lukustus salasõnaga ja kohenda Aegise seadistustest uuesti biomeetrilist tuvastust.</string>
+    <string name="disable_encryption">Lülita krüptimine välja</string>
+    <string name="disable_encryption_description">Kas sa oled kindel, et soovid krüptimist välja lülitada? Selle tulemusel salvestatakse andmehoidla lihtteksti vormingus. <b>Lisaks ei saa enam kasutada automaatset varundust</b>.</string>
+    <string name="enable_encryption_error">Krüptimise sisselülitamisel tekkis viga</string>
+    <string name="disable_encryption_error">Krüptimise väljalülitamisel tekkis viga</string>
+    <string name="backup_successful">Varukoopia ajastamine õnnestus</string>
+    <string name="backup_error">Varukoopia tegemisel tekkis viga</string>
+    <string name="backup_status_success">Viimane õnnestunud varukoopia: %s</string>
+    <string name="backup_status_failed">Viimane ebaõnnestunud varukoopia: %s</string>
+    <string name="backup_status_none">Ühtegi varukoopiat pole veel tehtud</string>
+    <string name="backup_warning_password">Varukoopiad on krüptitud eraldi salasõnaga, mis on lisatud seadistuste sektsioonist Turvalisus</string>
+    <string name="documentsui_error">DocumentsUI liidestus tundub olema sinu nutiseadmest puudu. Tegemist on olulise süsteemse komponendiga, mis on kasutusel dokumentide loomisel ja valimisel. Kui oled kasutanud mõnda rakendust oma nutiseadmest erisuguste mittevajalike komponentide eemaldamiseks, siis võid olla ka selle teegi eemaldanud ja pead ta uuesti paigaldama.</string>
+    <string name="icon_pack_import_error">Ikoonipaki importimisel tekkis viga</string>
+    <string name="icon_pack_import_exists_error">Ikoonipakk, mida proovid importida, on juba olemas. Kas tahad selle üle kirjutada?</string>
+    <string name="icon_pack_delete_error">Ikoonipaki kustutamisel tekkis viga</string>
+    <plurals name="icon_pack_info">
+        <item quantity="one">%d ikoon</item>
+        <item quantity="other">%d ikooni</item>
+    </plurals>
+    <string name="icon_custom">Kohandatud</string>
+    <string name="permission_denied">Õigused puuduvad</string>
+    <string name="andotp_new_format">Uus vorming (versioon 0.6.3 või uuem) </string>
+    <string name="andotp_old_format">Vana vorming (versioon 0.6.2 või vanem) </string>
+    <string name="choose_andotp_importer">Mis vormingus on andOTP varukoopia?</string>
+    <string name="choose_totpauth_importer">Kas see TOTP Authenticatori varukoopai on kaitstud salasõnaga?</string>
+    <string name="choose_application">Vali rakendus, kust sa tahaksid andmeid importida</string>
+    <string name="choose_theme">Valid soovitud kujundus</string>
+    <string name="choose_account_name_position">Vali sinu kasutajakonto nime asukoht</string>
+    <string name="choose_view_mode">Vali sinu soovitud vaade</string>
+    <string name="choose_copy_behavior">Vali soovitud käitumine kopeerimisel</string>
+    <string name="parsing_file_error">Faili töötlemisel tekkis viga</string>
+    <string name="file_not_found">Viga: faili ei leidu</string>
+    <string name="reading_file_error">Faili lugemisel tekkis viga</string>
+    <string name="app_lookup_error">Viga: rakendus pole paigaldatud</string>
+    <string name="app_version_error">Paigaldatud „%s“ rakenduse versioon pole toetatud. Viimased versioonid krüptivad osasid faile oma andmekaustas ja seega puudub Aegisel ligipääs nende importimiseks. Kui proovid importida, siis ilmselt lõppeb see veaga. Kas ikkagi tahad jätkata?</string>
+    <string name="root_error">Viga: ei õnnestu kasutada juurkasutaja õigusi</string>
+    <plurals name="imported_entries_count">
+        <item quantity="one">Importisin %d kirje</item>
+        <item quantity="other">Importisin %d kirjet</item>
+    </plurals>
+    <plurals name="entries_shown">
+        <item quantity="one">Näitan %d kirjet</item>
+        <item quantity="other">Näitan %d kirjet</item>
+    </plurals>
+    <string name="intro_import_error_title">Andmehoidla importimisel tekkis viga</string>
+    <string name="import_error_title">Importimisel tekkis üks või enam viga</string>
+    <string name="exporting_vault_error">Andmehoidla eksportimisel tekkis viga</string>
+    <string name="exported_vault">Andmehoidla on eksporditud</string>
+    <string name="encryption_set_password_error">Salasõna salvestamisel tekkis viga.</string>
+    <string name="encryption_enable_biometrics_error">Biomeetrilise isikutuvastuse kasutuselevõtmisel lukustuse eemaldamise jaoks tekkis viga. Mõnede nutiseadmete biomeetrilise tuvastuse teostused on puudulikud ning tundub, et see on üks niisugustest seadmetest. Me soovitame, et kasutad vaid salasõnapõhist tuvastust.</string>
+    <string name="no_cameras_available">Ühtegi kaamerat pole saadaval</string>
+    <string name="read_qr_error">QR-koodi lugemisel tekkis viga</string>
+    <string name="read_qr_error_phonefactor">Aegis pole ühilduv Microsofti kaheastmelise autentimise suletud algoritmiga. Kui oled seadistamas kaheastmelist autentimist Office 365 teenuses, siis palun vali eelistus „Seadista rakendus ilma teavitusteta“.</string>
+    <string name="partial_google_auth_import">Tuvastasin pooliku Google Authenticatori ekspordifaili</string>
+    <string name="partial_google_auth_import_warning">Mõned QR-koodid on imporditavatest andmetest puudu. Järgnevaid koode ei leidunud: \n\n<b>%s</b>\n\nSa võid küll jätkata selle pooliku impordiga, kuid me soovitame, et proovid uuesti kõikide andmetega ning väldid mõmõnede kirjete kadumaminekut.</string>
+    <string name="missing_qr_code_descriptor">• QR-kood %d</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Impordi %d tunnusluba ikkagi</item>
+        <item quantity="other">Impordi %d tunnusluba ikkagi</item>
+    </plurals>
+    <string name="import_google_auth_failure">Google Authenticatori ekspordifaili importimine ei õnnestunud</string>
+    <string name="unrelated_google_auth_batches_error">Ekspordis on teave mitteseotud töötluspakkide kohta. Proovida importida ühe paki kaupa.</string>
+    <string name="no_tokens_can_be_imported">Tulemusena pole võimalik ühtegi kirjet importida</string>
+    <string name="unlocking_vault">Andmehoidla lukustus on eemaldamisel</string>
+    <string name="rename_group">Muuda grupi nime</string>
+    <string name="no_group_selection">Kui kirje ei kuulu ühtegi gruppi, siis leidub ta valikus „Grupp puudub“.</string>
+    <string name="remove_group">Eemalda grupp</string>
+    <string name="remove_group_description">Kas sa oled kindel, et soovid selle grupi eemaldada? Selle ja teiste sama grupiga kirjete uus grupp saab olema „Grupp puudub“.</string>
+    <string name="remove_unused_groups">Kustuta kasutamata grupid</string>
+    <string name="remove_unused_groups_description">Kas sa oled kindel, et soovid kustutada kõik grupid, mis pole ühegi kirjega seotud?</string>
+    <string name="remove_icon_pack">Eemalda ikoonipakk</string>
+    <string name="remove_icon_pack_description">Kas sa oled kindel, et soovid selle ikoonipaki eemaldada? Sellest pakist ikoone kasutavad kirjed jäävad alles.</string>
+    <string name="details">Üksikasjad</string>
+    <string name="show_error_details">Näita vea üksikasju</string>
+    <string name="lock">Lukusta</string>
+    <string name="name">Nimi</string>
+    <string name="no_group">Grupp puudub</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Järjesta</string>
+    <string name="sort_alphabetically">Väljaandja (A kuni Z)</string>
+    <string name="sort_alphabetically_reverse">Väljaandja (Z kuni A)</string>
+    <string name="sort_alphabetically_name">Kasutajakonto (A kuni Z)</string>
+    <string name="sort_alphabetically_name_reverse">Kasutajakonto (Z kuni A)</string>
+    <string name="sort_usage_count">Kasutuskorrad</string>
+    <string name="sort_last_used">Viimati kasutatud</string>
+    <string name="sort_custom">Sinu järjestus</string>
+    <string name="last_used">Viimati kasutatud</string>
+    <string name="last_used_never">mitte kunagi</string>
+    <string name="new_group">Uus grupp…</string>
+    <string name="group">Grupp</string>
+    <string name="group_name_hint">Grupi nimi</string>
+    <string name="preference_manage_groups">Muuda gruppe</string>
+    <string name="preference_manage_groups_summary">Halda ja kustuta oma gruppe siin</string>
+    <string name="preference_reset_usage_count">Nulli kasutuskordade loendur</string>
+    <string name="preference_reset_usage_count_summary">Lähtesta andmehoidla kõikide kirjete loendurid</string>
+    <string name="preference_reset_usage_count_dialog">Kas sa oled kindel, et soovid nullida andmehoidla kõikide kirjete kasutuskordade loenduri?</string>
+    <string name="note" comment="Users can add a note to an entry">Märkus</string>
+    <string name="clear">Tühjenda</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Topeltkirje</string>
+    <string name="dialog_duplicate_entry_message">Sellel kirjel on sama nimi ja väljaandja, kui veel ühel või mitmel kirjel. Kuidas peaksime jätkama?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Kirjuta olemasolev kirje või kirjed üle</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Asenda olemasolev(ad) kirje või kirjed uuega. Seda tegevust ei saa tagasi pöörata</string>
+    <string name="dialog_duplicate_entry_suffix_title">Lisa eesliide</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Lisa eesliide uuele kirje nimele. Seega uus nimi saab olema: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Katkesta salvestamine</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Võimaldab sul enne uut salvestuskatset muuta kirjet</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Kas sa oled kindel, et soovid kustutada %d kirje järgneva nimega:\n\n%s - %s</item>
+        <item quantity="other">Kas sa oled kindel, et soovid kustutada %d kirjet järgnevate nimedega:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Kinnita kustutamine</string>
+    <string name="pref_haptic_feedback_summary">Anna koodide muutumisest märgi värinaga</string>
+    <string name="pref_haptic_feedback_title">Haptiline tagasiside</string>
+    <string name="pref_highlight_entry_title">Puudutamisel tõsta kinnituskood esile</string>
+    <string name="pref_highlight_entry_summary">Peale kinnituskoodi puudutamist tõsta ta ajutiselt esile ja tee seeläbi teistest kergemini eristatavaks</string>
+    <string name="pref_groups_multiselect_title">Vali mitu grupi korraga</string>
+    <string name="pref_groups_multiselect_summary">Võimalda mitme grupi korraga valimist</string>
+    <string name="pref_minimize_on_copy_title">Kopeerimisel peida rakendus</string>
+    <string name="pref_minimize_on_copy_summary">Peale kinnituskoodi kopeerimist minimeeri rakendus</string>
+    <string name="pref_copy_behavior_title">Kopeeri kinnituskoodid lõikelauale</string>
+    <string name="pref_search_behavior_title">Otsingu toimimine</string>
+    <string name="pref_pause_entry_title">Peale puudutamist peata kinnituskoodide muutumine</string>
+    <string name="pref_pause_entry_summary">Puudutamisel peata kinnituskoodide automaatne uuendamine - seni kuni ta on fookuses kood ei muutu. Eeldab, et „Puudutamisel tõsta kinnituskood esile“ või „Näitamiseks puuduta“ on sisse lülitatud.</string>
+    <string name="pin_keyboard_description">Numbriklahvistiku sisselülitamiseks sisesta uus salasõna. Palun arvesta, et selleks peab salasõna koosnema ainult numbritest</string>
+    <string name="pin_keyboard_error">Lukustusvaate numbriklahvistiku kasutuselevõtmisel tekkis viga</string>
+    <string name="pin_keyboard_error_description">Lukustusvaate numbriklahvistiku pole võimalik kasutusele võtta. Sinu salasõna peab koosnema ainult numbritest.</string>
+    <string name="pin_keyboard_disabled">Salasõna on muudetud. Lukustusvaate numbriklahvistik pole enam kasutusel.</string>
+    <string name="selected">Valitud</string>
+    <string name="dark_theme_title">Tume kujundus</string>
+    <string name="light_theme_title">Hele kujundus</string>
+    <string name="amoled_theme_title">Must kujundus AMOLED-i jaoks</string>
+    <string name="system_theme_title">Määratud akukasutuse optimeerija poolt</string>
+    <string name="system_amoled_theme_title">Määratud akukasutuse optimeerija poolt (AMOLED)</string>
+    <string name="normal_viewmode_title">Tavaline</string>
+    <string name="compact_mode_title">Kompaktne</string>
+    <string name="small_mode_title">Väike</string>
+    <string name="tiles_mode_title">Ruudustik</string>
+    <string name="unknown_issuer">Tundmatu väljaandja</string>
+    <string name="unknown_account_name">Tundmatu kasutajakonto nimi</string>
+    <plurals name="import_error_dialog">
+        <item quantity="one">Aegis ei suutnud importida %d-t kirjet ja see kirje jääb vahele. Leiad täpsemat teavet vea kohta, kui klõpsid viidet „üksikasjad“.</item>
+        <item quantity="other">Aegis ei suutnud importida %d-t kirjet ja need kirjed jäävad vahele. Leiad täpsemat teavet vea kohta, kui klõpsid viidet „üksikasjad“.</item>
+    </plurals>
+    <string name="unable_to_process_deeplink">Süvalinki ei õnnestunud töödelda</string>
+    <string name="unable_to_read_qrcode_file">Failis leiduvad QR-koodi ei õnnestunud töödelda: %s.</string>
+    <string name="unable_to_process_shared_text">Jagatud teksti pole võimalik töödelda ühekordse salasõnana</string>
+    <string name="unable_to_read_qrcode_files">Mõnede QR-koodide lugemine ja töötlemine pole võimalik. Importimisele kuuluvad vaid %1$d kirjet %2$d-st.</string>
+    <string name="unable_to_generate_qrcode">QR-koodi loomine ei õnnestu</string>
+    <string name="select_picture">Vali pilt</string>
+    <string name="select_icon">Vali ikoon</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Ava andmehoidla</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Ava skanner</string>
+    <string name="toggle_checkboxes">Märgista märkeruudud või eemalda märgistus</string>
+    <string name="search">Otsi</string>
+    <string name="channel_name_lock_status">Lukustuse olek</string>
+    <string name="channel_description_lock_status">Aegis võib luua püsiteavituse, mis kinnitab sulle, kui andmehoidla lukustub</string>
+    <string name="vault_unlocked_state">Andmehoidla pole lukus. Lukustamiseks klõpsi siin.</string>
+    <string name="version">Versioon</string>
+    <string name="changelog">Muudatuste logi</string>
+    <string name="whats_new">Mida on uut</string>
+    <string name="github_description">Lähtekood, veahaldus ja teave</string>
+    <string name="license">Litsents</string>
+    <string name="license_description">Aegis Authenticator on litsentseeritud GPLv3 alusel</string>
+    <string name="third_party_licenses">Kolmandate osapoolte litsentsid</string>
+    <string name="third_party_licenses_description">Aegise kasutatavate kolmandate osapoolte teekide litsentsid</string>
+    <string name="country_netherlands">Madalmaad</string>
+    <string name="email_us">Saada e-kiri</string>
+    <string name="visit_website">Külasta meie veebisaiti</string>
+    <string name="about_support">Kasutajatugi</string>
+    <string name="support_rate">Hinda meie rakendust</string>
+    <string name="support_rate_description">Toeta meid koostades arvustuse Google Play rakendustepoes</string>
+    <string name="webview_error">Selles nutiseadmes puudub webview-teegi tugi. Seda on vaja muudatuste logi ja litsentside kuvamiseks. Tegemist on operatsioonisüsteemi komponendiga.</string>
+    <string name="email">E-post</string>
+    <string name="time_sync_warning_title">Kellaaja automaatne sünkroniseerimine</string>
+    <string name="time_sync_warning_message">Õigete tuvastusskoodide loomiseks vajab Aegis, et kellaajad nutiserdme ja serveri vahel on sünkroonis. Isegi mõnesekundiline erinevus võib tulemuseks anda vale koodi. Tundub, et sinu nutiseadmes on puudu automaatne aja sünkroniseerimine. Kas sa tahaksid seda nüüd teha?</string>
+    <string name="time_sync_warning_disable">Ära hoiata mind enam. Ma tean, mida ma teen.</string>
+    <string name="google_qr_export_unrelated">Tuvastasin mitteseotud QR-koodi. Proovi skanneri uuesti käivitamist.</string>
+    <plurals name="google_qr_export_scanned">
+        <item quantity="one">Skaneerisin %1$d/%2$d QR-koodi</item>
+        <item quantity="other">Skaneerisin %1$d/%2$d QR-koodi</item>
+    </plurals>
+    <string name="google_qr_export_unexpected">Eeldasin näga QR-koodi #%1$d, aga selle asemel skaneerisin #%2$d</string>
+    <string name="backup_error_bar_message"><b>Andmehoidla hiljutine varundamine ei õnnestunud</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Vea tekkimise tõttu hiljutine andmehoidla varundus %1$s abil ei õnnestunud. Varukoopia loomise katse toimus %2$s. Selleks, et varundus toimiks korrektselt, palun kontrolli varunduse seadistusi.    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Kuna Aegisel polnud õigust kirjutada varunduse kausta, siis hiljutine andmehoidla varundus %1$s abil ei õnnestunud. Varukoopia loomise katse toimus %2$s. Selline viga võib tekkida, kui sa oled hiljuti muutnud varukoopia kausta nime või ta teisaldanud, samuti ka kui oled hiljuti Aegise varukoopiast taastanud. Palun seadista varukoopia kaust uuesti.    </string>
+    <string name="backup_system_builtin">Aegise sisseehitatud automaatne varundus</string>
+    <string name="backup_system_android">Androidi pilvevarundus</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">Viimane varukoopia on aegunud (%s)    </string>
+    <string name="backup_reminder_bar_message">Muudatused on varundamata    </string>
+    <string name="backup_reminder_bar_dialog_title">Muudatused on varundamata</string>
+    <string name="backup_reminder_bar_dialog_summary">Andmehoidla viimased muudatused on veel varundamata. Vältimaks, et kaotad ligipääsu oma kasutajakontodele, on oluline, et teed sagedasti varukoopiaid. Palun kaalu automaatse varunduse kasutuselevõtmist seadistuste menüüst.    </string>
+    <string name="backup_reminder_bar_dialog_accept">Seadista varundamine</string>
+    <string name="backup_plaintext_export_warning"><b>Andmehoidla on hiljuti eksporditud lihtteksti vormingus</b></string>
+    <string name="pref_show_plaintext_warning_hint">Ära näita seda hoiatust uuesti</string>
+    <string name="backup_plaintext_warning_explanation">Sa näed seda hoiatusest, sest oled hiljuti andmehoidlat eksportinud krüptimata vormingus. Säilitamaks sinu autentimiskirjete turvalisust soovitame me sul selle faili kustutada kohe, kui teda enam vaja pole.</string>
+    <string name="switch_camera">Vaheta kaamerat</string>
+    <string name="empty_list">Me ei saa sulle näidata ühtegi koodi. Kirjete lisamiseks klõpsi + ikooni lehe all paremas nurgas</string>
+    <string name="empty_list_title">Ühtegi kirjet ei leidu</string>
+    <string name="empty_group_list">Ühtegi gruppi pole näidatud. Saad neid lisada kirje muutmisvaatest</string>
+    <string name="empty_group_list_title">Ühtegi gruppi ei leidu</string>
+    <string name="no_icon_packs">Ühtegi ikoonipakki pole veel imporditud. Mõne sellise importimisejs klõpsi + ikooni. Soovitus: vaata ka <a href="https://aegis-icons.github.io">aegise ikoone</a>.</string>
+    <string name="no_icon_packs_title">Ikoonipakke pole</string>
+    <string name="pick_icon">Vali ikoon</string>
+    <string name="uncategorized">Kategoriseerimata</string>
+    <string name="done">Valmis</string>
+    <plurals name="qr_count">
+        <item quantity="one">%d / %d QR-koodi</item>
+        <item quantity="other">%d / %d QR-koodi</item>
+    </plurals>
+    <string name="next">Edasi</string>
+    <string name="previous">Tagasi</string>
+    <string name="copy_uri">Kopeeri URI</string>
+    <string name="unable_to_copy_uri_to_clipboard">URI kopeerimine lõikelauale ei õnnestunud</string>
+    <string name="uri_copied_to_clipboard">URI on kopeeritud lõikelauale</string>
+    <string name="transfer_entry_description">Skaneeri seda QR-koodi autentimisrakendusega, kuhu soovid seda kirjet eksportida</string>
+    <string name="transfer_entry_brightness">Täisekraani ereduse sisse/välja lülitamiseks klõosi QR-koodi</string>
+    <string name="google_auth_compatible_transfer_description">Skaneeri neid QR-koode Aegise või Google Authenticatoriga.\n\nGoogle Authenticatori tehniliste piirangute tõttu on võimalik eksportida vaid TOTP ja HOTP tunnuslube, mis kasutavad SHA1 räsi ning kuvavad tulemuseks 6-kohalisi koode</string>
+    <string name="password_strength_very_weak">Väga nõrk</string>
+    <string name="password_strength_weak">Nõrk</string>
+    <string name="password_strength_fair">Keskpärane</string>
+    <string name="password_strength_good">Hea</string>
+    <string name="password_strength_strong">Tugev</string>
+    <string name="password_strength_unknown">Salasõna tugevuse analüüsimiseks on ta liiga pikk</string>
+    <string name="pref_pin_keyboard_title">Kasuta lukustusvaates numbriklahvistikku</string>
+    <string name="pref_pin_keyboard_summary">Kasuta seda eelistust, kui soovid lukustusvaates näha numbriklahvistikku. Kasutatav vaid numbritest koosneva salasõna puhul</string>
+    <string name="title_activity_preferences">Seadistused</string>
+    <string name="title_activity_manage_groups">Halda gruppe</string>
+    <string name="title_activity_transfer">Kirjete teisaldamine mujale</string>
+    <string name="title_activity_about">Rakenduse teave</string>
+    <string name="title_activity_edit_entry">Muuda kirjet</string>
+    <string name="title_activity_scan_qr">Skanneeri QR-koodi</string>
+    <string name="title_activity_import_entries">Impordi kirjeid</string>
+    <string name="title_activity_assign_icons">Lisa ikoone</string>
+    <string name="title_activity_licenses">Kolmandate osapoolte litsentsid</string>
+    <string name="dialog_wipe_entries_title">Kõikide kirjete kustutamine</string>
+    <string name="dialog_wipe_entries_message">Sinu andmehoidlas juba leidub kirjeid. Kas sa soovid enne importimist need kirjed eemaldada?\n\n<b>Seda tehes kaotad sa jäädavalt ligipääsu eemaldatud kirjetele ja vastavale autentimisteenusele</b>.</string>
+    <string name="dialog_wipe_entries_checkbox">Kustuta andmehoidla sisu</string>
+    <string name="panic_trigger_ignore_toast">Aegis tuvastas paanikanupu vajutuse, kuid kuna vastav seadistus on keelatud, siis me ei tee midagi</string>
+    <string name="pref_panic_trigger_title">Paanikanupu vajutusel kustuta andmehoidla</string>
+    <string name="pref_panic_trigger_summary">Kui Guardian Projekti Ripple\'i rakenduses vajutatakse paanikanuppu, siis kustuta andmehoidla</string>
+    <string name="import_vault">Impordi Aegise andmehoidla</string>
+    <string name="import_vault_hint">Kas soovid andmeid importida mõnest teisest kaheastmelise autentimise haldusrakendusest? Esmalt lõpeta algseadistamine ja seejärel ava rakenduse seadistustest importimise valikud.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d võimalik kontrollimata duplikaat. Palun vaata kirjete loend üle.</item>
+        <item quantity="other">%d võimalikku kontrollimata duplikaati. Palun vaata kirjete loend üle.</item>
+    </plurals>
+    <string name="importer_help_2fas">Ava 2FAS Authenticatori varukoopia fail.</string>
+    <string name="importer_help_aegis">Ava Aegise ekspordi- või varukoopia fail.</string>
+    <string name="importer_help_authenticator_plus">Määratle Authenticator Plusi ekspordifail, mille saad rakendusest siit: <b>Seadistused -&gt; Varundus ja taastamine -&gt; Ekspordi teksti- või html-failina</b>.</string>
+    <string name="importer_help_authy">Ava <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> faili koopia, leiad Authy sisemisest andmeruumist.</string>
+    <string name="importer_help_andotp">Ava andOTP ekspordi- või varukoopia fail.</string>
+    <string name="importer_help_bitwarden">Ava Bitwardeni ekspordi- või varukoopia fail. Krüptitud failid pole toetatud.</string>
+    <string name="importer_help_battle_net_authenticator">Ava <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b> faili koopia, mille leiad Battle.net Authenticatori sisemisest andmeruumist.</string>
+    <string name="importer_help_duo">Ava <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> faili koopia, mille leiad DUO sisemisest andmeruumist.</string>
+    <string name="importer_help_ente_auth">Ava Ente Authi ekspordifail. Hetkel on toetatud vaid krüptimata failidest importimine.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Ava varundatud fail.\nFreeOTP 1.x: Ava <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> faili koopia, mille leiad FreeOTP sisemise andmeruumi kaustast.</string>
+    <string name="importer_help_freeotp_plus">Ava FreeOTP+ ekspordifail.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2 ühilduvus</string>
+    <string name="importer_warning_message_freeotp2">FreeOTP 2 rakendusega on seotud mitu viga, mis võib tekitada olukorra, kus varukoopiad on vigased. Aegis proovib olukorrast päästa maksimumi, aga võib juhtuda, et mõned või lausa kõik kirjed jäävad importimata.</string>
+    <string name="importer_help_google_authenticator"><b>Toetatud on ainult Google Authenticatori versiooni 5.10 või varasemad failid</b>.\n\nAva <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> faili koopia, mille leiad Google Authenticatori sisemise andmeruumi kaustast.</string>
+    <string name="importer_help_microsoft_authenticator">Ava <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> faili koopia, mille leiad Microsoft Authenticatori sisemisest andmeruumist.</string>
+    <string name="importer_help_plain_text">Lisa siia lihttekstina vormindatud fail, kus iga Google Authenticatori URI asub omaette real.</string>
+    <string name="importer_help_steam"><b>Steam 3.0 ja uuemad pole toetatud</b>. Ava <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> faili koopia, mille leiad Steami sisemise andmeruumi kaustast.</string>
+    <string name="importer_help_stratum">Ava Stratumi ekspordifail, mille saad rakendusest valides <b>„Seadistused“ → „Varundus“ → „Varunda krüptitud faili (soovitatud)“</b>.</string>
+    <string name="importer_help_totp_authenticator">Ava TOTP Authenticatori ekspordifail.</string>
+    <string name="importer_help_winauth">Ava WinAuthi ekspordifail.</string>
+    <string name="import_assign_icons_dialog_title">Lisa ikoone</string>
+    <string name="import_assign_icons_dialog_text">Kas sa sooviksid lisada imporditud kirjetele ikoone?</string>
+    <string name="importer_encrypted_exception_google_authenticator">Krüptitud kirje jäi vahele: %s</string>
+    <string name="importer_help_direct">Impordi kirjed otse „%s“ rakendusest. See eeldab, et rakendus on nutiseadmesse paigaldatud ja Aegisel on juurkasutaja õigused.</string>
+    <string name="groups">Grupid</string>
+    <string name="pref_focus_search">Rakenduse käivitamisel pane fookus otsingule</string>
+    <string name="pref_focus_search_summary">Rakenduse käivitamisel võimalda kohe alustada otsingut.</string>
+    <string name="pref_grouping_halves">Rühmita kahes osas</string>
+    <string name="pref_grouping_none">Ära rühmita</string>
+    <string name="pref_grouping_size_two">Rühmita kahekaupa</string>
+    <string name="pref_grouping_size_three">Rühmita kolmekaupa</string>
+    <string name="pref_grouping_size_four">Rühmita neljakaupa</string>
+    <string name="pref_copy_behavior_never">Ära kopeeri iialgi</string>
+    <string name="pref_copy_behavior_single_tap">Kopeeri ühe puudutusega</string>
+    <string name="pref_copy_behavior_double_tap">Kopeeri kahe puudutusega</string>
+    <string name="pref_account_name_position_hidden">Peidetud</string>
+    <string name="pref_account_name_position_end">Väljaandja kõrval</string>
+    <string name="pref_account_name_position_below">Väljaandja all</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="one">%d sekund tagasi</item>
+        <item quantity="other">%d sekundit tagasi</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">%d minut tagasi</item>
+        <item quantity="other">%d minutit tagasi</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="one">%d tund tagasi</item>
+        <item quantity="other">%d tundi tagasi</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="one">%d päev tagasi</item>
+        <item quantity="other">%d päeva tagasi</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="one">%d aasta tagasi</item>
+        <item quantity="other">%d aastat tagasi</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="one">%d kirje on valitud</item>
+        <item quantity="other">%d kirjet on valitud</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-eu-rES-v29/strings.xml b/app/src/main/res/values-eu-rES-v29/strings.xml
new file mode 100644
index 00000000..de639daf
--- /dev/null
+++ b/app/src/main/res/values-eu-rES-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Sistemaren defektuzkoa</string>
+    <string name="system_amoled_theme_title">Sistemaren defektuzkoa (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 01cf48a4..ed67272a 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Ezarpenak</string>
     <string name="action_about">Honi buruz</string>
     <string name="action_delete">Ezabatu</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Berrezarri abiarazle lehentsia</string>
     <string name="discard">Baztertu</string>
     <string name="save">Gorde</string>
+    <string name="all">Guztiak</string>
     <string name="issuer">Igorlea</string>
     <string name="yandex_pin">PIN (4–16 zenbaki)</string>
     <string name="motp_pin">PIN (4 zenbaki)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Zifratzea, desblokeatzeko elementu biometrikoak erabiltzea, automatikoki blokeatzea eta beste segurtasun ezarpen batzuk kudeatu.</string>
     <string name="pref_section_import_export_title">Inportatu eta esportatu</string>
     <string name="pref_section_import_export_summary">Aegis edo beste aplikazio batzuen segurtasun-kopiak inportatu. Zure Aegis biltegiaren eskuzko esportazioak sortu.</string>
+    <string name="pref_section_audit_log_title">Erregistroa</string>
+    <string name="pref_section_audit_log_summary">Appean gertatutako gertaeren zerrenda agertuko da.</string>
     <string name="pref_section_backups_title">Segurtasun-kopiak</string>
     <string name="pref_section_backups_summary">Konfiguratu segurtasun kopia automatikoak zuk nahi duzun karpetan gorde edo aktibatu Androiden segurtasun kopien sistema.</string>
     <string name="pref_section_icon_packs">Ikono multzoak</string>
     <string name="pref_section_icon_packs_summary">Kudeatu eta inportatu ikono multzoak</string>
     <string name="pref_select_theme_title">Itxura</string>
+    <string name="pref_dynamic_colors_title">Kolore dinamikoak</string>
+    <string name="pref_dynamic_colors_summary">Zure Androidaren itxuraren araberako koloreak aplikatu</string>
     <string name="pref_view_mode_title">Ikuspegia</string>
     <string name="pref_lang_title">Hizkuntza</string>
     <string name="pref_show_icons_title">Erakutsi ikonoak</string>
@@ -40,6 +45,11 @@
     <string name="pref_code_group_size_title">Kode-digituen taldekatzea</string>
     <string name="pref_code_group_size_summary">Aukeratu kodeak zenbat zenbakiko taldetan taldekatuko diren</string>
     <string name="pref_account_name_position_title">Erakutsi kontuaren izena</string>
+    <string name="pref_show_next_code_title">Erakutsi hurrengo kodea</string>
+    <string name="pref_show_next_code_summary">Sortu eta erakutsi hurrengo kodea aurrez</string>
+    <string name="pref_expiration_state_title">Erakutsi iraungitzera doazen kodeak</string>
+    <string name="pref_expiration_state_summary">Aldatu kodeen koloreak eta keinuak gehitu iraungitzera doazenean</string>
+    <string name="pref_expiration_state_fallback">Aldatu kodeen koloreak iraungitzera doazenean</string>
     <string name="pref_shared_issuer_account_name_title">Kontuaren izena beharrezkoa denean bakarrik erakutsi</string>
     <string name="pref_shared_issuer_account_name_summary">Kontuen izenak jaulkitzaile bera dutenean bakarrik erakutsi. Beste kontu izenak ezkutuan egongo dira.</string>
     <string name="pref_account_name_position_summary_override">Ezarpen hau lauzen bistak gainidazten du. Kontuaren izena jaulkitzailearen azpian erakutsiko da beti.</string>
@@ -54,15 +64,23 @@
     <string name="pref_backups_reminder_summary">Erakutsi segurtasun kopia egiteko gogorarazpena zure azken aldaketen kopiarik ez bada egin.</string>
     <string name="pref_backups_reminder_dialog_title">Desaktibatu segurtasun kopiaren gogorarazpena</string>
     <string name="pref_backups_reminder_dialog_summary">Gogorarazpena desaktibatzean Aegisek ez dizu kopien inguruko abisurik emango. Honek zure gakoak galtzea ekar dezake. Gogorarazpena desaktibatu egin nahi duzu?</string>
-    <string name="pref_backups_location_title">Segurtasun-kopiak egiteko direktorioa</string>
+    <string name="pref_backups_versioning_strategy_title">Segurtasun kopien estrategia</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Bertsio kopuru bat mantendu</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Segurtasun kopia bakarra</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Aukeratutako estrategia ez da fidagarria eta ez dugu gomendatzen. Segurtasun kopia bakarrak huts egiten badu datuak galdu egin ditzakezu.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Aukeratu segurtasun kopien estrategia</string>
+    <string name="pref_backups_location_title">Segurtasun kopien kokalekua</string>
     <string name="pref_backups_location_summary">Segurtasun-kopiak hemen gordeko dira</string>
+    <string name="pref_backup_location_summary">Segurtasun-kopiak hemen gordeko dira</string>
     <string name="pref_backups_trigger_title">Segurtasun-kopien abiarazlea</string>
     <string name="pref_backups_trigger_summary">Abiarazi segurtasun-kopia eskuz</string>
     <string name="pref_backups_versions_title">Gorde beharreko bertsio kopurua</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Mantendu segurtasun-kopiaren %1$d bertsio</item>
         <item quantity="other">Mantendu segurtasun-kopien %1$d bertsio</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Segurtasun kopien infititu bertsio gorde</string>
     <string name="pref_import_app_title">Inportatu aplikaziotik</string>
     <string name="pref_import_app_summary">Inportatu tokenak aplikazio batetik (root sarbidea behar du)</string>
     <string name="pref_export_title">Esportatu</string>
@@ -98,8 +116,34 @@
     <string name="pref_encryption_summary">Zifratu biltegia eta desblokeatu pasahitzarekin edo biometriarekin</string>
     <string name="pref_biometrics_title">Desblokeatze biometrikoa</string>
     <string name="pref_biometrics_summary">Baimendu autentifikazio biometrikoa biltegia desblokeatzeko</string>
+    <string name="pref_search_behavior_summary">Bilatu: %s</string>
+    <string name="pref_search_behavior_prompt">Bilatu eremu guzti hauetan</string>
+    <string name="pref_search_behavior_type_name">Izena</string>
+    <string name="pref_search_behavior_type_issuer">Jaulkitzailea</string>
+    <string name="pref_search_behavior_type_note">Oharra</string>
+    <string name="pref_search_behavior_type_groups">Taldeak</string>
     <string name="pref_set_password_title">Aldatu pasahitza</string>
     <string name="pref_set_password_summary">Ezarri biltegia desblokeatzeko erabiliko duzun pasahitz berria</string>
+    <string name="no_events_title">Ez dago gertaerarik</string>
+    <string name="no_events_description">Ez da garrantzizko gertaerarik gertatu appean</string>
+    <string name="event_title_vault_unlocked">Biltegia desblokeatuta</string>
+    <string name="event_description_vault_unlocked">Biltegia ondo desblokeatu da</string>
+    <string name="event_title_backup_created">Segurtasun kopia sortuta</string>
+    <string name="event_description_backup_created">Biltegiaren segurtasun kopia ondo sortu da</string>
+    <string name="event_title_android_backup_created">Androidek sortutako segurtasun kopia</string>
+    <string name="event_description_android_backup_created">Biltegiaren segurtasun kopia Androidek ondo sortu du</string>
+    <string name="event_title_vault_exported">Biltegia esportatuta</string>
+    <string name="event_description_vault_exported">Biltegiaren kopia bat esportatu da</string>
+    <string name="event_title_entry_shared">Sarrera partekatuta</string>
+    <string name="event_description_entry_shared">Sarrera bat partekatu da</string>
+    <string name="event_title_vault_unlock_failed_password">Biltegia desblokeatzeak huts egin du (pasahitza)</string>
+    <string name="event_description_vault_unlock_failed_password">Biltegia pasahitz bat erabiliz desblokeatzeak huts egin du</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Biltegia desblokeatzeak huts egin du (biometria)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Biltegia biometria erabilz desblokeatzeak huts egin du</string>
+    <string name="event_unknown">Gertaera ezezaguna</string>
+    <string name="audit_log_entry_deleted">(ezabatuta)</string>
+    <string name="today_at_time">Gaur %1$s</string>
+    <string name="day_of_week_at_time">%1$s %2$s</string>
     <string name="export_encrypted">Zifratu biltegia</string>
     <string name="export_help">Akzio honek zure biltegia Aegisen barne-biltegiratzetik kanpo esportatuko du. Aukeratu zein formatutan esportatu nahi duzun:</string>
     <string name="export_warning_unencrypted">Zure Aegis biltegiaren zifratu gabeko kopia esportatzera zoaz. <b>Ez dizugu hau egitea gomendatzen</b>.</string>
@@ -116,7 +160,7 @@
         <item quantity="other">%d talde aukeratuta</item>
     </plurals>
     <string name="export_no_groups_selected">Ez duzu talderik aukeratu esportatzeko</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator Esportazioa</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator Esportazioa</string>
     <string name="choose_authentication_method">Segurtasuna</string>
     <string name="authentication_method_explanation">Aegis segurtasunean oinarritutako 2FA aplikazioa da. Tokenak biltegi batean gordetzen dira. Biltegi hori nahi izanez gero, aukeratu duzun pasahitzarekin zifratu daiteke. Erasotzaile batek biltegi enkriptatuko fitxategia lortzen badu, ezingo du edukira sartu pasahitza jakin gabe.\n\nZure gailuarentzat hobeto egokituko litzatekeela uste dugun aukera hautatu dugu.</string>
     <string name="authentication_method_none">Bat ere ez</string>
@@ -152,6 +196,7 @@
     <string name="share">Partekatu</string>
     <string name="yes">Bai</string>
     <string name="no">Ez</string>
+    <string name="undo">Desegin</string>
     <string name="unlock">Desblokeatu</string>
     <string name="advanced">Aurreratua</string>
     <string name="counter">Kontagailua</string>
@@ -163,6 +208,11 @@
     <string name="set_up_biometric">Desblokeatze biometrikoa konfiguratu</string>
     <string name="copy">Kopiatu</string>
     <string name="edit">Editatu</string>
+    <string name="select_all">Aukeratu guztiak</string>
+    <string name="assign_icons">Esleitu ikonoak</string>
+    <string name="assign_groups">Esleitu taldeari</string>
+    <string name="assign_groups_dialog_summary">Aukeratu aukeratutako elementuak zein talderi esleitu.</string>
+    <string name="assign_groups_dialog_dropdown">Aukeratu taldea</string>
     <string name="favorite" comment="Verb">Gogokoa</string>
     <string name="unfavorite" comment="Verb">Gogokoetatik kendu</string>
     <string name="error_all_caps">Errorea</string>
@@ -177,10 +227,12 @@
     <string name="snackbar_authentication_method">Aukeratu autentifikazio modua mesedez</string>
     <string name="encrypting_vault">Biltegia zifratzen</string>
     <string name="exporting_vault">Biltegia esportatzen</string>
+    <string name="optimizing_icon">Ikonoak optimizatzen</string>
+    <string name="optimizing_icon_multiple">Ikonoak optimizatzen %1$d/%2$d</string>
     <string name="reading_file">Fitxategia irakurtzen</string>
     <string name="requesting_root_access">Root sarbidea eskatzen</string>
     <string name="analyzing_qr">QR kodea aztertzen</string>
-    <string name="analyzing_qr_multiple">QR kodea aztertzen %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">QR kodea aztertzen %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Sarrera berri %d gehitu da</item>
         <item quantity="other">%d sarrera berri gehitu dira</item>
@@ -197,6 +249,7 @@
     <string name="discard_changes">Baztertu aldaketak?</string>
     <string name="discard_changes_description">Zure aldaketak ez dira gorde</string>
     <string name="saving_profile_error">Errorea profila gordetzerakoan</string>
+    <string name="saving_assign_icons_error">Errorea ikonoak esleitzean</string>
     <string name="welcome">Ongi Etorri</string>
     <string name="app_description">Aegis doakoa, segurua eta software librea den 2FA aplikazioa da</string>
     <string name="setup_completed">Konfigurazioa osatuta</string>
@@ -205,6 +258,7 @@
     <string name="copied">Kopiatuta</string>
     <string name="errors_copied">Erroreak arbelera kopiatu dira</string>
     <string name="version_copied">Bertsioa arbelera kopiatu da</string>
+    <string name="error_required_field">Eremu hau derrigorrezkoa da</string>
     <string name="error_occurred">Errore bat gertatu da</string>
     <string name="decryption_error">Errorea gertatu da biltegia desblokeatzen saiatzean</string>
     <string name="decryption_corrupt_error">Errorea gertatu da biltegia desblokeatzen saiatzean. Zure biltegi-fitxategia hondatuta egon daiteke.</string>
@@ -268,15 +322,20 @@
     <string name="partial_google_auth_import">Google Authenticatorren esportazioa ez da osoa</string>
     <string name="partial_google_auth_import_warning">QR kode batzuk falta dira zure inportazioan. Kode hauek ez dira aurktu: \n\n<b>%s</b>\n\nZatikako inportazio honekin jarrai dezakezu baina berriz ere QR kode guztiekin saiatzea gomendatzen dizugu tokenetarako sarrera gal ez dezazun.</string>
     <string name="missing_qr_code_descriptor">• QR kodea %d</string>
-    <string name="import_partial_export_anyway">Inportatu %d token edonola ere</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Inportatu token %d edonola ere</item>
+        <item quantity="other">Inportatu %d token edonola ere</item>
+    </plurals>
     <string name="import_google_auth_failure">Google Authenticatorren esportazioa inportatzeak huts egin du</string>
     <string name="unrelated_google_auth_batches_error">Esportazioak zerikusirik ez duen sorta baten informazioa du. Saiatu sorta bakoitza bere aldetik inportatzen.</string>
     <string name="no_tokens_can_be_imported">Ez izan da tokenik inportatu</string>
-    <string name="authentication_method_raw">Gordina</string>
     <string name="unlocking_vault">Biltegia desblokeatzen</string>
-    <string name="slot_this_device">(gailu hau)</string>
+    <string name="rename_group">Berrizendatu taldea</string>
+    <string name="no_group_selection">Sarrera ez bada talde baten parte \"Talde gabekoak\" atalean egongo da.</string>
     <string name="remove_group">Ezabatu taldea</string>
     <string name="remove_group_description">Ziur zaude talde hau ezabatu nahi duzula? Talde honetako sarrerak automatikoki aldatuko dira \'Talderik ez\' aukerara.</string>
+    <string name="remove_unused_groups">Ezabatu erabili gabeko taldeak</string>
+    <string name="remove_unused_groups_description">Ziur zaude sarrera bati ere esleitu gabeko talde guztiak ezabatu nahi dituzula?</string>
     <string name="remove_icon_pack">Ezabatu ikono multzoa</string>
     <string name="remove_icon_pack_description">Ziur zaude ikono multzo hau ezabatzeaz? Ikono multzo honetako ikonoak darabiltzaten sarreretan ez da aldaketarik egongo.</string>
     <string name="details">Xehetasunak</string>
@@ -284,13 +343,16 @@
     <string name="lock">Blokeatu</string>
     <string name="name">Izena</string>
     <string name="no_group">Talderik ez</string>
-    <string name="sort">Ordenatu</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ordenatu</string>
     <string name="sort_alphabetically">Igorlea (A-tik Z-ra)</string>
     <string name="sort_alphabetically_reverse">Igorlea (Z-tik A-ra)</string>
     <string name="sort_alphabetically_name">Kontua (A-tik Z-ra)</string>
     <string name="sort_alphabetically_name_reverse">Kontua (Z-tik A-ra)</string>
     <string name="sort_usage_count">Erabilera kopurua</string>
+    <string name="sort_last_used">Azken erabilera</string>
     <string name="sort_custom">Pertsonalizatua</string>
+    <string name="last_used">Azken erabilera</string>
+    <string name="last_used_never">sekula ez</string>
     <string name="new_group">Talde berria…</string>
     <string name="group">Taldea</string>
     <string name="group_name_hint">Taldearen izena</string>
@@ -299,13 +361,16 @@
     <string name="preference_reset_usage_count">Berrezarri erabilera kopurua</string>
     <string name="preference_reset_usage_count_summary">Berrezarri elementu guztien erabilera kopurua</string>
     <string name="preference_reset_usage_count_dialog">Ziur zaude elementu guztien erabilera kopurua 0ra berrezartzeaz?</string>
-    <string name="note">Oharra</string>
+    <string name="note" comment="Users can add a note to an entry">Oharra</string>
     <string name="clear">Garbitu</string>
     <string name="pref_highlight_entry_title">Nabarmendu tokenak ukitzean</string>
     <string name="pref_highlight_entry_summary">Egin elkarrengandik errazago bereizten diren tokenak, sakatzen dituzunean aldi baterako nabarmenduz</string>
+    <string name="pref_groups_multiselect_title">Talde bat baino gehiago aukeratu</string>
+    <string name="pref_groups_multiselect_summary">Talde bat baino gehiago aldi berean aukeratzea baimendu</string>
     <string name="pref_minimize_on_copy_title">Txikitu kopiatzean</string>
     <string name="pref_minimize_on_copy_summary">Aplikazioa txikitu tokena kopiatutakoan</string>
     <string name="pref_copy_behavior_title">Kopiatu tokenak arbelera</string>
+    <string name="pref_search_behavior_title">Bilaketaren portaera</string>
     <string name="pref_pause_entry_title">Izoztu tokenak ukitzean</string>
     <string name="pref_pause_entry_summary">Gelditu tokenak automatikoki freskatzea beraietan sakatzean. Tokenak ez dira eguneratuko ukitzen ez badituzu. \"Nabarmendu tokenak ukitzean\" edo \"Sakatu erakusteko\" aukeratuta izatea eskatzen du.</string>
     <string name="pin_keyboard_description">Sartu pasahitza PIN teklatua gaitzeko. Kontuan izan honek zure pasahitzak zenbakiak soilik baditu funtzionatzen duela</string>
@@ -325,13 +390,13 @@
     <string name="unknown_issuer">Igorle ezezaguna</string>
     <string name="unknown_account_name">Kontu-izen ezezaguna</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegisek ezin izan du %d token inportatu. Token hori kendu egingo da. Sakatu \'Xehetasunak\' akatsei buruzko informazio gehiago ikusteko.</item>
-        <item quantity="other">Aegisek ezin izan du %d token inportatu. Token horiek kendu egingo dira. Sakatu \'Xehetasunak\' akatsei buruzko informazio gehiago ikusteko.</item>
+        <item quantity="one">Aegisek ezin izan du token %d inportatu. Token hau ez dugu inportatuko. Egin klik xehetasunetan erroreari buruzko informazio gehiago lortzeko.</item>
+        <item quantity="other">Aegisek ezin izan ditu %d token inportatu. Token hauek ez ditugu inportatuko. Egin klik xehetasunetan erroreari buruzko informazio gehiago lortzeko.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Ezin izan da esteka sakona prozesatu</string>
     <string name="unable_to_read_qrcode_file">Ezin izan da fitxategian oinarritutako QR kodea prozesatu: %s.</string>
     <string name="unable_to_process_shared_text">Ezin izan da partekatutako testua OTP bezala prozesatu</string>
-    <string name="unable_to_read_qrcode_files">Ezin izan dira QR kode batzuk irakurri eta prozesatu. %d/%d sarrera inportatuko dira bakarrik.</string>
+    <string name="unable_to_read_qrcode_files">Ezin izan dira QR kode batzuk irakurri eta prozesatu. %1$d/%2$d elementu bakarrik inportatuko dira.</string>
     <string name="unable_to_generate_qrcode">Ezin da QR kodea sortu</string>
     <string name="select_picture">Aukeratu irudia</string>
     <string name="select_icon">Aukeratu ikonoa</string>
@@ -363,12 +428,13 @@
     <string name="time_sync_warning_disable">Utzi aholkuak emateari. Badakit zer egiten ari naizen.</string>
     <string name="google_qr_export_unrelated">Erlazionatu gabeko QR kodea aurkitu da. Saiatu eskanerra berrabiarazten.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d eskaneatutako QR kodeak</item>
-        <item quantity="other">%d/%d eskaneatutako QR kodeak</item>
+        <item quantity="one">%1$d/%2$d QR kode eskaneatuta</item>
+        <item quantity="other">%1$d/%2$d QR kode eskaneatuta</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Itxarondako QR kodea #%d, baina haren ordez #%d eskaneatuta</string>
+    <string name="google_qr_export_unexpected">#%1$d QR kodea espero zen baina #%2$d eskaneatu da</string>
     <string name="backup_error_bar_message"><b>Biltegiaren segurtasun-kopiak akatsa eman du berriki</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">%s erabiliz egindako biltegiaren segurtasun kopiak huts egin du. Saiakera noiz egin den: %s. Ziurtatu segurtasun kopien ezarpenak ondo daudela hauek ondo egin daitezen.    </string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">%1$s erabiliz egindako biltegiaren segurtasun kopiak huts egin du. Saiakera noiz egin den: %2$s. Ziurtatu segurtasun kopien ezarpenak ondo daudela hauek ondo egin daitezen.    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">%1$s erabiliz egin den segurtasun-kopia baten saiakerak huts egin du Aegisek ez baitu baimenik helburuan ezer idazteko. Segurtasun kopiaren saiakera %2$s izan da. Errore hau kopia mugitu/berrizendatu egin duzulako izan daiteke edo Aegis segurtasun-kopia batetik berrezarri duzulako. Konfiguratu berriz zure kopien helburu karpeta.    </string>
     <string name="backup_system_builtin">Aegisek egindako segurtasun kopia automatikoak</string>
     <string name="backup_system_android">Androidek lainoan egidako segurtasun kopiak</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">Azken segurtasun kopia zaharregia da (%s)
@@ -400,14 +466,15 @@
     <string name="copy_uri">Kopiatu URIa</string>
     <string name="unable_to_copy_uri_to_clipboard">Ezin da URIa arbelean kopiatu</string>
     <string name="uri_copied_to_clipboard">URIa arbelean kopiatu da</string>
-    <string name="transfer_entry">Transferitu sarrera</string>
     <string name="transfer_entry_description">Eskaneatu QR kode hau sarrera transferitu nahi diozun aitentifikazio-aplikazioarekin</string>
+    <string name="transfer_entry_brightness">Sakatu QR kodea pantaila osoan ikusteko</string>
     <string name="google_auth_compatible_transfer_description">Eskaneatu QR kode hauek Aegis edo Google Authenticator erabiliz.\n\nGoogle Authenticator aplikazioaren mugak direla eta, SHA1 darabilten eta 6 zenbakiko kodeak erabiltzen dituzten TOTP &amp; HOTP tokenak bakarrik sartzen dira</string>
     <string name="password_strength_very_weak">Oso ahula</string>
     <string name="password_strength_weak">Ahula</string>
     <string name="password_strength_fair">Ertaina</string>
     <string name="password_strength_good">Ona</string>
     <string name="password_strength_strong">Sendoa</string>
+    <string name="password_strength_unknown">Pasahitza luzeegia da sendotasuna analisia egiteko</string>
     <string name="pref_pin_keyboard_title">Erabili PIN teklatua blokeo pantailan</string>
     <string name="pref_pin_keyboard_summary">Gaitu hau, blokeatzeko pantailan PIN teklatua gaitu nahi baduzu. Honek zenbaki-pasahitzetarako bakarrik balio du</string>
     <string name="title_activity_preferences">Ezarpenak</string>
@@ -416,33 +483,44 @@
     <string name="title_activity_about">Honi buruz</string>
     <string name="title_activity_edit_entry">Editatu sarrera</string>
     <string name="title_activity_scan_qr">Eskaneatu QR kodea</string>
-    <string name="title_activity_manage_slots">Kudeatu arteka giltzarriak</string>
     <string name="title_activity_import_entries">Inportatu sarrerak</string>
+    <string name="title_activity_assign_icons">Esleitu ikonoak</string>
+    <string name="title_activity_licenses">Hirugarrenen lizentziak</string>
     <string name="dialog_wipe_entries_title">Garbitu sarrerak</string>
     <string name="dialog_wipe_entries_message">Zure biltegiak sarrerak ditu dagoeneko. Sarrera horiek ezabatu nahi dituzu fitxategi hau inportatu aurretik?\n\n<b>Hori egitean, biltegiko sarreretarako sarbidea galduko da betirako.</b></string>
     <string name="dialog_wipe_entries_checkbox">Garbitu biltegiaren sarrerak</string>
     <string name="panic_trigger_ignore_toast">Aegisek arrisku mezua jaso du baina ezarpen hau desaktibatuta dago, ez da ezer egingo</string>
     <string name="pref_panic_trigger_title">Ezabatu biltegia arrisku mezua jasotzean</string>
     <string name="pref_panic_trigger_summary">Ezabatu biltegia Rippletik arrisku mezua jasotzean</string>
-    <string name="import_vault">Inportatu biltegia</string>
+    <string name="import_vault">Inportatu Aegis biltegia</string>
+    <string name="import_vault_hint">Beste 2FA aplikazio batetik inportatu nahi duzu? Amaitu konfigurazioa lehenengo eta joan ondoren ezarpenetara.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Bikoiztutako sarrera posible %d. Errebisatu zerrenda mesedez.</item>
+        <item quantity="other">Bikoiztutako %d sarrera posible. Errebisatu zerrenda mesedez.</item>
+    </plurals>
     <string name="importer_help_2fas">Aukeratu 2FAS Authenticator segurtasun-kopia fitxategia.</string>
     <string name="importer_help_aegis">Aegisen esportazio/segurtasun-kopia fitxategia aukeratu.</string>
     <string name="importer_help_authenticator_plus">Authenticator Plus esportazio fitxategia aukeratu. Lortzeko modua: <b>Settings -&gt; Backup &amp; Restore -&gt; Export as Text and HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Aukeratu Authenticator Proren esportazio fitxategia <b>Settings -&gt; Back up -&gt; Back up to encrypted file (recommended)</b> aukeratik lortu bezala.</string>
     <string name="importer_help_authy"><b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> fitxategia aukeratu.</string>
     <string name="importer_help_andotp">andOTPren esportazio/segurtasun-kopia fitxategia aukeratu.</string>
     <string name="importer_help_bitwarden">Kargatu Bitwardenen esportazio/segurtasun-kopia fitxategi bat. Ezin dituzu zifratutako fitxategiak kargatu.</string>
-    <string name="importer_help_battle_net_authenticator">Battle.net Authenticatoren <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b> fitxategia aukeratu.</string>
+    <string name="importer_help_battle_net_authenticator">Battle.net Authenticatoren <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b> fitxategia aukeratu.</string>
     <string name="importer_help_duo">Aukeratu <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> fitxategia, DUOren karpeten barruan dagoena.</string>
-    <string name="importer_help_freeotp">FreeTOPren <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> fitxategia aukeratu.</string>
+    <string name="importer_help_ente_auth">Kargatu Ente Auth esportazio fitxategia. Momentuz zifratu gabeko fitxategiak bakarrik kargatu daitezke.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Kargatu segurtasun-kopiaren fitxategia. \nFreeOTP 1.x: kargatu FreeOTPren barne-biltegiratzeko karpetan dagoen <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> fitxategia.</string>
     <string name="importer_help_freeotp_plus">FreeOTP+en esportazio fitxategia aukeratu.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2rekin bateragarritasuna</string>
+    <string name="importer_warning_message_freeotp2">Hainbat arazo daude FreeOTP 2rekin eta segurtasun-kopia okerrak eragin ditzagete. Aegis ahalik eta elementu gehien berreskuratzen saiatuko da baina horietako batzuk edo agian guztiek huts egitea gerta daiteke.</string>
     <string name="importer_help_google_authenticator">&lt;b&gt;Google Authenticator aplikazioaren v5.10 bertsioa edo lehenagokoak diren datu-baseak erabili daitezke. \n\n&lt;b&gt;data/data/com.google.android.apps.authenticator2/databases/databases&lt;/b&gt; fitxategiaren kopia bat eman, berau Google Authenticator aplikazioaren barne biltegiratzean dago.</string>
     <string name="importer_help_microsoft_authenticator">Microsoft Authenticatoren <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> fitxategia aukeratu.</string>
     <string name="importer_help_plain_text">Google Authenticator URIak dituen testu hutseko fitxategia aukeratu.</string>
     <string name="importer_help_steam"><b>Steam v3.0 eta berriagoak ezin dira erabili.</b>erabili
 <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> fitxategiaren kopia, berau Steamen barne biltegiratzearen karpetan egongo da.</string>
+    <string name="importer_help_stratum">Aukeratu Stratumen esportazio fitxategia <b>Settings -&gt; Back up -&gt; Back up to encrypted file (recommended)</b> aukeratik lortu bezala.</string>
     <string name="importer_help_totp_authenticator">TOTP Authenticatoren esportazio fitxategia aukeratu.</string>
     <string name="importer_help_winauth">WinAuthen esportazio fitxategia aukeratu.</string>
+    <string name="import_assign_icons_dialog_title">Esleitu ikonoak</string>
+    <string name="import_assign_icons_dialog_text">Inportatutako sarrerei ikonoak esleitu nahi dizkiezu?</string>
     <string name="importer_encrypted_exception_google_authenticator">Zifratutako sarrera ez da kontuan hartu: %s</string>
     <string name="importer_help_direct">Sarrerak %s-etik inportatu. Honek funtzionatzeko aplikazioa gailu honetan instalatuta egon behar da eta Aegisi root baimena eman beharko diozu.</string>
     <string name="groups">Taldeak</string>
@@ -459,23 +537,23 @@
     <string name="pref_account_name_position_hidden">Ezkutua</string>
     <string name="pref_account_name_position_end">Jaulkitzailearen ostean</string>
     <string name="pref_account_name_position_below">Jaulkitzailearen azpian</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">Duela segundo %d</item>
         <item quantity="other">Duela %d segundo</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">Duela minutu %d</item>
         <item quantity="other">Duela %d minutu</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">Duela ordu %d</item>
         <item quantity="other">Duela %d ordu</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">Duela egun %d</item>
         <item quantity="other">Duela %d egun</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">Duela urte %d</item>
         <item quantity="other">Duela %d urte</item>
     </plurals>
diff --git a/app/src/main/res/values-fa-rIR-v29/strings.xml b/app/src/main/res/values-fa-rIR-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-fa-rIR-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 069ea507..ba2edf94 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">تنظیمات</string>
     <string name="action_about">درباره‌</string>
     <string name="action_delete">حذف</string>
@@ -41,7 +41,6 @@
     <string name="pref_android_backups_hint"><i>پشتیبان‌گیریِ دستگاه به دستگاه (D2D) بدون در نظر گرفتن تنظیمات بالا، همواره مجاز است</i></string>
     <string name="pref_backups_title">بصورت خودکار از مخزن پشتیبانگیری شود</string>
     <string name="pref_backups_summary">به صورت خودکار از مخزن ها در کارت حافظه پیشتیبان گیری شود. این ویژگی فقط مخصوص مخزن های رمزگذاری شده است.</string>
-    <string name="pref_backups_location_title">مقصد ذخیره فایل‌های پشتیبان گیری</string>
     <string name="pref_backups_location_summary">فایل‌ها پشتیبان گیری در این آدرس ذخیره می‌شوند</string>
     <string name="pref_backups_trigger_title">پشتیبان‌گیری</string>
     <string name="pref_backups_trigger_summary">گرفتن پیشتیبان به صورت دستی</string>
@@ -193,9 +192,7 @@
     <string name="no_cameras_available">هیچ دوربینی در دسترس نیست</string>
     <string name="read_qr_error">هنگام خواندن بارکد دوبعدی خطایی رخ داد</string>
     <string name="read_qr_error_phonefactor">آگیس با الگوریتم اختصاصی 2FA مایکروسافت سازگاری ندارد. لطفا اطمینان حاصل فرمایید که گزینه \"تنظیم برنامه بدون اعلانات\" در تنظیمات 2FA آفیس 365 انتخاب شده باشد.</string>
-    <string name="authentication_method_raw">خام</string>
     <string name="unlocking_vault">رمزگشایی مزخن</string>
-    <string name="slot_this_device">(این دستگاه)</string>
     <string name="remove_group">حذف گروه</string>
     <string name="remove_group_description">آیا مطمئن به حذف این گروه هستید؟ تمام آیتم های داخل این گروه تبدیل به \"بدون گروه\" می‌شوند.</string>
     <string name="details">جزئیات</string>
@@ -229,10 +226,6 @@
     <string name="small_mode_title">کوچک</string>
     <string name="unknown_issuer">صادر کننده نامشخص</string>
     <string name="unknown_account_name">حساب کاربری نامشخص</string>
-    <plurals name="import_error_dialog">
-        <item quantity="one">%d توکن اضافه نشدند. برای اطلاعات بیشتر از دکمه جزییات استفاده نمایید.</item>
-        <item quantity="other">%d توکن اضافه نشدند. برای اطلاعات بیشتر از دکمه جزییات استفاده نمایید.</item>
-    </plurals>
     <string name="unable_to_generate_qrcode">عدم توانایی در ساخت بارکد دوبعدی</string>
     <string name="select_picture">انتخاب تصویر</string>
     <string name="select_icon">انتخاب آیکون</string>
@@ -256,11 +249,6 @@
     <string name="time_sync_warning_message">این برنامه نیاز به زمان دقیق برای ساختن کد جدید دارد. تفاوت چند ثانیه‌ای ممکن است باعث ایجاد کد اشتباه شود. به نظر می‌رسد ساعت دستگاه شما به صورت خودکار تنظیم نشده است. آیا میخواهید این کار را انجام دهید؟</string>
     <string name="time_sync_warning_disable">دیگر به من هشدار نده. می‌دانم دارم چکار می‌کنم.</string>
     <string name="google_qr_export_unrelated">یک بارکد دوبعدی نا مربوط دریافت شد. لطفا اسکنر خود را ریستارت کنید.</string>
-    <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d بارکد دوبعدیs اسکن شد</item>
-        <item quantity="other">%d/%d بارکد دوبعدیs اسکن شد</item>
-    </plurals>
-    <string name="google_qr_export_unexpected">بجای اینکه بارکد دوبعدی %d اسکن شود، بارکد دوبعدی %d اسکن شد.</string>
     <string name="backup_error_bar_message"><b>خطا پشتیبان گیری از مخزن</b></string>
     <string name="switch_camera">تغییر دوربین</string>
     <string name="empty_list">کدی برای نمایش موجود ندارد. لطفا برای اضافه کردن از دکمه به علاوه در پایین صفحه استفاده کنید.</string>
@@ -270,7 +258,6 @@
     <string name="done">انجام شد</string>
     <string name="next">بعدی</string>
     <string name="previous">قبلی</string>
-    <string name="transfer_entry">انتقال آیتم‌ها</string>
     <string name="transfer_entry_description">این بارکد دوبعدی را توسط برنامه ای که علاقه دارید توکن منتقل شود اسکن کنید.</string>
     <string name="password_strength_very_weak">خیلی ضعیف</string>
     <string name="password_strength_weak">ضعیف</string>
@@ -285,7 +272,6 @@
     <string name="title_activity_about">درباره‌ما</string>
     <string name="title_activity_edit_entry">ویرایش آیتم</string>
     <string name="title_activity_scan_qr">اسکن بارکد دوبعدی</string>
-    <string name="title_activity_manage_slots">مدیریت کلید‌ها</string>
     <string name="dialog_wipe_entries_title">پاک کردن موارد</string>
     <string name="dialog_wipe_entries_message">مخزن شما در حال حاضر شامل آیتم می‌باشد. آیا مطمئن به حذف این آیتم‌ها قبل از وارد کردن می‌باشید؟\n\n<b>بعد از این کار شما به هیچ وجه دسترسی به آیتم های قبلی نخواهید داشت.</b></string>
     <string name="dialog_wipe_entries_checkbox">پاک کردن اطلاعات مخزن</string>
@@ -298,9 +284,6 @@
 <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>,
 واقع شده در حافظه داخلی Authy.</string>
     <string name="importer_help_andotp">تهیه فایل بکاپ / خروجی از andOTP.</string>
-    <string name="importer_help_freeotp">تهیه کپی از
-<b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>,
-واقع شده در حافظه داخلیFreeOTP.</string>
     <string name="importer_help_freeotp_plus">تهیه فایل صدور برای FreeOTP+.</string>
     <string name="importer_help_microsoft_authenticator">تهیه کپی از
 <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>,
diff --git a/app/src/main/res/values-fi-rFI-v29/strings.xml b/app/src/main/res/values-fi-rFI-v29/strings.xml
new file mode 100644
index 00000000..feeda31b
--- /dev/null
+++ b/app/src/main/res/values-fi-rFI-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Järjestelmän oletus</string>
+    <string name="system_amoled_theme_title">Järjestelmän oletus (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index dc499450..63273bf9 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Asetukset</string>
     <string name="action_about">Tietoja</string>
     <string name="action_delete">Poista</string>
     <string name="action_transfer">Siirrä</string>
     <string name="action_edit_icon">Muokkaa kuvaketta</string>
     <string name="action_reset_usage_count">Nollaa käyttömäärä</string>
-    <string name="action_reset_usage_count_dialog">Nollataanko tämän kohteen käyttömäärä?</string>
+    <string name="action_reset_usage_count_dialog">Haluatko varmasti nollata tämän kohteen käyttömäärän?</string>
     <string name="action_default_icon">Palauta oletuskuvake</string>
     <string name="discard">Hylkää</string>
     <string name="save">Tallenna</string>
+    <string name="all">Kaikki</string>
     <string name="issuer">Myöntäjä</string>
-    <string name="yandex_pin">PIN (4–16 numeroa)</string>
+    <string name="yandex_pin">PIN (4 - 16 numeroa)</string>
     <string name="motp_pin">PIN (4 numeroa)</string>
     <string name="suggested">Ehdotettu</string>
     <string name="usage_count">Käyttömäärä</string>
@@ -22,46 +23,64 @@
     <string name="pref_cat_backups_auto">Automaattinen varmuuskopiointi</string>
     <string name="pref_section_behavior_title">Käyttäytyminen</string>
     <string name="pref_section_behavior_summary">Mukauta kohdelistan käyttäytymistä.</string>
-    <string name="pref_section_appearance_title">Ulkonäkö</string>
+    <string name="pref_section_appearance_title">Ulkoasu</string>
     <string name="pref_section_appearance_summary">Vaihda teemaa, kieltä ja muita sovelluksen ulkonäköön vaikuttavia asetuksia.</string>
     <string name="pref_section_security_title">Turvallisuus</string>
-    <string name="pref_section_security_summary">Määritä salaus, biometrinen avaus, automaattinen lukitus ja muita suojausasetuksia.</string>
+    <string name="pref_section_security_summary">Määritä salaus, biometrinen avaus, automaattilukitus ja muita suojausasetuksia.</string>
     <string name="pref_section_import_export_title">Tuonti ja vienti</string>
     <string name="pref_section_import_export_summary">Tuo varmuuskopioita Aegisista tai muista todennussovelluksista. Luo Aegis-holvisi varmuuskopioita manuaalisesti.</string>
+    <string name="pref_section_audit_log_title">Tilintarkastusloki</string>
+    <string name="pref_section_audit_log_summary">Löydät listan kaikista sovelluksessa tapahtuneista tärkeistä tapahtumista.</string>
     <string name="pref_section_backups_title">Varmuuskopiot</string>
     <string name="pref_section_backups_summary">Valitse automaattisen varmuuskopioinnin sijainti, tai ota Androidin pilvivarmuuskopiointijärjestelmä käyttöön.</string>
     <string name="pref_section_icon_packs">Kuvakepaketit</string>
     <string name="pref_section_icon_packs_summary">Hallitse ja tuo kuvakepaketteja</string>
     <string name="pref_select_theme_title">Teema</string>
-    <string name="pref_view_mode_title">Näyttötila</string>
+    <string name="pref_dynamic_colors_title">Dynaamiset värit</string>
+    <string name="pref_dynamic_colors_summary">Käytä Android-teemasi väreihin perustuvaa ulkoasua</string>
+    <string name="pref_view_mode_title">Näkymätila</string>
     <string name="pref_lang_title">Kieli</string>
     <string name="pref_show_icons_title">Näytä kuvakkeet</string>
     <string name="pref_show_icons_summary">Näytä kuvakkeet jokaisen kohteen vieressä</string>
-    <string name="pref_code_group_size_title">Numeroiden ryhmittely</string>
-    <string name="pref_code_group_size_summary">Valitse numeroiden määrä ryhmiteltäessä koodeja</string>
+    <string name="pref_code_group_size_title">Koodinumeroiden ryhmittely</string>
+    <string name="pref_code_group_size_summary">Valitse koodien ryhmittelyyn käytettävien numeroiden määrä</string>
     <string name="pref_account_name_position_title">Näytä tilin nimi</string>
+    <string name="pref_show_next_code_title">Näytä seuraava koodi</string>
+    <string name="pref_show_next_code_summary">Luo ja näytä seuraava koodi etukäteen</string>
+    <string name="pref_expiration_state_title">Ilmoita, milloin koodit ovat vanhentumassa</string>
+    <string name="pref_expiration_state_summary">Muuta koodien väriä ja laita ne vilkkumaan, kun ne ovat vanhentumassa</string>
+    <string name="pref_expiration_state_fallback">Vaihda koodien väriä, kun ne ovat vanhentumassa</string>
     <string name="pref_shared_issuer_account_name_title">Näytä tilin nimi vain tarvittaessa</string>
     <string name="pref_shared_issuer_account_name_summary">Näytä tilien nimet vain silloin, kun niillä on sama myöntäjä. Muiden tilien nimet piilotetaan.</string>
+    <string name="pref_account_name_position_summary_override">Tämä asetus ohitetaan laatat-näkymätilassa. Tilin nimi näytetään myöntäjän alapuolella.</string>
     <string name="pref_import_file_title">Tuo tiedostosta</string>
     <string name="pref_import_file_summary">Tuo todennuskoodit tiedostosta</string>
     <string name="pref_android_backups_title">Androidin pilvivarmuuskopiot</string>
     <string name="pref_android_backups_summary">Käytä Androidin pilvivarmuuskopiointijärjestelmää Aegisin holvin varmuuskopiointiin. Tämä tukee vain salattuja holveja.</string>
-    <string name="pref_android_backups_hint"><i>Device-to-device (D2D) -varmuuskopiot sallitaan aina, riippumatta yllä olevasta asetuksesta</i></string>
+    <string name="pref_android_backups_hint"><i>Laitteesta - laitteeseen (D2D) -varmuuskopiot sallitaan aina, riippumatta yllä olevasta asetuksesta</i></string>
     <string name="pref_backups_title">Varmuuskopioi holvi automaattisesti</string>
     <string name="pref_backups_summary">Holvi varmuuskopioidaan ulkoiseen tallennustilaan automaattisesti, muutoksia tehdessä. Vain salatut holvit tukevat tätä.</string>
     <string name="pref_backups_reminder_title">Varmuuskopiomuistutus</string>
     <string name="pref_backups_reminder_summary">Muistuta holvisi varmuuskopioimisesta, jos viimeisimpiä muutoksiasi ei ole varmuuskopioitu.</string>
     <string name="pref_backups_reminder_dialog_title">Poista varmuuskopiomuistutus käytöstä</string>
     <string name="pref_backups_reminder_dialog_summary">Tämän muistutuksen poistaminen käytöstä tarkoittaa, että Aegis ei kerro sinulle, onko sinulla varmuuskopioimattomia muutoksia. Tämän vaarantaa pääsysi todennuskoodeihisi. Haluatko varmasti poistaa muistutuksen käytöstä?</string>
-    <string name="pref_backups_location_title">Varmuuskopiotiedostojen hakemisto</string>
+    <string name="pref_backups_versioning_strategy_title">Varmuuskopiointistrategia</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Säilytä useita versioita</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Yksi varmuuskopio</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Valittu varmuuskopiointistrategia ei ole luotettava eikä sitä suositella. Yksi varmuuskopiointivirhe voi johtaa ainoan varmuuskopiosi menettämiseen.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Valitse varmuuskopiointistrategia</string>
+    <string name="pref_backups_location_title">Varmuuskopion sijainti</string>
     <string name="pref_backups_location_summary">Varmuuskopiot tallennetaan sijaintiin</string>
+    <string name="pref_backup_location_summary">Varmuuskopio tallennetaan sijaintiin</string>
     <string name="pref_backups_trigger_title">Varmuuskopion käynnistys</string>
     <string name="pref_backups_trigger_summary">Käynnistä varmuuskopio manuaalisesti</string>
     <string name="pref_backups_versions_title">Säilytettävien versioiden määrä</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Säilytä %1$d versio varmuuskopiosta</item>
         <item quantity="other">Säilytä %1$d versiota varmuuskopiosta</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Säilytä rajaton määrä versioita varmuuskopiosta</string>
     <string name="pref_import_app_title">Tuo sovelluksesta</string>
     <string name="pref_import_app_summary">Tuo todennuskoodit sovelluksesta (vaatii root-oikeuden)</string>
     <string name="pref_export_title">Vie</string>
@@ -81,7 +100,7 @@
     <string name="pref_tap_to_reveal_title">Paljasta napauttamalla</string>
     <string name="pref_tap_to_reveal_summary">Todennuskoodit piilotetaan oletuksena. Napauta kohdetta paljastaaksesi koodin.</string>
     <string name="pref_tap_to_reveal_time_title">Napauttamalla paljastuksen aikakatkaisu</string>
-    <string name="pref_auto_lock_title">Automaattinen lukitus</string>
+    <string name="pref_auto_lock_title">Automaattilukitus</string>
     <string name="pref_auto_lock_summary">Kun %s</string>
     <string name="pref_auto_lock_summary_disabled">Pois käytöstä</string>
     <string name="pref_auto_lock_prompt">Lukitse Aegis automaattisesti kun</string>
@@ -97,8 +116,34 @@
     <string name="pref_encryption_summary">Salaa holvi ja avaa se salasanalla tai biometrialla</string>
     <string name="pref_biometrics_title">Biometrinen lukituksen avaus</string>
     <string name="pref_biometrics_summary">Salli holvin avaus biometrisillä tiedoilla</string>
+    <string name="pref_search_behavior_summary">Hae: %s</string>
+    <string name="pref_search_behavior_prompt">Haku seuraavista kentistä</string>
+    <string name="pref_search_behavior_type_name">Nimi</string>
+    <string name="pref_search_behavior_type_issuer">Myöntäjä</string>
+    <string name="pref_search_behavior_type_note">Muistiinpano</string>
+    <string name="pref_search_behavior_type_groups">Ryhmät</string>
     <string name="pref_set_password_title">Vaihda salasana</string>
     <string name="pref_set_password_summary">Aseta uusi holvin avaamiseen tarvittava salasana</string>
+    <string name="no_events_title">Ei raportoituja tapahtumia</string>
+    <string name="no_events_description">Sovelluksessa ei ole raportoitu merkittäviä tapahtumia</string>
+    <string name="event_title_vault_unlocked">Holvin lukitus on avattu</string>
+    <string name="event_description_vault_unlocked">Holvin lukitus on avattu onnistuneesti</string>
+    <string name="event_title_backup_created">Varmuuskopio on luotu</string>
+    <string name="event_description_backup_created">Holvin varmuuskopio on luotu onnistuneesti</string>
+    <string name="event_title_android_backup_created">Androidin luoma varmuuskopio</string>
+    <string name="event_description_android_backup_created">Android on luonut holvin varmuuskopion onnistuneesti</string>
+    <string name="event_title_vault_exported">Holvi on viety</string>
+    <string name="event_description_vault_exported">Holvin kopio on viety</string>
+    <string name="event_title_entry_shared">Kohde on jaettu</string>
+    <string name="event_description_entry_shared">Kohde on jaettu</string>
+    <string name="event_title_vault_unlock_failed_password">Holvin lukituksen avaus epäonnistui (salasana)</string>
+    <string name="event_description_vault_unlock_failed_password">Holvin lukituksen avaus salasanalla epäonnistui</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Holvin lukituksen avaus epäonnistui (biometria)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Holvin lukituksen avaus biometrialla epäonnistui</string>
+    <string name="event_unknown">Tuntematon tapahtumatyyppi</string>
+    <string name="audit_log_entry_deleted">(poistettu)</string>
+    <string name="today_at_time">Tänään klo %1$s</string>
+    <string name="day_of_week_at_time">%1$s klo %2$s</string>
     <string name="export_encrypted">Salaa holvi</string>
     <string name="export_help">Tämä toiminto vie holvin ulos Aegisin sisäisestä tallennustilasta. Valitse viennin tiedostomuoto:</string>
     <string name="export_warning_unencrypted">Olet viemässä salaamattoman kopion Aegis-holvistasi. <b>Tätä ei suositella</b>.</string>
@@ -115,7 +160,7 @@
         <item quantity="other">%d ryhmää valittu</item>
     </plurals>
     <string name="export_no_groups_selected">Yhtään ryhmää ei ole valittu vietäväksi</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Todennustiedoston Vienti</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Todennustiedoston Vienti</string>
     <string name="choose_authentication_method">Turvallisuus</string>
     <string name="authentication_method_explanation">Aegis on turvallisuuteen keskittyvä 2FA-sovellus. Todennuskoodit talletetaan holviin, joka voidaan salata valitsemallasi salasanalla. Vaikka hyökkääjä kaappaisi salatun holvitiedostosi, hän ei pääse käsiksi sen sisältöön tietämättä salasanaasi.\n\nOlemme valinneet valmiiksi vaihtoehdon, joka sopii parhaiten laitteellesi.</string>
     <string name="authentication_method_none">Ei mitään</string>
@@ -151,6 +196,7 @@
     <string name="share">Jaa</string>
     <string name="yes">Kyllä</string>
     <string name="no">Ei</string>
+    <string name="undo">Kumoa</string>
     <string name="unlock">Avaa lukitus</string>
     <string name="advanced">Edistyneet</string>
     <string name="counter">Laskuri</string>
@@ -159,9 +205,14 @@
     <string name="scan">Skannaa QR-koodi</string>
     <string name="scan_image">Skannaa kuva</string>
     <string name="enter_manually">Syötä manuaalisesti</string>
-    <string name="set_up_biometric">Määritä biometrinen avaus</string>
+    <string name="set_up_biometric">Määritä biometrinen lukituksen avaus</string>
     <string name="copy">Kopioi</string>
     <string name="edit">Muokkaa</string>
+    <string name="select_all">Valitse kaikki</string>
+    <string name="assign_icons">Määritä kuvakkeet</string>
+    <string name="assign_groups">Lisää ryhmään</string>
+    <string name="assign_groups_dialog_summary">Valitse ryhmä, johon haluat lisätä valitut kohteet.</string>
+    <string name="assign_groups_dialog_dropdown">Valitse ryhmä</string>
     <string name="favorite" comment="Verb">Lisää suosikiksi</string>
     <string name="unfavorite" comment="Verb">Poista suosikeista</string>
     <string name="error_all_caps">VIRHE</string>
@@ -176,10 +227,12 @@
     <string name="snackbar_authentication_method">Valitse todennusmenetelmä</string>
     <string name="encrypting_vault">Holvia salataan</string>
     <string name="exporting_vault">Viedään holvia</string>
+    <string name="optimizing_icon">Optimoidaan kuvaketta</string>
+    <string name="optimizing_icon_multiple">Optimoidaan kuvakkeita %1$d/%2$d</string>
     <string name="reading_file">Luetaan tiedostoa</string>
     <string name="requesting_root_access">Pyydetään root-oikeuksia</string>
     <string name="analyzing_qr">Analysoidaan QR-koodia</string>
-    <string name="analyzing_qr_multiple">Luetaan QR-koodia %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Luetaan QR-koodia %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">%d uusi kohde lisätty holviin</item>
         <item quantity="other">%d uutta kohdetta lisätty holviin</item>
@@ -196,6 +249,7 @@
     <string name="discard_changes">Hylätäänkö muutokset?</string>
     <string name="discard_changes_description">Muutoksiasi ei ole tallennettu</string>
     <string name="saving_profile_error">Virhe profiilin tallennuksessa</string>
+    <string name="saving_assign_icons_error">Virhe kuvakkeita määritettäessä</string>
     <string name="welcome">Tervetuloa</string>
     <string name="app_description">Aegis on ilmainen, turvallinen ja avoimen lähdekoodin 2FA-sovellus</string>
     <string name="setup_completed">Määritys on valmis</string>
@@ -204,6 +258,7 @@
     <string name="copied">Kopioitu</string>
     <string name="errors_copied">Virheet kopioitiin leikepöydälle</string>
     <string name="version_copied">Versio kopioitiin leikepöydälle</string>
+    <string name="error_required_field">Tämä kenttä vaaditaan</string>
     <string name="error_occurred">Tapahtui virhe</string>
     <string name="decryption_error">Holvin avaamisessa tapahtui virhe</string>
     <string name="decryption_corrupt_error">Holvin avaamisessa tapahtui virhe. Holvitiedostosi saattaa olla korruptoitunut.</string>
@@ -239,7 +294,7 @@
     <string name="choose_application">Valitse sovellus, josta haluat tuoda tietoja</string>
     <string name="choose_theme">Valitse haluamasi teema</string>
     <string name="choose_account_name_position">Valitse haluamasi tilin nimen sijainti</string>
-    <string name="choose_view_mode">Valitse haluamasi näyttötila</string>
+    <string name="choose_view_mode">Valitse haluamasi näkymätila</string>
     <string name="choose_copy_behavior">Valitse haluttu kopiointikäyttäytyminen</string>
     <string name="parsing_file_error">Tiedoston jäsentämisessä tapahtui virhe</string>
     <string name="file_not_found">Virhe: Tiedostoa ei löydy</string>
@@ -267,15 +322,20 @@
     <string name="partial_google_auth_import">Puutteellinen Google Authenticatorin varmuuskopio havaittu</string>
     <string name="partial_google_auth_import_warning">Jotkin QR-koodit puuttuvat tuonnistasi. Seuraavia koodeja ei löytynyt:\n\n<b>%s</b>\n\nVoit jatkaa tämän osittaisen viennin tuontia, mutta suosittelemme kokeilemaan uudelleen kaikilla QR-koodeilla, jotta et menetä pääsyä todennuskoodeihin.</string>
     <string name="missing_qr_code_descriptor">• QR-koodi %d</string>
-    <string name="import_partial_export_anyway">Tuo %d todennuskoodia silti</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Tuo %d todennuskoodi silti</item>
+        <item quantity="other">Tuo %d todennuskoodia silti</item>
+    </plurals>
     <string name="import_google_auth_failure">Google Authenticatorin varmuuskopion tuonti epäonnistui</string>
     <string name="unrelated_google_auth_batches_error">Vienti sisältää tietoa liittymättömästä erästä. Yritä tuoda 1 erä kerrallaan.</string>
     <string name="no_tokens_can_be_imported">Tämän seurauksena yhtäkään todennuskoodia ei voitu tuoda</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Holvia avataan</string>
-    <string name="slot_this_device">(tämä laite)</string>
+    <string name="rename_group">Nimeä ryhmä uudelleen</string>
+    <string name="no_group_selection">Jos kohde ei kuulu mihinkään ryhmään, se löytyy osion ”Ei ryhmää” alta.</string>
     <string name="remove_group">Poista ryhmä</string>
     <string name="remove_group_description">Poistetaanko tämä ryhmä? Ryhmässä olevat kohteet merkitään automaattisesti ryhmättömiksi.</string>
+    <string name="remove_unused_groups">Poista käyttämättömät ryhmät</string>
+    <string name="remove_unused_groups_description">Haluatko varmasti poistaa kaikki ryhmät, joille ei ole määritetty kohteita?</string>
     <string name="remove_icon_pack">Poista kuvakepaketti</string>
     <string name="remove_icon_pack_description">Haluatko varmasti poistaa tämän kuvakepaketin? Tämä ei vaikuta kohteisiin, jotka käyttävät kuvakkeita tästä paketista.</string>
     <string name="details">Tiedot</string>
@@ -283,28 +343,41 @@
     <string name="lock">Lukitse</string>
     <string name="name">Nimi</string>
     <string name="no_group">Ei ryhmää</string>
-    <string name="sort">Järjestä</string>
-    <string name="sort_alphabetically">Myöntäjä (A-Ö)</string>
-    <string name="sort_alphabetically_reverse">Myöntäjä (Ö-A)</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Järjestä</string>
+    <string name="sort_alphabetically">Myöntäjä (A - Ö)</string>
+    <string name="sort_alphabetically_reverse">Myöntäjä (Ö - A)</string>
     <string name="sort_alphabetically_name">Tilin nimi (A-Ö)</string>
     <string name="sort_alphabetically_name_reverse">Tilin nimi (Ö-A)</string>
     <string name="sort_usage_count">Käyttömäärä</string>
+    <string name="sort_last_used">Viimeksi käytetyt</string>
     <string name="sort_custom">Mukautettu</string>
+    <string name="last_used">Viimeksi käytetyt</string>
+    <string name="last_used_never">ei koskaan</string>
     <string name="new_group">Uusi ryhmä…</string>
     <string name="group">Ryhmä</string>
     <string name="group_name_hint">Ryhmän nimi</string>
     <string name="preference_manage_groups">Muokkaa ryhmiä</string>
     <string name="preference_manage_groups_summary">Hallitse ja poista ryhmiäsi täällä</string>
     <string name="preference_reset_usage_count">Nollaa käyttömäärä</string>
-    <string name="preference_reset_usage_count_summary">Nollaa holvisi kohteiden käyttömäärä</string>
-    <string name="preference_reset_usage_count_dialog">Haluatko varmasti asettaa kaikkien holvisi kohteiden käyttämäärän nollaan?</string>
-    <string name="note">Muistiinpano</string>
+    <string name="preference_reset_usage_count_summary">Nollaa kaikkien holvisi kohteiden käyttömäärä</string>
+    <string name="preference_reset_usage_count_dialog">Haluatko varmasti nollata kaikkien holvisi kohteiden käyttömäärän?</string>
+    <string name="note" comment="Users can add a note to an entry">Muistiinpano</string>
     <string name="clear">Tyhjennä</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Korvaa olemassa olevat kohteet</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Korvaa olemassa olevat kohteet uusilla. Tätä toimintoa ei voi kumota</string>
+    <string name="dialog_duplicate_entry_suffix_title">Lisää pääte</string>
+    <string name="dialog_duplicate_entry_cancel_title">Peruuta tallennus</string>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Vahvista poisto</string>
+    <string name="pref_haptic_feedback_summary">Laitteesi värisee, kun koodit päivittyvät</string>
+    <string name="pref_haptic_feedback_title">Haptinen palaute</string>
     <string name="pref_highlight_entry_title">Korosta todennuskoodit napauttamalla</string>
     <string name="pref_highlight_entry_summary">Tee todennuskoodeista helpompi erottaa toisistaan korostamalla niitä tilapäisesti napauttamalla</string>
+    <string name="pref_groups_multiselect_title">Valitse useita ryhmiä</string>
+    <string name="pref_groups_multiselect_summary">Salli useiden ryhmien valitseminen samanaikaisesti</string>
     <string name="pref_minimize_on_copy_title">Pienennä kopioidessa</string>
     <string name="pref_minimize_on_copy_summary">Pienennä sovellus todennuskoodin kopioinnin jälkeen</string>
     <string name="pref_copy_behavior_title">Kopioi todennuskoodit leikepöydälle</string>
+    <string name="pref_search_behavior_title">Hakukäyttäytyminen</string>
     <string name="pref_pause_entry_title">Jäädytä todennuskoodit napauttamalla</string>
     <string name="pref_pause_entry_summary">Keskeytä todennuskoodien automaattinen päivitys napauttamalla niitä. Todennuskoodit eivät päivity automaattisesti, niin kauan kun ne ovat valittuina. Vaatii \"Korosta todennuskoodit napauttamalla\" tai \"Paljasta napauttamalla\" -asetusten käyttöönottoa.</string>
     <string name="pin_keyboard_description">Ota PIN-näppäimistö käyttöön antamalla salasanasi. Tämä toimii vain, jos salasanasi koostuu pelkästään numeroista</string>
@@ -320,16 +393,17 @@
     <string name="normal_viewmode_title">Normaali</string>
     <string name="compact_mode_title">Tiivis</string>
     <string name="small_mode_title">Pieni</string>
+    <string name="tiles_mode_title">Laatat</string>
     <string name="unknown_issuer">Tuntematon myöntäjä</string>
     <string name="unknown_account_name">Tuntematon tilinimi</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis ei voinut tuoda %d todennuskoodia. Nämä todennuskoodit ohitetaan. Paina \'tiedot\' nähdäksesi lisätietoa virheistä.</item>
+        <item quantity="one">Aegis ei voinut tuoda %d todennuskoodia. Nämä todennuskoodi ohitetaan. Paina \'tiedot\' nähdäksesi lisätietoa virheestä.</item>
         <item quantity="other">Aegis ei voinut tuoda %d todennuskoodia. Nämä todennuskoodit ohitetaan. Paina \'tiedot\' nähdäksesi lisätietoa virheistä.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Syvää linkkiä ei voitu käsitellä</string>
     <string name="unable_to_read_qrcode_file">Tiedoston %s QR-koodia ei voitu lukea ja käsitellä.</string>
     <string name="unable_to_process_shared_text">Jaettua tekstiä ei voitu käsitellä OTP:nä</string>
-    <string name="unable_to_read_qrcode_files">Joitakin QR-koodeja ei voitu lukea ja käsitellä. Vain %d/%d kohdetta tuodaan.</string>
+    <string name="unable_to_read_qrcode_files">Joitakin QR-koodeja ei voitu lukea ja käsitellä. Vain %1$d/%2$d kohdetta tuodaan.</string>
     <string name="unable_to_generate_qrcode">QR-koodia ei voitu luoda</string>
     <string name="select_picture">Valitse kuva</string>
     <string name="select_icon">Valitse kuvake</string>
@@ -361,12 +435,14 @@
     <string name="time_sync_warning_disable">Lopeta varoitus. Tiedän mitä teen.</string>
     <string name="google_qr_export_unrelated">Asiaankuulumaton QR-koodi löytyi. Yritä käynnistää skanneri uudelleen.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d QR-koodia skannattu</item>
-        <item quantity="other">%d/%d QR-koodia skannattu</item>
+        <item quantity="one">%1$d/%2$d QR-koodi skannattu</item>
+        <item quantity="other">%1$d/%2$d QR-koodia skannattu</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Odotettiin QR-koodia #%d, mutta skannattu #%d sen sijaan</string>
+    <string name="google_qr_export_unexpected">Odotettiin QR-koodia #%1$d, mutta skannattiin #%2$d sen sijaan</string>
     <string name="backup_error_bar_message"><b>Holvin varmuuskopiointi epäonnistui äskettäin</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Äskettäinen holvin varmuuskopiointiyritys %s käyttämällä epäonnistui, koska tapahtui virhe. Varmuuskopiointia yritettiin %s. Tarkista varmuuskopiointiasetukset varmistaaksesi, että varmuuskopiointi onnistuu.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Äskettäinen holvin varmuuskopiointiyritys %1$s käyttämällä epäonnistui, koska tapahtui virhe. Varmuuskopiointia yritettiin %2$s. Tarkista varmuuskopiointiasetukset varmistaaksesi, että varmuuskopiointi onnistuu.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Äskettäinen holvin varmuuskopiointiyritys %1$s käyttäen epäonnistui, koska Aegisilla ei ollut kirjoitusoikeutta varmuuskopiointikohteeseen. Varmuuskopiointia yritettiin %2$s. Tämä virhe voi ilmetä, jos olet siirtänyt tai nimennyt varmuuskopiointikohteen uudelleen tai jos olet hiljattain palauttanut Aegiksen varmuuskopiosta. Määritä varmuuskopiointikohde uudelleen.
     </string>
     <string name="backup_system_builtin">Aegisin sisäänrakennetut automaattiset varmuuskopiot</string>
     <string name="backup_system_android">Androidin pilvivarmuuskopiointijärjestelmä</string>
@@ -400,14 +476,15 @@
     <string name="copy_uri">Kopioi URI</string>
     <string name="unable_to_copy_uri_to_clipboard">URI:a ei voitu kopioida leikepöydälle</string>
     <string name="uri_copied_to_clipboard">URI kopioitiin leikepöydälle</string>
-    <string name="transfer_entry">Siirrä kohde</string>
     <string name="transfer_entry_description">Skannaa tämä QR-koodi todennussovelluksella, johon haluat siirtää tämän kohteen</string>
+    <string name="transfer_entry_brightness">Napauta QR-koodia muuttaaksesi koko näytön kirkkautta</string>
     <string name="google_auth_compatible_transfer_description">Skannaa nämä QR-koodit Aegisilla tai Google Authenticatorilla.\n\nGoogle Authenticator -sovelluksen rajoitusten vuoksi, vain SHA1-suojausta ja 6-numeroisia koodeja tuottavat TOTP- ja HOTP-todennuskoodit sisällytetään</string>
     <string name="password_strength_very_weak">Erittäin heikko</string>
     <string name="password_strength_weak">Heikko</string>
     <string name="password_strength_fair">Kohtalainen</string>
     <string name="password_strength_good">Hyvä</string>
     <string name="password_strength_strong">Vahva</string>
+    <string name="password_strength_unknown">Salasana liian pitkä vahvuusanalyysia varten</string>
     <string name="pref_pin_keyboard_title">Käytä PIN-näppäimistöä lukitusnäytöllä</string>
     <string name="pref_pin_keyboard_summary">Ota tämä käyttöön, jos haluat käyttää PIN-näppäimistöä lukitusnäytöllä. Tämä toimii vain numeerisilla salasanoilla</string>
     <string name="title_activity_preferences">Asetukset</string>
@@ -416,32 +493,43 @@
     <string name="title_activity_about">Tietoja</string>
     <string name="title_activity_edit_entry">Muokkaa kohdetta</string>
     <string name="title_activity_scan_qr">Skannaa QR-koodi</string>
-    <string name="title_activity_manage_slots">Hallitse avainpaikkoja</string>
     <string name="title_activity_import_entries">Tuo kohteet</string>
+    <string name="title_activity_assign_icons">Määritä kuvakkeet</string>
+    <string name="title_activity_licenses">Kolmannen osapuolen lisenssit</string>
     <string name="dialog_wipe_entries_title">Tyhjennä kohteet</string>
     <string name="dialog_wipe_entries_message">Holvisi sisältää jo kohteita. Haluatko poistaa nämä kohteet ennen tämän tiedoston tuontia?\n\n<b>Tehdessäsi näin menetät pysyvästi pääsyn holvin olemassa oleviin kohteisiin.</b></string>
     <string name="dialog_wipe_entries_checkbox">Tyhjennä holvin sisältö</string>
     <string name="panic_trigger_ignore_toast">Aegis vastaanotti paniikkilaukaisimen, mutta asetus on poistettu käytöstä, ohitetaan</string>
     <string name="pref_panic_trigger_title">Poista holvi paniikkilaukaisimella</string>
     <string name="pref_panic_trigger_summary">Poista holvi kun paniikkilaukaisin saadaan Ripplestä</string>
-    <string name="import_vault">Tuo holvi</string>
+    <string name="import_vault">Tuo Aegis-holvi</string>
+    <string name="import_vault_hint">Haluatko tuoda toisesta 2FA-sovelluksesta? Suorita määritys ensin loppuun ja siirry sitten asetusvalikkoon.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d mahdollisen kaksoiskappaleen valinta poistettiin. Tarkista kohdelista.</item>
+        <item quantity="other">%d mahdollisen kaksoiskappaleen valinta poistettiin. Tarkista kohdelista.</item>
+    </plurals>
     <string name="importer_help_2fas">Anna 2FAS Authenticatorin varmuuskopiotiedosto.</string>
     <string name="importer_help_aegis">Anna Aegisisin vienti-/varmuuskopiotiedosto.</string>
     <string name="importer_help_authenticator_plus">Anna Authenticator Plus -varmuuskopiotiedosto, jonka saat menemällä <b>Asetukset -&gt;Varmuuskopiointi ja palautus -&gt; Vie teksti- tai HTML-tiedostona</b>.</string>
-    <string name="importer_help_authenticator_pro">Toimita Authenticator Pro -vientitiedosto, jonka löydät menemällä <b>Asetukset -&gt; Varmuuskopioi -&gt; Varmuuskopioi salattuun tiedostoon (suositus)</b>.</string>
     <string name="importer_help_authy">Anna kopio tiedostosta <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, joka sijaitsee Authyn sisäisessä tallennushakemistossa.</string>
     <string name="importer_help_andotp">Anna andOTP:n vienti-/varmuuskopiotiedosto.</string>
     <string name="importer_help_bitwarden">Anna Bitwardenin vienti-/varmuuskopiotiedosto. Salattuja tiedostoja ei tueta.</string>
-    <string name="importer_help_battle_net_authenticator">Anna kopio tiedostosta <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, joka sijaitsee Battle.net Authenticatorin sisäisessä tallennushakemistossa.</string>
+    <string name="importer_help_battle_net_authenticator">Anna kopio tiedostosta <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, joka sijaitsee Battle.net Authenticatorin sisäisessä tallennushakemistossa.</string>
     <string name="importer_help_duo">Anna kopio tiedostosta <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, joka sijaitsee DUO:n sisäisessä tallennushakemistossa.</string>
-    <string name="importer_help_freeotp">Anna kopio tiedostosta <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, joka sijaitsee FreeOTP:n sisäisessä tallennushakemistossa.</string>
+    <string name="importer_help_ente_auth">Anna Ente Auth -vientitiedosto. Vain salaamattomia tiedostoja tuetaan tällä hetkellä.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Toimita varmuuskopiotiedosto.\nFreeOTP 1.x: Toimita kopio tiedostosta <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, joka sijaitsee FreeOTP:n sisäisessä tallennushakemistossa.</string>
     <string name="importer_help_freeotp_plus">Anna FreeOTP+:n vientitiedosto.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2 -yhteensopivuus</string>
+    <string name="importer_warning_message_freeotp2">FreeOTP 2:ssa on useita ongelmia, jotka voivat johtaa vioittuneisiin varmuuskopioihin. Aegis yrittää pelastaa mahdollisimman monta kohdetta, mutta on mahdollista, että joidenkin tai jopa kaikkien kohteiden tuonti epäonnistuu.</string>
     <string name="importer_help_google_authenticator"><b>Vain Google Authenticator v5.10 tai vanhemman tietokantatiedostoja tuetaan</b>.\n\nAnna kopio kohteesta <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, joka sijaitsee Google Authenticatorin sisäisessä tallennushakemistossa.</string>
     <string name="importer_help_microsoft_authenticator">Anna kopio tiedostosta <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, joka sijaitsee Microsoft Authenticatorin sisäisessä tallennushakemistossa.</string>
     <string name="importer_help_plain_text">Anna raakatekstitiedosto, joka sisältää Google Authenticatorin URIn jokaisella rivillä.</string>
     <string name="importer_help_steam"><b>Steamin versiota 3.0 ja uudempia ei tueta</b>. Toimita kopio tiedostosta <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, joka sijaitsee Steamin sisäisen tallennustilan hakemistossa.</string>
+    <string name="importer_help_stratum">Toimita Starum-vientitiedosto, jonka löydät menemällä <b>Asetukset -&gt; Varmuuskopioi -&gt; Varmuuskopioi salattuun tiedostoon (suositus)</b>.</string>
     <string name="importer_help_totp_authenticator">Anna TOTP Authenticatorin vientitiedosto.</string>
     <string name="importer_help_winauth">Anna WinAuthin vientitiedosto.</string>
+    <string name="import_assign_icons_dialog_title">Määritä kuvakkeet</string>
+    <string name="import_assign_icons_dialog_text">Haluatko määrittää kuvakkeet tuoduille kohteille?</string>
     <string name="importer_encrypted_exception_google_authenticator">Salattu kohde ohitettiin: %s</string>
     <string name="importer_help_direct">Tuo %s -kohteet. Tämä edellyttää, että sovellus on asennettu laitteeseen, ja pääkäyttäjän oikeuksien myöntämistä Aegisille.</string>
     <string name="groups">Ryhmät</string>
@@ -456,25 +544,25 @@
     <string name="pref_copy_behavior_single_tap">Yksi napautus</string>
     <string name="pref_copy_behavior_double_tap">Kaksoisnapautus</string>
     <string name="pref_account_name_position_hidden">Piilotettu</string>
-    <string name="pref_account_name_position_end">Myöntäjän vieressä</string>
+    <string name="pref_account_name_position_end">Myöntäjän vierellä</string>
     <string name="pref_account_name_position_below">Myöntäjän alla</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d sekunti sitten</item>
         <item quantity="other">%d sekuntia sitten</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minuutti sitten</item>
         <item quantity="other">%d minuuttia sitten</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d tunti sitten</item>
         <item quantity="other">%d tuntia sitten</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d päivä sitten</item>
         <item quantity="other">%d päivää sitten</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d vuosi sitten</item>
         <item quantity="other">%d vuotta sitten</item>
     </plurals>
diff --git a/app/src/main/res/values-fr-rFR-v29/strings.xml b/app/src/main/res/values-fr-rFR-v29/strings.xml
new file mode 100644
index 00000000..4bee6b7b
--- /dev/null
+++ b/app/src/main/res/values-fr-rFR-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Valeurs par défaut du système</string>
+    <string name="system_amoled_theme_title">Valeur par défaut du système (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ba8aada1..559951fe 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Paramètres</string>
     <string name="action_about">À propos</string>
     <string name="action_delete">Supprimer</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Restaurer l\'icône par défaut</string>
     <string name="discard">Annuler</string>
     <string name="save">Enregistrer</string>
+    <string name="all">Tout</string>
     <string name="issuer">Émetteur</string>
     <string name="yandex_pin">PIN (4–16 chiffres)</string>
     <string name="motp_pin">Code PIN (4 chiffres)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Configurer le chiffrement, le déverrouillage biométrique, le verrouillage automatique et d\'autres paramètres de sécurité.</string>
     <string name="pref_section_import_export_title">Importer &amp; Exporter</string>
     <string name="pref_section_import_export_summary">Importer des sauvegardes d\'Aegis ou d\'autres applications d\'authentification. Créez des exportations manuelles de votre coffre Aegis.</string>
+    <string name="pref_section_audit_log_title">Journal d\'audit</string>
+    <string name="pref_section_audit_log_summary">Trouver une liste de tous les événements importants signalés qui se sont produits dans l\'application.</string>
     <string name="pref_section_backups_title">Sauvegardes</string>
     <string name="pref_section_backups_summary">Configurer des sauvegardes automatiques à l\'emplacement de votre choix ou activer la participation au système de sauvegarde cloud d\'Android.</string>
     <string name="pref_section_icon_packs">Packs d\'icônes</string>
     <string name="pref_section_icon_packs_summary">Gérer et importer des packs d\'icônes</string>
     <string name="pref_select_theme_title">Thème</string>
+    <string name="pref_dynamic_colors_title">Couleurs dynamiques</string>
+    <string name="pref_dynamic_colors_summary">Appliquer une surcouche basée sur les couleurs de votre thème Android</string>
     <string name="pref_view_mode_title">Mode d\'affichage</string>
     <string name="pref_lang_title">Langue</string>
     <string name="pref_show_icons_title">Afficher les icônes</string>
@@ -40,9 +45,14 @@
     <string name="pref_code_group_size_title">Regroupement des chiffres du code</string>
     <string name="pref_code_group_size_summary">Sélectionner le nombre de chiffres par lequel regrouper les codes</string>
     <string name="pref_account_name_position_title">Afficher le nom de compte</string>
+    <string name="pref_show_next_code_title">Afficher le code suivant</string>
+    <string name="pref_show_next_code_summary">Générer et afficher le code suivant à l\'avance</string>
+    <string name="pref_expiration_state_title">Indiquer quand les codes sont sur le point d\'expirer</string>
+    <string name="pref_expiration_state_summary">Changer la couleur des codes et les faire clignoter quand ils sont sur le point d\'expirer</string>
+    <string name="pref_expiration_state_fallback">Changer la couleur des codes quand ils sont sur le point d\'expirer</string>
     <string name="pref_shared_issuer_account_name_title">Afficher le nom de compte seulement si nécessaire</string>
     <string name="pref_shared_issuer_account_name_summary">Afficher les noms de compte seulement lorsqu\'ils partagent le même émetteur. Les autres noms de compte seront masqués.</string>
-    <string name="pref_account_name_position_summary_override">Ce paramètre est remplacé par le mode d\'affichage des tuiles. Le nom de compte sera toujours affiché sous l\'émetteur.</string>
+    <string name="pref_account_name_position_summary_override">Ce paramètre est remplacé par le mode d\'affichage par tuiles. Le nom de compte sera affiché sous l\'émetteur.</string>
     <string name="pref_import_file_title">Importer depuis un fichier</string>
     <string name="pref_import_file_summary">Importer des jetons depuis un fichier</string>
     <string name="pref_android_backups_title">Sauvegardes cloud d\'Android</string>
@@ -54,15 +64,23 @@
     <string name="pref_backups_reminder_summary">Afficher un rappel pour sauvegarder votre coffre-fort si vous n\'avez pas sauvegardé vos dernières modifications.</string>
     <string name="pref_backups_reminder_dialog_title">Désactiver le rappel de sauvegarde</string>
     <string name="pref_backups_reminder_dialog_summary">Désactiver ce rappel signifie qu\'Aegis ne vous dira pas si vous avez ou non des modifications qui ne sont pas encore sauvegardées. Cela vous expose au risque de perdre l\'accès à vos jetons. Êtes-vous sûr de vouloir désactiver le rappel ?</string>
-    <string name="pref_backups_location_title">Répertoire des fichiers de sauvegarde</string>
+    <string name="pref_backups_versioning_strategy_title">Stratégie de sauvegarde</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Conserver plusieurs versions</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Sauvegarde unique</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">La stratégie de sauvegarde sélectionnée n\'est pas fiable et pas recommandée. Un seul échec de la sauvegarde pourrait entraîner la perte de votre unique sauvegarde.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Sélectionner une stratégie de sauvegarde</string>
+    <string name="pref_backups_location_title">Emplacement de sauvegarde</string>
     <string name="pref_backups_location_summary">Les sauvegardes seront enregistrées dans</string>
+    <string name="pref_backup_location_summary">La sauvegarde sera enregistrée dans</string>
     <string name="pref_backups_trigger_title">Déclencher la sauvegarde</string>
     <string name="pref_backups_trigger_summary">Déclencher manuellement une sauvegarde</string>
     <string name="pref_backups_versions_title">Nombre de versions à conserver</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Conserver %1$d version de la sauvegarde</item>
         <item quantity="other">Conserver %1$d versions de la sauvegarde</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Conserver un nombre infini de versions de la sauvegarde</string>
     <string name="pref_import_app_title">Importer depuis une application</string>
     <string name="pref_import_app_summary">Importer des jetons depuis une application (nécessite un accès root)</string>
     <string name="pref_export_title">Exporter</string>
@@ -75,7 +93,7 @@
         <item quantity="one">%d entrée incompatible a été ignorée</item>
         <item quantity="other">%d entrées incompatibles ont été ignorées</item>
     </plurals>
-    <string name="pref_password_reminder_summary">Afficher un rappel %s pour saisir le mot de passe, afin que vous ne l\'oubliiez pas.</string>
+    <string name="pref_password_reminder_summary">Afficher un rappel %s pour saisir le mot de passe, afin que vous ne l\'oubliez pas.</string>
     <string name="pref_password_reminder_summary_disabled">Désactivé</string>
     <string name="pref_secure_screen_title">Sécurité de l\'écran</string>
     <string name="pref_secure_screen_summary">Bloquer les captures d\'écran et autres tentatives de capture de l\'écran dans l\'application</string>
@@ -98,8 +116,34 @@
     <string name="pref_encryption_summary">Chiffrer le coffre-fort et le déverrouiller avec un mot de passe ou la biométrie</string>
     <string name="pref_biometrics_title">Déverrouillage biométrique</string>
     <string name="pref_biometrics_summary">Autoriser l\'authentification biométrique pour déverrouiller le coffre-fort</string>
+    <string name="pref_search_behavior_summary">Recherchez par : %s</string>
+    <string name="pref_search_behavior_prompt">Rechercher dans l\'un des champs suivants</string>
+    <string name="pref_search_behavior_type_name">Nom</string>
+    <string name="pref_search_behavior_type_issuer">Émetteur</string>
+    <string name="pref_search_behavior_type_note">Note</string>
+    <string name="pref_search_behavior_type_groups">Groupes</string>
     <string name="pref_set_password_title">Changer le mot de passe</string>
     <string name="pref_set_password_summary">Définir un nouveau mot de passe dont vous aurez besoin pour déverrouiller votre coffre-fort</string>
+    <string name="no_events_title">Aucun événement signalé</string>
+    <string name="no_events_description">Aucun événement important n\'a été signalé dans l\'application</string>
+    <string name="event_title_vault_unlocked">Coffre-fort déverrouillé</string>
+    <string name="event_description_vault_unlocked">Le coffre-fort a été déverrouillé avec succès</string>
+    <string name="event_title_backup_created">Sauvegarde créée</string>
+    <string name="event_description_backup_created">Une sauvegarde du coffre-fort a été créée avec succès</string>
+    <string name="event_title_android_backup_created">Sauvegarde créée par Android</string>
+    <string name="event_description_android_backup_created">Une sauvegarde du coffre-fort a été créée avec succès par Android</string>
+    <string name="event_title_vault_exported">Coffre-fort exporté</string>
+    <string name="event_description_vault_exported">Une copie du coffre-fort a été exportée</string>
+    <string name="event_title_entry_shared">Entrée partagée</string>
+    <string name="event_description_entry_shared">Une entrée a été partagée</string>
+    <string name="event_title_vault_unlock_failed_password">Le déverrouillage du coffre-fort a échoué (mot de passe)</string>
+    <string name="event_description_vault_unlock_failed_password">Une tentative de déverrouillage du coffre-fort avec un mot de passe a échoué</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Le déverrouillage du coffre-fort a échoué (données biométriques)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Une tentative de déverrouillage du coffre-fort avec des données biométriques a échoué</string>
+    <string name="event_unknown">Type d\'événement inconnu</string>
+    <string name="audit_log_entry_deleted">(supprimé)</string>
+    <string name="today_at_time">Ajourd\'hui à %1$s</string>
+    <string name="day_of_week_at_time">%1$s à %2$s</string>
     <string name="export_encrypted">Chiffrer le coffre-fort</string>
     <string name="export_help">Cette action exportera le coffre-fort à partir du stockage interne d\'Aegis. Sélectionnez le format vers lequel vous souhaitez faire votre export :</string>
     <string name="export_warning_unencrypted">Vous êtes sur le point d\'exporter une copie non chiffrée de votre coffre-fort Aegis. <b>Ce n\'est pas recommandé</b>.</string>
@@ -116,7 +160,7 @@
         <item quantity="other">%d groupes sélectionnés</item>
     </plurals>
     <string name="export_no_groups_selected">Aucun groupe sélectionné pour l\'export</string>
-    <string name="export_html_title" context="The title of an HTML export document">Export Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Export Aegis Authenticator</string>
     <string name="choose_authentication_method">Sécurité</string>
     <string name="authentication_method_explanation">Aegis est une application d\'authentification à deux facteurs (2FA) axée sur la sécurité. Les jetons sont stockés dans un coffre-fort, qui peut être éventuellement chiffré avec un mot de passe de votre choix. Si un attaquant obtient votre fichier de coffre-fort chiffré, il ne pourra pas accéder au contenu sans connaître le mot de passe.\n\nNous avons présélectionné l\'option que nous pensons la plus adaptée à votre appareil.</string>
     <string name="authentication_method_none">Aucun</string>
@@ -135,7 +179,7 @@
     <string name="set_password_confirm">Veuillez confirmer le mot de passe</string>
     <string name="invalid_password">Le mot de passe est incorrect</string>
     <string name="invalidated_biometrics">Un changement dans les paramètres de sécurité de votre appareil a été détecté. Veuillez aller dans \"Aegis -&gt; Paramètres -&gt; Sécurité -&gt; Déverrouillage biométrique\" pour désactiver et réactiver le déverrouillage biométrique.</string>
-    <string name="password_reminder">Veuillez saisir votre mot de passe. Nous vous demandons de le faire de temps en temps afin que vous ne l\'oubliiez pas.</string>
+    <string name="password_reminder">Veuillez saisir votre mot de passe. Nous vous demandons de le faire de temps en temps afin que vous ne l\'oubliez pas.</string>
     <string name="password_reminder_dialog_title">Déverrouillage biométrique par défaut</string>
     <string name="password_reminder_dialog_message">Nous vous demandons de temps en temps de saisir votre mot de passe à la place afin de nous assurer que vous ne ne l\'avez pas oublié et que l\'accès à votre coffre-fort ne soit pas bloqué. Après avoir saisi votre mot de passe une fois, Aegis utilisera de nouveau le déverrouillage biométrique par défaut jusqu\'à ce qu\'il soit temps pour un autre rappel de mot de passe.</string>
     <string name="password_reminder_freq_never">Jamais</string>
@@ -152,6 +196,7 @@
     <string name="share">Partager</string>
     <string name="yes">Oui</string>
     <string name="no">Non</string>
+    <string name="undo">Annuler</string>
     <string name="unlock">Déverrouiller</string>
     <string name="advanced">Avancé</string>
     <string name="counter">Compteur</string>
@@ -163,6 +208,11 @@
     <string name="set_up_biometric">Configurer le déverrouillage biométrique</string>
     <string name="copy">Copier</string>
     <string name="edit">Modifier</string>
+    <string name="select_all">Tout sélectionner</string>
+    <string name="assign_icons">Association des icônes</string>
+    <string name="assign_groups">Associer au groupe</string>
+    <string name="assign_groups_dialog_summary">Sélectionnez un groupe auquel vous souhaitez assigner les entrées sélectionnées.</string>
+    <string name="assign_groups_dialog_dropdown">Sélectionner groupe</string>
     <string name="favorite" comment="Verb">Ajouter aux favoris</string>
     <string name="unfavorite" comment="Verb">Retirer des favoris</string>
     <string name="error_all_caps">ERREUR</string>
@@ -177,10 +227,12 @@
     <string name="snackbar_authentication_method">Veuillez sélectionner une méthode d\'authentification</string>
     <string name="encrypting_vault">Chiffrement du coffre-fort</string>
     <string name="exporting_vault">Export du coffre-fort</string>
+    <string name="optimizing_icon">Optimisation de l\'icône</string>
+    <string name="optimizing_icon_multiple">Optimisation des icônes %1$d/%2$d</string>
     <string name="reading_file">Lecture du fichier</string>
     <string name="requesting_root_access">Demande d\'accès root</string>
     <string name="analyzing_qr">Analyse du code QR</string>
-    <string name="analyzing_qr_multiple">Analyse du code QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analyse du code QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Ajout de %d nouvelle entrée dans le coffre-fort</item>
         <item quantity="other">Ajout de %d nouvelles entrées dans le coffre-fort</item>
@@ -197,6 +249,7 @@
     <string name="discard_changes">Annuler les modifications ?</string>
     <string name="discard_changes_description">Vos modifications n\'ont pas été enregistrées</string>
     <string name="saving_profile_error">Erreur lors de l\'enregistrement du profil</string>
+    <string name="saving_assign_icons_error">Erreur lors de l\'association des icônes</string>
     <string name="welcome">Bienvenue</string>
     <string name="app_description">Aegis est une application d\'authentification à deux facteurs (2FA) gratuite, sécurisée et open source</string>
     <string name="setup_completed">Configuration terminée</string>
@@ -205,6 +258,7 @@
     <string name="copied">Copié</string>
     <string name="errors_copied">Erreurs copiées dans le presse-papier</string>
     <string name="version_copied">Version copiée dans le presse-papier</string>
+    <string name="error_required_field">Ce champ est obligatoire</string>
     <string name="error_occurred">Une erreur s\'est produite</string>
     <string name="decryption_error">Une erreur est survenue en essayant de déverrouiller le coffre-fort</string>
     <string name="decryption_corrupt_error">Une erreur est survenue en essayant de déverrouiller le coffre-fort. Le fichier de votre coffre-fort est peut-être corrompu.</string>
@@ -268,15 +322,20 @@
     <string name="partial_google_auth_import">Export Google Authenticator incomplet détecté</string>
     <string name="partial_google_auth_import_warning">Certains codes QR sont manquants dans votre export. Les codes suivants n\'ont pas été trouvés :\n\n<b>%s</b>\n\nVous pouvez continuer à importer cet export partiel, mais nous vous recommandons de réessayer avec tous les codes QR afin de ne risquer de perdre l\'accès à aucun jeton.</string>
     <string name="missing_qr_code_descriptor">• code QR %d</string>
-    <string name="import_partial_export_anyway">Importer %d jetons quand même</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importer quand même %d jeton</item>
+        <item quantity="other">Importer quand même %d jetons</item>
+    </plurals>
     <string name="import_google_auth_failure">L\'import de l\'export Google Authenticator a échoué</string>
     <string name="unrelated_google_auth_batches_error">L\'export contient des informations pour un lot non lié. Essayez d\'importer 1 lot à la fois.</string>
     <string name="no_tokens_can_be_imported">Aucun jeton ne peut être importé en conséquence</string>
-    <string name="authentication_method_raw">Brut</string>
     <string name="unlocking_vault">Déverrouillage du coffre-fort</string>
-    <string name="slot_this_device">(ces appareils)</string>
+    <string name="rename_group">Renommer le groupe</string>
+    <string name="no_group_selection">Si une entrée ne fait partie d\'aucun groupe, elle peut être trouvée sous \"Aucun groupe\".</string>
     <string name="remove_group">Supprimer groupe</string>
     <string name="remove_group_description">Êtes-vous sûr de vouloir supprimer ce groupe ? Les entrées dans ce groupe seront basculées automatiquement dans \"Aucun groupe\".</string>
+    <string name="remove_unused_groups">Supprimer les groupes inutilisés</string>
+    <string name="remove_unused_groups_description">Êtes-vous sûr de vouloir supprimer tous les groupes qui ne sont pas associés à une entrée ?</string>
     <string name="remove_icon_pack">Supprimer le pack d\'icônes</string>
     <string name="remove_icon_pack_description">Êtes-vous sûr de vouloir supprimer ce pack d\'icônes ? Les entrées qui utilisent les icônes de ce pack ne seront pas affectées.</string>
     <string name="details">Détails</string>
@@ -284,13 +343,16 @@
     <string name="lock">Verrouiller</string>
     <string name="name">Nom</string>
     <string name="no_group">Aucun groupe</string>
-    <string name="sort">Trier</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Trier</string>
     <string name="sort_alphabetically">Émetteur (de A à Z)</string>
     <string name="sort_alphabetically_reverse">Émetteur (de Z à A)</string>
     <string name="sort_alphabetically_name">Compte (de A à Z)</string>
     <string name="sort_alphabetically_name_reverse">Compte (de Z à A)</string>
     <string name="sort_usage_count">Nombre d\'utilisations</string>
+    <string name="sort_last_used">Dernière utilisation</string>
     <string name="sort_custom">Personnalisé</string>
+    <string name="last_used">Dernière utilisation</string>
+    <string name="last_used_never">jamais</string>
     <string name="new_group">Nouveau groupe…</string>
     <string name="group">Groupe</string>
     <string name="group_name_hint">Nom de groupe</string>
@@ -299,13 +361,31 @@
     <string name="preference_reset_usage_count">Réinitialiser le nombre d\'utilisations</string>
     <string name="preference_reset_usage_count_summary">Réinitialiser le nombre d\'utilisations de chaque entrée de votre coffre-fort</string>
     <string name="preference_reset_usage_count_dialog">Êtes-vous sûr de vouloir définir le nombre d\'utilisations de chaque entrée de votre coffre-fort à 0 ?</string>
-    <string name="note">Note</string>
+    <string name="note" comment="Users can add a note to an entry">Note</string>
     <string name="clear">Effacer</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Dupliquer l\'entrée</string>
+    <string name="dialog_duplicate_entry_message">Cette entrée a le même nom et émetteur qu\'une ou plusieurs entrées existantes. Comment voulez-vous procéder?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Écraser la ou les entrées existantes</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Remplacer la ou les entrées existantes par la nouvelle. Cette action ne peut pas être annulée</string>
+    <string name="dialog_duplicate_entry_suffix_title">Ajouter un suffixe</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Ajouter un suffixe au nom de cette nouvelle entrée. Le nouveau nom sera : %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Annuler l\'enregistrement</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Vous permet de modifier l\'entrée avant de tenter de l\'enregistrer à nouveau</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Êtes-vous sûr de vouloir supprimer %d entrée avec le nom suivant :\n\n%s - %s</item>
+        <item quantity="other">Êtes-vous sûr de vouloir supprimer %d entrées avec le nom suivant :\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Confirmer la suppression</string>
+    <string name="pref_haptic_feedback_summary">Faire vibrer votre appareil lorsque les codes sont actualisés</string>
+    <string name="pref_haptic_feedback_title">Retour haptique</string>
     <string name="pref_highlight_entry_title">Surligner les jetons lorsqu\'ils sont appuyés</string>
     <string name="pref_highlight_entry_summary">Rendre les jetons plus faciles à distinguer les uns des autres en les surlignant temporairement lorsqu\'ils sont appuyés</string>
+    <string name="pref_groups_multiselect_title">Groupes avec sélection multiple</string>
+    <string name="pref_groups_multiselect_summary">Autoriser la sélection de plusieurs groupes en même temps</string>
     <string name="pref_minimize_on_copy_title">Minimiser lors de la copie</string>
     <string name="pref_minimize_on_copy_summary">Minimiser l\'application après avoir copié un jeton</string>
     <string name="pref_copy_behavior_title">Copier les jetons dans le presse-papier</string>
+    <string name="pref_search_behavior_title">Comportement de recherche</string>
     <string name="pref_pause_entry_title">Geler les jetons lorsqu\'ils sont appuyés</string>
     <string name="pref_pause_entry_summary">Mettre en pause l\'actualisation automatique des jetons en appuyant dessus. Les jetons ne seront plus mis à jour tant qu\'ils seront ciblés. Nécessite « Surligner les jetons lorsqu\'ils sont appuyés » ou « Appuyer pour révéler ».</string>
     <string name="pin_keyboard_description">Saisissez votre mot de passe pour activer le clavier PIN. Notez que cela ne fonctionne que si votre mot de passe est composé uniquement de chiffres</string>
@@ -325,13 +405,13 @@
     <string name="unknown_issuer">Émetteur inconnu</string>
     <string name="unknown_account_name">Nom de compte inconnu</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis n\'a pas pu importer %d jeton. Ce jeton sera ignoré. Appuyez sur « détails » pour voir plus d\'informations sur les erreurs.</item>
-        <item quantity="other">Aegis n\'a pas pu importer %d jetons. Ces jetons seront ignorés. Appuyez sur « détails » pour voir plus d\'informations sur les erreurs.</item>
+        <item quantity="one">Aegis n\'a pas pu importer %d jeton. Ce jeton sera ignoré. Appuyez sur « détails » pour voir plus d\'informations sur l\'erreur.</item>
+        <item quantity="other">Aegis n\'a pas pu importer %d jetons. Ces jetons seront ignorés. Appuyez sur « détails » pour voir plus d\'informations sur l\'erreur.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Impossible de traiter le lien profond</string>
     <string name="unable_to_read_qrcode_file">Impossible de lire et de traiter le code QR depuis le fichier : %s.</string>
     <string name="unable_to_process_shared_text">Impossible de traiter le texte partagé comme OTP</string>
-    <string name="unable_to_read_qrcode_files">Impossible de lire et de traiter certains codes QR. Seules %d/%d entrées seront importées.</string>
+    <string name="unable_to_read_qrcode_files">Impossible de lire et traiter certains codes QR. %1$d/%2$d entrées seulement seront importées.</string>
     <string name="unable_to_generate_qrcode">Impossible de générer le code QR</string>
     <string name="select_picture">Sélectionner image</string>
     <string name="select_icon">Sélectionner une icône</string>
@@ -363,12 +443,15 @@
     <string name="time_sync_warning_disable">Arrêter de m\'avertir. Je sais ce que je fais.</string>
     <string name="google_qr_export_unrelated">Code QR non lié trouvé. Essayez de redémarrer le scanner.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d code QR scanné</item>
-        <item quantity="other">%d/%d codes QR scannés</item>
+        <item quantity="one">%1$d/%2$d code QR scanné</item>
+        <item quantity="other">%1$d/%2$d codes QR scannés</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Code QR n°%d attendu, mais n°%d scanné à la place</string>
+    <string name="google_qr_export_unexpected">Code QR n°%1$d attendu, mais n°%2$d scanné à la place</string>
     <string name="backup_error_bar_message"><b>La sauvegarde du coffre-fort a échoué récemment</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Une tentative récente de sauvegarde du coffre-fort en utilisant %s a échoué car une erreur est survenue. La sauvegarde a été tentée %s. Veuillez vérifier vos paramètres de sauvegarde pour vous assurer que les sauvegardes peuvent être terminées avec succès.    </string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Une tentative récente de sauvegarde du coffre-fort en utilisant %1$s a échoué car une erreur est survenue. La sauvegarde a été tentée %2$s. Veuillez vérifier vos paramètres de sauvegarde pour vous assurer que les sauvegardes peuvent se terminer avec succès.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Une tentative récente de sauvegarde du coffre-fort en utilisant %1$s a échoué car Aegis n\'avait pas la permission d\'écrire dans la destination de la sauvegarde. La sauvegarde a été tentée %2$s. Cette erreur peut se produire si vous avez déplacé/renommé la destination de la sauvegarde ou si vous avez récemment restauré Aegis depuis une sauvegarde. Veuillez reconfigurer la destination de la sauvegarde.
+    </string>
     <string name="backup_system_builtin">Sauvegardes automatiques intégrées dans Aegis</string>
     <string name="backup_system_android">Système de sauvegarde cloud d\'Android</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        La dernière sauvegarde est obsolète (%s)
@@ -376,7 +459,7 @@
     <string name="backup_reminder_bar_message">        Les modifications ne sont pas sauvegardées
     </string>
     <string name="backup_reminder_bar_dialog_title">Les modifications ne sont pas sauvegardées</string>
-    <string name="backup_reminder_bar_dialog_summary">        Les changements récents dans le coffre-for n\'ont pas encore été sauvegardés. Il est important de réaliser des sauvegardes régulières pour éviter de perdre l\'accès à vos comptes. Veuillez envisager de configurer des sauvegardes automatiques dans le menu Paramètres.
+    <string name="backup_reminder_bar_dialog_summary">        Les changements récents dans le coffre-fort n\'ont pas encore été sauvegardés. Il est important de réaliser des sauvegardes régulières pour éviter de perdre l\'accès à vos comptes. Veuillez envisager de configurer des sauvegardes automatiques dans le menu Paramètres.
     </string>
     <string name="backup_reminder_bar_dialog_accept">Configurer les sauvegardes</string>
     <string name="backup_plaintext_export_warning"><b>Le coffre-fort a récemment été exporté en texte brut</b></string>
@@ -401,14 +484,15 @@
     <string name="copy_uri">Copier l\'URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Impossible de copier l\'URI dans le presse-papier</string>
     <string name="uri_copied_to_clipboard">URI copiée dans le presse-papier</string>
-    <string name="transfer_entry">Transférer une entrée</string>
     <string name="transfer_entry_description">Scannez ce code QR avec l\'application d\'authentification vers laquelle vous souhaitez transférer cette entrée</string>
+    <string name="transfer_entry_brightness">Appuyer sur le code QR pour activer la luminosité maximale</string>
     <string name="google_auth_compatible_transfer_description">Scannez ces codes QR avec Aegis ou Google Authenticator.\n\nEn raison des limitations de l\'application Google Authenticator, seuls les jetons TOTP &amp; HOTP qui utilisent SHA1 et produisent des codes à 6 chiffres sont inclus</string>
     <string name="password_strength_very_weak">Très faible</string>
     <string name="password_strength_weak">Faible</string>
     <string name="password_strength_fair">Acceptable</string>
     <string name="password_strength_good">Satisfaisant</string>
     <string name="password_strength_strong">Fort</string>
+    <string name="password_strength_unknown">Mot de passe trop long pour que sa force puisse être analysée</string>
     <string name="pref_pin_keyboard_title">Utiliser le clavier PIN sur l\'écran de verrouillage</string>
     <string name="pref_pin_keyboard_summary">Activez ceci si vous voulez activer le clavier PIN sur l\'écran de verrouillage. Cela ne fonctionne que pour les mots de passe numériques</string>
     <string name="title_activity_preferences">Paramètres</string>
@@ -417,32 +501,43 @@
     <string name="title_activity_about">À propos</string>
     <string name="title_activity_edit_entry">Modifier l\'entrée</string>
     <string name="title_activity_scan_qr">Scanner un code QR</string>
-    <string name="title_activity_manage_slots">Gérer les emplacements de clés</string>
     <string name="title_activity_import_entries">Importer des entrées</string>
+    <string name="title_activity_assign_icons">Association des icônes</string>
+    <string name="title_activity_licenses">Licences tierces</string>
     <string name="dialog_wipe_entries_title">Effacer les entrées</string>
     <string name="dialog_wipe_entries_message">Votre coffre-fort contient déjà des entrées. Voulez-vous supprimer ces entrées avant d\'importer ce fichier ?\n\n<b>En faisant cela, vous perdrez définitivement l\'accès aux entrées existantes dans le coffre-fort.</b></string>
     <string name="dialog_wipe_entries_checkbox">Effacer le contenu du coffre-fort</string>
     <string name="panic_trigger_ignore_toast">Aegis a reçu le déclenchement d\'une alerte mais le paramètre est désactivé, il sera ignoré</string>
     <string name="pref_panic_trigger_title">Supprimer le coffre-fort lors du déclenchement de l\'alerte</string>
     <string name="pref_panic_trigger_summary">Supprimer le coffre-fort quand le déclenchement d\'une alerte est reçu de Ripple</string>
-    <string name="import_vault">Importer le coffre-fort</string>
+    <string name="import_vault">Importer un coffre-fort Aegis</string>
+    <string name="import_vault_hint">Vous voulez importer depuis une autre application 2FA ? Complétez d\'abord l\'installation, puis rendez-vous dans le menu des paramètres.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d potentiel doublon décoché. Veuillez vérifier la liste des entrées.</item>
+        <item quantity="other">%d potentiels doublons décochés. Veuillez vérifier la liste des entrées.</item>
+    </plurals>
     <string name="importer_help_2fas">Fournir une sauvegarde 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Fournir un export/sauvegarde Aegis.</string>
     <string name="importer_help_authenticator_plus">Fournir un export Authenticator Plus obtenu via <b>Paramètres -&gt; Sauvegarde &amp; Restauration -&gt; Exporter en tant que texte et HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Fournir un export Authenticator Pro obtenu via <b>Paramètres -&gt; Sauvegarde -&gt; Sauvegarder en tant que fichier chiffré (recommandé)</b>.</string>
     <string name="importer_help_authy">Fournir une copie de <b>/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, situé dans le répertoire de stockage interne d\'Authy.</string>
     <string name="importer_help_andotp">Fournir un export/sauvegarde andOTP.</string>
     <string name="importer_help_bitwarden">Fournir un export/sauvegarde Bitwarden. Les fichiers chiffrés ne sont pas pris en charge.</string>
-    <string name="importer_help_battle_net_authenticator">Fournir une copie de <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>,situé dans le répertoire de stockage interne de Battle.net Authenticator.</string>
-    <string name="importer_help_duo">Fournissez une copie de <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, situé dans le répertoire de stockage interne de DUO.</string>
-    <string name="importer_help_freeotp">Fournir une copie de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, situé dans le répertoire de stockage interne de FreeOTP.</string>
+    <string name="importer_help_battle_net_authenticator">Fournir une copie de <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, situé dans le répertoire de stockage interne de Battle.net Authenticator.</string>
+    <string name="importer_help_duo">Fournir une copie de <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, situé dans le répertoire de stockage interne de DUO.</string>
+    <string name="importer_help_ente_auth">Fournir un export Ente Auth. Actuellement, seuls les fichiers non chiffrés sont pris en charge.</string>
+    <string name="importer_help_freeotp">FreeOTP 2 : Fournir une sauvegarde.\nFreeOTP 1.x : Fournir une copie de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, situé dans le répertoire de stockage interne de FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Fournir un export FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilité FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Il y a un certain nombre de problèmes dans FreeOTP 2 qui peuvent entraîner des sauvegardes corrompues. Aegis essaiera de récupérer autant d\'entrées que possible, mais il est possible que certaines ou même la totalité ne parviennent pas à être importées.</string>
     <string name="importer_help_google_authenticator"><b>Seuls les fichiers de base de données de Google Authenticator v5.10 et antérieures sont pris en charge</b>.\n\nFournir une copie de <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, situé dans le répertoire de stockage interne de Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Fournir une copie de <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, situé dans le répertoire de stockage interne de Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Fournir un fichier texte brut avec une URI Google Authenticator sur chaque ligne.</string>
     <string name="importer_help_steam"><b>Steam 3.0 et plus récents ne sont pas pris en charge</b>. Fournissez une copie de <b>/data/data/com.valvesoftware. ndroid.steam.community/files/Steamguard-*.json</b>, situé dans le répertoire de stockage interne de Steam.</string>
+    <string name="importer_help_stratum">Fournir un export Stratum obtenu via <b>Paramètres -&gt; Sauvegarde -&gt; Sauvegarder en tant que fichier chiffré (recommandé)</b>.</string>
     <string name="importer_help_totp_authenticator">Fournir un export TOTP Authenticator.</string>
     <string name="importer_help_winauth">Fournir un export WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Association des icônes</string>
+    <string name="import_assign_icons_dialog_text">Voulez-vous associer des icônes aux entrées importées ?</string>
     <string name="importer_encrypted_exception_google_authenticator">L\'entrée chiffrée a été ignorée : %s</string>
     <string name="importer_help_direct">Importer des entrées directement depuis %s. Cela nécessite que l\'application soit installée sur cet appareil et que l\'accès root soit accordé à Aegis.</string>
     <string name="groups">Groupes</string>
@@ -459,23 +554,23 @@
     <string name="pref_account_name_position_hidden">Masqué</string>
     <string name="pref_account_name_position_end">À côté de l\'émetteur</string>
     <string name="pref_account_name_position_below">En dessous de l\'émetteur</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">Il y a %d seconde</item>
         <item quantity="other">Il y a %d secondes</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">Il y a %d minute</item>
         <item quantity="other">Il y a %d minutes</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">Il y a %d heure</item>
         <item quantity="other">Il y a %d heures</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">il y a %d jour</item>
         <item quantity="other">Il y a %d jours</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">Il y a %d an</item>
         <item quantity="other">Il y a %d ans</item>
     </plurals>
diff --git a/app/src/main/res/values-fy-rNL-v29/strings.xml b/app/src/main/res/values-fy-rNL-v29/strings.xml
new file mode 100644
index 00000000..cf7860cb
--- /dev/null
+++ b/app/src/main/res/values-fy-rNL-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Systeemstandert</string>
+    <string name="system_amoled_theme_title">Systeemstandert (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 48455875..6215cda6 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Ynstellingen</string>
     <string name="action_about">Oer</string>
     <string name="action_delete">Fuortsmite</string>
     <string name="action_transfer">Oersette</string>
     <string name="action_edit_icon">Piktogram oanpasse</string>
     <string name="action_reset_usage_count">Gebrûksteller op 0 ynstelle</string>
-    <string name="action_reset_usage_count_dialog">Bisto wis datsto de gebrûksteller fan dit item op 0 sette wolst?</string>
+    <string name="action_reset_usage_count_dialog">Binne jo wis dat jo de gebrûksteller fan dit item op 0 sette wolle?</string>
     <string name="action_default_icon">Standert piktogram opnij ynstelle</string>
     <string name="discard">Ungedien meitsje</string>
     <string name="save">Bewarje</string>
+    <string name="all">Alle</string>
     <string name="issuer">Utjouwer</string>
     <string name="yandex_pin">PIN (4–16 sifers)</string>
     <string name="motp_pin">PIN (4 sifers)</string>
@@ -27,12 +28,16 @@
     <string name="pref_section_security_title">Befeiliging</string>
     <string name="pref_section_security_summary">Ynstellen fan fersifering, biometrysk ûntskoatteljen, automatysk fergrindelje en oare befeiligingsynstellingen.</string>
     <string name="pref_section_import_export_title">Ymportearje &amp; Eksportearje</string>
-    <string name="pref_section_import_export_summary">Reservekopyen fan Aegis of oare autentikator-apps ymportearje. Meitsje hânmjittige eksport fan dyn Aegis-klûs oan.</string>
+    <string name="pref_section_import_export_summary">Reservekopyen fan Aegis of oare autentikator-apps ymportearje. Meitsje hânmjittige eksport fan jo Aegis-klûs oan.</string>
+    <string name="pref_section_audit_log_title">Auditlochboek</string>
+    <string name="pref_section_audit_log_summary">Sykje in list mei alle rapporteare wichtige ôfspraken dy’t yn de app plakfûn hawwe.</string>
     <string name="pref_section_backups_title">Reservekopyen</string>
     <string name="pref_section_backups_summary">Automatyske reservekopyen op in sels keazen lokaasje ynstelle, of meidwaan mei Androids cloud-reservekopysysteem ynskeakelje.</string>
     <string name="pref_section_icon_packs">Piktogrampakketten</string>
     <string name="pref_section_icon_packs_summary">Piktogrampakketten beheare en ymportearje.</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Dynamyske kleuren</string>
+    <string name="pref_dynamic_colors_summary">Overlay tapasse op basis fan de kleuren fan jo Android-tema</string>
     <string name="pref_view_mode_title">Werjeftemodus</string>
     <string name="pref_lang_title">Taal</string>
     <string name="pref_show_icons_title">Piktogrammen toane</string>
@@ -40,9 +45,14 @@
     <string name="pref_code_group_size_title">Koadesifergroepearring</string>
     <string name="pref_code_group_size_summary">Selektearje oantal sifers om de koaden op te groepearjen</string>
     <string name="pref_account_name_position_title">Accountnamme toane</string>
+    <string name="pref_show_next_code_title">Folgjende koade toane</string>
+    <string name="pref_show_next_code_summary">Generearje en toan de folgjende koade yn it foar</string>
+    <string name="pref_expiration_state_title">Jou oan wannear’t koaden op it punt stean te ferrinen</string>
+    <string name="pref_expiration_state_summary">Wizigje de kleur fan de koaden en lit se knipperje wannear’t se op it punt stean te ferrinnen</string>
+    <string name="pref_expiration_state_fallback">Wizigje de kleur fan de koaden wannear’t se op it punt stean te ferrinnen</string>
     <string name="pref_shared_issuer_account_name_title">Accountnamme allinnich wannear nedich toane</string>
     <string name="pref_shared_issuer_account_name_summary">Accountnammen allinnich toane wannear’t se deselde útjouwer diele. Oare accountnammen wurde ferstoppe.</string>
-    <string name="pref_account_name_position_summary_override">Dizze ynstelling wurdt oerskreaun troch de tegelwerjeftemodus. Accountnamme wurdt altyd toand ûnder de útjouwer.</string>
+    <string name="pref_account_name_position_summary_override">Dizze ynstelling wurdt oerskreaun troch de werjeftemodus Tegels. Accountnamme wurdt ûnder de útjouwer toand.</string>
     <string name="pref_import_file_title">Ut bestân ymportearje</string>
     <string name="pref_import_file_summary">Tokens fan in bestân út ymportearje</string>
     <string name="pref_android_backups_title">Android cloud-reservekopyen</string>
@@ -51,18 +61,26 @@
     <string name="pref_backups_title">Automatysk klûsreservekopy meitsje</string>
     <string name="pref_backups_summary">Automatysk reservekopyen meitsje fan de klûs op eksterne ûnthâld wannear’t der wizigingen binne. Allinnich stipe foar fersifere klûzen.</string>
     <string name="pref_backups_reminder_title">Reservekopyen oantinken</string>
-    <string name="pref_backups_reminder_summary">Toan in oantinken om in reservekopyen fan dyn klûs te meitsjen, asto noch gjin reservekopyen hast fan de lêste wizigingen.</string>
+    <string name="pref_backups_reminder_summary">Toan in oantinken om in reservekopy fan jo klûs te meitsjen, as jo noch gjin reservekopy hawwe fan de lêste wizigingen.</string>
     <string name="pref_backups_reminder_dialog_title">Reservekopy-oantinken útskeakelje</string>
-    <string name="pref_backups_reminder_dialog_summary">Utskeakeljen fan dit oantinken betsjut dat Aegis dy net fertelle sil oftsto wizigingen hast dêr’t noch net in reservekopy fan makke is. Hjirmei rinsto it risiko om de tagong ta tokens te ferliezen. Bisto wis datsto dit oantinken útskeakelje wolst?</string>
-    <string name="pref_backups_location_title">Map foar reservekopybestannen</string>
+    <string name="pref_backups_reminder_dialog_summary">Utskeakeljen fan dit oantinken betsjut dat Aegis jo net fertelle sil oft jo wizigingen hawwe dêr’t noch net in reservekopy fan makke is. Hjirmei rinne jo it risiko om de tagong ta tokens te ferliezen. Binne jo wis dat jo dit oantinken útskeakelje wolst?</string>
+    <string name="pref_backups_versioning_strategy_title">Reservekopystrategy</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">In oantal ferzjes behâlde</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Ien inkelde reservekopy</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">De selektearre reservekopystrategy is net betrouber en wurdt net oanrekommandearre. In inkelde reservekopymislearring soe liede kinne ta it ferliezen fan jo iennige reservekopy.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Selektearje in reservekopystrategy</string>
+    <string name="pref_backups_location_title">Reservekopylokaasje</string>
     <string name="pref_backups_location_summary">Reservekopyen sille bewarre wurde yn</string>
+    <string name="pref_backup_location_summary">Reservekopy sil bewarre wurde yn</string>
     <string name="pref_backups_trigger_title">No in reservekopy meitsje</string>
     <string name="pref_backups_trigger_summary">Hânmjittich in reservekopy meitsje</string>
     <string name="pref_backups_versions_title">Oantal ferzjes om te bewarjen</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Bewarje %1$d ferzje fan de reservekopy</item>
         <item quantity="other">Bewarje %1$d ferzjes fan de reservekopy</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Uneinich oantal ferzjes fan de reservekopy bewarje</string>
     <string name="pref_import_app_title">Fan in app út ymportearje</string>
     <string name="pref_import_app_summary">Tokens fan in app út ymportearje (fereasket root-tagong)</string>
     <string name="pref_export_title">Eksportearje</string>
@@ -75,10 +93,10 @@
         <item quantity="one">%d ynkompatibel item oerslaggen</item>
         <item quantity="other">%d ynkompatibele items oerslaggen</item>
     </plurals>
-    <string name="pref_password_reminder_summary">Toan in oantinken %s om it wachtwurd yn te fieren, sadatsto dizze net ferjitst.</string>
+    <string name="pref_password_reminder_summary">Toan in oantinken %s om it wachtwurd yn te fieren, sadat jo dizze net ferjitte.</string>
     <string name="pref_password_reminder_summary_disabled">Utskeakele</string>
     <string name="pref_secure_screen_title">Skermbeskoatteling</string>
-    <string name="pref_secure_screen_summary">Blokkearje skermôfdrukken en oare besykjen ta skermopnamen binnen dizze app</string>
+    <string name="pref_secure_screen_summary">Blokkearje skermôfdrukken en oare besykjen ta skermopnamen binnen dizze app.</string>
     <string name="pref_tap_to_reveal_title">Tikke om te toanen</string>
     <string name="pref_tap_to_reveal_summary">Koaden standert ferstopje. Tik items oan om de koade te toanen.</string>
     <string name="pref_tap_to_reveal_time_title">Time-out foar oantikken om te toanen</string>
@@ -95,13 +113,39 @@
     <string name="pref_backup_password_change_title">Wachtwurd foar reservekopy meitsje &amp; eksportearjen wizigje</string>
     <string name="pref_backup_password_change_summary">Stel in nij wachtwurd yn foar it fersiferjen fan de klûs wylst reservekopyen meitsjen en eksportearjen.</string>
     <string name="pref_encryption_title">Fersifering</string>
-    <string name="pref_encryption_summary">Fersiferje de klûs en ûntskoattelje dizze mei in wachtwurd of biometry</string>
+    <string name="pref_encryption_summary">Fersiferje de klûs en ûntskoattelje dizze mei in wachtwurd of biometry.</string>
     <string name="pref_biometrics_title">Biometrysk ûntskoattelje</string>
     <string name="pref_biometrics_summary">Biometryske autentikaasje tastean om de klûs te ûntskoatteljen</string>
+    <string name="pref_search_behavior_summary">Sykje troch: %s</string>
+    <string name="pref_search_behavior_prompt">Sykje yn ien fan de folgjende fjilden</string>
+    <string name="pref_search_behavior_type_name">Namme</string>
+    <string name="pref_search_behavior_type_issuer">Utjouwer</string>
+    <string name="pref_search_behavior_type_note">Notysje</string>
+    <string name="pref_search_behavior_type_groups">Groepen</string>
     <string name="pref_set_password_title">Wachtwurd wizigje</string>
-    <string name="pref_set_password_summary">Stel in nij wachtwurd yn wêrmei’tsto de klûs ûntskoattelje kinst</string>
+    <string name="pref_set_password_summary">Stel in nij wachtwurd yn wêrmei’t jo de klûs ûntskoattelje kinne</string>
+    <string name="no_events_title">Gjin rapportearre barrens</string>
+    <string name="no_events_description">Gjin wichtige ôfspraken binnen de app rapportearre</string>
+    <string name="event_title_vault_unlocked">Klûs ûntskoattele</string>
+    <string name="event_description_vault_unlocked">De klûs is mei sukses ûntskoattele</string>
+    <string name="event_title_backup_created">Reservekopy makke</string>
+    <string name="event_description_backup_created">Der is mei sukses in reservekopy fan de klûs makke</string>
+    <string name="event_title_android_backup_created">Reservekopy makke troch Android</string>
+    <string name="event_description_android_backup_created">Der is mei sukses troch Android in reservekopy fan de klûs makke</string>
+    <string name="event_title_vault_exported">Klûs eksportearre</string>
+    <string name="event_description_vault_exported">In kopy fan de klûs is eksportearre</string>
+    <string name="event_title_entry_shared">Ynfier dield</string>
+    <string name="event_description_entry_shared">Der is in ynfier dield</string>
+    <string name="event_title_vault_unlock_failed_password">Klûs ûntskoatteljen mislearre (wachtwurd)</string>
+    <string name="event_description_vault_unlock_failed_password">In besykjen om de klûs mei in wachtwurd te ûntskoatteljen is mislearre</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Klûs ûntskoatteljen mislearre (biometrysk)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">In besykjen om de klûs mei in wachtwurd te ûntskoatteljen mei biometryske gegevens is mislearre</string>
+    <string name="event_unknown">Unbekend barrenstype</string>
+    <string name="audit_log_entry_deleted">(fuortsmiten)</string>
+    <string name="today_at_time">Hjoed om %1$s</string>
+    <string name="day_of_week_at_time">%1$s om %2$s</string>
     <string name="export_encrypted">Fersiferje de klûs</string>
-    <string name="export_help">Dizze aksje sil de klûs eksportearje út it ynterne ûnthâld fan Aegis. Selektearje it formaat wêryn’tsto de eksport wolst:</string>
+    <string name="export_help">Dizze aksje sil de klûs eksportearje út it ynterne ûnthâld fan Aegis. Selektearje it formaat wêryn’t jo de eksport wolle:</string>
     <string name="export_warning_unencrypted">Do stiest op it punt in ûnfersifere kopy fan de Aegis-klûs te eksportearjen. <b>Dit wurdt net oanrekommandearre</b>.</string>
     <string name="export_warning_password">Eksporten wurde fersifere mei in apart wachtwurd ynsteld yn de befeiligingsynstellingen.</string>
     <string name="understand_risk_accept">Ik begryp it risiko</string>
@@ -116,16 +160,16 @@
         <item quantity="other">%d groepen selektearre</item>
     </plurals>
     <string name="export_no_groups_selected">Gjin groepen keazen om te eksportearjen</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator Export</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator Export</string>
     <string name="choose_authentication_method">Befeiliging</string>
-    <string name="authentication_method_explanation">Aegis is in op feilichheid rjochte 2FA-applikaasje. Tokens wurde bewarre yn in klûs, dy’t opsjoneel fersifere wurde kin mei in wachtwurd nei eigen idee. As in oanfaller dyn fersifere klûsbestân yn hannen kriget, sil dizze gjin tagong hawwe ta de ynhâld sûnder it wachtwurd te kennen.\n\nWy hawwe de opsje keazen dy’t neffens ús it beste past by dyn apparaat.</string>
+    <string name="authentication_method_explanation">Aegis is in op feilichheid rjochte 2FA-applikaasje. Tokens wurde bewarre yn in klûs, dy’t opsjoneel fersifere wurde kin mei in wachtwurd nei eigen idee. As in oanfaller jo fersifere klûsbestân yn hannen krijt, sil dizze gjin tagong hawwe ta de ynhâld sûnder it wachtwurd te kennen.\n\nWy hawwe de opsje keazen dy’t neffens ús it beste past by jo apparaat.</string>
     <string name="authentication_method_none">Gjin</string>
     <string name="authentication_method_none_description">Do hast gjin wachtwurd nedich om de klûs te ûntskoatteljen en de klûs sil net fersifere wurde. <b>Dizze opsje wurdt net oanrekommandearre</b>.</string>
     <string name="authentication_method_password">Wachtwurd</string>
     <string name="authentication_method_password_description">In wachtwurd is nedich om de klûs te ûntskoatteljen.</string>
-    <string name="authentication_method_password_explanation">Warskôging: Asto dyn wachtwurd ferjitst, ferliesto permanint tagong ta dyn tokens. Der is gjin manier om dizze te werstellen sûnder it wachtwurd.</string>
+    <string name="authentication_method_password_explanation">Warskôging: As jo jo wachtwurd ferjitte, ferlieze jo permanint tagong ta jo tokens. Der is gjin manier om dizze te werstellen sûnder it wachtwurd.</string>
     <string name="authentication_method_biometrics">Biometry</string>
-    <string name="authentication_method_biometrics_description">Njonken in wachtwurd kinne biometryske gegevens dy’t registrearre binne op dit apparaat, lykas in fingerôfdruk of dyn gesicht, brûkt wurde om de klûs te ûntskoatteljen.</string>
+    <string name="authentication_method_biometrics_description">Njonken in wachtwurd kinne biometryske gegevens dy’t registrearre binne op dit apparaat, lykas in fingerôfdruk of jo gesicht, brûkt wurde om de klûs te ûntskoatteljen.</string>
     <string name="authentication">Klûs ûntskoattelje</string>
     <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Klûs\nûntskoattelje</string>
     <string name="auth_use_biometrics">Of tik hjir om <font fgcolor="#FF0D86C1">biometry</font> te brûken</string>
@@ -134,17 +178,17 @@
     <string name="set_number">Kies in getal</string>
     <string name="set_password_confirm">Befêstigje it wachtwurd</string>
     <string name="invalid_password">It wachtwurd kloppet net</string>
-    <string name="invalidated_biometrics">Der is in wiziging yn de befeiligingsynstellingen fan dyn apparaat detektearre. Gean nei ‘Aegis -&gt; Ynstellingen -&gt; Befeiliging -&gt; Untskoattelje mei biometry’ om biometryske ferifikaasje wer yn te skeakeljen.</string>
-    <string name="password_reminder">Fier dyn wachtwurd yn. Wy freegje dy sa no en dan om dit te dwaan, sadatsto it net ferjitst.</string>
+    <string name="invalidated_biometrics">Der is in wiziging yn de befeiligingsynstellingen fan jo apparaat detektearre. Gean nei ‘Aegis -&gt; Ynstellingen -&gt; Befeiliging -&gt; Untskoattelje mei biometry’ om biometryske ferifikaasje wer yn te skeakeljen.</string>
+    <string name="password_reminder">Fier jo wachtwurd yn. Wy freegje jo sa no en dan om dit te dwaan, sadat jo it net ferjitte.</string>
     <string name="password_reminder_dialog_title">Standert biometrysk ûntskoattelje</string>
-    <string name="password_reminder_dialog_message">Wy freegje dy sa no en dan om dyn wachtwurd yn te fieren, sadatsto it net ferjitst en do de tagong ts dyn klûs ferliest. Neidatsto ien kear dyn wachtwurd ynfierd hast, sil Aegis standert weromgean nei biometrysk ûntskoattelje, oant it tiid is foar in oar omtinken oan dyn wachtwurd.</string>
+    <string name="password_reminder_dialog_message">Wy freegje jo sa no en dan om jo wachtwurd yn te fieren, sadat jo it net ferjitte en jo de tagong ta jo klûs ferlieze. Neidat jo ien kear jo wachtwurd ynfierd hawwe, sil Aegis standert weromgean nei biometrysk ûntskoattelje, oant it tiid is foar in oar omtinken oan jo wachtwurd.</string>
     <string name="password_reminder_freq_never">Nea</string>
     <string name="password_reminder_freq_weekly">Wykliks</string>
     <string name="password_reminder_freq_biweekly">Twawykliks</string>
     <string name="password_reminder_freq_monthly">Moanliks</string>
     <string name="password_reminder_freq_quarterly">Elk fearnsjier</string>
     <string name="enter_password_2fas_message">It liket derop dat dizze 2FAS-reservekopy fersifere is. Fier it wachtwurd hjirûnder yn.</string>
-    <string name="enter_password_authy_message">It liket derop datsto Authy-tokens fersifere binne. Slút Aegis, iepenje Authy en ûntskoattelje de tokens mei dyn wachtwurd. Yn stee dêrfan kin Aegis ek probearje om dyn Authy-tokens te dekodearjen asto hjirûnder dyn wachtwurd ynfollest.</string>
+    <string name="enter_password_authy_message">It liket derop dat jo Authy-tokens fersifere binne. Slút Aegis, iepenje Authy en ûntskoattelje de tokens mei jo wachtwurd. Yn stee dêrfan kin Aegis ek probearje om jo Authy-tokens te dekodearjen as jo hjirûnder jo wachtwurd ynfolje.</string>
     <string name="enter_password_aegis_title">Fier it ymportwachtwurd yn</string>
     <string name="period_hint">Tiid (sekonden)</string>
     <string name="algorithm_hint">Hash-funksje</string>
@@ -152,17 +196,23 @@
     <string name="share">Diele</string>
     <string name="yes">Ja</string>
     <string name="no">Nee</string>
+    <string name="undo">Ungedien meitsje</string>
     <string name="unlock">Untskoattelje</string>
     <string name="advanced">Avansearre</string>
     <string name="counter">Teller</string>
     <string name="digits">Sifers</string>
     <string name="secret">Kaai</string>
-    <string name="scan">Scan QR-koade</string>
-    <string name="scan_image">Scan ôfbylding</string>
+    <string name="scan">QR-koade scanne</string>
+    <string name="scan_image">Ofbylding scanne</string>
     <string name="enter_manually">Hânmjittich ynfiere</string>
     <string name="set_up_biometric">Biometryske ûntskoatteling ynstelle</string>
     <string name="copy">Kopiearje</string>
     <string name="edit">Bewurkje</string>
+    <string name="select_all">Alles selektearje</string>
+    <string name="assign_icons">Piktogrammen tawize</string>
+    <string name="assign_groups">Oan groep tawize</string>
+    <string name="assign_groups_dialog_summary">Selektearje in groep wêroan jo de selektearre items tawize wolle.</string>
+    <string name="assign_groups_dialog_dropdown">Groep selektearje</string>
     <string name="favorite" comment="Verb">Oan favoriten tafoegje</string>
     <string name="unfavorite" comment="Verb">Ut favoriten fuortsmite</string>
     <string name="error_all_caps">FLATER</string>
@@ -172,31 +222,34 @@
     <string name="new_entry">Nij item</string>
     <string name="add_new_entry">Nij item tafoegje</string>
     <string name="unlock_vault_error">Klûs koe net ûntskoattele wurde</string>
-    <string name="unlock_vault_error_description">Wachtwurd net krekt. Kontrolearje oftsto it wachtwurd korrekt ynfierd hast.</string>
+    <string name="unlock_vault_error_description">Wachtwurd net krekt. Kontrolearje oft jo it wachtwurd korrekt ynfierd hawwe.</string>
     <string name="password_equality_error">Wachtwurden moatte oerien komme en meie net leech wêze</string>
     <string name="snackbar_authentication_method">Kies in oanmeldmetoade</string>
     <string name="encrypting_vault">De klûs wurdt fersifere</string>
     <string name="exporting_vault">De klûs wurdt eksportearre</string>
+    <string name="optimizing_icon">Piktogram wurdt optimalisearre</string>
+    <string name="optimizing_icon_multiple">Piktogrammen %1$d/%2$d wurde optimalisearre</string>
     <string name="reading_file">Bestân lêze</string>
     <string name="requesting_root_access">Root-tagong wurdt oanfrege</string>
     <string name="analyzing_qr">QR-koade analysearje</string>
-    <string name="analyzing_qr_multiple">QR-koade analysearje %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">QR-koade analysearje %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">%d nij item tafoege oan de klûs</item>
         <item quantity="other">%d nije items tafoege oan de klûs</item>
     </plurals>
     <string name="importing_icon_pack">Piktogrampakket ymportearje</string>
     <string name="delete_entry">Item fuortsmite</string>
-    <string name="delete_entry_description">Bisto wis datsto dit item fuortsmite wolst?</string>
-    <string name="delete_entry_explanation">Dizze aksje skeakelet 2FA net út foar:\n<b>%s</b>\n\n. Soargje derfoar datsto 2FA útskeakele hast of datsto in oare manier hast om koaden foar dizze tsjinst te generearjen, om foar te kommen datsto tagong ferliest.</string>
+    <string name="delete_entry_description">Binne jo wis dat jo dit item fuortsmite wolle?</string>
+    <string name="delete_entry_explanation">Dizze aksje skeakelet 2FA net út foar:\n<b>%s</b>\n\n. Soargje derfoar dat jo 2FA útskeakele hawwe of dat jo in oare manier hawwe om koaden foar dizze tsjinst te generearjen, om foar te kommen dat jo tagong ferlieze.</string>
     <string name="delete_entries">Items fuortsmite</string>
     <plurals name="delete_entries_description">
-        <item quantity="one">Bisto wis datsto %d item fuortsmite wolst?</item>
-        <item quantity="other">Bisto wis datsto %d items fuortsmite wolst?</item>
+        <item quantity="one">Binne jo wis dat jo %d item fuortsmite wolle?</item>
+        <item quantity="other">Binne jo wis dat jo %d items fuortsmite wolle?</item>
     </plurals>
     <string name="discard_changes">Wizigingen annulearje?</string>
-    <string name="discard_changes_description">Dyn wizigingen binne net bewarre</string>
+    <string name="discard_changes_description">Jo wizigingen binne net bewarre</string>
     <string name="saving_profile_error">Flater by bewarjen profyl</string>
+    <string name="saving_assign_icons_error">Flater by tawizen piktogrammen</string>
     <string name="welcome">Wolkom</string>
     <string name="app_description">Aegis is in fergees en feilige iepen-boarne 2FA-app.</string>
     <string name="setup_completed">Konfiguraasje foltôge</string>
@@ -205,16 +258,17 @@
     <string name="copied">Kopiearre</string>
     <string name="errors_copied">Flaters binne nei klamboerd kopiearre</string>
     <string name="version_copied">Ferzje is nei klamboerd kopiearre</string>
+    <string name="error_required_field">Dit fjild is fereaske</string>
     <string name="error_occurred">Der is in flater bard</string>
     <string name="decryption_error">Der is in flater bard wylst it ûntskoatteljen fan de klûs</string>
     <string name="decryption_corrupt_error">Der is in flater bard wylst it ûntskoatteljen fan de klûs. It klûsbestân kin skansearre wêze.</string>
     <string name="saving_error">Der is in flater bard wylst it bewarjen fan de klûs</string>
     <string name="vault_init_error">Der is in flater bard wylst it inisjalisearjen fan de klûs</string>
     <string name="vault_load_error">Der is in flater bard wylst it laden fan de klûs fan it ûnthâld út</string>
-    <string name="biometric_decrypt_error">Der is in flater bard wylst it dekodearjen fan de klûs mei biometryske ferifikaasje. Dit bart meastentiids allinnich as de befeiligingsynstellingen fan dyn apparaat wizige binne. Untskoattelje de klûs mei dyn wachtwurd en konfigurearje biometryske autentikaasje opnij yn de ynstellingen fan Aegis.</string>
-    <string name="biometric_init_error">Der is in flater bard wylst it ynstellen fan biometryske ferifikaasje. Dit bart meastentiids allinnich as de befeiligingsynstellingen fan dyn apparaat wizige binne. Untskoattelje de klûs mei dyn wachtwurd en konfigurearje biometryske autentikaasje opnij yn de ynstellingen fan Aegis.</string>
+    <string name="biometric_decrypt_error">Der is in flater bard wylst it dekodearjen fan de klûs mei biometryske ferifikaasje. Dit bart meastentiids allinnich as de befeiligingsynstellingen fan jo apparaat wizige binne. Untskoattelje de klûs mei jo wachtwurd en konfigurearje biometryske autentikaasje opnij yn de ynstellingen fan Aegis.</string>
+    <string name="biometric_init_error">Der is in flater bard wylst it ynstellen fan biometryske ferifikaasje. Dit bart meastentiids allinnich as de befeiligingsynstellingen fan jo apparaat wizige binne. Untskoattelje de klûs mei jo wachtwurd en konfigurearje biometryske autentikaasje opnij yn de ynstellingen fan Aegis.</string>
     <string name="disable_encryption">Fersifering útskeakelje</string>
-    <string name="disable_encryption_description">Bisto wis datsto fersifering útskeakelje wolst? Hjirtroch sil de klûs yn platte tekst bewarre wurde. <b>Automatyske reservekopyen wurde ek útskeakele</b>.</string>
+    <string name="disable_encryption_description">Binne jo wis dat jo fersifering útskeakelje wolle? Hjirtroch sil de klûs yn platte tekst bewarre wurde. <b>Automatyske reservekopyen wurde ek útskeakele</b>.</string>
     <string name="enable_encryption_error">Der is in flater bard by it ynskeakeljen fan fersifering</string>
     <string name="disable_encryption_error">Der is in flater bard by it útskeakeljen fan fersifering</string>
     <string name="backup_successful">Plannen fan de reservekopy is slagge</string>
@@ -223,9 +277,9 @@
     <string name="backup_status_failed">De meast resinte mislearre reservekopy: %s</string>
     <string name="backup_status_none">Der binne noch gjin reservekopyen makke</string>
     <string name="backup_warning_password">Reservekopyen wurde fersifere mei in apart wachtwurd ynsteld yn de befeiligingsynstellingen</string>
-    <string name="documentsui_error">DocumentsUI liket te ûntbrekken op dyn apparaat. Dit is in wichtich systeemûnderdiel, nedich foar it selektearjen en meitsjen fan dokuminten. Asto in ark brûkt hast om dyn apparaat te &quot;debloaten&quot; hasto it mooglik mei fersin fuortsmiten en silsto it opnij ynstallearje moatte.</string>
+    <string name="documentsui_error">DocumentsUI liket te ûntbrekken op jo apparaat. Dit is in wichtich systeemûnderdiel, nedich foar it selektearjen en meitsjen fan dokuminten. As jo in ark brûkt hawwe om jo apparaat te &quot;debloaten&quot; hawwe jo it mooglik mei fersin fuortsmiten en sille jo it opnij ynstallearje moatte.</string>
     <string name="icon_pack_import_error">Der is in flater bard wylst it ymportearjen fan in piktogrampakket</string>
-    <string name="icon_pack_import_exists_error">It piktogrampakket datsto probearrest te ymportearjen bestiet al. Wolsto it oerskriuwe?</string>
+    <string name="icon_pack_import_exists_error">It piktogrampakket dat jo probearje te ymportearjen bestiet al. Wolle jo it oerskriuwe?</string>
     <string name="icon_pack_delete_error">Der is in flater bard wylst it fuortsmiten fan in piktogrampakket</string>
     <plurals name="icon_pack_info">
         <item quantity="one">%d piktogram</item>
@@ -237,16 +291,16 @@
     <string name="andotp_old_format">Ald formaat (v0.6.2 of âlder) </string>
     <string name="choose_andotp_importer">Hokker formaat hat it andOTP reservekopybestân?</string>
     <string name="choose_totpauth_importer">Is dizze TOTP-autentikator-reservekopy fersifere mei in wachtwurd?</string>
-    <string name="choose_application">Selektearje de applikaasje wêrútsto ymportearje wolst</string>
-    <string name="choose_theme">Selektearje dyn winske tema</string>
+    <string name="choose_application">Selektearje de applikaasje wêrút jo ymportearje wolle</string>
+    <string name="choose_theme">Selektearje jo winske tema</string>
     <string name="choose_account_name_position">Selektearje jo winske accountnammeposysje</string>
-    <string name="choose_view_mode">Selektearje dyn winske werjeftemodus</string>
+    <string name="choose_view_mode">Selektearje jo winske werjeftemodus</string>
     <string name="choose_copy_behavior">Selektearje it winske gedrach foar kopiearjen</string>
     <string name="parsing_file_error">Der is in flater bard wylst it oersetten fan it bestân</string>
     <string name="file_not_found">Flater: Bestân net fûn</string>
     <string name="reading_file_error">Der is in flater bard wylst it lêzen fan it bestân</string>
     <string name="app_lookup_error">Flater: App is net ynstallearre</string>
-    <string name="app_version_error">De ynstallearre ferzje fan %s wurdt net stipe. Resinte ferzjes binne begûn mei it fersiferjen fan inkelde bestannen yn de ynterne ûnthâldmap. Hjirtroch hat Aegis gjin tagong ta de ynformaasje dy’t nedich is om te ymportearjen. Ymportearjen sil wierskynlik in flater opleverje. Wolsto dochs trochgean?</string>
+    <string name="app_version_error">De ynstallearre ferzje fan %s wurdt net stipe. Resinte ferzjes binne begûn mei it fersiferjen fan inkelde bestannen yn de ynterne ûnthâldmap. Hjirtroch hat Aegis gjin tagong ta de ynformaasje dy’t nedich is om te ymportearjen. Ymportearjen sil wierskynlik in flater opleverje. Wolle jo dochs trochgean?</string>
     <string name="root_error">Flater: Kin gjin root-tagong krije</string>
     <plurals name="imported_entries_count">
         <item quantity="one">%d item ymportearre</item>
@@ -261,54 +315,80 @@
     <string name="exporting_vault_error">Der is in flater bard wylst it eksportearjen fan de klûs</string>
     <string name="exported_vault">De klûs is eksportearre</string>
     <string name="encryption_set_password_error">Der is in flater bard wylst it ynstellen fan it wachtwurd.</string>
-    <string name="encryption_enable_biometrics_error">Der is in flater bard by it ynskeakeljen fan biometrysk ûntskoatteljen. Guon apparaten hawwe in minne ymplemintaasje fan biometryske autentikaasje, dy fan dy is der wierskynlik ien fan. Tink ris nei om allinnich in wachtwurd te brûken.</string>
+    <string name="encryption_enable_biometrics_error">Der is in flater bard by it ynskeakeljen fan biometrysk ûntskoatteljen. Guon apparaten hawwe in minne ymplemintaasje fan biometryske autentikaasje, dy fan jo is der wierskynlik ien fan. Tink ris nei om allinnich in wachtwurd te brûken.</string>
     <string name="no_cameras_available">Gjin kamera’s beskikber</string>
     <string name="read_qr_error">Der is in flater bard wylst it lêzen fan de QR-koade</string>
-    <string name="read_qr_error_phonefactor">Aegis is net kompatibel mei it eigen 2FA-algoritme fan Microsoft. Soargje derfoar datsto ‘Applicatie zonder meldingen instellen’ selektearrest by it konfigurearjen fan 2FA yn Office 365.</string>
+    <string name="read_qr_error_phonefactor">Aegis is net kompatibel mei it eigen 2FA-algoritme fan Microsoft. Soargje derfoar dat jo ‘Applicatie zonder meldingen instellen’ selektearje by it konfigurearjen fan 2FA yn Office 365.</string>
     <string name="partial_google_auth_import">Net folsleine Google Authenticator-eksport detektearre</string>
-    <string name="partial_google_auth_import_warning">Inkelde QR-koaden ûntbrekke yn de ymport. De folgjende koaden binne net fûn:\n\n<b>%s</b>\n\nDo kinst trochgean mei it ymportearjen fan dizze ûnfolsleine eksport, mar wy rekommandearje oan it opnij te probearjen mei alle QR-koaden, sadatsto net it risiko rinst de tagong ta tokens te ferliezen.</string>
+    <string name="partial_google_auth_import_warning">Inkelde QR-koaden ûntbrekke yn de ymport. De folgjende koaden binne net fûn:\n\n<b>%s</b>\n\nJo kinne trochgean mei it ymportearjen fan dizze ûnfolsleine eksport, mar wy rekommandearje oan it opnij te probearjen mei alle QR-koaden, sadat jo net it risiko rinne de tagong ta tokens te ferliezen.</string>
     <string name="missing_qr_code_descriptor">• QR-koade %d</string>
-    <string name="import_partial_export_anyway">%d tokens dochs ymportearje</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">%d token dochs ymportearje</item>
+        <item quantity="other">%d tokens dochs ymportearje</item>
+    </plurals>
     <string name="import_google_auth_failure">Ymportearjen fan Google Authenticator-eksport mislearre</string>
     <string name="unrelated_google_auth_batches_error">Eksport befettet ynformaasje foar in net relatearre batch. Probearje 1 batch tagelyk te ymportearjen.</string>
     <string name="no_tokens_can_be_imported">Hjirtroch kinne gjin tokens ymportearre wurde</string>
-    <string name="authentication_method_raw">Rûch</string>
     <string name="unlocking_vault">Klûs wurdt ûntskoattele</string>
-    <string name="slot_this_device">(dit apparaat)</string>
+    <string name="rename_group">Groep omneame</string>
+    <string name="no_group_selection">As in item net yn in groep sit, kin dit fûn wurde ûnder ‘Gjin groep’.</string>
     <string name="remove_group">Groep fuortsmite</string>
-    <string name="remove_group_description">Bisto wis datsto dizze groep fuortsmite wolst? Alle items binnen dizze groep wurde automatysk ferpleatst nei ‘Gjin groep’.</string>
+    <string name="remove_group_description">Binne jo wis dat jo dizze groep fuortsmite wolle? Alle items binnen dizze groep wurde automatysk ferpleatst nei ‘Gjin groep’.</string>
+    <string name="remove_unused_groups">Net brûkte groepen fuortsmite</string>
+    <string name="remove_unused_groups_description">Binne jo wis dat jo alle groepen, dy’t net tawizen binne ta in item, fuortsmite wolle?</string>
     <string name="remove_icon_pack">Piktogrammepakket fuortsmite</string>
-    <string name="remove_icon_pack_description">Bisto wis datsto dit piktogrammepakket fuortsmite wolst? Items dy’t piktogrammen út dit pakket brûke, wurde net beynfloede.</string>
+    <string name="remove_icon_pack_description">Binne jo wis dat jo dit piktogrammepakket fuortsmite wolle? Items dy’t piktogrammen út dit pakket brûke, wurde net beynfloede.</string>
     <string name="details">Details</string>
     <string name="show_error_details">Flaterdetails toane</string>
     <string name="lock">Beskoattelje</string>
     <string name="name">Namme</string>
     <string name="no_group">Gjin groep</string>
-    <string name="sort">Sortearje</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sortearje</string>
     <string name="sort_alphabetically">Utjouwer (A t/m Z)</string>
     <string name="sort_alphabetically_reverse">Utjouwer (Z t/m A)</string>
     <string name="sort_alphabetically_name">Account (A t/m Z)</string>
     <string name="sort_alphabetically_name_reverse">Account (Z t/m A)</string>
     <string name="sort_usage_count">Gebrûksteller</string>
+    <string name="sort_last_used">Lêst brûkt</string>
     <string name="sort_custom">Oanpast</string>
+    <string name="last_used">Lêst brûkt</string>
+    <string name="last_used_never">nea</string>
     <string name="new_group">Nije groep…</string>
     <string name="group">Groep</string>
     <string name="group_name_hint">Groepsnamme</string>
     <string name="preference_manage_groups">Groepen bewurkje</string>
-    <string name="preference_manage_groups_summary">Behear en smyt hjir dyn groepen fuort</string>
+    <string name="preference_manage_groups_summary">Behear en smyt hjir jo groepen fuort</string>
     <string name="preference_reset_usage_count">Gebrûksteller op 0 ynstelle</string>
-    <string name="preference_reset_usage_count_summary">De gebrûksteller fan elk item yn dyn klûs opnij ynstelle</string>
-    <string name="preference_reset_usage_count_dialog">Bisto wis datsto de gebrûksteller fan alle items yn de klûs op 0 sette wolst?</string>
-    <string name="note">Notysje</string>
+    <string name="preference_reset_usage_count_summary">De gebrûksteller fan elk item yn jo klûs opnij ynstelle</string>
+    <string name="preference_reset_usage_count_dialog">Binne jo wis dat jo de gebrûksteller fan alle items yn de klûs op 0 sette wolle?</string>
+    <string name="note" comment="Users can add a note to an entry">Notysje</string>
     <string name="clear">Wiskje</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Ynfier bestiet al</string>
+    <string name="dialog_duplicate_entry_message">Dizze ynfier hat deselde namme en útjouwer as ien of mear besteande fermeldingen. Hoe wolsto fierder gean?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Besteande ynfier/items oerskriuwe</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Ferfang de besteande ynfier of fermeldingen troch de nije. Dizze aksje kin net ûngedien makke wurde</string>
+    <string name="dialog_duplicate_entry_suffix_title">Foegje suffix ta</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Foegje in achterfoechsel ta oan de namme fan dizze nije ynfier. De nije namme wurdt %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Bewarjen annulearje</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Hjirmei kinne jo it item bewurkjen eardat jo it opnij probearje te bewarjen</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Bisto wis datsto %d ynfier mei de folgjende namme fuortsmite wolst:\n\n%s - %s</item>
+        <item quantity="other">Bisto wis datsto %d ynfier mei de folgjende namme fuortsmite wolst:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Fuortsmiten befêstigje</string>
+    <string name="pref_haptic_feedback_summary">Lit dy apparaat trille wannear’t de koaden fernije</string>
+    <string name="pref_haptic_feedback_title">Haptyske feedback</string>
     <string name="pref_highlight_entry_title">Koaden markearje nei oantikken</string>
     <string name="pref_highlight_entry_summary">Meitsje koaden makliker te ûnderskieden fan inoar troch se tydlik te markearjen nei it oantikken</string>
+    <string name="pref_groups_multiselect_title">Meardere groepen selektearje</string>
+    <string name="pref_groups_multiselect_summary">Seleksje fan meardere groepen tagelyk tastean</string>
     <string name="pref_minimize_on_copy_title">By kopiearjen minimalisearje</string>
     <string name="pref_minimize_on_copy_summary">App nei kopiearjen fan in koade minimalisearje</string>
     <string name="pref_copy_behavior_title">Koaden nei it klamboerd kopiearje</string>
+    <string name="pref_search_behavior_title">Sykgedrach</string>
     <string name="pref_pause_entry_title">Tokens by oantikken befrieze</string>
     <string name="pref_pause_entry_summary">Automatysk ferfarskjen fan koaden troch derop te tikken stopje. Koaden sille net bywurke wurde sa lang se fokust binne. Fereasket ‘Koaden markearje nei oantikken’ of ‘Oantikke om te toanen’.</string>
-    <string name="pin_keyboard_description">Fier dyn wachtwurd yn om it PIN-toetseboerd yn te skeakeljen. Let op: dit wurket allinnich as dyn wachtwurd út sifers bestiet</string>
+    <string name="pin_keyboard_description">Fier jo wachtwurd yn om it PIN-toetseboerd yn te skeakeljen. Let op: dit wurket allinnich as jo wachtwurd út sifers bestiet</string>
     <string name="pin_keyboard_error">Flater by ynskeakeljen fan PIN-toetseboerd</string>
     <string name="pin_keyboard_error_description">It is net mooglik om PIN-toetseboerd yn te stellen. It wachtwurd mei allinnich út sifers bestean.</string>
     <string name="pin_keyboard_disabled">Wachtwurd wizige. It PIN-toetseboerd wurdt net mear werjûn.</string>
@@ -331,7 +411,7 @@
     <string name="unable_to_process_deeplink">Deeplink kin net ferwurke wurde</string>
     <string name="unable_to_read_qrcode_file">QR-koade koe net út bestân lêzen en ferwurke wurde: %s.</string>
     <string name="unable_to_process_shared_text">Dielde tekst kin net as OTP ferwurke wurde</string>
-    <string name="unable_to_read_qrcode_files">Guon QR-koaden kinne net lêzen en ferwurke wurde. Allinnich%d/%d items wurde ymportearre.</string>
+    <string name="unable_to_read_qrcode_files">Guon QR-koaden kinne net lêzen en ferwurke wurde. Allinnich%1$d/%2$d items wurde ymportearre.</string>
     <string name="unable_to_generate_qrcode">QR-koade koe net generearre wurde</string>
     <string name="select_picture">Ofbylding selektearje</string>
     <string name="select_icon">Piktogram selektearje</string>
@@ -347,11 +427,11 @@
     <string name="whats_new">Wat is der nij</string>
     <string name="github_description">Boarnekoade, problemen en ynformaasje</string>
     <string name="license">Lisinsje</string>
-    <string name="license_description">Aegis Authenticator is lisinsiearre ûnder de GPLv3</string>
+    <string name="license_description">Aegis Authenticator is lisinsearre ûnder de GPLv3</string>
     <string name="third_party_licenses">Lisinsjes fan tredden</string>
     <string name="third_party_licenses_description">Lisinsjes fan biblioteken fan tredden brûkt troch Aegis</string>
     <string name="country_netherlands">Nederlân</string>
-    <string name="email_us">Skriuw in e-mailberjocht</string>
+    <string name="email_us">Stjoer in e-mailberjocht</string>
     <string name="visit_website">Besykje ús website</string>
     <string name="about_support">Stipe</string>
     <string name="support_rate">Beoardielje</string>
@@ -359,16 +439,18 @@
     <string name="webview_error">Dit apparaat stipet gjin webview, hokker nedich is om de wizigingen te besjen. It mist in systeemkomponint.</string>
     <string name="email">E-mailadres</string>
     <string name="time_sync_warning_title">Automatyske tiidsyngronisaasje</string>
-    <string name="time_sync_warning_message">Aegis is ôfhinklik fan syngronisearre systeemtiid om krekte koaden te generearjen. In ôfwiking fan op syn minst inkelde sekonden kin liede ta net krekte koaden. It liket derop dat dyn apparaat net ynsteld is om de tiid automatysk te syngronisearjen. Wolsto dit no dwaan?</string>
+    <string name="time_sync_warning_message">Aegis is ôfhinklik fan syngronisearre systeemtiid om krekte koaden te generearjen. In ôfwiking fan op syn minst inkelde sekonden kin liede ta net krekte koaden. It liket derop dat jo apparaat net ynsteld is om de tiid automatysk te syngronisearjen. Wolle jo dit no dwaan?</string>
     <string name="time_sync_warning_disable">Stop mei my te warskôgjen. Ik wit wat ik doch.</string>
     <string name="google_qr_export_unrelated">Net relatearre QR-koade fûn. Probearje de scanner opnij te starten.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d QR-koade scand</item>
-        <item quantity="other">%d/%d QR-koaden scand</item>
+        <item quantity="one">%1$d/%2$d QR-koade scand</item>
+        <item quantity="other">%1$d/%2$d QR-koaden scand</item>
     </plurals>
-    <string name="google_qr_export_unexpected">QR-koade #%d waard ferwachte, mar yn stee dêrfan #%d scand</string>
+    <string name="google_qr_export_unexpected">QR-koade #%1$d ferwachte, yn stee dêrfan #%2$d scand</string>
     <string name="backup_error_bar_message"><b>Klûsreservekopy koartlyn mislearre</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        In resinte reservekopy fan de klûs mei %s mislearre, omdat der wat misgien is. De reservekopybesykjen wie op %s. Kontrolearje de resevekopy-ynstellingen om wis te wêzen dat reservekopyen mei sukses foltôge wurde kinne.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        In resinte reservekopy fan de klûs mei %1$s mislearre, omdat der wat misgien is. De reservekopybesykjen wie op %2$s. Kontrolearje de resevekopy-ynstellingen om wis te wêzen dat reservekopyen mei sukses foltôge wurde kinne.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        In resint besykjen in reservekopy fan de klûs te meitsjen mei %1$s is mislearre. Aegis hat gjin tastimming om te skriuwen nei de reservekopylokaasje. De reservekopy is %2$s probearre. Dizze flater kin barre as jo de reservekopylokaasje ferpleatst/omneamd hawwe of as jo koartlyn in Aegis-reservekopy wersteld hawwe. Konfigurearje de reservekopylokaasje opnij.
     </string>
     <string name="backup_system_builtin">it ynboude automatyske reservekopyen fan Aegis</string>
     <string name="backup_system_android">it cloudreservekopysysteem fan Android</string>
@@ -382,11 +464,11 @@
     <string name="backup_reminder_bar_dialog_accept">Reservekopyen ynstelle</string>
     <string name="backup_plaintext_export_warning"><b>De klûs is resint eksportearre yn platte tekst</b></string>
     <string name="pref_show_plaintext_warning_hint">Dizze warskôging net opnij toane</string>
-    <string name="backup_plaintext_warning_explanation">Dizze warskôging wurdt toand, omdatsto resint in net-fersifere kopy fan de klûs eksportearre hast. Om dyn tokens feilich te hâlden, riede wy oan dit bestân fuort te smiten asto it net mear nedich hast.</string>
+    <string name="backup_plaintext_warning_explanation">Dizze warskôging wurdt toand, omdat jo resint in net-fersifere kopy fan de klûs eksportearre hawwe. Om jo tokens feilich te hâlden, riede wy oan dit bestân fuort te smiten as jo it net mear nedich hawwe.</string>
     <string name="switch_camera">Kamera wikselje</string>
-    <string name="empty_list">Der binne gjin koaden om te toanen. Begjin mei it tafoegjen fan items troch op it plusteken yn de rjochterûnderhoek te tikken</string>
+    <string name="empty_list">Der binne gjin koaden om te toanen. Begjin mei it tafoegjen fan items troch op it plusteken yn de rjochterûnderhoek te tikken.</string>
     <string name="empty_list_title">Gjin items fûn</string>
-    <string name="empty_group_list">Der binne gjin groepen om te toanen. Foegje groepen ta yn it bewurkingsskerm fan in item</string>
+    <string name="empty_group_list">Der binne gjin groepen om te toanen. Foegje groepen ta yn it bewurkingsskerm fan in item.</string>
     <string name="empty_group_list_title">Gjin groepen fûn</string>
     <string name="no_icon_packs">Der binne noch gjin piktogrampakketten ymportearre. Tik op it plusteken om der ien te ymportearjen. Tip: probearje <a href="https://aegis-icons.github.io">Aegis-piktogrammen</a>.</string>
     <string name="no_icon_packs_title">Gjin piktogrampakketten</string>
@@ -402,50 +484,62 @@
     <string name="copy_uri">URI kopiearje</string>
     <string name="unable_to_copy_uri_to_clipboard">Kin URI net nei klamboerd kopiearje</string>
     <string name="uri_copied_to_clipboard">URI nei klamboerd kopiearre</string>
-    <string name="transfer_entry">Item oerbringe</string>
-    <string name="transfer_entry_description">Scan dizze QR-koade mei de autentikator-app wêr’tsto dit item nei oerbringe wolst</string>
+    <string name="transfer_entry_description">Scan dizze QR-koade mei de autentikator-app wêr’t jo dit item nei oerbringe wolle</string>
+    <string name="transfer_entry_brightness">Tik op de QR-koade om helderheid op folslein skerm te skeakeljen</string>
     <string name="google_auth_compatible_transfer_description">Scan dizze QR-koaden mei Aegis of Google Authenticator.\n\nFanwegen beheiningen fan de Google Authenticator-app, binne allinnich TOTP- &amp; HOTP-tokens dy’t SHA1 brûke en 6-siferige koaden produsearje opnommen</string>
     <string name="password_strength_very_weak">Hiel swak</string>
     <string name="password_strength_weak">Swak</string>
     <string name="password_strength_fair">Reedlik</string>
     <string name="password_strength_good">Goed</string>
     <string name="password_strength_strong">Sterk</string>
+    <string name="password_strength_unknown">Wachtwurd te lang foar sterkte-analyze</string>
     <string name="pref_pin_keyboard_title">PIN-toetsen op beskoattelskerm</string>
-    <string name="pref_pin_keyboard_summary">Skeakelje dit yn asto it PIN-toetseboerd op it beskoattelskerm brûke wolst. Wurket allinnich by numerike wachtwurden</string>
+    <string name="pref_pin_keyboard_summary">Skeakelje dit yn as jo it PIN-toetseboerd op it beskoattelskerm brûke wolle. Wurket allinnich by numerike wachtwurden</string>
     <string name="title_activity_preferences">Ynstellingen</string>
     <string name="title_activity_manage_groups">Groepen beheare</string>
     <string name="title_activity_transfer">Items oerbringe</string>
     <string name="title_activity_about">Oer</string>
     <string name="title_activity_edit_entry">Item bewurkje</string>
     <string name="title_activity_scan_qr">Scan in QR-koade</string>
-    <string name="title_activity_manage_slots">Kaaislots beheare</string>
     <string name="title_activity_import_entries">Items ymportearje</string>
+    <string name="title_activity_assign_icons">Piktogrammen tawize</string>
+    <string name="title_activity_licenses">Lisinsjes fan tredden</string>
     <string name="dialog_wipe_entries_title">Items wiskje</string>
-    <string name="dialog_wipe_entries_message">Dyn klûs befettet al items. Wolsto dizze items fuortsmite eardatsto dit bestân ymportearrest?\n\n<b>Hjirmei ferliesto permanint tagong ta de besteande items yn de klûs.</b></string>
+    <string name="dialog_wipe_entries_message">Jo klûs befettet al items. Wollle jo dizze items fuortsmite eardat jo dit bestân ymportearje?\n\n<b>Hjirmei ferlieze jo permanint tagong ta de besteande items yn de klûs.</b></string>
     <string name="dialog_wipe_entries_checkbox">Klûsynhâld wiskje</string>
     <string name="panic_trigger_ignore_toast">Aegis hat panyktrigger ûntfongen, mar ynstelling is útskeakele, wurdt negearre</string>
     <string name="pref_panic_trigger_title">Klûs fuortsmite by panyktrigger</string>
     <string name="pref_panic_trigger_summary">Klûs fuortsmite by ûntfangen fan Ripple-panyktrigger</string>
-    <string name="import_vault">Klûs ymportearje</string>
+    <string name="import_vault">Aegis-klûs ymportearje</string>
+    <string name="import_vault_hint">Wolle jo út in oare 2FA-app ymportearje? Foltôgje earst de konfiguraasje en gean dan nei it ynstellingenmenu.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d potinsjele dûbeling net oanfinkt. Kontrolearje de list mei items.</item>
+        <item quantity="other">%d potinsjele dûbelingen net oanfinkt. Kontrolearje de list mei items.</item>
+    </plurals>
     <string name="importer_help_2fas">Leverje in 2FAS-autentikator-eksportbestân oan.</string>
     <string name="importer_help_aegis">Leverje in Aegis-eksport-/reservekopybestân oan.</string>
     <string name="importer_help_authenticator_plus">Leverje in Authenticator Plus-eksportbestân oan krigen fia <b>Ynstellingen -&gt; Reservekopy &amp; Werstelle -&gt; Eksportearje as Tekst en HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Leverje in Authenticator Pro-eksportbestân oan krigen fia <b>Ynstellingen -&gt; Reservekopy -&gt; Reservekopy nei fersifere bestân (oanrekommandearre)</b>.</string>
     <string name="importer_help_authy">Leverje in kopy oan fan <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, pleatst yn de ynterne ûnthâldmap fan Authy.</string>
     <string name="importer_help_andotp">Leverje in andOTP-eksport-/reservekopybestân oan.</string>
     <string name="importer_help_bitwarden">Leverje in Bitwarden-eksport-/reservekopybestân oan. Fersifere bestannen wurde net stipe.</string>
-    <string name="importer_help_battle_net_authenticator">Leverje in kopy oan fan <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, pleatst yn de ynterne ûnthâldmap fan Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Leverje in kopy oan fan <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, pleatst yn de ynterne ûnthâldmap fan Battle.net Authenticator.</string>
     <string name="importer_help_duo">Leverje in kopy oan fan <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, pleatst yn de ynterne ûnthâldmap fan DUO.</string>
-    <string name="importer_help_freeotp">Leverje in kopy oan fan <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, pleatst yn de ynterne ûnthâldmap fan FreeOTP.</string>
+    <string name="importer_help_ente_auth">Fier in Ente Auth-eksportbestân yn. Op dit stuit wurde allinnich net-fersifere bestannen stipe.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Leverje in kopy.\nFreeOTP 1.x: Leverje in kopy oan fan <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, pleatst yn de ynterne ûnthâldmap fan FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Leverje in FreeOTP-eksportbestân oan.</string>
+    <string name="importer_warning_title_freeotp2">Kompatibiliteit mei FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Der binne in oantal problemen yn FreeOTP 2 dy’t ta korrupte reservekopyen liede kinne. Aegis sil probearje safolle mooglik items te rêden, mar it is mooglik dat guon of sels alles net te ymportearjen is.</string>
     <string name="importer_help_google_authenticator"><b>Allinnich databasebestannen fan Google Authenticator v5.10 en earder wurde stipe</b>.\n\nLeverje in kopy oan fan <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, pleatst yn de ynterne ûnthâldmap fan Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Leverje in kopy oan fan <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, pleatst yn de ynterne ûnthâldmap fan Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Leverje in tekstbestân oan mei in Google Authenticator-URI op elke rigel.</string>
     <string name="importer_help_steam"><b>Steam v3.0 en nijer wurde net stipe</b>. Soargje foar in kopy fan <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, te finen yn de ynterne ûnthâldmap fan Steam.</string>
+    <string name="importer_help_stratum">Leverje in Stratum-eksportbestân oan, ûntfongen fia <b>Ynstellingen -&gt; Reservekopy -&gt; Reservekopy nei fersifere bestân (oanrekommandearre)</b>.</string>
     <string name="importer_help_totp_authenticator">Leverje in TOTP-autentikator-eksportbestân oan.</string>
     <string name="importer_help_winauth">Leverje in WinAuth-eksportbestân oan.</string>
+    <string name="import_assign_icons_dialog_title">Piktogrammen tawize</string>
+    <string name="import_assign_icons_dialog_text">Wolle jo piktogrammen tawize oan de ymportearre items?</string>
     <string name="importer_encrypted_exception_google_authenticator">Fersifere item is oerslaggen: %s</string>
-    <string name="importer_help_direct">Ymportearje items streekrjocht fan %s. Dit fereasket dat de app op dit apparaat stiet en dat root-tagong oan Aegis ferliend wurdt.</string>
+    <string name="importer_help_direct">Ymportearje items streekrjocht fan %s út. Dit fereasket dat de app op dit apparaat stiet en dat root-tagong oan Aegis ferliend wurdt.</string>
     <string name="groups">Groepen</string>
     <string name="pref_focus_search">Fokus sykfjild nei starten app</string>
     <string name="pref_focus_search_summary">Fokus it sykfjild daliks nei it iepenjen fan de app.</string>
@@ -460,23 +554,23 @@
     <string name="pref_account_name_position_hidden">Ferstoppe</string>
     <string name="pref_account_name_position_end">Njonken de útjouwer</string>
     <string name="pref_account_name_position_below">Under de útjouwer</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d sekonde lyn</item>
         <item quantity="other">%d sekonden lyn</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minút lyn</item>
         <item quantity="other">%d minuten lyn</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d oere lyn</item>
         <item quantity="other">%d oeren lyn</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d dei lyn</item>
         <item quantity="other">%d dagen lyn</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d jier lyn</item>
         <item quantity="other">%d jierren lyn</item>
     </plurals>
diff --git a/app/src/main/res/values-gl-rES-v29/strings.xml b/app/src/main/res/values-gl-rES-v29/strings.xml
new file mode 100644
index 00000000..f2cc50b7
--- /dev/null
+++ b/app/src/main/res/values-gl-rES-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Predeterminado do sistema</string>
+    <string name="system_amoled_theme_title">Predeterminado do sistema (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 73649dd9..a97b02e1 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Axustes</string>
     <string name="action_about">Información</string>
     <string name="action_delete">Eliminar</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Restablecer icona predeterminada</string>
     <string name="discard">Desbotar</string>
     <string name="save">Gardar</string>
+    <string name="all">Todo</string>
     <string name="issuer">Provedor</string>
     <string name="yandex_pin">PIN (4–16 cifras)</string>
     <string name="motp_pin">PIN (4 cifras)</string>
@@ -28,17 +29,30 @@
     <string name="pref_section_security_summary">Configura o cifrado, o desbloqueo por biometría, o bloqueo automático e outros axustes de seguridade.</string>
     <string name="pref_section_import_export_title">Importar e exportar</string>
     <string name="pref_section_import_export_summary">Importa copias de seguridade de Aegis ou de outras aplicacións de autenticación. Exporta manualmente o teu almacén de Aegis.</string>
+    <string name="pref_section_audit_log_title">Rexistro de auditoría</string>
+    <string name="pref_section_audit_log_summary">Atopa unha lista de tódolos eventos importantes que ocorreron na app.</string>
     <string name="pref_section_backups_title">Copias de seguridade</string>
     <string name="pref_section_backups_summary">Configura copias de seguridade automáticas na localización que escollas ou activa a participación no sistema de copias de seguridade na nube de Android.</string>
     <string name="pref_section_icon_packs">Paquetes de iconas</string>
     <string name="pref_section_icon_packs_summary">Xestiona e importa paquetes de iconas.</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Cores dinámicas</string>
+    <string name="pref_dynamic_colors_summary">Aplica unha superposición baseada nas cores do teu tema de Android</string>
     <string name="pref_view_mode_title">Modo de visualización</string>
     <string name="pref_lang_title">Idioma</string>
-    <string name="pref_show_icons_title">Amosar iconas</string>
-    <string name="pref_show_icons_summary">Amosar iconas ao lado de cada entrada</string>
+    <string name="pref_show_icons_title">Mostrar iconas</string>
+    <string name="pref_show_icons_summary">Mostra iconas ao lado de cada entrada</string>
     <string name="pref_code_group_size_title">Agrupación dos díxitos do código</string>
     <string name="pref_code_group_size_summary">Escolle o número de díxitos polos que agrupar os códigos</string>
+    <string name="pref_account_name_position_title">Mostrar o nome da conta</string>
+    <string name="pref_show_next_code_title">Mostrar código seguinte</string>
+    <string name="pref_show_next_code_summary">Xera e amosa o seguinte código antes de tempo</string>
+    <string name="pref_expiration_state_title">Indicar que os códigos van caducar</string>
+    <string name="pref_expiration_state_summary">Cambia a cor dos códigos e fainos titilar cando estean a piques de caducar</string>
+    <string name="pref_expiration_state_fallback">Cambia a cor dos códigos cando estean a piques de caducar</string>
+    <string name="pref_shared_issuer_account_name_title">Mostrar o nome da conta só cando sexa necesario</string>
+    <string name="pref_shared_issuer_account_name_summary">Mostrar nomes de conta só cando teñan o mesmo provedor. Os demáis nomes de conta ocultaranse.</string>
+    <string name="pref_account_name_position_summary_override">Este axuste está anulado polo modo de visualización de mosaico. O nome da conta mostrarase debaixo do provedor.</string>
     <string name="pref_import_file_title">Importar desde un ficheiro</string>
     <string name="pref_import_file_summary">Importar tokens desde un ficheiro</string>
     <string name="pref_android_backups_title">Copias de seguridade na nube de Android</string>
@@ -50,15 +64,23 @@
     <string name="pref_backups_reminder_summary">Mostra un recordatorio para facer a copia de seguridade do almacén, no caso de que non fixeras ningunha copia dos teus últimos cambios.</string>
     <string name="pref_backups_reminder_dialog_title">Desactivar recordatorio da copia de seguridade</string>
     <string name="pref_backups_reminder_dialog_summary">Se desactivas este recordatorio, Aegis non che dirá se hai cambios sen gardar ou non nas copias de seguridade, polo que estarás no risco de perder o acceso aos teus tokens. Tes a certeza de que queres desactivar o recordatorio?</string>
-    <string name="pref_backups_location_title">Directorio para os ficheiros das copias de seguridade</string>
+    <string name="pref_backups_versioning_strategy_title">Estratexia da copia de seguridade</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Manter certo número de versións</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Copia de seguridade única</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">A estratexia escollida non é fiable nin recomendable. Un único fallo ao facer a copia de seguridade pode levar a que quedes sen a única copia que tiveras.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Escolle unha estratexia para a copia de seguridade</string>
+    <string name="pref_backups_location_title">Localización da copia de seguridade</string>
     <string name="pref_backups_location_summary">As copias de seguridade gardaranse en</string>
+    <string name="pref_backup_location_summary">A copia de seguridade gardarase en</string>
     <string name="pref_backups_trigger_title">Executar copia de seguridade</string>
     <string name="pref_backups_trigger_summary">Lanza manualmente unha copia de seguridade</string>
     <string name="pref_backups_versions_title">Número de versións a manter</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Manter %1$d versión da copia de seguridade</item>
         <item quantity="other">Manter %1$d versións da copia de seguridade</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Manter un número ilimitado de versións da copia de seguridade</string>
     <string name="pref_import_app_title">Importar desde unha aplicación</string>
     <string name="pref_import_app_summary">Importar tokens desde unha aplicación (require acceso root)</string>
     <string name="pref_export_title">Exportar</string>
@@ -94,8 +116,34 @@
     <string name="pref_encryption_summary">Cifra o almacén e permite desbloquealo mediante un contrasinal ou por biometría</string>
     <string name="pref_biometrics_title">Desbloqueo biométrico</string>
     <string name="pref_biometrics_summary">Permite a autenticación mediante biometría para desbloquear o almacén</string>
+    <string name="pref_search_behavior_summary">Buscar en: %s</string>
+    <string name="pref_search_behavior_prompt">Buscar nos seguintes campos</string>
+    <string name="pref_search_behavior_type_name">Nome</string>
+    <string name="pref_search_behavior_type_issuer">Provedor</string>
+    <string name="pref_search_behavior_type_note">Nota</string>
+    <string name="pref_search_behavior_type_groups">Grupos</string>
     <string name="pref_set_password_title">Cambiar contrasinal</string>
     <string name="pref_set_password_summary">Establece un novo contrasinal co que desbloquear o teu almacén</string>
+    <string name="no_events_title">Non hai ningún evento rexistrado</string>
+    <string name="no_events_description">Non se rexistrou ningún evento importante na app</string>
+    <string name="event_title_vault_unlocked">Almacén desbloqueado</string>
+    <string name="event_description_vault_unlocked">O almacén desbloqueouse correctamente</string>
+    <string name="event_title_backup_created">Copia de seguridade creada</string>
+    <string name="event_description_backup_created">Creouse correctamente unha copia de seguridade do almacén</string>
+    <string name="event_title_android_backup_created">Creada copia de seguridade de Android</string>
+    <string name="event_description_android_backup_created">Android creou correctamente unha copia de seguridade do almacén</string>
+    <string name="event_title_vault_exported">Almacén exportado</string>
+    <string name="event_description_vault_exported">Exportouse unha copia do almacén</string>
+    <string name="event_title_entry_shared">Entrada compartida</string>
+    <string name="event_description_entry_shared">Compartiuse unha entrada</string>
+    <string name="event_title_vault_unlock_failed_password">Fallo de desbloqueo do almacén (contrasinal)</string>
+    <string name="event_description_vault_unlock_failed_password">Houbo un intento errado de desbloquear o almacén mediante contrasinal</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Fallo de desbloqueo do almacén (biometría)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Houbo un intento errado de desbloquear o almacén mediante datos biométricos</string>
+    <string name="event_unknown">Tipo de evento descoñecido</string>
+    <string name="audit_log_entry_deleted">(borrado)</string>
+    <string name="today_at_time">Hoxe ás %1$s</string>
+    <string name="day_of_week_at_time">%1$s ás %2$s</string>
     <string name="export_encrypted">Cifrar o almacén</string>
     <string name="export_help">Esta acción exportará o almacén fóra do almacenamento interno de Aegis. Escolle o formato no que o queiras exportar:</string>
     <string name="export_warning_unencrypted">Estás a piques de exportar unha copia non cifrada do teu almacén de Aegis. <b>Isto non está recomendado</b>.</string>
@@ -112,7 +160,7 @@
         <item quantity="other">%d grupos seleccionados</item>
     </plurals>
     <string name="export_no_groups_selected">Non se seleccionou ningún grupo para exportar</string>
-    <string name="export_html_title" context="The title of an HTML export document">Exportación de Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Exportación de Aegis Authenticator</string>
     <string name="choose_authentication_method">Seguridade</string>
     <string name="authentication_method_explanation">Aegis é unha aplicación 2FA centrada na seguridade. Os tokens gárdanse nun almacén, o cal se pode cifrar cun contrasinal da túa elección. Se un atacante obtén o ficheiro do teu almacén cifrado, non será capaz de acceder á información se non sabe o contrasinal.\n\nPreseleccionouse a opción que cremos que encaixa mellor co teu dispositivo.</string>
     <string name="authentication_method_none">Ningunha</string>
@@ -131,6 +179,9 @@
     <string name="set_password_confirm">Confirma o contrasinal</string>
     <string name="invalid_password">O contrasinal é incorrecto</string>
     <string name="invalidated_biometrics">Detectouse un cambio nos axustes de seguridade do teu dispositivo. Vai a \"Aegis -&gt; Axustes -&gt; Seguridade -&gt; Desbloqueo biométrico\" para desactivar e volver a activar o desbloqueo biométrico.</string>
+    <string name="password_reminder">Introduce o teu contrasinal. Preguntámosche de vez en cando por el para que non o esquezas.</string>
+    <string name="password_reminder_dialog_title">Desbloqueo biométrico predeterminado</string>
+    <string name="password_reminder_dialog_message">De vez en cando, pedímosche que introduzas o contrasinal para que non te esquezas del e así non te quedes sen acceso ao teu almacén. En canto introduzas o contrasinal unha vez, Aegis volverá a usar o desbloqueo biométrico de xeito predeterminado ata que sexa hora de outro recordatorio do contrasinal.</string>
     <string name="password_reminder_freq_never">Nunca</string>
     <string name="password_reminder_freq_weekly">Semanalmente</string>
     <string name="password_reminder_freq_biweekly">Cada dúas semanas</string>
@@ -145,6 +196,7 @@
     <string name="share">Compartir</string>
     <string name="yes">Si</string>
     <string name="no">Non</string>
+    <string name="undo">Desfacer</string>
     <string name="unlock">Desbloquear</string>
     <string name="advanced">Avanzado</string>
     <string name="counter">Contador</string>
@@ -156,6 +208,11 @@
     <string name="set_up_biometric">Configurar desbloqueo biométrico</string>
     <string name="copy">Copiar</string>
     <string name="edit">Editar</string>
+    <string name="select_all">Seleccionar todo</string>
+    <string name="assign_icons">Asignar iconas</string>
+    <string name="assign_groups">Asignar a un grupo</string>
+    <string name="assign_groups_dialog_summary">Escolle o grupo ao que queiras asignar os elementos seleccionados.</string>
+    <string name="assign_groups_dialog_dropdown">Escolle o grupo</string>
     <string name="favorite" comment="Verb">Marcar como favorito</string>
     <string name="unfavorite" comment="Verb">Desmarcar como favorito</string>
     <string name="error_all_caps">ERRO</string>
@@ -170,10 +227,12 @@
     <string name="snackbar_authentication_method">Tes que escoller un método de autenticación</string>
     <string name="encrypting_vault">Cifrando o almacén</string>
     <string name="exporting_vault">Exportando o almacén</string>
+    <string name="optimizing_icon">Optimizando a icona</string>
+    <string name="optimizing_icon_multiple">Optimizando iconas %1$d/%2$d</string>
     <string name="reading_file">Lendo ficheiro</string>
     <string name="requesting_root_access">Pedindo acceso root</string>
     <string name="analyzing_qr">Analizando código QR</string>
-    <string name="analyzing_qr_multiple">Analizando código QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analizando código QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Engadida %d nova entrada ao almacén</item>
         <item quantity="other">Engadidas %d novas entradas ao almacén</item>
@@ -190,6 +249,7 @@
     <string name="discard_changes">Desbotar cambios?</string>
     <string name="discard_changes_description">Os teus cambios non se gardaron</string>
     <string name="saving_profile_error">Erro ao gardar o perfil</string>
+    <string name="saving_assign_icons_error">Erro asignando iconas</string>
     <string name="welcome">Dámosche a benvida</string>
     <string name="app_description">Aegis é unha aplicación 2FA gratuíta, segura e de código aberto</string>
     <string name="setup_completed">Configuración completada</string>
@@ -198,6 +258,7 @@
     <string name="copied">Copiado</string>
     <string name="errors_copied">Copiáronse os erros no portapapeis</string>
     <string name="version_copied">Versión copiada no portapapeis</string>
+    <string name="error_required_field">Este campo é obrigatorio</string>
     <string name="error_occurred">Ocorreu un erro</string>
     <string name="decryption_error">Ocorreu un erro ao intentar desbloquear o almacén</string>
     <string name="decryption_corrupt_error">Ocorreu un erro ao intentar desbloquear o almacén. O ficheiro do almacén podería estar corrompido.</string>
@@ -232,7 +293,9 @@
     <string name="choose_totpauth_importer">Esta copia de seguridade de TOTP Authenticator está cifrada cun contrasinal?</string>
     <string name="choose_application">Escolle a aplicación desde a que queiras importar</string>
     <string name="choose_theme">Escolle o tema que prefires</string>
+    <string name="choose_account_name_position">Escolle a posición que prefires para o nome de conta</string>
     <string name="choose_view_mode">Escolle o modo de visualización que prefires</string>
+    <string name="choose_copy_behavior">Escolle o comportamento de copia que prefires</string>
     <string name="parsing_file_error">Ocorreu un erro ao intentar analizar o ficheiro</string>
     <string name="file_not_found">Erro: Ficheiro non atopado</string>
     <string name="reading_file_error">Ocorreu un erro ao intentar ler o ficheiro</string>
@@ -259,15 +322,20 @@
     <string name="partial_google_auth_import">Detectouse una exportación de Google Authenticator incompleta</string>
     <string name="partial_google_auth_import_warning">Faltan algúns códigos QR na importación. Os seguintes códigos non se atoparon:\n\n<b>%s</b>\n\nPodes continuar importando esta exportación parcial, pero o recomendable é volvelo a intentar con tódolos códigos QR para que non te arrisques a perder o acceso a ningún token.</string>
     <string name="missing_qr_code_descriptor">• código QR %d</string>
-    <string name="import_partial_export_anyway">Importar %d tokens de todas formas</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importar %d token de tódolos xeitos</item>
+        <item quantity="other">Importar %d tokens de tódolos xeitos</item>
+    </plurals>
     <string name="import_google_auth_failure">Fallou a importación do exportado con Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">A exportación contén información sobre un lote non relacionado. Intenta importar 1 lote de cada vez.</string>
     <string name="no_tokens_can_be_imported">Polo tanto, non se pode importar ningún token</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Desbloqueando o almacén</string>
-    <string name="slot_this_device">(este dispositivo)</string>
+    <string name="rename_group">Renomear o grupo</string>
+    <string name="no_group_selection">Os elementos que non sexan parte de ningún grupo poderanse atopar dentro de \"Sen grupo\".</string>
     <string name="remove_group">Quitar grupo</string>
     <string name="remove_group_description">Tes a certeza de que queres quitar este grupo? As entradas deste grupo pasarán automaticamente a \"Sen grupo\".</string>
+    <string name="remove_unused_groups">Borrar grupos sen usar</string>
+    <string name="remove_unused_groups_description">Tes a certeza de que queres eliminar tódolos grupos que non estean asignados a algunha entrada?</string>
     <string name="remove_icon_pack">Quitar paquete de iconas</string>
     <string name="remove_icon_pack_description">Tes a certeza de que queres quitar este paquete de iconas? As entradas que usen iconas desde paquete non se verán afectadas.</string>
     <string name="details">Detalles</string>
@@ -275,13 +343,16 @@
     <string name="lock">Bloquear</string>
     <string name="name">Nome</string>
     <string name="no_group">Sen grupo</string>
-    <string name="sort">Ordenar</string>
-    <string name="sort_alphabetically">Emisor (A a Z)</string>
-    <string name="sort_alphabetically_reverse">Emisor (Z a A)</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ordenar</string>
+    <string name="sort_alphabetically">Provedor (A a Z)</string>
+    <string name="sort_alphabetically_reverse">Provedor (Z a A)</string>
     <string name="sort_alphabetically_name">Conta (A a Z)</string>
     <string name="sort_alphabetically_name_reverse">Conta (Z a A)</string>
     <string name="sort_usage_count">Contador de usos</string>
+    <string name="sort_last_used">Último uso</string>
     <string name="sort_custom">Personalizado</string>
+    <string name="last_used">Último uso</string>
+    <string name="last_used_never">nunca</string>
     <string name="new_group">Novo grupo…</string>
     <string name="group">Grupo</string>
     <string name="group_name_hint">Nome do grupo</string>
@@ -290,12 +361,16 @@
     <string name="preference_reset_usage_count">Reiniciar contador de usos</string>
     <string name="preference_reset_usage_count_summary">Reinicia o contador de usos de cada entrada do almacén</string>
     <string name="preference_reset_usage_count_dialog">Tes a certeza de que queres poñer o contador de usos de tódalas entradas do teu almacén a cero?</string>
-    <string name="note">Nota</string>
+    <string name="note" comment="Users can add a note to an entry">Nota</string>
     <string name="clear">Restablecer</string>
     <string name="pref_highlight_entry_title">Resaltar tokens ao premelos</string>
     <string name="pref_highlight_entry_summary">Resalta temporalmente os tokens cando se preman para podelos distinguir máis facilmente</string>
+    <string name="pref_groups_multiselect_title">Selección múltiple de grupos</string>
+    <string name="pref_groups_multiselect_summary">Permite ter seleccionados varios grupos ao mesmo tempo</string>
     <string name="pref_minimize_on_copy_title">Minimizar ao copiar</string>
     <string name="pref_minimize_on_copy_summary">Minimiza a aplicación despois de copiar un token</string>
+    <string name="pref_copy_behavior_title">Copiar códigos no portapapeis</string>
+    <string name="pref_search_behavior_title">Comportamento da busca</string>
     <string name="pref_pause_entry_title">Conxelar tokens ao premelos</string>
     <string name="pref_pause_entry_summary">Pausa a actualización automática dos tokens ao premer neles. Os tokens non se actualizarán mentres teñan o foco. Require \"Resaltar tokens ao premelos\" ou \"Tocar para mostrar\".</string>
     <string name="pin_keyboard_description">Introduce o teu contrasinal para activar o teclado do PIN. Ten en conta que isto só funciona se o teu contrasinal consiste só de números</string>
@@ -311,16 +386,17 @@
     <string name="normal_viewmode_title">Normal</string>
     <string name="compact_mode_title">Compacto</string>
     <string name="small_mode_title">Pequeno</string>
-    <string name="unknown_issuer">Emisor descoñecido</string>
+    <string name="tiles_mode_title">Mosaico</string>
+    <string name="unknown_issuer">Provedor descoñecido</string>
     <string name="unknown_account_name">Nome de conta descoñecido</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis non puido importar %d token. Este token omitirase. Preme en \"detalles\" para ver máis información sobre os erros.</item>
+        <item quantity="one">Aegis non puido importar %d token. Este token omitirase. Preme en \"detalles\" para ver máis información sobre o erro.</item>
         <item quantity="other">Aegis non puido importar %d tokens. Estes tokens omitiranse. Preme en \"detalles\" para ver máis información sobre os erros.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Non se puido procesar o enlace profundo</string>
     <string name="unable_to_read_qrcode_file">Non se puido ler e procesar o código QR do ficheiro: %s.</string>
     <string name="unable_to_process_shared_text">Non se puido procesar o texto compartido como OTP</string>
-    <string name="unable_to_read_qrcode_files">Non se puideron ler e procesar algúns dos códigos QR. Só se importarán %d/%d entradas.</string>
+    <string name="unable_to_read_qrcode_files">Non se puideron ler e procesar algúns dos códigos QR. Só se importarán %1$d/%2$d elementos.</string>
     <string name="unable_to_generate_qrcode">Non se puido xerar o código QR</string>
     <string name="select_picture">Seleccionar imaxe</string>
     <string name="select_icon">Seleccionar icona</string>
@@ -352,12 +428,14 @@
     <string name="time_sync_warning_disable">Non me avises máis. Sei o que fago.</string>
     <string name="google_qr_export_unrelated">Atopouse un código QR non relacionado. Proba a reiniciar o escáner.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d código QR escaneado</item>
-        <item quantity="other">%d/%d códigos QR escaneados</item>
+        <item quantity="one">%1$d/%2$d código QR escaneado</item>
+        <item quantity="other">%1$d/%2$d códigos QR escaneados</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Esperábase o código QR nº %d, pero escaneouse o nº %d</string>
+    <string name="google_qr_export_unexpected">Esperábase o código QR nº %1$d, pero escaneouse o nº %2$d</string>
     <string name="backup_error_bar_message"><b>A copia de seguridade do almacén fallou recentemente</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Un intento de facer unha copia de seguridade do almacén usando %s fallou debido a algún erro. A copia de seguridade intentouse %s. Comproba os axustes da copia de seguridade para asegurarte de que poidan completar correctamente.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Un intento de facer unha copia de seguridade do almacén usando %1$s fallou debido a algún erro. A copia de seguridade intentouse %2$s. Comproba os axustes da copia de seguridade para asegurarte de que poidan completar correctamente.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Un recente intento de copia de seguridade utilizando %1$s fallou porque Aegis non tiña permiso de escritura no destino da copia de seguridade. A copia de seguridade intentouse %2$s. Este erro pode ocorrer se moviches ou renomeaches o destino ou se fai pouco que recuperaches Aegis desde unha copia de seguridade. Volve a configurar o destino da copia de seguridade.
     </string>
     <string name="backup_system_builtin">Copias de seguridade automáticas de Aegis</string>
     <string name="backup_system_android">Copias de seguridade na nube de Android</string>
@@ -391,14 +469,15 @@
     <string name="copy_uri">Copiar URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Non se puido copiar a URI no portapapeis</string>
     <string name="uri_copied_to_clipboard">URI copiada no portapapeis</string>
-    <string name="transfer_entry">Transferir entrada</string>
     <string name="transfer_entry_description">Escanea este código QR coa aplicación de autenticación á que queiras transferirlle esta entrada</string>
+    <string name="transfer_entry_brightness">Preme no código QR para poñer ou quitar o brillo da pantalla ao máximo</string>
     <string name="google_auth_compatible_transfer_description">Escanea estes códigos QR con Aegis ou con Google Authenticator.\n\nDebido ás limitacións de Google Authenticator, só se inclúen os tokens TOTP e HOTP que usen SHA1 e produzan códigos de 6 cifras</string>
     <string name="password_strength_very_weak">Moi feble</string>
     <string name="password_strength_weak">Feble</string>
     <string name="password_strength_fair">Aceptable</string>
     <string name="password_strength_good">Boa</string>
     <string name="password_strength_strong">Forte</string>
+    <string name="password_strength_unknown">O contrasinal é demasiado longo para a análise de robustez</string>
     <string name="pref_pin_keyboard_title">Usar teclado PIN na pantalla de bloqueo</string>
     <string name="pref_pin_keyboard_summary">Activa isto se queres habilitar o teclado do PIN na pantalla de bloqueo. Isto só funciona para os contrasinais numéricos</string>
     <string name="title_activity_preferences">Axustes</string>
@@ -407,32 +486,43 @@
     <string name="title_activity_about">Información</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escanear un código QR</string>
-    <string name="title_activity_manage_slots">Xestionar espazos de claves</string>
     <string name="title_activity_import_entries">Importar entradas</string>
+    <string name="title_activity_assign_icons">Asignar iconas</string>
+    <string name="title_activity_licenses">Licenzas de terceiros</string>
     <string name="dialog_wipe_entries_title">Limpar entradas</string>
     <string name="dialog_wipe_entries_message">O teu almacén xa contén entradas. Queres eliminalas antes de importar o ficheiro?\n\n<b>Se o fas, perderás o acceso ás entradas existentes no almacén para sempre.</b></string>
     <string name="dialog_wipe_entries_checkbox">Limpar o contido do almacén</string>
     <string name="panic_trigger_ignore_toast">Aegis recibiu unha alarma de pánico pero ignorarase porque o axuste está desactivado</string>
     <string name="pref_panic_trigger_title">Eliminar o almacén cunha alarma de pánico</string>
     <string name="pref_panic_trigger_summary">Elimina o almacén cando se reciba unha alarma de pánico desde Ripple</string>
-    <string name="import_vault">Importar almacén</string>
+    <string name="import_vault">Importar almacén de Aegis</string>
+    <string name="import_vault_hint">Queres importar desde una aplicación 2FA distinta? Primeiro completa a configuración e despois vai ao menú de axustes.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Desmarcouse %d posible duplicado. Revisa a lista de entradas.</item>
+        <item quantity="other">Desmarcáronse %d posibles duplicados. Revisa a lista de entradas.</item>
+    </plurals>
     <string name="importer_help_2fas">Proporciona un ficheiro de copia de seguridade de 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Proporciona un ficheiro de copia de seguridade ou de exportación de Aegis.</string>
     <string name="importer_help_authenticator_plus">Proporciona un ficheiro de exportación de Authenticator Plus obtido mediante <b>Axustes -&gt; Copia de seguridade e restauración -&gt; Exportar como texto e HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Proporciona un ficheiro de exportación de Authenticator Pro, obtido desde <b>Axustes -&gt; Copia de seguridade -&gt; Facer copia de seguridade nun ficheiro cifrado (recomendado)</b>.</string>
     <string name="importer_help_authy">Proporciona unha copia de <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, localizado no directorio do almacenamento interno de Authy.</string>
     <string name="importer_help_andotp">Proporciona un ficheiro de copia de seguridade ou de exportación de andOTP.</string>
     <string name="importer_help_bitwarden">Proporciona un ficheiro de copia de seguridade ou de exportación de Bitwarden. Non se admiten os ficheiros cifrados.</string>
-    <string name="importer_help_battle_net_authenticator">Proporciona unha copia de <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, localizado no directorio do almacenamento interno de Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Proporciona unha copia de <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, localizado no directorio do almacenamento interno de Battle.net Authenticator.</string>
     <string name="importer_help_duo">Proporciona unha copia de <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, localizado no directorio do almacenamento interno de DUO.</string>
-    <string name="importer_help_freeotp">Proporciona unha copia de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, localizado no directorio do almacenamento interno de FreeOTP.</string>
+    <string name="importer_help_ente_auth">Proporciona un ficheiro de exportación de Ente Auth. Polo momento só se admiten ficheiros sen cifrar.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Proporciona unha copia de seguridade.\nFreeOTP 1.x: Proporciona unha copia de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, localizado no directorio do almacenamento interno de FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Proporciona un ficheiro de exportación de FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilidade con FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Hai varios problemas en FreeOTP 2 que poden provocar copias de seguridade corrompidas. Aegis intentará recuperar o máximo número de elementos posible, pero pode que haxa algúns, ou incluso todos, que non se poidan importar.</string>
     <string name="importer_help_google_authenticator"><b>Só se admiten ficheiros de base de datos de Google Authenticator v5.10 e anteriores</b>.\n\nProporciona unha copia de <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, localizado no directorio do almacenamento interno de Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Proporciona unha copia de <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, localizado no directorio do almacenamento interno de Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Proporciona un ficheiro de texto plano cunha URI de Google Authenticator en cada liña.</string>
     <string name="importer_help_steam"><b>Steam v3.0 e versións superiores non son compatibles</b>. Proporciona unha copia de <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, localizado no directorio do almacenamento interno de Steam.</string>
+    <string name="importer_help_stratum">Proporciona un ficheiro de exportación de Stratum, obtido desde <b>Axustes -&gt; Copia de seguridade -&gt; Facer copia de seguridade nun ficheiro cifrado (recomendado)</b>.</string>
     <string name="importer_help_totp_authenticator">Proporciona un ficheiro de exportación de TOTP Authenticator.</string>
     <string name="importer_help_winauth">Proporciona un ficheiro de exportación de WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Asignar iconas</string>
+    <string name="import_assign_icons_dialog_text">Queres asignar iconas ás entradas importadas?</string>
     <string name="importer_encrypted_exception_google_authenticator">Omitiuse unha entrada cifrada: %s</string>
     <string name="importer_help_direct">Importa entradas directamente desde %s. Isto require que a app estea instalada neste dispositivo e que se lle conceda acceso root a Aegis.</string>
     <string name="groups">Grupos</string>
@@ -443,23 +533,29 @@
     <string name="pref_grouping_size_two">Grupos de 2</string>
     <string name="pref_grouping_size_three">Grupos de 3</string>
     <string name="pref_grouping_size_four">Grupos de 4</string>
-    <plurals name="time_elapsed_seconds">
+    <string name="pref_copy_behavior_never">Nunca</string>
+    <string name="pref_copy_behavior_single_tap">Un toque</string>
+    <string name="pref_copy_behavior_double_tap">Dobre toque</string>
+    <string name="pref_account_name_position_hidden">Oculto</string>
+    <string name="pref_account_name_position_end">Ao lado do provedor</string>
+    <string name="pref_account_name_position_below">Debaixo do provedor</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">fai %d segundo</item>
         <item quantity="other">fai %d segundos</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">fai %d minuto</item>
         <item quantity="other">fai %d minutos</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">fai %d hora</item>
         <item quantity="other">fai %d horas</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">fai %d día</item>
         <item quantity="other">fai %d días</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">fai %d ano</item>
         <item quantity="other">fai %d anos</item>
     </plurals>
diff --git a/app/src/main/res/values-hi-rIN-v29/strings.xml b/app/src/main/res/values-hi-rIN-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-hi-rIN-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 47339d45..392d3dde 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">सेटिंग</string>
     <string name="action_about">हमारे बारे में</string>
     <string name="action_delete">हटाएँ</string>
@@ -50,7 +50,6 @@
     <string name="pref_backups_reminder_summary">यदि आपने अपने नवीनतम परिवर्तनों का बैकअप नहीं लिया है तो अपनी वॉल्ट का बैकअप लेने के लिए एक रिमाइंडर दिखाएँ।</string>
     <string name="pref_backups_reminder_dialog_title">बैकअप रिमाइंडर बंद करें</string>
     <string name="pref_backups_reminder_dialog_summary">इस रिमाइंडर को बंद करने का मतलब है कि एजिस आपको यह नहीं बताएगा कि आपके पास ऐसे परिवर्तन हैं या नहीं जिनका अभी तक बैकअप नहीं लिया गया है। इससे आपको अपने टोकन तक पहुंच खोने का खतरा रहता है। क्या आप वाकई रिमाइंडर बंद करना चाहते हैं?</string>
-    <string name="pref_backups_location_title">बैकअप फाइल्स के लिए स्थान</string>
     <string name="pref_backups_location_summary">बैकअप को इसमें सहेजा जाएगा</string>
     <string name="pref_backups_trigger_title">ट्रिगर बैकअप</string>
     <string name="pref_backups_trigger_summary">हाथ से बैकअप ट्रिगर करें</string>
@@ -112,7 +111,7 @@
         <item quantity="other">%d समूह चयनित</item>
     </plurals>
     <string name="export_no_groups_selected">एक्सपोर्ट करने के लिए किसी भी ग्रुप का चयन नही किया गया</string>
-    <string name="export_html_title" context="The title of an HTML export document">एजिस ऑथेंटिकेटर एक्सपोर्ट</string>
+    <string name="export_html_title" comment="The title of an HTML export document">एजिस ऑथेंटिकेटर एक्सपोर्ट</string>
     <string name="choose_authentication_method">सुरक्षा</string>
     <string name="authentication_method_explanation">Aegis एक सुरक्षा-केंद्रित 2FA ऐप है। टोकनों को एक वॉल्ट में संग्रहीत किया जाता है, जिसे वैकल्पिक रूप से आपके चुने पासवर्ड के साथ एन्क्रिप्ट किया जा सकता है। यदि कोई हमलावर आपकी एन्क्रिप्टेड वॉल्ट फ़ाइल प्राप्त करता है, तो वे पासवर्ड को जाने बिना सामग्री तक नहीं पहुँच पाएंगे। \n\nहमने उन विकल्पों पहले से सेट कर रखा है जो हमें लगता है कि आपके डिवाइस के लिए सबसे उपयुक्त होगा।</string>
     <string name="authentication_method_none">कोई नहीं</string>
@@ -173,7 +172,6 @@
     <string name="reading_file">फ़ाइल डेटा पढ़ना</string>
     <string name="requesting_root_access">रूट एक्सेस रिक्वेस्ट कर रहा</string>
     <string name="analyzing_qr">क्यूआर कोड एनालाइज कर रहा है</string>
-    <string name="analyzing_qr_multiple">एनालाइजिंग क्यूआर कोड %d/%d (%s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">वॉल्ट में %d नयी एंट्री जोड़ी गई</item>
         <item quantity="other">वॉल्ट में %d नयी एंट्रीज जोड़ी गईं </item>
@@ -259,13 +257,10 @@
     <string name="partial_google_auth_import">अपूर्ण गूगल ऑथेंटिकेटर एक्सपोर्ट का पता चला</string>
     <string name="partial_google_auth_import_warning">आपके इंपोर्ट से कुछ क्यूआर कोड गायब हैं। निम्नलिखित कोड नहीं मिले:\n\n<b>%s</b>\n\nआप इस आंशिक एक्सपोर्ट को इंपोर्ट करना जारी रख सकते हैं लेकिन हम सभी क्यूआर कोड के साथ पुनः प्रयास करने की सलाह देते हैं ताकि आप किसी भी टोकन तक पहुंच खोने का जोखिम न उठाएं|</string>
     <string name="missing_qr_code_descriptor">• क्यूआर कोड %d </string>
-    <string name="import_partial_export_anyway">फिर भी %d टोकंस इंपोर्ट करें</string>
     <string name="import_google_auth_failure">गूगल ऑथेंटिकेटर एक्सपोर्ट को इंपोर्ट करना असफल हुआ</string>
     <string name="unrelated_google_auth_batches_error">एक्सपोर्ट में किसी असंबंधित बैच की जानकारी शामिल है. एक समय में 1 बैच इंपोर्ट करने का प्रयास करें।</string>
     <string name="no_tokens_can_be_imported">परिणामस्वरूप कोई टोकन आयात नहीं किया जा सकता</string>
-    <string name="authentication_method_raw">रॉ</string>
     <string name="unlocking_vault">वॉल्ट अनलॉक हो रहा है</string>
-    <string name="slot_this_device">(यह डिवाइस)</string>
     <string name="remove_group">समूह हटाये</string>
     <string name="remove_group_description">क्या आप वाकई इस समूह को हटाना चाहते हैं? इस समूह में प्रविष्टियाँ स्वतः ही \'नो ग्रुप\' में बदल जाएँगी।</string>
     <string name="remove_icon_pack">आइकन पैक हटाएं</string>
@@ -275,7 +270,7 @@
     <string name="lock">लॉक करें</string>
     <string name="name">नाम</string>
     <string name="no_group">कोई समूह नहीं</string>
-    <string name="sort">क्रमबद्ध</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">क्रमबद्ध</string>
     <string name="sort_alphabetically">जारीकर्ता (A से Z)</string>
     <string name="sort_alphabetically_reverse">जारीकर्ता (Z से A)</string>
     <string name="sort_alphabetically_name">खाता (A से Z)</string>
@@ -290,7 +285,7 @@
     <string name="preference_reset_usage_count">उपयोग गणना रीसेट करें</string>
     <string name="preference_reset_usage_count_summary">अपनी तिजोरी में प्रत्येक प्रविष्टि की उपयोग संख्या को रीसेट करें</string>
     <string name="preference_reset_usage_count_dialog">क्या आप वाकई अपनी तिजोरी में प्रत्येक प्रविष्टि की उपयोग संख्या को 0 पर सेट करना चाहते हैं?</string>
-    <string name="note">नोट</string>
+    <string name="note" comment="Users can add a note to an entry">नोट</string>
     <string name="clear">खाली करें</string>
     <string name="pref_highlight_entry_title">टैप करने पर टोकन हाइलाइट करें</string>
     <string name="pref_highlight_entry_summary">टैप करने पर टोकनों को एक दूसरे से अलग उजागर करने के लिए उन्हें अस्थायी रूप से हाईलाइट करें</string>
@@ -313,14 +308,9 @@
     <string name="small_mode_title">छोटा</string>
     <string name="unknown_issuer">अज्ञात जारीकर्ता</string>
     <string name="unknown_account_name">अज्ञात खाता नाम</string>
-    <plurals name="import_error_dialog">
-        <item quantity="one">Aegis %d टोकन आयात नहीं कर सका। इन टोकन को छोड़ दिया जाएगा। त्रुटियों के बारे में अधिक जानकारी देखने के लिए \'विवरण\' दबाएँ।</item>
-        <item quantity="other">Aegis %d टोकनों को आयात नहीं कर सका। इन टोकनों को छोड़ दिया जाएगा। त्रुटियों के बारे में अधिक जानकारी देखने के लिए \'विवरण\' दबाएँ।</item>
-    </plurals>
     <string name="unable_to_process_deeplink">डीप लिंक प्रक्रिया करने में असमर्थ</string>
     <string name="unable_to_read_qrcode_file">क्यूआर कोड को फाइल:%s से पढ़ने और प्रोसेस करने में असमर्थ.</string>
     <string name="unable_to_process_shared_text">शेयर्ड टेक्स्ट को ओटीपी के रूप में प्रोसेस करने में असफल</string>
-    <string name="unable_to_read_qrcode_files">कुछ क्यूआर कोड को पढ़ने और प्रोसेस करने में असमर्थ। केवल %d/%d प्रविष्टियाँ इंपोर्ट की जाएंगी।</string>
     <string name="unable_to_generate_qrcode">क्यूआर कोड उत्पन्न करने में असमर्थ</string>
     <string name="select_picture">छवि चयन करें</string>
     <string name="select_icon">आइकन चयन करें</string>
@@ -351,13 +341,7 @@
     <string name="time_sync_warning_message">Aegis सही कोड उत्पन्न करने के लिए सिस्टम समय पर निर्भर करता है। केवल कुछ सेकंड के विचलन से गलत कोड हो सकते हैं। ऐसा लगता है कि आपका डिवाइस समय को स्वचालित रूप से सिंक्रनाइज़ करने के लिए कॉन्फ़िगर नहीं किया गया है। क्या आप अब ऐसा करना चाहेंगे?</string>
     <string name="time_sync_warning_disable">मुझे चेतावनी देना बंद करें। मैं जानता हूँ मैं क्या कर रहा हूँ</string>
     <string name="google_qr_export_unrelated">असंबंधित क्यूआर कोड मिला। स्कैनर को पुनरारंभ करने का प्रयास करें।</string>
-    <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d क्यूआर कोड स्कैन किए गए</item>
-        <item quantity="other">%d/%d क्यूआर कोड स्कैन किए गए</item>
-    </plurals>
-    <string name="google_qr_export_unexpected">अपेक्षित क्यूआर कोड #%d, लेकिन इसके बजाय #%d को स्कैन किया गया</string>
     <string name="backup_error_bar_message"><b>हाल ही में वॉल्ट बैकअप विफल रहा</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        %s का उपयोग करके हाल ही में वॉल्ट बैकअप का प्रयास विफल हो गया क्योंकि कोई त्रुटि उत्पन्न हुई। बैकअप का प्रयास %s किया गया था. यह सुनिश्चित करने के लिए कि बैकअप सफलतापूर्वक पूरा हो सकता है, कृपया अपनी बैकअप सेटिंग्स जांचें।</string>
     <string name="backup_system_builtin">एजिस के बिल्ट-इन स्वचालित बैकअप्स </string>
     <string name="backup_system_android">एंड्रॉयड क्लाउड बैकअप सिस्टम </string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        लेटेस्ट बैकअप आउटडेटेड है (%s)
@@ -389,7 +373,6 @@
     <string name="copy_uri">URI को कॉपी करें</string>
     <string name="unable_to_copy_uri_to_clipboard">क्लिपबोर्ड पर कॉपी करने में असमर्थ</string>
     <string name="uri_copied_to_clipboard">क्लिपबोर्ड में कॉपी हो गया</string>
-    <string name="transfer_entry">प्रविष्टि स्थानांतरित करें</string>
     <string name="transfer_entry_description">इस क्यूआर कोड को उस ऑथेंटिकेटर ऐप के साथ स्कैन करें जिसमें आप इस प्रविष्टि को स्थानांतरित करना चाहते हैं</string>
     <string name="google_auth_compatible_transfer_description">इन क्यूआर कोड को एजिस या गूगल ऑथेंटिकेटर से स्कैन करें।\n\n गूगल ऑथेंटिकेटर ऐप की सीमाओं के कारण, केवल TOTP &amp; HOTP टोकन जो SHA1 का उपयोग करते हैं और 6-अंकीय कोड उत्पन्न करते हैं, शामिल हैं</string>
     <string name="password_strength_very_weak">बहुत कमज़ोर</string>
@@ -405,7 +388,6 @@
     <string name="title_activity_about">ऐप के बारे में</string>
     <string name="title_activity_edit_entry">प्रविष्टि संपादित करें</string>
     <string name="title_activity_scan_qr">क्यूआर कोड स्कैन करें</string>
-    <string name="title_activity_manage_slots">कुंजी स्लॉट प्रबंधन करें</string>
     <string name="title_activity_import_entries">प्रविष्टियाँ आयात करें</string>
     <string name="dialog_wipe_entries_title">प्रविष्टियों को साफ करें</string>
     <string name="dialog_wipe_entries_message">आपके वॉल्ट में पहले से ही प्रविष्टियाँ हैं। क्या आप इस फ़ाइल को आयात करने से पहले इन प्रविष्टियों को निकालना चाहते हैं?\n\n<b> ऐसा करने पर, आप स्थायी रूप से वॉल्ट में मौजूदा प्रविष्टियों तक पहुंच खो देंगे। </b></string>
@@ -413,18 +395,14 @@
     <string name="panic_trigger_ignore_toast">एजिस को पैनिक ट्रिगर मिला लेकिन सेटिंग अक्षम है, अनदेखा कर रहा है</string>
     <string name="pref_panic_trigger_title">पैनिक ट्रिगर पर तिजोरी हटाएं</string>
     <string name="pref_panic_trigger_summary">रिपल से पैनिक ट्रिगर मिलने पर वॉल्ट को डिलीट करें</string>
-    <string name="import_vault">वॉल्ट इंपोर्ट</string>
     <string name="importer_help_2fas">2FAS प्रमाणक बैकअप फ़ाइल प्रदान करें।</string>
     <string name="importer_help_aegis">एजिस निर्यात/बैकअप फ़ाइल की आपूर्ति करें।</string>
     <string name="importer_help_authenticator_plus">एक प्रमाणक प्लस निर्यात फ़ाइल की आपूर्ति करें
 <b>सेटिंग्स -&gt; बैकअप &amp; पुनर्स्थापना -&gt; पाठ और HTML के रूप में निर्यात करें</b>।</string>
-    <string name="importer_help_authenticator_pro"><b>सेटिंग्स -&gt; बैक अप -&gt; के माध्यम से प्राप्त ऑथेंटिकेटर प्रो एक्सपोर्ट फ़ाइल की आपूर्ति करें।  एन्क्रिप्टेड फ़ाइल का बैकअप लें (अनुशंसित)</b>।</string>
     <string name="importer_help_authy">Authy की आंतरिक संग्रहण निर्देशिका में स्थित <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> की एक प्रति प्रदान करें।</string>
     <string name="importer_help_andotp">एक andOTP निर्यात/बैकअप फ़ाइल की आपूर्ति करें।</string>
     <string name="importer_help_bitwarden">एक बिटवर्डन निर्यात/बैकअप फ़ाइल की आपूर्ति करें। एन्क्रिप्टेड फ़ाइलें समर्थित नहीं हैं।</string>
-    <string name="importer_help_battle_net_authenticator">इंटरनल स्टोरेज की Battle.net ऑथेंटिकेटर डायरेक्ट्री में स्थित <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b> की एक प्रति प्रदान करें।</string>
     <string name="importer_help_duo">DUO की आंतरिक संग्रहण निर्देशिका में स्थित <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> की एक प्रति प्रदान करें।</string>
-    <string name="importer_help_freeotp">फ्रीओटीपी की आंतरिक संग्रहण निर्देशिका में स्थित <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> की एक प्रति प्रदान करें।</string>
     <string name="importer_help_freeotp_plus">एक फ्रीओटीपी+ निर्यात फ़ाइल की आपूर्ति करें।</string>
     <string name="importer_help_google_authenticator"><b>केवल गूगल प्रमाणक v5.10 और पूर्व की डेटाबेस फ़ाइलें समर्थित हैं</b>।\n\n<b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> की एक प्रति प्रदान करें, गूगल प्रमाणक की आंतरिक संग्रहण निर्देशिका में स्थित है।</string>
     <string name="importer_help_microsoft_authenticator">माइक्रोसॉफ्ट प्रमाणक। की आंतरिक संग्रहण निर्देशिका में स्थित <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> की एक प्रति प्रदान करें।</string>
@@ -442,23 +420,23 @@
     <string name="pref_grouping_size_two">२ का समूह</string>
     <string name="pref_grouping_size_three">३ का समूह</string>
     <string name="pref_grouping_size_four">४ का समूह</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d सेकंड पहले</item>
         <item quantity="other">%d सेकंड्स पहले</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d मिनट पहले</item>
         <item quantity="other">%d मिनट्स पहले</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d घंटा पहले</item>
         <item quantity="other">%d घंटे पहले</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d दिन पहले</item>
         <item quantity="other">%d दिनों पहले</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d वर्ष पहले</item>
         <item quantity="other">%d वर्षों पहले</item>
     </plurals>
diff --git a/app/src/main/res/values-hu-rHU-v29/strings.xml b/app/src/main/res/values-hu-rHU-v29/strings.xml
new file mode 100644
index 00000000..603e7769
--- /dev/null
+++ b/app/src/main/res/values-hu-rHU-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Rendszer alapértelmezése</string>
+    <string name="system_amoled_theme_title">Rendszer alapértelmezése (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 2912a005..9fa05316 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -1,101 +1,153 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Beállítások</string>
     <string name="action_about">Névjegy</string>
     <string name="action_delete">Törlés</string>
     <string name="action_transfer">Átvitel</string>
     <string name="action_edit_icon">Ikon szerkesztése</string>
-    <string name="action_reset_usage_count">Használati adatok visszaállítása</string>
-    <string name="action_reset_usage_count_dialog">Biztos abban, hogy vissza akarja állítani a használati adatokat nullára?</string>
+    <string name="action_reset_usage_count">Használati számláló visszaállítása</string>
+    <string name="action_reset_usage_count_dialog">Biztos, hogy visszaállítja a bejegyzés használati számlálóját nullára?</string>
     <string name="action_default_icon">Alapértelmezett ikon visszaállítása</string>
     <string name="discard">Elvetés</string>
     <string name="save">Mentés</string>
+    <string name="all">Összes</string>
     <string name="issuer">Kibocsátó</string>
-    <string name="yandex_pin">PIN (4-16 szám)</string>
+    <string name="yandex_pin">PIN (4–16 számjegy)</string>
     <string name="motp_pin">PIN (4 számjegy)</string>
-    <string name="suggested">Javaslatok</string>
-    <string name="usage_count">Felhasználási szám</string>
+    <string name="suggested">Javasolt</string>
+    <string name="usage_count">Használati számláló</string>
     <string name="warning">Figyelmeztetés</string>
-    <string name="pref_cat_appearance_app">App</string>
+    <string name="pref_cat_appearance_app">Alkalmazás</string>
     <string name="pref_cat_appearance_entries">Bejegyzések</string>
     <string name="pref_cat_backups_android">Android</string>
     <string name="pref_cat_backups_auto">Automatikus biztonsági mentés</string>
     <string name="pref_section_behavior_title">Működés</string>
-    <string name="pref_section_behavior_summary">Működés testreszabása a belépő lista beállításainál.</string>
+    <string name="pref_section_behavior_summary">Működés testreszabása a bejegyzéslista használatakor.</string>
     <string name="pref_section_appearance_title">Megjelenés</string>
-    <string name="pref_section_appearance_summary">Téma beállítása, nyelv és beállítások amelyek befolyásolják az app kinézetét.</string>
+    <string name="pref_section_appearance_summary">Téma, nyelv és egyéb beállítások módosítása, amelyek befolyásolják az alkalmazás kinézetét.</string>
     <string name="pref_section_security_title">Biztonság</string>
-    <string name="pref_section_security_summary">Titkosítás konfigurálása, biometrikus feloldás, automatikus zárolás és más biztonsági beállítás.</string>
-    <string name="pref_section_import_export_title">Importálás &amp; Exportálás</string>
-    <string name="pref_section_import_export_summary">Aegis vagy más app mentéseinek importálása. Az széf kézi export készítése.</string>
+    <string name="pref_section_security_summary">Titkosítás, biometrikus feloldás, automatikus zárolás és más biztonsági beállítások megadása.</string>
+    <string name="pref_section_import_export_title">Importálás és exportálás</string>
+    <string name="pref_section_import_export_summary">Az Aegis vagy más hitelesítő alkalmazás mentésének importálása. Kézi exportálások készítése az Aegis-széfjéről.</string>
+    <string name="pref_section_audit_log_title">Auditnapló</string>
+    <string name="pref_section_audit_log_summary">Az alkalmazáson belül történt összes bejelentett fontos esemény listája.</string>
     <string name="pref_section_backups_title">Biztonsági mentések</string>
-    <string name="pref_section_backups_summary">Állítson be egy automatikus biztonsági mentést az Ön által választott helyre, vagy kapcsolja be az Android felhő mentést.</string>
-    <string name="pref_section_icon_packs">Ikon pakkok</string>
-    <string name="pref_section_icon_packs_summary">Ikon pakkok kezelése és importálása</string>
+    <string name="pref_section_backups_summary">Automatikus biztonsági mentés beállítása az általa választott helyre, vagy az Android felhős mentésének bekapcsolása.</string>
+    <string name="pref_section_icon_packs">Ikoncsomagok</string>
+    <string name="pref_section_icon_packs_summary">Ikoncsomagok kezelése és importálása</string>
     <string name="pref_select_theme_title">Téma</string>
+    <string name="pref_dynamic_colors_title">Dinamikus színek</string>
+    <string name="pref_dynamic_colors_summary">Az Android-témája színein alapuló átfedés alkalmazása</string>
     <string name="pref_view_mode_title">Nézetmód</string>
     <string name="pref_lang_title">Nyelv</string>
     <string name="pref_show_icons_title">Ikonok megjelenítése</string>
-    <string name="pref_show_icons_summary">Ikonok megjelenítése minden elem mellett</string>
+    <string name="pref_show_icons_summary">Ikonok megjelenítése minden bejegyzés mellett</string>
     <string name="pref_code_group_size_title">Kód számjegyeinek csoportosítása</string>
     <string name="pref_code_group_size_summary">Válasszon csoportosítási számot</string>
+    <string name="pref_account_name_position_title">A fióknév megjelenítése</string>
+    <string name="pref_show_next_code_title">Következő kód megjelenítése</string>
+    <string name="pref_show_next_code_summary">A következő kód előállítása és megjelenítése előre</string>
+    <string name="pref_expiration_state_title">A lejáró kódok speciális jelzése</string>
+    <string name="pref_expiration_state_summary">A lejáró kódok színének módosítása, és villogtatás a lejáratuk előtt</string>
+    <string name="pref_expiration_state_fallback">A lejáró kódok színének módosítása</string>
+    <string name="pref_shared_issuer_account_name_title">A fióknév megjelenítése csak akkor, ha szükséges</string>
+    <string name="pref_shared_issuer_account_name_summary">A fióknevek megjelenítése csak akkor, ha megegyezik a kibocsátójuk. A többi fióknév rejtve lesz.</string>
+    <string name="pref_account_name_position_summary_override">Ezt a beállítást felülbírálja a csempenézetes mód. A fióknév látható lesz a kibocsátó alatt.</string>
     <string name="pref_import_file_title">Importálás fájlból</string>
     <string name="pref_import_file_summary">Tokenek importálása fájlból</string>
-    <string name="pref_android_backups_title">Android felhő mentések</string>
-    <string name="pref_android_backups_summary">Engedélyezem az Android felhő rendszer számára, hogy az Aegis széfjét automatikus mentse. Ez csak a titkosított széfnél lehetséges.</string>
-    <string name="pref_android_backups_hint"><i>Eszközről-eszközre (D2) mentések mindig engedélyezettek, a fenti beállítástól függetlenül</i></string>
+    <string name="pref_android_backups_title">Android felhős mentések</string>
+    <string name="pref_android_backups_summary">Engedélyezés az Android felhős biztonsági mentési rendszer számára, hogy automatikus mentse az Aegis széfjét. Ez csak titkosított széf esetén lehetséges.</string>
+    <string name="pref_android_backups_hint"><i>Az eszközök közti (D2) biztonsági mentések mindig engedélyezettek, a fenti beállítástól függetlenül</i></string>
     <string name="pref_backups_title">A széf automatikus mentése</string>
-    <string name="pref_backups_summary">Biztonsági mentést készít a széfről a külső tárolón. Ez csak titkosított széfek esetén támogatott.</string>
-    <string name="pref_backups_reminder_title">Biztonsági mentés emlékeztető</string>
-    <string name="pref_backups_reminder_summary">Emlékeztető mutatása, ha az utolsó változtatásokról nem készült biztonsági mentés.</string>
-    <string name="pref_backups_reminder_dialog_title">Biztonsági mentés emlékeztetés kikapcsolása</string>
-    <string name="pref_backups_reminder_dialog_summary">Emlékeztető kikapcsolása után Aegis nem fogja jelezni hogy a változásokról készült-e biztonsági mentés, ezzel kockáztatva az adatvesztést. Biztos hogy ki legyen kapcsolva az emlékeztetés?</string>
-    <string name="pref_backups_location_title">A biztonsági mentések könyvtára</string>
+    <string name="pref_backups_summary">Biztonsági mentések automatikus készítése a széfről a külső tárolóra, ha változás történik. Ez csak titkosított széfek esetén támogatott.</string>
+    <string name="pref_backups_reminder_title">Biztonsági mentési emlékeztető</string>
+    <string name="pref_backups_reminder_summary">Emlékeztető megjelenítése, ha a legutóbbi változtatásokról nem készült biztonsági mentés.</string>
+    <string name="pref_backups_reminder_dialog_title">Biztonsági mentési emlékeztető kikapcsolása</string>
+    <string name="pref_backups_reminder_dialog_summary">Az emlékeztető kikapcsolása után az Aegis nem fogja jelezni hogy a változásokról készült-e biztonsági mentés. Ezzel az adatvesztést kockáztatja. Biztos, hogy kikapcsolja az emlékeztetőt?</string>
+    <string name="pref_backups_versioning_strategy_title">Biztonsági mentési stratégia</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Több verzió megtartása</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Egyszeri biztonsági mentés</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">A kiválasztott biztonsági mentési stratégia nem megbízható és nem ajánlott. Az egyszeri biztonsági mentés meghibásodása az egyetlen biztonsági mentés elvesztéséhez vezethet.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Biztonsági mentési stratégia kiválasztása</string>
+    <string name="pref_backups_location_title">Biztonsági mentés helye</string>
     <string name="pref_backups_location_summary">A biztonsági mentések itt lesznek tárolva:</string>
+    <string name="pref_backup_location_summary">A biztonsági mentés itt lesz tárolva:</string>
     <string name="pref_backups_trigger_title">Biztonsági mentés készítése</string>
     <string name="pref_backups_trigger_summary">Biztonsági mentés kézi indítása</string>
     <string name="pref_backups_versions_title">Megtartandó verziók száma</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
+    <plurals name="pref_backups_versions_summary">
+        <item quantity="one">%1$d verzió megtartása a mentésből</item>
+        <item quantity="other">%1$d verzió megtartása a mentésből</item>
+    </plurals>
+    <string name="pref_backups_versions_infinite_summary">Végtelen számú verzió megtartása a biztonsági mentésből</string>
     <string name="pref_import_app_title">Importálás alkalmazásból</string>
     <string name="pref_import_app_summary">Tokenek importálása alkalmazásból (root hozzáférés szükséges)</string>
     <string name="pref_export_title">Exportálás</string>
     <string name="pref_export_summary">A széf exportálása</string>
     <string name="pref_password_reminder_title">Jelszóemlékeztető</string>
-    <string name="pref_google_auth_export_title">Exportálás Google Authenticator-ba</string>
-    <string name="pref_google_auth_export_descriptor">Google Authenticator kompatibilis export QR kód generálása</string>
+    <string name="pref_google_auth_export_title">Exportálás a Google Authenticatorba</string>
+    <string name="pref_google_auth_export_descriptor">Google Authenticatorral kompatibilis QR-kódot tartalmazó exportálást állít elő</string>
     <string name="pref_google_auth_export_no_data">Nincs exportálható adat</string>
     <plurals name="pref_google_auth_export_incompatible_entries">
-        <item quantity="one">%d inkompatibilis elem átugrása</item>
-        <item quantity="other">%d inkompatibilis elemek kihagyva</item>
+        <item quantity="one">%d nem kompatibilis bejegyzés átugorva</item>
+        <item quantity="other">%d nem kompatibilis bejegyzés átugorva</item>
     </plurals>
-    <string name="pref_password_reminder_summary">Mutasson %s időközönként emlékeztetőt a jelszó újra megadásáról, így nem felejti el.</string>
+    <string name="pref_password_reminder_summary">Emlékeztető megjelenítése %s időközönként, hogy adja meg újra jelszót, így nem felejti el.</string>
     <string name="pref_password_reminder_summary_disabled">Kikapcsolva</string>
     <string name="pref_secure_screen_title">Képernyőbiztonság</string>
     <string name="pref_secure_screen_summary">A képernyőképek és a képernyő rögzítésére irányuló egyéb kísérletek blokkolása</string>
-    <string name="pref_tap_to_reveal_title">Koppintás a megjelenítéshez</string>
+    <string name="pref_tap_to_reveal_title">Koppintás a felfedéshez</string>
     <string name="pref_tap_to_reveal_summary">A tokenek alapból rejtve lesznek. Koppintson a tokenekre, hogy megjelenjen a kód.</string>
-    <string name="pref_tap_to_reveal_time_title">Értintésre történő megjelenítés időtúllépése</string>
+    <string name="pref_tap_to_reveal_time_title">Koppintással történő felfedés időtúllépése</string>
     <string name="pref_auto_lock_title">Automatikus zárolás</string>
-    <string name="pref_auto_lock_summary">Mennyi idő után: %s</string>
+    <string name="pref_auto_lock_summary">Ennyi idő után: %s</string>
     <string name="pref_auto_lock_summary_disabled">Kikapcsolva</string>
-    <string name="pref_auto_lock_prompt">Aegis automatikus lezárása amikor</string>
-    <string name="pref_auto_lock_type_back_button">Amikor a vissza gombot megnyomja</string>
-    <string name="pref_auto_lock_type_minimize">Az app minimalizálása</string>
+    <string name="pref_auto_lock_prompt">Az Aegis automatikus lezárása, ha</string>
+    <string name="pref_auto_lock_type_back_button">A vissza gomb megnyomásakor</string>
+    <string name="pref_auto_lock_type_minimize">Az alkalmazás minimalizálásra kerül</string>
     <string name="pref_auto_lock_type_device_lock">Az eszköz zárolásra kerül</string>
-    <string name="pref_backup_password_category">Biztonsági mentés &amp; exportálás</string>
-    <string name="pref_backup_password_title">Biztonsági mentés és export jelszavának leválasztása</string>
-    <string name="pref_backup_password_summary">Ha aktív, az alkalmazás feloldásához használt jelszó már nem használható a biztonsági mentések és exportok visszafejtésére.</string>
+    <string name="pref_backup_password_category">Biztonsági mentés és exportálás</string>
+    <string name="pref_backup_password_title">Külön jelszó a biztonsági mentéshez és exportáláshoz</string>
+    <string name="pref_backup_password_summary">Ha engedélyezve van, akkor az alkalmazás feloldásához használt jelszó nem használható a biztonsági mentések és exportálások visszafejtéséhez.</string>
     <string name="pref_backup_password_change_title">Biztonsági mentés és export jelszavának módosítása</string>
-    <string name="pref_backup_password_change_summary">Új jelszó megadása a széf titkosításához a biztonsági mentés és export során.</string>
+    <string name="pref_backup_password_change_summary">Új jelszó megadása, amely a széf titkosításához lesz használva a biztonsági mentés és exportálás során.</string>
     <string name="pref_encryption_title">Titkosítás</string>
     <string name="pref_encryption_summary">A széf titkosítása, és jelszavas vagy biometrikus feloldás beállítása</string>
     <string name="pref_biometrics_title">Biometrikus feloldás</string>
     <string name="pref_biometrics_summary">Biometrikus hitelesítés engedélyezése a széf feloldásához</string>
+    <string name="pref_search_behavior_summary">Keresés ezek között: %s</string>
+    <string name="pref_search_behavior_prompt">Keresés a következő mezőkben</string>
+    <string name="pref_search_behavior_type_name">Név</string>
+    <string name="pref_search_behavior_type_issuer">Kibocsátó</string>
+    <string name="pref_search_behavior_type_note">Megjegyzés</string>
+    <string name="pref_search_behavior_type_groups">Csoportok</string>
     <string name="pref_set_password_title">Jelszó módosítása</string>
     <string name="pref_set_password_summary">Új jelszó beállítása, mellyel feloldhatja a széfet</string>
+    <string name="no_events_title">Nincs jelentett esemény</string>
+    <string name="no_events_description">Nem lettek fontos események jelentve az alkalmazásban</string>
+    <string name="event_title_vault_unlocked">Széf feloldva</string>
+    <string name="event_description_vault_unlocked">A széf sikeresen fel lett oldva</string>
+    <string name="event_title_backup_created">Biztonsági másolat létrehozva</string>
+    <string name="event_description_backup_created">A széf biztonsági mentése sikeresen létrejött</string>
+    <string name="event_title_android_backup_created">Androidos biztonsági mentés</string>
+    <string name="event_description_android_backup_created">Az Android sikeresen létrehozta a széf biztonsági mentését</string>
+    <string name="event_title_vault_exported">Széf exportálva</string>
+    <string name="event_description_vault_exported">A széf másolata exportálva lett</string>
+    <string name="event_title_entry_shared">Bejegyzés megosztva</string>
+    <string name="event_description_entry_shared">Egy bejegyzés meg lett osztva</string>
+    <string name="event_title_vault_unlock_failed_password">A széf feloldása nem sikerült (jelszó)</string>
+    <string name="event_description_vault_unlock_failed_password">A széf jelszóval való feloldása nem sikerült</string>
+    <string name="event_title_vault_unlock_failed_biometrics">A széf feloldása nem sikerült (biometrikus adatok)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">A széf biometikus adatokkal való feloldása nem sikerült</string>
+    <string name="event_unknown">Ismeretlen eseménytípus</string>
+    <string name="audit_log_entry_deleted">(törölve)</string>
+    <string name="today_at_time">Ma %1$s-kor</string>
+    <string name="day_of_week_at_time">%1$s %2$s-kor</string>
     <string name="export_encrypted">A széf titkosítása</string>
-    <string name="export_help">Ezzel ki tudja exportálni az Aegis belső széf tárolóját. Válassza ki, milyen formátumú legyen az export:</string>
+    <string name="export_help">Ez a művelet exportálja a széfet az Aegis belső tárolójából. Válassza ki az exportálás formátumát:</string>
     <string name="export_warning_unencrypted">Arra készül, hogy egy titkosítatlan Aegis széfet exportáljon. <b>Ez nem ajánlott</b>.</string>
-    <string name="export_warning_password">Exportok titkosítása egy külön jelszóval történik, ami a Biztonsági beállítások allatt megadható.</string>
+    <string name="export_warning_password">Az exportok titkosítása egy külön jelszóval történik, amely a Biztonsági beállítások allatt adható meg.</string>
     <string name="understand_risk_accept">Megértettem a kockázatot</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
     <string name="export_format_google_auth_uri">Szöveges fájl (.TXT)</string>
@@ -108,9 +160,9 @@
         <item quantity="other">%d csoport kiválasztva</item>
     </plurals>
     <string name="export_no_groups_selected">Nincs exportálandó csoport kiválasztva</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator Export</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis hitelesítő exportja</string>
     <string name="choose_authentication_method">Biztonság</string>
-    <string name="authentication_method_explanation">Az Aegis egy biztonságközpontú 2FA alkalmazás. A tokenek egy széfben vannak tárolva, mely akár tetszőleges jelszóval titkosítható. Ha egy támadó megszerzi a titkosított széffájlt, a jelszó ismerete nélkül akkor sem fog tudni hozzáférni a tartalmához.\n\nElőre ezt a beállítást választottuk, mert úgy véljük ez lenne a legmegfelelőbb az eszköze számára.</string>
+    <string name="authentication_method_explanation">Az Aegis egy biztonságközpontú kétfaktoros hitelesítő alkalmazás. A tokenek egy széfben vannak tárolva, mely akár tetszőleges jelszóval titkosítható. Ha egy támadó megszerzi a titkosított széffájlt, a jelszó ismerete nélkül akkor sem fog tudni hozzáférni a tartalmához.\n\nElőre ezt a beállítást választottuk, mert úgy véljük ez lenne a legmegfelelőbb az eszköze számára.</string>
     <string name="authentication_method_none">Nincs</string>
     <string name="authentication_method_none_description">Nem szükséges jelszó a széf zárolásához, és nem lesz titkosítva.<b>Ez a beállítás nem ajánlott</b>.</string>
     <string name="authentication_method_password">Jelszó</string>
@@ -120,43 +172,49 @@
     <string name="authentication_method_biometrics_description">A jelszó mellett a biometrikus adatai is regisztrálva lesznek az eszközön, mint például az ujjlenyomata vagy az arca, melyet a széf feloldásához használhat.</string>
     <string name="authentication">A széf feloldása</string>
     <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">A széf \nfeloldása</string>
-    <string name="auth_use_biometrics">Vagy nyomjon ide hogy használja a <font fgcolor="#FF0D86C1">biometrát</font></string>
+    <string name="auth_use_biometrics">Koppintson ide, hogy a <font fgcolor="#FF0D86C1">biometrikus adatokat</font> használja</string>
     <string name="set_password">Adja meg a jelszavát</string>
     <string name="set_group">Adja meg a csoport nevét</string>
     <string name="set_number">Adjon meg egy számot</string>
     <string name="set_password_confirm">Erősítse meg a jelszót</string>
-    <string name="invalid_password">Helytelen jelszó</string>
-    <string name="invalidated_biometrics">Változás történt a készüléke biztonsági beállításaiban. Menjen az \"Aegis -&gt; Beállítások -&gt; Biztonság -&gt; Biometrikus feloldás\" részbe, hogy kikapcsolja majd újra bekapcsolja a biometriát.</string>
-    <string name="password_reminder">Kérem írja be a jelszavát. Időnként megkérjük erre, hogy biztos emlékezzen rá.</string>
+    <string name="invalid_password">A jelszó helytelen</string>
+    <string name="invalidated_biometrics">Változás történt az eszköze biztonsági beállításaiban. Ugorjon az „Aegis -&gt; Beállítások -&gt; Biztonság -&gt; Biometrikus feloldás” részhez, hogy ki-, majd újból bekapcsolja a biometrikus feloldást.</string>
+    <string name="password_reminder">Adja meg a jelszavát. Időnként megkérjük erre, hogy biztosan ne felejtse el.</string>
     <string name="password_reminder_dialog_title">Biometrikus feloldás alapértelmezetten</string>
     <string name="password_reminder_dialog_message">Időnként bekérjük a jelszavát, hogy ne felejtse el és ne zárja ki magát. Miután sikeres az ellenőrzés az Aegis visszaáll az alapértelmezett biometrikus feloldásra a következő ellenőrzésig.</string>
     <string name="password_reminder_freq_never">Soha</string>
     <string name="password_reminder_freq_weekly">Hetente</string>
     <string name="password_reminder_freq_biweekly">Kéthetente</string>
     <string name="password_reminder_freq_monthly">Havonta</string>
-    <string name="password_reminder_freq_quarterly">Negyedéves</string>
-    <string name="enter_password_2fas_message">Úgy tűnik a 2FAS mentése titkosított. Adja meg a jelszót alul.</string>
-    <string name="enter_password_authy_message">Úgy néz ki, hogy az Authy tokenek titkosítottak. Zárja be az Aegist, nyissa meg az Authyt, és oldja fel a tokeneket a jelszavával. Vagy az Aegis is megpróbálhatja visszafejteni az Authy tokeneket, ha megadja a jelszót lent.</string>
-    <string name="enter_password_aegis_title">Kérem adja meg az import jelszót</string>
-    <string name="period_hint">Periódusok (másodpercek)</string>
+    <string name="password_reminder_freq_quarterly">Negyedévente</string>
+    <string name="enter_password_2fas_message">Úgy tűnik, hogy ez a 2FAS mentés titkosított. Adja meg a jelszót alul.</string>
+    <string name="enter_password_authy_message">Úgy tűnik, hogy az Authy tokenek titkosítottak. Zárja be az Aegist, nyissa meg az Authyt, és oldja fel a tokeneket a jelszavával. Vagy az Aegis is megpróbálhatja visszafejteni az Authy tokeneket, ha megadja a jelszót alább.</string>
+    <string name="enter_password_aegis_title">Adja meg az importálási jelszót</string>
+    <string name="period_hint">Időtartam (másodpercben)</string>
     <string name="algorithm_hint">Hash függvény</string>
     <string name="type">Típus</string>
     <string name="share">Megosztás</string>
     <string name="yes">Igen</string>
     <string name="no">Nem</string>
+    <string name="undo">Visszavonás</string>
     <string name="unlock">Feloldás</string>
     <string name="advanced">Speciális</string>
     <string name="counter">Számláló</string>
-    <string name="digits">Számjegy</string>
+    <string name="digits">Számjegyek</string>
     <string name="secret">Titok</string>
-    <string name="scan">QR-kód leolvasása</string>
+    <string name="scan">QR-kód beolvasása</string>
     <string name="scan_image">Kép beolvasása</string>
     <string name="enter_manually">Kézi megadás</string>
-    <string name="set_up_biometric">Feloldás beállítása biometrikus adatokkal</string>
+    <string name="set_up_biometric">Biometrikus adatokkal való feloldás beállítása</string>
     <string name="copy">Másolás</string>
     <string name="edit">Szerkesztés</string>
-    <string name="favorite" comment="Verb">Kedvencek</string>
-    <string name="unfavorite" comment="Verb">Nem kedveltek</string>
+    <string name="select_all">Összes kijelölése</string>
+    <string name="assign_icons">Ikonok hozzárendelése</string>
+    <string name="assign_groups">Csoporthoz rendelés</string>
+    <string name="assign_groups_dialog_summary">Válassza ki, hogy a kiválasztott elemek mely csoporthoz legyenek rendelve.</string>
+    <string name="assign_groups_dialog_dropdown">Csoport kiválasztása</string>
+    <string name="favorite" comment="Verb">Kedvencnek jelölés</string>
+    <string name="unfavorite" comment="Verb">Eltávolítás a kedvencek közül</string>
     <string name="error_all_caps">HIBA</string>
     <string name="password">Jelszó</string>
     <string name="confirm_password">Jelszó megerősítése</string>
@@ -169,48 +227,64 @@
     <string name="snackbar_authentication_method">Válasszon hitelesítési módot</string>
     <string name="encrypting_vault">A széf titkosítása</string>
     <string name="exporting_vault">A széf exportálása</string>
+    <string name="optimizing_icon">Ikon optimalizálása</string>
+    <string name="optimizing_icon_multiple">Ikonok optimalizálása %1$d/%2$d</string>
     <string name="reading_file">Fájl olvasása</string>
     <string name="requesting_root_access">Root hozzáférés igénylése</string>
-    <string name="analyzing_qr">QR kód elemzése</string>
-    <string name="analyzing_qr_multiple">QR kód elemzése %d/%d (%s)</string>
-    <string name="importing_icon_pack">Ikon pakk importálása</string>
+    <string name="analyzing_qr">QR-kód elemzése</string>
+    <string name="analyzing_qr_multiple">%1$d./%2$d QR-kód elemzése (%3$s)</string>
+    <plurals name="added_new_entries">
+        <item quantity="one">%d új bejegyzés hozzáadva a széfhez</item>
+        <item quantity="other">%d új bejegyzés hozzáadva a széfhez</item>
+    </plurals>
+    <string name="importing_icon_pack">Ikoncsomag importálása</string>
     <string name="delete_entry">A bejegyzés törlése</string>
     <string name="delete_entry_description">Biztos, hogy törli ezt a bejegyzést?</string>
-    <string name="delete_entry_explanation">Ezzel nem kapcsolja ki a 2Fa belépést a \n<b>%s</b>\n\n fiókhoz. Győződjön meg arról, hogy továbbra is tud mással kódot generálni, vagy kikapcsolta a 2FA belépést.</string>
+    <string name="delete_entry_explanation">Ez a művelet nem kapcsolja ki a 2FA hitelesítést a következő fióknál: \n<b>%s</b>\n\nHogy ne veszítse el a hozzáférését, győződjön meg arról, hogy kikapcsolta a 2FA-t, vagy továbbra is tud más módon kódokat előállítani.</string>
     <string name="delete_entries">Bejegyzések törlése</string>
+    <plurals name="delete_entries_description">
+        <item quantity="one">Biztos, hogy töröl %d bejegyzést?</item>
+        <item quantity="other">Biztos, hogy töröl %d bejegyzést?</item>
+    </plurals>
     <string name="discard_changes">Elveti a változásokat?</string>
     <string name="discard_changes_description">A változásai nem lettek mentve</string>
     <string name="saving_profile_error">Hiba a profil mentésekor</string>
+    <string name="saving_assign_icons_error">Hiba az ikonok hozzárendelésekor</string>
     <string name="welcome">Üdvözöljük</string>
-    <string name="app_description">Az Aegis egy szabad, biztonságos és nyílt forráskódú két faktoros hitelesítő alkalmazás</string>
+    <string name="app_description">Az Aegis egy szabad, biztonságos és nyílt forráskódú kétfaktoros hitelesítő alkalmazás</string>
     <string name="setup_completed">Beállítás kész</string>
     <string name="setup_completed_description">Az Aegis beállításra került, és használatra kész.</string>
     <string name="vault_not_found">Széf nem található, beállítás indítása…</string>
     <string name="copied">Másolva</string>
     <string name="errors_copied">Hibák a vágólapra másolva</string>
     <string name="version_copied">Verzió a vágólapra másolva</string>
-    <string name="error_occurred">Hiba lépett fel</string>
+    <string name="error_required_field">Ez a mező kötelező</string>
+    <string name="error_occurred">Hiba történt</string>
     <string name="decryption_error">Hiba történt a széf feloldásakor</string>
-    <string name="decryption_corrupt_error">Hiba lépett fel a széf feloldásakor. A széf fájlja megsérülhetett.</string>
+    <string name="decryption_corrupt_error">Hiba történt a széf feloldásakor. A széf fájlja megsérülhetett.</string>
     <string name="saving_error">Hiba történt a széf mentésekor</string>
-    <string name="vault_init_error">Hiba lépett fel a széf feldolgozásakor</string>
-    <string name="vault_load_error">Hiba lépett fel a széf háttértárról való betöltésekor</string>
-    <string name="biometric_decrypt_error">Hiba lépett fel a széf biometrikus feloldásánál. Ez legtöbbször azt jelenit, hogy a készüléke biztonsági beállításai változtak. Kérem oldja fel az appot jelszóval, majd állítsa be újra a biometrikus hitelesítést.</string>
-    <string name="biometric_init_error">Egy hiba lépett fel a biometrikus hitelesítés előkészítésénél. Ez többnyire azt jelenti, hogy a készüléke biztonsági beállításai változtak. Kérem nyissa kis a széfjét a kóddal, majd állítsa be újra a biometrikus hitelesítést a beállításokban.</string>
-    <string name="disable_encryption">Titkosítás letiltása</string>
-    <string name="disable_encryption_description">Biztos abban, hogy kikapcsolja a titkosítást? Ez azt fogja eredményezni, hogy egyszerű szövegként mentődik a széf. <b>Az automatikus mentések is kikapcsolásra kerülnek</b>.</string>
-    <string name="enable_encryption_error">Hiba történt a titkosítás engedélyezésekor</string>
-    <string name="disable_encryption_error">Hiba történt a titkosítás letiltásakor</string>
+    <string name="vault_init_error">Hiba történt a széf előkészítésekor</string>
+    <string name="vault_load_error">Hiba történt a széf háttértárról való betöltésekor</string>
+    <string name="biometric_decrypt_error">Hiba történt a széf biometrikus hitelesítéssel való feloldásakor. Ez legtöbbször azt jelenit, hogy az eszköz biztonsági beállításai megváltoztak. Oldja fel az alkalmazást jelszóval, majd állítsa be újra a biometrikus hitelesítést.</string>
+    <string name="biometric_init_error">Hiba történt a biometrikus hitelesítés előkészítésekor. Ez legtöbbször azt jelenit, hogy az eszköz biztonsági beállításai megváltoztak. Oldja fel az alkalmazást jelszóval, majd állítsa be újra a biometrikus hitelesítést.</string>
+    <string name="disable_encryption">Titkosítás kikapcsolása</string>
+    <string name="disable_encryption_description">Biztos, hogy kikapcsolja a titkosítást? Ez azt fogja eredményezni, hogy a széf egyszerű szövegként lesz mentve. <b>Az automatikus biztonsági mentések is kikapcsolásra kerülnek</b>.</string>
+    <string name="enable_encryption_error">Hiba történt a titkosítás bekapcsolásakor</string>
+    <string name="disable_encryption_error">Hiba történt a titkosítás kikapcsolásakor</string>
     <string name="backup_successful">A biztonsági mentés ütemezésre került</string>
-    <string name="backup_error">Hiba lépett fel a biztonsági mentés létrehozásánál</string>
-    <string name="backup_status_success">Legutolsó mentés sikeres: %s</string>
-    <string name="backup_status_failed">Legutolsó mentés sikertelen: %s</string>
+    <string name="backup_error">Hiba történt a biztonsági mentés létrehozásakor</string>
+    <string name="backup_status_success">A legutóbbi mentés sikeres: %s</string>
+    <string name="backup_status_failed">A legutóbbi mentés sikertelen: %s</string>
     <string name="backup_status_none">Nem készült még biztonsági mentés</string>
-    <string name="backup_warning_password">Bizt. mentések titkosítása egy külön jelszóval történik, ami a Biztonsági beállítások allatt megadható</string>
-    <string name="documentsui_error">A DocumentsUI hiányzik a készülékéről. Ez egy elengedhetetlen rendszer összetevő a dokumentumok kiválasztásához és létrehozásához. Ha &quot;szemét-mentesítette&quot; eszközét, valószínűleg véletlenül letörölhette, így újra kell installálnia.</string>
-    <string name="icon_pack_import_error">Hiba lépett fel az ikon csomag importálásakor</string>
-    <string name="icon_pack_import_exists_error">Már létező ikon csomagot próbál importálni. Felül kívánja írni?</string>
-    <string name="icon_pack_delete_error">Hiba lépett fel az ikon csomag törlése során</string>
+    <string name="backup_warning_password">A biztonsági mentések titkosítása egy külön jelszóval történik, amely a Biztonsági beállítások alatt adható meg</string>
+    <string name="documentsui_error">A DocumentsUI hiányzik az eszközéről. Ez egy elengedhetetlen rendszerösszetevő a dokumentumok kiválasztásához és létrehozásához. Ha „szemétmentesítette” eszközét, akkor lehet, hogy véletlenül letörölhette, így újra kell telepítenie.</string>
+    <string name="icon_pack_import_error">Hiba történt az ikoncsomag importálása során</string>
+    <string name="icon_pack_import_exists_error">Az importálandó ikoncsomag már létezik. Felülírja?</string>
+    <string name="icon_pack_delete_error">Hiba történt az ikoncsomag törlése során</string>
+    <plurals name="icon_pack_info">
+        <item quantity="one">%d ikon</item>
+        <item quantity="other">%d ikon</item>
+    </plurals>
     <string name="icon_custom">Egyéni</string>
     <string name="permission_denied">Engedély megtagadva</string>
     <string name="andotp_new_format">Új formátum (v0.6.3 vagy újabb) </string>
@@ -219,50 +293,66 @@
     <string name="choose_totpauth_importer">Ez egy jelszóval titkosított TOTP hitelesítő biztonsági mentése?</string>
     <string name="choose_application">Válassza ki az alkalmazást, melyből importálna</string>
     <string name="choose_theme">Válassza ki a kívánt témát</string>
+    <string name="choose_account_name_position">Válassza ki a kívánt fióknév-pozíciót</string>
     <string name="choose_view_mode">Válassza ki a kívánt nézetmódot</string>
+    <string name="choose_copy_behavior">Válassza ki a kívánt másolási viselkedést</string>
     <string name="parsing_file_error">Hiba történt a fájl feldolgozásakor</string>
     <string name="file_not_found">Hiba: A fájl nem található</string>
     <string name="reading_file_error">Hiba történt a fájl olvasásakor</string>
     <string name="app_lookup_error">Hiba: Az alkalmazás nincs telepítve</string>
-    <string name="app_version_error">A telepített %s verziója nem támogatott. Az újabb verziók elkezdték titkosítani a belső tároló egyes fájljait, így Aegis nem tud hozzáférni az importáláshoz szükséges információkhoz. Az importálás megkísérlése valószínűleg hibát fog eredményezni. Szeretné mégis folytatni?</string>
-    <string name="root_error">Hiba: root hozzáférés nem elérhető</string>
+    <string name="app_version_error">A telepített %s verziója nem támogatott. Az újabb verziók elkezdték titkosítani a belső tároló egyes fájljait, így az Aegis nem tud hozzáférni az importáláshoz szükséges információkhoz. Az importálás megkísérlése valószínűleg hibát fog eredményezni. Szeretné mégis folytatni?</string>
+    <string name="root_error">Hiba: nem szerezhető root jogosultság</string>
+    <plurals name="imported_entries_count">
+        <item quantity="one">%d bejegyzés importálva</item>
+        <item quantity="other">%d bejegyzés importálva</item>
+    </plurals>
     <plurals name="entries_shown">
-        <item quantity="one">%d elem mutatása</item>
-        <item quantity="other">%d elem mutatása</item>
+        <item quantity="one">%d bejegyzés megjelenítése</item>
+        <item quantity="other">%d bejegyzés megjelenítése</item>
     </plurals>
     <string name="intro_import_error_title">Hiba történt a széf importálása közben</string>
     <string name="import_error_title">Egy vagy több hiba történt az importálás során</string>
     <string name="exporting_vault_error">Hiba történt a széf exportálásakor</string>
     <string name="exported_vault">A széf exportálva</string>
-    <string name="encryption_set_password_error">Hiba történt a jelszó beállításakor: </string>
-    <string name="encryption_enable_biometrics_error">Hiba történt a biometrikus feloldás engedélyezésekor</string>
+    <string name="encryption_set_password_error">Hiba történt a jelszó beállításakor.</string>
+    <string name="encryption_enable_biometrics_error">Hiba történt a biometrikus feloldás engedélyezésekor. Egyes eszközök rossz minőségű biometrikus hitelesítési megvalósítással rendelkeznek, és valószínűleg az Öné is ilyen. Fontolja meg, hogy jelszavas beállításra váltson.</string>
     <string name="no_cameras_available">Nem érhető el kamera</string>
-    <string name="read_qr_error">Hiba történt a QR-kód leolvasásakor</string>
-    <string name="read_qr_error_phonefactor">Az Aegis nem kompatiblis a Microsoft saját fejlesztésű 2FA algoritmusával. Bizonyosodjon meg arról, hogy az \"Értesítés nélküli app telepítése\" opciót választja amikor az Office 365 2FA-t konfigurálja.</string>
+    <string name="read_qr_error">Hiba történt a QR-kód beolvasásakor</string>
+    <string name="read_qr_error_phonefactor">Az Aegis nem kompatiblis a Microsoft zárt 2FA algoritmusával. Győződjön meg arról, hogy az „Alkalmazás telepítése értesítések nélkül” lehetőséget választja, amikor beállítja az Office 365 2FA-t.</string>
     <string name="partial_google_auth_import">Hiányos Google Authenticator export észlelve</string>
-    <string name="partial_google_auth_import_warning">Néhány QR kód hiányzik az importból. Ezek a kódok nem találhatók:\n\n<b>%s</b>\n\nFolytathatja a részleges export importálást, de javasoljuk, hogy az összes QR-kóddal próbálja meg újra, hogy ne kockáztassa egyetlen tokenhez sem a hozzáférés elvesztését.</string>
-    <string name="missing_qr_code_descriptor">• QR kód %d</string>
-    <string name="import_partial_export_anyway">%d tokenek importálása mindenképp</string>
-    <string name="import_google_auth_failure">Google Authenticator export importálása sikertelen</string>
-    <string name="authentication_method_raw">Nyers</string>
+    <string name="partial_google_auth_import_warning">Néhány QR-kód hiányzik az importból. Ezek a kódok nem találhatók:\n\n<b>%s</b>\n\nFolytathatja a részleges export importálását, de javasoljuk, hogy próbálja újra az összes QR-kóddal, hogy ne kockáztassa a hozzáférése elvesztését egyetlen tokennél sem.</string>
+    <string name="missing_qr_code_descriptor">• %d. QR-kód</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">%d token importálása mindenképp</item>
+        <item quantity="other">%d token importálása mindenképp</item>
+    </plurals>
+    <string name="import_google_auth_failure">A Google Authenticator export importálása sikertelen</string>
+    <string name="unrelated_google_auth_batches_error">Az export nem kapcsolódó köteg információit tartalmazza. Egyszerre csak 1 köteget próbáljon meg importálni.</string>
+    <string name="no_tokens_can_be_imported">Ennek eredményeképp egyetlen token sem importálható</string>
     <string name="unlocking_vault">A széf feloldása</string>
-    <string name="slot_this_device">(ez az eszköz)</string>
+    <string name="rename_group">Csoport átnevezése</string>
+    <string name="no_group_selection">Ha egy bejegyzés egy csoportnak sem tagja, akkor a „Nincs csoport” alatt található.</string>
     <string name="remove_group">Csoport eltávolítása</string>
     <string name="remove_group_description">Biztos, hogy eltávolítja ezt a csoportot? A csoport bejegyzései automatikusan „Csoport nélküli” elemek lesznek.</string>
-    <string name="remove_icon_pack">Ikon csomag törlése</string>
-    <string name="remove_icon_pack_description">Biztos abban, hogy le akarja törölni az ikon csomagot? Azok a belépések amelyek ezt használják nem affektáltak.</string>
+    <string name="remove_unused_groups">Nem használt csoportok törlése</string>
+    <string name="remove_unused_groups_description">Biztos, hogy törli az összes olyan csoportot, amely nincs bejegyzéshez rendelve?</string>
+    <string name="remove_icon_pack">Ikoncsomag törlése</string>
+    <string name="remove_icon_pack_description">Biztos, hogy törli az ikoncsomagot? Az ikoncsomag ikonjait használó bejegyzésekre ez nem lesz hatással.</string>
     <string name="details">Részletek</string>
-    <string name="show_error_details">Hiba részletek mutatása</string>
+    <string name="show_error_details">Hiba részleteinek megjelenítése</string>
     <string name="lock">Zárolás</string>
     <string name="name">Név</string>
     <string name="no_group">Nincs csoport</string>
-    <string name="sort">Rendezés</string>
-    <string name="sort_alphabetically">Kibocsátó (A-tól Z-ig)</string>
-    <string name="sort_alphabetically_reverse">Kibocsátó (Z-től A-ig)</string>
-    <string name="sort_alphabetically_name">Fiók (A-tól Z-ig)</string>
-    <string name="sort_alphabetically_name_reverse">Fiók (Z-től A-ig)</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Rendezés</string>
+    <string name="sort_alphabetically">Kibocsátó (A–Z)</string>
+    <string name="sort_alphabetically_reverse">Kibocsátó (Z–A)</string>
+    <string name="sort_alphabetically_name">Fiók (A–Z)</string>
+    <string name="sort_alphabetically_name_reverse">Fiók (Z–A)</string>
     <string name="sort_usage_count">Használati számláló</string>
+    <string name="sort_last_used">Legutóbb használva</string>
     <string name="sort_custom">Egyéni</string>
+    <string name="last_used">Legutóbb használva</string>
+    <string name="last_used_never">soha</string>
     <string name="new_group">Új csoport…</string>
     <string name="group">Csoport</string>
     <string name="group_name_hint">Csoportnév</string>
@@ -270,35 +360,60 @@
     <string name="preference_manage_groups_summary">Itt kezelheti és törölheti a csoportokat</string>
     <string name="preference_reset_usage_count">Használati számláló visszaállítása</string>
     <string name="preference_reset_usage_count_summary">Minden bejegyzés használati számlálójának visszaállítása</string>
-    <string name="preference_reset_usage_count_dialog">Biztosan vissza akarja állítani a számlálókat nullára?</string>
-    <string name="note">Megjegyzés</string>
+    <string name="preference_reset_usage_count_dialog">Biztos, hogy visszaállítja a széf összes bejegyzésének használati számlálóját nullára?</string>
+    <string name="note" comment="Users can add a note to an entry">Megjegyzés</string>
     <string name="clear">Törlés</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Ismétlődő bejegyzés</string>
+    <string name="dialog_duplicate_entry_message">Ennek a bejegyzésnek ugyanaz a neve és kibocsátója, mint egy vagy több meglévő bejegyzésnek. Hogyan folytatja?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Meglévő bejegyzések felülírása</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">A meglévő bejegyzések lecserélése egy újjal. Ez a művelet nem vonható vissza.</string>
+    <string name="dialog_duplicate_entry_suffix_title">Utótag hozzáadása</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Utótag hozzáadása ehhez a bejegyzéshez. Az új név ez lesz: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Mentés megszakítása</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Lehetővé teszi a bejegyzés szerkesztését mielőtt újból megpróbálná menteni</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Biztos, hogy töröl %d bejegyzést a következő névvel:\n\n%s – %s</item>
+        <item quantity="other">Biztos, hogy töröl %d bejegyzést a következő névvel:\n\n%s – %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Törlés megerősítése</string>
+    <string name="pref_haptic_feedback_summary">Az eszköz rezgetése, amikor a kódok frissülnek</string>
+    <string name="pref_haptic_feedback_title">Haptikus visszajelzés</string>
     <string name="pref_highlight_entry_title">Tokenek kiemelése koppintáskor</string>
-    <string name="pref_highlight_entry_summary">A tokenek könnyebb megkülönböztethetősége érdekében ideiglenesen ki lesznek emeve koppintáskor</string>
+    <string name="pref_highlight_entry_summary">A tokenek könnyebb megkülönböztethetősége érdekében ideiglenesen ki lesznek emelve koppintáskor</string>
+    <string name="pref_groups_multiselect_title">Csoportok többszörös kiválasztása</string>
+    <string name="pref_groups_multiselect_summary">Több csoport egyidejű kiválasztásának engedélyezése</string>
     <string name="pref_minimize_on_copy_title">Minimalizálás másoláskor</string>
-    <string name="pref_minimize_on_copy_summary">App minimalizálása a token másolása után</string>
-    <string name="pref_pause_entry_title">Tokenek megállítása érintéskor</string>
-    <string name="pref_pause_entry_summary">Tokenek automata frissítéséhez érintse meg őket. Tokenek nem frissülnek addig míg fókuszban vannak. Szükséges a \"Tokenek kiemelése érintéskor\" vagy \"Érintéskor felfedés\" opció.</string>
-    <string name="pin_keyboard_description">Írja be jelszavát a PIN billentyű bekapcsolásához. Ez csak akkor működik, ha jelszava csak számokból áll</string>
-    <string name="pin_keyboard_error">Hiba lépett fel a PIN felület előhívásakor</string>
-    <string name="pin_keyboard_error_description">Nem kapcsolható be a PIN billentyű. A jelszava csak számokat tartalmazhat.</string>
-    <string name="pin_keyboard_disabled">A jelszó megváltozott. A PIN billentyű nem fog innentől megjelenni.</string>
-    <string name="selected">Kiválasztott</string>
+    <string name="pref_minimize_on_copy_summary">Az alkalmazás minimalizálása a token másolása után</string>
+    <string name="pref_copy_behavior_title">Tokenek másolása a vágólapra</string>
+    <string name="pref_search_behavior_title">Keresés viselkedése</string>
+    <string name="pref_pause_entry_title">Tokenek befagyasztása koppintáskor</string>
+    <string name="pref_pause_entry_summary">A tokenek automatikus frissítésének szüneteltetése koppintás után. A tokenek addig nem frissülnek, míg fókuszban vannak. Ehhez szükséges a „Tokenek kiemelése koppintáskor” vagy a „Koppintás a felfedéshez\" beállítás.</string>
+    <string name="pin_keyboard_description">Írja be jelszavát a PIN-billentyűzet bekapcsolásához. Ez csak akkor működik, ha jelszava csak számokból áll.</string>
+    <string name="pin_keyboard_error">Hiba történt a PIN-billentyűzet bekapcsolásakor</string>
+    <string name="pin_keyboard_error_description">Nem kapcsolható be a PIN-billentyűzet. A jelszava csak számokat tartalmazhat.</string>
+    <string name="pin_keyboard_disabled">A jelszó megváltozott. A PIN-billentyűzet ettől kezdve nem fog megjelenni.</string>
+    <string name="selected">Kiválasztva</string>
     <string name="dark_theme_title">Sötét téma</string>
     <string name="light_theme_title">Világos téma</string>
     <string name="amoled_theme_title">AMOLED téma</string>
     <string name="system_theme_title">Akkumulátorkímélő által beállított</string>
     <string name="system_amoled_theme_title">Akkumulátorkímélő által beállított (AMOLED)</string>
-    <string name="normal_viewmode_title">Normál</string>
+    <string name="normal_viewmode_title">Szokásos</string>
     <string name="compact_mode_title">Kompakt</string>
     <string name="small_mode_title">Apró</string>
+    <string name="tiles_mode_title">Csempék</string>
     <string name="unknown_issuer">Ismeretlen kibocsátó</string>
     <string name="unknown_account_name">Ismeretlen fióknév</string>
-    <string name="unable_to_process_deeplink">Deep link nem feldolgozható</string>
-    <string name="unable_to_read_qrcode_file">A QR kód nem olvasható be és dolgozható fel a fájlból: %s.</string>
-    <string name="unable_to_process_shared_text">Megosztott OTP szöveg nem feldolgozható</string>
-    <string name="unable_to_generate_qrcode">Sikertelen QR kód generálás</string>
-    <string name="select_picture">Válasszon képet</string>
+    <plurals name="import_error_dialog">
+        <item quantity="one">Az Aegis nem tudott importálni %d tokent. Ez a token ki lesz hagyva. A hibával kapcsolatos további információkért nyomja meg a „részletek” feliratot.</item>
+        <item quantity="other">Az Aegis nem tudott importálni %d tokent. Ezek a tokenek ki lesznek hagyva. A hibával kapcsolatos további információkért nyomja meg a „részletek” feliratot.</item>
+    </plurals>
+    <string name="unable_to_process_deeplink">Az alkalmazáshivatkozás nem dolgozható fel</string>
+    <string name="unable_to_read_qrcode_file">A QR-kód nem olvasható le és dolgozható fel a fájlból: %s.</string>
+    <string name="unable_to_process_shared_text">A megosztott szöveg nem dolgozható fel OTP-ként</string>
+    <string name="unable_to_read_qrcode_files">Egyes QR-kódok nem olvashatók le és dolgozhatók fel. Csak %1$d/%2$d bejegyzés lesz importálva.</string>
+    <string name="unable_to_generate_qrcode">A QR-kód nem állítható elő</string>
+    <string name="select_picture">Kép kiválasztása</string>
     <string name="select_icon">Ikon kiválasztása</string>
     <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Széf megnyitása</string>
     <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Szkenner megnyitása</string>
@@ -306,79 +421,161 @@
     <string name="search">Keresés</string>
     <string name="channel_name_lock_status">Állapot zárolása</string>
     <string name="channel_description_lock_status">Az Aegis állandó értesítést tud megjeleníteni, ha a széf zárolva van</string>
-    <string name="vault_unlocked_state">A széf feloldott. Koppintson a zároláshoz.</string>
+    <string name="vault_unlocked_state">A széf fel van oldva. Koppintson a zároláshoz.</string>
     <string name="version">Verzió</string>
-    <string name="changelog">Változásnapló</string>
+    <string name="changelog">Változáslista</string>
     <string name="whats_new">Újdonságok</string>
     <string name="github_description">Forráskód, problémák és információk</string>
-    <string name="license">Licensz</string>
-    <string name="license_description">Az Aegis Authenticatorra GPLv3 licensz érvényes</string>
-    <string name="third_party_licenses">Harmadik fél licenszei</string>
-    <string name="third_party_licenses_description">Az Aegis által használt harmadik féltől származó licenszek</string>
+    <string name="license">Licenc</string>
+    <string name="license_description">Az Aegis Authenticatorra a GPLv3 licenc érvényes</string>
+    <string name="third_party_licenses">Harmadik felek licencei</string>
+    <string name="third_party_licenses_description">Az Aegis által használt, harmadik féltől származó programkönyvtárok licencei</string>
     <string name="country_netherlands">Hollandia</string>
     <string name="email_us">Írjon egy e-mailt</string>
     <string name="visit_website">Keresse fel weboldalunkat</string>
     <string name="about_support">Támogatás</string>
     <string name="support_rate">Értékelés</string>
     <string name="support_rate_description">Támogasson minket azzal, hogy értékelést ír a Google Play Áruházban</string>
-    <string name="webview_error">Ez az eszköz nem támogatja a webes nézetet, mely azonban szükséges a változásnapló és licensz megtekintéséhez. Hiányzó rendszerösszetevő.</string>
+    <string name="webview_error">Ez az eszköz nem támogatja a webes nézetet, amely szükséges a változásnapló és a licenc megtekintéséhez. Ez egy hiányzó rendszerösszetevő.</string>
     <string name="email">E-mail</string>
-    <string name="time_sync_warning_title">Automata idő szinkronizálás</string>
-    <string name="time_sync_warning_message">Aegis a rendszeridőre támaszkodik a korrekt kódok generálásánál. Néhány másodperces eltérés is hibás kód generálást eredményezhet. Úgy tűnik az eszközön nincs bekapcsolva az automata idő szinkronizálás. Be akarja most ezt kapcsolni?</string>
+    <string name="time_sync_warning_title">Automatikus időszinkronizálás</string>
+    <string name="time_sync_warning_message">Az Aegis a rendszeridőre támaszkodik a helyes kódok előállításánál. Néhány másodperces eltérés is hibás kódok előállítását eredményezheti. Úgy tűnik az eszközön nincs bekapcsolva az automatikus időszinkronizálás. Be akarja most ezt kapcsolni?</string>
     <string name="time_sync_warning_disable">Ne figyelmeztessen. Tudom mit csinálok.</string>
-    <string name="google_qr_export_unrelated">A rendszer összefüggéstelen QR kódot talált. Próbálja újraindítani a szkennert.</string>
-    <string name="google_qr_export_unexpected">A #%d várt QR kódból csak #%d került szeknnelésre</string>
-    <string name="backup_error_bar_message"><b>Nemrég sikertelen volt egy széf mentés</b></string>
+    <string name="google_qr_export_unrelated">Nem kapcsolódó QR-kód található. Próbálja meg újraindítani a QR-kód-olvasót.</string>
+    <plurals name="google_qr_export_scanned">
+        <item quantity="one">%1$d/%2$d QR-kód beolvasva</item>
+        <item quantity="other">%1$d/%2$d QR-kód beolvasva</item>
+    </plurals>
+    <string name="google_qr_export_unexpected">A várt #%1$d QR-kód helyett ez lett beolvasva: #%2$d</string>
+    <string name="backup_error_bar_message"><b>Egy széf mentése nemrég sikertelen volt</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Egy közelmúltbeli, az %1$s használó széfmentés sikertelen volt, mert hiba történt. A biztonsági mentés ekkor volt megpróbálva: %2$s. Ellenőrizze a biztonsági mentési beállításokat, hogy biztosítsa a mentések sikeres végrehajtását.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Egy közelmúltbeli, az %1$s használó széfmentés sikertelen volt, mert az Aegisnek nem volt engedélye, hogy a mentési célra írjon. A biztonsági mentés ekkor volt megpróbálva: %2$s. Ez a hiba akkor történhet, ha áthelyezte/átnevezte a biztonsági mentés célját, vagy ha nemrég állította vissza mentésből az Aegist. Állítsa be újra a biztonsági mentés célját.
+    </string>
+    <string name="backup_system_builtin">Aegis beépített biztonsági mentését</string>
+    <string name="backup_system_android">Android felhős mentési rendszerét</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        A legfrissebb biztonsági mentés elavult (%s)
+    </string>
+    <string name="backup_reminder_bar_message">        A változásokról nincs biztonsági mentés
+    </string>
+    <string name="backup_reminder_bar_dialog_title">A változásokról nincs biztonsági mentés</string>
+    <string name="backup_reminder_bar_dialog_summary">        A széf friss változásairól még nincs biztonsági mentés. Fontos, hogy rendszeresen készítsen biztonsági mentéseket, hogy ne veszítse el a hozzáférést a fiókjaihoz. Fontolja meg, hogy beállítja az automatikus biztonsági mentést a beállítások menüben.
+    </string>
+    <string name="backup_reminder_bar_dialog_accept">Biztonsági mentések beállítása</string>
+    <string name="backup_plaintext_export_warning"><b>A széf nemrég egyszerű szövegként lett exportálva</b></string>
     <string name="pref_show_plaintext_warning_hint">Ne jelenjen meg többet ez a figyelmeztetés</string>
+    <string name="backup_plaintext_warning_explanation">Ez a figyelmeztetés azért jelenik meg, mert nemrég titkosítatlan formában exportálta a széfet. A tokenek biztonságának megtartása érdekében azt ajánljuk, hogy törölje ezt a fájlt, ha már nincs rá szüksége.</string>
     <string name="switch_camera">Kamera váltása</string>
     <string name="empty_list">Nincs megjeleníthető kód. Adjon hozzá bejegyzéseket a jobb alsó sarokban lévő plusz jelre koppintva.</string>
     <string name="empty_list_title">Nem található bejegyzés</string>
-    <string name="empty_group_list">Nincs megjelenítendő csoport. Adjon hozzá csoportokat egy bejegyzés szerkesztésénél</string>
+    <string name="empty_group_list">Nincs megjelenítendő csoport. Adjon hozzá csoportokat egy bejegyzés szerkesztésénél.</string>
     <string name="empty_group_list_title">Nem található csoport</string>
-    <string name="no_icon_packs">Nem került még ikon csomag importálásra. nyomjon a plusz ikonra az importáláshoz. Tipp: próbálja ki az <a href="https://aegis-icons.github.io">aegis-ikonokat</a>.</string>
-    <string name="no_icon_packs_title">Nincs ikon csomag</string>
+    <string name="no_icon_packs">Még nem lett ikoncsomag importálva. Koppintson a plusz ikonra az importáláshoz. Tipp: próbálja ki az <a href="https://aegis-icons.github.io">aegis-icons</a> csomagot.</string>
+    <string name="no_icon_packs_title">Nincs ikoncsomag</string>
     <string name="pick_icon">Válasszon egy ikont</string>
     <string name="uncategorized">Kategorizálatlan</string>
     <string name="done">Kész</string>
+    <plurals name="qr_count">
+        <item quantity="one">%d / %d QR-kód</item>
+        <item quantity="other">%d / %d QR-kód</item>
+    </plurals>
     <string name="next">Következő</string>
     <string name="previous">Előző</string>
-    <string name="transfer_entry">Elemek másolása</string>
-    <string name="transfer_entry_description">Szkennelje be ezt a QR kódot a kívánt authentikátor appal</string>
+    <string name="copy_uri">URI másolása</string>
+    <string name="unable_to_copy_uri_to_clipboard">Nem lehet az URI-t a vágólapra másolni</string>
+    <string name="uri_copied_to_clipboard">Az URI a vágólapra másolva</string>
+    <string name="transfer_entry_description">Olvassa le ezt a QR-kódot azzal hitelesítő alkalmazással, amelybe át akarja vinni</string>
+    <string name="transfer_entry_brightness">Koppintson a QR-kódra a teljes fényerő be- és kikapcsolásához</string>
+    <string name="google_auth_compatible_transfer_description">Olvassa le ezeket a QR-kódokat az Aegisszel vagy a Google Hitelesítővel.\n\nA Google Hitelesítő korlátozásai miatt csak az SHA1-et használó és 6 számjegyű kódot előállító TOTP és HOTP tokenek szerepelnek itt.</string>
     <string name="password_strength_very_weak">Nagyon gyenge</string>
     <string name="password_strength_weak">Gyenge</string>
     <string name="password_strength_fair">Tűrhető</string>
     <string name="password_strength_good">Jó</string>
     <string name="password_strength_strong">Erős</string>
-    <string name="pref_pin_keyboard_title">Használja a PIN billentyűket a zárolási képernyőn</string>
-    <string name="pref_pin_keyboard_summary">Kapcsolja be ezt a PIN billentyűk zárolási képernyőn való megjelenítéséhez. Ez csak a szám alapú jelszavaknál működik</string>
+    <string name="password_strength_unknown">A jelszó túl hosszú az erősségelemzéshez</string>
+    <string name="pref_pin_keyboard_title">PIN-billentyűzet használata a zárolási képernyőn</string>
+    <string name="pref_pin_keyboard_summary">Kapcsolja be ezt a PIN-billentyűzet bekapcsolásához a zárolási képernyőn. Ez csak a számjegyekből álló jelszavaknál működik.</string>
     <string name="title_activity_preferences">Beállítások</string>
     <string name="title_activity_manage_groups">Csoportok kezelése</string>
-    <string name="title_activity_transfer">Elemek másolása</string>
+    <string name="title_activity_transfer">Bejegyzések másolása</string>
     <string name="title_activity_about">Névjegy</string>
-    <string name="title_activity_edit_entry">Elem szerkesztése</string>
-    <string name="title_activity_scan_qr">QR kód beolvasása</string>
-    <string name="title_activity_manage_slots">Kulcs helyek kezelése</string>
-    <string name="title_activity_import_entries">Elemek importálása</string>
-    <string name="dialog_wipe_entries_title">Elemek letörlése</string>
-    <string name="dialog_wipe_entries_message">A széfe már tartalmaz elemeket. Le akarja törölni ezeket, mielőtt importálja az újakat?\n\n<b>Ha így dönt, örökre elveszíti a már meglevő adatokat.</b></string>
+    <string name="title_activity_edit_entry">Bejegyzés szerkesztése</string>
+    <string name="title_activity_scan_qr">Egy QR-kód beolvasása</string>
+    <string name="title_activity_import_entries">Bejegyzések importálása</string>
+    <string name="title_activity_assign_icons">Ikonok hozzárendelése</string>
+    <string name="title_activity_licenses">Harmadik felek licencei</string>
+    <string name="dialog_wipe_entries_title">Bejegyzések törlése</string>
+    <string name="dialog_wipe_entries_message">A széfe már tartalmaz bejegyzéseket. Törli ezeket, mielőtt importálja az újakat?\n\n<b>Ha így dönt, végleg elveszíti a széfben már meglevő bejegyzéseket.</b></string>
     <string name="dialog_wipe_entries_checkbox">Széf ürítése</string>
-    <string name="panic_trigger_ignore_toast">Az Aegis pánik érzékelője megszólalt, de ez a funkció kikapcsolásra került</string>
-    <string name="pref_panic_trigger_title">Széf törlése a pánik gomb megnyomásakor</string>
-    <string name="pref_panic_trigger_summary">Széf törlése amikor a Ripple megnyomja a pánik gombot</string>
-    <string name="importer_help_2fas">Hozza létre a 2FAS Authenticator mentést.</string>
-    <string name="importer_help_aegis">Hozzon létre egy Aegis export/mentést.</string>
-    <string name="importer_help_authenticator_plus">Addja hozzá az Authenticator Plus export fájlját a <b>Beállítások -&gt; Mentés &amp; Visszaállítás -&gt; Export mint szöveg vagy HTML</b> résznél.</string>
-    <string name="importer_help_authy">Adja hozzá a <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> mappából, mely az Authy belső háttértáron levő mappája.</string>
-    <string name="importer_help_andotp">Addja hozzá az andOTP export/mentést.</string>
-    <string name="importer_help_duo">Adja hozzá a <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> mappából, mely az DUO belső háttértáron levő mappája.</string>
-    <string name="importer_help_freeotp">Adja hozzá a <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> mappából, mely az FreeOTP belső háttértáron levő mappája.</string>
-    <string name="importer_help_freeotp_plus">Addja hozzá a FreeOTP+ exportot.</string>
-    <string name="importer_help_microsoft_authenticator">Adja hozzá a <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> mappából, mely a Microsoft Authenticator belső háttértáron levő mappája.</string>
-    <string name="importer_help_plain_text">Addja hozzá egy szöveges fájlt aminek minden sora tartalmazza a Google Authenticator URI-t.</string>
-    <string name="importer_help_totp_authenticator">Addja hozzá a TOTP Authenticator exportot.</string>
-    <string name="importer_help_winauth">Addja hozzá a WinAuth exportot.</string>
-    <string name="importer_help_direct">Bejegyzések közvetlen importálása %s-ból. Ehhez szükséges az applikáció telepítése, és root hozzáférés biztosítása az Aegis számára.</string>
+    <string name="panic_trigger_ignore_toast">Az Aegis pánikgombja meg lett nyomva, de a beállítás ki van kapcsolva, figyelmen kívül hagyás</string>
+    <string name="pref_panic_trigger_title">A széf törlése a pánikgomb megnyomásakor</string>
+    <string name="pref_panic_trigger_summary">A széf törlése, ha a Ripple megnyomja a pánikgombot</string>
+    <string name="import_vault">Aegis-széf importálása</string>
+    <string name="import_vault_hint">Egy eltéről 2FA-alkalmazásból importálna? Előbb fejezze be a beállításokat, majd ugorjon a beállítások menübe.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d lehetséges ismétlődés kijelölése megszüntetve. Ellenőrizze a bejegyzéseket.</item>
+        <item quantity="other">%d lehetséges ismétlődés kijelölése megszüntetve. Ellenőrizze a bejegyzéseket.</item>
+    </plurals>
+    <string name="importer_help_2fas">Adja meg a 2FAS Authenticator egy biztonsági mentési fájlját.</string>
+    <string name="importer_help_aegis">Adja meg az Aegis egy exportját vagy biztonsági mentési fájlját.</string>
+    <string name="importer_help_authenticator_plus">Adja meg az Authenticator Plus egy exportfájlját, melyet a <b>Beállítások -&gt; Mentés és visszaállítás -&gt; Exportálás szövegként vagy HTML-ként</b> résznél állíthat elő.</string>
+    <string name="importer_help_authy">Adja meg a <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> másolatát, mely az Authy belső háttértáron levő mappájában található.</string>
+    <string name="importer_help_andotp">Adja meg az andOTP egy exportját vagy biztonsági mentési fájlját.</string>
+    <string name="importer_help_bitwarden">Adja meg a Bitwarden egy exportját vagy biztonsági mentési fájlját. A titkosított fájlok nem támogatottak.</string>
+    <string name="importer_help_battle_net_authenticator">Adja meg a <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b> másolatát, mely a Battle.net Authenticator belső háttértáron levő mappájában található.</string>
+    <string name="importer_help_duo">Adja meg a <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> másolatát, mely a DUO belső háttértáron levő mappájában található.</string>
+    <string name="importer_help_ente_auth">Adjon meg egy Ente Auth exportfájlt. Jelenleg csak a titkosítatlan fájlok támogatottak.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Egy biztonsági mentési fájlt tárol.\nFeeOTP 1.x: A következő biztonsági mentési fájl másolatát: <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> tárolja, amely a FreeOTP belső tárolási könyvtárában található.</string>
+    <string name="importer_help_freeotp_plus">Adja meg a FreeOTP+ egy exportfájlját.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2 kompatibilitás</string>
+    <string name="importer_warning_message_freeotp2">A FreeOTP 2-ben számos olyan probléma van, amely hibás biztonsági mentéseket eredményezhet. Az Aegis megpróbálja megmenteni a lehető legtöbb bejegyzést, de lehetséges, hogy néhány vagy akár az összes bejegyzés importálása sikertelen lesz.</string>
+    <string name="importer_help_google_authenticator"><b>Csak a Google Hitelesítő v5.10 és korábbi verziói támogatottak</b>.\n\nAdja meg a <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> másolatát, mely a Google Hitelesítő belső háttértáron lévő mappájában található.</string>
+    <string name="importer_help_microsoft_authenticator">Adja meg a <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> másolatát, mely a Microsoft Authenticator belső háttértáron levő mappájában található.</string>
+    <string name="importer_help_plain_text">Adjon meg egy szöveges fájlt, melynek minden sorában Google Hitelesítő URI található.</string>
+    <string name="importer_help_steam"><b>A Steam v3.0 és újabb verziói nem támogatottak</b>. Adja hozzá a <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> mappából, mely a Steam belső háttértáron levő mappája.</string>
+    <string name="importer_help_stratum">Adjon meg egy Stratum exportálási fájlt, amelyet a <b>Beállítások &gt; Biztonsági mentés &gt; Biztonsági mentés titkosított fájlba (ajánlott)</b> menüpontban lehet előállítani.</string>
+    <string name="importer_help_totp_authenticator">Adjon meg egy TOTP Autheticator exportfájlt.</string>
+    <string name="importer_help_winauth">Adjon meg egy WinAuth exportfájlt.</string>
+    <string name="import_assign_icons_dialog_title">Ikonok hozzárendelése</string>
+    <string name="import_assign_icons_dialog_text">Hozzárendeli az ikonokat az importált bejegyzésekhez?</string>
+    <string name="importer_encrypted_exception_google_authenticator">Titkosított bejegyzés kihagyva: %s</string>
+    <string name="importer_help_direct">Bejegyzések közvetlen importálása a következőből: %s. Ehhez szükséges, hogy telepítve legyen az alkalmazás, és hogy biztosítsa a root hozzáférést az Aegis számára.</string>
     <string name="groups">Csoportok</string>
     <string name="pref_focus_search">A keresésre fókuszálás az alkalmazás indításakor</string>
     <string name="pref_focus_search_summary">Azonnali fókuszálás a keresésre az alkalmazás megnyitásakor.</string>
+    <string name="pref_grouping_halves">Felek</string>
+    <string name="pref_grouping_none">Nincs csoportosítás</string>
+    <string name="pref_grouping_size_two">2-es csoportok</string>
+    <string name="pref_grouping_size_three">3-as csoportok</string>
+    <string name="pref_grouping_size_four">4-es csoportok</string>
+    <string name="pref_copy_behavior_never">Soha</string>
+    <string name="pref_copy_behavior_single_tap">Egy koppintás</string>
+    <string name="pref_copy_behavior_double_tap">Dupla koppintás</string>
+    <string name="pref_account_name_position_hidden">Rejtett</string>
+    <string name="pref_account_name_position_end">A kibocsátó mellett</string>
+    <string name="pref_account_name_position_below">A kibocsátó alatt</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="one">%d másodperce</item>
+        <item quantity="other">%d másodperce</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">%d perce</item>
+        <item quantity="other">%d perce</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="one">%d órája</item>
+        <item quantity="other">%d órája</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="one">%d napja</item>
+        <item quantity="other">%d napja</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="one">%d éve</item>
+        <item quantity="other">%d éve</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="one">%d elem kiválasztva</item>
+        <item quantity="other">%d elem kiválasztva</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-in-rID-v29/strings.xml b/app/src/main/res/values-in-rID-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-in-rID-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index b913396c..26d23b06 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Pengaturan</string>
     <string name="action_about">Tentang</string>
     <string name="action_delete">Hapus</string>
-    <string name="action_transfer">Kirim</string>
-    <string name="action_edit_icon">Mengedit ikon</string>
-    <string name="action_reset_usage_count">Setel ulang jumlah penggunaan</string>
-    <string name="action_reset_usage_count_dialog">Apakah Anda yakin ingin mengatur jumlah penggunaan entri ini menjadi 0?</string>
-    <string name="action_default_icon">Pulihkan ikon baku</string>
+    <string name="action_transfer">Transfer</string>
+    <string name="action_edit_icon">Ubah ikon</string>
+    <string name="action_reset_usage_count">Reset jumlah penggunaan</string>
+    <string name="action_reset_usage_count_dialog">Apakah Anda yakin ingin mengatur jumlah penggunaan entri ini ke 0?</string>
+    <string name="action_default_icon">Pulihkan ikon bawaan</string>
     <string name="discard">Buang</string>
     <string name="save">Simpan</string>
+    <string name="all">Semua</string>
     <string name="issuer">Penerbit</string>
     <string name="yandex_pin">PIN (4–16 digit)</string>
     <string name="motp_pin">PIN (4 digit)</string>
@@ -28,46 +29,80 @@
     <string name="pref_section_security_summary">Menyesuaikan enkripsi, buka kunci dengan biometrik, penguncian otomatis, dan pengaturan keamanan lainnya.</string>
     <string name="pref_section_import_export_title">Impor &amp; Ekspor</string>
     <string name="pref_section_import_export_summary">Impor cadangan dari Aegis atau aplikasi autentikasi lainnya. Buat ekspor manual dari brankas Aegis.</string>
+    <string name="pref_section_audit_log_title">Log audit</string>
+    <string name="pref_section_audit_log_summary">Temukan daftar semua peristiwa penting yang dilaporkan yang terjadi di dalam aplikasi.</string>
     <string name="pref_section_backups_title">Cadangan</string>
     <string name="pref_section_backups_summary">Atur pencadangan otomatis ke lokasi yang Anda pilih atau aktifkan partisipasi di sistem pencadangan awan Android.</string>
     <string name="pref_section_icon_packs">Paket Ikon</string>
     <string name="pref_section_icon_packs_summary">Kelola dan impor paket ikon</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Warna dinamis</string>
+    <string name="pref_dynamic_colors_summary">Terapkan lapisan berdasarkan warna tema Android Anda</string>
     <string name="pref_view_mode_title">Mode tampilan</string>
     <string name="pref_lang_title">Bahasa</string>
+    <string name="pref_show_icons_title">Tampilkan ikon</string>
+    <string name="pref_show_icons_summary">Tampilkan ikon di samping setiap entri</string>
     <string name="pref_code_group_size_title">Pengelompokan digit kode</string>
-    <string name="pref_import_file_title">Impor berkas</string>
+    <string name="pref_code_group_size_summary">Pilih jumlah digit untuk mengelompokkan kode berdasarkan</string>
+    <string name="pref_account_name_position_title">Tampilkan nama akun</string>
+    <string name="pref_show_next_code_title">Tampilkan kode selanjutnya</string>
+    <string name="pref_show_next_code_summary">Hasilkan dan tampilkan kode berikutnya lebih awal</string>
+    <string name="pref_expiration_state_title">Tunjukkan kapan kode akan kedaluwarsa</string>
+    <string name="pref_expiration_state_summary">Ubah warna kode dan buat kode tersebut berkedip ketika akan kedaluwarsa</string>
+    <string name="pref_expiration_state_fallback">Ubah warna kode saat kode akan kedaluwarsa</string>
+    <string name="pref_shared_issuer_account_name_title">Hanya tampilkan nama akun jika diperlukan</string>
+    <string name="pref_shared_issuer_account_name_summary">Hanya tampilkan nama akun ketika mereka memiliki penerbit yang sama. Nama akun lain akan disembunyikan.</string>
+    <string name="pref_account_name_position_summary_override">Pengaturan ini digantikan oleh mode tampilan kotak. Nama akun akan ditampilkan di bawah penerbit.</string>
+    <string name="pref_import_file_title">Impor dari berkas</string>
     <string name="pref_import_file_summary">Impor token dari berkas</string>
     <string name="pref_android_backups_title">Pencadangan awan Android</string>
-    <string name="pref_android_backups_summary">Bolehkan sistem pencadangan awan Android untuk menyertakan brankas Aegis di pencadangan mereka. Ini hanya didukung untuk brankas terenkripsi.</string>
-    <string name="pref_android_backups_hint"><i>Pencadangan perangkat-ke-perangkat (D2D) selalu diperbolehkan, terlepas dari setelan di atas</i></string>
+    <string name="pref_android_backups_summary">Izinkan sistem pencadangan awan Android untuk menyertakan brankas Aegis dalam pencadangannya. Ini hanya didukung untuk brankas terenkripsi.</string>
+    <string name="pref_android_backups_hint"><i>Pencadangan perangkat-ke-perangkat (D2D) selalu diizinkan, terlepas dari pengaturan di atas.</i></string>
     <string name="pref_backups_title">Otomatis cadangkan brankas</string>
-    <string name="pref_backups_summary">Secara otomatis membuat cadangan vault di penyimpanan eksternal saat ada perubahan. Ini hanya didukung untuk brankas terenkripsi.</string>
-    <string name="pref_backups_location_title">Direktori untuk cadangan berkas</string>
+    <string name="pref_backups_summary">Secara otomatis membuat cadangan brankas pada penyimpanan eksternal ketika ada perubahan. Ini hanya didukung untuk brankas terenkripsi.</string>
+    <string name="pref_backups_reminder_title">Pengingat pencadangan</string>
+    <string name="pref_backups_reminder_summary">Tampilkan pengingat untuk mencadangkan cadangan jika Anda belum mencadangkan perubahan terakhir.</string>
+    <string name="pref_backups_reminder_dialog_title">Menonaktifkan pengingat pencadangan</string>
+    <string name="pref_backups_reminder_dialog_summary">Dengan menonaktifkan pengingat ini, Aegis tidak akan memberi tahu Anda apakah Anda memiliki perubahan yang belum dicadangkan atau tidak. Hal ini membuat Anda berisiko kehilangan akses ke token Anda. Apakah Anda yakin ingin menonaktifkan pengingat ini?</string>
+    <string name="pref_backups_versioning_strategy_title">Strategi pencadangan</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Simpan beberapa versi</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Pencadangan tunggal</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Strategi pencadangan yang dipilih tidak dapat diandalkan dan tidak direkomendasikan. Kegagalan pencadangan tunggal dapat menyebabkan kehilangan satu-satunya cadangan Anda.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Pilih strategi pencadangan</string>
+    <string name="pref_backups_location_title">Lokasi pencadangan</string>
     <string name="pref_backups_location_summary">Cadangan akan disimpan di</string>
-    <string name="pref_backups_trigger_title">Perintah pencadangan</string>
-    <string name="pref_backups_trigger_summary">Perintah pencadangan secara manual</string>
-    <string name="pref_backups_versions_title">Nomor versi untuk disimpan</string>
+    <string name="pref_backup_location_summary">Cadangan akan disimpan di</string>
+    <string name="pref_backups_trigger_title">Jalankan pencadangan</string>
+    <string name="pref_backups_trigger_summary">Jalankan pencadangan secara manual</string>
+    <string name="pref_backups_versions_title">Banyaknya versi yang harus disimpan</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
-        <item quantity="other">Simpan %1$d versi cadangan</item>
+        <item quantity="other">Simpan versi %1$d dari cadangan</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Menyimpan cadangan dalam jumlah tak terbatas</string>
     <string name="pref_import_app_title">Impor dari aplikasi</string>
     <string name="pref_import_app_summary">Impor token dari aplikasi (membutuhkan akses root)</string>
     <string name="pref_export_title">Ekspor</string>
     <string name="pref_export_summary">Ekspor ke brankas</string>
     <string name="pref_password_reminder_title">Pengingat kata sandi</string>
-    <string name="pref_password_reminder_summary">Tampilkan pengingat %s untuk memasukkan kata sandi, agar Anda tidak lupa.</string>
+    <string name="pref_google_auth_export_title">Ekspor untuk Google Authenticator</string>
+    <string name="pref_google_auth_export_descriptor">Membuat kode QR ekspor yang kompatibel dengan Google Authenticator</string>
+    <string name="pref_google_auth_export_no_data">Tidak ada data untuk diekspor</string>
+    <plurals name="pref_google_auth_export_incompatible_entries">
+        <item quantity="other">Melewatkan %d entri yang tidak kompatibel</item>
+    </plurals>
+    <string name="pref_password_reminder_summary">Tampilkan pengingat %s untuk memasukkan kata sandi agar Anda tidak lupa.</string>
     <string name="pref_password_reminder_summary_disabled">Dinonaktifkan</string>
     <string name="pref_secure_screen_title">Keamanan layar</string>
     <string name="pref_secure_screen_summary">Blokir tangkapan layar dan upaya lain untuk menangkap layar di dalam aplikasi</string>
-    <string name="pref_tap_to_reveal_title">Sentuh untuk melihat</string>
-    <string name="pref_tap_to_reveal_summary">Token akan disembunyikan secara default. Sentuh token untuk melihat kode.</string>
-    <string name="pref_tap_to_reveal_time_title">Batas waktu sentuh untuk melihat</string>
-    <string name="pref_auto_lock_title">Kunci Otomatis</string>
+    <string name="pref_tap_to_reveal_title">Ketuk untuk menampilkan</string>
+    <string name="pref_tap_to_reveal_summary">Token akan disembunyikan secara bawaan. Ketuk pada token untuk menampilkan kode.</string>
+    <string name="pref_tap_to_reveal_time_title">Batas waktu ketuk untuk menampilkan</string>
+    <string name="pref_auto_lock_title">Kunci otomatis</string>
     <string name="pref_auto_lock_summary">Kapan %s</string>
     <string name="pref_auto_lock_summary_disabled">Dinonaktifkan</string>
-    <string name="pref_auto_lock_prompt">Secara otomatis mengunci Aegis saat</string>
-    <string name="pref_auto_lock_type_back_button">Tombol kembali ditekan</string>
+    <string name="pref_auto_lock_prompt">Otomatis mengunci Aegis saat</string>
+    <string name="pref_auto_lock_type_back_button">Tombol kembali sudah ditekan</string>
     <string name="pref_auto_lock_type_minimize">Aplikasi diminimalkan</string>
     <string name="pref_auto_lock_type_device_lock">Perangkat terkunci</string>
     <string name="pref_backup_password_category">Cadangan &amp; Ekspor</string>
@@ -79,14 +114,50 @@
     <string name="pref_encryption_summary">Enkripsi brankas dan buka dengan kata sandi atau biometrik</string>
     <string name="pref_biometrics_title">Buka kunci dengan biometrik</string>
     <string name="pref_biometrics_summary">Izinkan otentikasi biometrik untuk membuka brankas</string>
+    <string name="pref_search_behavior_summary">Telusuri melalui: %s</string>
+    <string name="pref_search_behavior_prompt">Cari di salah satu kolom berikut</string>
+    <string name="pref_search_behavior_type_name">Nama</string>
+    <string name="pref_search_behavior_type_issuer">Penerbit</string>
+    <string name="pref_search_behavior_type_note">Catatan</string>
+    <string name="pref_search_behavior_type_groups">Grup</string>
     <string name="pref_set_password_title">Ganti kata sandi</string>
     <string name="pref_set_password_summary">Atur kata sandi baru untuk digunkan membuka brankas Anda</string>
+    <string name="no_events_title">Tidak ada kejadian yang dilaporkan</string>
+    <string name="no_events_description">Tidak ada kejadian penting yang dilaporkan dalam aplikasi ini</string>
+    <string name="event_title_vault_unlocked">Brankas terbuka</string>
+    <string name="event_description_vault_unlocked">Brankas telah berhasil dibuka</string>
+    <string name="event_title_backup_created">Cadangan dibuat</string>
+    <string name="event_description_backup_created">Cadangan brankas telah berhasil dibuat</string>
+    <string name="event_title_android_backup_created">Cadangan dibuat oleh Android</string>
+    <string name="event_description_android_backup_created">Cadangan brankas telah berhasil dibuat oleh Android</string>
+    <string name="event_title_vault_exported">Brankas diekspor</string>
+    <string name="event_description_vault_exported">Salinan brankas telah diekspor</string>
+    <string name="event_title_entry_shared">Entri dibagikan</string>
+    <string name="event_description_entry_shared">Sebuah entri telah dibagikan</string>
+    <string name="event_title_vault_unlock_failed_password">Gagal membuka kunci brankas (kata sandi)</string>
+    <string name="event_description_vault_unlock_failed_password">Upaya membuka kunci brankas dengan kata sandi gagal</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Gagal membuka kunci brankas (biometrik)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Upaya membuka kunci brankas dengan biometrik gagal</string>
+    <string name="event_unknown">Jenis peristiwa tidak diketahui</string>
+    <string name="audit_log_entry_deleted">(terhapus)</string>
+    <string name="today_at_time">Hari ini pada %1$s</string>
+    <string name="day_of_week_at_time">Hari %1$s pada %2$s</string>
     <string name="export_encrypted">Enkripsi brankas</string>
     <string name="export_help">Tindakan ini akan mengekspor brankas dari penyimpanan internal Aegis. Pilih format yang Anda inginkan untuk ekspor:</string>
     <string name="export_warning_unencrypted">Anda akan mengekspor salinan tidak terenkripsi dari brankas Aegis Anda. <b>Ini tidak disarankan</b>.</string>
+    <string name="export_warning_password">Ekspor dienkripsi menggunakan kata sandi terpisah yang dikonfigurasikan dalam pengaturan Keamanan.</string>
+    <string name="understand_risk_accept">Saya mengerti risikonya</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
     <string name="export_format_google_auth_uri">File teks (*.txt)</string>
+    <string name="export_format_html">Halaman web (.HTML)</string>
     <string name="export_format_hint">Format ekspor</string>
+    <string name="export_all_groups">Ekspor semua grup</string>
+    <string name="export_choose_groups">Pilih grup mana yang akan diekspor</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="other">%d kelompok yang dipilih</item>
+    </plurals>
+    <string name="export_no_groups_selected">Tidak ada grup yang dipilih untuk diekspor</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Ekspor Aegis Authenticator</string>
     <string name="choose_authentication_method">Keamanan</string>
     <string name="authentication_method_explanation">Aegis adalah aplikasi 2FA yang berfokus pada keamanan. Token disimpan dalam brankas, yang secara opsional dapat dienkripsi dengan kata sandi pilihan Anda. Jika penyerang mendapatkan file brankas terenkripsi Anda, mereka tidak akan dapat mengakses konten tanpa mengetahui kata sandinya.\n\nKami telah memilih opsi yang menurut kami paling sesuai untuk perangkat Anda.</string>
     <string name="authentication_method_none">Tidak ada</string>
@@ -105,6 +176,9 @@
     <string name="set_password_confirm">Konfirmasi kata sandi</string>
     <string name="invalid_password">Kata sandi salah</string>
     <string name="invalidated_biometrics">Perubahan di pengaturan keamanan perangkat Anda terdeteksi. Silakan pergi ke \"Aegis-&gt; Pengaturan -&gt; Keamanan -&gt; Kunci Biometrik\" untuk menonaktifkan dan mengaktifkan kembali kunci biometrik.</string>
+    <string name="password_reminder">Masukkan kata sandi Anda. Kami sesekali meminta Anda untuk melakukan hal ini agar Anda tidak lupa.</string>
+    <string name="password_reminder_dialog_title">Buka kunci biometrik secara default</string>
+    <string name="password_reminder_dialog_message">Kami sesekali meminta Anda untuk memasukkan kata sandi untuk memastikan Anda tidak lupa dan tidak terkunci dari brankas. Setelah memasukkan kata sandi Anda sekali, Aegis akan kembali ke pembukaan kunci biometrik secara default hingga tiba waktunya untuk pengingat kata sandi berikutnya.</string>
     <string name="password_reminder_freq_never">Tak Pernah</string>
     <string name="password_reminder_freq_weekly">Setiap Pekan</string>
     <string name="password_reminder_freq_biweekly">Setiap Dua Pekan</string>
@@ -119,6 +193,7 @@
     <string name="share">Bagikan</string>
     <string name="yes">Ya</string>
     <string name="no">Tidak</string>
+    <string name="undo">Urung</string>
     <string name="unlock">Buka</string>
     <string name="advanced">Lanjutan</string>
     <string name="counter">Penghitung</string>
@@ -130,6 +205,14 @@
     <string name="set_up_biometric">Atur buka kunci biometrik</string>
     <string name="copy">Salin</string>
     <string name="edit">Ubah</string>
+    <string name="select_all">Pilih semua</string>
+    <string name="assign_icons">Tetapkan ikon</string>
+    <string name="assign_groups">Tetapkan ke grup</string>
+    <string name="assign_groups_dialog_summary">Pilih grup yang ingin Anda tetapkan untuk menetapkan entri yang dipilih.</string>
+    <string name="assign_groups_dialog_dropdown">Pilih grup</string>
+    <string name="favorite" comment="Verb">Favorit</string>
+    <string name="unfavorite" comment="Verb">Hapus dari favorit</string>
+    <string name="error_all_caps">ERROR</string>
     <string name="password">Kata Sandi</string>
     <string name="confirm_password">Konfirmasi Kata Sandi</string>
     <string name="show_password">Tampilkan Kata Sandi</string>
@@ -141,9 +224,12 @@
     <string name="snackbar_authentication_method">Pilih metode otentikasi</string>
     <string name="encrypting_vault">Mengenkripsi brankas</string>
     <string name="exporting_vault">Ekspor brankas</string>
+    <string name="optimizing_icon">Mengoptimasi ikon</string>
+    <string name="optimizing_icon_multiple">Mengoptimasi ikon %1$d/%2$d</string>
     <string name="reading_file">Baca berkas</string>
+    <string name="requesting_root_access">Meminta akses root</string>
     <string name="analyzing_qr">Menganalisis kode QR</string>
-    <string name="analyzing_qr_multiple">Menganalisis kode QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Menganalisis kode QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="other">Menambahkan %d entri baru ke brankas</item>
     </plurals>
@@ -158,6 +244,7 @@
     <string name="discard_changes">Batalkan perubahan?</string>
     <string name="discard_changes_description">Perubahan Anda belum disimpan</string>
     <string name="saving_profile_error">Terjadi kesalahan saat menyimpan profil</string>
+    <string name="saving_assign_icons_error">Kesalahan dalam menetapkan ikon</string>
     <string name="welcome">Selamat Datang</string>
     <string name="app_description">Aegis adalah aplikasi 2FA gratis, aman, dan kode sumber terbuka</string>
     <string name="setup_completed">Pengaturan selesai</string>
@@ -166,6 +253,7 @@
     <string name="copied">Disalin</string>
     <string name="errors_copied">Kesalahan menyalin ke Clipboard</string>
     <string name="version_copied">Versi disalin ke Clipboard</string>
+    <string name="error_required_field">Kolom ini wajib diisi</string>
     <string name="error_occurred">Terjadi kesalahan</string>
     <string name="decryption_error">Terjadi kesalahan saat membuka brankas</string>
     <string name="decryption_corrupt_error">Terjadi kesalahan saat membuka brankas. Mungkin file berkas brankas Anda rusak.</string>
@@ -180,6 +268,10 @@
     <string name="disable_encryption_error">Terjadi kesalahan saat menonaktifkan enkripsi</string>
     <string name="backup_successful">Pencadangan sukses dijadwalkan</string>
     <string name="backup_error">Terjadi kesalahan saat membuat cadangan</string>
+    <string name="backup_status_success">Backup terakhir berhasil: %s</string>
+    <string name="backup_status_failed">Backup terakhir gagal: %s</string>
+    <string name="backup_status_none">Belum ada backup yang dibuat</string>
+    <string name="backup_warning_password">Backup dienkripsi menggunakan kata sandi terpisah yang dikonfigurasi dalam pengaturan Keamanan</string>
     <string name="documentsui_error">DocumentsUI sepertinya menghilang dari perangkat Anda. Ini merupakan komponen sistem yang penting yang diperlukan untuk seleksi dan pembuatan dokumen. Jika Anda menggunakan alat untuk &quot;debloat&quot; perangkat Anda, Anda mungkin tidak sengaja menghapusnya dan Anda harus memasang alat tersebut kembali.</string>
     <string name="icon_pack_import_error">Terjadi kesalahan ketika mencoba mengimpor sebuah paket ikon</string>
     <string name="icon_pack_import_exists_error">Paket ikon yang Anda coba impor sudah ada. Apakah Anda ingin menimpanya?</string>
@@ -195,14 +287,22 @@
     <string name="choose_totpauth_importer">Apakah cadangan otentikasi TOTP ini dienkripsi dengan sandi?</string>
     <string name="choose_application">Pilih aplikasi yang ingin Anda impor</string>
     <string name="choose_theme">Pilih tema yang Anda inginkan</string>
+    <string name="choose_account_name_position">Pilih posisi nama akun yang Anda inginkan</string>
     <string name="choose_view_mode">Pilih mode tampilan yang Anda inginkan</string>
+    <string name="choose_copy_behavior">Pilih perilaku penyalinan yang Anda inginkan</string>
     <string name="parsing_file_error">Terjadi kesalahan saat mengurai berkas</string>
     <string name="file_not_found">Kesalahan: Berkas tidak ditemukan</string>
     <string name="reading_file_error">Terjadi kesalahan saat membaca berkas</string>
     <string name="app_lookup_error">Kesalahan: Aplikasi tidak terpasang</string>
+    <string name="app_version_error">Versi %s yang terinstal tidak didukung. Versi terbaru telah mulai mengenkripsi beberapa file di direktori penyimpanan internal, sehingga Aegis tidak dapat mengakses informasi yang dibutuhkan untuk impor. Mencoba mengimpor kemungkinan besar akan menghasilkan kesalahan. Apakah Anda tetap ingin melanjutkan?</string>
+    <string name="root_error">Eror: Tidak bisa mendapatkan akses root</string>
     <plurals name="imported_entries_count">
         <item quantity="other">%d entri yang diimpor</item>
     </plurals>
+    <plurals name="entries_shown">
+        <item quantity="other">Menampilkan %d entri</item>
+    </plurals>
+    <string name="intro_import_error_title">Terjadi kesalahan saat mengimpor vault</string>
     <string name="import_error_title">Terjadi beberapakali kesalahan saat proses impor</string>
     <string name="exporting_vault_error">Terjadi kesalahan saat mengekspor brankas</string>
     <string name="exported_vault">Data brankas Anda telah diekspor</string>
@@ -211,24 +311,39 @@
     <string name="no_cameras_available">Kamera tidak tersedia</string>
     <string name="read_qr_error">Terjadi kesalahan saat membaca kode QR</string>
     <string name="read_qr_error_phonefactor">Aegis tidak sesuai dengan algoritma 2FA milik Microsoft. Tolong untuk memastikan telah memilih \"Atur aplikasi tanpa notifikasi\" ketika mengonfigurasi 2FA di Office 365.</string>
-    <string name="authentication_method_raw">Raw</string>
+    <string name="partial_google_auth_import">Ekspor Google Authenticator tidak lengkap terdeteksi</string>
+    <string name="partial_google_auth_import_warning">Beberapa kode QR tidak ditemukan dalam impor Anda. Kode berikut ini tidak ditemukan:\n\n<b>%s</b>\n\nAnda dapat melanjutkan mengimpor ekspor parsial ini, tetapi kami sarankan untuk mencoba kembali dengan semua kode QR agar Anda tidak mengambil risiko kehilangan akses ke token apa pun.</string>
+    <string name="missing_qr_code_descriptor">• - Kode QR %d</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="other">Tetap mengimpor token %d</item>
+    </plurals>
+    <string name="import_google_auth_failure">Mengimpor ekspor Google Authenticator gagal</string>
+    <string name="unrelated_google_auth_batches_error">Ekspor berisi informasi untuk batch yang tidak terkait. Coba impor 1 batch dalam satu waktu.</string>
+    <string name="no_tokens_can_be_imported">Tidak ada token yang dapat diimpor sebagai hasilnya</string>
     <string name="unlocking_vault">Buka brankas</string>
-    <string name="slot_this_device">(perangkat ini)</string>
+    <string name="rename_group">Ganti Nama Grup</string>
+    <string name="no_group_selection">Jika sebuah entri bukan merupakan bagian dari grup mana pun, entri tersebut dapat ditemukan di bawah “Tidak ada grup”.</string>
     <string name="remove_group">Hapus kelompok</string>
     <string name="remove_group_description">Apakah Anda yakin ingin menghapus kelompok ini? Catatan dalam kelompok ini akan secara otomatis beralih ke \'Tidak ada kelompok\'.</string>
+    <string name="remove_unused_groups">Menghapus grup yang tidak digunakan</string>
+    <string name="remove_unused_groups_description">Apakah Anda yakin ingin menghapus semua grup yang tidak ditetapkan ke entri?</string>
     <string name="remove_icon_pack">Hapus Paket Ikon</string>
     <string name="remove_icon_pack_description">Apakah Anda yakin ingin menghapus paket ikon ini? Entri yang menggunakan ikon dari paket ini tidak akan terpengaruh.</string>
     <string name="details">Rincian</string>
+    <string name="show_error_details">Tampilkan detil eror</string>
     <string name="lock">Kunci</string>
     <string name="name">Nama</string>
     <string name="no_group">Tidak ada kelompok</string>
-    <string name="sort">Sortir</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sortir</string>
     <string name="sort_alphabetically">Penerbit (A ke Z)</string>
     <string name="sort_alphabetically_reverse">Penerbit (Z ke A)</string>
     <string name="sort_alphabetically_name">Akun (A ke Z)</string>
     <string name="sort_alphabetically_name_reverse">Akun (Z ke A)</string>
     <string name="sort_usage_count">Jumlah penggunaan</string>
+    <string name="sort_last_used">Terakhir digunakan</string>
     <string name="sort_custom">Kustom</string>
+    <string name="last_used">Terakhir digunakan</string>
+    <string name="last_used_never">tidak pernah</string>
     <string name="new_group">Kelompok baru…</string>
     <string name="group">Kelompok</string>
     <string name="group_name_hint">Nama kelompok</string>
@@ -237,10 +352,16 @@
     <string name="preference_reset_usage_count">Atur ulang jumlah penggunaan</string>
     <string name="preference_reset_usage_count_summary">Atur ulang jumlah penggunaan setiap entri di brankas Anda</string>
     <string name="preference_reset_usage_count_dialog">Apakah Anda yakin ingin mengatur ulang jumlah penggunaan semua entri di brankas Anda menjadi 0?</string>
-    <string name="note">Catatan</string>
+    <string name="note" comment="Users can add a note to an entry">Catatan</string>
     <string name="clear">Bersihkan</string>
     <string name="pref_highlight_entry_title">Sorot token saat disentuh</string>
     <string name="pref_highlight_entry_summary">Jadikan token untuk lebih mudah dibedakan satu sama lain dengan menyorotnya saat disentuh</string>
+    <string name="pref_groups_multiselect_title">Pilih berganda grup</string>
+    <string name="pref_groups_multiselect_summary">Mengizinkan memilih beberapa grup pada saat yang sama</string>
+    <string name="pref_minimize_on_copy_title">Meminimalkan penyalinan</string>
+    <string name="pref_minimize_on_copy_summary">Meminimalkan aplikasi setelah menyalin token</string>
+    <string name="pref_copy_behavior_title">Menyalin token ke papan klip</string>
+    <string name="pref_search_behavior_title">Aktivitas pencarian</string>
     <string name="pref_pause_entry_title">Bekukan token ketika disentuh</string>
     <string name="pref_pause_entry_summary">Hentikan penyegaran otomatis token dengan menyentuh mereka. Token tidak akan diperbarui selama mereka difokuskan. Membutuhkan \"Sorot token saat disentuh\" atau \"Sentuh untuk melihat.\"</string>
     <string name="pin_keyboard_description">Masukkan kata sandi Anda untuk mengaktifkan keyboard PIN. Perhatikan bahwa ini hanya berfungsi jika kata sandi Anda hanya terdiri dari angka</string>
@@ -256,16 +377,21 @@
     <string name="normal_viewmode_title">Normal</string>
     <string name="compact_mode_title">Ringkas</string>
     <string name="small_mode_title">Kecil</string>
+    <string name="tiles_mode_title">Menu</string>
     <string name="unknown_issuer">Penerbit tidak diketahui</string>
     <string name="unknown_account_name">Nama akun tidak diketahui</string>
     <plurals name="import_error_dialog">
-        <item quantity="other">Aegis tidak dapat mengimpor %d token. Token ini akan dilewati. Tekan \'detail\' untuk melihat informasi lebih lanjut tentang kesalahan tersebut.</item>
+        <item quantity="other">Aegis tidak dapat mengimpor token %d. Token ini akan dilewati. Tekan \'detail\' untuk melihat informasi lebih lanjut tentang kesalahan.</item>
     </plurals>
+    <string name="unable_to_process_deeplink">Tidak dapat memproses tautan dalam</string>
     <string name="unable_to_read_qrcode_file">Tidak dapat membaca dan memproses kode QR dari berkas: %s.</string>
-    <string name="unable_to_read_qrcode_files">Tidak dapat membaca dan memproses beberapa dari kode QR. Hanya %d/%d entri yang akan diimpor.</string>
+    <string name="unable_to_process_shared_text">Tidak dapat memproses teks bersama sebagai OTP</string>
+    <string name="unable_to_read_qrcode_files">Tidak dapat membaca dan memproses sebagian kode QR. Hanya entri %1$d/%2$d yang akan diimpor.</string>
     <string name="unable_to_generate_qrcode">Tidak dapat membuat kode QR</string>
     <string name="select_picture">Pilih gambar</string>
     <string name="select_icon">Pilih ikon</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Buka brankas</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Buka pemindai</string>
     <string name="toggle_checkboxes">Alihkan kotak centang</string>
     <string name="search">Cari</string>
     <string name="channel_name_lock_status">Status kunci</string>
@@ -292,10 +418,22 @@
     <string name="time_sync_warning_disable">Berhenti memperingatkan saya. Saya tahu apa yang saya lakukan.</string>
     <string name="google_qr_export_unrelated">Ditemukan kode QR yang tidak terkait. Coba mulai ulang pemindai.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="other">Pindai %d/%d code QR</item>
+        <item quantity="other">Kode QR yang dipindai %1$d/%2$d</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Kode QR yang ditemukan #%d, namun hanya #%d yang dipindai</string>
+    <string name="google_qr_export_unexpected">Kode QR yang seharusnya #%1$d, tetapi yang dipindai justru #%2$d</string>
     <string name="backup_error_bar_message"><b>Pencadangan Brankas baru-baru ini gagal</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">               Upaya pencadangan brankas terkini menggunakan %1$s gagal karena terjadi kesalahan. Pencadangan telah dilakukan dengan menggunakan %2$s. Periksa pengaturan pencadangan Anda untuk memastikan pencadangan berhasil diselesaikan.</string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Upaya pencadangan brankas terkini menggunakan %1$s gagal karena Aegis tidak memiliki izin untuk menulis ke tujuan pencadangan. Pencadangan telah dilakukan dengan menggunakan %2$s. Kesalahan ini dapat terjadi jika Anda memindahkan/mengganti nama tujuan pencadangan atau jika Anda baru saja memulihkan Aegis dari pencadangan. Harap konfigurasikan ulang tujuan pencadangan.</string>
+    <string name="backup_system_builtin">Pencadangan otomatis bawaan Aegis</string>
+    <string name="backup_system_android">Sistem pencadangan awan Android</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Backup terakhir sudah kedaluwarsa (%s)
+    </string>
+    <string name="backup_reminder_bar_message">        Perubahan tidak di backup
+    </string>
+    <string name="backup_reminder_bar_dialog_title">Perubahan tidak di backup</string>
+    <string name="backup_reminder_bar_dialog_summary">        Perubahan terbaru pada brankas belum dicadangkan. Penting untuk melakukan pencadangan secara teratur untuk mencegah kehilangan akses ke akun Anda. Pertimbangkan untuk menyiapkan pencadangan otomatis di menu pengaturan.
+    </string>
+    <string name="backup_reminder_bar_dialog_accept">Menyiapkan cadangan</string>
     <string name="backup_plaintext_export_warning"><b>Brankas baru-baru ini diekspor dalam teks biasa</b></string>
     <string name="pref_show_plaintext_warning_hint">Jangan perlihatkan peringatan ini lagi</string>
     <string name="backup_plaintext_warning_explanation">Peringatan ini ditampilkan karena Anda baru-baru ini mengekspor salinan tidak terenkripsi dari brankas. Untuk menjaga keamanan token Anda, kami merekomendasikan untuk menghapus berkas ini ketika sudah tidak dibutuhkan.</string>
@@ -309,15 +447,22 @@
     <string name="pick_icon">Pilih sebuah ikon</string>
     <string name="uncategorized">Tidak Dikategorikan</string>
     <string name="done">Selesai</string>
+    <plurals name="qr_count">
+        <item quantity="other">%d / %d Kode QR</item>
+    </plurals>
     <string name="next">Berikutnya</string>
     <string name="previous">Sebelumnya</string>
-    <string name="transfer_entry">Pindahkan entri</string>
+    <string name="copy_uri">Salin URI</string>
+    <string name="unable_to_copy_uri_to_clipboard">Tidak dapat menyalin URI ke clipboard</string>
+    <string name="uri_copied_to_clipboard">URI disalin ke papan klip</string>
     <string name="transfer_entry_description">Pindai kode QR ini dengan aplikasi autentikasi yang ingin Anda pindahkan ke sana entri ini</string>
+    <string name="google_auth_compatible_transfer_description">Pindai kode QR ini dengan Aegis atau Google Authenticator.\n\nKarena keterbatasan aplikasi Google Authenticator, hanya token TOTP &amp; HOTP yang menggunakan SHA1 dan menghasilkan kode 6 digit yang disertakan</string>
     <string name="password_strength_very_weak">Sangat lemah</string>
     <string name="password_strength_weak">Lemah</string>
     <string name="password_strength_fair">Baik</string>
     <string name="password_strength_good">Baik</string>
     <string name="password_strength_strong">Kuat</string>
+    <string name="password_strength_unknown">Kata sandi terlalu panjang untuk analisis kekuatan</string>
     <string name="pref_pin_keyboard_title">Gunakan keyboard PIN di layar kunci</string>
     <string name="pref_pin_keyboard_summary">Aktifkan ini jika Anda ingin mengaktifkan keyboard PIN di layar kunci. Ini hanya berfungsi untuk kata sandi numerik</string>
     <string name="title_activity_preferences">Pengaturan</string>
@@ -326,14 +471,20 @@
     <string name="title_activity_about">Tentang</string>
     <string name="title_activity_edit_entry">Sunting entri</string>
     <string name="title_activity_scan_qr">Pindai kode QR</string>
-    <string name="title_activity_manage_slots">Atur slot kunci</string>
     <string name="title_activity_import_entries">Impor entri</string>
+    <string name="title_activity_assign_icons">Tetapkan ikon</string>
+    <string name="title_activity_licenses">Lisensi pihak ketiga</string>
     <string name="dialog_wipe_entries_title">Hapus catatan</string>
     <string name="dialog_wipe_entries_message">Brankas Anda sudah memiliki catatan. Apakah Anda ingin menghapus catatan ini tanpa mengimpor berkas ini?\n\n<b>Jika ini dilakukan, Anda akan kehilangan akses secara permanen ke catatan yang ada di brankas.</b></string>
     <string name="dialog_wipe_entries_checkbox">Hapus konten brankas</string>
     <string name="panic_trigger_ignore_toast">Aegis menerima perintah darurat tetapi pengaturan dinonaktifkan, abaikan</string>
     <string name="pref_panic_trigger_title">Hapus brankas pada perintah darurat</string>
     <string name="pref_panic_trigger_summary">Hapus brankas saat menerima indikasi perintah darurat</string>
+    <string name="import_vault">Mengimpor brankas Aegis</string>
+    <string name="import_vault_hint">Ingin mengimpor dari aplikasi 2FA yang berbeda? Selesaikan penyiapan terlebih dahulu, lalu buka menu pengaturan.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="other">Tidak dicentang %d potensi duplikat. Silakan tinjau daftar entri.</item>
+    </plurals>
     <string name="importer_help_2fas">Sediakan sebuah berkas cadangan Autetikator 2FAS.</string>
     <string name="importer_help_aegis">Siapkan berkas ekspor/cadangan Aegis.</string>
     <string name="importer_help_authenticator_plus">Siapkan berkas ekspor Authenticator Plus yang didapat melalui<b>Pengaturan -&gt; Pemulihan &amp; Cadangan -&gt; Ekspor sebagai Teks dan HTML</b>.</string>
@@ -341,20 +492,56 @@
 <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, yang terletak di direktori penyimpanan internal Authy.</string>
     <string name="importer_help_andotp">Siapkan berkas ekspor/cadangan andOTP.</string>
     <string name="importer_help_bitwarden">Masukkan berkas cadangan/ekspor Bitwarden. Berkas terenkripsi tidak didukung.</string>
+    <string name="importer_help_battle_net_authenticator">Sediakan salinan <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, yang terletak di direktori penyimpanan internal Battle.net Authenticator.</string>
     <string name="importer_help_duo">Siapkan salinan
 <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, yang terletak di direktori penyimpanan internal DUO.</string>
-    <string name="importer_help_freeotp">Siapkan salinan
-<b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, yang terletak di direktori penyimpanan internal FreeOTP.</string>
+    <string name="importer_help_ente_auth">Menyediakan file ekspor Ente Auth. Saat ini hanya file yang tidak dienkripsi yang didukung.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Menyediakan berkas cadangan.\nFreeOTP 1.x: Menyediakan salinan  <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, yang terletak di direktori penyimpanan internal FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Siapkan berkas ekspor FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Kompatibilitas FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Ada sejumlah masalah dalam FreeOTP 2 yang dapat mengakibatkan cadangan rusak. Aegis akan mencoba menyelamatkan sebanyak mungkin entri, tetapi ada kemungkinan beberapa atau bahkan semuanya gagal diimpor.</string>
     <string name="importer_help_google_authenticator"><b>Hanya berkas basis data dari Google Authenticator v5.10 dan sebelumnya yang didukung</b>.\n\nMasukkan salinan dari <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, yang tersimpan di direktori penyimpanan internal Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Siapkan salinan
 <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, yang terletak di direktori penyimpanan internal Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Siapkan berkas plain text Google Authenticator dengan URI di setiap baris.</string>
+    <string name="importer_help_steam"><b>Steam v3.0 dan yang lebih baru tidak didukung</b>. Sediakan salinan <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, yang terletak di direktori penyimpanan internal Steam.</string>
+    <string name="importer_help_stratum">Sediakan berkas ekspor Stratum yang diperoleh melalui <b>Pengaturan -&gt; Cadangkan -&gt; Cadangkan ke berkas terenkripsi (disarankan)</b>.</string>
     <string name="importer_help_totp_authenticator">Siapkan berkas ekspor Autentikasi TOTP.</string>
     <string name="importer_help_winauth">Siapkan berkas ekspor WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Tetapkan ikon</string>
+    <string name="import_assign_icons_dialog_text">Apakah Anda ingin menetapkan ikon ke entri yang diimpor?</string>
     <string name="importer_encrypted_exception_google_authenticator">Entri terenkripsi dilewati: %s</string>
     <string name="importer_help_direct">Impor entri langsung dari %s. Ini membutuhkan aplikasi untuk diinstal pada perangkat ini dan untuk akses root diberikan ke Aegis.</string>
     <string name="groups">Kelompok-kelompok</string>
     <string name="pref_focus_search">Fokuskan pencarian saat aplikasi dimulai</string>
     <string name="pref_focus_search_summary">Fokuskan pencarian langsung setelah membuka aplikasi.</string>
+    <string name="pref_grouping_halves">Dibelah dua</string>
+    <string name="pref_grouping_none">Tidak dikelompokan</string>
+    <string name="pref_grouping_size_two">Dua kelompok</string>
+    <string name="pref_grouping_size_three">Tiga kelompok</string>
+    <string name="pref_grouping_size_four">Empat kelompok</string>
+    <string name="pref_copy_behavior_never">Tidak pernah</string>
+    <string name="pref_copy_behavior_single_tap">Ketuk sekali</string>
+    <string name="pref_copy_behavior_double_tap">Ketuk dua kali</string>
+    <string name="pref_account_name_position_hidden">Tersembunyi</string>
+    <string name="pref_account_name_position_end">Di sebelah emiten</string>
+    <string name="pref_account_name_position_below">Di bawah emiten</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="other">%d detik yang lalu</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="other">%d menit yang lalu</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="other">%d jam yang lalu</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="other">%d hari yang lalu</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="other">%d tahun yang lalu</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="other">%d item terpilih</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-it-rIT-v29/strings.xml b/app/src/main/res/values-it-rIT-v29/strings.xml
new file mode 100644
index 00000000..be06f5e1
--- /dev/null
+++ b/app/src/main/res/values-it-rIT-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Predefinito di sistema</string>
+    <string name="system_amoled_theme_title">Predefinito di sistema (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 97cc08a7..45a7d135 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Impostazioni</string>
     <string name="action_about">Informazioni</string>
     <string name="action_delete">Elimina</string>
     <string name="action_transfer">Trasferisci</string>
-    <string name="action_edit_icon">Modifica icona</string>
+    <string name="action_edit_icon">Modifica l\'icona</string>
     <string name="action_reset_usage_count">Azzera il numero di utilizzi</string>
     <string name="action_reset_usage_count_dialog">Sei sicuro di voler riportare a zero il numero di utilizzi di questa voce?</string>
-    <string name="action_default_icon">Ripristina icona predefinita</string>
+    <string name="action_default_icon">Ripristina l\'icona predefinita</string>
     <string name="discard">Annulla</string>
     <string name="save">Salva</string>
+    <string name="all">Tutti</string>
     <string name="issuer">Servizio</string>
     <string name="yandex_pin">PIN (4–16 cifre)</string>
     <string name="motp_pin">PIN (4 cifre)</string>
-    <string name="suggested">Suggeriti</string>
+    <string name="suggested">Consigliato</string>
     <string name="usage_count">Numero di utilizzi</string>
-    <string name="warning">Attenzione</string>
-    <string name="pref_cat_appearance_app">App</string>
+    <string name="warning">Avviso</string>
+    <string name="pref_cat_appearance_app">Applicazione</string>
     <string name="pref_cat_appearance_entries">Voci</string>
     <string name="pref_cat_backups_android">Android</string>
     <string name="pref_cat_backups_auto">Backup automatici</string>
@@ -25,66 +26,83 @@
     <string name="pref_section_appearance_title">Aspetto</string>
     <string name="pref_section_appearance_summary">Imposta il tema, la lingua e altre impostazioni che cambiano l\'aspetto dell\'app.</string>
     <string name="pref_section_security_title">Sicurezza</string>
-    <string name="pref_section_security_summary">Configura crittografia, sblocco biometrico, blocco automatico e altre impostazioni di sicurezza.</string>
+    <string name="pref_section_security_summary">Configura la crittografia, lo sblocco biometrico, il blocco automatico e altre impostazioni di sicurezza.</string>
     <string name="pref_section_import_export_title">Importa / Esporta</string>
     <string name="pref_section_import_export_summary">Importa i backup di Aegis o di altre applicazioni di autenticazione. Crea esportazioni manuali della tua cassaforte di Aegis.</string>
+    <string name="pref_section_audit_log_title">Registro di controllo</string>
+    <string name="pref_section_audit_log_summary">Trova un elenco di tutti gli eventi importanti segnalati che sono avvenuti nell\'app.</string>
     <string name="pref_section_backups_title">Backup</string>
     <string name="pref_section_backups_summary">Imposta i backup automatici in una posizione a tua scelta o abilita la partecipazione al sistema di backup cloud di Android.</string>
     <string name="pref_section_icon_packs">Pacchetti di icone</string>
     <string name="pref_section_icon_packs_summary">Gestisci e importa i pacchetti di icone</string>
     <string name="pref_select_theme_title">Tema</string>
-    <string name="pref_view_mode_title">Visualizzazione</string>
+    <string name="pref_dynamic_colors_title">Colori dinamici</string>
+    <string name="pref_dynamic_colors_summary">Applica una sovrapposizione basata sui colori del tema di Android</string>
+    <string name="pref_view_mode_title">Visualizzazione delle voci</string>
     <string name="pref_lang_title">Lingua</string>
-    <string name="pref_show_icons_title">Mostra icone</string>
+    <string name="pref_show_icons_title">Mostra le icone</string>
     <string name="pref_show_icons_summary">Mostra le icone accanto a ogni voce</string>
-    <string name="pref_code_group_size_title">Raggruppamento cifre codice</string>
+    <string name="pref_code_group_size_title">Raggruppamento delle cifre dei codici</string>
     <string name="pref_code_group_size_summary">Seleziona il numero di cifre per cui raggruppare i codici</string>
     <string name="pref_account_name_position_title">Mostra il nome dell\'account</string>
-    <string name="pref_shared_issuer_account_name_title">Mostra il nome dell\'account solo quando necessario</string>
-    <string name="pref_shared_issuer_account_name_summary">Mostra i nomi degli account quando condividono lo stesso emittente. I nomi degli altri account verranno nascosti.</string>
-    <string name="pref_account_name_position_summary_override">Questa impostazione è sovrascritta dalla visualizzazione a schede. Il nome dell\'account verrà sempre mostrato sotto all\'emittente.</string>
-    <string name="pref_import_file_title">Importa da file</string>
-    <string name="pref_import_file_summary">Importa token da file</string>
+    <string name="pref_show_next_code_title">Mostra il codice successivo</string>
+    <string name="pref_show_next_code_summary">Genera e mostra il codice successivo in anticipo</string>
+    <string name="pref_expiration_state_title">Mostra quando qualche codice sta per scadere</string>
+    <string name="pref_expiration_state_summary">Cambia il colore e fa\' lampeggiare i codici che stanno per scadere</string>
+    <string name="pref_expiration_state_fallback">Cambia il colore dei codici quando stanno per scadere</string>
+    <string name="pref_shared_issuer_account_name_title">Mostra il nome dell\'account solo se necessario</string>
+    <string name="pref_shared_issuer_account_name_summary">Mostra i nomi degli account quando condividono lo stesso servizio. I nomi degli altri account verranno nascosti.</string>
+    <string name="pref_account_name_position_summary_override">Questa impostazione è sovrascritta dalla visualizzazione a schede. Il nome dell\'account verrà mostrato sotto a quello del servizio.</string>
+    <string name="pref_import_file_title">Importa da un file</string>
+    <string name="pref_import_file_summary">Importa i token da un file</string>
     <string name="pref_android_backups_title">Backup cloud di Android</string>
-    <string name="pref_android_backups_summary">Permetti al sistema di backup cloud di Android di includere la cassaforte di Aegis nei suoi backup. Questa funzionalità è supportata solo per casseforti cifrate.</string>
-    <string name="pref_android_backups_hint"><i>I backup da dispositivo a dispositivo (D2D) sono sempre consentiti, indipendentemente dall\'impostazione sopra</i></string>
+    <string name="pref_android_backups_summary">Permetti al sistema di backup cloud di Android di includere la cassaforte di Aegis nei suoi backup. Questa funzionalità è supportata solo per casseforti crittografate.</string>
+    <string name="pref_android_backups_hint"><i>I backup da dispositivo a dispositivo (D2D) sono sempre consentiti, indipendentemente dall\'impostazione qui sopra</i></string>
     <string name="pref_backups_title">Backup automatico della cassaforte</string>
     <string name="pref_backups_summary">Effettua automaticamente un backup della cassaforte nella memoria esterna quando vengono apportate delle modifiche. Questa funzionalità è supportata solo per casseforti crittografate.</string>
     <string name="pref_backups_reminder_title">Promemoria di backup</string>
-    <string name="pref_backups_reminder_summary">Mostra un promemoria di effettuare il backup della cassaforte nel caso in cui non sia stato fatto dopo le ultime modifiche.</string>
-    <string name="pref_backups_reminder_dialog_title">Disabilita promemoria di backup</string>
-    <string name="pref_backups_reminder_dialog_summary">Disattivare questo promemoria comporta che Aegis non ti avviserà delle eventuali modifiche di cui non hai ancora eseguito il backup. Ciò comporta il rischio di perdere l\'accesso ai tuoi token. Sei sicuro di voler disabilitare il promemoria?</string>
-    <string name="pref_backups_location_title">Cartella per i file di backup</string>
+    <string name="pref_backups_reminder_summary">Mostra un promemoria per effettuare il backup della cassaforte nel caso in cui non sia stato fatto dopo le ultime modifiche.</string>
+    <string name="pref_backups_reminder_dialog_title">Disabilita i promemoria di backup</string>
+    <string name="pref_backups_reminder_dialog_summary">Se disabiliti i promemoria, Aegis non ti avviserà delle eventuali modifiche di cui non hai ancora effettuato il backup. Ciò comporta il rischio di perdere l\'accesso ai tuoi token. Sei sicuro di voler disabilitare i promemoria?</string>
+    <string name="pref_backups_versioning_strategy_title">Strategia di backup</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Mantieni un numero di versioni</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Backup singolo</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">La strategia di backup selezionata non è affidabile e non è consigliata. Un singolo errore di backup potrebbe portare alla perdita dell\'unico salvataggio presente.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Seleziona una strategia di backup</string>
+    <string name="pref_backups_location_title">Percorso del backup</string>
     <string name="pref_backups_location_summary">I backup saranno salvati in</string>
-    <string name="pref_backups_trigger_title">Esegui backup</string>
+    <string name="pref_backup_location_summary">I backup saranno salvati in</string>
+    <string name="pref_backups_trigger_title">Effettua un backup</string>
     <string name="pref_backups_trigger_summary">Effettua un backup manualmente</string>
     <string name="pref_backups_versions_title">Numero di versioni da salvare</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Salva %1$d versione del backup</item>
         <item quantity="other">Salva %1$d versioni del backup</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Mantieni un numero infinito di versioni del backup</string>
     <string name="pref_import_app_title">Importa da app</string>
     <string name="pref_import_app_summary">Importa i token da un\'altra app (richiede i permessi di root)</string>
     <string name="pref_export_title">Esporta</string>
     <string name="pref_export_summary">Esporta la cassaforte</string>
-    <string name="pref_password_reminder_title">Promemoria password</string>
+    <string name="pref_password_reminder_title">Promemoria della password</string>
     <string name="pref_google_auth_export_title">Esporta per Google Authenticator</string>
-    <string name="pref_google_auth_export_descriptor">Genera codici QR per l\'esportazione compatibili con Google Authenticator</string>
+    <string name="pref_google_auth_export_descriptor">Genera dei codici QR per l\'esportazione compatibili con Google Authenticator</string>
     <string name="pref_google_auth_export_no_data">Nessun dato da esportare</string>
     <plurals name="pref_google_auth_export_incompatible_entries">
-        <item quantity="one">Saltata %d voce incompatibile</item>
+        <item quantity="one">Ignorata %d voce incompatibile</item>
         <item quantity="other">Ignorate %d voci incompatibili</item>
     </plurals>
     <string name="pref_password_reminder_summary">Mostra un promemoria %s per inserire la password, in modo da non dimenticarla.</string>
-    <string name="pref_password_reminder_summary_disabled">Disattivato</string>
-    <string name="pref_secure_screen_title">Sicurezza schermo</string>
+    <string name="pref_password_reminder_summary_disabled">Disabilitato</string>
+    <string name="pref_secure_screen_title">Sicurezza dello schermo</string>
     <string name="pref_secure_screen_summary">Blocca i tentativi di salvare schermate all\'interno dell\'app</string>
     <string name="pref_tap_to_reveal_title">Tocca per mostrare</string>
-    <string name="pref_tap_to_reveal_summary">I token saranno nascosti. Toccane uno per mostrare il codice.</string>
+    <string name="pref_tap_to_reveal_summary">I token verranno nascosti. Toccane uno per mostrare il codice.</string>
     <string name="pref_tap_to_reveal_time_title">Durata della visualizzazione del codice</string>
     <string name="pref_auto_lock_title">Blocco automatico</string>
     <string name="pref_auto_lock_summary">Quando %s</string>
-    <string name="pref_auto_lock_summary_disabled">Disattivato</string>
+    <string name="pref_auto_lock_summary_disabled">Disabilitato</string>
     <string name="pref_auto_lock_prompt">Blocca automaticamente Aegis se</string>
     <string name="pref_auto_lock_type_back_button">Il tasto Indietro viene premuto</string>
     <string name="pref_auto_lock_type_minimize">L\'app viene minimizzata</string>
@@ -95,12 +113,38 @@
     <string name="pref_backup_password_change_title">Cambia la password per il backup e l\'esportazione</string>
     <string name="pref_backup_password_change_summary">Imposta una nuova password che verrà utilizzata per cifrare la cassaforte durante il backup e l\'esportazione.</string>
     <string name="pref_encryption_title">Crittografia</string>
-    <string name="pref_encryption_summary">Cifra il database e sbloccalo con password o impronta digitale</string>
+    <string name="pref_encryption_summary">Cripta il database e sbloccalo con password o impronta digitale</string>
     <string name="pref_biometrics_title">Sblocco biometrico</string>
     <string name="pref_biometrics_summary">Consenti l\'autenticazione biometrica per sbloccare la cassaforte</string>
+    <string name="pref_search_behavior_summary">Cerca attraverso: %s</string>
+    <string name="pref_search_behavior_prompt">Cerca in uno dei seguenti campi</string>
+    <string name="pref_search_behavior_type_name">Nome</string>
+    <string name="pref_search_behavior_type_issuer">Servizio</string>
+    <string name="pref_search_behavior_type_note">Nota</string>
+    <string name="pref_search_behavior_type_groups">Gruppi</string>
     <string name="pref_set_password_title">Cambia password</string>
     <string name="pref_set_password_summary">Modifica la password utilizzata per sbloccare la tua cassaforte</string>
-    <string name="export_encrypted">Cifra la cassaforte</string>
+    <string name="no_events_title">Nessun evento segnalato</string>
+    <string name="no_events_description">Non sono stati segnalati eventi importanti all\'interno dell\'applicazione</string>
+    <string name="event_title_vault_unlocked">Cassaforte sbloccata</string>
+    <string name="event_description_vault_unlocked">La cassaforte è stata sbloccata con successo</string>
+    <string name="event_title_backup_created">Backup creato</string>
+    <string name="event_description_backup_created">Un backup della cassaforte è stato creato con successo</string>
+    <string name="event_title_android_backup_created">Backup creato da Android</string>
+    <string name="event_description_android_backup_created">Un backup della cassaforte è stato creato con successo da Android</string>
+    <string name="event_title_vault_exported">Cassaforte esportata</string>
+    <string name="event_description_vault_exported">Una copia della cassaforte è stata esportata</string>
+    <string name="event_title_entry_shared">Elemento condiviso</string>
+    <string name="event_description_entry_shared">Un elemento è stato condiviso</string>
+    <string name="event_title_vault_unlock_failed_password">Sblocco della cassaforte non riuscito (password)</string>
+    <string name="event_description_vault_unlock_failed_password">Un tentativo di sbloccare la cassaforte con una password non riuscito</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Sblocco della cassaforte non riuscito (biometrica)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Un tentativo di sbloccare la cassaforte con dati biometrici non riuscito</string>
+    <string name="event_unknown">Tipo di evento sconosciuto</string>
+    <string name="audit_log_entry_deleted">(eliminato)</string>
+    <string name="today_at_time">Oggi alle %1$s</string>
+    <string name="day_of_week_at_time">%1$s alle %2$s</string>
+    <string name="export_encrypted">Cripta la cassaforte</string>
     <string name="export_help">Questa azione esporterà la cassaforte al di fuori dello spazio di archiviazione interno di Aegis. Seleziona il formato che vorresti utilizzare per l\'esportazione:</string>
     <string name="export_warning_unencrypted">Stai per esportare una copia non criptata della tua cassaforte Aegis. <b>Questo non è consigliato</b>.</string>
     <string name="export_warning_password">Le esportazioni vengono crittografate utilizzando una password diversa configurata nelle impostazioni di sicurezza.</string>
@@ -116,7 +160,7 @@
         <item quantity="other">%d gruppi selezionati</item>
     </plurals>
     <string name="export_no_groups_selected">Non sono stati selezionati gruppi da esportare</string>
-    <string name="export_html_title" context="The title of an HTML export document">Esportazione di Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Esportazione di Aegis Authenticator</string>
     <string name="choose_authentication_method">Sicurezza</string>
     <string name="authentication_method_explanation">Aegis è un\'app per l\'autenticazione a due fattori incentrata sulla sicurezza. I token sono memorizzati in una cassaforte che può essere opzionalmente crittografata con una password. Se un utente malintenzionato ottiene il file criptato della cassaforte, non sarà in grado di accedere ai contenuti senza conoscere la password.\n\nAbbiamo già selezionato l\'opzione che riteniamo più adatta per il tuo dispositivo.</string>
     <string name="authentication_method_none">Nessuna</string>
@@ -128,7 +172,7 @@
     <string name="authentication_method_biometrics_description">Oltre a una password, i dati biometrici registrati su questo dispositivo, come un\'impronta digitale o il tuo volto, possono essere utilizzati per sbloccare la cassaforte.</string>
     <string name="authentication">Sblocca la cassaforte</string>
     <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Sblocca\nla cassaforte</string>
-    <string name="auth_use_biometrics">Oppure tocca qui per usare i <font fgcolor="#FF0D86C1">dati biometrici</font></string>
+    <string name="auth_use_biometrics">Oppure tocca qui per usare la <font fgcolor="#FF0D86C1">biometria</font></string>
     <string name="set_password">Inserisci una password</string>
     <string name="set_group">Inserisci il nome di un gruppo</string>
     <string name="set_number">Inserisci un numero</string>
@@ -152,6 +196,7 @@
     <string name="share">Condividi</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
+    <string name="undo">Annulla</string>
     <string name="unlock">Sblocca</string>
     <string name="advanced">Avanzate</string>
     <string name="counter">Contatore</string>
@@ -163,6 +208,11 @@
     <string name="set_up_biometric">Imposta sblocco biometrico</string>
     <string name="copy">Copia</string>
     <string name="edit">Modifica</string>
+    <string name="select_all">Seleziona tutto</string>
+    <string name="assign_icons">Assegna icone</string>
+    <string name="assign_groups">Assegna al gruppo</string>
+    <string name="assign_groups_dialog_summary">Selezionare un gruppo al quale assegnare l\'elemento selezionato.</string>
+    <string name="assign_groups_dialog_dropdown">Seleziona un gruppo</string>
     <string name="favorite" comment="Verb">Aggiungi ai preferiti</string>
     <string name="unfavorite" comment="Verb">Rimuovi dai preferiti</string>
     <string name="error_all_caps">ERRORE</string>
@@ -172,15 +222,17 @@
     <string name="new_entry">Nuovo elemento</string>
     <string name="add_new_entry">Aggiungi nuovo elemento</string>
     <string name="unlock_vault_error">Impossibile sbloccare la cassaforte</string>
-    <string name="unlock_vault_error_description">Password errata. Assicurati di non aver sbagliato a digitarla.</string>
+    <string name="unlock_vault_error_description">Password errata. Verifica di averla inserita correttamente.</string>
     <string name="password_equality_error">Le password devono essere identiche e non vuote</string>
     <string name="snackbar_authentication_method">Seleziona un metodo di autenticazione</string>
-    <string name="encrypting_vault">Cifratura della cassaforte in corso</string>
+    <string name="encrypting_vault">Crittografia della cassaforte in corso</string>
     <string name="exporting_vault">Esportazione della cassaforte in corso</string>
+    <string name="optimizing_icon">Ottimizzazione icona</string>
+    <string name="optimizing_icon_multiple">Ottimizzazione icone %1$d/%2$d</string>
     <string name="reading_file">Lettura del file in corso</string>
     <string name="requesting_root_access">Richiesta accesso root</string>
     <string name="analyzing_qr">Analisi del codice QR</string>
-    <string name="analyzing_qr_multiple">Analisi del codice QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analisi del codice QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Aggiunta %d nuova voce alla cassaforte</item>
         <item quantity="other">Aggiunte %d nuove voci alla cassaforte</item>
@@ -194,9 +246,10 @@
         <item quantity="one">Sei sicuro di voler eliminare %d elemento?</item>
         <item quantity="other">Sei sicuro di voler eliminare %d elementi?</item>
     </plurals>
-    <string name="discard_changes">Annullare le modifiche?</string>
+    <string name="discard_changes">Vuoi salvare le modifiche?</string>
     <string name="discard_changes_description">Le modifiche non sono state salvate</string>
     <string name="saving_profile_error">Errore nel salvataggio del profilo</string>
+    <string name="saving_assign_icons_error">Errore nell\'assegnazione delle icone</string>
     <string name="welcome">Benvenuto</string>
     <string name="app_description">Aegis è un\'app per l\'autenticazione a due fattori (2FA) gratuita, sicura e open source</string>
     <string name="setup_completed">Configurazione completata</string>
@@ -205,16 +258,17 @@
     <string name="copied">Copiato</string>
     <string name="errors_copied">Codice errore copiato negli appunti</string>
     <string name="version_copied">Versione copiata negli appunti</string>
+    <string name="error_required_field">Questo campo è necessario</string>
     <string name="error_occurred">Si è verificato un errore</string>
     <string name="decryption_error">Si è verificato un errore nello sblocco della cassaforte</string>
     <string name="decryption_corrupt_error">Si è verificato un errore durante lo sblocco della cassaforte. Il file della cassaforte potrebbe essere danneggiato.</string>
     <string name="saving_error">Si è verificato un errore durante il salvataggio della cassaforte</string>
     <string name="vault_init_error">Si è verificato un errore durante il tentativo di inizializzare la cassaforte</string>
     <string name="vault_load_error">Si è verificato un errore durante il caricamento della cassaforte dalla memoria</string>
-    <string name="biometric_decrypt_error">Si è verificato un errore durante il tentativo di decifrare la cassaforte con autenticazione biometrica. Probabilmente le impostazioni di sicurezza del dispositivo sono state modificate. Si prega di sbloccare la cassaforte con la password e riconfigurare l\'autenticazione biometrica nelle impostazioni di Aegis.</string>
+    <string name="biometric_decrypt_error">Si è verificato un errore durante il tentativo di decrittografia della cassaforte con autenticazione biometrica. Probabilmente le impostazioni di sicurezza del dispositivo sono state modificate. Sblocca la cassaforte con la password e configura nuovamente l\'autenticazione biometrica nelle impostazioni di Aegis.</string>
     <string name="biometric_init_error">Si è verificato un errore durante l\'inizializzazione dell\'autenticazione biometrica. Questo accade di solito quando le impostazioni di sicurezza del dispositivo sono state modificate. Si prega di sbloccare la cassaforte con la password e riconfigurare l\'autenticazione biometrica nelle impostazioni di Aegis.</string>
-    <string name="disable_encryption">Disabilita crittografia</string>
-    <string name="disable_encryption_description">Sei sicuro di voler disabilitare la cifratura? La cassaforte verrà salvata sotto forma di testo semplice. <b>Anche i backup automatici saranno disattivati</b>.</string>
+    <string name="disable_encryption">Disabilita la crittografia</string>
+    <string name="disable_encryption_description">Sei sicuro di voler disabilitare la crittografia? La cassaforte verrà salvata sotto forma di testo semplice. <b>Verranno disabilitati anche i backup automatici</b>.</string>
     <string name="enable_encryption_error">Errore durante l\'attivazione della crittografia</string>
     <string name="disable_encryption_error">Errore durante la disattivazione della crittografia</string>
     <string name="backup_successful">Il backup è stato pianificato correttamente</string>
@@ -268,15 +322,20 @@
     <string name="partial_google_auth_import">Rilevata esportazione di Google Authenticator incompleta</string>
     <string name="partial_google_auth_import_warning">Alcuni codici QR non sono presenti nell\'importazione. Non sono stati trovati i seguenti codici:\n\n<b>%s</b>\n\nPuoi continuare a importare questa esportazione parziale, ma ti consigliamo di riprovare con tutti i codici QR in modo da non perdere l\'accesso ai token.</string>
     <string name="missing_qr_code_descriptor">• QR code %d</string>
-    <string name="import_partial_export_anyway">Importa comunque %d token</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importa comunque il token %d</item>
+        <item quantity="other">Importa comunque i token %d</item>
+    </plurals>
     <string name="import_google_auth_failure">Importazione dell\'esportazione di Google Authenticator non riuscita</string>
     <string name="unrelated_google_auth_batches_error">L\'esportazione contiene informazioni per un lotto non correlato. Provare a importare un lotto alla volta.</string>
     <string name="no_tokens_can_be_imported">Di conseguenza non è possibile importare token</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Sblocco della cassaforte</string>
-    <string name="slot_this_device">(questo dispositivo)</string>
+    <string name="rename_group">Rinomina gruppo</string>
+    <string name="no_group_selection">Se un elemento non fa parte di alcun gruppo, può essere trovato in \"Nessun gruppo\".</string>
     <string name="remove_group">Rimuovi gruppo</string>
     <string name="remove_group_description">Sei sicuro di voler rimuovere questo gruppo? Gli elementi in questo gruppo verranno automaticamente spostati in \'Nessun gruppo\'.</string>
+    <string name="remove_unused_groups">Elimina gruppi non utilizzati</string>
+    <string name="remove_unused_groups_description">Sei sicuro di voler eliminare tutti i gruppi non assegnati a una voce?</string>
     <string name="remove_icon_pack">Rimuovi pacchetto di icone</string>
     <string name="remove_icon_pack_description">Sei sicuro di voler rimuovere questo pacchetto di icone? Le voci che usano le icone di questo pacchetto non saranno modificate.</string>
     <string name="details">Dettagli</string>
@@ -284,13 +343,16 @@
     <string name="lock">Blocca</string>
     <string name="name">Nome</string>
     <string name="no_group">Nessun gruppo</string>
-    <string name="sort">Ordina</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ordina</string>
     <string name="sort_alphabetically">Emittente (A-Z)</string>
     <string name="sort_alphabetically_reverse">Emittente (Z-A)</string>
     <string name="sort_alphabetically_name">Account (A-Z)</string>
     <string name="sort_alphabetically_name_reverse">Account (Z-A)</string>
     <string name="sort_usage_count">Numero di utilizzi</string>
+    <string name="sort_last_used">Ultimo utilizzo</string>
     <string name="sort_custom">Personalizzato</string>
+    <string name="last_used">Ultimo utilizzo</string>
+    <string name="last_used_never">mai</string>
     <string name="new_group">Nuovo gruppo…</string>
     <string name="group">Gruppo</string>
     <string name="group_name_hint">Nome gruppo</string>
@@ -299,13 +361,16 @@
     <string name="preference_reset_usage_count">Azzera il numero di utilizzi</string>
     <string name="preference_reset_usage_count_summary">Azzera il numero di utilizzi di ogni voce nella tua cassaforte</string>
     <string name="preference_reset_usage_count_dialog">Sei sicuro di voler riportare a zero il numero di utilizzi di ogni voce nella tua cassaforte?</string>
-    <string name="note">Nota</string>
+    <string name="note" comment="Users can add a note to an entry">Nota</string>
     <string name="clear">Pulisci</string>
     <string name="pref_highlight_entry_title">Evidenzia i token al tocco</string>
     <string name="pref_highlight_entry_summary">Rendi i token più facili da distinguere, evidenziandoli temporaneamente quando vengono toccati</string>
+    <string name="pref_groups_multiselect_title">Gruppi multiselezione</string>
+    <string name="pref_groups_multiselect_summary">Consente la selezione multipla di più gruppi contemporaneamente</string>
     <string name="pref_minimize_on_copy_title">Minimizza alla copia</string>
     <string name="pref_minimize_on_copy_summary">Minimizza l\'app dopo aver copiato un token</string>
     <string name="pref_copy_behavior_title">Copia i token negli appunti</string>
+    <string name="pref_search_behavior_title">Comportamento di ricerca</string>
     <string name="pref_pause_entry_title">Blocca i token con un tocco</string>
     <string name="pref_pause_entry_summary">Metti in pausa l\'aggiornamento automatico dei token toccandoli. I token non si aggiorneranno finché sono evidenziati. Richiede \"Evidenzia i token al tocco\" o \"Tocca per mostrare\".</string>
     <string name="pin_keyboard_description">Inserisci la password per abilitare la tastiera PIN. Funziona solo se la password è composta di soli numeri</string>
@@ -316,8 +381,8 @@
     <string name="dark_theme_title">Tema scuro</string>
     <string name="light_theme_title">Tema chiaro</string>
     <string name="amoled_theme_title">Tema AMOLED</string>
-    <string name="system_theme_title">Impostato in base al risparmio energetico</string>
-    <string name="system_amoled_theme_title">Impostato in base al risparmio energetico (AMOLED)</string>
+    <string name="system_theme_title">Predefinito di sistema</string>
+    <string name="system_amoled_theme_title">Predefinito di sistema (AMOLED)</string>
     <string name="normal_viewmode_title">Normale</string>
     <string name="compact_mode_title">Compatto</string>
     <string name="small_mode_title">Piccolo</string>
@@ -325,13 +390,13 @@
     <string name="unknown_issuer">Emittente sconosciuto</string>
     <string name="unknown_account_name">Nome account sconosciuto</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis non può importare %d token. Questi token verranno saltati. Premi \'dettagli\' per vedere ulteriori informazioni sugli errori.</item>
-        <item quantity="other">Aegis non può importare %d token. Questi token verranno saltati. Premi \'dettagli\' per vedere ulteriori informazioni sugli errori.</item>
+        <item quantity="one">Aegis non può importare %d token. Questo token verrà ignorato. Premi \'dettagli\' per vedere ulteriori informazioni sull\'errore.</item>
+        <item quantity="other">Aegis non può importare %d token. Questi token verranno ignorati. Premi \'dettagli\' per vedere ulteriori informazioni sugli errori.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Impossibile elaborare il collegamento</string>
     <string name="unable_to_read_qrcode_file">Impossibile leggere ed elaborare il codice QR dal file: %s.</string>
     <string name="unable_to_process_shared_text">Impossibile elaborare il testo condiviso come OTP</string>
-    <string name="unable_to_read_qrcode_files">Impossibile leggere ed elaborare alcuni dei codici QR. Ne verranno importati solo %d/%d.</string>
+    <string name="unable_to_read_qrcode_files">Impossibile leggere ed elaborare alcuni dei codici QR. Solo %1$d/%2$d elementi verranno importati.</string>
     <string name="unable_to_generate_qrcode">Impossibile generare il codice QR</string>
     <string name="select_picture">Seleziona immagine</string>
     <string name="select_icon">Seleziona icona</string>
@@ -354,8 +419,8 @@
     <string name="email_us">Scrivici una email</string>
     <string name="visit_website">Visita il nostro sito web</string>
     <string name="about_support">Supporto</string>
-    <string name="support_rate">Vota</string>
-    <string name="support_rate_description">Supportaci lasciando una recensione nel Google Play Store</string>
+    <string name="support_rate">Votaci</string>
+    <string name="support_rate_description">Supportaci con una recensione nel Google Play Store</string>
     <string name="webview_error">Questo dispositivo non supporta la visualizzazione web, necessaria per visualizzare il changelog e la licenza. Manca un componente di sistema.</string>
     <string name="email">Email</string>
     <string name="time_sync_warning_title">Sincronizzazione automatica dell\'ora</string>
@@ -363,12 +428,14 @@
     <string name="time_sync_warning_disable">Smettetela di avvertirmi. So cosa sto facendo.</string>
     <string name="google_qr_export_unrelated">Trovato codice QR non correlato. Prova a riavviare lo scanner.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Scansionato %d/%d codici QR</item>
-        <item quantity="other">Scansionati %d/%d codici QR</item>
+        <item quantity="one">Scansionato %1$d/%2$d codici QR</item>
+        <item quantity="other">Scansionati %1$d/%2$d codici QR</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Previsto codice QR #%d, ma scansionato #%d invece</string>
+    <string name="google_qr_export_unexpected">Atteso il codice QR #%1$d, ma invece è stato scansionato #%2$d</string>
     <string name="backup_error_bar_message"><b>Backup della cassaforte fallito recentemente</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Un recente tentativo di backup della cassaforte utilizzando %s non è riuscito perché si è verificato un errore. Il backup è stato tentato %s. Controlla le impostazioni di backup per assicurarti che i backup possano essere completati correttamente.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Un recente tentativo di backup della cassaforte con %1$s non è riuscito perché si è verificato un errore. Il backup è stato tentato %2$s. Verificare le impostazioni di backup per assicurarsi che i backup possano essere completati correttamente.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Un recente tentativo di backup della cassaforte con %1$s non è riuscito perché Aegis non aveva l\'autorizzazione di scrittura nella destinazione del backup. Il backup è stato tentato %2$s. Questo errore può verificarsi se è stato spostata o rinominata la destinazione del backup o se recentemente è stato ripristinato Aegis da un backup. Configurare nuovamente la destinazione del backup.
     </string>
     <string name="backup_system_builtin">i backup automatici integrati di Aegis</string>
     <string name="backup_system_android">il sistema di backup su cloud di Android</string>
@@ -379,7 +446,7 @@
     <string name="backup_reminder_bar_dialog_title">Le modifiche non vengono sottoposte a backup</string>
     <string name="backup_reminder_bar_dialog_summary">        Le recenti modifiche alla cassaforte non sono ancora state sottoposte a backup. È importante eseguire backup regolari per evitare di perdere l\'accesso ai propri account. Si consiglia di impostare i backup automatici nel menu delle impostazioni.    </string>
     <string name="backup_reminder_bar_dialog_accept">Configura i backup</string>
-    <string name="backup_plaintext_export_warning"><b>La cassaforte è stata recentemente esportata in testo normale</b></string>
+    <string name="backup_plaintext_export_warning"><b>La cassaforte è stata recentemente esportata in testo semplice</b></string>
     <string name="pref_show_plaintext_warning_hint">Non mostrare più questo avviso</string>
     <string name="backup_plaintext_warning_explanation">Questo avviso viene visualizzato perché di recente è stata esportata una copia non crittografata della cassaforte. Per mantenere la sicurezza dei tuoi token, ti consigliamo di eliminare questo file quando non è più necessario.</string>
     <string name="switch_camera">Cambia fotocamera</string>
@@ -401,53 +468,65 @@
     <string name="copy_uri">Copia URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Impossibile copiare l\'URI negli appunti</string>
     <string name="uri_copied_to_clipboard">URI copiato negli appunti</string>
-    <string name="transfer_entry">Trasferisci voce</string>
     <string name="transfer_entry_description">Scansiona questo codice QR con l\'app di autenticazione a cui vuoi trasferire questa voce</string>
-    <string name="google_auth_compatible_transfer_description">Scansionare questi codici QR con Aegis o Google Authenticator.\n\nA causa delle limitazioni dell\'applicazione Google Authenticator, sono inclusi solo i token TOTP e HOTP che utilizzano SHA1 e producono codici a 6 cifre</string>
+    <string name="transfer_entry_brightness">Tocca il codice QR per attivare o disattivare la luminosità a schermo intero</string>
+    <string name="google_auth_compatible_transfer_description">Scansiona questi codici QR con Aegis o Google Authenticator.\n\nA causa delle limitazioni dell\'app Google Authenticator, sono inclusi solo i token TOTP e HOTP che utilizzano SHA1 e producono codici a 6 cifre</string>
     <string name="password_strength_very_weak">Molto debole</string>
     <string name="password_strength_weak">Debole</string>
     <string name="password_strength_fair">Sufficiente</string>
     <string name="password_strength_good">Buona</string>
     <string name="password_strength_strong">Forte</string>
+    <string name="password_strength_unknown">Password troppo lunga per l\'analisi della robustezza</string>
     <string name="pref_pin_keyboard_title">Usa la tastiera PIN nella schermata di blocco</string>
     <string name="pref_pin_keyboard_summary">Abilita questa opzione se vuoi utilizzare la tastiera PIN nella schermata di blocco. Funziona solo per le password numeriche</string>
     <string name="title_activity_preferences">Impostazioni</string>
     <string name="title_activity_manage_groups">Gestisci gruppi</string>
     <string name="title_activity_transfer">Trasferisci voci</string>
-    <string name="title_activity_about">Informazioni su</string>
+    <string name="title_activity_about">Informazioni</string>
     <string name="title_activity_edit_entry">Modifica voce</string>
     <string name="title_activity_scan_qr">Scansiona un codice QR</string>
-    <string name="title_activity_manage_slots">Gestisci slot di chiavi</string>
     <string name="title_activity_import_entries">Importa voci</string>
+    <string name="title_activity_assign_icons">Assegna icone</string>
+    <string name="title_activity_licenses">Licenze di terze parti</string>
     <string name="dialog_wipe_entries_title">Cancella voci</string>
     <string name="dialog_wipe_entries_message">La tua cassaforte contiene già delle voci. Rimuovere queste voci prima di importare questo file?\n\n<b>In questo modo, perderai definitivamente l\'accesso alle voci esistenti nella cassaforte.</b></string>
     <string name="dialog_wipe_entries_checkbox">Cancella contenuto della cassaforte</string>
     <string name="panic_trigger_ignore_toast">Aegis ha ignorato il segnale di emergenza perché l\'opzione corrispondente è disabilitata</string>
     <string name="pref_panic_trigger_title">Elimina cassaforte al segnale di emergenza</string>
     <string name="pref_panic_trigger_summary">Elimina la cassaforte quando Ripple invia un segnale di emergenza</string>
-    <string name="import_vault">Importa cassaforte</string>
+    <string name="import_vault">Importa cassaforte di Aegis</string>
+    <string name="import_vault_hint">Vuoi importare da un\'app 2FA differente? Completa prima la configurazione e poi vai al menu delle impostazioni.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Deselezionato %d potenziale duplicato. Si prega di rivedere l\'elenco delle voci.</item>
+        <item quantity="other">Deselezionati %d potenziali duplicati. Si prega di rivedere l\'elenco delle voci.</item>
+    </plurals>
     <string name="importer_help_2fas">Seleziona un backup di 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Seleziona un file di backup di Aegis.</string>
     <string name="importer_help_authenticator_plus">Seleziona un file di esportazione di Authenticator Plus ottenuto tramite <b>Impostazioni -&gt; Backup &amp; Ripristino -&gt; Esporta come testo e HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Fornire un file di esportazione di Authenticator Pro ottenuto tramite <b>Impostazioni -&gt; Backup -&gt; Backup in file cifrato (raccomandato)</b>.</string>
     <string name="importer_help_authy">Seleziona una copia di <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, situata nella directory della memoria interna di Authy.</string>
     <string name="importer_help_andotp">Seleziona un file di backup di andOTP.</string>
     <string name="importer_help_bitwarden">Seleziona un file di esportazione/backup di Bitwarden. I file crittografati non sono supportati.</string>
-    <string name="importer_help_battle_net_authenticator">Seleziona una copia di <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, situata nella directory della memoria interna di Battle.net Authenticator.</string>
-    <string name="importer_help_duo">Seleziona una copia di <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, situata nella directory della memoria interna di DUO.</string>
-    <string name="importer_help_freeotp">Seleziona una copia di <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, situata nella directory della memoria interna di FreeOTP.</string>
+    <string name="importer_help_battle_net_authenticator">Seleziona una copia di <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, situata nella directory della memoria interna di Battle.net Authenticator.</string>
+    <string name="importer_help_duo">Seleziona una copia di <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, che si trova nella cartella di archiviazione interna di DUO.</string>
+    <string name="importer_help_ente_auth">Fornire un file di esportazione di Ente Auth. Attualmente sono supportati solo i file non criptati.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Fornire un file di backup.\nFreeOTP 1.x: Fornire una copia di <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, che si trova nella directory di archiviazione interna di FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Seleziona un file di esportazione di FreeOTP+.</string>
-    <string name="importer_help_google_authenticator"><b>Sono supportati solo i file di database di Google Authenticator v5.10 e precedenti</b>.\n\nFornire una copia di<b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, che si trova nella directory di archiviazione interna di Google Authenticator.</string>
-    <string name="importer_help_microsoft_authenticator">Seleziona una copia di <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, situata nella directory della memoria interna di Microsoft Authenticator.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilità con FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Ci sono diversi problemi in FreeOTP 2 che possono portare a backup danneggiati. Aegis cercherà di recuperare il maggior numero possibile di voci, ma è possibile che alcune o addirittura tutte non vengano importate.</string>
+    <string name="importer_help_google_authenticator"><b>Sono supportati solo i file di database di Google Authenticator v5.10 e precedenti</b>.\n\nSeleziona una copia di<b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, che si trova nella cartella di archiviazione interna di Google Authenticator.</string>
+    <string name="importer_help_microsoft_authenticator">Seleziona una copia di <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, che si trova nella cartella di archiviazione interna di Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Seleziona un file di testo con un URI di Google Authenticator in ogni riga.</string>
-    <string name="importer_help_steam"><b>Steam v3.0 e versioni successive non sono supportate</b>. Fornire una copia di <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, che si trova nella directory di archiviazione interna di Steam.</string>
+    <string name="importer_help_steam"><b>Steam v3.0 e versioni successive non sono supportate</b>. Seleziona una copia di <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, che si trova nella cartella di archiviazione interna di Steam.</string>
+    <string name="importer_help_stratum">Fornire un file di esportazione di Stratum ottenuto tramite <b>Impostazioni -&gt; Backup -&gt; Backup su file criptato (consigliato)</b>.</string>
     <string name="importer_help_totp_authenticator">Seleziona un file di esportazione di TOTP Authenticator.</string>
     <string name="importer_help_winauth">Seleziona un file di esportazione di WinAuth.</string>
-    <string name="importer_encrypted_exception_google_authenticator">L\'elemento cifrato è stata saltato: %s</string>
+    <string name="import_assign_icons_dialog_title">Assegna icone</string>
+    <string name="import_assign_icons_dialog_text">Vuoi assegnare le icone alle voci importate?</string>
+    <string name="importer_encrypted_exception_google_authenticator">L\'elemento crittografato è stato ignorato: %s</string>
     <string name="importer_help_direct">Importa le voci direttamente da %s. Questa funzionalità richiede che l\'app sia installata sul dispositivo e che Aegis possa ottenere i permessi di root.</string>
     <string name="groups">Gruppi</string>
-    <string name="pref_focus_search">Seleziona la ricerca all\'avvio dell\'app</string>
-    <string name="pref_focus_search_summary">Focalizza la ricerca subito dopo aver aperto l\'app.</string>
+    <string name="pref_focus_search">Apri ricerca all\'avvio dell\'app</string>
+    <string name="pref_focus_search_summary">Apri la ricerca subito dopo aver aperto l\'app.</string>
     <string name="pref_grouping_halves">Metà</string>
     <string name="pref_grouping_none">Nessun raggruppamento</string>
     <string name="pref_grouping_size_two">Gruppi di 2</string>
@@ -457,25 +536,25 @@
     <string name="pref_copy_behavior_single_tap">Tocco singolo</string>
     <string name="pref_copy_behavior_double_tap">Doppio tocco</string>
     <string name="pref_account_name_position_hidden">Nascosto</string>
-    <string name="pref_account_name_position_end">Accanto all\'emittente</string>
+    <string name="pref_account_name_position_end">Accanto al servizio</string>
     <string name="pref_account_name_position_below">Sotto all\'emittente</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d secondo fa</item>
         <item quantity="other">%d secondi fa</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minuto fa</item>
         <item quantity="other">%d minuti fa</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d ora fa</item>
         <item quantity="other">%d ore fa</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d giorno fa</item>
         <item quantity="other">%d giorni fa</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d anno fa</item>
         <item quantity="other">%d anni fa</item>
     </plurals>
diff --git a/app/src/main/res/values-iw-rIL-v29/strings.xml b/app/src/main/res/values-iw-rIL-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-iw-rIL-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 3b54f17d..17bf971a 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">הגדרות</string>
     <string name="action_about">אודות</string>
     <string name="action_delete">מחיקה</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">שיחזור סמליל ברירת-מחדל</string>
     <string name="discard">ביטול</string>
     <string name="save">שמירה</string>
+    <string name="all">הכל</string>
     <string name="issuer">מנפיק</string>
     <string name="yandex_pin">קוד (4-16 ספרות)</string>
     <string name="motp_pin">קוד (4- ספרות)</string>
@@ -29,17 +30,29 @@
     <string name="pref_section_import_export_title">ייבוא &amp; ייצוא</string>
     <string name="pref_section_import_export_summary">ייבא גיבויים של Aegis ויישומי אימות נוספים.
 צור ייצואים ידניים של כספת ה-Aegis שלך.</string>
+    <string name="pref_section_audit_log_title">יומן ביקורת</string>
+    <string name="pref_section_audit_log_summary">מצא רשימה של כל האירועים החשובים שדווחו שקרו בתוך האפליקציה.</string>
     <string name="pref_section_backups_title">גיבויים</string>
     <string name="pref_section_backups_summary">קבע גיבויים אוטומטיים למיקום לבחירתך או אפשר השתתפות במערכת הגיבוי של אנדרואיד.</string>
     <string name="pref_section_icon_packs">ערכות סמלילים</string>
     <string name="pref_section_icon_packs_summary">נהל וייבא ערכות סמלילים</string>
     <string name="pref_select_theme_title">ערכת נושא</string>
+    <string name="pref_dynamic_colors_title">צבעים דינמים</string>
+    <string name="pref_dynamic_colors_summary">החל שכבת-על המבוססת על הצבעים של ערכת הנושא של אנדרואיד</string>
     <string name="pref_view_mode_title">מצב תצוגה</string>
     <string name="pref_lang_title">שפה</string>
     <string name="pref_show_icons_title">הצגת סמלים</string>
     <string name="pref_show_icons_summary">הצגת סמלים לצד כל ערך</string>
     <string name="pref_code_group_size_title">קיבוץ ספרות קוד</string>
     <string name="pref_code_group_size_summary">בחר את מספר הספרות לקיבוץ קודים לפיהן</string>
+    <string name="pref_account_name_position_title">הצג את שם החשבון</string>
+    <string name="pref_show_next_code_title">הצג את הקוד הבא</string>
+    <string name="pref_show_next_code_summary">צור והצג את הקוד הבא מבעוד מועד</string>
+    <string name="pref_expiration_state_title">ציין מתי תוקף הקודים עומד לפוג</string>
+    <string name="pref_expiration_state_summary">שנה את צבע הקודים ותן להם להבהב כשהם עומדים לפוג</string>
+    <string name="pref_expiration_state_fallback">שנה את צבע הקודים כאשר תוקפם עומד לפוג</string>
+    <string name="pref_shared_issuer_account_name_title">הצג את שם החשבון רק כאשר יש צורך</string>
+    <string name="pref_shared_issuer_account_name_summary">הצג שמות חשבונות רק בכל פעם שהם חולקים את אותו מנפיק. שמות חשבונות אחרים יוסתרו.</string>
     <string name="pref_import_file_title">ייבוא מקובץ</string>
     <string name="pref_import_file_summary">ייבוא טוקנים מקובץ</string>
     <string name="pref_android_backups_title">גיבויי ענן אנדרואיד</string>
@@ -51,17 +64,23 @@
     <string name="pref_backups_reminder_summary">הצג תזכורת לגיבוי הכספת שלך למקרה שלא גיבית את השינויים האחרונים שלך.</string>
     <string name="pref_backups_reminder_dialog_title">השבת תזכורת גיבוי</string>
     <string name="pref_backups_reminder_dialog_summary">השבתת תזכורת זו פירושה ש-Aegis לא יגיד לך אם יש לך שינויים שעדיין לא מגובים. זה מעמיד אותך בסיכון לאבד גישה לאסימונים שלך. האם אתה בטוח שברצונך להשבית את התזכורת?</string>
-    <string name="pref_backups_location_title">ספריה עבור קבצי גיבוי</string>
+    <string name="pref_backups_versioning_strategy_title">תכנית גיבויים</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">שמור מספר גרסאות</string>
+    <string name="pref_backups_versioning_strategy_single_backup">גיבוי יחיד</string>
+    <string name="pref_backups_location_title">מיקום הגיבוי</string>
     <string name="pref_backups_location_summary">הגיבויים יאוחסנו ב</string>
+    <string name="pref_backup_location_summary">הגיבוי יאוחסן במיקום</string>
     <string name="pref_backups_trigger_title">הפעלת גיבוי</string>
     <string name="pref_backups_trigger_summary">הפעלה ידנית של גיבוי</string>
     <string name="pref_backups_versions_title">מספר הגירסאות שיש לשמור</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">שמור %1$d את גירסת הגיבוי</item>
         <item quantity="two">שמור %1$d גירסאות של הגיבוי</item>
         <item quantity="many">שמור %1$d את גירסת הגיבוי</item>
         <item quantity="other">שמור %1$d את גירסת הגיבוי</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">שמור מספר לא מוגבל של גרסאות גיבוי</string>
     <string name="pref_import_app_title">ייבוא מיישום</string>
     <string name="pref_import_app_summary">ייבוא טוקנים מאפליקציה (דורש גישת שורש)</string>
     <string name="pref_export_title">ייצוא</string>
@@ -99,8 +118,15 @@
     <string name="pref_encryption_summary">הצפן את הכספת ופתח אותה באמצעות סיסמה או ביומטריה</string>
     <string name="pref_biometrics_title">נעילה ביומטרית</string>
     <string name="pref_biometrics_summary">אפשר אימות ביומטרי כדי לפתוח את הכספת</string>
+    <string name="pref_search_behavior_type_name">שם</string>
+    <string name="pref_search_behavior_type_note">הערה</string>
+    <string name="pref_search_behavior_type_groups">קבוצות</string>
     <string name="pref_set_password_title">שנה סיסמא</string>
     <string name="pref_set_password_summary">הגדר סיסמה חדשה שתצטרך כדי לפתוח את נעילת הכספת שלך</string>
+    <string name="event_title_backup_created">גיבוי נוצר</string>
+    <string name="audit_log_entry_deleted">(נמחק)</string>
+    <string name="today_at_time">היום בשעה %1$s</string>
+    <string name="day_of_week_at_time">%1$s בשעה %2$s</string>
     <string name="export_encrypted">הצפנת הכספת</string>
     <string name="export_help">פעולה זו תייצא את הכספת מהאחסון הפנימי של Aegis. בחר את הפורמט שבו תרצה שהייצוא שלך יהיה:</string>
     <string name="export_warning_unencrypted">אתה עומד לייצא עותק לא מוצפן של כספת Aegis שלך. <b>זה לא מומלץ</b>.</string>
@@ -119,7 +145,7 @@
         <item quantity="other">נבחרו %d קבוצות</item>
     </plurals>
     <string name="export_no_groups_selected">לא נבחרו קבוצות לייצוא</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis מאמת ייצוא</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis מאמת ייצוא</string>
     <string name="choose_authentication_method">אבטחה</string>
     <string name="authentication_method_explanation">Aegis היא אפליקציית אימות דו-שלבי ממוקדת אבטחה. אסימונים מאוחסנים בכספת, שבאופן אופציונלי ניתן להצפין באמצעות סיסמה לבחירתך. אם תוקף משיג את קובץ הכספת המוצפן שלך, הוא לא יוכל לגשת לתוכן מבלי לדעת את הסיסמה. \n\nבחרנו מראש באפשרות שלדעתנו תתאים ביותר למכשיר שלך.</string>
     <string name="authentication_method_none">ללא</string>
@@ -138,6 +164,7 @@
     <string name="set_password_confirm">אנא אשר את הסיסמה</string>
     <string name="invalid_password">הסיסמה שגויה</string>
     <string name="invalidated_biometrics">זוהה שינוי בהגדרות האבטחה של המכשיר. עבור אל \"\"הגדרות- &gt; -אבטחה&gt;- &gt; נעילה ביומטרית\"\" כדי להשבית ולהפעיל מחדש את הנעילה הביומטרית.</string>
+    <string name="password_reminder">הזן את הסיסמה שלך. מדי פעם אנו מבקשים ממך לעשות זאת כדי שלא תשכח זאת.</string>
     <string name="password_reminder_freq_never">אף פעם</string>
     <string name="password_reminder_freq_weekly">שבועי</string>
     <string name="password_reminder_freq_biweekly">דו שבועי</string>
@@ -177,10 +204,11 @@
     <string name="snackbar_authentication_method">בחר שיטת אימות</string>
     <string name="encrypting_vault">הצפנת הכספת</string>
     <string name="exporting_vault">ייצוא הכספת</string>
+    <string name="optimizing_icon">מייעל סמל</string>
+    <string name="optimizing_icon_multiple">מייעל סמלים %1$d/%2$d</string>
     <string name="reading_file">קריאת קובץ</string>
     <string name="requesting_root_access">בקשת גישה לשורש</string>
     <string name="analyzing_qr">ניתוח קוד QR</string>
-    <string name="analyzing_qr_multiple">מנתח קוד QR %d/%d (%s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">הוספה %d כניסה חדשה לכספת</item>
         <item quantity="two">נוספו %d ערכים חדשים לכספת</item>
@@ -252,13 +280,10 @@
     <string name="partial_google_auth_import">זוהה ייצוא לא שלם של Google Authenticator</string>
     <string name="partial_google_auth_import_warning">כמה קודי QR חסרים בייבוא שלך. הקודים הבאים לא נמצאו:\n\n<b>%s</b>\n\nתוכל להמשיך לייבא את הייצוא החלקי הזה, אך אנו ממליצים לנסות שוב עם כל קודי ה-QR כדי לא להסתכן באובדן גישה לכל קודי אסימונים.</string>
     <string name="missing_qr_code_descriptor">• קוד QR %d</string>
-    <string name="import_partial_export_anyway">ייבוא אסימוני %d בכל מקרה</string>
     <string name="import_google_auth_failure">ייבוא ייצוא מאמת Google נכשל</string>
     <string name="unrelated_google_auth_batches_error">ייצוא מכיל מידע עבור אצווה לא קשורה. נסה לייבא אצווה אחת בכל פעם.</string>
     <string name="no_tokens_can_be_imported">לא ניתן לייבא אסימונים כתוצאה מכך</string>
-    <string name="authentication_method_raw">גולמי</string>
     <string name="unlocking_vault">פתיחת הכספת</string>
-    <string name="slot_this_device">(המכשיר הזה)</string>
     <string name="remove_group">הסר קבוצה</string>
     <string name="remove_group_description">האם אתה בטוח שברצונך להסיר קבוצה זו? ערכים בקבוצה זו יעברו באופן אוטומטי ל\'אין קבוצה\'.</string>
     <string name="remove_icon_pack">הסרת חבילת סמלים</string>
@@ -268,7 +293,7 @@
     <string name="lock">נעל</string>
     <string name="name">שם</string>
     <string name="no_group">אין קבוצה</string>
-    <string name="sort">מיין</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">מיין</string>
     <string name="sort_alphabetically">מנפיק (א\' עד ת\')</string>
     <string name="sort_alphabetically_reverse">מנפיק (ת עד א)</string>
     <string name="sort_alphabetically_name">חשבון (א\' עד ת\')</string>
@@ -283,7 +308,7 @@
     <string name="preference_reset_usage_count">אפס ספירת שימוש</string>
     <string name="preference_reset_usage_count_summary">איפוס ספירת השימוש של כל ערך בכספת</string>
     <string name="preference_reset_usage_count_dialog">האם אתה בטוח שברצונך להגדיר את ספירת השימוש של כל ערך בכספת שלך ל- 0?</string>
-    <string name="note">הערה</string>
+    <string name="note" comment="Users can add a note to an entry">הערה</string>
     <string name="clear">נקה</string>
     <string name="pref_highlight_entry_title">סימון טוקנים בעת הקשה</string>
     <string name="pref_highlight_entry_summary">הפוך אסימונים לקלים יותר להבחנה זה מזה על-ידי הדגשתם באופן זמני בעת הקשה עליהם</string>
@@ -309,7 +334,6 @@
     <string name="unable_to_process_deeplink">לא ניתן לעבד קישור עמוק</string>
     <string name="unable_to_read_qrcode_file">לא ניתן לקרוא ולעבד קוד QR מהקובץ: %s.</string>
     <string name="unable_to_process_shared_text">לא ניתן לעבד טקסט משותף כ-OTP</string>
-    <string name="unable_to_read_qrcode_files">לא ניתן לקרוא ולעבד חלק מקודי ה-QR. רק %d/%d ערכים ייובאו.</string>
     <string name="unable_to_generate_qrcode">לא ניתן ליצור קוד QR</string>
     <string name="select_picture">בחר תמונה</string>
     <string name="select_icon">בחר סמל</string>
@@ -340,10 +364,7 @@
     <string name="time_sync_warning_message">Aegis מסתמכת על זמן המערכת להיות מסונכרן כדי ליצור קודים נכונים. סטייה של מספר שניות בלבד עלולה לגרום לקודים שגויים. נראה שהמכשיר שלך לא מוגדר לסנכרון אוטומטי של השעה. האם תרצה לעשות זאת כעת?</string>
     <string name="time_sync_warning_disable">תפסיק להזהיר אותי. אני יודע מה אני עושה.</string>
     <string name="google_qr_export_unrelated">נמצא קוד QR לא קשור. נסה להפעיל מחדש את הסורק.</string>
-    <string name="google_qr_export_unexpected">צפי לקוד QR #%d, אך במקום זאת נסרק #%d</string>
     <string name="backup_error_bar_message"><b>גיבוי הכספת נכשל לאחרונה</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        ניסיון גיבוי של כספת לאחרונה באמצעות %s נכשל מכיוון שאירעה שגיאה. בוצע ניסיון הגיבוי %s. אנא בדוק את הגדרות הגיבוי שלך כדי לוודא שהגיבויים יכולים להסתיים בהצלחה.
-    </string>
     <string name="backup_system_builtin">גיבויים אוטומטיים מובנים של Aegis</string>
     <string name="backup_system_android">מערכת גיבוי בענן של אנדרואיד</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        הגיבוי האחרון מיושן (%s)
@@ -372,7 +393,6 @@
     <string name="copy_uri">העתק שורת כתובת</string>
     <string name="unable_to_copy_uri_to_clipboard">לא ניתן להעתיק URI ללוח</string>
     <string name="uri_copied_to_clipboard">URI שהועתק ללוח</string>
-    <string name="transfer_entry">העברת ערך</string>
     <string name="transfer_entry_description">סרוק קוד QR זה באמצעות אפליקציית המאמת שאליה ברצונך להעביר ערך זה</string>
     <string name="google_auth_compatible_transfer_description">סרוק קודי QR אלה באמצעות Aegis אוGoogle Authenticator.\n\n בשל מגבלות אפליקציית מאמת Google, רק אסימוני TOTP &amp; HOTP המשתמשים ב- SHA1 ומייצרים קודים בני 6 ספרות כלולים</string>
     <string name="password_strength_very_weak">חלש מאוד</string>
@@ -388,7 +408,6 @@
     <string name="title_activity_about">אודות</string>
     <string name="title_activity_edit_entry">ערוך רשומה</string>
     <string name="title_activity_scan_qr">סרוק ברקוד</string>
-    <string name="title_activity_manage_slots">ניהול חריצי מקשים</string>
     <string name="title_activity_import_entries">ייבוא רשומה</string>
     <string name="dialog_wipe_entries_title">מחיקת רשומה</string>
     <string name="dialog_wipe_entries_message">הכספת שלך כבר מכילה ערכים. האם ברצונך להסיר את הערכים הללו לפני ייבוא הקובץ הזה?\n\n<b>בכך, תאבד לצמיתות את הגישה לערכים הקיימים בכספת.</b></string>
@@ -396,17 +415,13 @@
     <string name="panic_trigger_ignore_toast">Aegis קיבל הפעלת פאניקה אך ההגדרה מושבתת, מתעלמת</string>
     <string name="pref_panic_trigger_title">מחק את הכספת בהפעלת הפאניקה</string>
     <string name="pref_panic_trigger_summary">מחק את הכספת בהפעלת הפאניקה</string>
-    <string name="import_vault">ייצוא כספת</string>
     <string name="importer_help_2fas">ספק קובץ גיבוי של 2FAS Authenticator.</string>
     <string name="importer_help_aegis">ספק קובץ ייצוא/גיבוי של Aegis.</string>
     <string name="importer_help_authenticator_plus">ספק קובץ ייצוא של Authenticator Plus שהושג דרך <b>הגדרות -&gt; גיבוי &amp; שחזור -&gt; ייצוא כטקסט ו-HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">ספק קובץ ייצוא של Authenticator Pro שהושג דרך <b>הגדרות -&gt; גיבוי -&gt; גבה לקובץ מוצפן (מומלץ)</b>.</string>
     <string name="importer_help_authy">ספק עותק של <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, הממוקם בספריית האחסון הפנימית של Authy.</string>
     <string name="importer_help_andotp">ספק קובץ יצוא/גיבוי andOTP.</string>
     <string name="importer_help_bitwarden">ספק קובץ יצוא/גיבוי של Bitwarden. קבצים מוצפנים אינם נתמכים.</string>
-    <string name="importer_help_battle_net_authenticator">ספק עותק של <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, הממוקם בספריית האחסון הפנימית של Battle.net Authenticator.</string>
     <string name="importer_help_duo">ספק עותק של <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, הממוקם בספריית האחסון הפנימית של DUO.</string>
-    <string name="importer_help_freeotp">ספק עותק של <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, הממוקם בספריית האחסון הפנימית של FreeOTP.</string>
     <string name="importer_help_freeotp_plus">ספק קובץ יצוא FreeOTP+.</string>
     <string name="importer_help_google_authenticator"><b>רק קבצי מסד נתונים מ-Google Authenticator v5.10 ואילך נתמכים</b>. \n\nספק עותק של<b> /data/data</b>/com.google.android.apps.authenticator2/databases/databases, הממוקם בספריית האחסון הפנימית של Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">ספק עותק של <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, הממוקם בספריית האחסון הפנימית של Microsoft Authenticator.</string>
diff --git a/app/src/main/res/values-ja-rJP-v29/strings.xml b/app/src/main/res/values-ja-rJP-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-ja-rJP-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index cbe35f5e..ce763803 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">設定</string>
-    <string name="action_about">このプログラムについて</string>
+    <string name="action_about">Aegis について</string>
     <string name="action_delete">削除</string>
     <string name="action_transfer">転送</string>
     <string name="action_edit_icon">アイコンを編集</string>
     <string name="action_reset_usage_count">使用回数をリセット</string>
-    <string name="action_reset_usage_count_dialog">このエントリーの使用回数を0に設定してもよろしいですか？</string>
+    <string name="action_reset_usage_count_dialog">本当に、このエントリーの使用回数を 0 に設定しますか？</string>
     <string name="action_default_icon">既定のアイコンを復元</string>
-    <string name="discard">破棄する</string>
+    <string name="discard">破棄</string>
     <string name="save">保存</string>
     <string name="issuer">発行者</string>
-    <string name="yandex_pin">PIN (4～16桁)</string>
-    <string name="motp_pin">PIN (4桁)</string>
+    <string name="yandex_pin">PIN (4～16 桁)</string>
+    <string name="motp_pin">PIN (4 桁)</string>
     <string name="suggested">提案</string>
     <string name="usage_count">使用回数</string>
     <string name="warning">警告</string>
@@ -42,7 +42,6 @@
     <string name="pref_account_name_position_title">アカウント名を表示</string>
     <string name="pref_shared_issuer_account_name_title">必要に応じてアカウント名のみ表示</string>
     <string name="pref_shared_issuer_account_name_summary">同じ発行者を共有するたびにアカウント名のみを表示します。他のアカウント名は非表示になります。</string>
-    <string name="pref_account_name_position_summary_override">この設定はタイル表示モードで上書きされています。アカウント名は常に発行者の下に表示されます。</string>
     <string name="pref_import_file_title">ファイルからインポート</string>
     <string name="pref_import_file_summary">ファイルからトークンをインポート</string>
     <string name="pref_android_backups_title">Androidクラウドバックアップ</string>
@@ -54,7 +53,6 @@
     <string name="pref_backups_reminder_summary">最近の変更をバックアップしていない場合に、保管庫をバックアップするよう通知を表示します。</string>
     <string name="pref_backups_reminder_dialog_title">バックアップリマインダーを無効化</string>
     <string name="pref_backups_reminder_dialog_summary">このリマインダーを無効にすると、Aegisはバックアップしていない変更があるかどうかを知らせません。これにより、トークンにアクセスできなくなる危険性があります。本当にリマインダーを無効にしてもよろしいですか？</string>
-    <string name="pref_backups_location_title">バックアップファイルのディレクトリ</string>
     <string name="pref_backups_location_summary">バックアップの保存場所</string>
     <string name="pref_backups_trigger_title">バックアップのトリガー</string>
     <string name="pref_backups_trigger_summary">手動でバックアップを開始する</string>
@@ -113,7 +111,7 @@
         <item quantity="other">%d グループを選択しました</item>
     </plurals>
     <string name="export_no_groups_selected">エクスポートするグループが選択されていません</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator のエクスポート</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator のエクスポート</string>
     <string name="choose_authentication_method">セキュリティ</string>
     <string name="authentication_method_explanation">Aegisはセキュリティに重点を置いた2FAアプリです。トークンは保管庫に保存され、必要に応じて選択したパスワードで暗号化できます。 攻撃者が暗号化された保管庫ファイルを取得した場合、パスワードを知らずにアクセスすることはできません。\n\nお使いのデバイスに最適なオプションを事前に選択しました。</string>
     <string name="authentication_method_none">なし</string>
@@ -149,6 +147,7 @@
     <string name="share">共有する</string>
     <string name="yes">はい</string>
     <string name="no">いいえ</string>
+    <string name="undo">元に戻す</string>
     <string name="unlock">ロック解除</string>
     <string name="advanced">高度な設定</string>
     <string name="counter">カウンター</string>
@@ -160,6 +159,8 @@
     <string name="set_up_biometric">生体認証ロック解除の設定</string>
     <string name="copy">コピー</string>
     <string name="edit">編集</string>
+    <string name="select_all">すべて選択</string>
+    <string name="assign_icons">アイコンを割り当てる</string>
     <string name="favorite" comment="Verb">お気に入りに追加</string>
     <string name="unfavorite" comment="Verb">お気に入りを解除</string>
     <string name="error_all_caps">エラー</string>
@@ -177,7 +178,6 @@
     <string name="reading_file">ファイルを読み込み中</string>
     <string name="requesting_root_access">root権限を要求中</string>
     <string name="analyzing_qr">QRコードを解析中</string>
-    <string name="analyzing_qr_multiple">QRコードを解析中 %d/%d (%s)</string>
     <plurals name="added_new_entries">
         <item quantity="other">%d 個の新しいエントリーを保管庫に追加しました</item>
     </plurals>
@@ -192,6 +192,7 @@
     <string name="discard_changes">変更を破棄しますか？</string>
     <string name="discard_changes_description">変更は保存されていません</string>
     <string name="saving_profile_error">プロファイルの保存中にエラーが発生しました</string>
+    <string name="saving_assign_icons_error">アイコンの割り当てエラー</string>
     <string name="welcome">ようこそ</string>
     <string name="app_description">Aegisは、無料で安全なオープンソースの2FAアプリです</string>
     <string name="setup_completed">セットアップが完了しました</string>
@@ -260,15 +261,14 @@
     <string name="partial_google_auth_import">不完全な Google Authenticator のエクスポートが検出されました</string>
     <string name="partial_google_auth_import_warning">インポート内の一部のQRコードが見つかりません。以下のコードが見つかりませんでした:\n\n<b>%s</b>\n\n正常な部分のみでインポートを継続することはできますが、トークンへのアクセス方法を失う危険性があるため、すべてのQRコードを再試行することをお勧めします。</string>
     <string name="missing_qr_code_descriptor">• QRコード %d</string>
-    <string name="import_partial_export_anyway">とにかく %d 個のトークンをインポートする</string>
     <string name="import_google_auth_failure">Google Authenticator エクスポートのインポートに失敗しました</string>
     <string name="unrelated_google_auth_batches_error">エクスポートには関連のないバッチの情報が含まれています。一度にひとつのバッチをインポートしてください。</string>
     <string name="no_tokens_can_be_imported">インポートできるトークンはありません</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">保管庫のロックを解除しています</string>
-    <string name="slot_this_device">(このデバイス)</string>
     <string name="remove_group">グループを削除</string>
     <string name="remove_group_description">このグループを削除してもよろしいですか？このグループのエントリーは自動的に「グループなし」に切り替わります。</string>
+    <string name="remove_unused_groups">未使用のグループを削除</string>
+    <string name="remove_unused_groups_description">エントリーに割り当てられていないすべてのグループを削除してもよろしいですか？</string>
     <string name="remove_icon_pack">アイコンパックを削除</string>
     <string name="remove_icon_pack_description">このアイコンパックを削除してもよろしいですか？このパックからアイコンを使用するエントリーは影響を受けません。</string>
     <string name="details">詳細</string>
@@ -276,7 +276,7 @@
     <string name="lock">ロックする</string>
     <string name="name">名前</string>
     <string name="no_group">グループなし</string>
-    <string name="sort">並び替え</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">並び替え</string>
     <string name="sort_alphabetically">発行者 (A to Z)</string>
     <string name="sort_alphabetically_reverse">発行者 (Z to A)</string>
     <string name="sort_alphabetically_name">アカウント (A to Z)</string>
@@ -291,7 +291,7 @@
     <string name="preference_reset_usage_count">使用回数をリセット</string>
     <string name="preference_reset_usage_count_summary">保管庫のすべてのエントリーの使用回数をリセットする</string>
     <string name="preference_reset_usage_count_dialog">保管庫のすべてのエントリーの使用回数を0に設定してもよろしいですか？</string>
-    <string name="note">メモ</string>
+    <string name="note" comment="Users can add a note to an entry">メモ</string>
     <string name="clear">クリア</string>
     <string name="pref_highlight_entry_title">タップ時にトークンを強調表示する</string>
     <string name="pref_highlight_entry_summary">タップ時に一時的に強調表示することで、トークンが互いに区別しやすくなります。</string>
@@ -317,12 +317,11 @@
     <string name="unknown_issuer">不明な発行者</string>
     <string name="unknown_account_name">不明なアカウント名</string>
     <plurals name="import_error_dialog">
-        <item quantity="other">Aegisは %d 個のトークンをインポートできませんでした。これらのトークンはスキップされます。エラーの詳細を見るには「詳細」を押してください。</item>
+        <item quantity="other">Aegisは %d 個のトークンをインポートできませんでした。これらのトークンはスキップされます。エラーの詳細を確認するには「詳細」をタップします。</item>
     </plurals>
     <string name="unable_to_process_deeplink">ディープリンクを処理できません</string>
     <string name="unable_to_read_qrcode_file">ファイル %s からQRコードを読み取り処理できません。</string>
     <string name="unable_to_process_shared_text">OTPとして共有テキストを処理できません</string>
-    <string name="unable_to_read_qrcode_files">QRコードの一部を読み取り処理できません。 %d/%d 個のエントリーのみインポートされます。</string>
     <string name="unable_to_generate_qrcode">QRコードを生成できません</string>
     <string name="select_picture">画像を選択</string>
     <string name="select_icon">アイコンを選択</string>
@@ -354,10 +353,6 @@
     <string name="time_sync_warning_message">Aegisが正しいコードを生成するためには、システム時刻が正しく同期されている必要があります。 わずか数秒のずれでも誤ったコードを生成する可能性があります。このデバイスは時刻を自動的に同期するように設定されていないようです。今すぐ同期しますか？</string>
     <string name="time_sync_warning_disable">警告は不要です。</string>
     <string name="google_qr_export_unrelated">関連のないQRコードが見つかりました。スキャナーを再起動してみてください。</string>
-    <plurals name="google_qr_export_scanned">
-        <item quantity="other">%d/%d QRコードをスキャン</item>
-    </plurals>
-    <string name="google_qr_export_unexpected">QRコード#%dを期待していましたが、代わりに#%dをスキャンしました</string>
     <string name="backup_error_bar_message"><b>保管庫のバックアップが失敗しました</b></string>
     <string name="backup_system_builtin">Aegisの内蔵自動バックアップ</string>
     <string name="backup_system_android">Androidのクラウドバックアップシステム</string>
@@ -390,7 +385,6 @@
     <string name="copy_uri">URIをコピー</string>
     <string name="unable_to_copy_uri_to_clipboard">URIをクリップボードにコピーできません</string>
     <string name="uri_copied_to_clipboard">URI をクリップボードにコピーしました</string>
-    <string name="transfer_entry">エントリーを転送</string>
     <string name="transfer_entry_description">このエントリーを別の認証アプリに転送するには、このQRコードをスキャンしてください</string>
     <string name="google_auth_compatible_transfer_description">QRコードを Aegis または Google Authenticator でスキャンしてください。\n\nGoogle Authenticator アプリの制限のため、SHA1 を使用し6桁のコードを生成する TOTP と HOTP トークンのみが含まれます。</string>
     <string name="password_strength_very_weak">非常に弱い</string>
@@ -406,25 +400,26 @@
     <string name="title_activity_about">このプログラムについて</string>
     <string name="title_activity_edit_entry">エントリーを編集</string>
     <string name="title_activity_scan_qr">QRコードをスキャン</string>
-    <string name="title_activity_manage_slots">キースロットの管理</string>
     <string name="title_activity_import_entries">エントリーをインポート</string>
+    <string name="title_activity_assign_icons">アイコンを割り当てる</string>
     <string name="dialog_wipe_entries_title">エントリーを消去</string>
     <string name="dialog_wipe_entries_message">あなたの保管庫には既にエントリーが含まれています。このファイルをインポートする前に、これらのエントリーを削除しますか？\n\n<b>その場合、保管庫内の既存のエントリーへのアクセスが永久に失われます。</b></string>
     <string name="dialog_wipe_entries_checkbox">保管庫の内容を消去</string>
     <string name="panic_trigger_ignore_toast">イージスはパニックトリガーを受信しましたが、設定は無効になっています。</string>
     <string name="pref_panic_trigger_title">パニックトリガー時に保管庫を削除</string>
     <string name="pref_panic_trigger_summary">Rippleからパニックトリガーを受信したときに保管庫を削除する</string>
-    <string name="import_vault">保管庫をインポート</string>
+    <string name="import_vault">Aegis 保管庫をインポート</string>
+    <string name="import_vault_hint">別の2FAアプリからインポートしたい場合は、まずセットアップを完了してから、設定メニューに進みます。</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="other">%d 個の重複が見つかりました。エントリーのリストを確認してください。</item>
+    </plurals>
     <string name="importer_help_2fas">2FAS Authenticatorのバックアップファイルを提供します。</string>
     <string name="importer_help_aegis">Aegisのエクスポート/バックアップファイルを提供します。</string>
     <string name="importer_help_authenticator_plus">Authenticator Plusの<b>Settings -&gt; Backup &amp; Restore -&gt; Export as Text and HTML</b>で取得したエクスポートファイルを提供します。</string>
-    <string name="importer_help_authenticator_pro">Authenticator Pro でファイルをエクスポートするには、<b>設定 -&gt; バックアップ -&gt; 暗号化されたファイルへバックアップ (推奨) </b> と進みます。</string>
     <string name="importer_help_authy">Authyの内部ストレージディレクトリにある <b>/data/data/com.authy/shared_prefs/com.auth.storage.tokens.authenticator.xml</b>のコピーを提供します。</string>
     <string name="importer_help_andotp">andOTPのエクスポート/バックアップ ファイルを提供します。</string>
     <string name="importer_help_bitwarden">Bitwarden のエクスポート/バックアップファイルを提供します。暗号化されたファイルはサポートされていません。</string>
-    <string name="importer_help_battle_net_authenticator">Battle.net Authenticator の内部ストレージディレクトリにある<b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, のコピーを提供します。</string>
     <string name="importer_help_duo">DUOの内部ストレージディレクトリにある <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>のコピーを提供します。</string>
-    <string name="importer_help_freeotp">FreeOTPの内部ストレージディレクトリにある <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>のコピーを提供します。</string>
     <string name="importer_help_freeotp_plus">FreeOTP+のエクスポートファイルを提供します。</string>
     <string name="importer_help_google_authenticator"><b>Google Authenticator v5.10 およびそれ以前のデータベースファイルのみサポートされています。</b>.\n\nGoogle Authenticator の内部ストレージディレクトリにある<b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> のコピーを提供します。</string>
     <string name="importer_help_microsoft_authenticator">Microsoft Authenticatorの内部ストレージディレクトリにある <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>のコピーを提供します。</string>
@@ -432,6 +427,8 @@
     <string name="importer_help_steam"><b>Steam v3.0 およびそれ以降のバージョンはサポートされていません。</b>. Steam の内部ストレージディレクトリにある <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>のコピーを提供します。</string>
     <string name="importer_help_totp_authenticator">TOTP Authenticatorのエクスポートファイルを提供します。</string>
     <string name="importer_help_winauth">WinAuthのエクスポートファイルを提供します。</string>
+    <string name="import_assign_icons_dialog_title">アイコンを割り当てる</string>
+    <string name="import_assign_icons_dialog_text">インポートされたエントリーにアイコンを割り当てますか？</string>
     <string name="importer_encrypted_exception_google_authenticator">暗号化されたエントリーがスキップされました: %s</string>
     <string name="importer_help_direct">%sからエントリーを直接インポートします。これにはアプリをデバイスにインストールし、root権限をAegisに許可する必要があります。</string>
     <string name="groups">グループ</string>
@@ -448,19 +445,19 @@
     <string name="pref_account_name_position_hidden">非表示</string>
     <string name="pref_account_name_position_end">次の発行者</string>
     <string name="pref_account_name_position_below">前の発行者</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="other">%d 秒前</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="other">%d 分前</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="other">%d 時間前</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="other">%d 日前</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="other">%d 年前</item>
     </plurals>
     <plurals name="dropdown_checkboxes_default_count">
diff --git a/app/src/main/res/values-kn-rIN-v29/strings.xml b/app/src/main/res/values-kn-rIN-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-kn-rIN-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
index 44d8453e..84a52562 100644
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">ಸಿದ್ಢತೆಗಳು</string>
     <string name="action_about">ಅಪ್ಲಿಕೇಶನ್ ಬಗ್ಗೆ</string>
     <string name="action_delete">ಅಳಿಸು</string>
@@ -13,6 +13,7 @@
     <string name="issuer">ನೀಡುವವರು</string>
     <string name="yandex_pin">ಪಿನ್(4-16 ಅಂಕೆಗಳು)</string>
     <string name="motp_pin">ಪಿನ್(4 ಅಂಕೆಗಳು)</string>
+    <string name="suggested">ಸಲಹೆ</string>
     <string name="warning">ಎಚ್ಚರಿಕೆ</string>
     <string name="pref_cat_appearance_app">ಆ್ಯಪ್</string>
     <string name="pref_cat_appearance_entries">ಎಂಟ್ರಿಗಳು</string>
@@ -34,12 +35,28 @@
     <string name="pref_show_icons_title">ಐಕಾನ್ಗಳನ್ನು ತೋರಿಸು</string>
     <string name="pref_show_icons_summary">ಪ್ರತಿ ಪ್ರವೇಶದ ಪಕ್ಕದಲ್ಲಿ ಐಕಾನ್ ಅನ್ನು ಪ್ರದರ್ಶಿಸಿ</string>
     <string name="pref_code_group_size_title">ಅಂಕೆಗಳ ಗುಂಪು</string>
+    <string name="pref_account_name_position_title">ಖಾತೆಯ ಹೆಸರನ್ನು ತೋರಿಸಿ</string>
+    <string name="pref_shared_issuer_account_name_title">ಅಗತ್ಯವಿದ್ದಾಗ ಮಾತ್ರ ಖಾತೆಯ ಹೆಸರನ್ನು ತೋರಿಸಿ</string>
+    <string name="pref_shared_issuer_account_name_summary">ಒಂದೇ ವಿತರಕರನ್ನು ಹಂಚಿಕೊಂಡಾಗ ಮಾತ್ರ ಖಾತೆಯ ಹೆಸರುಗಳನ್ನು ತೋರಿಸಿ. ಇತರ ಖಾತೆಯ ಹೆಸರುಗಳನ್ನು ಮರೆಮಾಡಲಾಗುತ್ತದೆ.</string>
     <string name="pref_import_file_title">ಫೈಲಿಂದ ಆಮದಿಸು</string>
     <string name="pref_import_file_summary">ಫೈಲ್‌ನಿಂದ ಟೋಕನ್ಗಳ್ಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ</string>
+    <string name="pref_android_backups_title">ಆಂಡ್ರಾಯ್ಡ್ ಕ್ಲೌಡ್ ಬ್ಯಾಕ್‌ಅಪ್‌ಗಳು</string>
+    <string name="pref_android_backups_hint"><i>ಮೇಲಿನ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಲೆಕ್ಕಿಸದೆಯೇ ಸಾಧನದಿಂದ ಸಾಧನಕ್ಕೆ (D2D) ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ಯಾವಾಗಲೂ ಅನುಮತಿಸಲಾಗುತ್ತದೆ</i></string>
+    <string name="pref_backups_title">ವಾಲ್ಟ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬ್ಯಾಕಪ್ ಮಾಡಿ</string>
+    <string name="pref_backups_summary">ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಿದಾಗ ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆಯಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವಾಲ್ಟ್‌ನ ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ರಚಿಸಿ. ಇದು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾದ ವಾಲ್ಟ್‌ಗಳಿಗೆ ಮಾತ್ರ ಬೆಂಬಲಿತವಾಗಿದೆ.</string>
     <string name="pref_backups_reminder_title">ಬ್ಯಾಕಪ್ ಜ್ಞಾಪನೆ</string>
+    <string name="pref_backups_reminder_summary">ನಿಮ್ಮ ಇತ್ತೀಚಿನ ಬದಲಾವಣೆಗಳನ್ನು ನೀವು ಬ್ಯಾಕಪ್ ಮಾಡದಿದ್ದಲ್ಲಿ ನಿಮ್ಮ ವಾಲ್ಟ್ ಅನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಲು ಜ್ಞಾಪನೆಯನ್ನು ತೋರಿಸಲಾಗುವುದು.</string>
+    <string name="pref_backups_reminder_dialog_title">ಬ್ಯಾಕಪ್ ಜ್ಞಾಪನೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
+    <string name="pref_backups_reminder_dialog_summary">ಈ ಜ್ಞಾಪನೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದು ಎಂದರೆ ನೀವು ಇನ್ನೂ ಬ್ಯಾಕಪ್ ಮಾಡದ ಬದಲಾವಣೆಗಳನ್ನು ಹೊಂದಿದ್ದೀರಾ ಅಥವಾ ಇಲ್ಲವೇ ಎಂಬುದನ್ನು Aegis ನಿಮಗೆ ತಿಳಿಸುವುದಿಲ್ಲ. ಇದರಿಂದ ನಿಮ್ಮ ಟೋಕನ್ಗಳನ್ನೂ ಕಳೆದುಕೊಳ್ಳುವ ಸಂಭವವಿರುತ್ತದೆ. ಜ್ಞಾಪನೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
+    <string name="pref_backups_location_summary">ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ಇಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗುತ್ತದೆ</string>
+    <string name="pref_backups_trigger_title">ಬ್ಯಾಕಪ್ ಮಾಡು</string>
+    <string name="pref_backups_trigger_summary">ಈಗಲೇ ಬ್ಯಾಕಪ್ ಮಾಡಲು ಇಲ್ಲಿ ಒತ್ತಿ</string>
+    <string name="pref_backups_versions_title">ಬ್ಯಾಕಪ್ ಆವೃತ್ತಿಗಳ ಸಂಖ್ಯೆ</string>
     <string name="pref_import_app_title">ಅಪ್ಲಿಕೇಶನಿಂದ ಆಮದಿಸು</string>
     <string name="pref_export_title">ರಫ್ತು ಮಾಡು</string>
+    <string name="pref_export_summary">ವಾಲ್ಟ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ</string>
     <string name="pref_password_reminder_title">ಪಾಸ್ವರ್ಡ್ ಜ್ಞಾಪನೆ</string>
+    <string name="pref_google_auth_export_title">ಗೂಗಲ್ Authenticator ಗೆ ರಫ್ತು ಮಾಡಿ</string>
     <string name="pref_google_auth_export_no_data">ರವಾನಿಸಲು ಯಾವುದೇ ಡೇಟಾ ಇಲ್ಲ</string>
     <string name="pref_secure_screen_title">ಪರದೆಯ ಭದ್ರತೆ</string>
     <string name="pref_secure_screen_summary">ಅಪ್ಲಿಕೇಶನ್ ಒಳಗೆ ಪರದೆ ಚಿತ್ರ ಹಾಗು ಪರದೆಯನ್ನು ಸೆರೆಹಿಡಿಯುವ ಇತರ ಪ್ರಯತ್ನಗಳನ್ನು ನಿರ್ಬಂಧಿಸು</string>
@@ -49,8 +66,12 @@
     <string name="pref_auto_lock_title">ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬೀಗ ಹಾಕು</string>
     <string name="pref_backup_password_category">ಬ್ಯಾಕಪ್ &amp; ರವಾನಿಸು</string>
     <string name="pref_encryption_title">ಗೂಢಲಿಪೀಕರಣ</string>
+    <string name="pref_biometrics_title">ಬೆರೆಳಚ್ಚಿನಿಂದ ಅನ್ಲಾಕ್ ಮಾಡಿ</string>
     <string name="pref_set_password_title">ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸು</string>
     <string name="pref_set_password_summary">ವೌಲ್ಟ್ ಅನ್ನು ತೆರೆಯಲು ಹೊಸಾ ಗುಪ್ತಪದವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
+    <string name="understand_risk_accept">ನನಗೆ ಇದರ ಪರಿಣಾಮದ ಅರಿವಿದೆ</string>
+    <string name="export_format_google_auth_uri">ಪಠ್ಯ ಫೈಲ್ (.TXT)</string>
+    <string name="export_format_html">ವೆಬ್ ಪೇಜ್ (.HTML)</string>
     <string name="export_format_hint">ರಫ್ತು ಸ್ವರೂಪ</string>
     <string name="export_all_groups">ಎಲ್ಲಾ ಗುಂಪುಗಳನ್ನು ರಫ್ತು ಮಾಡಿ</string>
     <plurals name="export_groups_selected_count">
@@ -74,6 +95,7 @@
     <string name="password_reminder_freq_quarterly">ತ್ರೈಮಾಸಿಕ</string>
     <string name="yes">ಹೌದು</string>
     <string name="no">ಇಲ್ಲ</string>
+    <string name="undo">ರದ್ದುಮಾಡು</string>
     <string name="unlock">ಬೀಗ ತೆಗೆದು ಹಾಕು</string>
     <string name="advanced">ಸುಧಾರಿತ</string>
     <string name="counter">ಎಣಿಕೆ ಮಾಡುವ ಯಂತ್ರ</string>
@@ -112,6 +134,11 @@
     <string name="disable_encryption">ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
     <string name="enable_encryption_error">ಗೂಢಲಿಪೀಕರಣವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವಾಗ ಒಂದು ದೋಷ ಸಂಭವಿಸಿದೆ</string>
     <string name="disable_encryption_error">ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವಾಗ ಒಂದು ದೋಷ ಸಂಭವಿಸಿದೆ</string>
+    <string name="backup_successful">ಬ್ಯಾಕಪ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ</string>
+    <string name="backup_error">ಬ್ಯಾಕಪ್ ರಚಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವಾಗ ದೋಷ ಸಂಭವಿಸಿದೆ</string>
+    <string name="backup_status_success">ಇತ್ತೀಚಿನ ಬ್ಯಾಕಪ್ ಯಶಸ್ವಿಯಾಗಿದೆ: %s</string>
+    <string name="backup_status_failed">ಇತ್ತೀಚಿನ ಬ್ಯಾಕಪ್ ವಿಫಲವಾಗಿದೆ: %s</string>
+    <string name="backup_status_none">ಯಾವುದೇ ಬ್ಯಾಕ್‌ಅಪ್‌ಗಳನ್ನು ಇನ್ನೂ ಮಾಡಲಾಗಿಲ್ಲ</string>
     <string name="permission_denied">ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ</string>
     <string name="choose_theme">ನಿಮ್ಮ ಇಚ್ಛೆಯ ಥೀಮನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
     <string name="choose_view_mode">ನಿಮ್ಮ ಇಚ್ಛೆಯ ವೀಕ್ಷಣೆ ರೀತಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
@@ -122,11 +149,11 @@
     <string name="import_error_title">ಅಮದಿಸುವಾಗ ಒಂದು ಅಥವಾ ಜಾಸ್ತಿ ದೋಷಗಳು ಸಂಭವಿಸಿದೆ</string>
     <string name="no_cameras_available">ಯಾವುದೇ ಕ್ಯಾಮರಾಗಳು ಲಭ್ಯವಿಲ್ಲ</string>
     <string name="read_qr_error">ಕ್ಯೂ ಆರ್ ಸಂಕೇತವನ್ನು ಓದಲು ಪ್ರಯತ್ನಿಸುವಾಗ ಒಂದು ದೋಷ ಸಂಭವಿಸಿದೆ</string>
-    <string name="authentication_method_raw">ಕಚ್ಚಾ</string>
     <string name="unlocking_vault">ವೌಲ್ಟಿನ ಬೀಗವನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ</string>
     <string name="remove_group">ಗುಂಪನ್ನು ತೆಗೆದುಹಾಕು</string>
     <string name="remove_group_description">ನಿಜವಾಗಲು ಈ ಗುಂಪನ್ನು ತೆರೆಯಾಲು ಬಯಸುವಿರಾ? ಈ ಗುಂಪಿನಾಲ್ಲಿರುವ ಎಂಟ್ರಿಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ \'ಗುಂಪಿಲ್ಲ\'ಗೆ ಬದಲಾವಣೆ ಆಗುತ್ತವೆ.</string>
     <string name="details">ವಿವರಗಳು</string>
+    <string name="show_error_details">ದೋಷ ವಿವರಗಳನ್ನು ತೋರಿಸಿ</string>
     <string name="lock">ಬೀಗ ಹಾಕು</string>
     <string name="name">ಹೆಸರು</string>
     <string name="no_group">ಗುಂಪಿಲ್ಲ</string>
@@ -140,12 +167,14 @@
     <string name="group_name_hint">ಗುಂಪಿನ ಹೆಸರು</string>
     <string name="preference_manage_groups">ಗುಂಪುಗಳನ್ನು ಸಂಪಾದಿಸು</string>
     <string name="preference_manage_groups_summary">ಇಲ್ಲಿ ನಿಮ್ಮ ಗುಂಪುಗಳನ್ನು ನಿರ್ವಹಿಸು ಮತ್ತು ಅಳಿಸು</string>
+    <string name="note" comment="Users can add a note to an entry">ಟಿಪ್ಪಣಿ</string>
     <string name="selected">ಆಯ್ಕೆ ಮಾಡಿರುವುದು</string>
     <string name="dark_theme_title">ಗಾಢ ಥೀಮ್</string>
     <string name="light_theme_title">ತಿಳಿ ಥೀಮ್</string>
     <string name="normal_viewmode_title">ಸಾಮಾನ್ಯ</string>
     <string name="compact_mode_title">ದಟ್ಟ</string>
     <string name="small_mode_title">ಸಣ್ಣ</string>
+    <string name="tiles_mode_title">ಟೈಲ್ಸ್ ಗಳು</string>
     <string name="unknown_issuer">ಗೊತ್ತಿಲ್ಲದಿರುವ ನೀಡುವವರು</string>
     <string name="unknown_account_name">ಗೊತ್ತಿಲ್ಲದಿರುವ ಖಾತೆಯ ಹೆಸರು</string>
     <string name="select_picture">ಚಿತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡು</string>
@@ -169,23 +198,23 @@
     <string name="empty_list_title">ಯಾವುದೇ ಎಂಟ್ರಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ</string>
     <string name="title_activity_manage_groups">ಗುಂಪುಗಳನ್ನು ನಿರ್ವಹಿಸು</string>
     <string name="title_activity_about">ಅಪ್ಲಿಕೇಶನ್ ಬಗ್ಗೆ</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d ಸೆಕೆಂಡ್ ಹಿಂದೆ</item>
         <item quantity="other">%d ಸೆಕೆಂಡ್ಗಳ ಹಿಂದೆ</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d ನಿಮಿಷದ ಹಿಂದೆ</item>
         <item quantity="other">%d ನಿಮಿಷಗಳ ಹಿಂದೆ</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d ಗಂಟೆಯ ಹಿಂದೆ</item>
         <item quantity="other">%d ಗಂಟೆಗಳ ಹಿಂದೆ</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d ದಿನಗಳ ಹಿಂದೆ</item>
         <item quantity="other">%d ದಿನಗಳ ಹಿಂದೆ</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d ವರ್ಷದ ಹಿಂದೆ</item>
         <item quantity="other">%d ವರ್ಷಗಳ ಹಿಂದೆ</item>
     </plurals>
diff --git a/app/src/main/res/values-ko-rKR-v29/strings.xml b/app/src/main/res/values-ko-rKR-v29/strings.xml
new file mode 100644
index 00000000..50440e42
--- /dev/null
+++ b/app/src/main/res/values-ko-rKR-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">시스템 기본값</string>
+    <string name="system_amoled_theme_title">시스템 기본값 (검정)</string>
+</resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 00000000..cec72094
--- /dev/null
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="action_settings">설정</string>
+    <string name="action_about">정보</string>
+    <string name="action_delete">삭제</string>
+    <string name="action_transfer">전송</string>
+    <string name="action_edit_icon">아이콘 편집</string>
+    <string name="action_reset_usage_count">사용횟수 초기화</string>
+    <string name="action_reset_usage_count_dialog">정말로 사용횟수를 0으로 초기화하시겠어요?</string>
+    <string name="action_default_icon">기본 아이콘으로 초기화</string>
+    <string name="discard">취소</string>
+    <string name="save">저장</string>
+    <string name="all">전체</string>
+    <string name="issuer">서비스명</string>
+    <string name="yandex_pin">PIN (숫자 4-16자리)</string>
+    <string name="motp_pin">PIN (숫자 4자리)</string>
+    <string name="suggested">추천</string>
+    <string name="usage_count">사용횟수</string>
+    <string name="warning">경고</string>
+    <string name="pref_cat_appearance_app">앱</string>
+    <string name="pref_cat_appearance_entries">항목</string>
+    <string name="pref_cat_backups_android">Android</string>
+    <string name="pref_cat_backups_auto">자동 백업</string>
+    <string name="pref_section_behavior_title">동작</string>
+    <string name="pref_section_behavior_summary">항목들과 상호작용 할 때의 행동을 사용자 지정합니다.</string>
+    <string name="pref_section_appearance_title">모양</string>
+    <string name="pref_section_appearance_summary">테마, 언어와 같이 앱의 모습에 영향을 주는 설정들을 조정합니다.</string>
+    <string name="pref_section_security_title">보안</string>
+    <string name="pref_section_security_summary">암호화, 생체 인식, 자동 잠금과 같은 보안 설정을 조정합니다.</string>
+    <string name="pref_section_import_export_title">가져오기 &amp; 내보내기</string>
+    <string name="pref_section_import_export_summary">다른 2FA 앱이나 Aegis의 백업을 가져옵니다. Aegis 보관함을 수동으로 내보내주세요.</string>
+    <string name="pref_section_audit_log_title">이벤트 로그</string>
+    <string name="pref_section_audit_log_summary">앱 내에서 발생한 모든 신고된 중요한 이벤트의 목록을 확인하세요.</string>
+    <string name="pref_section_backups_title">백업</string>
+    <string name="pref_section_backups_summary">원하는 위치에 자동 백업을 설정하거나 안드로이드 클라우드 백업 시스템에 참여하도록 설정하세요.</string>
+    <string name="pref_section_icon_packs">아이콘 팩</string>
+    <string name="pref_section_icon_packs_summary">아이콘 팩 관리 및 가져오기</string>
+    <string name="pref_select_theme_title">테마</string>
+    <string name="pref_dynamic_colors_title">동적 색상</string>
+    <string name="pref_dynamic_colors_summary">안드로이드 테마에 맞춰 오버레이가 적용됩니다</string>
+    <string name="pref_view_mode_title">보기 모드</string>
+    <string name="pref_lang_title">언어</string>
+    <string name="pref_show_icons_title">아이콘 표시</string>
+    <string name="pref_show_icons_summary">각각의 항목 옆에 아이콘이 표시됩니다</string>
+    <string name="pref_code_group_size_title">코드 숫자 그룹화</string>
+    <string name="pref_code_group_size_summary">코드를 그룹화할 자릿수를 선택합니다</string>
+    <string name="pref_account_name_position_title">계정 이름 표시</string>
+    <string name="pref_show_next_code_title">다음 코드 보기</string>
+    <string name="pref_show_next_code_summary">미리 다음 코드를 생성하고 보여줍니다</string>
+    <string name="pref_expiration_state_title">코드가 곧 만료됨을 표시</string>
+    <string name="pref_expiration_state_summary">코드가 곧 만료될 때, 색이 변경되고 깜빡입니다</string>
+    <string name="pref_expiration_state_fallback">코드가 곧 만료될 때, 색이 변경됩니다</string>
+    <string name="pref_shared_issuer_account_name_title">필요할 때만 계정 이름 표시</string>
+    <string name="pref_shared_issuer_account_name_summary">동일한 발급자를 공유하는 경우에만 계정 이름을 표시합니다. 다른 계정 이름은 숨겨집니다.</string>
+    <string name="pref_account_name_position_summary_override">이 설정은 타일 보기 모드에서 재정의됩니다. 계정 이름은 항상 발급자 아래에 표시됩니다.</string>
+    <string name="pref_import_file_title">파일에서 가져오기</string>
+    <string name="pref_import_file_summary">파일에서 토큰 가져오기</string>
+    <string name="pref_android_backups_title">Android 클라우드 백업</string>
+    <string name="pref_android_backups_summary">안드로이드 클라우드 백업 시스템에 Aegis 보관함 백업을 포함하도록 합니다. 암호화된 보관함에서만 지원됩니다.</string>
+    <string name="pref_android_backups_hint"><i>위 설정과 관계 없이 장치 간 백업(D2D)은 항상 허용됩니다.</i></string>
+    <string name="pref_backups_title">자동 백업</string>
+    <string name="pref_backups_summary">변경 사항이 있을 때 외부 디렉토리에 자동으로 백업을 생성합니다. 암호화된 보관함에서만 지원됩니다.</string>
+    <string name="pref_backups_reminder_title">백업 알림</string>
+    <string name="pref_backups_reminder_summary">마지막 변경 이후에 백업하지 않았을 때 백업하라는 알림을 표시합니다.</string>
+    <string name="pref_backups_reminder_dialog_title">백업 알림 해제</string>
+    <string name="pref_backups_reminder_dialog_summary">이 알림을 비활성화하면 아직 백업되지 않은 변경사항이 있는지를 \"아무도\" 알려주지 않습니다. 따라서 토큰에 대한 액세스 권한을 잃을 위험이 있습니다. 알림을 비활성화하시겠나요?</string>
+    <string name="pref_backups_versioning_strategy_title">백업 방법</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">여러 버전 유지</string>
+    <string name="pref_backups_versioning_strategy_single_backup">단일 백업</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">선택돤 백업 방법은 신뢰 및 권장되지 않습니다. 단일 백업 실패는 단 하나의 백업을 잃는 것입니다.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">백업 방법을 선택해주세요</string>
+    <string name="pref_backups_location_title">백업 위치</string>
+    <string name="pref_backups_location_summary">백업이 보관될 위치:</string>
+    <string name="pref_backup_location_summary">백업이 보관될 위치:</string>
+    <string name="pref_backups_trigger_title">백업하기</string>
+    <string name="pref_backups_trigger_summary">수동으로 백업을 실행합니다</string>
+    <string name="pref_backups_versions_title">유지할 버전 수</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
+    <plurals name="pref_backups_versions_summary">
+        <item quantity="other">백업 버전 %1$d(을)를 유지합니다</item>
+    </plurals>
+    <string name="pref_backups_versions_infinite_summary">백업 버전을 무제한으로 유지하세요.</string>
+    <string name="pref_import_app_title">앱에서 가져오기</string>
+    <string name="pref_import_app_summary">앱에서 토큰 가져오기 (root 필요)</string>
+    <string name="pref_export_title">내보내기</string>
+    <string name="pref_export_summary">보관함 내보내기</string>
+    <string name="pref_password_reminder_title">비밀번호 알림</string>
+    <string name="pref_google_auth_export_title">Google Authenticator으로 내보내기</string>
+    <string name="pref_google_auth_export_descriptor">Google Authenticator에 호환되는 QR코드를 생성합합니다.</string>
+    <string name="pref_google_auth_export_no_data">내보낼 데이터가 없습니다</string>
+    <plurals name="pref_google_auth_export_incompatible_entries">
+        <item quantity="other">호환되지 않는 %d개 항목 건너뜀</item>
+    </plurals>
+    <string name="pref_password_reminder_summary">비밀번호를 입력하라는 %s 알림을 표시하여 비밀번호를 잊어버리지 않도록 합니다.</string>
+    <string name="pref_password_reminder_summary_disabled">비활성화됨</string>
+    <string name="pref_secure_screen_title">화면 보안</string>
+    <string name="pref_secure_screen_summary">앱 내에서 스크린샷과 같은 화면을 찍으려는 시도를 차단합니다</string>
+    <string name="pref_tap_to_reveal_title">눌러서 확인하기</string>
+    <string name="pref_tap_to_reveal_summary">토큰은 기본적으로 숨겨집니다. 탭하면 표시됩니다.</string>
+    <string name="pref_tap_to_reveal_time_title">탭 이후 가려지기까지..</string>
+    <string name="pref_auto_lock_title">자동 잠금</string>
+    <string name="pref_auto_lock_summary">%s인 경우</string>
+    <string name="pref_auto_lock_summary_disabled">비활성화됨</string>
+    <string name="pref_auto_lock_prompt">자동으로 잠기는 상황</string>
+    <string name="pref_auto_lock_type_back_button">뒤로 버튼이 눌렸음</string>
+    <string name="pref_auto_lock_type_minimize">앱이 최소화되었음</string>
+    <string name="pref_auto_lock_type_device_lock">기기가 잠겼을 때</string>
+    <string name="pref_backup_password_category">백업 &amp; 내보내기</string>
+    <string name="pref_backup_password_title">백업 &amp; 복원에 다른 비밀번호 설정</string>
+    <string name="pref_backup_password_summary">활성화시, 앱 잠금을 해제하는 데 사용된 비밀번호를 더 이상 백업 및 복원의 잠금 해제에 사용할 수 없습니다.</string>
+    <string name="pref_backup_password_change_title">백업 &amp; 복원의 비밀번호 변경</string>
+    <string name="pref_backup_password_change_summary">백업 및 복원 중에 암호화하는 데 사용할 새 비밀번호를 설정합니다.</string>
+    <string name="pref_encryption_title">암호화</string>
+    <string name="pref_encryption_summary">보관함을 잠그고 비밀번호 또는 생체 인식으로 해제합니다</string>
+    <string name="pref_biometrics_title">생체 인식 사용</string>
+    <string name="pref_biometrics_summary">잠금 해제에 생체 인식을 사용합니다</string>
+    <string name="pref_search_behavior_summary">검색 범위: %s</string>
+    <string name="pref_search_behavior_prompt">제공된 필드에서 검색합니다</string>
+    <string name="pref_search_behavior_type_name">이름</string>
+    <string name="pref_search_behavior_type_issuer">서비스명</string>
+    <string name="pref_search_behavior_type_note">메모</string>
+    <string name="pref_search_behavior_type_groups">그룹</string>
+    <string name="pref_set_password_title">비밀번호 변경</string>
+    <string name="pref_set_password_summary">잠금 해제가 필요할 때 쓸 새로운 비밀번호를 설정합니다</string>
+    <string name="no_events_title">보고된 이벤트 없음</string>
+    <string name="no_events_description">앱에서 보고된 중요한 이벤트 없음</string>
+    <string name="event_title_vault_unlocked">잠금 해제됨</string>
+    <string name="event_description_vault_unlocked">성공적으로 잠금이 해제되었습니다</string>
+    <string name="event_title_backup_created">백업 생성됨</string>
+    <string name="event_description_backup_created">성공적으로 백업이 생성되었습니다</string>
+    <string name="event_title_android_backup_created">안드로이드에서 백업 생성됨</string>
+    <string name="event_description_android_backup_created">성공적으로 안드로이드에서 백업이 생성되었습니다</string>
+    <string name="event_title_vault_exported">내보내기됨</string>
+    <string name="event_description_vault_exported">보관함의 복사본 내보내기에 성공했습니다</string>
+    <string name="event_title_entry_shared">항목 공유됨</string>
+    <string name="event_description_entry_shared">항목이 공유되었습니다</string>
+    <string name="event_title_vault_unlock_failed_password">잠금 해제 실패 (비밀번호)</string>
+    <string name="event_description_vault_unlock_failed_password">비밀번호를 사용한 잠금 해제에 실패했습니다</string>
+    <string name="event_title_vault_unlock_failed_biometrics">잠금 해제 실패 (생체 인식)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">생체 인식을 사용한 잠금 해제에 실패했습니다</string>
+    <string name="event_unknown">알 수 없는 이벤트 유형</string>
+    <string name="audit_log_entry_deleted">(삭제됨)</string>
+    <string name="today_at_time">오늘 %1$s</string>
+    <string name="day_of_week_at_time">%1$s %2$s</string>
+    <string name="export_encrypted">보관함 암호화하기</string>
+    <string name="export_help">이 작업을 수행하면 Aegis의 내부 저장소에서 보관함을 내보냅니다. 내보낼 형식 선택:</string>
+    <string name="export_warning_unencrypted">암호화되지 않은 보관함을 내보내려는 것 같습니다. <b>이것은 권장되지 않습니다</b>.</string>
+    <string name="export_warning_password">내보내기는 보안 설정에서 설정된 별도의 비밀번호를 사용하여 암호화됩니다.</string>
+    <string name="understand_risk_accept">아 예 위험하군요</string>
+    <string name="export_format_aegis">Aegis (.JSON)</string>
+    <string name="export_format_google_auth_uri">텍스트 파일 (.TXT)</string>
+    <string name="export_format_html">웹 페이지 (.HTML)</string>
+    <string name="export_format_hint">내보내기 형식</string>
+    <string name="export_all_groups">모든 그룹 내보내기</string>
+    <string name="export_choose_groups">내보낼 그룹 선택하기</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="other">그룹 %d개 선택됨</item>
+    </plurals>
+    <string name="export_no_groups_selected">아무 그룹도 선택받지 못했습니다</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator로부터</string>
+    <string name="choose_authentication_method">보안</string>
+    <string name="authentication_method_explanation">Aegis는 보안에 중점을 둔 2FA 앱입니다. 토큰은 사용자가 선택한 비밀번호로 선택적으로 암호화할 수 있는 보관함에 저장됩니다. 공격자가 암호화된 보관함 파일을 입수하면 암호를 모르면 콘텐츠에 액세스할 수 없습니다.\n\n우리는 이미 당신의 장치에 가장 적합하다고 생각되는 옵션을 선택해 두었습니다.</string>
+    <string name="authentication_method_none">없음</string>
+    <string name="authentication_method_none_description">보관함 해제에 비밀번호가 필요하지 않고고 이는 암호화되지 않음을 의미합니다. <b>이 설정은 권장되지 않습니다</b>.</string>
+    <string name="authentication_method_password">비밀번호</string>
+    <string name="authentication_method_password_description">보관함 해제에 비밀번호가 필요합니다.</string>
+    <string name="authentication_method_password_explanation">경고: 만약 비밀번호를 잊어버렸다면, 영원히, 영원히 토큰에 접근할 수 없게 됩니다. 비밀번호 없이는 \"절대\" 복구가 불가능합니다.</string>
+    <string name="authentication_method_biometrics">생체 인식</string>
+    <string name="authentication_method_biometrics_description">비밀번호에 추가로, 지문과 같이 이 장치에 등록된 생체 인식을 잠금 해제에 사용합니다.</string>
+    <string name="authentication">보관함 잠금 해제</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">보관함\n잠금 해제</string>
+    <string name="auth_use_biometrics">또는 <font fgcolor="#FF0D86C1">여기</font>를 눌러 생체 인식 사용</string>
+    <string name="set_password">비밀번호를 입력해주세요</string>
+    <string name="set_group">그룹 이름을 입력해주세요</string>
+    <string name="set_number">숫자를 입력해주세요</string>
+    <string name="set_password_confirm">비밀번호를 확인해주세요</string>
+    <string name="invalid_password">비밀번호가 올바르지 않습니다</string>
+    <string name="invalidated_biometrics">기기의 보안 설정이 변경되었습니다. \"Aegis -&gt; 설정 -&gt; 보안 -&gt; 생체 인식 잠금 해제\"에서 생체 인식을 비활성화한 후 다시 활성화 해주세요.</string>
+    <string name="password_reminder">비밀번호를 입력해주세요. 잊어버리지 않도록 가끔 물어볼 수 있습니다.</string>
+    <string name="password_reminder_dialog_title">기본적으로 생체 인식 사용</string>
+    <string name="password_reminder_dialog_message">비밀번호를 잊어버리지 않고 보관함이 잠기지 않도록 비밀번호를 입력하라는 메시지가 가끔 표시됩니다. 비밀번호를 한 번 입력하면 다시 비밀번호 알림이 표시될 때까지 Aegis는 기본적으로 생체 인식 잠금 해제로 돌아갑니다.</string>
+    <string name="password_reminder_freq_never">없음</string>
+    <string name="password_reminder_freq_weekly">1주</string>
+    <string name="password_reminder_freq_biweekly">2주</string>
+    <string name="password_reminder_freq_monthly">1개월</string>
+    <string name="password_reminder_freq_quarterly">3개월</string>
+    <string name="enter_password_2fas_message">2FAS 백업이 암호화되어 있습니다. 아래에 비밀번호를 입력해주세요.</string>
+    <string name="enter_password_authy_message">Authy 토큰이 암호화된 것으로 보입니다. Aegis를 닫은 다음 Authy를 열고 비밀번호로 토큰을 해제해주세요. 아래에 비밀번호를 입력해서도 Aegis가 대신 Authy 토큰을 해독할 수 있습니다.</string>
+    <string name="enter_password_aegis_title">가져오기 비밀번호를 입력해주세요</string>
+    <string name="period_hint">주기 (초)</string>
+    <string name="algorithm_hint">해시 함수</string>
+    <string name="type">유형</string>
+    <string name="share">공유</string>
+    <string name="yes">예</string>
+    <string name="no">아니요</string>
+    <string name="undo">실행 취소</string>
+    <string name="unlock">잠금 해제</string>
+    <string name="advanced">고급</string>
+    <string name="counter">카운터</string>
+    <string name="digits">숫자</string>
+    <string name="secret">비밀키</string>
+    <string name="scan">QR코드 스캔</string>
+    <string name="scan_image">이미지 스캔</string>
+    <string name="enter_manually">수동으로 입력</string>
+    <string name="set_up_biometric">생체 인식 잠금 설정하기</string>
+    <string name="copy">복사</string>
+    <string name="edit">수정</string>
+    <string name="select_all">전체 선택</string>
+    <string name="assign_icons">아이콘 할당</string>
+    <string name="assign_groups">그룹에 할당하기</string>
+    <string name="assign_groups_dialog_summary">선택된 항목을 어떤 그룹에 할당할지 선택해주세요．</string>
+    <string name="assign_groups_dialog_dropdown">그룹 선택하기</string>
+    <string name="favorite" comment="Verb">즐겨찾기</string>
+    <string name="unfavorite" comment="Verb">즐겨찾기 해제</string>
+    <string name="error_all_caps">오류</string>
+    <string name="password">비밀번호</string>
+    <string name="confirm_password">비밀번호 확인</string>
+    <string name="show_password">비밀번호 표시</string>
+    <string name="new_entry">새 항목</string>
+    <string name="add_new_entry">새 항목 추가</string>
+    <string name="unlock_vault_error">보관함 잠금 해제 실패</string>
+    <string name="unlock_vault_error_description">비밀번호가 올바르지 않습니다. 잘못 입력하지는 않았는지 확인해주세요.</string>
+    <string name="password_equality_error">비밀번호는 동일하고 비어있지 않아야 합니다</string>
+    <string name="snackbar_authentication_method">인증 수단을 선택해주세요</string>
+    <string name="encrypting_vault">보관함을 암호화하는 중</string>
+    <string name="exporting_vault">보관함을 내보내는 중</string>
+    <string name="optimizing_icon">아이콘 최적화</string>
+    <string name="optimizing_icon_multiple">아이콘 최적화 중 %1$d/%2$d</string>
+    <string name="reading_file">파일 읽는 중</string>
+    <string name="requesting_root_access">루트 권한 필요</string>
+    <string name="analyzing_qr">QR 코드 분석 중</string>
+    <string name="analyzing_qr_multiple">QR 코드 분석 중 %1$d/%2$d (%3$s)</string>
+    <plurals name="added_new_entries">
+        <item quantity="other">새 항목 %d개가 추가되었습니다</item>
+    </plurals>
+    <string name="importing_icon_pack">아이콘 팩을 불러오는 중</string>
+    <string name="delete_entry">항목 삭제</string>
+    <string name="delete_entry_description">정말로 이 항목을 삭제하시겠어요?</string>
+    <string name="delete_entry_explanation">이 행동(%s)은 2단계 인증(2FA)를 비활성화하지 않습니다. 접근 권한을 잃지 않으려면 2FA를 비활성화했거나 이 서비스에 대한 코드를 생성할 수 있는 대체 방법이 있는지 확인하세요.</string>
+    <string name="delete_entries">항목 삭제</string>
+    <plurals name="delete_entries_description">
+        <item quantity="other">정말로 %d개의 항목을 삭제하시겠나요?</item>
+    </plurals>
+    <string name="discard_changes">변경을 취소하시겠어요?</string>
+    <string name="discard_changes_description">변경 사항이 저장되지 않았습니다</string>
+    <string name="saving_profile_error">프로필 저장 오류</string>
+    <string name="saving_assign_icons_error">아이콘 할당 오류</string>
+    <string name="welcome">환영합니다!!</string>
+    <string name="app_description">Ageis는 무료고, 자유롭고, 보안에, 무려 오픈 소스인 2FA 앱입니다.</string>
+    <string name="setup_completed">설정 완료</string>
+    <string name="setup_completed_description">Aegis가 설정되고, 이제 사용할 준비가 되었습니다!</string>
+    <string name="vault_not_found">보관함이 없었고, 설정을 시작하는 중…</string>
+    <string name="copied">복사됨</string>
+    <string name="errors_copied">클립보드에 복사 중 오류</string>
+    <string name="version_copied">버전을 클립보드에 복사했습니다</string>
+    <string name="error_required_field">필수로 기입해야 합니다</string>
+    <string name="error_occurred">오류 발생</string>
+    <string name="decryption_error">보관함 잠금 해제 중 오류 발생</string>
+    <string name="decryption_corrupt_error">보관함 잠금 해제 중 오류가 발생했습니다. 보관함 파일이 손상되었는지 확인해주세요.</string>
+    <string name="saving_error">보관함 저장 중 오류 발생</string>
+    <string name="vault_init_error">보관함 초기화 중 오류 발생</string>
+    <string name="vault_load_error">저장소에서 보관함 가져오던 중 오류 발생</string>
+    <string name="biometric_decrypt_error">생체 인증으로 보관함의 암호를 해독하는 동안 오류가 발생했습니다. 일반적으로 장치의 보안 설정이 변경된 경우에만 발생합니다. 비밀번호로 보관함의 잠금을 해제하고 Aegis의 설정에서 생체 인증을 다시 설정하세요.</string>
+    <string name="biometric_init_error">생체 인증을 준비하는 동안 오류가 발생했습니다. 이는 일반적으로 장치의 보안 설정이 변경된 경우에만 발생합니다. 비밀번호로 보관함의 잠금을 해제하고 Aegis의 설정에서 생체 인증을 다시 설정하세요.</string>
+    <string name="disable_encryption">암호화 비활성화</string>
+    <string name="disable_encryption_description">암호화를 비활성화하시겠나요? 그렇게 하면 보관함이 일반 텍스트로 저장됩니다. <b>자동 백업도 비활성화됩니다.</b></string>
+    <string name="enable_encryption_error">암호화 활성화 중 오류 발생</string>
+    <string name="disable_encryption_error">암호화 비활성화 중 오류 발생</string>
+    <string name="backup_successful">백업이 성공적으로 예약되었습니다</string>
+    <string name="backup_error">백업 생성 중 오류 발생</string>
+    <string name="backup_status_success">마지막으로 성공한 백업: %s</string>
+    <string name="backup_status_failed">마지막으로 실패한 백업: %s</string>
+    <string name="backup_status_none">아직 아무 백업도 만들어지지 않았습니다</string>
+    <string name="backup_warning_password">백업은 보안 설정에서 설정된 별도의 비밀번호를 사용하여 암호화됩니다</string>
+    <string name="documentsui_error">장치에서 DocumentsUI가 누락된 것 같습니다. 이는 문서를 선택하고 작성하는 데 필요한 중요한 시스템 구성 요소입니다. 도구를 사용하여 장치를 &quot;삭제
+&quot;한 경우 실수로 삭제했을 수 있으므로 다시 설치해야 합니다．</string>
+    <string name="icon_pack_import_error">아이콘 팩 생성 중 오류 발생</string>
+    <string name="icon_pack_import_exists_error">가져오려는 아이콘 팩이 이미 있는 것 같습니다. 덮어쓰시겠나요?</string>
+    <string name="icon_pack_delete_error">아이콘 팩 삭제 중 오류 발생</string>
+    <plurals name="icon_pack_info">
+        <item quantity="other">%d 아이콘</item>
+    </plurals>
+    <string name="icon_custom">사용자 지정</string>
+    <string name="permission_denied">승인 거부됨</string>
+    <string name="andotp_new_format">새 형식 (v0.6.3 또는 신버전) </string>
+    <string name="andotp_old_format">구 형식 (v0.6.2 또는 구버전) </string>
+    <string name="choose_andotp_importer">andOTP 백업 파일은 어떤 형식인가요?</string>
+    <string name="choose_totpauth_importer">이 TOTP 인증자 백업은 비밀번호로 암호화되어 있나요?</string>
+    <string name="choose_application">불러오려는 앱을 선택해주세요</string>
+    <string name="choose_theme">원하는 테마를 선택해주세요</string>
+    <string name="choose_account_name_position">계정 이름 위치를 선택해주세요</string>
+    <string name="choose_view_mode">보기 모드를 선택해주세요</string>
+    <string name="choose_copy_behavior">복사 방법을 선택해주세요</string>
+    <string name="parsing_file_error">파일 파싱 중 오류 발생</string>
+    <string name="file_not_found">오류: 파일을 찾을 수 없습니다</string>
+    <string name="reading_file_error">파일을 읽던 중 오류가 발생했습니다</string>
+    <string name="app_lookup_error">오류: 앱이 설치되지 않았습니다</string>
+    <string name="app_version_error">이 버전의 %s는 지원되지 않습니다. 최근 버전에서는 내부 저장소 디렉터리의 일부 파일이 암호화되기 시작하여 Aegis가 가져오기에 필요한 정보에 액세스할 수 없습니다. 가져오기를 시도하면 오류가 발생할 수 있습니다. 그래도 계속하시겠나요?</string>
+    <string name="root_error">오류: 루트 권한을 얻을 수 없습니다</string>
+    <plurals name="imported_entries_count">
+        <item quantity="other">%d 개 불러옴</item>
+    </plurals>
+    <plurals name="entries_shown">
+        <item quantity="other">%d개 표시 중</item>
+    </plurals>
+    <string name="intro_import_error_title">보관함을 불러오던 중 오류가 발생했습니다</string>
+    <string name="import_error_title">불러오기 중 하나 이상의 오류가 발생했습니다</string>
+    <string name="exporting_vault_error">보관함을 내보내던 중 오류가 발생했습니다</string>
+    <string name="exported_vault">보관함을 내보냈습니다</string>
+    <string name="encryption_set_password_error">암호를 설정하던 중 오류가 발생했습니다.</string>
+    <string name="encryption_enable_biometrics_error">생체 인식 잠금 해제를 활성화하는 동안 오류가 발생했습니다. 일부 기기에서는 생체 인증이 제대로 구현되지 않으며, 사용 중인 기기도 여기에 해당할 수 있습니다. 대신 비밀번호 전용 구성으로 전환해 보세요.</string>
+    <string name="no_cameras_available">사용 가능한 카메라 없음</string>
+    <string name="read_qr_error">QR 코드를 읽던 중 오류가 발생했습니다</string>
+    <string name="read_qr_error_phonefactor">Aegis는 Microsoft의 독점적인 2FA 알고리즘과 호환되지 않습니다. Office 365에서 2FA를 설정할 때 \'알림 없이 애플리케이션 설정\'을 선택해야 합니다.</string>
+    <string name="partial_google_auth_import">불완전한 Google 인증자 내보내기가 감지되었습니다</string>
+    <string name="partial_google_auth_import_warning">일부 QR 코드가 불러오기에서 누락되었습니다. 다음 코드들이 발견되지 않았습니다: \n\n<b>%s</b>\n\n이 부분 불러오기를 계속할 수 있지만 토큰에 대한 액세스 권한을 잃을 위험이 없도록 모든 QR 코드를 사용하여 다시 시도하는 것이 좋습니다.</string>
+    <string name="missing_qr_code_descriptor">• QR 코드 %d</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="other">어쨋든 토큰 %d개를 불러오기</item>
+    </plurals>
+    <string name="import_google_auth_failure">Google 인증자 내보내기를 불러오지 못했습니다</string>
+    <string name="unrelated_google_auth_batches_error">내보내기에 관련 없는 배치에 대한 정보가 포함되어 있습니다. 한 번에 하나의 배치를 가져와 보세요.</string>
+    <string name="no_tokens_can_be_imported">아무 토큰도 가져오지 못했습니다</string>
+    <string name="unlocking_vault">보관함 잠금 해제 중</string>
+    <string name="rename_group">그룹 이름 바꾸기</string>
+    <string name="no_group_selection">어떤 그룹에도 속하지 않은 항목은, \"그룹 없음\"에서 발견될 수 있습니다.</string>
+    <string name="remove_group">그룹 삭제</string>
+    <string name="remove_group_description">정말로 이 그룹을 삭제하시겠나요? 그룹 내의 항목들은 자동적으로 \'그룹 없음\'으로 변경됩니다.</string>
+    <string name="remove_unused_groups">사용하지 않는 그룹 삭제</string>
+    <string name="remove_unused_groups_description">정말로 항목이 할당되지 않은 모든 그룹을 삭제하시겠나요?</string>
+    <string name="remove_icon_pack">아이콘 팩 삭제</string>
+    <string name="remove_icon_pack_description">정말로 이 아이콘 팩을 삭제하시겠나요? 이 아이콘 팩의 아이콘을 사용하는 항목들은 영향이 없습니다.</string>
+    <string name="details">상세</string>
+    <string name="show_error_details">오류 상세 표시</string>
+    <string name="lock">잠금</string>
+    <string name="name">이름</string>
+    <string name="no_group">그룹 없음</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">정렬</string>
+    <string name="sort_alphabetically">서비스명 (이름순)</string>
+    <string name="sort_alphabetically_reverse">서비스명 (이름 역순)</string>
+    <string name="sort_alphabetically_name">계정 (이름순)</string>
+    <string name="sort_alphabetically_name_reverse">계정 (이름 역순)</string>
+    <string name="sort_usage_count">사용 횟수</string>
+    <string name="sort_last_used">최근 사용</string>
+    <string name="sort_custom">사용자 지정</string>
+    <string name="last_used">최근 사용</string>
+    <string name="last_used_never">없음</string>
+    <string name="new_group">새 그룹...</string>
+    <string name="group">그룹</string>
+    <string name="group_name_hint">그룹명</string>
+    <string name="preference_manage_groups">그룹 편집</string>
+    <string name="preference_manage_groups_summary">여기에서 그룹을 관리하거나 삭제할 수 있습니다</string>
+    <string name="preference_reset_usage_count">사용 횟수 초기화</string>
+    <string name="preference_reset_usage_count_summary">보관함에서 모든 항목의 사용횟수 초기화</string>
+    <string name="preference_reset_usage_count_dialog">보관함 속 모든 항목의 사용횟수를 0으로 초기화하시겠나요?</string>
+    <string name="note" comment="Users can add a note to an entry">메모</string>
+    <string name="clear">지우기</string>
+    <string name="pref_highlight_entry_title">터치되었을 때 토큰 강조하기</string>
+    <string name="pref_highlight_entry_summary">터치되었을 때 일시적으로 토큰을 강조하여 구분하기 쉽게 합니다</string>
+    <string name="pref_groups_multiselect_title">다중 그룹 선택</string>
+    <string name="pref_groups_multiselect_summary">한 번에 여러 개의 그룹을 선택할 수 있게 합니다</string>
+    <string name="pref_minimize_on_copy_title">복사할 때 최소화하기</string>
+    <string name="pref_minimize_on_copy_summary">토큰을 복사한 후, 앱을 최소화합니다</string>
+    <string name="pref_copy_behavior_title">클립보드에 토큰 복사하기</string>
+    <string name="pref_search_behavior_title">검색 행동</string>
+    <string name="pref_pause_entry_title">터치되었을 때 토큰 얼리기</string>
+    <string name="pref_pause_entry_summary">토큰을 탭하여 토큰의 자동 새로 고침을 일시 중지합니다. 토큰이 초점이 맞춰져 있는 동안에는 토큰이 업데이트되지 않습니다. “탭하면 토큰 강조 표시” 또는 ‘탭하여 표시’가 필요합니다.</string>
+    <string name="pin_keyboard_description">비밀번호를 입력하여 PIN 키보드를 활성화합니다. 비밀번호가 숫자로만 구성된 경우에만 작동합니다</string>
+    <string name="pin_keyboard_error">PIN 키보드를 활성화하던 중 오류가 발생했습니다</string>
+    <string name="pin_keyboard_error_description">PIN 키보드를 설정할 수 없습니다. 비밀번호가 반드시 숫자만을 포함해야 합니다.</string>
+    <string name="pin_keyboard_disabled">비밀번호가 변경되었습니다. PIN 키보드는 더 이상 보여지지 않습니다.</string>
+    <string name="selected">선택됨</string>
+    <string name="dark_theme_title">다크 테마</string>
+    <string name="light_theme_title">라이트 테마</string>
+    <string name="amoled_theme_title">AMOLED 테마</string>
+    <string name="system_theme_title">배터리 절약 모드</string>
+    <string name="system_amoled_theme_title">배터리 절약 모드 (AMOLED)</string>
+    <string name="normal_viewmode_title">보통</string>
+    <string name="compact_mode_title">간단히</string>
+    <string name="small_mode_title">작게</string>
+    <string name="tiles_mode_title">타일</string>
+    <string name="unknown_issuer">알 수 없는 공급자</string>
+    <string name="unknown_account_name">알 수 없는 계정명</string>
+    <plurals name="import_error_dialog">
+        <item quantity="other">Aegis가 토큰 %d개를 불러오지 못했습니다. 이 토큰들은 스킵될 것입니다. \'상세\'를 눌러 오류에 대한 정보를 더 확인할 수 있습니다.</item>
+    </plurals>
+    <string name="unable_to_process_deeplink">딥 링크를 처리할 수 없음</string>
+    <string name="unable_to_read_qrcode_file">파일로부터 QR 코드를 읽고 처리할 수 없음: %s.</string>
+    <string name="unable_to_process_shared_text">공유 텍스트를 OTP로 처리할 수 없음</string>
+    <string name="unable_to_read_qrcode_files">일부 QR 코드를 읽고 처리할 수 없음, %1$d/%2$d개 항목만 불러와졌습니다.</string>
+    <string name="unable_to_generate_qrcode">QR 코드를 생성할 수 없음</string>
+    <string name="select_picture">사진 선택</string>
+    <string name="select_icon">아이콘 선택</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">보관함 열기</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">스캐너 열기</string>
+    <string name="toggle_checkboxes">확인란 토글</string>
+    <string name="search">검색</string>
+    <string name="channel_name_lock_status">잠금 상태</string>
+    <string name="channel_description_lock_status">Aegis는 보관함이 잠겨 있을 때 영구 알림을 생성하여 사용자에게 알릴 수 있습니다</string>
+    <string name="vault_unlocked_state">보관함이 잠금 해제되었습니다. 여기를 눌러 잠그세요.</string>
+    <string name="version">버전</string>
+    <string name="changelog">변경 내역</string>
+    <string name="whats_new">새로운 소식</string>
+    <string name="github_description">소스코드, 문제 및 정보</string>
+    <string name="license">라이선스</string>
+    <string name="license_description">Aegis 인증자는 GPLv3 라이선스 하에 있습니다</string>
+    <string name="third_party_licenses">서드파티 라이선스</string>
+    <string name="third_party_licenses_description">Aegis가 사용하는 서드파티 라이브러리</string>
+    <string name="country_netherlands">네덜란드</string>
+    <string name="email_us">이메일 쓰기</string>
+    <string name="visit_website">웹사이트 방문하기</string>
+    <string name="about_support">지원</string>
+    <string name="support_rate">평가</string>
+    <string name="support_rate_description">구글 플레이 스토어에서 리뷰를 남겨 응원해주세요</string>
+    <string name="webview_error">이 기기는 변경 내역 및 라이선스를 보는 데 필요한 웹 뷰를 지원하지 않습니다. 시스템 구성 요소가 누락된 것입니다.</string>
+    <string name="email">이메일</string>
+    <string name="time_sync_warning_title">자동 시간 동기화</string>
+    <string name="time_sync_warning_message">Aegis는 올바른 코드를 생성하기 위해 시스템 동기화 시간에 의존합니다. 몇 초만 벗어나도 잘못된 코드가 생성될 수 있습니다. 장치가 시간을 자동으로 동기화하도록 설정되지 않은 것 같습니다. 지금 변경하시겠나요?</string>
+    <string name="time_sync_warning_disable">그만해!! 나는 다 알아!!</string>
+    <string name="google_qr_export_unrelated">관련 없는 QR 코드가 발견되었습니다. 스캐너를 재시작해보세요.</string>
+    <plurals name="google_qr_export_scanned">
+        <item quantity="other">QR 코드 %1$d/%2$d개가 스캔됨</item>
+    </plurals>
+    <string name="google_qr_export_unexpected">QR 코드 #%1$d가 아닌 QR 코드 #%2$d가 스캔됨</string>
+    <string name="backup_error_bar_message"><b>보관함 백업이 최근에 실패했습니다</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        최근에 %1$s를 사용한 보관함 백업에 오류가 발생했습니다. 백업이 %2$s에 시도되었습니다. 백업이 완전하게 이루어질 수 있는지 설정을 확인해주세요.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Aegis에 백업 대상에 대한 쓰기 권한이 없어서 %1$s를 사용하여 최근 보관함 백업을 시도하지 못했습니다. 백업이 %2$s에 시도되었습니다. 이 오류는 백업 대상을 이동/이름을 변경했거나 최근에 백업에서 Aegis를 복원한 경우에 발생할 수 있습니다. 백업 대상을 다시 설정하세요.    </string>
+    <string name="backup_system_builtin">Aegis의 내부 자동 백업</string>
+    <string name="backup_system_android">안드로이드 클라우드 백업 시스템</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        마지막 백업이 오래되었습니다 (%s)
+    </string>
+    <string name="backup_reminder_bar_message">        변경 사항이 백업되지 않았습니다
+    </string>
+    <string name="backup_reminder_bar_dialog_title">변경 사항이 백업되지 않았습니다</string>
+    <string name="backup_reminder_bar_dialog_summary">        최근 보관함의 변경 사항이 아직 백업되지 않았습니다. 계정에 대한 액세스 권한을 잃지 않으려면 정기적으로 백업을 하는 것이 중요합니다. 설정 메뉴에서 자동 백업을 설정해 보세요.
+    </string>
+    <string name="backup_reminder_bar_dialog_accept">백업 설정하기</string>
+    <string name="backup_plaintext_export_warning"><b>보관함이 최근에 일반 글자로 내보내졌습니다</b></string>
+    <string name="pref_show_plaintext_warning_hint">이 경고 다시 보여주지 않기</string>
+    <string name="backup_plaintext_warning_explanation">이 경고는 최근에 암호화되지 않은 보관함 사본을 내보냈기 때문에 보여집니다. 토큰의 보안을 위해서, 파일이 필요하지 않아지면 삭제하는 것을 권장합니다.</string>
+    <string name="switch_camera">카메라 변경</string>
+    <string name="empty_list">보여줄 코드가 없습니다. 오른쪽 아래 구석의 플러스 표시를 눌러 항목 추가를 시작해보세요!</string>
+    <string name="empty_list_title">항목이 없습니다</string>
+    <string name="empty_group_list">보여줄 그룹이 없습니다. 항목 편집 화면에서 그룹을 추가하세요</string>
+    <string name="empty_group_list_title">그룹이 없습니다</string>
+    <string name="no_icon_packs">불러온 아이콘 팩이 없습니다. 플러스 버튼을 눌러 불러와보세요. 팁: <a href="https://aegis-icons.github.io">aegis-icons(Aegis 아이콘)</a>을 시도해보세요.</string>
+    <string name="no_icon_packs_title">아이콘 팩이 없습니다</string>
+    <string name="pick_icon">아이콘 선택하기</string>
+    <string name="uncategorized">분류되지 않음</string>
+    <string name="done">완료</string>
+    <plurals name="qr_count">
+        <item quantity="other">%d / %d QR 코드</item>
+    </plurals>
+    <string name="next">다음</string>
+    <string name="previous">이전</string>
+    <string name="copy_uri">URI 복사하기</string>
+    <string name="unable_to_copy_uri_to_clipboard">URI를 클립보드에 복사할 수 없습니다</string>
+    <string name="uri_copied_to_clipboard">URI를 클립보드에 복사했습니다</string>
+    <string name="transfer_entry_description">이 항목을 전송하려는 인증 앱으로 이 QR 코드를 스캔하세요</string>
+    <string name="transfer_entry_brightness">화면 밝기를 최대로 변경하려면 QR 코드를 누르세요</string>
+    <string name="google_auth_compatible_transfer_description">이 QR 코드를 Aegis 또는 Google Authenticator로 스캔하세요.\n\nGoogle Authenticator 앱의 제한으로 인해 SHA1을 사용하고 6자리 코드를 생성하는 TOTP &amp; HOTP 토큰만 포함되어 있습니다</string>
+    <string name="password_strength_very_weak">매우 약함</string>
+    <string name="password_strength_weak">약함</string>
+    <string name="password_strength_fair">적당함</string>
+    <string name="password_strength_good">좋음</string>
+    <string name="password_strength_strong">강함</string>
+    <string name="password_strength_unknown">강함을 분석하기엔 비밀번호가 너무 깁니다</string>
+    <string name="pref_pin_keyboard_title">잠금화면에서 PIN 키보드 사용하기</string>
+    <string name="pref_pin_keyboard_summary">PIN 키보드를 잠금화면에서 사용하려면 활성화하세요. 숫자로만 이루어진 비밀번호에만 작동합니다</string>
+    <string name="title_activity_preferences">설정</string>
+    <string name="title_activity_manage_groups">그룹 관리</string>
+    <string name="title_activity_transfer">항목 이동</string>
+    <string name="title_activity_about">정보</string>
+    <string name="title_activity_edit_entry">항목 편집</string>
+    <string name="title_activity_scan_qr">QR 코드 스캔</string>
+    <string name="title_activity_import_entries">항목 불러오기</string>
+    <string name="title_activity_assign_icons">아이콘 할당하기</string>
+    <string name="title_activity_licenses">제 3자 라이선스</string>
+    <string name="dialog_wipe_entries_title">항목 지우기</string>
+    <string name="dialog_wipe_entries_message">보관함이 항목들을 포함합니다. 이 파일을 불러오기 전에 중복되는 항목을 제거하시겠나요?\n\n<b>이렇게 하면, 보관함에 있는 기존 항목에 영구적으로 액세스할 수 없게 됩니다.</b></string>
+    <string name="dialog_wipe_entries_checkbox">보관함 내용 지우기</string>
+    <string name="panic_trigger_ignore_toast">Aeigs가 패닉 트리거를 수신했지만 비활성화이므로, 무시합니다</string>
+    <string name="pref_panic_trigger_title">패닉 트리거의 보관함 삭제</string>
+    <string name="pref_panic_trigger_summary">Ripple에서 패닉 트리거를 수신하면 보관함 삭제</string>
+    <string name="import_vault">Aegis 보관함 불러오기</string>
+    <string name="import_vault_hint">다른 2FA 앱에서 불러오실건가요? 설정을 먼저 끝내고 설정 메뉴로 가보세요.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="other">%d개의 잠재적 중복을 확인하지 않았습니다. 전체 목록을 검토해주세요.</item>
+    </plurals>
+    <string name="importer_help_2fas">2FAS Authenticator 백업 파일을 제공해주세요.</string>
+    <string name="importer_help_aegis">Aegis 백업 파일을 제공해주세요.</string>
+    <string name="importer_help_authenticator_plus"><b>설정 -&gt; 백업 &amp; 복원- &gt; 글자 또는 HTML로 내보내기</b>에서 얻은 Authenticator Plus 내보내기 파일을 제공해주세요.</string>
+    <string name="importer_help_authy">Authy의 내부 저장소 위치 <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>에 있는 파일의 사본을 제공해주세요.</string>
+    <string name="importer_help_andotp">andOTP 내보내기 파일을 제공해주세요.</string>
+    <string name="importer_help_bitwarden">Bitwarden 내보내기 파일을 제공해주세요. 암호화된 파일은 지원되지 않습니다.</string>
+    <string name="importer_help_battle_net_authenticator">Battle.net Authenticator의 내부 저장소 위치 <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>에 있는 파일의 사본을 제공해주세요.</string>
+    <string name="importer_help_duo">DUO의 내부 저장소 위치 <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>에 있는 파일의 사본을 제공해주세요.</string>
+    <string name="importer_help_ente_auth">Ente Auth 내보내기 파일을 제공해주세요. 현재 암호화되지 않은 파일만 지원됩니다.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: 백업 파일을 제공해주세요.\nFreeOTP 1.x: FreeOTP의 내부 저장소 위치 <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>에 있는 파일의 사본을 제공해주세요.</string>
+    <string name="importer_help_freeotp_plus">FreeOTP+ 내보내기 파일을 제공해주세요.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2 호환성</string>
+    <string name="importer_warning_message_freeotp2">백업이 손상될 수 있는 FreeOTP 2의 여러 문제가 있습니다. Aegis는 가능한 한 많은 항목을 복구하려고 시도하지만, 일부 또는 전체 항목을 불러오지 못할 수도 있습니다.</string>
+    <string name="importer_help_google_authenticator"><b>Google Authenticator v5.10 및 이전 버전의 데이터베이스 파일만 지원됩니다</b>.\n\nGoogle Authenticator의 내부 저장소 위치 <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>에 존재하는 파일의 사본을 제공해주세요.</string>
+    <string name="importer_help_microsoft_authenticator">Microsoft Authenticator의 내부 저장소 위치 <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>에 있는 파일의 사본을 제공해주세요.</string>
+    <string name="importer_help_plain_text">각 줄에 Google Authenticator URI가 포함된 일반 텍스트 파일을 제공해주세요.</string>
+    <string name="importer_help_steam"><b>Steam v3.0과 이후 버전은 지원되지 않습니다</b>. Steam의 내부 저장소 위치 <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>에 있는 파일의 사본을 제공해주세요.</string>
+    <string name="importer_help_stratum"><b>설정 -&gt; 백업 -&gt; 암호화된 파일로 백업하기 (권장)</b>으로 얻은 Stratum 내보내기 파일을 제공해주세요.</string>
+    <string name="importer_help_totp_authenticator">TOTP Authenticator 내보내기 파일을 제공해주세요.</string>
+    <string name="importer_help_winauth">WinAuth 내보내기 파일을 제공해주세요.</string>
+    <string name="import_assign_icons_dialog_title">아이콘 할당하기</string>
+    <string name="import_assign_icons_dialog_text">불러온 항목에 아이콘을 할당하시겠나요?</string>
+    <string name="importer_encrypted_exception_google_authenticator">암호화된 항목은 스킵되었습니다: %s</string>
+    <string name="importer_help_direct">%s에서 직접 항목을 가져옵니다. 이를 위해서는 이 기기에 앱이 설치되어 있어야 하며 Aegis에 루트 접근 권한이 부여되어야 합니다.</string>
+    <string name="groups">그룹</string>
+    <string name="pref_focus_search">앱 시작 시 바로 검색하기</string>
+    <string name="pref_focus_search_summary">앱이 열리면 즉시 검색을 실시합니다.</string>
+    <string name="pref_grouping_halves">절반</string>
+    <string name="pref_grouping_none">그룹 없음</string>
+    <string name="pref_grouping_size_two">2개 그룹</string>
+    <string name="pref_grouping_size_three">3개 그룹</string>
+    <string name="pref_grouping_size_four">4개 그룹</string>
+    <string name="pref_copy_behavior_never">없음</string>
+    <string name="pref_copy_behavior_single_tap">단일 탭</string>
+    <string name="pref_copy_behavior_double_tap">두 번 탭</string>
+    <string name="pref_account_name_position_hidden">숨김</string>
+    <string name="pref_account_name_position_end">공급자 옆에</string>
+    <string name="pref_account_name_position_below">공급자 아래에</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="other">%d 초 전</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="other">%d 분 전</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="other">%d 시간 전</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="other">%d 일 전</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="other">%d 년 전</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="other">%d개 항목 선택됨</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-lt-rLT-v29/strings.xml b/app/src/main/res/values-lt-rLT-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-lt-rLT-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 088f3749..a5582cf9 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Nustatymai</string>
     <string name="action_about">Apie</string>
     <string name="action_delete">Ištrinti</string>
     <string name="action_transfer">Perkelti</string>
-    <string name="action_edit_icon">Taisyti piktogramą</string>
+    <string name="action_edit_icon">Redaguoti piktogramą</string>
     <string name="action_default_icon">Atkurti numatytąją piktogramą</string>
     <string name="discard">Atmesti</string>
-    <string name="save">Įrašyti</string>
+    <string name="save">Išsaugoti</string>
+    <string name="all">Viskas</string>
     <string name="issuer">Leidėjas</string>
     <string name="usage_count">Naudojimų skaičius</string>
     <string name="warning">Įspėjimas</string>
@@ -38,8 +39,8 @@
     <string name="pref_android_backups_summary">Leisti „Android“ debesijos atsarginių kopijų sistemai įtraukti Aegis slėptuves į „Android“ atsargines kopijas. Tai palaikoma tik šifruotoms slėptuvėms.</string>
     <string name="pref_backups_title">Automatiškai daryti slėptuvės atsargines kopijas</string>
     <string name="pref_backups_summary">Atlikus pakeitimus, automatiškai daryti slėptuvės atsarginę kopiją išorinėje saugykloje. Tai palaikoma tik šifruotoms slėptuvėms.</string>
-    <string name="pref_backups_location_title">Atsarginės kopijos failų katalogas</string>
     <string name="pref_backups_location_summary">Atsarginės kopijos bus saugomos ties</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Laikyti %1$d atsarginės kopijos versiją</item>
         <item quantity="few">Laikyti %1$d atsarginės kopijos versijas</item>
@@ -73,6 +74,7 @@
     <string name="export_warning_unencrypted">Jūs ketinate eksportuoti nešifruotą savo Aegis slėptuvės kopiją. <b>Tai nerekomenduojama</b>.</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
     <string name="export_format_google_auth_uri">Tekstinis failas (.TXT)</string>
+    <string name="export_format_html">Saityno puslapis (.HTML)</string>
     <string name="export_format_hint">Eksportavimo formatas</string>
     <string name="choose_authentication_method">Saugumas</string>
     <string name="authentication_method_explanation">Aegis yra į saugumą orientuota 2FA programėlė. Prieigos raktai yra saugomi slėptuvėje, kuri gali būti pasirinktinai šifruojama naudojant pasirinktą slaptažodį. Jei užpuolikas gaus jūsų šifruotą slėptuvės failą, jis, nežinodamas slaptažodžio, negalės pasiekti slėptuvės turinio.\n\nMes iš anksto pažymėjome parinktį, kuri mūsų manymu labiausiai tinka jūsų įrenginiui.</string>
@@ -97,6 +99,7 @@
     <string name="share">Bendrinti</string>
     <string name="yes">Taip</string>
     <string name="no">Ne</string>
+    <string name="undo">Atšaukti</string>
     <string name="unlock">Atrakinti</string>
     <string name="advanced">Išplėstiniai</string>
     <string name="digits">Skaitmenys</string>
@@ -117,7 +120,7 @@
     <string name="snackbar_authentication_method">Pasirinkite tapatybės nustatymo metodą</string>
     <string name="encrypting_vault">Šifruojama slėptuvė</string>
     <string name="analyzing_qr">Analizuojamas QR kodas</string>
-    <string name="analyzing_qr_multiple">Analizuojamas QR kodas %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analizuojamas QR kodas %1$d/%2$d (%3$s)</string>
     <string name="importing_icon_pack">Importuojamas piktogramų paketas</string>
     <string name="delete_entry">Ištrinti įrašą</string>
     <string name="delete_entry_description">Ar tikrai norite ištrinti šį įrašą?</string>
@@ -131,6 +134,7 @@
     <string name="discard_changes">Atmesti pakeitimus?</string>
     <string name="discard_changes_description">Jūsų pakeitimai neįrašyti</string>
     <string name="saving_profile_error">Klaida įrašant profilį</string>
+    <string name="saving_assign_icons_error">Klaida priskiriant piktogramas</string>
     <string name="welcome">Sveiki</string>
     <string name="app_description">Aegis yra nemokama, saugi ir atvirojo kodo dviejų faktorių tapatybės nustatymo (2FA) programėlė</string>
     <string name="setup_completed">Sąranka užbaigta</string>
@@ -187,7 +191,9 @@
     <string name="read_qr_error">Bandant perskaityti QR kodą, įvyko klaida</string>
     <string name="missing_qr_code_descriptor">• QR kodas %d</string>
     <string name="unlocking_vault">Atrakinama slėptuvė</string>
+    <string name="rename_group">Pervadinti grupę</string>
     <string name="remove_group">Šalinti grupę</string>
+    <string name="remove_unused_groups">Ištrinti nenaudojamas grupes</string>
     <string name="remove_icon_pack">Šalinti piktogramų paketą</string>
     <string name="remove_icon_pack_description">Ar tikrai norite pašalinti šį piktogramų paketą? Tai nepaveiks įrašų, kurie naudoja piktogramas iš šio paketo.</string>
     <string name="details">Išsamiau</string>
@@ -195,20 +201,23 @@
     <string name="lock">Užrakinti</string>
     <string name="name">Pavadinimas</string>
     <string name="no_group">Nėra grupės</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Rikiuoti</string>
     <string name="sort_alphabetically">Leidėjas (A–Ž)</string>
     <string name="sort_alphabetically_reverse">Leidėjas (Ž–A)</string>
     <string name="sort_alphabetically_name">Paskyra (A-Ž)</string>
     <string name="sort_alphabetically_name_reverse">Paskyra (Ž-A)</string>
     <string name="sort_usage_count">Naudojimų skaičius</string>
+    <string name="last_used_never">niekada</string>
     <string name="new_group">Nauja grupė…</string>
     <string name="group">Grupė</string>
     <string name="group_name_hint">Grupės pavadinimas</string>
     <string name="preference_manage_groups">Taisyti grupes</string>
     <string name="preference_manage_groups_summary">Čia tvarkykite ir ištrinkite savo grupes</string>
-    <string name="note">Pastaba</string>
+    <string name="note" comment="Users can add a note to an entry">Pastaba</string>
     <string name="clear">Išvalyti</string>
     <string name="pref_highlight_entry_title">Bakstelėjus, paryškinti prieigos raktus</string>
     <string name="pref_highlight_entry_summary">Bakstelėjus ant prieigos raktų, laikinai juos paryškinti ir padaryti taip, kad juos būtų lengviau atskirti</string>
+    <string name="pref_search_behavior_title">Paieškos elgsena</string>
     <string name="pin_keyboard_description">Norėdami įjungti PIN kodo klaviatūrą, įveskite slaptažodį. Turėkite omenyje, jog tai veikia tik tuo atveju, jei jūsų slaptažodis yra sudarytas tik iš skaitmenų</string>
     <string name="pin_keyboard_error">Klaida įjungiant PIN kodo klaviatūrą</string>
     <string name="pin_keyboard_error_description">Neįmanoma nustatyti PIN kodo klaviatūros. Jūsų slaptažodis privalo būti sudarytas tik iš skaitmenų.</string>
@@ -222,12 +231,6 @@
     <string name="small_mode_title">Maža</string>
     <string name="unknown_issuer">Nežinomas leidėjas</string>
     <string name="unknown_account_name">Nežinomas paskyros pavadinimas</string>
-    <plurals name="import_error_dialog">
-        <item quantity="one">Aegis nepavyko importuoti %d prieigos rakto. Šis prieigos raktas bus praleistas. Norėdami pamatyti informaciją apie klaidas, paspauskite „Išsamiau“.</item>
-        <item quantity="few">Aegis nepavyko importuoti %d prieigos raktų. Šie prieigos raktai bus praleisti. Norėdami pamatyti informaciją apie klaidas, paspauskite „Išsamiau“.</item>
-        <item quantity="many">Aegis nepavyko importuoti %d prieigos raktų. Šie prieigos raktai bus praleisti. Norėdami pamatyti informaciją apie klaidas, paspauskite „Išsamiau“.</item>
-        <item quantity="other">Aegis nepavyko importuoti %d prieigos rakto. Šie prieigos raktai bus praleisti. Norėdami pamatyti informaciją apie klaidas, paspauskite „Išsamiau“.</item>
-    </plurals>
     <string name="unable_to_read_qrcode_file">Nepavyko perskaityti ir apdoroti QR kodo iš failo: %s.</string>
     <string name="unable_to_generate_qrcode">Nepavyko sukurti QR kodo</string>
     <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Atverti slėptuvę</string>
@@ -251,7 +254,6 @@
     <string name="time_sync_warning_title">Automatinis laiko sinchronizavimas</string>
     <string name="time_sync_warning_disable">Daugiau manęs nebeįspėkite. Aš žinau, ką darau.</string>
     <string name="google_qr_export_unrelated">Rastas nesusijęs QR kodas. Pabandykite paleisti skenerį iš naujo.</string>
-    <string name="google_qr_export_unexpected">Tikėtasi #%d QR kodo, bet vietoj to, nuskenuotas #%d</string>
     <string name="backup_reminder_bar_message">        Pakeitimų atsarginė kopija nėra daroma
     </string>
     <string name="pref_show_plaintext_warning_hint">Daugiau neberodyti šio įspėjimo</string>
@@ -268,7 +270,6 @@
     <string name="copy_uri">Kopijuoti URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Nepavyko nukopijuoti URI į iškarpinę</string>
     <string name="uri_copied_to_clipboard">URI nukopijuotas į iškarpinę</string>
-    <string name="transfer_entry">Perkelti įrašą</string>
     <string name="transfer_entry_description">Nuskenuokite šį QR kodą naudodami tapatybės nustatymo programėlę, į kurią norite perkelti šį įrašą</string>
     <string name="password_strength_very_weak">Labai silpnas</string>
     <string name="password_strength_weak">Silpnas</string>
@@ -284,24 +285,26 @@
     <string name="title_activity_edit_entry">Taisyti įrašą</string>
     <string name="title_activity_scan_qr">Skenuokite QR kodą</string>
     <string name="title_activity_import_entries">Importuoti įrašus</string>
+    <string name="title_activity_assign_icons">Priskirti piktogramas</string>
+    <string name="title_activity_licenses">Trečiųjų šalių licencijos</string>
     <string name="dialog_wipe_entries_title">Išvalyti įrašus</string>
     <string name="dialog_wipe_entries_message">Jūsų slėptuvėje jau yra įrašai. Ar prieš importuodami šį failą, norite pašalinti šiuos įrašus?\n\n<b>Tai atlikę, visam laikui prarasite prieigą prie šiuo metu slėptuvėje esančių įrašų.</b></string>
     <string name="dialog_wipe_entries_checkbox">Išvalyti slėptuvės turinį</string>
-    <string name="import_vault">Importuoti slėptuvę</string>
     <string name="importer_help_2fas">Pateikite 2FAS Authenticator atsarginės kopijos failą.</string>
     <string name="importer_help_aegis">Pateikite Aegis eksportuotą/atsarginės kopijos failą.</string>
     <string name="importer_help_authenticator_plus">Pateikite Authenticator Plus eksportuotą failą, gautą per <b>Nustatymai (angl. Settings) -&gt; Atsarginė kopija ir atkūrimas (angl. Backup &amp; Restore) -&gt; Eksportuoti kaip tekstą ir HTML (angl. Export as Text and HTML)</b>.</string>
     <string name="importer_help_authy">Pateikite <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> kopiją, esančią Authy vidinės saugyklos kataloge.</string>
     <string name="importer_help_andotp">Pateikite andOTP eksportuotą/atsarginės kopijos failą.</string>
     <string name="importer_help_bitwarden">Pateikite Bitwarden eksportuotą/atsarginės kopijos failą. Šifruoti failai yra nepalaikomi.</string>
-    <string name="importer_help_freeotp">Pateikite <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> kopiją, esančią FreeOTP vidinės saugyklos kataloge.</string>
     <string name="importer_help_freeotp_plus">Pateikite FreeOTP+ eksportuotą failą.</string>
     <string name="importer_help_microsoft_authenticator">Pateikite <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> kopiją, esančią Microsoft Authenticator vidinės saugyklos kataloge.</string>
     <string name="importer_help_plain_text">Pateikite grynojo teksto failą, kurio kiekvienoje eilutėje būtų Google Authenticator URI.</string>
     <string name="importer_help_totp_authenticator">Pateikite TOTP Authenticator eksportuotą failą.</string>
     <string name="importer_help_winauth">Pateikite WinAuth eksportuotą failą.</string>
+    <string name="import_assign_icons_dialog_title">Priskirti piktogramas</string>
     <string name="importer_encrypted_exception_google_authenticator">Šifruotas įrašas buvo praleistas: %s</string>
     <string name="groups">Grupės</string>
     <string name="pref_focus_search">Paleidus programėlę, fokusuoti paiešką</string>
     <string name="pref_focus_search_summary">Atvėrus programėlę, nedelsiant fokusuoti paieškos laukelį.</string>
+    <string name="pref_copy_behavior_never">Niekada</string>
 </resources>
diff --git a/app/src/main/res/values-lv-rLV-v29/strings.xml b/app/src/main/res/values-lv-rLV-v29/strings.xml
new file mode 100644
index 00000000..1d310608
--- /dev/null
+++ b/app/src/main/res/values-lv-rLV-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Sistēmas noklusējums</string>
+    <string name="system_amoled_theme_title">Sistēmas noklusējums (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
index bd89e526..de6b082b 100644
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Iestatījumi</string>
     <string name="action_about">Par</string>
     <string name="action_delete">Dzēst</string>
     <string name="action_transfer">Pārsūtīt</string>
     <string name="action_edit_icon">Labot ikonu</string>
     <string name="action_reset_usage_count">Atiestatīt izmantošanas reižu skaitu</string>
-    <string name="action_reset_usage_count_dialog">Vai tiešām kā šī ieraksta izmantošanas reižu skaitu norādīt 0?</string>
+    <string name="action_reset_usage_count_dialog">Vai tiešām iestatīt šī ieraksta izmantošanas reižu skaitu 0?</string>
     <string name="action_default_icon">Atjaunot noklusējuma ikonu</string>
     <string name="discard">Atmest</string>
     <string name="save">Saglabāt</string>
+    <string name="all">Visas</string>
     <string name="issuer">Izsniedzējs</string>
     <string name="yandex_pin">PIN (4-16 cipari)</string>
     <string name="motp_pin">PIN (4 cipari)</string>
@@ -19,20 +20,24 @@
     <string name="pref_cat_appearance_app">Lietotne</string>
     <string name="pref_cat_appearance_entries">Ieraksti</string>
     <string name="pref_cat_backups_android">Android</string>
-    <string name="pref_cat_backups_auto">Automātiska dublēšana</string>
+    <string name="pref_cat_backups_auto">Automātiska rezerves kopēšana</string>
     <string name="pref_section_behavior_title">Uzvedība</string>
     <string name="pref_section_behavior_summary">Pielāgot uzvedību, kad notiek mijiedarbība ar ierakstu sarakstu.</string>
     <string name="pref_section_appearance_title">Izskats</string>
     <string name="pref_section_appearance_summary">Pielāgot izskatu, valodu un citus iestatījumus, kas ietekmē lietotnes veidolu.</string>
     <string name="pref_section_security_title">Drošība</string>
     <string name="pref_section_security_summary">Uzstādīt šifrēšanu, atslēgšanu ar biometriju, automātisku aizslēgšanu un citus drošības iestatījumus.</string>
-    <string name="pref_section_import_export_title">Ievietot un izdot</string>
-    <string name="pref_section_import_export_summary">Aegis vai citu autentificēšanāš lietotņu rezerves kopiju ievietošana. Aegis glabātavas satura pašrocīga izdošana.</string>
+    <string name="pref_section_import_export_title">Ievietot un izgūt</string>
+    <string name="pref_section_import_export_summary">Aegis vai citu autentificēšanās lietotņu rezerves kopiju ievietošana. Aegis glabātavas satura pašrocīga izgūšana.</string>
+    <string name="pref_section_audit_log_title">Audita žurnāls</string>
+    <string name="pref_section_audit_log_summary">Saraksts, kurā ir ierakstīti visi svarīgie notiekumi, kas ir bijuši lietotnē.</string>
     <string name="pref_section_backups_title">Rezerves kopijas</string>
-    <string name="pref_section_backups_summary">Uzstādīt automātisko dublēšanu paša izvēlētā vietā vai iespējot dalību Android mākoņa dublēšanas sistēmā.</string>
+    <string name="pref_section_backups_summary">Uzstādīt automātisko rezerves kopēšanu paša izvēlētā vietā vai iespējot dalību Android mākoņa dublēšanas sistēmā.</string>
     <string name="pref_section_icon_packs">Ikonu pakotnes</string>
     <string name="pref_section_icon_packs_summary">Pārvaldīt un ievietot ikonu pakotnes</string>
     <string name="pref_select_theme_title">Izskats</string>
+    <string name="pref_dynamic_colors_title">Dinamiskas krāsas</string>
+    <string name="pref_dynamic_colors_summary">Pielietot pārklājumu, kas pielāgots izvēlētā Android izskata krāsām</string>
     <string name="pref_view_mode_title">Skata veids</string>
     <string name="pref_lang_title">Valoda</string>
     <string name="pref_show_icons_title">Rādīt ikonas</string>
@@ -40,38 +45,51 @@
     <string name="pref_code_group_size_title">Koda ciparu kopošana</string>
     <string name="pref_code_group_size_summary">Atlasīt koda ciparu kopu lielumu</string>
     <string name="pref_account_name_position_title">Rādīt konta nosaukumu</string>
+    <string name="pref_show_next_code_title">Rādīt nākamo kodu</string>
+    <string name="pref_show_next_code_summary">Izveidot un rādīt nākamo kodu pirms laika</string>
+    <string name="pref_expiration_state_title">Norādīt, kad beigsies kodu derīgums</string>
+    <string name="pref_expiration_state_summary">Mainīt kodu krāsu un likt tiem mirgot, kad to derīgums tūlīt beigsies</string>
+    <string name="pref_expiration_state_fallback">Mainīt kodu krāsu, kad to derīgums tūlīt beigsies</string>
     <string name="pref_shared_issuer_account_name_title">Radīt konta nosaukumu tikai tad, kad nepieciešams</string>
     <string name="pref_shared_issuer_account_name_summary">Rādīt kontu nosaukumu kad vien tiem ir viens un tas pats izdevējs. Citu kontu nosaukums būs paslēpts.</string>
-    <string name="pref_account_name_position_summary_override">Šis iestatījums netiek ņemts vērā mozaīkas skatā. Konta nosaukums vienmēr tiks parādīts zem izdevēja.</string>
+    <string name="pref_account_name_position_summary_override">Šis iestatījums netiek ņemts vērā mozaīkas skatā. Konta nosaukums tiks parādīts zem izdevēja.</string>
     <string name="pref_import_file_title">Ievietot no datnes</string>
     <string name="pref_import_file_summary">Ievietot kodus no datnes</string>
     <string name="pref_android_backups_title">Android mākoņa rezerves kopijas</string>
-    <string name="pref_android_backups_summary">Ļaut Android mākoņa dublēšanas sistēmai iekļaut Aegis glabātavu rezerves kopijās. Tas tiek nodrošināts tikai šifrētām glabātavām.</string>
-    <string name="pref_android_backups_hint"><i>No ierīces uz ierīci (angliski Device-to-device (D2D)) rezerves kopijas vienmēr ir atļautas, neatkarīgi no augšup esošā iestatījuma</i></string>
-    <string name="pref_backups_title">Automātiski dublēt glabātavu</string>
+    <string name="pref_android_backups_summary">Ļaut Android mākoņa rezerves kopēšanas sistēmai iekļaut Aegis glabātavu rezerves kopijās. Tas tiek nodrošināts tikai šifrētām glabātavām.</string>
+    <string name="pref_android_backups_hint"><i>No ierīces uz ierīci (angliski Device-to-device (D2D)) rezerves kopijas vienmēr ir atļautas, neatkarīgi no augstāk esošā iestatījuma</i></string>
+    <string name="pref_backups_title">Automātiski veikt glabātavas rezerves kopēšanu</string>
     <string name="pref_backups_summary">Automātiski izveidot glabātavas rezerves kopijas ārējā krātuvē, kad tiek veiktas izmaiņas. Tas tiek nodrošināts tikai šifrētām glabātavām.</string>
     <string name="pref_backups_reminder_title">Rezerves kopiju veidošanas atgādinājums</string>
-    <string name="pref_backups_reminder_summary">Rādīt glabātavas rezerves kopijas izveidošanas atgādinājumu gadījumā, ja pēdējās izmaiņas nav dublētas.</string>
+    <string name="pref_backups_reminder_summary">Rādīt glabātavas rezerves kopijas izveidošanas atgādinājumu gadījumā, ja pēdējās izmaiņas nav iekļautas rezerves kopijās.</string>
     <string name="pref_backups_reminder_dialog_title">Atspējot rezerves kopiju izveidošanas atgādinājumu</string>
-    <string name="pref_backups_reminder_dialog_summary">Šī atgādinājuma atspējošana nozīmē, ka Aegis neziņos, vai ir vai nav izmaiņu, kuras vēl nav dublētas. Tas rada iespējamību zaudēt piekļuvi kodiem. Vai tiešām atspējot atgādinājumu?</string>
-    <string name="pref_backups_location_title">Rezerves kopiju datņu mape</string>
+    <string name="pref_backups_reminder_dialog_summary">Šī atgādinājuma atspējošana nozīmē, ka Aegis neziņos, vai ir vai nav izmaiņu, kuras vēl nav iekļautas rezerves kopijās. Tas rada iespējamību zaudēt piekļuvi kodiem. Vai tiešām atspējot atgādinājumu?</string>
+    <string name="pref_backups_versioning_strategy_title">Rezerves kopiju stratēģija</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Paturēt noteiktu versiju skaitu</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Viena rezerves kopija</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Atlasītā rezerves kopiju stratēģija nav uzticama, tāpēc tā nav ieteicama. Kļūme vienīgajā rezerves kopijā var novest pie vienīgās rezerves kopijas zaudēšanas.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Atlasīt rezerves kopiju stratēģiju</string>
+    <string name="pref_backups_location_title">Rezerves kopiju atrašanās vieta</string>
     <string name="pref_backups_location_summary">Rezerves kopijas tiks glabātas</string>
-    <string name="pref_backups_trigger_title">Veikt dublēšanu</string>
-    <string name="pref_backups_trigger_summary">Pašrocīgi veikt dublēšanu</string>
+    <string name="pref_backup_location_summary">Rezerves kopijas tiks glabātas</string>
+    <string name="pref_backups_trigger_title">Izraisīt rezerves kopēšanu</string>
+    <string name="pref_backups_trigger_summary">Pašrocīgi izraisīt rezerves kopēšanu</string>
     <string name="pref_backups_versions_title">Paturamo rezerves kopiju skaits</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="zero">Paturēt %1$d rezerves kopijas</item>
         <item quantity="one">Paturēt %1$d rezerves kopiju</item>
         <item quantity="other">Paturēt %1$d rezerves kopijas</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Paturēt neierobežotu skaitu rezerves kopiju</string>
     <string name="pref_import_app_title">Ievietot no lietotnes</string>
     <string name="pref_import_app_summary">Ievietot kodus no lietotnes (nepieciešama saknes piekļuve)</string>
-    <string name="pref_export_title">Izdot</string>
-    <string name="pref_export_summary">Izdot glabātavas saturu</string>
+    <string name="pref_export_title">Izgūt</string>
+    <string name="pref_export_summary">Izgūt glabātavas saturu</string>
     <string name="pref_password_reminder_title">Paroles atgādinājums</string>
-    <string name="pref_google_auth_export_title">Izdot izmantošanai Google Authenticator</string>
-    <string name="pref_google_auth_export_descriptor">Izveido izdošanas kvadrātkodus, kas ir saderīgi ar Google Authenticator</string>
-    <string name="pref_google_auth_export_no_data">Nav satura, ko izdot</string>
+    <string name="pref_google_auth_export_title">Izgūt izmantošanai Google Authenticator</string>
+    <string name="pref_google_auth_export_descriptor">Izveido izgūšanas kvadrātkodus, kas ir saderīgi ar Google Authenticator</string>
+    <string name="pref_google_auth_export_no_data">Nav satura, ko izgūt</string>
     <plurals name="pref_google_auth_export_incompatible_entries">
         <item quantity="zero">Izlaisti %d nesaderīgu ierakstu</item>
         <item quantity="one">Izlaists %d nesaderīgs ieraksts</item>
@@ -91,35 +109,61 @@
     <string name="pref_auto_lock_type_back_button">Ir nospiesta poga \"Atpakaļ\"</string>
     <string name="pref_auto_lock_type_minimize">Lietotne ir samazināta</string>
     <string name="pref_auto_lock_type_device_lock">Ierīce ir aizslēgta</string>
-    <string name="pref_backup_password_category">Dublēšana un izdošana</string>
-    <string name="pref_backup_password_title">Atsevišķa dublēšanas un izdošanas parole</string>
-    <string name="pref_backup_password_summary">Ja iespējots, paroli, kas tiek izmantota lietotnes atslēgšanai, nevarēs izmantot rezerves kopiju un izdošanas datņu atšifrēšanai.</string>
-    <string name="pref_backup_password_change_title">Mainīt dublēšanas un izdošanas paroli</string>
-    <string name="pref_backup_password_change_summary">Uzstādīt jaunu paroli, kas tiks izmantota, lai šifrētu glabātavu dublēšanas un izdošanas laikā.</string>
+    <string name="pref_backup_password_category">Rezerves kopēšana un izgūšana</string>
+    <string name="pref_backup_password_title">Atsevišķa rezerves kopēšanas un izgūšanas parole</string>
+    <string name="pref_backup_password_summary">Ja iespējots, paroli, kas tiek izmantota lietotnes atslēgšanai, nevarēs izmantot rezerves kopiju un izgūšanas datņu atšifrēšanai.</string>
+    <string name="pref_backup_password_change_title">Mainīt rezerves kopēšanas un izgūšanas paroli</string>
+    <string name="pref_backup_password_change_summary">Iestatīt jaunu paroli, kas tiks izmantota, lai šifrētu glabātavu rezerves kopēšanas un izgūšanas laikā.</string>
     <string name="pref_encryption_title">Šifrēšana</string>
     <string name="pref_encryption_summary">Šifrēt glabātavu un atslēgt to ar paroli vai biometriju</string>
     <string name="pref_biometrics_title">Atslēgšana ar biometriju</string>
     <string name="pref_biometrics_summary">Ļaut atslēgt glabātavu ar biometriju</string>
+    <string name="pref_search_behavior_summary">Meklē: %s</string>
+    <string name="pref_search_behavior_prompt">Meklēt jebkurā no zemāk esošajiem laukiem</string>
+    <string name="pref_search_behavior_type_name">Nosaukums</string>
+    <string name="pref_search_behavior_type_issuer">Izsniedzējs</string>
+    <string name="pref_search_behavior_type_note">Piezīme</string>
+    <string name="pref_search_behavior_type_groups">Kopas</string>
     <string name="pref_set_password_title">Mainīt paroli</string>
     <string name="pref_set_password_summary">Uzstādīt jaunu paroli, kas būs nepieciešama, lai atslēgtu glabātavu</string>
+    <string name="no_events_title">Nav notikumu</string>
+    <string name="no_events_description">Nav ziņots par svarīgiem notikumiem, kas ir bijuši lietotnē</string>
+    <string name="event_title_vault_unlocked">Glabātava atslēgta</string>
+    <string name="event_description_vault_unlocked">Glabātava tika sekmīgi atslēgta</string>
+    <string name="event_title_backup_created">Rezerves kopija izveidota</string>
+    <string name="event_description_backup_created">Glabātavas rezerves kopija tika sekmīgi izveidota</string>
+    <string name="event_title_android_backup_created">Android izveidota rezerves kopija</string>
+    <string name="event_description_android_backup_created">Android sekmīgi izveidoja glabātavas rezerves kopiju</string>
+    <string name="event_title_vault_exported">Glabātava izgūta</string>
+    <string name="event_description_vault_exported">Tika izgūta glabātavas kopija</string>
+    <string name="event_title_entry_shared">Ieraksts kopīgots</string>
+    <string name="event_description_entry_shared">Ieraksts tika kopīgots</string>
+    <string name="event_title_vault_unlock_failed_password">Glabātavas atslēgšana neizdevās (parole)</string>
+    <string name="event_description_vault_unlock_failed_password">Mēģinājums atslēgt glabātavu ar paroli neizdevās</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Glabātavas atslēgšana neizdevās (biometrija)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Mēģinājums atslēgt glabātavu ar biometriju neizdevās</string>
+    <string name="event_unknown">Nezināms notikuma veids</string>
+    <string name="audit_log_entry_deleted">(izdzēsts)</string>
+    <string name="today_at_time">Šodien %1$s</string>
+    <string name="day_of_week_at_time">%1$s %2$s</string>
     <string name="export_encrypted">Šifrēt glabātavu</string>
-    <string name="export_help">Šī darbība izdos glabātavas saturu no Aegis iekšējās krātuves. Atlasīt veidolu, kādā izdot datus:</string>
-    <string name="export_warning_unencrypted">Tiks izdots nešifrēts Aegis glabātavas atveidojums. <b>Tas nav ieteicams</b>.</string>
-    <string name="export_warning_password">Izdodamās datnes ir šifrētas ar paroli, kas ir norādīta drošības iestatījumos.</string>
+    <string name="export_help">Šī darbība izgūs glabātavas saturu no Aegis iekšējās krātuves. Jāatlasa veidols, kurā izgūt datus:</string>
+    <string name="export_warning_unencrypted">Tiks izgūts nešifrēts Aegis glabātavas atveidojums. <b>Tas nav ieteicams</b>.</string>
+    <string name="export_warning_password">Izgūstamās datnes ir šifrētas ar paroli, kas ir norādīta drošības iestatījumos.</string>
     <string name="understand_risk_accept">Es apzinos bīstamību</string>
     <string name="export_format_aegis">Aegis (.json)</string>
     <string name="export_format_google_auth_uri">Teksta datne (.txt)</string>
-    <string name="export_format_html">Tīmekļa vietne (.HTML)</string>
-    <string name="export_format_hint">Izdošanas veidols</string>
-    <string name="export_all_groups">Izdot visas kopas</string>
-    <string name="export_choose_groups">Atlasīt, kuras kopas izdot</string>
+    <string name="export_format_html">Tīmekļa lapa (.HTML)</string>
+    <string name="export_format_hint">Izgūšanas veidols</string>
+    <string name="export_all_groups">Izgūt visas kopas</string>
+    <string name="export_choose_groups">Jāatlasa, kuras kopas izgūt</string>
     <plurals name="export_groups_selected_count">
         <item quantity="zero">Atlasītas %d kopu</item>
         <item quantity="one">Atlasīta %d kopa</item>
         <item quantity="other">Atlasītas %d kopas</item>
     </plurals>
-    <string name="export_no_groups_selected">Nav atlasītu kopu izdošanai</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator izdošana</string>
+    <string name="export_no_groups_selected">Nav atlasītu kopu izgūšanai</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator izgūšana</string>
     <string name="choose_authentication_method">Drošība</string>
     <string name="authentication_method_explanation">Aegis ir uz drošību vērsta 2FA lietotne. Kodi tiek turēti glabātavā, ko ir iespējams šifrēt ar paša izvēlētu paroli. Ja uzbrucēji iegūst šifrēto glabātavas datni, tie nevarēs piekļūt tās saturam, nezinot paroli.\n\nTika atlasīta iespēja, kurai vajadzētu būt vispiemērotākajai šai ierīcei.</string>
     <string name="authentication_method_none">Nekas</string>
@@ -146,7 +190,7 @@
     <string name="password_reminder_freq_biweekly">Divreiz nedēļā</string>
     <string name="password_reminder_freq_monthly">Ik mēnesi</string>
     <string name="password_reminder_freq_quarterly">Ik ceturksni</string>
-    <string name="enter_password_2fas_message">Izskatās, ka šis 2FAS dublējums ir šifrēts. Lūgums zemāk ievadīt paroli.</string>
+    <string name="enter_password_2fas_message">Izskatās, ka šī 2FAS rezerves kopija ir šifrēta. Lūgums zemāk ievadīt paroli.</string>
     <string name="enter_password_authy_message">Izskatās, ka Authy kodi ir šifrēti. Lūgums aizvērt Aegis, atvērt Authy un atslēgt kodus ar paroli. Aegis var arī mēģināt atšifrēt Authy kodus, ja tiek ievadīta parole zemāk esošajā laukā.</string>
     <string name="enter_password_aegis_title">Lūgums ievadīt ievietošanas paroli</string>
     <string name="period_hint">Laika posms (sekundes)</string>
@@ -155,6 +199,7 @@
     <string name="share">Kopīgot</string>
     <string name="yes">Jā</string>
     <string name="no">Nē</string>
+    <string name="undo">Atsaukt</string>
     <string name="unlock">Atslēgt</string>
     <string name="advanced">Papildu</string>
     <string name="counter">Skaitītājs</string>
@@ -166,6 +211,11 @@
     <string name="set_up_biometric">Uzstādīt atslēgšanu ar biometriju</string>
     <string name="copy">Ievietot starpliktuvē</string>
     <string name="edit">Labot</string>
+    <string name="select_all">Atlasīt visus</string>
+    <string name="assign_icons">Piešķirt ikonas</string>
+    <string name="assign_groups">Piešķirt kopai</string>
+    <string name="assign_groups_dialog_summary">Jāatlasa kopa, kurai piešķirt atlasītos ierakstus.</string>
+    <string name="assign_groups_dialog_dropdown">Atlasīt kopu</string>
     <string name="favorite" comment="Verb">Pievienot izlasei</string>
     <string name="unfavorite" comment="Verb">Izņemt no izlases</string>
     <string name="error_all_caps">KĻŪDA</string>
@@ -179,11 +229,13 @@
     <string name="password_equality_error">Parolēm ir jāsakrīt un tās nedrīkst būt tukšas</string>
     <string name="snackbar_authentication_method">Lūgums atlasīt autentificēšanās veidu</string>
     <string name="encrypting_vault">Šifrē glabātavu</string>
-    <string name="exporting_vault">Izdod glabātavas saturu</string>
+    <string name="exporting_vault">Izgūst glabātavu</string>
+    <string name="optimizing_icon">Optimizē ikonu</string>
+    <string name="optimizing_icon_multiple">Optimizē ikonas: %1$d/%2$d</string>
     <string name="reading_file">Nolasa datni</string>
     <string name="requesting_root_access">Pieprasa neierobežotu piekļuvi</string>
     <string name="analyzing_qr">Notiek kvadrātkoda nolasīšana</string>
-    <string name="analyzing_qr_multiple">Apstrādā kvadrātkodu %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Apstrādā kvadrātkodu %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="zero">Glabātavai pievienoti %d jaunu ierakstu</item>
         <item quantity="one">Glabātavai pievienots %d jauns ieraksts</item>
@@ -202,14 +254,16 @@
     <string name="discard_changes">Atmest izmaiņas?</string>
     <string name="discard_changes_description">Izmaiņas netika saglabātas</string>
     <string name="saving_profile_error">Kļūda saglabājot profilu</string>
+    <string name="saving_assign_icons_error">Ikonu piešķiršanā atgadījās kļūda</string>
     <string name="welcome">Sveiciens!</string>
-    <string name="app_description">Aegis ir bezmaksas, droša un atvērtā pirmkoda 2FA lietotne</string>
+    <string name="app_description">Aegis ir bezmaksas, atvērta pirmkoda un droša 2FA lietotne</string>
     <string name="setup_completed">Uzstādīšana pabeigta</string>
     <string name="setup_completed_description">Aegis ir uzstādīta un ir gatava izmantošanai.</string>
     <string name="vault_not_found">Nav atrasta glabātava, tiek uzsākta uzstādīšana…</string>
     <string name="copied">Ievietots starpliktuvē</string>
     <string name="errors_copied">Kļūdas ir ievietotas starpliktuvē</string>
     <string name="version_copied">Laidiena numurs ir ievietots starpliktuvē</string>
+    <string name="error_required_field">Šis lauks ir nepieciešams</string>
     <string name="error_occurred">Atgadījusies kļūda</string>
     <string name="decryption_error">Atgadījusies kļūda glabātavas atslēgšanā</string>
     <string name="decryption_corrupt_error">Atgadījusies kļūda glabātavas atslēgšanā. Tās datne var būt bojāta.</string>
@@ -219,12 +273,12 @@
     <string name="biometric_decrypt_error">Atgadījusies kļūda glabātavas atšifrēšanā ar biometrisko autentificēšanos. Tā parasti notiek tikai tad, ja tika mainīti ierīces drošības iestatījumi. Lūgums atslēgt glabātavu ar paroli un atkārtoti uzstādīt biometrisko autentificēšanos Aegis iestatījumos.</string>
     <string name="biometric_init_error">Atgadījusies kļūda biometriskās autentificēšanās sagatavošanā. Tā parasti notiek tikai tad, ja tika mainīti ierīces drošības iestatījumi. Lūgums atslēgt glabātavu ar paroli un atkārtoti uzstādīt biometrisko autentificēšanos Aegis iestatījumos.</string>
     <string name="disable_encryption">Atspējot šifrēšanu</string>
-    <string name="disable_encryption_description">Vai tiešām atspējot šifrēšanu? Tādējādi glabātava tiks glabāta kā vienkāršs teksts. <b>Tiks atspējota arī automātiskā dublēšana</b>.</string>
+    <string name="disable_encryption_description">Vai tiešām atspējot šifrēšanu? Tādējādi glabātava tiks glabāta kā vienkāršs teksts. <b>Tiks atspējota arī automātiskā rezerves kopēšana</b>.</string>
     <string name="enable_encryption_error">Atgadījusies kļūda šifrēšanas iespējošanā</string>
     <string name="disable_encryption_error">Atgadījusies kļūda šifrēšanas atspējošanā</string>
-    <string name="backup_successful">Dublēšana ir veiksmīgi ieplānota</string>
-    <string name="backup_error">Atgadījusies kļūda dublējuma izveidošanā</string>
-    <string name="backup_status_success">Visjaunākā veiksmīgā rezerves kopija: %s</string>
+    <string name="backup_successful">Rezerves kopēšana tika sekmīgi ieplānota</string>
+    <string name="backup_error">Atgadījusies kļūda rezerves kopijas izveidošanā</string>
+    <string name="backup_status_success">Visjaunākā sekmīgā rezerves kopija: %s</string>
     <string name="backup_status_failed">Visjaunākā neizdevusies rezerves kopija: %s</string>
     <string name="backup_status_none">Vēl nav veikta neviena rezerves kopēšana</string>
     <string name="backup_warning_password">Rezerves kopijas ir ar šifrētas ar paroli, kas ir norādīta drošības iestatījumos</string>
@@ -266,25 +320,31 @@
     </plurals>
     <string name="intro_import_error_title">Notika kļūda glabātavas ievietošanas laikā</string>
     <string name="import_error_title">Ievietošanas laikā radās viena vai vairākas kļūdas</string>
-    <string name="exporting_vault_error">Atgadījusies kļūda glabātavas satura izdošanā</string>
-    <string name="exported_vault">Glabātavas saturs ir izdots</string>
+    <string name="exporting_vault_error">Atgadījās kļūda glabātavas izgūšanas laikā</string>
+    <string name="exported_vault">Glabātava tika izgūta</string>
     <string name="encryption_set_password_error">Atgadījusies kļūda paroles uzstādīšanā.</string>
     <string name="encryption_enable_biometrics_error">Atgadījusies kļūda mēģinājumā iespējot atslēgšanu ar biometriju. Dažām ierīcēm ir vāji īstenota biometriskā autentifikācija, un ļoti iespējams, ka šī ir viena no tādām. Ieteicams apsvērt uzstādījumos izmantot tikai paroli.</string>
     <string name="no_cameras_available">Kameras nav pieejamas</string>
     <string name="read_qr_error">Atgadījusies kļūda kvadrātkoda nolasīšanā</string>
     <string name="read_qr_error_phonefactor">Aegis nav saderīgs ar Microsoft piederošo 2FA algoritmu. Lūgums pārliecināties, ka ir izvēlēts \"Uzstādīt lietotni bez paziņojumiem\", kad Office 365 tiek uzstādīts 2FA.</string>
-    <string name="partial_google_auth_import">Noteikta nepilnīga Google Authenticator izdošanas datne</string>
-    <string name="partial_google_auth_import_warning">Trūkst dažu kvadrātkodu no ievietošanas. Šie kodi netika atrasti:\n\n<b>%s</b>\n\nVar turpināt ievietošanu no šīs nepilnīgās izdošanas datnes, bet mēs iesakām mēģināt atkārtoti ar visiem kvadrātkodiem, lai nebūtu jāzaudē piekļuve kodiem.</string>
+    <string name="partial_google_auth_import">Noteikta nepilnīga Google Authenticator izgūšanas datne</string>
+    <string name="partial_google_auth_import_warning">Trūkst dažu kvadrātkodu no ievietošanas. Šie kodi netika atrasti:\n\n<b>%s</b>\n\nVar turpināt ievietošanu no šīs nepilnīgās izgūšanas datnes, bet mēs iesakām mēģināt atkārtoti ar visiem kvadrātkodiem, lai nebūtu jāzaudē piekļuve kodiem.</string>
     <string name="missing_qr_code_descriptor">• kvadrātkods %d</string>
-    <string name="import_partial_export_anyway">Vienalga ievietot %d kodus</string>
-    <string name="import_google_auth_failure">Neizdevās ievietošana no Google Authenticator izdošanas datnes</string>
-    <string name="unrelated_google_auth_batches_error">Izdošanas datne satur informāciju par nesaistītu paketi. Var mēģināt ievietot pa vienai paketei vienlaicīgi.</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="zero">Vienalga ievietot %d kodus</item>
+        <item quantity="one">Vienalga ievietot %d kodu</item>
+        <item quantity="other">Vienalga ievietot %d kodus</item>
+    </plurals>
+    <string name="import_google_auth_failure">Neizdevās ievietošana no Google Authenticator izgūšanas datnes</string>
+    <string name="unrelated_google_auth_batches_error">Izgūšanas datne satur informāciju par nesaistītu kopumu. Var mēģināt ievietot atsevišķi pa vienam kopumam.</string>
     <string name="no_tokens_can_be_imported">Iznākumā nevar ievietot nevienu kodu</string>
-    <string name="authentication_method_raw">Neapstrādāts</string>
     <string name="unlocking_vault">Atslēgšana ar biometriju</string>
-    <string name="slot_this_device">(šī ierīce)</string>
+    <string name="rename_group">Pārdēvēt kopu</string>
+    <string name="no_group_selection">Ja ieraksts nav daļa no kādas kopas, to var atrast zem \"Nav kopas\".</string>
     <string name="remove_group">Noņemt kopu</string>
     <string name="remove_group_description">Vai tiešām noņemt šo kopu? Tās ieraksti tiks pārmainīti uz \"Nav kopas\".</string>
+    <string name="remove_unused_groups">Izdzēst neizmantotās kopas</string>
+    <string name="remove_unused_groups_description">Vai tiešām izdzēst visas kopas, kas nav piesaistītas kādam ierakstam?</string>
     <string name="remove_icon_pack">Noņemt ikonu pakotni</string>
     <string name="remove_icon_pack_description">Vai tiešām noņemt šo ikonu pakotni? Netiks ietekmēti ieraksti, kuros ir izmantotas pakotnē esošās ikonas.</string>
     <string name="details">Izklāsts</string>
@@ -292,13 +352,16 @@
     <string name="lock">Aizslēgt</string>
     <string name="name">Nosaukums</string>
     <string name="no_group">Bez kopas</string>
-    <string name="sort">Kārtot</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Kārtot</string>
     <string name="sort_alphabetically">Izsniedzējs (no A līdz Z)</string>
     <string name="sort_alphabetically_reverse">Izsniedzējs (no Z līdz A)</string>
     <string name="sort_alphabetically_name">Konts (no A līdz Z)</string>
     <string name="sort_alphabetically_name_reverse">Konts (no Z līdz A)</string>
     <string name="sort_usage_count">Izmantošanas reižu skaits</string>
+    <string name="sort_last_used">Pēdējoreiz izmantots</string>
     <string name="sort_custom">Pielāgots</string>
+    <string name="last_used">Pēdējoreiz izmantots</string>
+    <string name="last_used_never">nekad</string>
     <string name="new_group">Jauna kopa…</string>
     <string name="group">Kopa</string>
     <string name="group_name_hint">Kopas nosaukums</string>
@@ -307,13 +370,32 @@
     <string name="preference_reset_usage_count">Atiestatīt izmantošanas reižu skaitu</string>
     <string name="preference_reset_usage_count_summary">Atiestatīt izmantošanas reižu skaitu ikkatram glabātavas ierakstam</string>
     <string name="preference_reset_usage_count_dialog">Vai tiešām kā visu glabātavas ierakstu izmantošanas reižu skaitu norādīt 0?</string>
-    <string name="note">Piezīme</string>
+    <string name="note" comment="Users can add a note to an entry">Piezīme</string>
     <string name="clear">Notīrīt</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Ieraksts atkārtojas</string>
+    <string name="dialog_duplicate_entry_message">Šim ierakstam ir tāds pats nosaukums un izdevējs kā vienaim vai vairākiem citiem esošiem ierakstiem. Kā Tu vēlētos turpināt?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Izvietot esošo ierakstu/ierakstus</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Aizvietot esošo ierakstu vai ierakstus ar jauno. Šī darbība ir neatgriezeniska</string>
+    <string name="dialog_duplicate_entry_suffix_title">Pievienot piedēkli</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Pievienot piedēkli jaunajam ierakstam. Jaunais nosaukums būs: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Atcelt saglabāšanu</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Ļauj labot ierakstu pirms vēlreiz mēģināt to saglabāt</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="zero">Vai tiešām izdzēst %d ierakstu ar šādu nosaukumu:\n\n%s - %s</item>
+        <item quantity="one">Vai tiešām izdzēst %d ierakstu ar šādu nosaukumu:\n\n%s - %s</item>
+        <item quantity="other">Vai tiešām izdzēst %d ierakstus ar šādu nosaukumu:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Apstiprināt izdzēšanu</string>
+    <string name="pref_haptic_feedback_summary">Likt ierīcēi ietrīcēties, kad kodi tiek atsvaidzināti</string>
+    <string name="pref_haptic_feedback_title">Sajūtu atgriezeniskā saite</string>
     <string name="pref_highlight_entry_title">Izcelt kodus, kad piesit</string>
     <string name="pref_highlight_entry_summary">Padarīt kodus vieglāk atšķiramus citu no cita, īslaicīgi izceļot tos, kad tiem piesit</string>
+    <string name="pref_groups_multiselect_title">Vairāku kopu atlasīšana</string>
+    <string name="pref_groups_multiselect_summary">Ļaut vienlaicīgi atlasīt vairākas kopas</string>
     <string name="pref_minimize_on_copy_title">Samazināt pēc ievietošanas starpliktuvē</string>
     <string name="pref_minimize_on_copy_summary">Samazināt lietotni pēc koda ievietošanas starpliktuvē</string>
     <string name="pref_copy_behavior_title">Ievietot tekstvienības starpliktuvē</string>
+    <string name="pref_search_behavior_title">Meklēšanas uzvedība</string>
     <string name="pref_pause_entry_title">Iesaldēt kodus pēc piesišanas tiem</string>
     <string name="pref_pause_entry_summary">Apturēt kodu atsvaidzināšanu, kad piesit. Kods netiks atjaunots, kamēr vien tas ir izcelts. Ir nepieciešams ieslēgt iestatījumu \"Izcelt kodus, kad piesit\" vai \"Piesist, lai atklātu\".</string>
     <string name="pin_keyboard_description">Jāievada parole, lai iespējotu PIN tastatūru. Jāņem vērā, ka tā darbojas tikai tad, ja parole sastāv tikai no cipariem</string>
@@ -333,14 +415,14 @@
     <string name="unknown_issuer">Nezināms izsniedzējs</string>
     <string name="unknown_account_name">Nezināms konta nosaukums</string>
     <plurals name="import_error_dialog">
-        <item quantity="zero">Aegis nevarēja ievietot %d kodu. Spiest uz \"Izklāsts\", lai redzētu vairāk informācijas par kļūdām.</item>
+        <item quantity="zero">Aegis nevarēja ievietot %d kodus. Tie tiks izlaisti. Spiest uz \"Izklāsts\", lai redzētu vairāk informācijas par kļūdām.</item>
         <item quantity="one">Aegis nevarēja ievietot %d kodu. Tas tiks izlaists. Spiest uz \"Izklāsts\", lai redzētu vairāk informācijas par kļūdām.</item>
         <item quantity="other">Aegis nevarēja ievietot %d kodus. Tie tiks izlaisti. Spiest uz \"Izklāsts\", lai redzētu vairāk informācijas par kļūdām.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Nevar apstrādāt dziļo saiti</string>
     <string name="unable_to_read_qrcode_file">Nav iespējams nolasīt un apstrādāt kvadrātkodu no datnes: %s.</string>
     <string name="unable_to_process_shared_text">Nav iespējams apstrādāt kopīgoto tekstu kā OTP</string>
-    <string name="unable_to_read_qrcode_files">Nav iespējams nolasīt un apstrādāt dažus no kvadrātkodiem. Tikai %d/%d ieraksti tiks ievietoti.</string>
+    <string name="unable_to_read_qrcode_files">Nav iespējams nolasīt un apstrādāt dažus no kvadrātkodiem. Tiks ievietoti tikai %1$d/%2$d ieraksti.</string>
     <string name="unable_to_generate_qrcode">Nav iespējams izveidot kvadrātkodu</string>
     <string name="select_picture">Atlasīt attēlu</string>
     <string name="select_icon">Atlasīt ikonu</string>
@@ -370,29 +452,31 @@
     <string name="time_sync_warning_title">Automātiska laika sinhronizēšana</string>
     <string name="time_sync_warning_message">Aegis paļaujas, ka sistēmas laiks sakrīt, lai izveidotu pareizus kodus. Dažu sekunžu nobīde var izraisīt nepareizus kodus. Izskatās, ka šī ierīce nav uzstādīta, lai automātiski sinhronizētu laiku. Vai izdarīt to tagad?</string>
     <string name="time_sync_warning_disable">Nebrīdināt mani. Es zinu, ko es daru.</string>
-    <string name="google_qr_export_unrelated">Atrasts nesaistīts kvadrātkods. Pamēģini pārsāknēt nolasītāju!</string>
+    <string name="google_qr_export_unrelated">Atrasts nesaistīts kvadrātkods. Jāmēģina pārsāknēt nolasītāju.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="zero">Nolasīti %d/%d kvadrātkodiem</item>
-        <item quantity="one">Nolasīts %d/%d kvadrātkodiem</item>
-        <item quantity="other">Nolasīti %d/%d kvadrātkodiem</item>
+        <item quantity="zero">Nolasīti %1$d/%2$d kvadrātkodi</item>
+        <item quantity="one">Nolasīts %1$d/%2$d kvadrātkods</item>
+        <item quantity="other">Nolasīti %1$d/%2$d QR attēliem</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Sagaidāms kvadrātkods #%d, bet tā vietā nolasīts #%d</string>
-    <string name="backup_error_bar_message"><b>Glabātavas dublēšana nesen neizdevās</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Nesens rezerves kopijas veidošanas mēģinājums, izmantojot %s, neizdevās, jo atgadījās kļūda. Rezerves kopiju tika mēģināts izveidot %s. Lūgums pārskatīt rezerves kopēšanas iestatījumus, lai pārliecinātos, ka var veiksmīgi veikt rezerves kopiju izveidošanu.
+    <string name="google_qr_export_unexpected">Sagaidāms kvadrātkods #%1$d, bet tā vietā nolasīts #%2$d</string>
+    <string name="backup_error_bar_message"><b>Glabātavas rezerves kopēšana nesen neizdevās</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Nesens rezerves kopijas veidošanas mēģinājums, izmantojot %1$s, neizdevās, jo atgadījās kļūda. Rezerves kopiju tika mēģināts izveidot %2$s. Lūgums pārskatīt rezerves kopēšanas iestatījumus, lai pārliecinātos, ka var sekmīgi veikt rezerves kopiju izveidošanu.
     </string>
-    <string name="backup_system_builtin">Aegis iebūvētā automātisko rezerves kopiju veidošana</string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Nesens glabātavas rezerves kopēšanas mēģinājums ar %1$s neizdevās, jo Aegis nebija atļaujas rakstīt rezerves kopijas paredzētajā vietā. Rezerves kopēšana tika mēģināta %2$s. Šī kļūda var atgadīties, ja tika pārvietota vai pāsaukta rezerves kopiju atrašanās vieta vai ja nesen Aegis tika atjaunots no rezerves kopijas. Lūgums atkārtoti iestatīt rezerves kopiju atrašanās vietu.
+    </string>
+    <string name="backup_system_builtin">Aegis iebūvētā automātiskā rezerves kopēšana</string>
     <string name="backup_system_android">Android mākoņa rezerves kopiju sistēma</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Jaunākā rezerves kopija ir novecojusi (%s)
     </string>
-    <string name="backup_reminder_bar_message">        Izmaiņām nav rezerves kopiju
+    <string name="backup_reminder_bar_message">        Izmaiņas nav rezerves kopijās
     </string>
-    <string name="backup_reminder_bar_dialog_title">Izmaiņām nav rezerves kopiju</string>
-    <string name="backup_reminder_bar_dialog_summary">        Nesenas glabātavas izmaiņas vēl nav dublētas. Ir svarīgi laiku pa laikam veidot rezerves kopijas, lai novērstu kontu piekļuves zaudēšanu. Lūgums apsvērt iestatīt automātisko rezerves kopiju veidošanu iestatījumu izvēlnē.
+    <string name="backup_reminder_bar_dialog_title">Izmaiņās nav rezerves kopijās</string>
+    <string name="backup_reminder_bar_dialog_summary">        Nesenas glabātavas izmaiņas vēl nav rezerves kopijās. Ir svarīgi laiku pa laikam veidot rezerves kopijas, lai novērstu kontu piekļuves zaudēšanu. Lūgums apsvērt iestatīt automātisko rezerves kopiju veidošanu iestatījumu izvēlnē.
     </string>
     <string name="backup_reminder_bar_dialog_accept">Iestatīt rezerves kopiju veidošanu</string>
-    <string name="backup_plaintext_export_warning"><b>Glabātava nesen tika izdota kā vienkāršs teksts</b></string>
+    <string name="backup_plaintext_export_warning"><b>Glabātava nesen tika izgūta kā vienkāršs teksts</b></string>
     <string name="pref_show_plaintext_warning_hint">Vairs nerādīt šo brīdinājumu</string>
-    <string name="backup_plaintext_warning_explanation">Šis brīdinājums tiek parādīts, jo nesen tika izdota nešifrēta glabātavas kopija. Lai nodrošinātu pilnvaru drošību, ir ieteicams izdzēst šo failu, tiklīdz tas vairs nav nepieciešams.</string>
+    <string name="backup_plaintext_warning_explanation">Šis brīdinājums tiek parādīts, jo nesen tika izgūta nešifrēta glabātavas kopija. Lai nodrošinātu kodu drošību, ir ieteicams izdzēst šo datni, tiklīdz tā vairs nav nepieciešama.</string>
     <string name="switch_camera">Pārslēgt kameru</string>
     <string name="empty_list">Nav kodu, ko attēlot. Ierakstus var pievienot, piesitot apakšējā labajā stūrī esošajai \"+\" zīmei</string>
     <string name="empty_list_title">Nav atrastu ierakstu</string>
@@ -413,14 +497,15 @@
     <string name="copy_uri">Ievietot URI starpliktuvē</string>
     <string name="unable_to_copy_uri_to_clipboard">Nebija iespējams ievietot URI starpliktuvē</string>
     <string name="uri_copied_to_clipboard">URI tika ievietots starpliktuvē</string>
-    <string name="transfer_entry">Pārvietot ierakstu</string>
     <string name="transfer_entry_description">Nolasīt šo kvadrātkodu ar autentificētāja lietotni, uz kuru ir vēlme pārvietot šo ierakstu</string>
+    <string name="transfer_entry_brightness">Piesist kvadrātkodam, lai pārslēgtu pilnu ekrāna spilgtumu</string>
     <string name="google_auth_compatible_transfer_description">Nolasīt šos kvadrātkodus ar Aegis vai Google Authenticator.\n\nIerobežojumu dēļ Google Authenticator lietotnē, ir iekļautas tikai TOTP un HOTP pilnvaras, kam ir izmantots SHA1 un kas veido sešciparu kodus</string>
     <string name="password_strength_very_weak">Ļoti vāja</string>
     <string name="password_strength_weak">Vāja</string>
     <string name="password_strength_fair">Pieņemama</string>
     <string name="password_strength_good">Laba</string>
     <string name="password_strength_strong">Spēcīga</string>
+    <string name="password_strength_unknown">Parole ir pārāk gara stipruma novērtēšanai</string>
     <string name="pref_pin_keyboard_title">Izmantot PIN tastatūru slēgšanas ekrānā</string>
     <string name="pref_pin_keyboard_summary">Iespējot, ja ir vēlme izmantot PIN tastatūru slēgšanas ekrānā. Šī iespēja darbojas tikai ar parolēm, kas sastāv tikai no cipariem</string>
     <string name="title_activity_preferences">Iestatījumi</string>
@@ -429,32 +514,44 @@
     <string name="title_activity_about">Par</string>
     <string name="title_activity_edit_entry">Labot ierakstu</string>
     <string name="title_activity_scan_qr">Nolasīt kvadrātkodu</string>
-    <string name="title_activity_manage_slots">Pārvaldīt atslēgu vietas</string>
     <string name="title_activity_import_entries">Ievietot ierakstus</string>
+    <string name="title_activity_assign_icons">Piešķirt ikonas</string>
+    <string name="title_activity_licenses">Trešo pušu licences</string>
     <string name="dialog_wipe_entries_title">Notīrīt ierakstus</string>
     <string name="dialog_wipe_entries_message">Glabātava jau satur ierakstus. Vai tos noņemt, pirms tiek ievietota šī datne?\n\n<b>Šādi rīkojoties, tiks zaudēta piekļuve pašreizējiem glabātavas ierakstiem.</b></string>
     <string name="dialog_wipe_entries_checkbox">Notīrīt glabātavas saturu</string>
     <string name="panic_trigger_ignore_toast">Aegis saņēma trauksmes izsaukumu, bet iestatījums ir atspējots, tādēļ tas netiek ņemts vērā</string>
     <string name="pref_panic_trigger_title">Izdzēst glabātavu pēc trauksmes izsaukuma</string>
     <string name="pref_panic_trigger_summary">Izdzēst glabātavu, kad trauksmes izsaukums ir saņemts no Ripple</string>
-    <string name="import_vault">Ievietot glabātavu</string>
-    <string name="importer_help_2fas">Padot 2FAS Authenticator izdošanas datni.</string>
-    <string name="importer_help_aegis">Padot Aegis izdošanas/rezerves kopijas datni.</string>
-    <string name="importer_help_authenticator_plus">Padot Authenticator Plus izdošanas datni, kas ir iegūta ar <b>Iestatījumi -&gt; Dublēšana un atjaunošana -&gt; Izdot kā tekstu un HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Jāiesniedz Authenticator Pro izdošanas datne, kas ir iegūstama <b>Iestatījumi -&gt; Rezerves kopijas -&gt; Dublēt šifrētā datnē (ieteicams)</b>.</string>
-    <string name="importer_help_authy">Padot <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> kopiju, kas atrodas iekšējās krātuves Authy mapē.</string>
-    <string name="importer_help_andotp">Padot andOTP izdošanas/rezerves kopijas datni.</string>
-    <string name="importer_help_bitwarden">Padot Bitwarden izdošanas/rezerves kopijas datni. Šifrētas datnes netiek atbalstītas.</string>
-    <string name="importer_help_battle_net_authenticator">Padot <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b> kopiju, kas atrodas iekšējās krātuves Battle.net Authenticator mapē.</string>
-    <string name="importer_help_duo">Padot <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> kopiju, kas atrodas iekšējās krātuves DUO mapē.</string>
-    <string name="importer_help_freeotp">Padot <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> kopiju, kas atrodas iekšējās krātuves FreeOTP mapē.</string>
-    <string name="importer_help_freeotp_plus">Padot FreeOTP+ izdošanas datni.</string>
-    <string name="importer_help_google_authenticator"><b>Tek atbalstītas tikai datubāzes datnes no Goole Authenticator v5.10 un agrāka</b>.\n\nJāpadod kopija no <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, kas atrodas iekšējās krātuves Google Authenticator mapē.</string>
-    <string name="importer_help_microsoft_authenticator">Padot <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> kopiju, kas atrodas iekšējās krātuves Microsoft Authenticator mapē.</string>
-    <string name="importer_help_plain_text">Padot tīra teksta datni, kuras katra līnija satur vienu Google Authenticator URI.</string>
-    <string name="importer_help_steam"><b>Steam v3.0 un jaunāki laidieni netiek atbalstīti</b>. Jāpadod <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> dublējums, kas atrodas iekšējās krātuves Steam mapē.</string>
-    <string name="importer_help_totp_authenticator">Padot TOTP Authenticator izdošanas datni.</string>
-    <string name="importer_help_winauth">Padot WinAuth izdošanas datni.</string>
+    <string name="import_vault">Ievietot Aegis glabātavu</string>
+    <string name="import_vault_hint">Ir vēlēšanās ievietot no citas 2FA lietotnes? Vispirms jāpabeidz uzstādīšana un tad jādodas uz iestatījumu izvēlni.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="zero">Noņemta atzīme %d iespējamiem dublikātiem. Lūgums pārskatīt ierakstu sarakstu.</item>
+        <item quantity="one">Noņemta atzīme %d iespējamam dublikātam. Lūgums pārskatīt ierakstu sarakstu.</item>
+        <item quantity="other">Noņemta atzīme %d iespējamiem dublikātiem. Lūgums pārskatīt ierakstu sarakstu.</item>
+    </plurals>
+    <string name="importer_help_2fas">Jāiesniedz 2FAS Authenticator izgūšanas datne.</string>
+    <string name="importer_help_aegis">Jāiesniedz Aegis izgūšanas / rezerves kopijas datne.</string>
+    <string name="importer_help_authenticator_plus">Jāiesniedz Authenticator Plus izgūšanas datne, kas ir iegūta ar <b>Iestatījumi -&gt; Rezerves kopēšana un atjaunošana -&gt; Izgūt kā tekstu un HTML</b>.</string>
+    <string name="importer_help_authy">Jāiesniedz <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> kopija, kas atrodas iekšējās krātuves Authy mapē.</string>
+    <string name="importer_help_andotp">Jāiesniedz andOTP izgūšanas / rezerves kopijas datne.</string>
+    <string name="importer_help_bitwarden">Jāiesniedz Bitwarden izgūšanas / rezerves kopijas datne. Šifrētas datnes netiek atbalstītas.</string>
+    <string name="importer_help_battle_net_authenticator">Jāiesniedz <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b> kopija, kas atrodas iekšējās krātuves Battle.net Authenticator mapē.</string>
+    <string name="importer_help_duo">Jāiesniedz <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> kopija, kas atrodas iekšējās krātuves DUO mapē.</string>
+    <string name="importer_help_ente_auth">Jāiesniedz Ente Auth izgūšanas datne. Pašlaik tiek atbalstītas tikai nešifrētas datnes.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: jāpadod rezerves kopijas datne.\nFreeOTP 1.x: jāpadod <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> kopija, kas atrodas iekšējās krātuves FreeOTP mapē.</string>
+    <string name="importer_help_freeotp_plus">Jāiesniedz FreeOTP+ izgūšanas datne.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2 saderība</string>
+    <string name="importer_warning_message_freeotp2">Pastāv vairākas FreeOTP 2 nepilnības, kas var beigties ar bojātām rezerves kopijām. Aegis mēģinās saglābt pēc iespējas vairāk ierakstu, bet ir iespējams, ka dažus no tiem vai pat visus neizdodas ievietot.</string>
+    <string name="importer_help_google_authenticator"><b>Tek atbalstītas tikai datubāzes datnes no Goole Authenticator v5.10 un agrāka</b>.\n\nJāiesniedz kopija no <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, kas atrodas iekšējās krātuves Google Authenticator mapē.</string>
+    <string name="importer_help_microsoft_authenticator">Jāiesniedz <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> kopija, kas atrodas iekšējās krātuves Microsoft Authenticator mapē.</string>
+    <string name="importer_help_plain_text">Jāiesniedz vienkārša teksta datne, kuras katra līnija satur vienu Google Authenticator URI.</string>
+    <string name="importer_help_steam"><b>Steam v3.0 un jaunāks netiek atbalstīts</b>. Jāiesniedz <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> kopija, kas atrodas iekšējās krātuves Steam mapē.</string>
+    <string name="importer_help_stratum">Jāiesniedz Stratum izgūšanas datne, kas ir iegūstama <b>Iestatījumi -&gt; Rezerves kopijas -&gt; Dublēt šifrētā datnē (ieteicams)</b>.</string>
+    <string name="importer_help_totp_authenticator">Jāiesniedz TOTP Authenticator izgūšanas datne.</string>
+    <string name="importer_help_winauth">Jāiesniedz WinAuth izgūšanas datne.</string>
+    <string name="import_assign_icons_dialog_title">Piešķirt ikonas</string>
+    <string name="import_assign_icons_dialog_text">Vai piešķirt ikonas ievietotajiem ierakstiem?</string>
     <string name="importer_encrypted_exception_google_authenticator">Tika izlaists šifrēts ieraksts: %s</string>
     <string name="importer_help_direct">Ievietot ierakstus uzreiz no %s. Tam ir nepieciešams, lai lietotne ir uzstādīta šajā ierīcē un lai Aegis ir nodrošināta saknes piekļuve.</string>
     <string name="groups">Kopas</string>
@@ -471,27 +568,27 @@
     <string name="pref_account_name_position_hidden">Paslēpts</string>
     <string name="pref_account_name_position_end">Aiz izdevēja</string>
     <string name="pref_account_name_position_below">Zem izdevēja</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="zero">pirms %d sekundēm</item>
         <item quantity="one">pirms %d sekundes</item>
         <item quantity="other">Pirms %d sekundēm</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="zero">Pirms %d minūtēm</item>
         <item quantity="one">Pirms %d minūtes</item>
         <item quantity="other">Pirms %d minūtēm</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="zero">Pirms %d stundām</item>
         <item quantity="one">Pirms %d stundas</item>
         <item quantity="other">Pirms %d stundām</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="zero">Pirms %d dienām</item>
         <item quantity="one">Pirms %d dienas</item>
         <item quantity="other">Pirms %d dienām</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="zero">Pirms %d gadiem</item>
         <item quantity="one">Pirms %d gada</item>
         <item quantity="other">Pirms %d gadiem</item>
diff --git a/app/src/main/res/values-ml-rIN-v29/strings.xml b/app/src/main/res/values-ml-rIN-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-ml-rIN-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ml-rIN/strings.xml b/app/src/main/res/values-ml-rIN/strings.xml
new file mode 100644
index 00000000..b4cb3dde
--- /dev/null
+++ b/app/src/main/res/values-ml-rIN/strings.xml
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="action_settings">ക്രമീകരണങ്ങൾ</string>
+    <string name="action_about">കുറിച്ച്</string>
+    <string name="action_delete">ഇല്ലാതാക്കുക</string>
+    <string name="action_transfer">മാറ്റിസ്ഥാപിക്കുക</string>
+    <string name="action_edit_icon">തിരുത്തുക ഐക്കൺ</string>
+    <string name="action_reset_usage_count">ഉപയോഗ എണ്ണം പുനഃസജ്ജമാക്കുക</string>
+    <string name="action_reset_usage_count_dialog">ഈ എൻട്രിയുടെ ഉപയോഗ എണ്ണം 0 ആയി സജ്ജീകരിക്കണമെന്ന് തീർച്ചയാണോ?</string>
+    <string name="action_default_icon">സ്ഥിരസ്ഥിതി ഐക്കൺ പുനഃസ്ഥാപിക്കുക</string>
+    <string name="discard">കളയുക</string>
+    <string name="save">ഓർക്കുക</string>
+    <string name="issuer">പ്രസാധകൻ</string>
+    <string name="yandex_pin">പിൻ (4–16 അക്കങ്ങൾ)</string>
+    <string name="motp_pin">പിൻ (4 അക്കങ്ങൾ)</string>
+    <string name="suggested">നിർദ്ദേശിcha</string>
+    <string name="usage_count">ഉപയോഗ എണ്ണം</string>
+    <string name="warning">മുന്നറിയിപ്പ്</string>
+    <string name="pref_cat_appearance_app">ആപ്പ്</string>
+    <string name="pref_cat_appearance_entries">ഇനങ്ങൾ</string>
+    <string name="pref_cat_backups_android">ആൻഡ്രോയിഡ്</string>
+    <string name="pref_cat_backups_auto">യാന്ത്രിക ബാക്കപ്പുകൾ</string>
+    <string name="pref_section_behavior_title">പെരുമാറ്റം</string>
+    <string name="pref_section_behavior_summary">എൻട്രി ലിസ്റ്റുമായി ഇടപഴകുമ്പോൾ പെരുമാറ്റം ഇഷ്ടാനുസൃതമാക്കുക.</string>
+    <string name="pref_section_appearance_title">രൂപഭാവം</string>
+    <string name="pref_section_appearance_summary">ആപ്പിൻ്റെ രൂപഭാവത്തെ ബാധിക്കുന്ന തീം, ഭാഷ, മറ്റ് ക്രമീകരണങ്ങൾ എന്നിവ ക്രമീകരിക്കുക.</string>
+    <string name="pref_section_security_title">സുരക്ഷ</string>
+    <string name="pref_section_security_summary">എൻക്രിപ്ഷൻ, ബയോമെട്രിക് അൺലോക്ക്, ഓട്ടോ ലോക്ക്, മറ്റ് സുരക്ഷാ ക്രമീകരണങ്ങൾ എന്നിവ കോൺഫിഗർ ചെയ്യുക.</string>
+    <string name="pref_section_import_export_title">ഇറക്കുമതി &amp; കയറ്റുമതി</string>
+    <string name="pref_section_import_export_summary">ഏജിസ് അല്ലെങ്കിൽ മറ്റ് ഓതൻ്റിക്കേറ്റർ ആപ്പുകളുടെ ബാക്കപ്പുകൾ ഇറക്കുമതി ചെയ്യുക. നിങ്ങളുടെ ഏജിസ് നിലവറയുടെ മാനുവൽ എക്‌സ്‌പോർട്ടുകൾ സൃഷ്‌ടിക്കുക.</string>
+    <string name="pref_section_backups_title">ബാക്കപ്പുകൾ</string>
+    <string name="pref_section_backups_summary">നിങ്ങൾ തിരഞ്ഞെടുക്കുന്ന സ്ഥലത്തേക്ക് സ്വയമേവയുള്ള ബാക്കപ്പുകൾ സജ്ജീകരിക്കുക അല്ലെങ്കിൽ Android-ൻ്റെ ക്ലൗഡ് ബാക്കപ്പ് സിസ്റ്റത്തിൽ പങ്കാളിത്തം പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="pref_section_icon_packs">ഐക്കൺ പായ്ക്കുകൾ</string>
+    <string name="pref_section_icon_packs_summary">ഐക്കൺ പായ്ക്കുകൾ നിയന്ത്രിക്കുകയും ഇറക്കുമതി ചെയ്യുകയും ചെയ്യുക</string>
+    <string name="pref_select_theme_title">തീം</string>
+    <string name="pref_dynamic_colors_title">ഡൈനാമിക് നിറങ്ങൾ</string>
+    <string name="pref_dynamic_colors_summary">നിങ്ങളുടെ Android തീമിൻ്റെ നിറങ്ങളെ അടിസ്ഥാനമാക്കി ഒരു ഓവർലേ പ്രയോഗിക്കുക</string>
+    <string name="pref_view_mode_title">കാഴ്ചയുടെ രീതി</string>
+    <string name="pref_lang_title">ഭാഷ</string>
+    <string name="pref_show_icons_title">ഐക്കണുകൾ കാണിക്കുക</string>
+    <string name="pref_show_icons_summary">ഓരോ എൻട്രിക്കും അടുത്തുള്ള ഐക്കണുകൾ പ്രദർശിപ്പിക്കുക</string>
+    <string name="pref_code_group_size_title">കോഡ് അക്കം ഒന്നിച്ചുചേർക്കൽ</string>
+    <string name="pref_code_group_size_summary">ഒന്നിച്ചുചേർക്കൽ കോഡുകളിലേക്കുള്ള അക്കങ്ങളുടെ എണ്ണം</string>
+    <string name="pref_account_name_position_title">അക്കൗണ്ട് പേര് കാണിക്കുക</string>
+    <string name="pref_shared_issuer_account_name_title">ആവശ്യമുള്ളപ്പോൾ മാത്രം അക്കൗണ്ട് പേര് കാണിക്കുക</string>
+    <string name="pref_shared_issuer_account_name_summary">ഒരേ പ്രസാധകനെ അവർ പങ്കിടുമ്പോഴെല്ലാം അക്കൗണ്ട് പേരുകൾ മാത്രം കാണിക്കുക. മറ്റ് അക്കൗണ്ട് പേരുകൾ മറയ്ക്കപ്പെടും.</string>
+    <string name="pref_import_file_title">ഫയലിൽ നിന്ന് ഇറക്കുമതി ചെയ്യുക</string>
+    <string name="pref_import_file_summary">ഫയലിൽ നിന്ന് ടോക്കണുകൾ ഇറക്കുമതി ചെയ്യുക</string>
+    <string name="pref_android_backups_title">ആൻഡ്രോയിഡ് ക്ലൗഡ് ബാക്കപ്പുകൾ</string>
+    <string name="pref_android_backups_summary">ആൻഡ്രോയിഡിൻ്റെ ക്ലൗഡ് ബാക്കപ്പ് സിസ്റ്റത്തെ അതിൻ്റെ ബാക്കപ്പുകളിൽ ഏജിസിൻ്റെ നിലവറ ഉൾപ്പെടുത്താൻ അനുവദിക്കുക. എൻക്രിപ്റ്റ് ചെയ്ത നിലവറകൾക്ക് മാത്രമേ ഇത് പിന്തുണയ്ക്കൂ.</string>
+    <string name="pref_android_backups_hint"><i>മുകളിലെ ക്രമീകരണം പരിഗണിക്കാതെ തന്നെ ഡിവൈസ് ടു ഡിവൈസ് (D2D) ബാക്കപ്പുകൾ എപ്പോഴും അനുവദനീയമാണ്</i></string>
+    <string name="pref_backups_title">നിലവറ സ്വയമേവ ബാക്കപ്പ് ചെയ്യുക</string>
+    <string name="pref_backups_summary">മാറ്റങ്ങൾ സ്വയമേവ ബാഹ്യ സംഭരണത്തിൽ നിലവറയുടെ ബാക്കപ്പുകൾ സൃഷ്ടിക്കുമ്പോൾ. എൻക്രിപ്റ്റ് ചെയ്ത നിലവറകൾക്ക് മാത്രമേ ഇത് പിന്തുണയ്ക്കൂ.</string>
+    <string name="pref_backups_reminder_title">ബാക്കപ്പ് ഓർമ്മപ്പെടുത്തൽ</string>
+    <string name="pref_backups_reminder_summary">നിങ്ങളുടെ ഏറ്റവും പുതിയ മാറ്റങ്ങൾ ബാക്കപ്പ് ചെയ്‌തിട്ടില്ലെങ്കിൽ, നിങ്ങളുടെ നിലവറ ബാക്കപ്പ് ചെയ്യുന്നതിനുള്ള ഒരു ഓർമ്മപ്പെടുത്തൽ കാണിക്കുക.</string>
+    <string name="pref_backups_reminder_dialog_title">ബാക്കപ്പ് ഓർമ്മപ്പെടുത്തൽ പ്രവർത്തനരഹിതമാക്കുക</string>
+    <string name="pref_backups_reminder_dialog_summary">ഈ ഓർമ്മപ്പെടുത്തൽ പ്രവർത്തനരഹിതമാക്കുക എന്നതിനർത്ഥം, ഇതുവരെ ബാക്കപ്പ് ചെയ്യാത്ത മാറ്റങ്ങൾ നിങ്ങൾക്കുണ്ടോ ഇല്ലയോ എന്ന് ഏജിസ് നിങ്ങളോട് പറയില്ല എന്നാണ്. ഇത് നിങ്ങളുടെ ടോക്കണുകളിലേക്കുള്ള പ്രവേശനം നഷ്‌ടപ്പെടാനുള്ള അപകടസാധ്യത ഉണ്ടാക്കുന്നു. ഓർമ്മപ്പെടുത്തൽ പ്രവർത്തനരഹിതമാക്കണമെന്ന് തീർച്ചയാണോ?</string>
+    <string name="pref_backups_location_summary">ബാക്കപ്പുകൾ സംഭരിക്കും</string>
+    <string name="pref_backups_trigger_title">ബാക്കപ്പ് ട്രിഗർ ചെയ്യുക</string>
+    <string name="pref_backups_trigger_summary">ഒരു ബാക്കപ്പ് സ്വമേധയാ ട്രിഗർ ചെയ്യുക</string>
+    <string name="pref_backups_versions_title">സൂക്ഷിക്കേണ്ട പതിപ്പുകളുടെ എണ്ണം</string>
+    <plurals name="pref_backups_versions_summary">
+        <item quantity="one">ബാക്കപ്പിൻ്റെ %1$d പതിപ്പ് സൂക്ഷിക്കുക</item>
+        <item quantity="other">ബാക്കപ്പിൻ്റെ %1$d പതിപ്പുകൾ സൂക്ഷിക്കുക</item>
+    </plurals>
+    <string name="pref_import_app_title">ആപ്പിൽ നിന്ന് ഇറക്കുമതി ചെയ്യുക</string>
+    <string name="pref_import_app_summary">ഒരു ആപ്പിൽ നിന്ന് ടോക്കണുകൾ ഇറക്കുമതി ചെയ്യുക (റൂട്ട് ആക്സസ് ആവശ്യമാണ്)</string>
+    <string name="pref_export_title">കയറ്റുമതി</string>
+    <string name="pref_export_summary">നിലവറ കയറ്റുമതി ചെയ്യുക</string>
+    <string name="pref_password_reminder_title">പാസ്‌വേഡ് ഓർമ്മപ്പെടുത്തൽ</string>
+    <string name="pref_google_auth_export_title">ഗൂഗിൾ ഓതൻ്റിക്കേറ്റർ-നായി കയറ്റുമതി ചെയ്യുക</string>
+    <string name="pref_google_auth_export_descriptor">ഗൂഗിൾ ഓതൻ്റിക്കേറ്റർ-ന് അനുയോജ്യമായ എക്സ്പോർട്ട് ക്യുആർ കോഡുകൾ സൃഷ്ടിക്കുന്നു</string>
+    <string name="pref_google_auth_export_no_data">കയറ്റുമതി ചെയ്യാൻ ഡാറ്റയില്ല</string>
+    <plurals name="pref_google_auth_export_incompatible_entries">
+        <item quantity="one">പൊരുത്തമില്ലാത്ത %d എൻട്രി ഒഴിവാക്കി</item>
+        <item quantity="other">പൊരുത്തമില്ലാത്ത %d എൻട്രികൾ ഒഴിവാക്കി</item>
+    </plurals>
+    <string name="pref_password_reminder_summary">പാസ്‌വേഡ് നൽകാനുള്ള %s ഓർമ്മപ്പെടുത്തൽ കാണിക്കുക, അതുവഴി നിങ്ങൾ അത് മറക്കരുത്.</string>
+    <string name="pref_password_reminder_summary_disabled">അപ്രാപ്തമാക്കി</string>
+    <string name="pref_secure_screen_title">സ്ക്രീൻ സുരക്ഷ</string>
+    <string name="pref_secure_screen_summary">സ്‌ക്രീൻഷോട്ടുകളും ആപ്പിനുള്ളിൽ സ്‌ക്രീൻ ക്യാപ്‌ചർ ചെയ്യാനുള്ള മറ്റ് ശ്രമങ്ങളും തടയുക</string>
+    <string name="pref_tap_to_reveal_title">വെളിപ്പെടുത്താൻ ടാപ്പ് ചെയ്യുക</string>
+    <string name="pref_tap_to_reveal_summary">ടോക്കണുകൾ സ്ഥിരസ്ഥിതി മറയ്‌ക്കും. കോഡ് വെളിപ്പെടുത്താൻ ടോക്കണുകളിൽ ടാപ്പുചെയ്യുക.</string>
+    <string name="pref_tap_to_reveal_time_title">ടാപ്പ് വെളിപ്പെടുത്താനുള്ള സമയപരിധി</string>
+    <string name="pref_auto_lock_title">ഓട്ടോ ലോക്ക്</string>
+    <string name="pref_auto_lock_summary">എപ്പോൾ %s</string>
+    <string name="pref_auto_lock_summary_disabled">അപ്രാപ്തമാക്കി</string>
+    <string name="pref_auto_lock_prompt">എജിസ് ഓട്ടോമാറ്റിക് ലോക്ക് എപ്പോൾ</string>
+    <string name="pref_auto_lock_type_back_button">ബാക്ക് ബട്ടൺ അമർത്തി</string>
+    <string name="pref_auto_lock_type_minimize">ആപ്പ് ചെറുതാക്കി</string>
+    <string name="pref_auto_lock_type_device_lock">ഉപകരണം ലോക്ക് ചെയ്തിരിക്കുന്നു</string>
+    <string name="pref_backup_password_category">ബാക്കപ്പ് &amp; കയറ്റുമതി</string>
+    <string name="pref_backup_password_title">ബാക്കപ്പിനായി പ്രത്യേക പാസ്‌വേഡ് &amp; കയറ്റുമതി</string>
+    <string name="pref_backup_password_summary">പ്രവർത്തനക്ഷമമാക്കിയാൽ, ആപ്പ് അൺലോക്ക് ചെയ്യാൻ ഉപയോഗിക്കുന്ന പാസ്‌വേഡ് ബാക്കപ്പും കയറ്റുമതി ഡീക്രിപ്റ്റ് ചെയ്യാൻ ഇനി ഉപയോഗിക്കാനാകില്ല.</string>
+    <string name="pref_backup_password_change_title">ബാക്കപ്പിനായി പാസ്‌വേഡ് മാറ്റുക &amp; കയറ്റുമതി</string>
+    <string name="pref_backup_password_change_summary">ബാക്കപ്പ് ചെയ്യുമ്പോഴും കയറ്റുമതി ചെയ്യുമ്പോഴും നിലവറ എൻക്രിപ്റ്റ് ചെയ്യാൻ ഉപയോഗിക്കുന്ന ഒരു പുതിയ പാസ്‌വേഡ് സജ്ജീകരിക്കുക.</string>
+    <string name="pref_encryption_title">എൻക്രിപ്ഷൻ</string>
+    <string name="pref_encryption_summary">നിലവറ എൻക്രിപ്റ്റ് ചെയ്‌ത് പാസ്‌വേഡ് അല്ലെങ്കിൽ ബയോമെട്രിക്‌സ് ഉപയോഗിച്ച് അൺലോക്ക് ചെയ്യുക</string>
+    <string name="pref_biometrics_title">ബയോമെട്രിക് അൺലോക്ക്</string>
+    <string name="pref_biometrics_summary">നിലവറ അൺലോക്ക് ചെയ്യാൻ ബയോമെട്രിക് പ്രാമാണീകരണം അനുവദിക്കുക</string>
+    <string name="pref_set_password_title">പാസ്വേഡ് മാറ്റുക</string>
+    <string name="pref_set_password_summary">നിങ്ങളുടെ നിലവറ അൺലോക്ക് ചെയ്യുന്നതിന് ഒരു പുതിയ പാസ്‌വേഡ് സജ്ജമാക്കുക</string>
+    <string name="export_encrypted">നിലവറ എൻക്രിപ്റ്റ് ചെയ്യുക</string>
+    <string name="export_help">ഈ പ്രവർത്തനം എജീസിൻ്റെ ആന്തരിക സംഭരണത്തിൽ നിന്ന് നിലവറ കയറ്റുമതി ചെയ്യും. നിങ്ങൾ കയറ്റുമതി ചെയ്യാൻ ആഗ്രഹിക്കുന്ന ഫോർമാറ്റ് തിരഞ്ഞെടുക്കുക:</string>
+    <string name="export_warning_unencrypted">നിങ്ങളുടെ ഏജിസ് നിലവറയുടെ എൻക്രിപ്റ്റ് ചെയ്യാത്ത ഒരു പകർപ്പ് നിങ്ങൾ കയറ്റുമതി ചെയ്യാൻ പോകുകയാണ്. <b>ഇത് ശുപാർശ ചെയ്യുന്നില്ല</b>.</string>
+    <string name="export_warning_password">സുരക്ഷാ ക്രമീകരണങ്ങളിൽ കോൺഫിഗർ ചെയ്‌തിരിക്കുന്ന പ്രത്യേക പാസ്‌വേഡ് ഉപയോഗിച്ചാണ് കയറ്റുമതി എൻക്രിപ്റ്റ് ചെയ്യുന്നത്.</string>
+    <string name="understand_risk_accept">അപകടസാധ്യത ഞാൻ മനസ്സിലാക്കുന്നു</string>
+    <string name="export_format_aegis">Aegis (.JSON)</string>
+    <string name="export_format_google_auth_uri">Text file (.TXT)</string>
+    <string name="export_format_html">Web page (.HTML)</string>
+    <string name="export_format_hint">കയറ്റുമതി ഫോർമാറ്റ്</string>
+    <string name="export_all_groups">എല്ലാ ഗ്രൂപ്പുകളും കയറ്റുമതി ചെയ്യുക</string>
+    <string name="export_choose_groups">കയറ്റുമതി ചെയ്യേണ്ട ഗ്രൂപ്പുകൾ തിരഞ്ഞെടുക്കുക</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="one">%d തിരഞ്ഞെടുത്ത ഗ്രൂപ്പ്</item>
+        <item quantity="other">%d തിരഞ്ഞെടുത്ത ഗ്രൂപ്പുകൾ</item>
+    </plurals>
+    <string name="export_no_groups_selected">കയറ്റുമതി ചെയ്യാൻ ഗ്രൂപ്പുകളൊന്നും തിരഞ്ഞെടുത്തിട്ടില്ല</string>
+    <string name="export_html_title" comment="The title of an HTML export document">ഏജിസ് ഓതൻ്റിക്കേറ്റർ കയറ്റുമതി</string>
+    <string name="choose_authentication_method">സുരക്ഷ</string>
+    <string name="authentication_method_explanation">സുരക്ഷാ കേന്ദ്രീകൃതമായ 2FA ആപ്പാണ് ഏജിസ്. ടോക്കണുകൾ ഒരു നിലവറയിൽ സംഭരിച്ചിരിക്കുന്നു, അത് നിങ്ങൾ തിരഞ്ഞെടുക്കുന്ന പാസ്‌വേഡ് ഉപയോഗിച്ച് ഓപ്ഷണലായി എൻക്രിപ്റ്റ് ചെയ്യാവുന്നതാണ്. ഒരു ആക്രമണകാരിക്ക് നിങ്ങളുടെ എൻക്രിപ്റ്റ് ചെയ്ത വോൾട്ട് ഫയൽ ലഭിച്ചാൽ, പാസ്‌വേഡ് അറിയാതെ അവർക്ക് ഉള്ളടക്കം ആക്‌സസ് ചെയ്യാൻ കഴിയില്ല.\n\nനിങ്ങളുടെ ഉപകരണത്തിന് ഏറ്റവും അനുയോജ്യമെന്ന് ഞങ്ങൾ കരുതുന്ന ഓപ്ഷൻ ഞങ്ങൾ മുൻകൂട്ടി തിരഞ്ഞെടുത്തു.</string>
+    <string name="authentication_method_none">ഒന്നുമില്ല</string>
+    <string name="authentication_method_none_description">നിലവറ അൺലോക്ക് ചെയ്യാൻ പാസ്‌വേഡ് ആവശ്യമില്ല, അത് എൻക്രിപ്റ്റ് ചെയ്യപ്പെടില്ല. <b>നിലവറ അൺലോക്ക് ചെയ്യാൻ പാസ്‌വേഡ് ആവശ്യമില്ല, അത് എൻക്രിപ്റ്റ് ചെയ്യപ്പെടില്ല</b>.</string>
+    <string name="authentication_method_password">പാസ്വേഡ്</string>
+    <string name="authentication_method_password_description">നിലവറ അൺലോക്ക് ചെയ്യുന്നതിന് ഒരു പാസ്‌വേഡ് ആവശ്യമാണ്.</string>
+    <string name="authentication_method_password_explanation">മുന്നറിയിപ്പ്: നിങ്ങൾ പാസ്‌വേഡ് മറന്നാൽ, നിങ്ങളുടെ ടോക്കണുകളിലേക്കുള്ള ആക്‌സസ് ശാശ്വതമായി നഷ്‌ടമാകും. പാസ്‌വേഡ് ഇല്ലാതെ അവ വീണ്ടെടുക്കാൻ ഒരു മാർഗവുമില്ല.</string>
+    <string name="authentication_method_biometrics">ബയോമെട്രിക്സ്</string>
+    <string name="authentication_method_biometrics_description">ഒരു പാസ്‌വേഡിന് പുറമേ, ഈ ഉപകരണത്തിൽ രജിസ്‌റ്റർ ചെയ്‌തിരിക്കുന്ന വിരലടയാളമോ നിങ്ങളുടെ മുഖമോ പോലുള്ള ബയോമെട്രിക്‌സും നിലവറ അൺലോക്ക് ചെയ്യാൻ ഉപയോഗിക്കാം.</string>
+    <string name="authentication">നിലവറ അൺലോക്ക് ചെയ്യുക</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">നിലവറ\nഅൺലോക്ക് ചെയ്യുക</string>
+    <string name="auth_use_biometrics">അല്ലെങ്കിൽ <font fgcolor="#FF0D86C1">ബയോമെട്രിക്‌സ്</font> ഉപയോഗിക്കാൻ ഇവിടെ ടാപ്പ് ചെയ്യുക</string>
+    <string name="set_password">ദയവായി ഒരു പാസ്‌വേഡ് നൽകുക</string>
+    <string name="set_group">ദയവായി ഒരു ഗ്രൂപ്പിൻ്റെ പേര് നൽകുക</string>
+    <string name="set_number">ദയവായി ഒരു അക്കം നൽകുക</string>
+    <string name="set_password_confirm">ദയവായി പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക</string>
+    <string name="invalid_password">പാസ്‌വേഡ് തെറ്റാണ്</string>
+    <string name="invalidated_biometrics">നിങ്ങളുടെ ഉപകരണത്തിൻ്റെ സുരക്ഷാ ക്രമീകരണത്തിൽ ഒരു മാറ്റം കണ്ടെത്തി. ബയോമെട്രിക് അൺലോക്ക് പ്രവർത്തനരഹിതമാക്കുന്നതിനും വീണ്ടും പ്രവർത്തനക്ഷമമാക്കുന്നതിനും ദയവായി \"Aegis -&gt; ക്രമീകരണങ്ങൾ -&gt; സുരക്ഷ -&gt; ബയോമെട്രിക് അൺലോക്ക്\" എന്നതിലേക്ക് പോകുക.</string>
+    <string name="password_reminder">ദയവായി നിങ്ങളുടെ പാസ്‌വേഡ് നൽകുക. ഇത് മറക്കാതിരിക്കാൻ ഞങ്ങൾ ഇടയ്ക്കിടെ നിങ്ങളോട് ആവശ്യപ്പെടാറുണ്ട്.</string>
+    <string name="password_reminder_dialog_title">സ്ഥിരസ്ഥിതി ബയോമെട്രിക് അൺലോക്ക്</string>
+    <string name="password_reminder_dialog_message">നിങ്ങളുടെ പാസ്‌വേഡ് നിങ്ങൾ മറന്നിട്ടില്ലെന്നും നിങ്ങളുടെ നിലവറയിൽ നിന്ന് ലോക്ക് ചെയ്യപ്പെടില്ലെന്നും ഉറപ്പാക്കാൻ പകരം അത് നൽകാൻ ഞങ്ങൾ ഇടയ്ക്കിടെ നിങ്ങളോട് ആവശ്യപ്പെടും. ഒരിക്കൽ നിങ്ങളുടെ പാസ്‌വേഡ് നൽകിയതിന് ശേഷം, മറ്റൊരു പാസ്‌വേഡ് ഓർമ്മപ്പെടുത്തലിനുള്ള സമയം ആകുന്നത് വരെ Aegis ബയോമെട്രിക് അൺലോക്കിലേക്ക് സ്ഥിരസ്ഥിതി ആയി മടങ്ങും.</string>
+    <string name="password_reminder_freq_never">ഒരിക്കലും</string>
+    <string name="password_reminder_freq_weekly">പ്രതിവാരം</string>
+    <string name="password_reminder_freq_biweekly">ദ്വൈവാരം</string>
+    <string name="password_reminder_freq_monthly">പ്രതിമാസ</string>
+    <string name="password_reminder_freq_quarterly">ത്രൈമാസ</string>
+    <string name="enter_password_2fas_message">ഈ 2FAS ബാക്കപ്പ് എൻക്രിപ്റ്റ് ചെയ്തതായി തോന്നുന്നു. ദയവായി താഴെ പാസ്‌വേഡ് നൽകുക.</string>
+    <string name="enter_password_authy_message">നിങ്ങളുടെ Authy ടോക്കണുകൾ എൻക്രിപ്റ്റ് ചെയ്തതായി തോന്നുന്നു. ദയവായി Aegis അടയ്ക്കുക, Authy തുറന്ന് നിങ്ങളുടെ പാസ്‌വേഡ് ഉപയോഗിച്ച് ടോക്കണുകൾ അൺലോക്ക് ചെയ്യുക. പകരം, നിങ്ങളുടെ പാസ്‌വേഡ് ചുവടെ നൽകിയാൽ, നിങ്ങളുടെ Authy ടോക്കണുകൾ ഡീക്രിപ്റ്റ് ചെയ്യാനും ഏജിസിന് ശ്രമിക്കാം.</string>
+    <string name="enter_password_aegis_title">ഇറക്കുമതി പാസ്‌വേഡ് നൽകുക</string>
+    <string name="period_hint">കാലയളവ് (സെക്കൻ്റുകൾ)</string>
+    <string name="algorithm_hint">ഹാഷ് ഫംഗ്ഷൻ</string>
+    <string name="type">വൈവിധ്യം</string>
+    <string name="share">പങ്കിടുക</string>
+    <string name="yes">അതെ</string>
+    <string name="no">ഇല്ല</string>
+    <string name="undo">പഴയപടിയാക്കുക</string>
+    <string name="unlock">അൺലോക്ക്</string>
+    <string name="advanced">വിപുലമായത്</string>
+    <string name="counter">കൗണ്ടർ</string>
+    <string name="digits">അക്കങ്ങൾ</string>
+    <string name="secret">രഹസ്യം</string>
+    <string name="scan">ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുക</string>
+    <string name="scan_image">ചിത്രം സ്കാൻ ചെയ്യുക</string>
+    <string name="enter_manually">സ്വമേധയാ നൽകുക</string>
+    <string name="set_up_biometric">ബയോമെട്രിക് അൺലോക്ക് സജ്ജീകരിക്കുക</string>
+    <string name="copy">പകര്‍ത്തുക</string>
+    <string name="edit">തിരുത്തുക</string>
+    <string name="select_all">എല്ലാം തിരഞ്ഞെടുക്കുക</string>
+    <string name="assign_icons">ഐക്കണുകൾ നിയോഗിക്കുക</string>
+    <string name="favorite" comment="Verb">പ്രിയപ്പെട്ടത്</string>
+    <string name="unfavorite" comment="Verb">പ്രിയപ്പെട്ടതല്ല</string>
+    <string name="error_all_caps">പിശക്</string>
+    <string name="password">പാസ്വേഡ്</string>
+    <string name="confirm_password">പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക</string>
+    <string name="show_password">പാസ്‌വേഡ് കാണിക്കുക</string>
+    <string name="new_entry">പുതിയ എൻട്രി</string>
+    <string name="add_new_entry">പുതിയ എൻട്രി ചേർക്കുക</string>
+    <string name="unlock_vault_error">നിലവറ അൺലോക്ക് ചെയ്യാനായില്ല</string>
+    <string name="unlock_vault_error_description">തെറ്റായ പാസ്‌വേഡ്. നിങ്ങളുടെ പാസ്‌വേഡ് തെറ്റായി ടൈപ്പ് ചെയ്തിട്ടില്ലെന്ന് ഉറപ്പാക്കുക.</string>
+    <string name="password_equality_error">പാസ്‌വേഡുകൾ സമാനവും ശൂന്യമല്ലാത്തതുമായിരിക്കണം</string>
+    <string name="snackbar_authentication_method">ഒരു പ്രാമാണീകരണ രീതി തിരഞ്ഞെടുക്കുക</string>
+    <string name="encrypting_vault">നിലവറ എൻക്രിപ്റ്റ് ചെയ്യുക</string>
+    <string name="exporting_vault">നിലവറ കയറ്റുമതി ചെയ്യുന്നു</string>
+    <string name="reading_file">ഫയൽ വായിക്കുന്നു</string>
+    <string name="requesting_root_access">റൂട്ട് അനുമതി അഭ്യർത്ഥിക്കുന്നു</string>
+    <string name="analyzing_qr">ക്യുആർ കോഡ് വിശകലനം ചെയ്യുന്നു</string>
+    <plurals name="added_new_entries">
+        <item quantity="one">നിലവറയിലേക്ക് %d പുതിയ എൻട്രി ചേർത്തു</item>
+        <item quantity="other">നിലവറയിലേക്ക് %d പുതിയ എൻട്രികൾ ചേർത്തു</item>
+    </plurals>
+    <string name="importing_icon_pack">ഐക്കൺ പായ്ക്ക് ഇറക്കുമതി ചെയ്യുന്നു</string>
+    <string name="delete_entry">എൻട്രി ഇല്ലാതാക്കുക</string>
+    <string name="delete_entry_description">ഈ എൻട്രി ഇല്ലാതാക്കണമെന്ന് തീർച്ചയാണോ?</string>
+    <string name="delete_entry_explanation">ഈ പ്രവർത്തനം ഇതിനായി 2FA അപ്രാപ്‌തമാക്കുന്നില്ല:\n<b>%s</b>\n\n പ്രവേശനം നഷ്‌ടപ്പെടുന്നത് തടയാൻ, നിങ്ങൾ 2FA അപ്രാപ്‌തമാക്കിയിട്ടുണ്ടെന്ന് അല്ലെങ്കിൽ ഈ സേവനത്തിനായി കോഡുകൾ സൃഷ്‌ടിക്കുന്നതിന് നിങ്ങൾക്ക് ഒരു ബദൽ മാർഗമുണ്ടെന്ന് ഉറപ്പാക്കുക.</string>
+    <string name="delete_entries">എൻട്രികൾ ഇല്ലാതാക്കുക</string>
+    <plurals name="delete_entries_description">
+        <item quantity="one">%d എൻട്രി ഇല്ലാതാക്കണമെന്ന് തീർച്ചയാണോ?</item>
+        <item quantity="other">%d എൻട്രികൾ ഇല്ലാതാക്കണമെന്ന് തീർച്ചയാണോ?</item>
+    </plurals>
+    <string name="discard_changes">മാറ്റങ്ങൾ ഉപേക്ഷിക്കുക?</string>
+    <string name="discard_changes_description">നിങ്ങളുടെ മാറ്റങ്ങൾ സംരക്ഷിച്ചിട്ടില്ല</string>
+    <string name="saving_profile_error">പ്രൊഫൈൽ സംരക്ഷിക്കുന്നതിൽ പിശക്</string>
+    <string name="saving_assign_icons_error">ഐക്കണുകൾ നൽകുന്നതിൽ പിശക്</string>
+    <string name="welcome">സ്വാഗതം</string>
+    <string name="app_description">Aegis ഒരു സൗജന്യവും സുരക്ഷിതവും ഓപ്പൺ സോഴ്‌സ് 2FA ആപ്പാണ്</string>
+    <string name="setup_completed">സജ്ജീകരണം പൂർത്തിയായി</string>
+    <string name="setup_completed_description">ഏജീസ് സജ്ജീകരിച്ചു, പോകാൻ തയ്യാറാണ്.</string>
+    <string name="vault_not_found">നിലവറ കണ്ടെത്തിയില്ല, സജ്ജീകരണം ആരംഭിക്കുന്നു…</string>
+    <string name="copied">പകർത്തി</string>
+    <string name="errors_copied">പിശകുകൾ ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി</string>
+    <string name="version_copied">പതിപ്പ് ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി</string>
+    <string name="error_occurred">ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="decryption_error">നിലവറ അൺലോക്ക് ചെയ്യാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="decryption_corrupt_error">നിലവറ അൺലോക്ക് ചെയ്യാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു. നിങ്ങളുടെ നിലവറ ഫയൽ കേടായേക്കാം.</string>
+    <string name="saving_error">നിലവറ സംരക്ഷിക്കാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="vault_init_error">നിലവറ ആരംഭിക്കാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="vault_load_error">സംഭരണത്തിൽ നിന്ന് നിലവറ ലോഡുചെയ്യാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="biometric_decrypt_error">ബയോമെട്രിക് പ്രാമാണീകരണം ഉപയോഗിച്ച് നിലവറ ഡീക്രിപ്റ്റ് ചെയ്യാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു. നിങ്ങളുടെ ഉപകരണത്തിൻ്റെ സുരക്ഷാ ക്രമീകരണങ്ങൾ മാറ്റിയാൽ മാത്രമേ ഇത് സാധാരണയായി സംഭവിക്കുകയുള്ളൂ. നിങ്ങളുടെ പാസ്‌വേഡ് ഉപയോഗിച്ച് നിലവറ അൺലോക്ക് ചെയ്യുക, എജിസിൻ്റെ ക്രമീകരണങ്ങളിൽ ബയോമെട്രിക് പ്രാമാണീകരണം പുനഃക്രമീകരിക്കുക.</string>
+    <string name="biometric_init_error">ബയോമെട്രിക് പ്രാമാണീകരണം തയ്യാറാക്കാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു. നിങ്ങളുടെ ഉപകരണത്തിൻ്റെ സുരക്ഷാ ക്രമീകരണങ്ങൾ മാറ്റിയാൽ മാത്രമേ ഇത് സാധാരണയായി സംഭവിക്കുകയുള്ളൂ. നിങ്ങളുടെ പാസ്‌വേഡ് ഉപയോഗിച്ച് നിലവറ അൺലോക്ക് ചെയ്യുക, എജിസിൻ്റെ ക്രമീകരണങ്ങളിൽ ബയോമെട്രിക് പ്രാമാണീകരണം പുനഃക്രമീകരിക്കുക.</string>
+    <string name="disable_encryption">എൻക്രിപ്ഷൻ പ്രവർത്തനരഹിതമാക്കുക</string>
+    <string name="disable_encryption_description">എൻക്രിപ്ഷൻ പ്രവർത്തനരഹിതമാക്കണമെന്ന് തീർച്ചയാണോ? ഇത് നിലവറ പ്ലെയിൻ ടെക്സ്റ്റിൽ സൂക്ഷിക്കാൻ ഇടയാക്കും. <b>യാന്ത്രിക ബാക്കപ്പുകളും പ്രവർത്തനരഹിതമാക്കും</b>.</string>
+    <string name="enable_encryption_error">എൻക്രിപ്ഷൻ പ്രവർത്തനക്ഷമമാക്കുമ്പോൾ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="disable_encryption_error">എൻക്രിപ്ഷൻ പ്രവർത്തനരഹിതമാക്കുമ്പോൾ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="backup_successful">ബാക്കപ്പ് വിജയകരമായി ഷെഡ്യൂൾ ചെയ്തു</string>
+    <string name="backup_error">ഒരു ബാക്കപ്പ് സൃഷ്ടിക്കാൻ ശ്രമിക്കുമ്പോൾ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="backup_status_success">ഏറ്റവും പുതിയ ബാക്കപ്പ് വിജയകരം: %s</string>
+    <string name="backup_status_failed">ഏറ്റവും പുതിയ ബാക്കപ്പ് പരാജയപ്പെട്ടു: %s</string>
+    <string name="backup_status_none">ഇതുവരെ ബാക്കപ്പുകളൊന്നും ഉണ്ടാക്കിയിട്ടില്ല</string>
+    <string name="backup_warning_password">സുരക്ഷാ ക്രമീകരണങ്ങളിൽ കോൺഫിഗർ ചെയ്‌തിരിക്കുന്ന ഒരു പ്രത്യേക പാസ്‌വേഡ് ഉപയോഗിച്ചാണ് ബാക്കപ്പുകൾ എൻക്രിപ്റ്റ് ചെയ്യുന്നത്</string>
+    <string name="documentsui_error">നിങ്ങളുടെ ഉപകരണത്തിൽ DocumentsUI നഷ്‌ടമായതായി തോന്നുന്നു. പ്രമാണങ്ങൾ തിരഞ്ഞെടുക്കുന്നതിനും സൃഷ്ടിക്കുന്നതിനും ആവശ്യമായ ഒരു പ്രധാന സിസ്റ്റം ഘടകമാണിത്. നിങ്ങൾ &quot;ഡീബ്ലോറ്റ്&quot; നിങ്ങളുടെ ഉപകരണം, നിങ്ങൾ അത് അബദ്ധവശാൽ ഇല്ലാതാക്കിയിരിക്കാം, അത് വീണ്ടും ഇൻസ്റ്റാൾ ചെയ്യേണ്ടിവരും.</string>
+    <string name="icon_pack_import_error">ഒരു ഐക്കൺ പായ്ക്ക് ഇറക്കുമതി ചെയ്യാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="icon_pack_import_exists_error">നിങ്ങൾ ഇറക്കുമതി ചെയ്യാൻ ശ്രമിക്കുന്ന ഐക്കൺ പായ്ക്ക് ഇതിനകം നിലവിലുണ്ട്. നിങ്ങൾക്ക് അത് തിരുത്തിയെഴുതണോ?</string>
+    <string name="icon_pack_delete_error">ഒരു ഐക്കൺ പായ്ക്ക് ഇല്ലാതാക്കാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="icon_custom">നിർദ്ദേശാനുസരണം</string>
+    <string name="permission_denied">അനുമതി നിഷേധിച്ചു</string>
+    <string name="andotp_new_format">പുതിയ ഫോർമാറ്റ് (v0.6.3 അല്ലെങ്കിൽ പുതിയത്) </string>
+    <string name="andotp_old_format">പഴയ ഫോർമാറ്റ് (v0.6.2 അല്ലെങ്കിൽ പഴയത്) </string>
+    <string name="choose_andotp_importer">andOTP ബാക്കപ്പ് ഫയലിന് ഏത് ഫോർമാറ്റാണ് ഉള്ളത്?</string>
+    <string name="choose_totpauth_importer">ഈ TOTP ഓതൻ്റിക്കേറ്റർ ബാക്കപ്പ് ഒരു പാസ്‌വേഡ് ഉപയോഗിച്ച് എൻക്രിപ്റ്റ് ചെയ്തതാണോ?</string>
+    <string name="choose_application">നിങ്ങൾ ഇറക്കുമതി ചെയ്യാൻ ആഗ്രഹിക്കുന്ന ആപ്ലിക്കേഷൻ തിരഞ്ഞെടുക്കുക</string>
+    <string name="choose_theme">നിങ്ങൾ ആഗ്രഹിക്കുന്ന തീം തിരഞ്ഞെടുക്കുക</string>
+    <string name="choose_account_name_position">നിങ്ങൾ ആഗ്രഹിക്കുന്ന അക്കൗണ്ട് പേര് സ്ഥാനം തിരഞ്ഞെടുക്കുക</string>
+    <string name="choose_view_mode">നിങ്ങൾക്ക് ആവശ്യമുള്ള വ്യൂ മോഡ് തിരഞ്ഞെടുക്കുക</string>
+    <string name="choose_copy_behavior">നിങ്ങൾ ആഗ്രഹിക്കുന്ന പകർപ്പ് സ്വഭാവം തിരഞ്ഞെടുക്കുക</string>
+    <string name="parsing_file_error">ഫയൽ പാഴ്‌സ് ചെയ്യാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="file_not_found">പിശക്: ഫയൽ കണ്ടെത്തിയില്ല</string>
+    <string name="reading_file_error">ഫയൽ വായിക്കാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="app_lookup_error">പിശക്: ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല</string>
+    <string name="app_version_error">ഇൻസ്റ്റാൾ ചെയ്ത %s-ൻ്റെ പതിപ്പ് പിന്തുണയ്ക്കുന്നില്ല. സമീപകാല പതിപ്പുകൾ ഇൻ്റേണൽ സ്റ്റോറേജ് ഡയറക്‌ടറിയിലെ ചില ഫയലുകൾ എൻക്രിപ്റ്റ് ചെയ്യാൻ തുടങ്ങി, അത് ഇറക്കുമതിക്ക് ആവശ്യമായ വിവരങ്ങൾ ആക്‌സസ് ചെയ്യാൻ Aegis-ന് കഴിയുന്നില്ല. ഇറക്കുമതി ചെയ്യാൻ ശ്രമിക്കുന്നത് ഒരു പിശകിന് കാരണമാകും. എന്തായാലും തുടരാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?</string>
+    <string name="root_error">പിശക്: റൂട്ട് ആക്സസ് നേടാനായില്ല</string>
+    <plurals name="imported_entries_count">
+        <item quantity="one">%d എൻട്രി ഇറക്കുമതി ചെയ്തു</item>
+        <item quantity="other">%d എൻട്രികൾ ഇറക്കുമതി ചെയ്തു</item>
+    </plurals>
+    <plurals name="entries_shown">
+        <item quantity="one">%d എൻട്രി കാണിക്കുന്നു</item>
+        <item quantity="other">%d എൻട്രികൾ കാണിക്കുന്നു</item>
+    </plurals>
+    <string name="intro_import_error_title">നിലവറ ഇറക്കുമതി ചെയ്യുമ്പോൾ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="import_error_title">ഇറക്കുമതി ചെയ്യുമ്പോൾ ഒന്നോ അതിലധികമോ പിശകുകൾ സംഭവിച്ചു</string>
+    <string name="exporting_vault_error">നിലവറ കയറ്റുമതി ചെയ്യാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="exported_vault">നിലവറ കയറ്റുമതി ചെയ്തു</string>
+    <string name="encryption_set_password_error">പാസ്‌വേഡ് സജ്ജീകരിക്കാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു.</string>
+    <string name="encryption_enable_biometrics_error">ബയോമെട്രിക് അൺലോക്ക് പ്രവർത്തനക്ഷമമാക്കാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു. ചില ഉപകരണങ്ങൾക്ക് ബയോമെട്രിക് പ്രാമാണീകരണത്തിൻ്റെ മോശം നിർവ്വഹണങ്ങൾ ഉണ്ട്, നിങ്ങളുടേത് അവയിലൊന്നായിരിക്കാം. പകരം പാസ്‌വേഡ് മാത്രമുള്ള കോൺഫിഗറേഷനിലേക്ക് മാറുന്നത് പരിഗണിക്കുക.</string>
+    <string name="no_cameras_available">ക്യാമറകളൊന്നും ലഭ്യമല്ല</string>
+    <string name="read_qr_error">QR കോഡ് വായിക്കാൻ ശ്രമിക്കുന്നതിനിടെ ഒരു പിശക് സംഭവിച്ചു</string>
+    <string name="read_qr_error_phonefactor">മൈക്രോസോഫ്റ്റിൻ്റെ ഉടമസ്ഥതയിലുള്ള 2FA അൽഗോരിതവുമായി ഏജിസ് പൊരുത്തപ്പെടുന്നില്ല. ഓഫീസ് 365-ൽ 2FA കോൺഫിഗർ ചെയ്യുമ്പോൾ \"അറിയിപ്പുകളില്ലാതെ ആപ്ലിക്കേഷൻ സജ്ജീകരിക്കുക\" എന്നത് തിരഞ്ഞെടുക്കുന്നത് ഉറപ്പാക്കുക.</string>
+    <string name="partial_google_auth_import">അപൂർണ്ണമായ Google Authenticator കയറ്റുമതി കണ്ടെത്തി</string>
+    <string name="partial_google_auth_import_warning">നിങ്ങളുടെ ഇമ്പോർട്ടിൽ ചില QR കോഡുകൾ കാണുന്നില്ല. ഇനിപ്പറയുന്ന കോഡുകൾ കണ്ടെത്തിയില്ല:\n\n<b>%s</b>\n\nനിങ്ങൾക്ക് ഈ ഭാഗിക കയറ്റുമതി ഇമ്പോർട്ടുചെയ്യുന്നത് തുടരാം, എന്നാൽ എല്ലാ QR കോഡുകളും ഉപയോഗിച്ച് വീണ്ടും ശ്രമിക്കാൻ ഞങ്ങൾ ശുപാർശ ചെയ്യുന്നു, അതിനാൽ നിങ്ങൾക്ക് ആക്‌സസ് നഷ്‌ടമാകില്ല ടോക്കണുകൾ.</string>
+    <string name="missing_qr_code_descriptor">• QR കോഡ് %d</string>
+    <string name="import_google_auth_failure">Google Authenticator കയറ്റുമതി ഇമ്പോർട്ടുചെയ്യുന്നത് പരാജയപ്പെട്ടു</string>
+    <string name="unrelated_google_auth_batches_error">കയറ്റുമതിയിൽ ബന്ധമില്ലാത്ത ഒരു ബാച്ചിനുള്ള വിവരങ്ങൾ അടങ്ങിയിരിക്കുന്നു. ഒരു സമയം 1 ബാച്ച് ഇറക്കുമതി ചെയ്യാൻ ശ്രമിക്കുക.</string>
+    <string name="no_tokens_can_be_imported">തൽഫലമായി ടോക്കണുകളൊന്നും ഇറക്കുമതി ചെയ്യാൻ കഴിയില്ല</string>
+    <string name="unlocking_vault">നിലവറ അൺലോക്ക് ചെയ്യുന്നു</string>
+    <string name="remove_group">ഗ്രൂപ്പ് നീക്കം ചെയ്യുക</string>
+    <string name="remove_group_description">ഈ ഗ്രൂപ്പ് നീക്കം ചെയ്യണമെന്ന് തീർച്ചയാണോ? ഈ ഗ്രൂപ്പിലെ എൻട്രികൾ സ്വയമേവ \'ഗ്രൂപ്പില്ല\' എന്നതിലേക്ക് മാറും.</string>
+    <string name="remove_unused_groups">ഉപയോഗിക്കാത്ത ഗ്രൂപ്പുകൾ ഇല്ലാതാക്കുക</string>
+    <string name="remove_unused_groups_description">ഒരു എൻട്രിയിൽ അസൈൻ ചെയ്യാത്ത എല്ലാ ഗ്രൂപ്പുകളും ഇല്ലാതാക്കണമെന്ന് തീർച്ചയാണോ?</string>
+    <string name="remove_icon_pack">ഐക്കൺ പായ്ക്ക് നീക്കം ചെയ്യുക</string>
+    <string name="remove_icon_pack_description">ഈ ഐക്കൺ പായ്ക്ക് നീക്കം ചെയ്യണമെന്ന് തീർച്ചയാണോ? ഈ പാക്കിൽ നിന്നുള്ള ഐക്കണുകൾ ഉപയോഗിക്കുന്ന എൻട്രികളെ ബാധിക്കില്ല.</string>
+    <string name="details">വിശദാംശങ്ങൾ</string>
+    <string name="show_error_details">പിശക് വിശദാംശങ്ങൾ കാണിക്കുക</string>
+    <string name="lock">പൂട്ടുക</string>
+    <string name="name">പേര്</string>
+    <string name="no_group">ഗ്രൂപ്പില്ല</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">അടുക്കുക</string>
+    <string name="sort_alphabetically">പ്രസാധകർ (A മുതൽ Z വരെ)</string>
+    <string name="sort_alphabetically_reverse">പ്രസാധകർ (Z മുതൽ A വരെ)</string>
+    <string name="sort_alphabetically_name">അക്കൗണ്ട് (A മുതൽ Z വരെ)</string>
+    <string name="sort_alphabetically_name_reverse">അക്കൗണ്ട് (Z മുതൽ A വരെ)</string>
+    <string name="sort_usage_count">ഉപയോഗ എണ്ണം</string>
+    <string name="sort_last_used">അവസാനം ഉപയോഗിച്ചത്</string>
+    <string name="sort_custom">നിർദ്ദേശാനുസരണം</string>
+    <string name="last_used">അവസാനം ഉപയോഗിച്ചത്</string>
+    <string name="last_used_never">ഒരിക്കലും</string>
+    <string name="new_group">പുതിയ ഗ്രൂപ്പ്…</string>
+    <string name="group">ഗ്രൂപ്പ്</string>
+    <string name="group_name_hint">ഗ്രൂപ്പിന്റെ പേര്</string>
+    <string name="preference_manage_groups">ഗ്രൂപ്പ് എഡിറ്റ് ചെയ്യുക</string>
+    <string name="preference_manage_groups_summary">ഇവിടെ നിങ്ങളുടെ ഗ്രൂപ്പുകൾ മാനേജ് ചെയ്യുക, ഇല്ലാതാക്കുക</string>
+    <string name="preference_reset_usage_count">ഉപയോഗ എണ്ണം പുനഃസജ്ജമാക്കുക</string>
+    <string name="preference_reset_usage_count_summary">നിങ്ങളുടെ നിലവറയിലെ ഓരോ എൻട്രിയുടെയും ഉപയോഗ എണ്ണം പുനഃസജ്ജമാക്കുക</string>
+    <string name="preference_reset_usage_count_dialog">നിങ്ങളുടെ നിലവറയിലെ എല്ലാ എൻട്രികളുടെയും ഉപയോഗ എണ്ണം 0 ആയി സജ്ജീകരിക്കണമെന്ന് തീർച്ചയാണോ?</string>
+    <string name="note" comment="Users can add a note to an entry">കുറിപ്പ്</string>
+    <string name="clear">മായ്ക്കുക</string>
+    <string name="pref_highlight_entry_title">ടാപ്പുചെയ്യുമ്പോൾ ടോക്കണുകൾ ഹൈലൈറ്റ് ചെയ്യുക</string>
+    <string name="pref_highlight_entry_summary">ടാപ്പുചെയ്യുമ്പോൾ താൽക്കാലികമായി ഹൈലൈറ്റ് ചെയ്തുകൊണ്ട് പരസ്പരം വേർതിരിച്ചറിയാൻ ടോക്കണുകൾ എളുപ്പമാക്കുക</string>
+    <string name="pref_minimize_on_copy_title">പകർപ്പിൽ ചെറുതാക്കുക</string>
+    <string name="pref_minimize_on_copy_summary">ഒരു ടോക്കൺ പകർത്തിയ ശേഷം ആപ്പ് ചെറുതാക്കുക</string>
+    <string name="pref_copy_behavior_title">ക്ലിപ്പ്ബോർഡിലേക്ക് ടോക്കണുകൾ പകർത്തുക</string>
+    <string name="pref_pause_entry_title">ടാപ്പുചെയ്യുമ്പോൾ ടോക്കണുകൾ ഫ്രീസ് ചെയ്യുക</string>
+    <string name="pref_pause_entry_summary">ടോക്കണുകൾ ടാപ്പുചെയ്യുന്നതിലൂടെ അവയുടെ യാന്ത്രിക പുതുക്കൽ താൽക്കാലികമായി നിർത്തുക. ടോക്കണുകൾ ഫോക്കസ് ചെയ്തിരിക്കുന്നിടത്തോളം കാലം അവ അപ്‌ഡേറ്റ് ചെയ്യില്ല. \"ടാപ്പുചെയ്യുമ്പോൾ ടോക്കണുകൾ ഹൈലൈറ്റ് ചെയ്യുക\" അല്ലെങ്കിൽ \"വെളിപ്പെടുത്താൻ ടാപ്പ് ചെയ്യുക\" ആവശ്യമാണ്.</string>
+    <string name="pin_keyboard_description">പിൻ കീബോർഡ് പ്രവർത്തനക്ഷമമാക്കാൻ നിങ്ങളുടെ പാസ്‌വേഡ് നൽകുക. നിങ്ങളുടെ പാസ്‌വേഡിൽ അക്കങ്ങൾ മാത്രം അടങ്ങിയിട്ടുണ്ടെങ്കിൽ മാത്രമേ ഇത് പ്രവർത്തിക്കൂ എന്നത് ശ്രദ്ധിക്കുക</string>
+    <string name="pin_keyboard_error">പിൻ കീബോർഡ് പ്രവർത്തനക്ഷമമാക്കുന്നതിൽ പിശക്</string>
+    <string name="pin_keyboard_error_description">പിൻ കീബോർഡ് സജ്ജീകരിക്കാൻ സാധ്യമല്ല. നിങ്ങളുടെ പാസ്‌വേഡിൽ അക്കങ്ങൾ മാത്രമേ ഉണ്ടാകാവൂ.</string>
+    <string name="pin_keyboard_disabled">പാസ്‌വേഡ് മാറ്റി. പിൻ കീബോർഡ് ഇനി കാണിക്കില്ല.</string>
+    <string name="selected">തിരഞ്ഞെടുത്തു</string>
+    <string name="dark_theme_title">ഇരുണ്ട തീം</string>
+    <string name="light_theme_title">ലൈറ്റ് തീം</string>
+    <string name="amoled_theme_title">AMOLED തീം</string>
+    <string name="system_theme_title">ബാറ്ററി സേവർ സജ്ജമാക്കിയത്</string>
+    <string name="system_amoled_theme_title">ബാറ്ററി സേവർ സജ്ജമാക്കിയത് (AMOLED)</string>
+    <string name="normal_viewmode_title">സാധാരണ</string>
+    <string name="compact_mode_title">ഒതുക്കമുള്ളത്</string>
+    <string name="small_mode_title">ചെറുത്</string>
+    <string name="tiles_mode_title">ടൈലുകൾ</string>
+    <string name="unknown_issuer">അജ്ഞാത പ്രസാധകൻ</string>
+    <string name="unknown_account_name">അജ്ഞാത അക്കൗണ്ട് പേര്</string>
+    <plurals name="import_error_dialog">
+        <item quantity="one">ഏജിസിന് %d ടോക്കൺ ഇറക്കുമതി ചെയ്യാൻ കഴിഞ്ഞില്ല. ഈ ടോക്കൺ ഒഴിവാക്കപ്പെടും. പിശകിനെക്കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾ കാണുന്നതിന് \'വിശദാംശങ്ങൾ\' അമർത്തുക.</item>
+        <item quantity="other">ഏജിസിന് %d ടോക്കണുകൾ ഇറക്കുമതി ചെയ്യാൻ കഴിഞ്ഞില്ല. ഈ ടോക്കണുകൾ ഒഴിവാക്കപ്പെടും. പിശകുകളെക്കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾ കാണുന്നതിന് \'വിശദാംശങ്ങൾ\' അമർത്തുക.</item>
+    </plurals>
+    <string name="unable_to_process_deeplink">ആഴത്തിലുള്ള ലിങ്ക് പ്രോസസ്സ് ചെയ്യാനായില്ല</string>
+    <string name="unable_to_read_qrcode_file">ഫയലിൽ നിന്ന് ക്യുആർ കോഡ് വായിക്കാനും പ്രോസസ്സ് ചെയ്യാനും കഴിയുന്നില്ല: %s.</string>
+    <string name="unable_to_process_shared_text">പങ്കിട്ട ടെക്‌സ്‌റ്റ് OTP ആയി പ്രോസസ്സ് ചെയ്യാൻ കഴിയുന്നില്ല</string>
+    <string name="unable_to_generate_qrcode">QR കോഡ് സൃഷ്‌ടിക്കാനായില്ല</string>
+    <string name="select_picture">ചിത്രം തിരഞ്ഞെടുക്കുക</string>
+    <string name="select_icon">ഐക്കൺ തിരഞ്ഞെടുക്കുക</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">നിലവറ തുറക്കുക</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">സ്കാനർ തുറക്കുക</string>
+    <string name="toggle_checkboxes">ചെക്ക്ബോക്സുകൾ ടോഗിൾ ചെയ്യുക</string>
+    <string name="search">തിരയുക</string>
+    <string name="channel_name_lock_status">ലോക്ക് നില</string>
+    <string name="channel_description_lock_status">നിലവറ പൂട്ടിയിരിക്കുമ്പോൾ നിങ്ങളെ അറിയിക്കാൻ ഏജിസിന് സ്ഥിരമായ ഒരു അറിയിപ്പ് സൃഷ്ടിക്കാൻ കഴിയും</string>
+    <string name="vault_unlocked_state">നിലവറ അൺലോക്ക് ചെയ്തു. ലോക്ക് ചെയ്യാൻ ഇവിടെ ടാപ്പ് ചെയ്യുക.</string>
+    <string name="version">പതിപ്പ്</string>
+    <string name="changelog">ചേഞ്ച്ലോഗ്</string>
+    <string name="whats_new">പുതിയതെന്താണ്</string>
+    <string name="github_description">കോഡ്, പ്രശ്നങ്ങൾ, വിവരങ്ങൾ</string>
+    <string name="license">ലൈസൻസ്</string>
+    <string name="license_description">GPLv3 പ്രകാരം Aegis Authenticator ലൈസൻസ് ചെയ്തിട്ടുണ്ട്</string>
+    <string name="third_party_licenses">മൂന്നാം കക്ഷി ലൈസൻസുകൾ</string>
+    <string name="third_party_licenses_description">ഏജിസ് ഉപയോഗിക്കുന്ന മൂന്നാം കക്ഷി ലൈബ്രറികളുടെ ലൈസൻസുകൾ</string>
+    <string name="country_netherlands">നെതർലാൻഡ്സ്</string>
+    <string name="email_us">ഒരു ഇ - മെയിൽ എഴുതുക</string>
+    <string name="visit_website">ഞങ്ങളുടെ വെബ്സൈറ്റ് സന്ദർശിക്കുക</string>
+    <string name="about_support">പിന്തുണ</string>
+    <string name="support_rate">നിരക്ക്</string>
+    <string name="support_rate_description">Google Play Store-ൽ ഒരു അവലോകനം നൽകി ഞങ്ങളെ പിന്തുണയ്ക്കുക</string>
+    <string name="webview_error">ഈ ഉപകരണം വെബ് കാഴ്‌ചയെ പിന്തുണയ്‌ക്കുന്നില്ല, ഇത് ചേഞ്ച്‌ലോഗും ലൈസൻസും കാണുന്നതിന് ആവശ്യമാണ്. ഇതിന് ഒരു സിസ്റ്റം ഘടകം നഷ്‌ടമായിരിക്കുന്നു.</string>
+    <string name="email">ഇമെയിൽ</string>
+    <string name="time_sync_warning_title">യാന്ത്രിക സമന്വയം</string>
+    <string name="time_sync_warning_message">ശരിയായ കോഡുകൾ സൃഷ്‌ടിക്കുന്നതിന് ഏജിസ് സിസ്റ്റം സമയത്തെ ആശ്രയിക്കുന്നു. കുറച്ച് സെക്കൻ്റുകൾ മാത്രം വ്യതിചലിക്കുന്നത് തെറ്റായ കോഡുകൾക്ക് കാരണമായേക്കാം. സമയം സ്വയമേവ സമന്വയിപ്പിക്കുന്നതിന് നിങ്ങളുടെ ഉപകരണം കോൺഫിഗർ ചെയ്തിട്ടില്ലെന്ന് തോന്നുന്നു. ഇപ്പോൾ അങ്ങനെ ചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?</string>
+    <string name="time_sync_warning_disable">എനിക്ക് മുന്നറിയിപ്പ് നൽകുന്നത് നിർത്തുക. ഞാൻ എന്താണ് ചെയ്യുന്നതെന്ന് എനിക്കറിയാം.</string>
+    <string name="google_qr_export_unrelated">ബന്ധമില്ലാത്ത QR കോഡ് കണ്ടെത്തി. സ്കാനർ പുനരാരംഭിക്കാൻ ശ്രമിക്കുക.</string>
+    <string name="backup_error_bar_message"><b>വോൾട്ട് ബാക്കപ്പ് അടുത്തിടെ പരാജയപ്പെട്ടു</b></string>
+    <string name="backup_system_builtin">ഏജീസ നിർമ്മിച്ചിരിക്കുന്നത് ഓട്ടോമാറ്റിക് ബാക്കപ്പുകൾ</string>
+    <string name="backup_system_android">ആൻഡ്രോയിഡ് ക്ലൗഡ് ബാക്കപ്പ് സിസ്റ്റം</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">         ഏറ്റവും പുതിയ ബാക്കപ്പ് കാലഹരണപ്പെട്ടതാണ് (%s)
+    </string>
+    <string name="backup_reminder_bar_message">         മാറ്റങ്ങൾ ബാക്കപ്പ് ചെയ്തിട്ടില്ല
+    </string>
+    <string name="backup_reminder_bar_dialog_title">മാറ്റങ്ങൾ ബാക്കപ്പ് ചെയ്തിട്ടില്ല</string>
+    <string name="backup_reminder_bar_dialog_summary">നിലവറയിലെ സമീപകാല മാറ്റങ്ങൾ ഇതുവരെ ബാക്കപ്പ് ചെയ്തിട്ടില്ല. നിങ്ങളുടെ അക്കൗണ്ടുകളിലേക്കുള്ള ആക്‌സസ് നഷ്‌ടപ്പെടുന്നത് തടയാൻ പതിവായി ബാക്കപ്പുകൾ എടുക്കേണ്ടത് പ്രധാനമാണ്. ക്രമീകരണ മെനുവിൽ സ്വയമേവയുള്ള ബാക്കപ്പുകൾ സജ്ജീകരിക്കുന്നത് പരിഗണിക്കുക.    </string>
+    <string name="backup_reminder_bar_dialog_accept">ബാക്കപ്പുകൾ സജ്ജീകരിക്കുക</string>
+    <string name="backup_plaintext_export_warning"><b>നിലവറ അടുത്തിടെ പ്ലെയിൻ ടെക്‌സ്‌റ്റിൽ കയറ്റുമതി ചെയ്‌തു</b></string>
+    <string name="pref_show_plaintext_warning_hint">ഈ മുന്നറിയിപ്പ് വീണ്ടും കാണിക്കരുത്</string>
+    <string name="backup_plaintext_warning_explanation">നിങ്ങൾ അടുത്തിടെ നിലവറയുടെ എൻക്രിപ്റ്റ് ചെയ്യാത്ത ഒരു പകർപ്പ് കയറ്റുമതി ചെയ്തതിനാലാണ് ഈ മുന്നറിയിപ്പ് കാണിക്കുന്നത്. നിങ്ങളുടെ ടോക്കണുകളുടെ സുരക്ഷ നിലനിർത്താൻ, ഈ ഫയൽ ആവശ്യമില്ലെങ്കിൽ അത് ഇല്ലാതാക്കാൻ ഞങ്ങൾ ശുപാർശ ചെയ്യുന്നു.</string>
+    <string name="switch_camera">ക്യാമറ മാറുക</string>
+    <string name="empty_list">കാണിക്കാൻ കോഡുകളൊന്നുമില്ല. ചുവടെ വലത് കോണിലുള്ള പ്ലസ് ചിഹ്നത്തിൽ ടാപ്പുചെയ്‌ത് എൻട്രികൾ ചേർക്കുന്നത് ആരംഭിക്കുക</string>
+    <string name="empty_list_title">എൻട്രികളൊന്നും കണ്ടെത്തിയില്ല</string>
+    <string name="empty_group_list">കാണിക്കാൻ ഗ്രൂപ്പുകളൊന്നുമില്ല. ഒരു എൻട്രിയുടെ എഡിറ്റ് സ്ക്രീനിൽ ഗ്രൂപ്പുകൾ ചേർക്കുക</string>
+    <string name="empty_group_list_title">ഗ്രൂപ്പുകളൊന്നും കണ്ടെത്തിയില്ല</string>
+    <string name="no_icon_packs">ഐക്കൺ പാക്കുകളൊന്നും ഇതുവരെ ഇറക്കുമതി ചെയ്തിട്ടില്ല. ഒരെണ്ണം ഇറക്കുമതി ചെയ്യാൻ പ്ലസ് ചിഹ്നത്തിൽ ടാപ്പ് ചെയ്യുക. നുറുങ്ങ്: <a href="https://aegis-icons.github.io">aegis-icons</a> പരീക്ഷിക്കുക.</string>
+    <string name="no_icon_packs_title">ഐക്കൺ പായ്ക്കുകളൊന്നുമില്ല</string>
+    <string name="pick_icon">ഒരു ഐക്കൺ തിരഞ്ഞെടുക്കുക</string>
+    <string name="uncategorized">വർഗ്ഗീകരിക്കാത്തത്</string>
+    <string name="done">ചെയ്‌തു</string>
+    <plurals name="qr_count">
+        <item quantity="one">%d / %d QR കോഡ്</item>
+        <item quantity="other">%d / %d QR കോഡുകൾ</item>
+    </plurals>
+    <string name="next">അടുത്തത്</string>
+    <string name="previous">മുമ്പത്തെ</string>
+    <string name="copy_uri">URI പകർത്തുക</string>
+    <string name="unable_to_copy_uri_to_clipboard">URI ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്താനായില്ല</string>
+    <string name="uri_copied_to_clipboard">URI ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി</string>
+    <string name="transfer_entry_description">നിങ്ങൾ ഈ എൻട്രി കൈമാറാൻ ആഗ്രഹിക്കുന്ന ഓതൻ്റിക്കേറ്റർ ആപ്പ് ഉപയോഗിച്ച് ഈ QR കോഡ് സ്കാൻ ചെയ്യുക</string>
+    <string name="password_strength_very_weak">വളരെ ദുർബലമായ</string>
+    <string name="password_strength_weak">ദുർബലമായ</string>
+    <string name="password_strength_fair">മേള</string>
+    <string name="password_strength_good">നല്ലത്</string>
+    <string name="password_strength_strong">ശക്തമായത്</string>
+    <string name="password_strength_unknown">ശക്തി വിശകലനത്തിന് പാസ്‌വേഡ് ദൈർഘ്യമേറിയതാണ്</string>
+    <string name="pref_pin_keyboard_title">ലോക്ക് സ്ക്രീനിൽ പിൻ കീബോർഡ് ഉപയോഗിക്കുക</string>
+    <string name="pref_pin_keyboard_summary">ലോക്ക് സ്‌ക്രീനിൽ പിൻ കീബോർഡ് പ്രവർത്തനക്ഷമമാക്കണമെങ്കിൽ ഇത് പ്രവർത്തനക്ഷമമാക്കുക. ഇത് സംഖ്യാ പാസ്വേഡുകൾക്ക് മാത്രമേ പ്രവർത്തിക്കൂ</string>
+    <string name="title_activity_preferences">ക്രമീകരണങ്ങള്‍</string>
+    <string name="title_activity_manage_groups">ഗ്രൂപ്പുകൾ നിയന്ത്രിക്കുക</string>
+    <string name="title_activity_transfer">ഗ്രൂപ്പുകൾ നിയന്ത്രിക്കുക</string>
+    <string name="title_activity_about">കുറിച്ച്‌</string>
+    <string name="title_activity_edit_entry">എൻട്രി എഡിറ്റ് ചെയ്യുക</string>
+    <string name="title_activity_scan_qr">ഒരു QR കോഡ് സ്കാൻ ചെയ്യുക</string>
+    <string name="title_activity_import_entries">എൻട്രികൾ ഇറക്കുമതി ചെയ്യുക</string>
+    <string name="title_activity_assign_icons">ഐക്കണുകൾ അസൈൻ ചെയ്യുക</string>
+    <string name="title_activity_licenses">മൂന്നാം കക്ഷി ലൈസൻസുകൾ</string>
+    <string name="dialog_wipe_entries_title">എൻട്രികൾ മായ്‌ക്കുക</string>
+    <string name="dialog_wipe_entries_message">നിങ്ങളുടെ നിലവറയിൽ ഇതിനകം എൻട്രികൾ അടങ്ങിയിരിക്കുന്നു. ഈ ഫയൽ ഇറക്കുമതി ചെയ്യുന്നതിന് മുമ്പ് നിങ്ങൾക്ക് ഈ എൻട്രികൾ നീക്കം ചെയ്യണോ?\n\n<b>അങ്ങനെ ചെയ്യുമ്പോൾ, നിലവറയിലെ നിലവിലുള്ള എൻട്രികളിലേക്കുള്ള ആക്സസ് നിങ്ങൾക്ക് ശാശ്വതമായി നഷ്‌ടമാകും.</b></string>
+    <string name="dialog_wipe_entries_checkbox">നിലവറയിലെ ഉള്ളടക്കങ്ങൾ മായ്‌ക്കുക</string>
+    <string name="panic_trigger_ignore_toast">എജിസിന് പാനിക് ട്രിഗർ ലഭിച്ചു, പക്ഷേ അവഗണിച്ച് ക്രമീകരണം പ്രവർത്തനരഹിതമാക്കി</string>
+    <string name="pref_panic_trigger_title">പാനിക് ട്രിഗറിൽ നിലവറ ഇല്ലാതാക്കുക</string>
+    <string name="pref_panic_trigger_summary">റിപ്പിളിൽ നിന്ന് ഒരു പാനിക് ട്രിഗർ ലഭിക്കുമ്പോൾ നിലവറ ഇല്ലാതാക്കുക</string>
+    <string name="import_vault">ഏജിസ് നിലവറ ഇറക്കുമതി ചെയ്യുക</string>
+    <string name="import_vault_hint">മറ്റൊരു 2FA ആപ്പിൽ നിന്ന് ഇറക്കുമതി ചെയ്യണോ? ആദ്യം സജ്ജീകരണം പൂർത്തിയാക്കുക, തുടർന്ന് ക്രമീകരണ മെനുവിലേക്ക് പോകുക.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d സാധ്യതയുള്ള ഡ്യൂപ്ലിക്കേറ്റ് അൺചെക്ക് ചെയ്‌തു. എൻട്രികളുടെ ലിസ്റ്റ് അവലോകനം ചെയ്യുക.</item>
+        <item quantity="other">%d സാധ്യതയുള്ള ഡ്യൂപ്ലിക്കേറ്റുകൾ അൺചെക്ക് ചെയ്തു. എൻട്രികളുടെ ലിസ്റ്റ് അവലോകനം ചെയ്യുക.</item>
+    </plurals>
+    <string name="importer_help_2fas">ഒരു 2FAS ഓതൻ്റിക്കേറ്റർ ബാക്കപ്പ് ഫയൽ നൽകുക.</string>
+    <string name="importer_help_aegis">ഒരു എജിസ് കയറ്റുമതി/ബാക്കപ്പ് ഫയൽ നൽകുക.</string>
+    <string name="importer_help_andotp">ഒരു andOTP കയറ്റുമതി/ബാക്കപ്പ് ഫയൽ നൽകുക.</string>
+    <string name="importer_help_bitwarden">ഒരു ബിറ്റ്വാർഡൻ കയറ്റുമതി/ബാക്കപ്പ് ഫയൽ നൽകുക. എൻക്രിപ്റ്റ് ചെയ്ത ഫയലുകൾ പിന്തുണയ്ക്കുന്നില്ല.</string>
+    <string name="importer_help_freeotp_plus">ഒരു FreeOTP+ കയറ്റുമതി ഫയൽ നൽകുക.</string>
+    <string name="importer_help_totp_authenticator">ഒരു TOTP ഓതൻ്റിക്കേറ്റർ കയറ്റുമതി ഫയൽ നൽകുക.</string>
+    <string name="importer_help_winauth">ഒരു WinAuth കയറ്റുമതി ഫയൽ നൽകുക.</string>
+    <string name="import_assign_icons_dialog_title">ഐക്കണുകൾ അസൈൻ ചെയ്യുക</string>
+    <string name="import_assign_icons_dialog_text">ഇറക്കുമതി ചെയ്ത എൻട്രികൾക്ക് ഐക്കണുകൾ നൽകണോ?</string>
+    <string name="importer_encrypted_exception_google_authenticator">എൻക്രിപ്റ്റ് ചെയ്ത എൻട്രി ഒഴിവാക്കി: %s</string>
+    <string name="importer_help_direct">%s-ൽ നിന്ന് നേരിട്ട് എൻട്രികൾ ഇറക്കുമതി ചെയ്യുക. ഇതിന് ഈ ഉപകരണത്തിൽ ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്യുകയും റൂട്ട് ആക്‌സസ്സ് Aegis-ന് നൽകുകയും വേണം.</string>
+    <string name="groups">ഗ്രൂപ്പുകൾ</string>
+    <string name="pref_focus_search">ആപ്പ് ആരംഭത്തിൽ സെർച്ച് ഫോക്കസ് ചെയ്യുക</string>
+    <string name="pref_focus_search_summary">ആപ്പ് തുറന്ന ഉടനെ സെർച്ചിൽ ഫോക്കസ് ചെയ്യുക.</string>
+    <string name="pref_grouping_halves">പകുതി</string>
+    <string name="pref_grouping_none">ഗ്രൂപ്പിംഗ് ഇല്ല</string>
+    <string name="pref_grouping_size_two">രണ്ടു പേരുടെ ഗ്രൂപ്പുകൾ</string>
+    <string name="pref_grouping_size_three">മൂന്ന് പേരടങ്ങുന്ന ഗ്രൂപ്പുകൾ</string>
+    <string name="pref_grouping_size_four">നാലംഗ സംഘങ്ങൾ</string>
+    <string name="pref_copy_behavior_never">ഒരിക്കലും പകർത്തരുത്</string>
+    <string name="pref_copy_behavior_single_tap">ഒറ്റ ടാപ്പ്</string>
+    <string name="pref_copy_behavior_double_tap">രണ്ടുതവണ ടാപ്പ് ചെയ്യുക</string>
+    <string name="pref_account_name_position_hidden">മറച്ചിരിക്കുന്നു</string>
+    <string name="pref_account_name_position_end">പ്രസാധകൻ്റെ അടുത്ത്</string>
+    <string name="pref_account_name_position_below">പ്രസാധകൻ്റെ താഴെ</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="one">%d സെക്കൻഡ് മുമ്പ്</item>
+        <item quantity="other">%d സെക്കൻ്റുകൾ മുമ്പ്</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">%d മിനിറ്റ് മുമ്പ്</item>
+        <item quantity="other">%d മിനിറ്റ് മുമ്പ്</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="one">%d മണിക്കൂർ മുമ്പ്</item>
+        <item quantity="other">%d മണിക്കൂറുകള്ക്ക് മുന്പ്</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="one">%d ദിവസം മുമ്പ്</item>
+        <item quantity="other">%d ദിവസങ്ങൾക്ക് മുൻപ്</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="one">%d വർഷം മുമ്പ്</item>
+        <item quantity="other">%d വർഷങ്ങൾക്ക് മുമ്പ്</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="one">%d തിരഞ്ഞെടുത്ത ഇനം</item>
+        <item quantity="other">%d തിരഞ്ഞെടുത്ത ഇനങ്ങൾ</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-nb-rNO-v29/strings.xml b/app/src/main/res/values-nb-rNO-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-nb-rNO-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
new file mode 100644
index 00000000..4395061c
--- /dev/null
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -0,0 +1,505 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="action_settings">Innstillinger</string>
+    <string name="action_about">Om</string>
+    <string name="action_delete">Slett</string>
+    <string name="action_transfer">Overfør</string>
+    <string name="action_edit_icon">Endre ikon</string>
+    <string name="action_reset_usage_count">Tilbakestill bruksfrekvens</string>
+    <string name="action_reset_usage_count_dialog">Er du sikker på at du vil nullstille bruksfrekvensen til denne oppføringen?</string>
+    <string name="action_default_icon">Gjenopprett standardikon</string>
+    <string name="discard">Forkast</string>
+    <string name="save">Lagre</string>
+    <string name="all">Alle</string>
+    <string name="issuer">Utsteder</string>
+    <string name="yandex_pin">PIN (4-16 sifre)</string>
+    <string name="motp_pin">PIN (4 sifre)</string>
+    <string name="suggested">Foreslått</string>
+    <string name="usage_count">Bruksfrekvens</string>
+    <string name="warning">Advarsel</string>
+    <string name="pref_cat_appearance_app">App</string>
+    <string name="pref_cat_appearance_entries">Oppføringer</string>
+    <string name="pref_cat_backups_android">Android</string>
+    <string name="pref_cat_backups_auto">Automatisk sikkerhetskopiering</string>
+    <string name="pref_section_behavior_title">Oppførsel</string>
+    <string name="pref_section_behavior_summary">Tilpass oppførselen når du samhandler med oppføringslisten.</string>
+    <string name="pref_section_appearance_title">Utseende</string>
+    <string name="pref_section_appearance_summary">Tilpass tema, språk og andre innstillinger som påvirker utseende til appen.</string>
+    <string name="pref_section_security_title">Sikkerhet</string>
+    <string name="pref_section_security_summary">Konfigurer kryptering, biometrisk opplåsing, automatisk låsing og andre sikkerhetsinnstillinger.</string>
+    <string name="pref_section_import_export_title">Import &amp; Eksport</string>
+    <string name="pref_section_import_export_summary">Importer sikkerhetskopier av Aegis eller andre autentiseringsapper. Opprett en manuell eksport av Aegis-hvelvet ditt.</string>
+    <string name="pref_section_audit_log_title">Revisjonslogg</string>
+    <string name="pref_section_audit_log_summary">Finn en liste over alle rapporterte viktige hendelser i appen.</string>
+    <string name="pref_section_backups_title">Sikkerhetskopier</string>
+    <string name="pref_section_backups_summary">Sett opp automatiske sikkerhetskopier til en egenvalgt plassering, eller aktiver lagring via Android-sikkerhetskopiering i skyen.</string>
+    <string name="pref_section_icon_packs">Ikonpakker</string>
+    <string name="pref_section_icon_packs_summary">Behandle og importer ikonpakker</string>
+    <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Dynamiske farger</string>
+    <string name="pref_dynamic_colors_summary">Tilpass appens farger basert på Android-temaet</string>
+    <string name="pref_view_mode_title">Visningsmodus</string>
+    <string name="pref_lang_title">Språk</string>
+    <string name="pref_show_icons_title">Vis ikoner</string>
+    <string name="pref_show_icons_summary">Vis ikoner ved sidden av hver oppføring</string>
+    <string name="pref_code_group_size_title">Gruppering av kodesifre</string>
+    <string name="pref_code_group_size_summary">Velg antall sifre å gruppere kodene etter</string>
+    <string name="pref_account_name_position_title">Vis brukernavnet</string>
+    <string name="pref_show_next_code_title">Vis neste kode</string>
+    <string name="pref_show_next_code_summary">Generer og vis neste kode på forhånd</string>
+    <string name="pref_expiration_state_title">Indiker når koder er i ferd med å utløpe</string>
+    <string name="pref_expiration_state_summary">Endre farge på koder og få dem til å blinke når de er i ferd med å utløpe</string>
+    <string name="pref_expiration_state_fallback">Endre farge på koder når de er i ferd med å utløpe</string>
+    <string name="pref_shared_issuer_account_name_title">Bare vis brukernavn ved behov</string>
+    <string name="pref_shared_issuer_account_name_summary">Vis kun brukernavn hvis oppføringene har felles utsteder. Andre brukernavn vil være skjult.</string>
+    <string name="pref_account_name_position_summary_override">Denne innstillingen blir overstyrt av visningsmodusen «Fliser». Kontonavn vil vises under utstederen.</string>
+    <string name="pref_import_file_title">Importer fra fil</string>
+    <string name="pref_import_file_summary">Importer nøkler fra en fil</string>
+    <string name="pref_android_backups_title">Android-sikkerhetskopiering i skyen</string>
+    <string name="pref_android_backups_summary">Tillat at Android-sikkerhetskopiering i skyen inkluderer Aegis-hvelvet i sine sikkerhetskopier. Dette støttes kun for krypterte hvelv.</string>
+    <string name="pref_android_backups_hint"><i>Enhet-til-enhet (D2D) sikkerhetskopiering er alltid tillat, uavhengig av innstillingene over</i></string>
+    <string name="pref_backups_title">Sikkerhetskopier hvelvet automatisk</string>
+    <string name="pref_backups_summary">Opprett sikkerhetskopier av hvelvet automatisk på ekstern lagringsenhet når noe endres. Gjelder bare for krypterte hvelv.</string>
+    <string name="pref_backups_reminder_title">Påminnelse om sikkerhetskopiering</string>
+    <string name="pref_backups_reminder_summary">Vis en påminnelse om å ta en sikkerhetskopi av hvelvet hvis du ikke har sikkerhetskopiert de nyeste endringene.</string>
+    <string name="pref_backups_reminder_dialog_title">Skru av varsler om sikkerhetskopiering</string>
+    <string name="pref_backups_reminder_dialog_summary">Ved å skru av disse varslene vil du ikke få beskjed hvis du har endringer som ikke er sikkerhetskopiert. Da risikerer du å miste tilgang til nøkler. Er du sikker på at du ønsker å skru av dette?</string>
+    <string name="pref_backups_versioning_strategy_title">Sikkerhetskopistrategi</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Behold et antall versjoner</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Enkel sikkerhetskopi</string>
+    <string name="pref_backups_location_summary">Sikkerhetskopier vil lagres ved</string>
+    <string name="pref_backups_trigger_title">Sikkerhetskopier nå</string>
+    <string name="pref_backups_trigger_summary">Start sikkerhetskopiering manuelt</string>
+    <string name="pref_backups_versions_title">Antall versjoner å beholde</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
+    <plurals name="pref_backups_versions_summary">
+        <item quantity="one">Behold %1$d versjon av sikkerhetskopien</item>
+        <item quantity="other">Behold %1$d versjoner av sikkerhetskopien</item>
+    </plurals>
+    <string name="pref_backups_versions_infinite_summary">Behold et uendelig antall sikkerhetskopier</string>
+    <string name="pref_import_app_title">Importer fra app</string>
+    <string name="pref_import_app_summary">Importer nøkler fra en app (krever root-tilgang)</string>
+    <string name="pref_export_title">Eksporter</string>
+    <string name="pref_export_summary">Eksporter hvelvet</string>
+    <string name="pref_password_reminder_title">Passordpåminnelse</string>
+    <string name="pref_google_auth_export_title">Eksporter for Google Autentisering</string>
+    <string name="pref_google_auth_export_descriptor">Genererer QR-koder for eksport til Google Autentisering</string>
+    <string name="pref_google_auth_export_no_data">Ingen data å eksportere</string>
+    <plurals name="pref_google_auth_export_incompatible_entries">
+        <item quantity="one">Hoppet over %d inkompatibel oppføring</item>
+        <item quantity="other">Hoppet over %d inkompatible oppføringer</item>
+    </plurals>
+    <string name="pref_password_reminder_summary">Viser en %s påminnelse for å skrive inn passordet så du ikke glemmer det.</string>
+    <string name="pref_password_reminder_summary_disabled">Deaktivert</string>
+    <string name="pref_secure_screen_title">Skjermsikkerhet</string>
+    <string name="pref_secure_screen_summary">Blokker skjermbilder og skjermopptak av appen</string>
+    <string name="pref_tap_to_reveal_title">Trykk for å vise</string>
+    <string name="pref_tap_to_reveal_summary">Koder vil være skjult til vanlig. Trykk på oppføringen for å vise koden.</string>
+    <string name="pref_tap_to_reveal_time_title">Tidsavbrudd for «Trykk for å vise»</string>
+    <string name="pref_auto_lock_title">Lås automatisk</string>
+    <string name="pref_auto_lock_summary">Når %s</string>
+    <string name="pref_auto_lock_summary_disabled">Deaktivert</string>
+    <string name="pref_auto_lock_prompt">Lås Aegis automatisk når</string>
+    <string name="pref_auto_lock_type_back_button">Tilbakeknappen trykkes</string>
+    <string name="pref_auto_lock_type_minimize">Appen er minimert</string>
+    <string name="pref_auto_lock_type_device_lock">Enheten er låst</string>
+    <string name="pref_backup_password_category">Sikkerhetskopi &amp; Eksport</string>
+    <string name="pref_backup_password_title">Ulike passord for sikkerhetskopi &amp; eksport</string>
+    <string name="pref_backup_password_summary">Ved å aktivere dette, vil ikke passordet for å låse opp appen kunne brukes til å dekryptere sikkerhetskopier og eksport lenger.</string>
+    <string name="pref_backup_password_change_title">Bytt passord for sikkerhetskopi &amp; eksport</string>
+    <string name="pref_backup_password_change_summary">Angi et nytt passord for å kryptere hvelvet ved sikkerhetskopiering og eksport.</string>
+    <string name="pref_encryption_title">Kryptering</string>
+    <string name="pref_encryption_summary">Krypter hvelvet og lås det opp med passord eller biometri</string>
+    <string name="pref_biometrics_title">Biometrisk opplåsing</string>
+    <string name="pref_biometrics_summary">Tillat biometrisk autentisering for å låse opp hvelvet</string>
+    <string name="pref_search_behavior_summary">Søk igjennom: %s</string>
+    <string name="pref_search_behavior_prompt">Søk i følgende felter</string>
+    <string name="pref_search_behavior_type_name">Navn</string>
+    <string name="pref_search_behavior_type_issuer">Utsteder</string>
+    <string name="pref_search_behavior_type_note">Notat</string>
+    <string name="pref_search_behavior_type_groups">Grupper</string>
+    <string name="pref_set_password_title">Bytt passord</string>
+    <string name="pref_set_password_summary">Angi et nytt passord til opplåsing av hvelvet ditt</string>
+    <string name="no_events_title">Ingen rapporterte hendelser</string>
+    <string name="no_events_description">Ingen viktige hendelser har blitt rapportert i appen</string>
+    <string name="event_title_vault_unlocked">Hvelvet låst opp</string>
+    <string name="event_description_vault_unlocked">Vellykket opplåsing av hvelvet</string>
+    <string name="event_title_backup_created">Sikkerhetskopi opprettet</string>
+    <string name="event_description_backup_created">Vellykket sikkerhetskopi av hvelvet</string>
+    <string name="event_title_android_backup_created">Sikkerhetskopi fra Android</string>
+    <string name="event_description_android_backup_created">Vellykket Android-sikkerhetskopi av hvelvet</string>
+    <string name="event_title_vault_exported">Hvelv eksportert</string>
+    <string name="event_description_vault_exported">En kopi av hvelvet har blitt eksportert</string>
+    <string name="event_title_entry_shared">Oppføring delt</string>
+    <string name="event_description_entry_shared">En oppføring ble delt</string>
+    <string name="event_title_vault_unlock_failed_password">Feil ved opplåsing av hvelvet (passord)</string>
+    <string name="event_description_vault_unlock_failed_password">Et forsøk på å låse opp hvelvet med passord feilet</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Feil ved opplåsing av hvelvet (biometri)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Et forsøk på å låse opp hvelvet med biometri feilet</string>
+    <string name="event_unknown">Ukjent hendelsestype</string>
+    <string name="audit_log_entry_deleted">(slettet)</string>
+    <string name="today_at_time">I dag ved %1$s</string>
+    <string name="day_of_week_at_time">%1$s ved %2$s</string>
+    <string name="export_encrypted">Krypter hvelvet</string>
+    <string name="export_help">Denne handlingen vil eksportere hvelvet utenfor Aegis\' interne lagring. Velg filformat du vil eksportere til:</string>
+    <string name="export_warning_unencrypted">Du er i ferd med å eksportere en ukryptert kopi av Aegis hvelvet ditt. <b>Dette er ikke anbefalt</b>.</string>
+    <string name="export_warning_password">Eksporter er kryptert med et separat passord satt opp i sikkerhetsinnstillingene.</string>
+    <string name="understand_risk_accept">Jeg forstår risikoen</string>
+    <string name="export_format_aegis">Aegis (.JSON)</string>
+    <string name="export_format_google_auth_uri">Tekstfil (.TXT)</string>
+    <string name="export_format_html">Nettside (.HTML)</string>
+    <string name="export_format_hint">Eksporteringsformat</string>
+    <string name="export_all_groups">Eksporter alle grupper</string>
+    <string name="export_choose_groups">Velg hvilke grupper som skal eksporteres</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="one">%d gruppe valgt</item>
+        <item quantity="other">%d grupper valgt</item>
+    </plurals>
+    <string name="export_no_groups_selected">Ingen grupper valgt for eksportering</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator eksportering</string>
+    <string name="choose_authentication_method">Sikkerhet</string>
+    <string name="authentication_method_explanation">Aegis er en sikkerhetsfokusert app for tofaktorautentisering (2FA). Nøklene blir lagret i et hvelv, som kan krypteres med passord etter eget ønske. Hvis en angriper får tilgang til den krypterte hvelv-filen, vil de i så fall ikke kunne få tilgang til innholdet uten passordet.\n\nVi har forhåndsvalgt løsningen vi mener passer best til enheten din.</string>
+    <string name="authentication_method_none">Ingen</string>
+    <string name="authentication_method_none_description">Det trengs ikke passord for å låse opp hvelvet, og hvelvet vil ikke bli kryptert. <b>Dette er ikke anbefalt</b>.</string>
+    <string name="authentication_method_password">Passordd</string>
+    <string name="authentication_method_password_description">Et passord kreves for å låse opp hvelvet.</string>
+    <string name="authentication_method_password_explanation">Advarsel: Hvis du glemmer passordet ditt vil du kunne miste permanent tilgang til nøklene dine. Det er ikke mulig å gjenopprette disse uten passordet.</string>
+    <string name="authentication_method_biometrics">Biometri</string>
+    <string name="authentication_method_biometrics_description">I tillegg til et passord, så kan biometri som fingeravtrykk eller ansikt brukes til å låse opp hvelvet.</string>
+    <string name="authentication">Lås opp hvelvet</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Lås opp\nhvelvet</string>
+    <string name="auth_use_biometrics">Eller trykk her for å bruke <font fgcolor="#FF0D86C1">biometri</font></string>
+    <string name="set_password">Vennligst skriv inn et passord</string>
+    <string name="set_group">Vennligst skriv inn et gruppenavn</string>
+    <string name="set_number">Vennligst skriv inn et nummer</string>
+    <string name="set_password_confirm">Vennligst bekreft passordet</string>
+    <string name="invalid_password">Passordet er feil</string>
+    <string name="invalidated_biometrics">En endring har blitt oppdaget i enhetens sikkerhetsinnstillinger. Vennligst gå til «Aegis -&gt; Innstillinger -&gt; Sikkerhet - &gt; Biometrisk opplåsing» for å skru av og på biometrisk opplåsing.</string>
+    <string name="password_reminder">Vennligst skriv inn passordet ditt. Vi ber deg om dette av og til så du ikke glemmer det.</string>
+    <string name="password_reminder_dialog_title">Biometrisk opplåsning som standard</string>
+    <string name="password_reminder_dialog_message">Vi ber deg av og til om å skrive inn passordet ditt for å passe på at du ikke har glemt det, slik at du ikke blir låst ute av hvelvet ditt. Etter å ha skrevet inn passordet vil Aegis gå tilbake til biometrisk opplåsning frem til neste passordpåminnelse.</string>
+    <string name="password_reminder_freq_never">Aldri</string>
+    <string name="password_reminder_freq_weekly">Ukentlig</string>
+    <string name="password_reminder_freq_biweekly">Annenhver uke</string>
+    <string name="password_reminder_freq_monthly">Månedlig</string>
+    <string name="password_reminder_freq_quarterly">Kvartalvis</string>
+    <string name="enter_password_2fas_message">Det ser ut som at denne 2FAS sikkerhetskopien er kryptert. Vennligst skriv inn passordet under.</string>
+    <string name="enter_password_authy_message">Det ser ut som at nøklene i Authy er krypterte. Vennligst lukk Aegis, åpne Authy og lås opp nøklene med passordet ditt. Alternativt kan Aegis forsøke å dekryptere Authy nøklene dine om du skriver passordet ditt nedenfor.</string>
+    <string name="enter_password_aegis_title">Vennligst skriv inn det importerte passordet</string>
+    <string name="period_hint">Periode (sekunder)</string>
+    <string name="algorithm_hint">Hashfunksjon</string>
+    <string name="type">Type</string>
+    <string name="share">Del</string>
+    <string name="yes">Ja</string>
+    <string name="no">Nei</string>
+    <string name="undo">Angre</string>
+    <string name="unlock">Lås opp</string>
+    <string name="advanced">Avansert</string>
+    <string name="counter">Teller</string>
+    <string name="digits">Sifre</string>
+    <string name="secret">Nøkkel</string>
+    <string name="scan">Skann QR-kode</string>
+    <string name="scan_image">Skann bilde</string>
+    <string name="enter_manually">Skriv inn manuelt</string>
+    <string name="set_up_biometric">Sett opp biometrisk opplåsing</string>
+    <string name="copy">Kopier</string>
+    <string name="edit">Rediger</string>
+    <string name="select_all">Velg alle</string>
+    <string name="assign_icons">Tildel ikoner</string>
+    <string name="assign_groups">Legg til i gruppe</string>
+    <string name="assign_groups_dialog_summary">Velg i hvilken gruppe du vil legge til de valgte oppføringene.</string>
+    <string name="assign_groups_dialog_dropdown">Velg gruppe</string>
+    <string name="favorite" comment="Verb">Legg til som favoritt</string>
+    <string name="unfavorite" comment="Verb">Fjern fra favoritter</string>
+    <string name="error_all_caps">FEIL</string>
+    <string name="password">Passord</string>
+    <string name="confirm_password">Bekreft passord</string>
+    <string name="show_password">Vis passord</string>
+    <string name="new_entry">Ny oppføring</string>
+    <string name="add_new_entry">Legg til ny oppføring</string>
+    <string name="unlock_vault_error">Kunne ikke låse opp hvelvet</string>
+    <string name="unlock_vault_error_description">Feil passord. Kontroller at det er skrevet inn korrekt.</string>
+    <string name="password_equality_error">Passordene bør være identiske og ikke være tomme</string>
+    <string name="snackbar_authentication_method">Vennligst velg en autentiseringsmetode</string>
+    <string name="encrypting_vault">Krypterer hvelvet</string>
+    <string name="exporting_vault">Eksporterer hvelvet</string>
+    <string name="optimizing_icon">Optimaliserer ikon</string>
+    <string name="optimizing_icon_multiple">Optimaliserer ikoner %1$d/%2$d</string>
+    <string name="reading_file">Leser fil</string>
+    <string name="requesting_root_access">Ber om root-tilgang</string>
+    <string name="analyzing_qr">Analyserer QR-kode</string>
+    <string name="analyzing_qr_multiple">Analyserer QR-kode %1$d/%2$d (%3$s)</string>
+    <plurals name="added_new_entries">
+        <item quantity="one">La til %d ny oppføring i hvelvet</item>
+        <item quantity="other">La til %d nye oppføringer i hvelvet</item>
+    </plurals>
+    <string name="importing_icon_pack">Importerer ikonpakke</string>
+    <string name="delete_entry">Slett oppføring</string>
+    <string name="delete_entry_description">Er du sikker på at du vil slette denne oppføringen?</string>
+    <string name="delete_entry_explanation">Dette deaktiverer ikke 2FA for: \n<b>%s</b>\n\nSørg for å skru av 2FA, eller at du har en alternativ metode for å generere koder for denne tjenesten. Hvis ikke risikerer du å miste tilgang til den.</string>
+    <string name="delete_entries">Slett oppføringer</string>
+    <plurals name="delete_entries_description">
+        <item quantity="one">Er du sikker på at du vil slette %d oppføring?</item>
+        <item quantity="other">Er du sikker på at du vil slette %d oppføringer?</item>
+    </plurals>
+    <string name="discard_changes">Forkast endringer?</string>
+    <string name="discard_changes_description">Endringene ble ikke lagret</string>
+    <string name="saving_profile_error">Feil ved lagring av profil</string>
+    <string name="saving_assign_icons_error">Feil ved tildeling av ikoner</string>
+    <string name="welcome">Velkommen</string>
+    <string name="app_description">Aegis er en gratis og sikker 2FA app med åpen kildekode</string>
+    <string name="setup_completed">Oppsett fullført</string>
+    <string name="setup_completed_description">Aegis er satt opp og er klar for bruk.</string>
+    <string name="vault_not_found">Finner ikke hvelv, starter oppsett…</string>
+    <string name="copied">Kopiert</string>
+    <string name="errors_copied">Feil kopiert til utklippstavlen</string>
+    <string name="version_copied">Versjon kopiert til utklippstavlen</string>
+    <string name="error_required_field">Dette feltet er påkrevd</string>
+    <string name="error_occurred">En feil oppstod</string>
+    <string name="decryption_error">En feil oppstod ved opplåsing av hvelvet</string>
+    <string name="decryption_corrupt_error">En feil oppstod ved opplåsing av hvelvet. Hvelv-filen kan være skadet.</string>
+    <string name="saving_error">En feil oppstod ved lagring av hvelvet</string>
+    <string name="vault_init_error">En feil oppstod ved initialisering av hvelvet</string>
+    <string name="vault_load_error">Det oppsto en feil under forsøk på å laste inn hvelvet</string>
+    <string name="biometric_decrypt_error">En feil oppstod under forsøk på å dekryptere hvelvet med biometrisk godkjenning. Dette skjer vanligvis bare hvis sikkerhetsinnstillingene for enheten ble endret. Lås opp hvelvet med passordet ditt og sett opp biometrisk autentisering på nytt i innstillingene til Aegis.</string>
+    <string name="biometric_init_error">En feil oppsto ved forsøk på å forberede biometrisk autentisering. Dette skjer vanligvis bare hvis sikkerhetsinnstillingene til enheten ble endret. Lås opp hvelvet med passordet ditt og sett opp biometrisk autentiseringpå nytt i innstillingene til Aegis.</string>
+    <string name="disable_encryption">Deaktiver kryptering</string>
+    <string name="disable_encryption_description">Er du sikker på at du vil deaktivere kryptering? Dette vil føre til at hvelvet lagres i klartekst. <b>automatiske sikkerhetskopier vil også bli deaktivert</b>.</string>
+    <string name="enable_encryption_error">En feil oppstod under aktivering av kryptering</string>
+    <string name="disable_encryption_error">En feil oppstod under deaktivering av kryptering</string>
+    <string name="backup_successful">Vellykket planlegging av sikkerhetskopi</string>
+    <string name="backup_error">En feil oppstod ved forsøk på å lage en sikkerhetskopi</string>
+    <string name="backup_status_success">Nyeste sikkerhetskopi vellykket: %s</string>
+    <string name="backup_status_failed">Nyeste sikkerhetskopi feilet: %s</string>
+    <string name="backup_status_none">Det er ikke opprettet noen sikkerhetskopier enda</string>
+    <string name="backup_warning_password">Sikkerhetskopier er kryptert med eget passord konfigurert i sikkerhetsinnstillingene</string>
+    <string name="documentsui_error">DocumentsUI ser ut til å mangle på enheten. Dette er en viktig systemkomponent som er nødvendig for valg og oppretting av dokumenter. Hvis du brukte et verktøy til &quot;slanke&quot; enheten, kan det ha blitt slettet ved et uhell og du må installere det på nytt.</string>
+    <string name="icon_pack_import_error">Det oppsto en feil under forsøk på å importere en ikonpakke</string>
+    <string name="icon_pack_import_exists_error">Ikonpakken du prøver å importere finnes allerede. Vil du overskrive den?</string>
+    <string name="icon_pack_delete_error">Det oppstod en feil under forsøk på å slette en ikonpakke</string>
+    <plurals name="icon_pack_info">
+        <item quantity="one">%d ikon</item>
+        <item quantity="other">%d ikoner</item>
+    </plurals>
+    <string name="icon_custom">Egendefinert</string>
+    <string name="permission_denied">Tilgang nektet</string>
+    <string name="andotp_new_format">Nytt format (v0.6.3 eller nyere) </string>
+    <string name="andotp_old_format">Gammelt format (v0.6.2 eller eldre) </string>
+    <string name="choose_andotp_importer">Hvilket filformat har sikkerhetskopien fra andOTP?</string>
+    <string name="choose_totpauth_importer">Er sikkerhetskopien fra TOTP Authenticator kryptert med et passord?</string>
+    <string name="choose_application">Velg applikasjonen du ønsker å importere fra</string>
+    <string name="choose_theme">Velg ønsket tema</string>
+    <string name="choose_account_name_position">Velg ønsket plassering av brukernavn</string>
+    <string name="choose_view_mode">Velg ønsket visningsmodus</string>
+    <string name="choose_copy_behavior">Velg ønsket oppførsel for kopiering</string>
+    <string name="parsing_file_error">Det oppsto en feil under forsøk på å analysere filen</string>
+    <string name="file_not_found">Feil: Finner ikke filen</string>
+    <string name="reading_file_error">Det oppsto en feil under forsøk på å lese filen</string>
+    <string name="app_lookup_error">Feil: Appen er ikke installert</string>
+    <string name="app_version_error">Versjonen av %s som er installert støttes ikke. Nylige versjoner har begynt å kryptere noen av filene i den interne lagringsmappen, slik at Aegis ikke får tilgang til den informasjonen den trenger for å importere dataene. Om du prøver å importere dataene vil det sannsynligvis resultere i en feil. Ønsker du likevel å fortsette?</string>
+    <string name="root_error">Feil: Kunne ikke få root-tilgang</string>
+    <plurals name="imported_entries_count">
+        <item quantity="one">Importerte %d oppføring</item>
+        <item quantity="other">Importerte %d oppføringer</item>
+    </plurals>
+    <plurals name="entries_shown">
+        <item quantity="one">Viser %d oppføring</item>
+        <item quantity="other">Viser %d oppføringer</item>
+    </plurals>
+    <string name="intro_import_error_title">En feil oppstod under import av hvelvet</string>
+    <string name="import_error_title">En eller flere feil oppstod under importeringen</string>
+    <string name="exporting_vault_error">En feil oppstod ved eksportering av hvelvet</string>
+    <string name="exported_vault">Hvelvet ble eksportert</string>
+    <string name="encryption_set_password_error">Det oppstod en feil under forsøk på å angi passordet.</string>
+    <string name="encryption_enable_biometrics_error">Det oppsto en feil under forsøk på å aktivere biometrisk opplåsing. Noen enheter har dårlige implementeringer av biometriske godkjenninger, og det er sannsynlig at din enhet er en av dem. Vurder å bytte til annen konfigurasjon som kun bruker passord i stedet.</string>
+    <string name="no_cameras_available">Ingen kameraer tilgjengelig</string>
+    <string name="read_qr_error">Det oppstod en feil under forsøk på å lese QR-koden</string>
+    <string name="read_qr_error_phonefactor">Aegis er ikke kompatibel med Microsofts egenutviklede 2FA algoritme. Vennligst velg \"Oppsett app uten varsler\" når du konfigurerer 2FA i Office 365.</string>
+    <string name="partial_google_auth_import">Ufullstendig eksport av Google Authenticator funnet</string>
+    <string name="partial_google_auth_import_warning">Noen QR-koder mangler i de importerte dataene. Følgende koder ble ikke funnet:\n\n<b>%s</b>\n\nDu kan fortsette å importere denne ufullstendige eksporten, men vi anbefaler at du prøver på nytt med alle QR-kodene slik at du ikke risikerer å miste tilgang til noen av nøklene.</string>
+    <string name="missing_qr_code_descriptor">• QR-kode %d</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importer %d nøkkel likevel</item>
+        <item quantity="other">Importer %d nøkler likevel</item>
+    </plurals>
+    <string name="import_google_auth_failure">Importering av eksport fra Google Authenticator mislyktes</string>
+    <string name="no_tokens_can_be_imported">Ingen nøkler kan importeres som resultat</string>
+    <string name="unlocking_vault">Låser opp hvelvet</string>
+    <string name="rename_group">Endre gruppenavn</string>
+    <string name="remove_group">Fjern gruppe</string>
+    <string name="remove_unused_groups">Slett ubrukte grupper</string>
+    <string name="remove_unused_groups_description">Er du sikker på at du ønsker å slette alle grupper som ikke brukes av noen oppføringer?</string>
+    <string name="remove_icon_pack">Fjern ikonpakke</string>
+    <string name="details">Detaljer</string>
+    <string name="show_error_details">Vis feildetaljer</string>
+    <string name="lock">Lås</string>
+    <string name="name">Navn</string>
+    <string name="no_group">Ingen gruppe</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sorter</string>
+    <string name="sort_alphabetically">Utsteder (A til Å)</string>
+    <string name="sort_alphabetically_reverse">Utsteder (Å til A)</string>
+    <string name="sort_alphabetically_name">Konto (A til Å)</string>
+    <string name="sort_alphabetically_name_reverse">Konto (Å til A)</string>
+    <string name="sort_usage_count">Bruksfrekvens</string>
+    <string name="sort_last_used">Sist brukt</string>
+    <string name="sort_custom">Egendefinert</string>
+    <string name="last_used">Sist brukt</string>
+    <string name="last_used_never">aldri</string>
+    <string name="new_group">Ny gruppe…</string>
+    <string name="group">Gruppe</string>
+    <string name="group_name_hint">Gruppenavn</string>
+    <string name="preference_manage_groups">Rediger grupper</string>
+    <string name="preference_manage_groups_summary">Administrer og slett gruppene dine her</string>
+    <string name="preference_reset_usage_count">Tilbakestill bruksfrekvens</string>
+    <string name="note" comment="Users can add a note to an entry">Notat</string>
+    <string name="clear">Tøm</string>
+    <string name="pref_highlight_entry_title">Fremhev koder ved trykk</string>
+    <string name="pref_highlight_entry_summary">Gjør det lettere å skille mellom koder ved å fremheve dem ved trykk</string>
+    <string name="pref_minimize_on_copy_title">Minimer ved kopi</string>
+    <string name="pref_minimize_on_copy_summary">Minimer appen etter å ha kopiert en kode</string>
+    <string name="pref_copy_behavior_title">Kopier koder til utklippstavlen</string>
+    <string name="pref_pause_entry_title">Frys koder ved trykk</string>
+    <string name="pref_pause_entry_summary">Pause autmatisk oppdatering av koder ved å trykke på dem. Koder vil ikke oppdateres så lenge de er i fokus. Krever «Fremhev koder ved trykk» eller «Trykk for å vise».</string>
+    <string name="pin_keyboard_description">Skriv inn passordet ditt for å aktivere PIN-tastaturet. Merk at dette kun fungerer dersom passordet bare består av tall</string>
+    <string name="pin_keyboard_error">Feil ved aktivering av PIN-tastatur</string>
+    <string name="pin_keyboard_error_description">Det er ikke mulig å aktivere PIN-tastatur. Passordet ditt kan bare bestå av tall.</string>
+    <string name="pin_keyboard_disabled">Passord endret. PIN-tastaturet vil ikke lenger bli vist.</string>
+    <string name="selected">Valgt</string>
+    <string name="dark_theme_title">Mørkt tema</string>
+    <string name="light_theme_title">Lyst tema</string>
+    <string name="amoled_theme_title">AMOLED tema</string>
+    <string name="system_theme_title">Følg systemet</string>
+    <string name="system_amoled_theme_title">Følg systemet (AMOLED)</string>
+    <string name="normal_viewmode_title">Normal</string>
+    <string name="compact_mode_title">Kompakt</string>
+    <string name="small_mode_title">Liten</string>
+    <string name="tiles_mode_title">Fliser</string>
+    <string name="unknown_issuer">Ukjent utsteder</string>
+    <string name="unknown_account_name">Ukjent brukernavn</string>
+    <string name="unable_to_generate_qrcode">Kunne ikke generere QR-kode</string>
+    <string name="select_picture">Velg bilde</string>
+    <string name="select_icon">Velg ikon</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Åpne hvelv</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Åpne skanner</string>
+    <string name="search">Søk</string>
+    <string name="channel_name_lock_status">Låsestatus</string>
+    <string name="channel_description_lock_status">Aegis kan opprette et vedvarende varsel for å informere deg når hvelvet er låst</string>
+    <string name="vault_unlocked_state">Hvelvet er låst opp. Trykk her for å låse.</string>
+    <string name="version">Versjon</string>
+    <string name="changelog">Endringslogg</string>
+    <string name="whats_new">Nyheter</string>
+    <string name="github_description">Kildekode, problemer og informasjon</string>
+    <string name="license">Lisens</string>
+    <string name="license_description">Aegis Authenticator er lisensiert under GPLv3</string>
+    <string name="third_party_licenses">Tredjepartslisenser</string>
+    <string name="third_party_licenses_description">Lisenser til tredjepartsbiblioteker Aegis benytter</string>
+    <string name="country_netherlands">Nederland</string>
+    <string name="email_us">Skriv en e-post</string>
+    <string name="visit_website">Besøk nettsiden våres</string>
+    <string name="about_support">Støtte</string>
+    <string name="support_rate">Ranger</string>
+    <string name="support_rate_description">Støtt oss ved å skrive en anmeldelse i Google Play Butikk</string>
+    <string name="email">E-post</string>
+    <string name="backup_system_builtin">Aegis\' innebygde automatiske sikkerhetskopier</string>
+    <string name="backup_system_android">System for Android-sikkerhetskopiering i skyen</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Siste sikkerhetskopi er utdatert (%s)
+    </string>
+    <string name="backup_reminder_bar_message">        Endringer er ikke sikkerhetskopiert
+    </string>
+    <string name="backup_reminder_bar_dialog_title">Endringer er ikke sikkerhetskopiert</string>
+    <string name="backup_reminder_bar_dialog_summary">        Nylige endringer i hvelvet er ikke sikkerhetskopiert enda. Det er viktig å sikkerhetskopiere regelmessig for å unngå at du mister tilgang til kontoene dine. Vennligst vurder å sette opp automatisk sikkerhetskopiering i innstillingene.
+    </string>
+    <string name="backup_reminder_bar_dialog_accept">Sett opp sikkerhetskopier</string>
+    <string name="backup_plaintext_export_warning"><b>Hvelvet ble nylig eksportert i klartekst</b></string>
+    <string name="pref_show_plaintext_warning_hint">Ikke vis denne advarselen igjen</string>
+    <string name="backup_plaintext_warning_explanation">Denne advarselen blir vist fordi du nylig eksporterte en ukryptert kopi av hvelvet ditt. For å opprettholde sikkerheten for nøklene dine, vil vi anbefale deg å slette denne filen når den ikke trengs lenger.</string>
+    <string name="switch_camera">Bytt kamera</string>
+    <string name="empty_list">Det er ingen koder å vise. Legg til oppføringer ved å trykke på pluss-ikonet nederst til høyre</string>
+    <string name="empty_list_title">Ingen oppføringer funnet</string>
+    <string name="empty_group_list">Det er ingen grupper å vise. Legg til grupper når du redigerer oppføringer</string>
+    <string name="empty_group_list_title">Ingen grupper funnet</string>
+    <string name="no_icon_packs">Ingen importerte ikonpakker enda. Trykk på pluss-ikonet for å importere en. Tips: prøv <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
+    <string name="no_icon_packs_title">Ingen ikonpakker</string>
+    <string name="pick_icon">Velg et ikon</string>
+    <string name="uncategorized">Ukategorisert</string>
+    <string name="done">Ferdig</string>
+    <plurals name="qr_count">
+        <item quantity="one">%d / %d QR-kode</item>
+        <item quantity="other">%d / %d QR-koder</item>
+    </plurals>
+    <string name="next">Neste</string>
+    <string name="previous">Forrige</string>
+    <string name="copy_uri">Kopier URI</string>
+    <string name="unable_to_copy_uri_to_clipboard">Kunne ikke kopiere URI til utklippstavlen</string>
+    <string name="uri_copied_to_clipboard">URI kopiert til utklippstavlen</string>
+    <string name="transfer_entry_description">Skann denne QR-koden med autentiseringsappen du ønsker å overføre denne oppføringen til</string>
+    <string name="google_auth_compatible_transfer_description">Skann disse QR-kodene med Aegis eller Google Authenticator.\n\nPå grunn av begrensningene i Google Authenticator appen, vil kun TOTP og HOTP nøkler som benytter SHA1 og produserer 6-sifrede koder bli inkludert</string>
+    <string name="password_strength_very_weak">Veldig svakt</string>
+    <string name="password_strength_weak">Svak</string>
+    <string name="password_strength_fair">Middels</string>
+    <string name="password_strength_good">Bra</string>
+    <string name="password_strength_strong">Sterkt</string>
+    <string name="password_strength_unknown">Passordet er for langt for styrkeanalyse</string>
+    <string name="pref_pin_keyboard_title">Bruk PIN-kode tastatur på appens låseskjerm</string>
+    <string name="title_activity_preferences">Innstillinger</string>
+    <string name="title_activity_manage_groups">Administrer grupper</string>
+    <string name="title_activity_transfer">Overfør oppføringer</string>
+    <string name="title_activity_about">Om</string>
+    <string name="title_activity_edit_entry">Rediger oppføring</string>
+    <string name="title_activity_scan_qr">Skann en QR-kode</string>
+    <string name="title_activity_import_entries">Importer oppføring</string>
+    <string name="title_activity_assign_icons">Tildel ikoner</string>
+    <string name="title_activity_licenses">Tredjepartslisenser</string>
+    <string name="dialog_wipe_entries_title">Tøm oppføringner</string>
+    <string name="dialog_wipe_entries_checkbox">Destruer hvelv</string>
+    <string name="import_vault">Importer Aegis hvelv</string>
+    <string name="importer_help_2fas">Legg ved en 2FAS Authenticator sikkerhetskopi.</string>
+    <string name="importer_help_aegis">Legg ved en Aegis eksportfil eller sikkerhetskopi.</string>
+    <string name="importer_help_andotp">Legg ved en andOTP eksportfil eller sikkerhetskopi.</string>
+    <string name="importer_help_bitwarden">Legg ved en Bitwarden eksportfil eller sikkerhetskopi. Krypterte filer støttes ikke.</string>
+    <string name="importer_help_freeotp_plus">Legg ved en FreeOTP+ eksportfil.</string>
+    <string name="importer_help_totp_authenticator">Legg ved en TOTP Authenticator eksportfil.</string>
+    <string name="importer_help_winauth">Legg ved en WinAuth eksportfil.</string>
+    <string name="import_assign_icons_dialog_title">Tildel ikoner</string>
+    <string name="import_assign_icons_dialog_text">Ønsker du å tildele ikoner til de importerte oppføringene?</string>
+    <string name="importer_encrypted_exception_google_authenticator">Kryptert oppføring ble hoppet over: %s</string>
+    <string name="importer_help_direct">Importer oppføringer direkte fra %s. Dette krever at appen er installert på denne enheten og at Aegis har root-tilgang.</string>
+    <string name="groups">Grupper</string>
+    <string name="pref_focus_search">Fokuser på søkefelt når appen startes</string>
+    <string name="pref_focus_search_summary">Fokuser på søkefelt med en gang appen er åpnet.</string>
+    <string name="pref_grouping_halves">Halvert</string>
+    <string name="pref_grouping_none">Ingen gruppering</string>
+    <string name="pref_grouping_size_two">Grupper på 2</string>
+    <string name="pref_grouping_size_three">Grupper på 3</string>
+    <string name="pref_grouping_size_four">Grupper på 4</string>
+    <string name="pref_copy_behavior_never">Aldri</string>
+    <string name="pref_copy_behavior_single_tap">Enkelttrykk</string>
+    <string name="pref_copy_behavior_double_tap">Dobbelttrykk</string>
+    <string name="pref_account_name_position_hidden">Skjult</string>
+    <string name="pref_account_name_position_end">Ved siden av utstederen</string>
+    <string name="pref_account_name_position_below">Under utstederen</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="one">%d sekund siden</item>
+        <item quantity="other">%d sekunder siden</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">%d minutt siden</item>
+        <item quantity="other">%d minutter siden</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="one">%d time siden</item>
+        <item quantity="other">%d timer siden</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="one">%d dag siden</item>
+        <item quantity="other">%d dager siden</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="one">%d år siden</item>
+        <item quantity="other">%d år siden</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="one">%d element valgt</item>
+        <item quantity="other">%d elementer valgt</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL-v29/strings.xml b/app/src/main/res/values-nl-rNL-v29/strings.xml
new file mode 100644
index 00000000..e71d82a6
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Systeemstandaard</string>
+    <string name="system_amoled_theme_title">Systeemstandaard (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 441e2963..eb15c450 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Instellingen</string>
     <string name="action_about">Over</string>
     <string name="action_delete">Verwijderen</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Standaard pictogram herstellen</string>
     <string name="discard">Ongedaan maken</string>
     <string name="save">Opslaan</string>
+    <string name="all">Alle</string>
     <string name="issuer">Uitgever</string>
     <string name="yandex_pin">Pin (4–16 cijfers)</string>
     <string name="motp_pin">Pin (4 cijfers)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Instellen van versleuteling, biometrische ontgrendeling, automatische vergrendeling en andere beveiligingsinstellingen.</string>
     <string name="pref_section_import_export_title">Importeren &amp; Exporteren</string>
     <string name="pref_section_import_export_summary">Back-ups van Aegis of andere authenticator-apps importeren. Maak handmatige export van je Aegis-kluis aan.</string>
+    <string name="pref_section_audit_log_title">Auditlogboek</string>
+    <string name="pref_section_audit_log_summary">Lijst met alle gerapporteerde belangrijke gebeurtenissen in de app bekijken.</string>
     <string name="pref_section_backups_title">Back-ups</string>
     <string name="pref_section_backups_summary">Automatische back-ups op een zelfgekozen locatie instellen, of meedoen met Androids cloud-back-upsysteem inschakelen.</string>
     <string name="pref_section_icon_packs">Pictogrampakketten</string>
     <string name="pref_section_icon_packs_summary">Pictogrampakketten beheren en importeren.</string>
     <string name="pref_select_theme_title">Thema</string>
+    <string name="pref_dynamic_colors_title">Dynamische kleuren</string>
+    <string name="pref_dynamic_colors_summary">Overlay toepassen op basis van de kleuren van je Android-thema</string>
     <string name="pref_view_mode_title">Weergavemodus</string>
     <string name="pref_lang_title">Taal</string>
     <string name="pref_show_icons_title">Pictogrammen tonen</string>
@@ -40,9 +45,14 @@
     <string name="pref_code_group_size_title">Codecijfergroepering</string>
     <string name="pref_code_group_size_summary">Selecteer aantal cijfers om de codes op te groeperen</string>
     <string name="pref_account_name_position_title">Accountnaam tonen</string>
+    <string name="pref_show_next_code_title">Volgende code tonen</string>
+    <string name="pref_show_next_code_summary">Genereer en toon de volgende code vooraf</string>
+    <string name="pref_expiration_state_title">Geef aan wanneer codes op het punt staan te verlopen</string>
+    <string name="pref_expiration_state_summary">Wijzig de kleur van de codes en laat ze knipperen wanneer ze op het punt staan te verlopen</string>
+    <string name="pref_expiration_state_fallback">Wijzig de kleur van de codes wanneer ze op het punt staan te verlopen</string>
     <string name="pref_shared_issuer_account_name_title">Accountnaam alleen indien nodig tonen</string>
     <string name="pref_shared_issuer_account_name_summary">Accountnamen alleen tonen wanneer ze dezelfde uitgever hebben. Andere accountnamen worden verborgen.</string>
-    <string name="pref_account_name_position_summary_override">Deze instelling wordt overschreven door de tegelweergavemodus. Accountnaam wordt altijd getoond onder de uitgever.</string>
+    <string name="pref_account_name_position_summary_override">Instelling wordt overschreven door de weergavemodus Tegels. Accountnaam wordt getoond onder de uitgever.</string>
     <string name="pref_import_file_title">Importeren vanuit een bestand</string>
     <string name="pref_import_file_summary">Importeer tokens vanuit een bestand</string>
     <string name="pref_android_backups_title">Android-cloudback-ups</string>
@@ -54,15 +64,23 @@
     <string name="pref_backups_reminder_summary">Toon een herinnering om een back-up van je kluis te maken, als je nog geen back-up hebt van de laatste wijzigingen.</string>
     <string name="pref_backups_reminder_dialog_title">Back-up herinnering uitschakelen</string>
     <string name="pref_backups_reminder_dialog_summary">Uitschakelen van deze herinnering betekent dat Aegis je niet zal vertellen of je wijzigingen hebt die nog niet zijn geback-upt. Hiermee loop je het risico om de toegang tot tokens te verliezen. Weet je zeker dat je deze herinnering wil uitschakelen?</string>
-    <string name="pref_backups_location_title">Map voor back-upbestanden</string>
+    <string name="pref_backups_versioning_strategy_title">Back-upstrategie</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Een aantal versies behouden</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Een enkele back-up</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">De geselecteerde back-upstrategie is niet betrouwbaar en wordt niet aanbevolen. Een enkele mislukte back-up kan leiden tot het verliezen van de enige back-up.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Selecteer een back-upstrategie</string>
+    <string name="pref_backups_location_title">Back-uplocatie</string>
     <string name="pref_backups_location_summary">Back-ups zullen worden opgeslagen in</string>
+    <string name="pref_backup_location_summary">Back-up zal worden opgeslagen in</string>
     <string name="pref_backups_trigger_title">Maak nu een back-up</string>
     <string name="pref_backups_trigger_summary">Handmatig een back-up aanzetten</string>
     <string name="pref_backups_versions_title">Aantal versies om te behouden</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Behoud %1$d versie van de back-up</item>
         <item quantity="other">Behoud %1$d versies van de back-up</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Oneindig aantal versies van de back-up bewaren</string>
     <string name="pref_import_app_title">Importeren vanuit een app</string>
     <string name="pref_import_app_summary">Importeer tokens vanuit een app (vereist root-access)</string>
     <string name="pref_export_title">Exporteren</string>
@@ -98,8 +116,34 @@
     <string name="pref_encryption_summary">Versleutel de kluis en ontgrendel deze met een wachtwoord of biometrie</string>
     <string name="pref_biometrics_title">Ontgrendelen met biometrie</string>
     <string name="pref_biometrics_summary">Sta biometrische authenticatie toe om de kluis te ontgrendelen</string>
+    <string name="pref_search_behavior_summary">Zoek door: %s</string>
+    <string name="pref_search_behavior_prompt">Zoek in een van de volgende velden</string>
+    <string name="pref_search_behavior_type_name">Naam</string>
+    <string name="pref_search_behavior_type_issuer">Uitgever</string>
+    <string name="pref_search_behavior_type_note">Notitie</string>
+    <string name="pref_search_behavior_type_groups">Groepen</string>
     <string name="pref_set_password_title">Wachtwoord wijzigen</string>
     <string name="pref_set_password_summary">Stel een nieuw wachtwoord in waarmee je de kluis kunt ontgrendelen</string>
+    <string name="no_events_title">Geen gerapporteerde gebeurtenissen</string>
+    <string name="no_events_description">Geen belangrijke gebeurtenissen in de app gerapporteerd</string>
+    <string name="event_title_vault_unlocked">Kluis ontgrendeld</string>
+    <string name="event_description_vault_unlocked">De kluis is met succes ontgrendeld</string>
+    <string name="event_title_backup_created">Back-up gemaakt</string>
+    <string name="event_description_backup_created">Er is met succes een back-up van de kluis gemaakt</string>
+    <string name="event_title_android_backup_created">Back-up gemaakt door Android</string>
+    <string name="event_description_android_backup_created">Er is met succes een back-up van de kluis gemaakt door Android</string>
+    <string name="event_title_vault_exported">Kluis geëxporteerd</string>
+    <string name="event_description_vault_exported">Een kopie van de kluis is geëxporteerd</string>
+    <string name="event_title_entry_shared">Item gedeeld</string>
+    <string name="event_description_entry_shared">Een item is gedeeld</string>
+    <string name="event_title_vault_unlock_failed_password">Kluis ontgrendelen mislukt (wachtwoord)</string>
+    <string name="event_description_vault_unlock_failed_password">Een poging om de kluis met een wachtwoord te ontgrendelen is mislukt</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Kluis ontgrendelen mislukt (biometrie)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Een poging om de kluis te ontgrendelen met biometrie is mislukt</string>
+    <string name="event_unknown">Onbekende gebeurtenis</string>
+    <string name="audit_log_entry_deleted">(verwijderd)</string>
+    <string name="today_at_time">Vandaag om %1$s</string>
+    <string name="day_of_week_at_time">%1$s om %2$s</string>
     <string name="export_encrypted">Kluis versleutelen</string>
     <string name="export_help">Deze actie zal de kluis exporteren uit de interne opslag van Aegis. Selecteer het formaat waarin je de export wilt:</string>
     <string name="export_warning_unencrypted">Je staat op het punt een onversleutelde kopie van de Aegis-kluis te exporteren. <b>Dit wordt niet aanbevolen</b>.</string>
@@ -116,7 +160,7 @@
         <item quantity="other">%d groepen geselecteerd</item>
     </plurals>
     <string name="export_no_groups_selected">Geen groepen gekozen om te exporteren</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator Export</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator Export</string>
     <string name="choose_authentication_method">Beveiliging</string>
     <string name="authentication_method_explanation">Aegis is een op veiligheid gerichte 2FA-applicatie. Tokens worden opgeslagen in een kluis, die optioneel kan worden versleuteld met een wachtwoord naar keuze. Als een aanvaller je versleutelde kluisbestand in handen krijgt, zal deze geen toegang hebben tot de inhoud zonder het wachtwoord te kennen.\n\nWij hebben de optie gekozen die volgens ons het beste past bij jouw apparaat.</string>
     <string name="authentication_method_none">Geen</string>
@@ -125,7 +169,7 @@
     <string name="authentication_method_password_description">Een wachtwoord is nodig om de kluis te ontgrendelen.</string>
     <string name="authentication_method_password_explanation">Waarschuwing: Als je je wachtwoord vergeet, verlies je permanent toegang tot je tokens. Er is geen manier om deze te herstellen zonder het wachtwoord.</string>
     <string name="authentication_method_biometrics">Biometrie</string>
-    <string name="authentication_method_biometrics_description">Naast een wachtwoord kunnen biometrische gegevens die geregistreerd zijn op dit apparaat, zoals een vingerafdruk of je gezicht, gebruikt worden om de kluis te ontgrendelen.</string>
+    <string name="authentication_method_biometrics_description">Naast een wachtwoord kan biometrie die geregistreerd is op dit apparaat, zoals een vingerafdruk of je gezicht, gebruikt worden om de kluis te ontgrendelen.</string>
     <string name="authentication">Ontgrendel de kluis</string>
     <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Ontgrendel\nde kluis</string>
     <string name="auth_use_biometrics">Of tik hier om <font fgcolor="#FF0D86C1">biometrie</font> te gebruiken</string>
@@ -152,6 +196,7 @@
     <string name="share">Delen</string>
     <string name="yes">Ja</string>
     <string name="no">Nee</string>
+    <string name="undo">Ongedaan maken</string>
     <string name="unlock">Ontgrendel</string>
     <string name="advanced">Geavanceerd</string>
     <string name="counter">Teller</string>
@@ -163,6 +208,11 @@
     <string name="set_up_biometric">Biometrische ontgrendeling instellen</string>
     <string name="copy">Kopiëren</string>
     <string name="edit">Bewerken</string>
+    <string name="select_all">Alles selecteren</string>
+    <string name="assign_icons">Pictogrammen toewijzen</string>
+    <string name="assign_groups">Toewijzen aan groep</string>
+    <string name="assign_groups_dialog_summary">Selecteer een groep waaraan u de geselecteerde items wilt toewijzen.</string>
+    <string name="assign_groups_dialog_dropdown">Groep selecteren</string>
     <string name="favorite" comment="Verb">Aan favorieten toevoegen</string>
     <string name="unfavorite" comment="Verb">Uit favorieten verwijderen</string>
     <string name="error_all_caps">FOUT</string>
@@ -177,10 +227,12 @@
     <string name="snackbar_authentication_method">Kies een inlogmethode</string>
     <string name="encrypting_vault">De kluis wordt versleuteld</string>
     <string name="exporting_vault">De kluis wordt geëxporteerd</string>
+    <string name="optimizing_icon">Pictogram wordt geoptimaliseerd</string>
+    <string name="optimizing_icon_multiple">Pictogrammen %1$d/%2$d worden geoptimaliseerd</string>
     <string name="reading_file">Bestand lezen</string>
     <string name="requesting_root_access">Root-toegang wordt aangevraagd</string>
     <string name="analyzing_qr">QR-code analyseren</string>
-    <string name="analyzing_qr_multiple">QR-code analyseren %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">QR-code analyseren %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">%d nieuwe items aan de kluis toegevoegd</item>
         <item quantity="other">%d nieuwe items aan de kluis toegevoegd</item>
@@ -197,6 +249,7 @@
     <string name="discard_changes">Wijzigingen ongedaan maken?</string>
     <string name="discard_changes_description">Je wijzigingen zijn niet opgeslagen</string>
     <string name="saving_profile_error">Fout bij opslaan profiel</string>
+    <string name="saving_assign_icons_error">Fout bij toewijzen pictogrammen</string>
     <string name="welcome">Welkom</string>
     <string name="app_description">Aegis is een gratis en veilige open-source 2FA-app.</string>
     <string name="setup_completed">Configuratie voltooid</string>
@@ -205,6 +258,7 @@
     <string name="copied">Gekopieerd</string>
     <string name="errors_copied">Fouten zijn naar klembord gekopieerd</string>
     <string name="version_copied">Versie is naar het klembord gekopieerd</string>
+    <string name="error_required_field">Dit veld is vereist</string>
     <string name="error_occurred">Er is een fout opgetreden</string>
     <string name="decryption_error">Er is een fout opgetreden tijdens het ontgrendelen van de kluis</string>
     <string name="decryption_corrupt_error">Er is een fout opgetreden tijdens het ontgrendelen van de kluis. Het kluisbestand kan beschadigd zijn.</string>
@@ -268,15 +322,20 @@
     <string name="partial_google_auth_import">Onvolledige Google Authenticator-export gedetecteerd</string>
     <string name="partial_google_auth_import_warning">Enkele QR-codes ontbreken in de import. De volgende codes zijn niet gevonden:\n\n<b>%s</b>\n\nJe kan doorgaan met het importeren van deze gedeeltelijke export, maar we raden aan het opnieuw te proberen met alle QR-codes, zodat je niet het risico loopt de toegang tot tokens te verliezen.</string>
     <string name="missing_qr_code_descriptor">• QR-code %d</string>
-    <string name="import_partial_export_anyway">%d tokens toch importeren</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">%d token toch importeren</item>
+        <item quantity="other">%d tokens toch importeren</item>
+    </plurals>
     <string name="import_google_auth_failure">Importeren van Google Authenticator-export mislukt</string>
     <string name="unrelated_google_auth_batches_error">Export bevat informatie voor een niet gerelateerde batch. Probeer 1 batch tegelijk te importeren.</string>
     <string name="no_tokens_can_be_imported">Hierdoor kunnen geen tokens worden geïmporteerd</string>
-    <string name="authentication_method_raw">Onbewerkt</string>
     <string name="unlocking_vault">Kluis wordt ontgrendeld</string>
-    <string name="slot_this_device">(dit apparaat)</string>
+    <string name="rename_group">Groep hernoemen</string>
+    <string name="no_group_selection">Als een item niet in een groep zit, kan dit worden gevonden onder ‘Geen groep’.</string>
     <string name="remove_group">Groep verwijderen</string>
     <string name="remove_group_description">Weet je zeker dat je deze groep wilt verwijderen? Alle items binnen deze groep worden automatisch verplaatst naar ‘Geen groep’.</string>
+    <string name="remove_unused_groups">Ongebruikte groepen verwijderen</string>
+    <string name="remove_unused_groups_description">Weet je zeker dat je alle groepen, die niet aan een item zijn toegewezen, wilt verwijderen?</string>
     <string name="remove_icon_pack">Pictogrammenpakket verwijderen</string>
     <string name="remove_icon_pack_description">Weet je zeker dat je dit pictogrampakket wil verwijderen? Items die pictogrammen uit dit pakket gebruiken, worden niet beïnvloed.</string>
     <string name="details">Details</string>
@@ -284,13 +343,16 @@
     <string name="lock">Vergrendel</string>
     <string name="name">Naam</string>
     <string name="no_group">Geen groep</string>
-    <string name="sort">Sorteren</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sorteren</string>
     <string name="sort_alphabetically">Uitgever (A t/m Z)</string>
     <string name="sort_alphabetically_reverse">Uitgever (Z t/m A)</string>
     <string name="sort_alphabetically_name">Account (A t/m Z)</string>
     <string name="sort_alphabetically_name_reverse">Account (Z t/m A)</string>
     <string name="sort_usage_count">Gebruikteller</string>
+    <string name="sort_last_used">Laatst gebruikt</string>
     <string name="sort_custom">Aangepast</string>
+    <string name="last_used">Laatst gebruikt</string>
+    <string name="last_used_never">nooit</string>
     <string name="new_group">Nieuwe groep…</string>
     <string name="group">Groep</string>
     <string name="group_name_hint">Groepsnaam</string>
@@ -299,13 +361,31 @@
     <string name="preference_reset_usage_count">Gebruikteller resetten</string>
     <string name="preference_reset_usage_count_summary">Reset de gebruikteller van elk item in je kluis</string>
     <string name="preference_reset_usage_count_dialog">Weet je zeker dat je de gebruikteller van alle items in de kluis op 0 wilt zetten?</string>
-    <string name="note">Notitie</string>
+    <string name="note" comment="Users can add a note to an entry">Notitie</string>
     <string name="clear">Wissen</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Item bestaat al</string>
+    <string name="dialog_duplicate_entry_message">Dit item heeft dezelfde naam en uitgever als een of meer bestaande items. Hoe wil je verder gaan?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Bestaande item(s) overschrijven</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Vervang de bestaande items door de nieuwe. Deze actie kan niet ongedaan worden gemaakt</string>
+    <string name="dialog_duplicate_entry_suffix_title">Achtervoegsel toevoegen</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Voeg een achtervoegsel toe aan de naam van het nieuwe item. De nieuwe naam wordt %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Opslaan annuleren</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Hiermee kan je het item bewerken voordat je het opnieuw probeert op te slaan</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Weet je zeker dat je %d item met de volgende naam wil verwijderen:\n\n%s - %s</item>
+        <item quantity="other">Weet je zeker dat je %d items met de volgende naam wil verwijderen:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Verwijdering bevestigen</string>
+    <string name="pref_haptic_feedback_summary">Laat je apparaat trillen wanneer de codes verversen</string>
+    <string name="pref_haptic_feedback_title">Haptische feedback</string>
     <string name="pref_highlight_entry_title">Codes markeren na aantikken</string>
     <string name="pref_highlight_entry_summary">Maak codes makkelijker te onderscheiden van elkaar door ze tijdelijk te markeren na het aantikken</string>
+    <string name="pref_groups_multiselect_title">Meerdere groepen selecteren</string>
+    <string name="pref_groups_multiselect_summary">Selectie van meerdere groepen tegelijkertijd toestaan</string>
     <string name="pref_minimize_on_copy_title">Na kopiëren minimaliseren</string>
     <string name="pref_minimize_on_copy_summary">Na kopiëren van een code de app minimaliseren</string>
     <string name="pref_copy_behavior_title">Codes naar het klembord kopiëren</string>
+    <string name="pref_search_behavior_title">Zoekgedrag</string>
     <string name="pref_pause_entry_title">Codes bevriezen na aantikken</string>
     <string name="pref_pause_entry_summary">Pauzeer automatisch verversen van codes door erop te tikken. Codes zullen niet worden bijgewerkt zolang ze gefocust zijn. Vereist ‘Codes markeren na aantikken’ of ‘Aantikken om te laten zien’.</string>
     <string name="pin_keyboard_description">Voer je wachtwoord in om het PIN-toetsenbord in te schakelen. Let op: dit werkt alleen als je wachtwoord uit cijfers bestaat</string>
@@ -325,13 +405,13 @@
     <string name="unknown_issuer">Onbekende uitgever</string>
     <string name="unknown_account_name">Onbekende accountnaam</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis kon %d token niet importeren. Dit token zal worden overgeslagen. Druk op ‘details’ om meer informatie over de fouten te zien.</item>
-        <item quantity="other">Aegis kon %d tokens niet importeren. Deze tokens zullen worden overgeslagen. Druk op ‘details’ om meer informatie over de fouten te zien.</item>
+        <item quantity="one">Aegis kan %d token niet importeren. Dit token zal worden overgeslagen. Druk op ‘details’ voor meer informatie over de fouten.</item>
+        <item quantity="other">Aegis kan %d tokens niet importeren. Deze tokens zullen worden overgeslagen. Druk op ‘details’ voor meer informatie over de fouten.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Kan de deeplink niet verwerken</string>
     <string name="unable_to_read_qrcode_file">Kan de QR-code van bestand niet lezen en verwerken: %s.</string>
     <string name="unable_to_process_shared_text">Kan gedeelde tekst niet verwerken als OTP</string>
-    <string name="unable_to_read_qrcode_files">Kan sommige QR-codes niet lezen en verwerken. Alleen %d/%d items worden geïmporteerd.</string>
+    <string name="unable_to_read_qrcode_files">Kan sommige QR-codes niet lezen en verwerken. Alleen %1$d/%2$d items worden geïmporteerd.</string>
     <string name="unable_to_generate_qrcode">Kan de QR-code niet genereren</string>
     <string name="select_picture">Foto selecteren</string>
     <string name="select_icon">Icoon selecteren</string>
@@ -347,7 +427,7 @@
     <string name="whats_new">Vernieuwingen</string>
     <string name="github_description">Broncode, problemen en informatie</string>
     <string name="license">Licentie</string>
-    <string name="license_description">Aegis Authenticator is gelicensieerd onder de GPLv3</string>
+    <string name="license_description">Aegis Authenticator is gelicenseerd onder de GPLv3</string>
     <string name="third_party_licenses">Licenties van derden</string>
     <string name="third_party_licenses_description">Licenties van bibliotheken van derden gebruikt door Aegis</string>
     <string name="country_netherlands">Nederland</string>
@@ -363,12 +443,14 @@
     <string name="time_sync_warning_disable">Stop met me te waarschuwen. Ik weet wat ik doe.</string>
     <string name="google_qr_export_unrelated">Ongerelateerde QR-code gevonden. Probeer de scanner opnieuw te starten.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d QR-code gescand</item>
-        <item quantity="other">%d/%d QR-codes gescand</item>
+        <item quantity="one">%1$d/%2$d QR-codes gescand</item>
+        <item quantity="other">%1$d/%2$d QR-codes gescand</item>
     </plurals>
-    <string name="google_qr_export_unexpected">QR-code #%d werd verwacht, maar in plaats daarvan #%d gescand</string>
+    <string name="google_qr_export_unexpected">QR-code #%1$d verwacht, in plaats daarvan #%2$d gescand</string>
     <string name="backup_error_bar_message"><b>Kluis back-up onlangs mislukt</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Een recente back-up van de kluis met %s mislukte omdat er iets misging. De back-uppoging was op %s. Controleer de back-upinstellingen om zeker te zijn dat back-ups met succes kunnen worden voltooid.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Een recente back-up van de kluis met %1$s mislukte omdat er iets misging. De back-uppoging was %2$s. Controleer de back-upinstellingen om zeker te zijn dat back-ups met succes kunnen worden voltooid.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Een recente poging een reservekopie van de kluis te maken met %1$s is mislukt. Aegis heeft geen toestemming om te schrijven naar de back-uplocatie. De De back-uppoging was %2$s. Deze fout kan optreden als je de back-uplocatie hebt verplaatst/hernoemd of als je onlangs een Aegis hebt hersteld met een back-up. Configureer de back-uplocatie opnieuw.
     </string>
     <string name="backup_system_builtin">het ingebouwde automatische back-ups van Aegis</string>
     <string name="backup_system_android">het cloud back-upsysteem van Android</string>
@@ -402,14 +484,15 @@
     <string name="copy_uri">URI kopiëren</string>
     <string name="unable_to_copy_uri_to_clipboard">Kan URI niet naar klembord kopiëren</string>
     <string name="uri_copied_to_clipboard">URI naar klembord gekopieerd</string>
-    <string name="transfer_entry">Item overzetten</string>
     <string name="transfer_entry_description">Scan deze QR-code met de authenticator-app waar je dit item naar wilt overzetten</string>
+    <string name="transfer_entry_brightness">QR-code aantikken om helderheid op volledig scherm te schakelen</string>
     <string name="google_auth_compatible_transfer_description">Scan deze QR-codes met Aegis of Google Authenticator.\n\nVanwege beperkingen van de Google Authenticator app, zijn alleen TOTP- &amp; HOTP-tokens die SHA1 gebruiken en 6-cijferige codes produceren opgenomen</string>
     <string name="password_strength_very_weak">Zeer zwak</string>
     <string name="password_strength_weak">Zwak</string>
     <string name="password_strength_fair">Redelijk</string>
     <string name="password_strength_good">Goed</string>
     <string name="password_strength_strong">Sterk</string>
+    <string name="password_strength_unknown">Wachtwoord te lang voor sterkte-analyse</string>
     <string name="pref_pin_keyboard_title">PIN-toetsen op vergrendelscherm</string>
     <string name="pref_pin_keyboard_summary">Schakel dit in als je het PIN-toetsenbord op het vergrendelscherm wilt gebruiken. Werkt alleen bij numerieke wachtwoorden</string>
     <string name="title_activity_preferences">Instellingen</string>
@@ -418,32 +501,43 @@
     <string name="title_activity_about">Over</string>
     <string name="title_activity_edit_entry">Item bewerken</string>
     <string name="title_activity_scan_qr">QR-code scannen</string>
-    <string name="title_activity_manage_slots">Sleutelslots beheren</string>
     <string name="title_activity_import_entries">Items importeren</string>
+    <string name="title_activity_assign_icons">Pictogrammen toewijzen</string>
+    <string name="title_activity_licenses">Licenties van derden</string>
     <string name="dialog_wipe_entries_title">Items wissen</string>
     <string name="dialog_wipe_entries_message">Je kluis bevat al items. Wil je deze items verwijderen voordat je dit bestand importeert?\n\n<b>Hiermee verlies je permanent toegang tot de bestaande items in de kluis.</b></string>
     <string name="dialog_wipe_entries_checkbox">Inhoud van kluis wissen</string>
     <string name="panic_trigger_ignore_toast">Aegis heeft paniektrigger ontvangen, maar instelling is uitgeschakeld, wordt genegeerd</string>
     <string name="pref_panic_trigger_title">Kluis bij paniektrigger verwijderen</string>
     <string name="pref_panic_trigger_summary">Kluis bij ontvangen van Ripple-paniektrigger verwijderen</string>
-    <string name="import_vault">Kluis importeren</string>
+    <string name="import_vault">Aegis-kluis importeren</string>
+    <string name="import_vault_hint">Wil je uit een andere 2FA-app importeren? Voltooi eerst de configuratie en ga dan naar het instellingenmenu.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d potentiële dubbeling niet aangevinkt. Controleer de lijst met items.</item>
+        <item quantity="other">%d potentiële dubbelingen niet aangevinkt. Controleer de lijst met items.</item>
+    </plurals>
     <string name="importer_help_2fas">Lever een 2FAS Authenticator-back-upbestand aan.</string>
     <string name="importer_help_aegis">Lever een Aegis-export/-back-upbestand aan.</string>
     <string name="importer_help_authenticator_plus">Lever een Authenticator Plus-exportbestand aan verkregen via <b>Instellingen -&gt; Back-up &amp; Herstellen -&gt; Exporteren als Tekst en HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Lever een Authenticator Pro-exportbestand aan verkregen via <b>Instellingen -&gt; Back-up -&gt; Back-up naar versleuteld bestand (aanbevolen)</b>.</string>
     <string name="importer_help_authy">Lever een kopie aan van <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, geplaatst in de interne opslagmap van Authy.</string>
     <string name="importer_help_andotp">Lever een andOTP-export/-back-upbestand aan.</string>
     <string name="importer_help_bitwarden">Lever een Bitwarden-export/-back-upbestand aan. Versleutelde bestanden worden niet ondersteund.</string>
-    <string name="importer_help_battle_net_authenticator">Lever een kopie aan van <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, geplaatst in de interne opslagmap van Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Lever een kopie aan van <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, geplaatst in de interne opslagmap van Battle.net Authenticator.</string>
     <string name="importer_help_duo">Lever een kopie aan van <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, geplaatst in de interne opslagmap van DUO.</string>
-    <string name="importer_help_freeotp">Lever een kopie aan van <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, geplaatst in de interne opslagmap van FreeOTP.</string>
+    <string name="importer_help_ente_auth">Lever een Ente Auth-exportbestand aan. Momenteel worden alleen niet-versleutelde bestanden ondersteund.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Lever een back-upbestand.\nFreeOTP 1.x: Lever een kopie aan van <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, geplaatst in de interne opslagmap van FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Lever een FreeOTP+-exportbestand aan.</string>
+    <string name="importer_warning_title_freeotp2">Compatibiliteit met FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Er zijn een aantal problemen in FreeOTP 2 die tot beschadigde back-ups kunnen leiden. Aegis zal proberen zoveel mogelijk items te redden, maar mogelijk kunnen sommige items of zelfs alles niet worden geïmporteerd.</string>
     <string name="importer_help_google_authenticator"><b>Alleen database-bestanden van Google Authenticator v5.10 en eerder worden ondersteund</b>.\n\nLever een kopie aan van <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, geplaatst in de interne opslagmap van Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Lever een kopie aan van <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, geplaatst in de interne opslagmap van Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Lever een tekstbestand aan met een Google Authenticator URI op elke regel.</string>
     <string name="importer_help_steam"><b>Steam v3.0 en nieuwer worden niet ondersteund</b>. Zorg voor een kopie van <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, te vinden in de interne opslagmap van Steam.</string>
+    <string name="importer_help_stratum">Lever een Stratum-exportbestand aan verkregen via <b>Instellingen -&gt; Back-up -&gt; Back-up naar versleuteld bestand (aanbevolen)</b>.</string>
     <string name="importer_help_totp_authenticator">Lever een TOTP Authenticator-exportbestand aan.</string>
     <string name="importer_help_winauth">Lever een WinAuth-exportbestand aan.</string>
+    <string name="import_assign_icons_dialog_title">Pictogrammen toewijzen</string>
+    <string name="import_assign_icons_dialog_text">Wil je pictogrammen aan de geïmporteerde items toewijzen?</string>
     <string name="importer_encrypted_exception_google_authenticator">Versleuteld item is overgeslagen: %s</string>
     <string name="importer_help_direct">Importeer items rechtstreeks van %s. Dit vereist dat de app op dit apparaat staat en dat root-toegang aan Aegis wordt verleend.</string>
     <string name="groups">Groepen</string>
@@ -460,23 +554,23 @@
     <string name="pref_account_name_position_hidden">Verborgen</string>
     <string name="pref_account_name_position_end">Naast de uitgever</string>
     <string name="pref_account_name_position_below">Onder de uitgever</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d seconde geleden</item>
         <item quantity="other">%d seconden geleden</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minuut geleden</item>
         <item quantity="other">%d minuten geleden</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d uur geleden</item>
         <item quantity="other">%d uur geleden</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d dag geleden</item>
         <item quantity="other">%d dagen geleden</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d jaar geleden</item>
         <item quantity="other">%d jaar geleden</item>
     </plurals>
diff --git a/app/src/main/res/values-pl-rPL-v29/strings.xml b/app/src/main/res/values-pl-rPL-v29/strings.xml
new file mode 100644
index 00000000..3ac3bf21
--- /dev/null
+++ b/app/src/main/res/values-pl-rPL-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Domyślny systemu</string>
+    <string name="system_amoled_theme_title">Domyślny systemu (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index a00567c6..beaea5bb 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Ustawienia</string>
     <string name="action_about">O aplikacji</string>
     <string name="action_delete">Usuń</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Przywróć domyślną ikonę</string>
     <string name="discard">Odrzuć</string>
     <string name="save">Zapisz</string>
+    <string name="all">Wszystkie</string>
     <string name="issuer">Wydawca</string>
     <string name="yandex_pin">PIN (4–16 cyfr)</string>
     <string name="motp_pin">PIN (4 cyfry)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Skonfiguruj szyfrowanie, autoryzację biometryczną, automatyczną blokadę i inne ustawienia bezpieczeństwa.</string>
     <string name="pref_section_import_export_title">Import i eksport</string>
     <string name="pref_section_import_export_summary">Importuj kopie zapasowe aplikacji Aegis lub innych aplikacji uwierzytelniających. Utwórz ręczne kopie zapasowe sejfu Aegis.</string>
+    <string name="pref_section_audit_log_title">Dziennik zdarzeń</string>
+    <string name="pref_section_audit_log_summary">Znajdź listę wszystkich zgłoszonych ważnych zdarzeń, które miały miejsce w aplikacji.</string>
     <string name="pref_section_backups_title">Kopie zapasowe</string>
     <string name="pref_section_backups_summary">Skonfiguruj automatyczne kopie zapasowe w wybranej lokalizacji lub włącz uczestnictwo w systemie kopii zapasowej w chmurze Android.</string>
     <string name="pref_section_icon_packs">Pakiety ikon</string>
     <string name="pref_section_icon_packs_summary">Zarządzaj i importuj pakiety ikon</string>
     <string name="pref_select_theme_title">Motyw</string>
+    <string name="pref_dynamic_colors_title">Dynamiczne kolory</string>
+    <string name="pref_dynamic_colors_summary">Zastosuj nakładkę opartą na kolorach twojego motywu Androida</string>
     <string name="pref_view_mode_title">Tryb wyświetlania</string>
     <string name="pref_lang_title">Język</string>
     <string name="pref_show_icons_title">Pokaż ikony</string>
@@ -40,7 +45,14 @@
     <string name="pref_code_group_size_title">Grupowanie cyfr kodu</string>
     <string name="pref_code_group_size_summary">Wybierz liczbę cyfr do grupowania według</string>
     <string name="pref_account_name_position_title">Pokaż nazwę konta</string>
+    <string name="pref_show_next_code_title">Pokaż następny kod</string>
+    <string name="pref_show_next_code_summary">Wygeneruj i pokaż następny kod z wyprzedzeniem</string>
+    <string name="pref_expiration_state_title">Wskaż, gdy kody mają wygasnąć</string>
+    <string name="pref_expiration_state_summary">Zmień kolor kodów i spraw, aby migały, gdy mają wygasnąć</string>
+    <string name="pref_expiration_state_fallback">Zmień kolor kodów, gdy mają wygasnąć</string>
     <string name="pref_shared_issuer_account_name_title">Pokaż nazwę konta tylko w razie potrzeby</string>
+    <string name="pref_shared_issuer_account_name_summary">Pokazuj nazwy kont tylko, gdy są z tego samego wydawcy. Inne nazwy kont zostaną ukryte.</string>
+    <string name="pref_account_name_position_summary_override">To ustawienie jest nadpisane przez tryb wyświetlania pól. Nazwa konta będzie wyświetlana pod wydawcą.</string>
     <string name="pref_import_file_title">Importuj z pliku</string>
     <string name="pref_import_file_summary">Importuj tokeny z aplikacji</string>
     <string name="pref_android_backups_title">Kopia zapasowa Android w chmurze</string>
@@ -52,17 +64,25 @@
     <string name="pref_backups_reminder_summary">Pokaż przypomnienie o kopii zapasowej twojego sejfu na wypadek, gdybyś nie zrobił kopii zapasowej najnowszych zmian.</string>
     <string name="pref_backups_reminder_dialog_title">Wyłącz przypomnienia o kopii zapasowej</string>
     <string name="pref_backups_reminder_dialog_summary">Wyłączenie tych powiadomień, oznacza że Aegis nie powie, czy masz zmiany, które nie są jeszcze zapisane w kopii zapasowej. To naraża cię na ryzyko utraty dostępu do twoich tokenów. Czy na pewno chcesz wyłączyć te powiadomienia?</string>
-    <string name="pref_backups_location_title">Folder plików kopii zapasowej</string>
+    <string name="pref_backups_versioning_strategy_title">Strategia tworzenia kopii zapasowych</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Zachowuj wiele wersji</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Pojedyncza kopia zapasowa</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Wybrana strategia tworzenia kopii zapasowych jest zawodna i niezalecana. Pojedyncza awaria kopii zapasowej może doprowadzić do utraty jedynej kopii zapasowej.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Wybierz strategię tworzenia kopii zapasowych</string>
+    <string name="pref_backups_location_title">Lokalizacja kopii zapasowych</string>
     <string name="pref_backups_location_summary">Kopie zapasowe będą przechowywane w</string>
+    <string name="pref_backup_location_summary">Kopie zapasowe będą przechowywane w</string>
     <string name="pref_backups_trigger_title">Uruchom kopie zapasowe</string>
     <string name="pref_backups_trigger_summary">Utwórz kopię zapasową ręcznie</string>
     <string name="pref_backups_versions_title">Liczba kopii do zachowania</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Zachowaj %1$d wersję kopii zapasowej</item>
         <item quantity="few">Zachowaj %1$d wersje kopii zapasowej</item>
         <item quantity="many">Zachowaj %1$d wersji kopii zapasowej</item>
         <item quantity="other">Zachowaj %1$d wersji kopii zapasowej</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Zachowuj nieskończoną liczbę wersji kopii zapasowej</string>
     <string name="pref_import_app_title">Importuj z aplikacji</string>
     <string name="pref_import_app_summary">Importuj tokeny z innej aplikacji (wymagane jest konto root)</string>
     <string name="pref_export_title">Eksportuj</string>
@@ -100,8 +120,34 @@
     <string name="pref_encryption_summary">Zaszyfruj sejf i odblokuj go za pomocą hasła lub autoryzacji biometrycznej</string>
     <string name="pref_biometrics_title">Autoryzacja biometryczna</string>
     <string name="pref_biometrics_summary">Zezwalaj na odblokowywanie aplikacji za pomocą autoryzacji biometrycznej</string>
+    <string name="pref_search_behavior_summary">Przeszukaj przez: %s</string>
+    <string name="pref_search_behavior_prompt">Szukaj w którymkolwiek z następujących pól</string>
+    <string name="pref_search_behavior_type_name">Nazwa</string>
+    <string name="pref_search_behavior_type_issuer">Wydawca</string>
+    <string name="pref_search_behavior_type_note">Notatka</string>
+    <string name="pref_search_behavior_type_groups">Grupy</string>
     <string name="pref_set_password_title">Zmień hasło</string>
     <string name="pref_set_password_summary">Ustaw nowe hasło do odblokowywania sejfu</string>
+    <string name="no_events_title">Brak zgłoszonych zdarzeń</string>
+    <string name="no_events_description">Żadne ważne zdarzenia nie zostały zgłoszone w aplikacji</string>
+    <string name="event_title_vault_unlocked">Sejf odblokowany</string>
+    <string name="event_description_vault_unlocked">Sejf został pomyślnie odblokowany</string>
+    <string name="event_title_backup_created">Kopia zapasowa utworzona</string>
+    <string name="event_description_backup_created">Kopia zapasowa sejfu została pomyślnie utworzona</string>
+    <string name="event_title_android_backup_created">Kopia zapasowa utworzona przez Androida</string>
+    <string name="event_description_android_backup_created">Kopia zapasowa sejfu została pomyślnie utworzona przez Androida</string>
+    <string name="event_title_vault_exported">Sejf został wyeksportowany</string>
+    <string name="event_description_vault_exported">Kopia sejfu została wyeksportowana</string>
+    <string name="event_title_entry_shared">Wpis udostępniony</string>
+    <string name="event_description_entry_shared">Wpis został udostępniony</string>
+    <string name="event_title_vault_unlock_failed_password">Odblokowanie sejfu nie powiodło się (hasło)</string>
+    <string name="event_description_vault_unlock_failed_password">Próba odblokowania sejfu z hasłem nie powiodła się</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Odblokowanie sejfu nie powiodło się (biometryczne)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Próba odblokowania sejfu za pomocą biometrii nie powiodła się</string>
+    <string name="event_unknown">Nieznany typ zdarzenia</string>
+    <string name="audit_log_entry_deleted">(usunięty)</string>
+    <string name="today_at_time">Dzisiaj o %1$s</string>
+    <string name="day_of_week_at_time">%1$s o %2$s</string>
     <string name="export_encrypted">Zaszyfruj sejf</string>
     <string name="export_help">Ta czynność wyeksportuje sejf z wewnętrznej przestrzeni dyskowej aplikacji Aegis. Wybierz format eksportowanego pliku:</string>
     <string name="export_warning_unencrypted">Wyeksportujesz sejf aplikacji Aegis w niezaszyfrowanym formacie. <b>Ta opcja nie jest zalecana</b>.</string>
@@ -120,7 +166,7 @@
         <item quantity="other">%d zaznaczonych grup</item>
     </plurals>
     <string name="export_no_groups_selected">Nie wybrano grup do eksportu</string>
-    <string name="export_html_title" context="The title of an HTML export document">Eksport Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Eksport Aegis Authenticator</string>
     <string name="choose_authentication_method">Bezpieczeństwo</string>
     <string name="authentication_method_explanation">Aegis to aplikacja uwierzytelniająca zorientowana na bezpieczeństwo. Tokeny są przechowywane w sejfie, który może zostać opcjonalnie zaszyfrowany przy użyciu wybranego przez Ciebie hasła. Jeśli atakujący uzyska zaszyfrowany plik sejfu, nie będzie mógł uzyskać dostępu do zawartości bez znajomości hasła.\n\nZaznaczyliśmy opcję, która najlepiej powinna pasować do Twojego urządzenia.</string>
     <string name="authentication_method_none">Brak</string>
@@ -156,6 +202,7 @@
     <string name="share">Udostępnij</string>
     <string name="yes">Tak</string>
     <string name="no">Nie</string>
+    <string name="undo">Cofnij</string>
     <string name="unlock">Odblokuj</string>
     <string name="advanced">Zaawansowane</string>
     <string name="counter">Licznik</string>
@@ -167,6 +214,11 @@
     <string name="set_up_biometric">Ustaw autoryzację biometryczną</string>
     <string name="copy">Kopiuj</string>
     <string name="edit">Edytuj</string>
+    <string name="select_all">Wybierz wszystko</string>
+    <string name="assign_icons">Przypisz ikony</string>
+    <string name="assign_groups">Przypisz do grupy</string>
+    <string name="assign_groups_dialog_summary">Wybierz grupę, do której chcesz przypisać wybrane wpisy.</string>
+    <string name="assign_groups_dialog_dropdown">Wybierz grupę</string>
     <string name="favorite" comment="Verb">Dodaj do ulubionych</string>
     <string name="unfavorite" comment="Verb">Usuń z ulubionych</string>
     <string name="error_all_caps">BŁĄD</string>
@@ -181,10 +233,12 @@
     <string name="snackbar_authentication_method">Wybierz metodę uwierzytelnienia</string>
     <string name="encrypting_vault">Szyfrowanie sejfu</string>
     <string name="exporting_vault">Eksportowanie sejfu</string>
+    <string name="optimizing_icon">Optymalizacja ikony</string>
+    <string name="optimizing_icon_multiple">Optymalizacja ikon %1$d/%2$d</string>
     <string name="reading_file">Odczytywanie pliku</string>
     <string name="requesting_root_access">Żądanie dostępu do roota</string>
     <string name="analyzing_qr">Analizowanie kodu QR</string>
-    <string name="analyzing_qr_multiple">Analizowanie kodu QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analizowanie kodu QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Dodano %d nowy wpis do sejfu</item>
         <item quantity="few">Dodano %d nowe wpisy do sejfu</item>
@@ -205,6 +259,7 @@
     <string name="discard_changes">Czy chcesz odrzucić zmiany?</string>
     <string name="discard_changes_description">Zmiany nie zostały zapisane</string>
     <string name="saving_profile_error">Wystąpił błąd podczas zapisywania profilu</string>
+    <string name="saving_assign_icons_error">Błąd podczas przypisywania ikon</string>
     <string name="welcome">Witaj</string>
     <string name="app_description">Aegis jest darmową, bezpieczną i otwartoźródłową aplikacją uwierzytelniającą</string>
     <string name="setup_completed">Konfiguracja została zakończona</string>
@@ -213,6 +268,7 @@
     <string name="copied">Skopiowano</string>
     <string name="errors_copied">Błędy zostały skopiowane do schowka</string>
     <string name="version_copied">Wersja została skopiowana do schowka</string>
+    <string name="error_required_field">To pole jest wymagane</string>
     <string name="error_occurred">Wystąpił błąd</string>
     <string name="decryption_error">Wystąpił błąd podczas odblokowywania sejfu</string>
     <string name="decryption_corrupt_error">Wystąpił błąd podczas odblokowywania sejfu. Plik sejfu może być uszkodzony.</string>
@@ -282,15 +338,22 @@
     <string name="partial_google_auth_import">Wykryto niekompletny eksport z Google Authenticator</string>
     <string name="partial_google_auth_import_warning">W imporcie brakuje niektórych kodów QR. Następujące kody nie zostały znalezione:\n\n<b>%s</b>\n\nMożesz kontynuować importowanie tego częściowego eksportu, ale zalecamy ponowną próbę z wszystkimi kodami QR, aby nie ryzykować utraty dostępu do tokenów.</string>
     <string name="missing_qr_code_descriptor">• Kod QR %d</string>
-    <string name="import_partial_export_anyway">Zaimportuj tokeny %d mimo to</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Zaimportuj %d token mimo to</item>
+        <item quantity="few">Zaimportuj %d tokeny mimo to</item>
+        <item quantity="many">Zaimportuj %d tokenów mimo to</item>
+        <item quantity="other">Zaimportuj %d tokenów mimo to</item>
+    </plurals>
     <string name="import_google_auth_failure">Importowanie danych z Google Authenticator nie powiodło się</string>
     <string name="unrelated_google_auth_batches_error">Eksport zawiera informacje dla niepowiązanej partii. Spróbuj importować 1 partię jednocześnie.</string>
     <string name="no_tokens_can_be_imported">Nie można zaimportować żadnych tokenów</string>
-    <string name="authentication_method_raw">Dane surowe</string>
     <string name="unlocking_vault">Odblokowywanie sejfu</string>
-    <string name="slot_this_device">(to urządzenie)</string>
+    <string name="rename_group">Zmień Nazwę Grupy</string>
+    <string name="no_group_selection">Jeśli wpis nie jest częścią żadnej grupy, można go znaleźć pod \"Brak grupy\".</string>
     <string name="remove_group">Usuń grupę</string>
     <string name="remove_group_description">Czy na pewno chcesz usunąć tę grupę? Wpisy z tej grupy zostaną automatycznie przeniesione do kategorii \'Brak grupy\'.</string>
+    <string name="remove_unused_groups">Usuń nieużywane grupy</string>
+    <string name="remove_unused_groups_description">Czy na pewno chcesz usunąć wszystkie grupy, które nie mają przypisanego żadnego wpisu?</string>
     <string name="remove_icon_pack">Usuń pakiet ikon</string>
     <string name="remove_icon_pack_description">Czy na pewno chcesz usunąć ten pakiet ikon? Wpisy, które używają ikon z tego pakietu nie zostaną zmienione.</string>
     <string name="details">Szczegóły</string>
@@ -298,13 +361,16 @@
     <string name="lock">Zablokuj</string>
     <string name="name">Nazwa</string>
     <string name="no_group">Brak grupy</string>
-    <string name="sort">Sortuj</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sortuj</string>
     <string name="sort_alphabetically">Wydawca (od A do Z)</string>
     <string name="sort_alphabetically_reverse">Wydawca (od Z do A)</string>
     <string name="sort_alphabetically_name">Konto (od A do Z)</string>
     <string name="sort_alphabetically_name_reverse">Konto (od Z do A)</string>
     <string name="sort_usage_count">Licznik użycia</string>
+    <string name="sort_last_used">Ostatnie użycie</string>
     <string name="sort_custom">Niestandardowe</string>
+    <string name="last_used">Ostatnio używane</string>
+    <string name="last_used_never">nigdy</string>
     <string name="new_group">Nowa grupa…</string>
     <string name="group">Grupa</string>
     <string name="group_name_hint">Nazwa grupy</string>
@@ -313,13 +379,33 @@
     <string name="preference_reset_usage_count">Zeruj licznik użycia</string>
     <string name="preference_reset_usage_count_summary">Zresetuj liczbę użyć każdego wpisu w Twoim sejfie</string>
     <string name="preference_reset_usage_count_dialog">Czy na pewno chcesz ustawić liczbę użyć każdego wpisu w sejfie na 0?</string>
-    <string name="note">Notatki</string>
+    <string name="note" comment="Users can add a note to an entry">Notatki</string>
     <string name="clear">Wyczyść</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Duplikat wpisu</string>
+    <string name="dialog_duplicate_entry_message">Ten wpis ma tę samą nazwę i wystawcę co jeden lub więcej istniejących wpisów. Jak chcesz kontynuować?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Nadpisz istniejący wpis/wpisy</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Zastąp istniejący wpis lub wpisy nowym. Tej czynności nie można cofnąć</string>
+    <string name="dialog_duplicate_entry_suffix_title">Dodaj przyrostek</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Dodaj przyrostek do nazwy tego nowego wpisu. Nowa nazwa to: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Anuluj zapis</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Umożliwia edycję wpisu przed ponowną próbą jego zapisania</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Czy na pewno chcesz usunąć %d wpis o następującej nazwie:\n\n%s - %s</item>
+        <item quantity="few">Czy na pewno chcesz usunąć %d wpisy o następującej nazwie:\n\n%s - %s</item>
+        <item quantity="many">Czy na pewno chcesz usunąć %d wpisów o następującej nazwie:\n\n%s - %s</item>
+        <item quantity="other">Czy na pewno chcesz usunąć %d wpisów o następującej nazwie:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Potwiedź usunięcie</string>
+    <string name="pref_haptic_feedback_summary">Spraw, aby urządzenie wibrowało podczas odświeżania kodów</string>
+    <string name="pref_haptic_feedback_title">Dotykowe sprzężenie zwrotne</string>
     <string name="pref_highlight_entry_title">Podświetl tokeny podczas kliknięcia</string>
     <string name="pref_highlight_entry_summary">Wyróżnij tokeny od siebie poprzez tymczasowe podświetlenie po ich kliknięciu</string>
+    <string name="pref_groups_multiselect_title">Wybór wielokrotny grup</string>
+    <string name="pref_groups_multiselect_summary">Zezwalaj na wybór wielu grup jednocześnie</string>
     <string name="pref_minimize_on_copy_title">Zminimalizuj przy skopiowaniu</string>
     <string name="pref_minimize_on_copy_summary">Zminimalizuj aplikację po skopiowaniu tokenu</string>
     <string name="pref_copy_behavior_title">Skopiuj tokeny do schowka</string>
+    <string name="pref_search_behavior_title">Zachowanie wyszukiwania</string>
     <string name="pref_pause_entry_title">Zamroź tokeny po naciśnięciu</string>
     <string name="pref_pause_entry_summary">Wstrzymaj automatyczne odświeżanie tokenów poprzez dotknięcie ich. Tokeny nie będą aktualizowane tak długo, jak długo są podświetlone. Wymaga \"Podświetl tokeny podczas kliknięcia\" lub \"Kliknij, aby odkryć\".</string>
     <string name="pin_keyboard_description">Wpisz hasło, aby włączyć klawiaturę numeryczną. Pamiętaj, że ta klawiatura działa tylko dla hasła numerycznego</string>
@@ -335,18 +421,19 @@
     <string name="normal_viewmode_title">Normalny</string>
     <string name="compact_mode_title">Kompaktowy</string>
     <string name="small_mode_title">Mały</string>
+    <string name="tiles_mode_title">Pola</string>
     <string name="unknown_issuer">Nieznany wydawca</string>
     <string name="unknown_account_name">Nieznana nazwa konta</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aplikacja Aegis nie może zaimportować %d tokenu. Te tokeny zostaną pominięte. Kliknij \'Szczegóły\', aby zobaczyć więcej informacji o błędach.</item>
-        <item quantity="few">Aplikacja Aegis nie może zaimportować %d tokenów. Te tokeny zostaną pominięte. Kliknij \'Szczegóły\', aby zobaczyć więcej informacji o błędach.</item>
-        <item quantity="many">Aplikacja Aegis nie może zaimportować %d tokenów. Te tokeny zostaną pominięte. Kliknij \'Szczegóły\', aby zobaczyć więcej informacji o błędach.</item>
-        <item quantity="other">Aplikacja Aegis nie może zaimportować %d tokenów. Te tokeny zostaną pominięte. Kliknij \'Szczegóły\', aby zobaczyć więcej informacji o błędach.</item>
+        <item quantity="one">Aplikacja Aegis nie może zaimportować %d token. Ten token zostanie pominięty. Kliknij \'szczegóły\', aby zobaczyć więcej informacji o błędzie.</item>
+        <item quantity="few">Aplikacja Aegis nie może zaimportować %d tokenów. Te tokeny zostaną pominięte. Kliknij \'szczegóły\', aby zobaczyć więcej informacji o błędach.</item>
+        <item quantity="many">Aplikacja Aegis nie może zaimportować %d tokenów. Te tokeny zostaną pominięte. Kliknij \'szczegóły\', aby zobaczyć więcej informacji o błędach.</item>
+        <item quantity="other">Aplikacja Aegis nie może zaimportować %d tokenów. Te tokeny zostaną pominięte. Kliknij \'szczegóły\', aby zobaczyć więcej informacji o błędach.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Nie można przetworzyć głębokiego linku</string>
     <string name="unable_to_read_qrcode_file">Nie można odczytać i przetworzyć kodu QR z pliku: %s.</string>
     <string name="unable_to_process_shared_text">Nie można przetworzyć udostępnionego tekstu jako OTP</string>
-    <string name="unable_to_read_qrcode_files">Nie można odczytać i przetworzyć niektórych kodów QR. Zaimportowano tylko %d/%d wpisów.</string>
+    <string name="unable_to_read_qrcode_files">Nie można odczytać i przetworzyć niektórych kodów QR. Zaimportowano tylko %1$d/%2$d wpisów.</string>
     <string name="unable_to_generate_qrcode">Nie udało się wygenerować kodu QR</string>
     <string name="select_picture">Wybierz obraz</string>
     <string name="select_icon">Wybierz ikonę</string>
@@ -378,14 +465,16 @@
     <string name="time_sync_warning_disable">Nie ostrzegaj mnie. Wiem co robię.</string>
     <string name="google_qr_export_unrelated">Znaleziono niepowiązany kod QR. Spróbuj ponownie uruchomić skaner.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Zeskanowano %d/%d kodów QR</item>
-        <item quantity="few">Zeskanowano %d/%d kodów QR</item>
-        <item quantity="many">Zeskanowano %d/%d kodów QR</item>
-        <item quantity="other">Zeskanowano %d/%d kodów QR</item>
+        <item quantity="one">Zeskanowano %1$d/%2$d kod QR</item>
+        <item quantity="few">Zeskanowano %1$d/%2$d kody QR</item>
+        <item quantity="many">Zeskanowano %1$d/%2$d kodów QR</item>
+        <item quantity="other">Zeskanowano %1$d/%2$d kodów QR</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Aplikacja oczekiwała kodu QR nr %d, lecz zeskanowano kod nr %d</string>
+    <string name="google_qr_export_unexpected">Aplikacja oczekiwała kodu QR nr %1$d, lecz zeskanowano kod nr %2$d</string>
     <string name="backup_error_bar_message"><b>Ostatnia kopia zapasowa sejfu nie powiodła się</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Ostatnia próba wykonania kopii zapasowej sejfu z użyciem %s nie powiodła się, ponieważ wystąpił błąd. Kopia zapasowa została wykonana w: %s. Sprawdź ustawienia kopii zapasowej, aby upewnić się, że wykonywanie kopii zapasowych może się pomyślnie zakończyć.    </string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Ostatnia próba wykonania kopii zapasowej sejfu z użyciem %1$s nie powiodła się, ponieważ wystąpił błąd. Kopia zapasowa została wykonana w: %2$s. Sprawdź ustawienia kopii zapasowej, aby upewnić się, że wykonywanie kopii zapasowych może się pomyślnie zakończyć.    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Niedawna próba wykonania kopii zapasowej używając %1$s nie powiodła się, ponieważ Aegis nie miał uprawnienia do zapisu w wybranym folderze. Próba zapisu była wykonana %2$s. Teb błąd może wystąpić po przeniesieniu/zmianie nazwy wybranego folderu lub po niedawnym przywróceniu Aegis z kopii zapasowej. Proszę wybrać poprawny folder.
+    </string>
     <string name="backup_system_builtin">Wbudowane automatyczne kopie zapasowe Aegis</string>
     <string name="backup_system_android">System kopii zapasowej w chmurze Android</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Najnowsza kopia zapasowa jest nieaktualna (%s)
@@ -420,14 +509,15 @@
     <string name="copy_uri">Kopiuj URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Nie można skopiować URI do schowka</string>
     <string name="uri_copied_to_clipboard">Skopiowano URI do schowka</string>
-    <string name="transfer_entry">Przenieś wpis</string>
     <string name="transfer_entry_description">Zeskanuj kod QR za pomocą aplikacji uwierzytelniającej, do której chcesz przenieść ten wpis</string>
+    <string name="transfer_entry_brightness">Stuknij kod QR, aby przełączyć pełną jasność ekranu</string>
     <string name="google_auth_compatible_transfer_description">Zeskanuj te kody QR za pomocą Aegis lub Google Authenticator.\n\nZ powodu ograniczeń w aplikacji Google Authenticator, tylko tokeny TOTP &amp; HOTP, które używają SHA1 i generują 6 cyfrowe kody są uwzględniane</string>
     <string name="password_strength_very_weak">Bardzo słabe</string>
     <string name="password_strength_weak">Słabe</string>
     <string name="password_strength_fair">Przyzwoite</string>
     <string name="password_strength_good">Dobre</string>
     <string name="password_strength_strong">Silne</string>
+    <string name="password_strength_unknown">Hasło jest zbyt długie, by przeprowadzić analizę bezpieczeństwa</string>
     <string name="pref_pin_keyboard_title">Używaj klawiatury numerycznej na ekranie blokady</string>
     <string name="pref_pin_keyboard_summary">Włącz tę opcję, jeśli chcesz włączyć klawiaturę numeryczną na ekranie blokady. Ta klawiatura działa tylko z numerycznymi hasłami</string>
     <string name="title_activity_preferences">Ustawienia</string>
@@ -436,35 +526,48 @@
     <string name="title_activity_about">O aplikacji</string>
     <string name="title_activity_edit_entry">Edytuj wpis</string>
     <string name="title_activity_scan_qr">Skanuj kod QR</string>
-    <string name="title_activity_manage_slots">Zarządzaj slotami klucza</string>
     <string name="title_activity_import_entries">Importuj wpisy</string>
+    <string name="title_activity_assign_icons">Przypisz ikony</string>
+    <string name="title_activity_licenses">Licencje innych firm</string>
     <string name="dialog_wipe_entries_title">Wyczyść wpisy</string>
     <string name="dialog_wipe_entries_message">Twój sejf zawiera już wpisy. Czy chcesz usunąć te wpisy przed zaimportowaniem tego pliku?\n\n<b>W ten sposób trwale stracisz dostęp do obecnych wpisów w sejfie.</b></string>
     <string name="dialog_wipe_entries_checkbox">Wyczyść zawartość sejfu</string>
     <string name="panic_trigger_ignore_toast">Aegis otrzymał wyzwalacz paniki, ale ustawienie jest wyłączone, ignorowanie</string>
     <string name="pref_panic_trigger_title">Usuń sejf przy wyzwalaczu paniki</string>
     <string name="pref_panic_trigger_summary">Usuń sejf po otrzymaniu wyzwalacza paniki z Ripple</string>
-    <string name="import_vault">Import sejfu</string>
+    <string name="import_vault">Zaimportuj sejf Aegis</string>
+    <string name="import_vault_hint">Chcesz zaimportować z innej aplikacji 2FA? Ukończ konfigurację, a następnie przejdź do menu ustawień.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Odznaczono %d potencjalny duplikat. Sprawdź listę.</item>
+        <item quantity="few">Odznaczono %d potencjalne duplikaty. Sprawdź listę.</item>
+        <item quantity="many">Odznaczono %d potencjalnych duplikatów. Sprawdź listę.</item>
+        <item quantity="other">Odznaczono %d potencjalnych duplikatów. Sprawdź listę.</item>
+    </plurals>
     <string name="importer_help_2fas">Dostarcz plik zapasowy 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Dostarcz plik zapasowy Aegis.</string>
     <string name="importer_help_authenticator_plus">Dostarcz plik eksportu Authenticator Plus uzyskany w <b>Ustawienia -&gt; Kopia zapasowa &amp; Przywróć -&gt; Eksportuj jako tekst i HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Dostarcz plik eksportu Authenticator Pro uzyskany przez <b>Ustawienia -&gt; Kopia zapasowa -&gt; Kopia zapasowa do zaszyfrowanego pliku (zalecana)</b>.</string>
-    <string name="importer_help_authy">Dostarcz kopię <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, znajdującą się w wewnętrznym katalogu przechowywania danych Authy.</string>
+    <string name="importer_help_authy">Dostarcz kopię <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, znajdującą się w wewnętrznym katalogu pamięci Authy.</string>
     <string name="importer_help_andotp">Dostarcz plik andOTP eksportu/kopii zapasowej.</string>
     <string name="importer_help_bitwarden">Dostarcz plik kopii zapasowej Bitwarden. Zaszyfrowane pliki nie są obsługiwane.</string>
     <string name="importer_help_battle_net_authenticator">Dostarcz kopię
-<b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, znajdującą się w wewnętrznym katalogu przechowywania danych aplikacji Battle.net Authenticator.</string>
+<b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, znajdującą się w wewnętrznym katalogu pamięci Battle.net Authenticator.</string>
     <string name="importer_help_duo">Dostarcz kopię <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, znajdującą się w wewnętrznym katalogu pamięci DUO.</string>
-    <string name="importer_help_freeotp">Dostarcz kopię <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, znajdującą się w wewnętrznym katalogu przechowywania danych Authy.</string>
+    <string name="importer_help_ente_auth">Dostarcz plik eksportu Ente Auth. Obecnie obsługiwane są tylko niezaszyfrowane pliki.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Dostarcz plik kopii zapasowej.\nFreeOTP 1.x: Dostarcz kopię pliku <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> znajdującego się w katalogu FreeOTP pamięci wewnętrznej.</string>
     <string name="importer_help_freeotp_plus">Dostarcz plik eksportu FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Zgodność z FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Istnieje szereg problemów w FreeOTP 2, które mogą skutkować uszkodzonymi kopiami zapasowymi. Aegis spróbuje odzyskać jak najwięcej wpisów, ale możliwe, że niektóre lub nawet wszystkie z nich nie zostaną zaimportowane.</string>
     <string name="importer_help_google_authenticator"><b>Obsługiwane są tylko pliki bazy danych z Google Authenticator v5.10 i wcześniej</b>.\n\nDostarcz kopię <b>/data/com.google.android.apps.authenticator2/databases/databases</b>, zlokalizowane w wewnętrznym katalogu pamięci Google Authenticator.</string>
-    <string name="importer_help_microsoft_authenticator">Dostarcz kopię <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, znajdującą się w wewnętrznym katalogu przechowywania danych Authy.</string>
+    <string name="importer_help_microsoft_authenticator">Dostarcz kopię <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, znajdującą się w wewnętrznym katalogu pamięci Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Dostarcz plik tekstowy z URI Google Authenticator w każdej linii.</string>
     <string name="importer_help_steam"><b>Steam v3.0 i nowsze nie są wspierane</b>. Dostarcz kopię 
 <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>,
 zlokalizowanego w wewnętrznym katalogu Steam.</string>
+    <string name="importer_help_stratum">Dostarcz plik eksportu Stratum uzyskany przez <b>Ustawienia -&gt; Kopia zapasowa -&gt; Kopia zapasowa do zaszyfrowanego pliku (zalecana)</b>.</string>
     <string name="importer_help_totp_authenticator">Dostarcz plik eksportowy TOTP Authenticator.</string>
     <string name="importer_help_winauth">Dostarcz plik eksportowy WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Przypisz ikony</string>
+    <string name="import_assign_icons_dialog_text">Czy chcesz przypisać ikony do zaimportowanych wpisów?</string>
     <string name="importer_encrypted_exception_google_authenticator">Zaszyfrowany wpis został pominięty: %s</string>
     <string name="importer_help_direct">Importuj wpisy bezpośrednio z %s. Wymaga to zainstalowania aplikacji na tym urządzeniu i dostępu roota dla Aegis.</string>
     <string name="groups">Grupy</string>
@@ -481,31 +584,31 @@ zlokalizowanego w wewnętrznym katalogu Steam.</string>
     <string name="pref_account_name_position_hidden">Ukryta</string>
     <string name="pref_account_name_position_end">Obok wydawcy</string>
     <string name="pref_account_name_position_below">Pod wydawcą</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d sekundę temu</item>
         <item quantity="few">%d sekundy temu</item>
         <item quantity="many">%d sekund temu</item>
         <item quantity="other">%d sekund temu</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minutę temu</item>
         <item quantity="few">%d minuty temu</item>
         <item quantity="many">%d minut temu</item>
         <item quantity="other">%d minut temu</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d godzinę temu</item>
         <item quantity="few">%d godziny temu</item>
         <item quantity="many">%d godzin temu</item>
         <item quantity="other">%d godzin temu</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d dzień temu</item>
         <item quantity="few">%d dni temu</item>
         <item quantity="many">%d dni temu</item>
         <item quantity="other">%d dni temu</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d rok temu</item>
         <item quantity="few">%d lata temu</item>
         <item quantity="many">%d lat temu</item>
diff --git a/app/src/main/res/values-pt-rBR-v29/strings.xml b/app/src/main/res/values-pt-rBR-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 35684a02..a6eea382 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Configurações</string>
     <string name="action_about">Sobre</string>
     <string name="action_delete">Excluir</string>
@@ -10,7 +10,8 @@
     <string name="action_default_icon">Restaurar ícone padrão</string>
     <string name="discard">Descartar</string>
     <string name="save">Salvar</string>
-    <string name="issuer">Nome do serviço</string>
+    <string name="all">Tudo</string>
+    <string name="issuer">Emissor</string>
     <string name="yandex_pin">PIN (4–16 dígitos)</string>
     <string name="motp_pin">PIN (4 dígitos)</string>
     <string name="suggested">Sugerido</string>
@@ -28,17 +29,30 @@
     <string name="pref_section_security_summary">Configure criptografia, desbloqueio biométrico, bloqueio automático e outras configurações de segurança.</string>
     <string name="pref_section_import_export_title">Importar &amp; Exportar</string>
     <string name="pref_section_import_export_summary">Importe backups do Aegis ou outros aplicativos de autenticação. Crie exportações manuais do seu cofre Aegis.</string>
+    <string name="pref_section_audit_log_title">Registro de auditoria</string>
+    <string name="pref_section_audit_log_summary">Encontre uma lista de todos os eventos importantes reportados que aconteceram no app.</string>
     <string name="pref_section_backups_title">Backups</string>
     <string name="pref_section_backups_summary">Configura backups automáticos em um local da sua escolha ou habilita a participação no sistema de backup em nuvem do Android.</string>
     <string name="pref_section_icon_packs">Pacote de ícones</string>
     <string name="pref_section_icon_packs_summary">Gerencie e importe pacotes de ícones</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Cores dinâmicas</string>
+    <string name="pref_dynamic_colors_summary">Aplicar uma sobreposição baseada nas cores do seu tema Android</string>
     <string name="pref_view_mode_title">Modo de exibição</string>
     <string name="pref_lang_title">Idioma</string>
     <string name="pref_show_icons_title">Mostrar Ícones</string>
     <string name="pref_show_icons_summary">Mostrar ícones ao lado de cada entrada</string>
     <string name="pref_code_group_size_title">Agrupamento de dígitos</string>
     <string name="pref_code_group_size_summary">Selecione o número de dígitos para agrupar códigos</string>
+    <string name="pref_account_name_position_title">Mostrar nome da conta</string>
+    <string name="pref_show_next_code_title">Mostrar próximo código</string>
+    <string name="pref_show_next_code_summary">Gerar e mostrar o próximo código antes do tempo</string>
+    <string name="pref_expiration_state_title">Indicar quando códigos estão prestes a expirar</string>
+    <string name="pref_expiration_state_summary">Mudar a cor dos códigos e fazê-los piscar quando estão prestes a expirar</string>
+    <string name="pref_expiration_state_fallback">Mudar a cor dos códigos quando estão prestes a expirar</string>
+    <string name="pref_shared_issuer_account_name_title">Exibir o nome da conta apenas quando necessário</string>
+    <string name="pref_shared_issuer_account_name_summary">Mostra os nomes de conta apenas quando eles compartilham o mesmo emissor. Outros nomes de conta serão ocultados.</string>
+    <string name="pref_account_name_position_summary_override">Esta configuração é substituída pelo modo de visualização em grade. O nome da conta será mostrado abaixo do emissor.</string>
     <string name="pref_import_file_title">Importar de arquivo</string>
     <string name="pref_import_file_summary">Importa tokens de um arquivo</string>
     <string name="pref_android_backups_title">Backups na nuvem do Android</string>
@@ -50,15 +64,23 @@
     <string name="pref_backups_reminder_summary">Mostrar um lembrete para fazer backup do seu cofre caso você não o tenha feito de suas alterações mais recentes.</string>
     <string name="pref_backups_reminder_dialog_title">Desabilitar lembrete de backup</string>
     <string name="pref_backups_reminder_dialog_summary">Desativar este lembrete significa que o Aegis não vai te dizer se você tem ou não alterações que ainda não foram salvas. Isso te coloca em risco de perder acesso aos seus tokens. Tem certeza de que deseja desativar o lembrete?</string>
-    <string name="pref_backups_location_title">Diretório para aquivos de backup</string>
+    <string name="pref_backups_versioning_strategy_title">Estratégia de backup</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Manter várias versões</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Um único backup</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">A estratégia de backup selecionada não é adequada e não é recomendada. Uma única falha no backup pode levar à perda de seu único backup.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Selecione uma estratégia de backup</string>
+    <string name="pref_backups_location_title">Localização do backup</string>
     <string name="pref_backups_location_summary">Backups são armazenados em</string>
+    <string name="pref_backup_location_summary">O backup será armazenado em</string>
     <string name="pref_backups_trigger_title">Ativar backup</string>
     <string name="pref_backups_trigger_summary">Ativa manualmente um backup</string>
     <string name="pref_backups_versions_title">Número de versões a manter</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Manter %1$d versão do backup</item>
         <item quantity="other">Manter %1$d versões do backup</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Manter um número infinito de versões do backup</string>
     <string name="pref_import_app_title">Importar de um app</string>
     <string name="pref_import_app_summary">Importa tokens de um app (requer acesso root)</string>
     <string name="pref_export_title">Exportar</string>
@@ -94,8 +116,34 @@
     <string name="pref_encryption_summary">Criptografa o cofre e o desbloqueia com uma senha ou biometria</string>
     <string name="pref_biometrics_title">Desbloqueio biométrico</string>
     <string name="pref_biometrics_summary">Permite autenticação por biometria para desbloquear o cofre</string>
+    <string name="pref_search_behavior_summary">Pesquisar por %s</string>
+    <string name="pref_search_behavior_prompt">Pesquisar em qualquer um dos seguintes campos</string>
+    <string name="pref_search_behavior_type_name">Nome</string>
+    <string name="pref_search_behavior_type_issuer">Emissor</string>
+    <string name="pref_search_behavior_type_note">Nota</string>
+    <string name="pref_search_behavior_type_groups">Grupos</string>
     <string name="pref_set_password_title">Trocar senha</string>
     <string name="pref_set_password_summary">Define uma nova senha que será necessária para desbloquear o cofre</string>
+    <string name="no_events_title">Nenhum evento reportado</string>
+    <string name="no_events_description">Nenhum evento importante foi reportado no app</string>
+    <string name="event_title_vault_unlocked">Cofre desbloqueado</string>
+    <string name="event_description_vault_unlocked">O cofre foi desbloqueado com sucesso</string>
+    <string name="event_title_backup_created">Backup criado</string>
+    <string name="event_description_backup_created">Um backup do cofre foi criado com sucesso</string>
+    <string name="event_title_android_backup_created">Backup criado pelo Android</string>
+    <string name="event_description_android_backup_created">Um backup do cofre foi criado com sucesso pelo Android</string>
+    <string name="event_title_vault_exported">Cofre exportado</string>
+    <string name="event_description_vault_exported">Uma cópia do cofre foi exportada</string>
+    <string name="event_title_entry_shared">Entrada compartilhada</string>
+    <string name="event_description_entry_shared">Uma entrada foi compartilhada</string>
+    <string name="event_title_vault_unlock_failed_password">O desbloqueio do cofre falhou (senha)</string>
+    <string name="event_description_vault_unlock_failed_password">Uma tentativa de desbloquear o cofre com uma senha falhou</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Falha ao desbloquear o cofre (biometria)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Uma tentativa de desbloquear o cofre com a biometria falhou</string>
+    <string name="event_unknown">Tipo de evento desconhecido</string>
+    <string name="audit_log_entry_deleted">(excluído)</string>
+    <string name="today_at_time">Hoje às %1$s</string>
+    <string name="day_of_week_at_time">%1$s em %2$s</string>
     <string name="export_encrypted">Criptografar o cofre</string>
     <string name="export_help">Esta ação irá exportar o cofre para fora do armazenamento interno do Aegis. Selecione o formato em que você gostaria que sua exportação esteja:</string>
     <string name="export_warning_unencrypted">Você está prestes a exportar uma cópia não criptografada de seu cofre Aegis. <b>Isso não é recomendado</b>.</string>
@@ -112,7 +160,7 @@
         <item quantity="other">%d Grupos selecionados</item>
     </plurals>
     <string name="export_no_groups_selected">Nenhum grupo selecionado para exportar</string>
-    <string name="export_html_title" context="The title of an HTML export document">Exportação Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Exportação Aegis Authenticator</string>
     <string name="choose_authentication_method">Segurança</string>
     <string name="authentication_method_explanation">Aegis é uma app 2FA focado em segurança. Tokens serão armazenados em um cofre, que pode opcionalmente ser criptografado com uma senha da sua escolha. Caso um invasor obtenha seu arquivo do cofre criptografado, ele não será capaz de acessar os conteúdos sem saber sua senha.\n\nNós pré-selecionamos a opção que nós pensamos que melhor se adapta ao seu aparelho.</string>
     <string name="authentication_method_none">Nenhuma</string>
@@ -131,6 +179,9 @@
     <string name="set_password_confirm">Por favor, confirme a senha</string>
     <string name="invalid_password">A senha está incorreta</string>
     <string name="invalidated_biometrics">Foi detectada uma alteração nas configurações de segurança do seu dispositivo. Por favor, vá até \"Aegis -&gt; Configurações -&gt; Segurança -&gt; Desbloqueio biométrico\" para desativar e reativar o desbloqueio biométrico.</string>
+    <string name="password_reminder">Por favor, digite sua senha. Nós ocasionalmente pedimos que você faça isso para que não a esqueça.</string>
+    <string name="password_reminder_dialog_title">Desbloqueio biométrico por padrão</string>
+    <string name="password_reminder_dialog_message">Ocasionalmente pedimos que você digite sua senha em vez disso para garantir que você não se esqueça dela e não fique bloqueado para o seu cofre. Depois de digitar sua senha uma vez, o Aegis retornará ao desbloqueio biométrico por padrão até que seja hora de outro lembrete de senha.</string>
     <string name="password_reminder_freq_never">Nunca</string>
     <string name="password_reminder_freq_weekly">Semanalmente</string>
     <string name="password_reminder_freq_biweekly">Quinzenalmente</string>
@@ -145,6 +196,7 @@
     <string name="share">Compartilhar</string>
     <string name="yes">Sim</string>
     <string name="no">Não</string>
+    <string name="undo">Desfazer</string>
     <string name="unlock">Desbloquear</string>
     <string name="advanced">Avançado</string>
     <string name="counter">Contador</string>
@@ -156,6 +208,11 @@
     <string name="set_up_biometric">Preparar desbloqueio biométrico</string>
     <string name="copy">Copiar</string>
     <string name="edit">Editar</string>
+    <string name="select_all">Selecionar tudo</string>
+    <string name="assign_icons">Atribuir ícones</string>
+    <string name="assign_groups">Atribuir ao grupo</string>
+    <string name="assign_groups_dialog_summary">Selecione um grupo para o qual deseja atribuir os itens selecionados.</string>
+    <string name="assign_groups_dialog_dropdown">Selecionar grupo</string>
     <string name="favorite" comment="Verb">Favorito</string>
     <string name="unfavorite" comment="Verb">Remover dos favoritos</string>
     <string name="error_all_caps">ERRO</string>
@@ -170,26 +227,29 @@
     <string name="snackbar_authentication_method">Por favor selecione um método de autenticação</string>
     <string name="encrypting_vault">Criptografando o cofre</string>
     <string name="exporting_vault">Exportando o cofre</string>
+    <string name="optimizing_icon">Otimizando ícone</string>
+    <string name="optimizing_icon_multiple">Otimizando ícones %1$d/%2$d</string>
     <string name="reading_file">Lendo arquivo</string>
     <string name="requesting_root_access">Solicitando acesso root</string>
     <string name="analyzing_qr">Analisando QR code</string>
-    <string name="analyzing_qr_multiple">Analisando o QR code %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Lendo código QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Adicionada %d nova entrada ao cofre</item>
         <item quantity="other">Adicionadas %d novas entradas ao cofre</item>
     </plurals>
     <string name="importing_icon_pack">Importando pacote de ícones</string>
-    <string name="delete_entry">Deletar entrada</string>
-    <string name="delete_entry_description">Você tem certeza que deseja deletar essa entrada?</string>
+    <string name="delete_entry">Excluir entrada</string>
+    <string name="delete_entry_description">Tem certeza que deseja excluir essa entrada?</string>
     <string name="delete_entry_explanation">Esta ação não desativa a 2FA para:\n<b>%s</b>\n\nPara evitar a perda de acesso, certifique-se de ter desabilitado a 2FA ou de ter uma maneira alternativa de gerar códigos para este serviço.</string>
-    <string name="delete_entries">Deletar entradas</string>
+    <string name="delete_entries">Excluir entradas</string>
     <plurals name="delete_entries_description">
-        <item quantity="one">Você tem certeza que deseja deletar %d entrada?</item>
-        <item quantity="other">Você tem certeza que deseja deletar %d entradas?</item>
+        <item quantity="one">Você tem certeza que deseja excluir %d entrada?</item>
+        <item quantity="other">Você tem certeza que deseja excluir %d entradas?</item>
     </plurals>
     <string name="discard_changes">Descartar mudanças?</string>
     <string name="discard_changes_description">Suas mudanças não foram salvas</string>
     <string name="saving_profile_error">Erro ao salvar o perfil</string>
+    <string name="saving_assign_icons_error">Erro ao atribuir ícones</string>
     <string name="welcome">Bem-vindo</string>
     <string name="app_description">Aegis é um app 2FA grátis, seguro e de código aberto</string>
     <string name="setup_completed">Configuração concluída</string>
@@ -198,6 +258,7 @@
     <string name="copied">Copiado</string>
     <string name="errors_copied">Erros copiados para a área de transferência</string>
     <string name="version_copied">Versão copiada para a área de transferência</string>
+    <string name="error_required_field">Este campo é obrigatório</string>
     <string name="error_occurred">Um erro ocorreu</string>
     <string name="decryption_error">Um erro ocorreu durante a tentativa de desbloqueio do cofre</string>
     <string name="decryption_corrupt_error">Um erro ocorreu durante a tentativa de desbloqueio do cofre. Seu arquivo do cofre pode estar corrompido.</string>
@@ -232,7 +293,9 @@
     <string name="choose_totpauth_importer">Esse backup do TOTP Authenticator é encriptado com uma senha?</string>
     <string name="choose_application">Selecione o aplicativo do qual você gostaria de importar</string>
     <string name="choose_theme">Selecione o tema desejado</string>
+    <string name="choose_account_name_position">Selecione a posição do nome da conta desejada</string>
     <string name="choose_view_mode">Selecione o modo de visualização desejado</string>
+    <string name="choose_copy_behavior">Selecione o comportamento de copiar desejado</string>
     <string name="parsing_file_error">Um erro ocorreu durante a tentativa de analisar o arquivo</string>
     <string name="file_not_found">Erro: Arquivo não encontrado</string>
     <string name="reading_file_error">Um erro ocorreu durante a tentativa de ler o arquivo</string>
@@ -259,15 +322,20 @@
     <string name="partial_google_auth_import">Exportação incompleta do Google Authenticator detectada</string>
     <string name="partial_google_auth_import_warning">Alguns QR codes estão faltando em sua importação. Os seguintes códigos não foram encontrados:\n\n<b>%s</b>\n\nVocê pode continuar importando esta exportação parcial, mas recomendamos tentar novamente com todos os códigos QR para que não corra o risco de perder o acesso a quaisquer tokens.</string>
     <string name="missing_qr_code_descriptor">• QR code %d</string>
-    <string name="import_partial_export_anyway">Importar %d tokens mesmo assim</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importar %d token mesmo assim</item>
+        <item quantity="other">Importar %d tokens mesmo assim</item>
+    </plurals>
     <string name="import_google_auth_failure">Falha ao importar exportação do Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">A exportação contém informações para um lote não relacionado. Tente importar 1 lote de cada vez.</string>
     <string name="no_tokens_can_be_imported">Como resultado, nenhum token pode ser importado</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Desbloqueando o cofre</string>
-    <string name="slot_this_device">(esse dispositivo)</string>
+    <string name="rename_group">Renomear Grupo</string>
+    <string name="no_group_selection">Se um item não faz parte de qualquer grupo, ele pode ser encontrada em \"Sem grupo\".</string>
     <string name="remove_group">Remover grupo</string>
     <string name="remove_group_description">Você tem certeza que deseja remover esse grupo? Entradas nesse grupo serão automaticamente para \'Sem grupo\'.</string>
+    <string name="remove_unused_groups">Excluir grupos não utilizados</string>
+    <string name="remove_unused_groups_description">Tem certeza que deseja excluir todos os grupos que não são atribuídos a uma entrada?</string>
     <string name="remove_icon_pack">Remover pacote de ícones</string>
     <string name="remove_icon_pack_description">Tem certeza que deseja remover este pacote de ícones? Entradas que usam ícones deste pacote não serão afetadas.</string>
     <string name="details">Detalhes</string>
@@ -275,27 +343,49 @@
     <string name="lock">Bloquear</string>
     <string name="name">Conta</string>
     <string name="no_group">Sem grupo</string>
-    <string name="sort">Ordenar</string>
-    <string name="sort_alphabetically">Nome (A to Z)</string>
-    <string name="sort_alphabetically_reverse">Nome (Z to A)</string>
-    <string name="sort_alphabetically_name">Conta (A to Z)</string>
-    <string name="sort_alphabetically_name_reverse">Conta (Z to A)</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ordenar</string>
+    <string name="sort_alphabetically">Emissor (A a Z)</string>
+    <string name="sort_alphabetically_reverse">Emissor (Z a A)</string>
+    <string name="sort_alphabetically_name">Conta (A a Z)</string>
+    <string name="sort_alphabetically_name_reverse">Conta (Z a A)</string>
     <string name="sort_usage_count">Contagem de uso</string>
+    <string name="sort_last_used">Último uso</string>
     <string name="sort_custom">Personalizado</string>
+    <string name="last_used">Último uso</string>
+    <string name="last_used_never">nunca</string>
     <string name="new_group">Novo grupo…</string>
     <string name="group">Grupo</string>
     <string name="group_name_hint">Nome do grupo</string>
     <string name="preference_manage_groups">Editar grupos</string>
-    <string name="preference_manage_groups_summary">Gerencie e delete seus grupos aqui</string>
+    <string name="preference_manage_groups_summary">Gerencie e exclua seus grupos aqui</string>
     <string name="preference_reset_usage_count">Redefinir contagem de uso</string>
     <string name="preference_reset_usage_count_summary">Redefinir a contagem de uso de todas as entradas no seu cofre</string>
     <string name="preference_reset_usage_count_dialog">Tem certeza que deseja definir a contagem de uso de todas as entradas no seu cofre para 0?</string>
-    <string name="note">Nota</string>
+    <string name="note" comment="Users can add a note to an entry">Nota</string>
     <string name="clear">Limpar</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Entrada duplicada</string>
+    <string name="dialog_duplicate_entry_message">Esta entrada tem o mesmo nome e emissor que uma ou mais entradas existentes. Como você gostaria de proceder?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Sobrescrever entrada(s) existente(s)</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Substituir a(s) entrada(s) existente(s) pela nova. Esta ação não poderá ser desfeita</string>
+    <string name="dialog_duplicate_entry_suffix_title">Adicionar sufixo</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Adicionar sufixo ao nome da nova entrada. O novo nome será: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Cancelar salvamento</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Permitir a edição da entrada antes de tentar salvá-la novamente</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Tem certeza de que deseja excluir %d entrada com o seguinte nome:\n\n%s - %s</item>
+        <item quantity="other">Tem certeza de que deseja excluir %d entradas com os seguintes nomes:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Confirmar exclusão</string>
+    <string name="pref_haptic_feedback_summary">Ativar vibração do dispositivo ao atualizar os códigos</string>
+    <string name="pref_haptic_feedback_title">Resposta tátil</string>
     <string name="pref_highlight_entry_title">Destacar tokens quando tocados</string>
     <string name="pref_highlight_entry_summary">Torna tokens mais fáceis de distinguir dos outros destacando eles temporariamente quando tocados</string>
+    <string name="pref_groups_multiselect_title">Múltipla seleção de grupos</string>
+    <string name="pref_groups_multiselect_summary">Permitir a seleção de vários grupos ao mesmo tempo</string>
     <string name="pref_minimize_on_copy_title">Minimizar ao copiar</string>
     <string name="pref_minimize_on_copy_summary">Minimizar o aplicativo após copiar um token</string>
+    <string name="pref_copy_behavior_title">Copiar tokens para a área de transferência</string>
+    <string name="pref_search_behavior_title">Comportamento de pesquisa</string>
     <string name="pref_pause_entry_title">Congelar tokens quando tocados</string>
     <string name="pref_pause_entry_summary">Pausa a atualização automática dos tokens ao tocá-los. Tokens não serão atualizados desde que o foco esteja neles. Requer \"Destacar tokens quando tocados\" ou \"Tocar para exibir\".</string>
     <string name="pin_keyboard_description">Digite sua senha para ativar o teclado PIN. Observe que isso só funciona se a sua senha for constituída apenas por números</string>
@@ -311,16 +401,17 @@
     <string name="normal_viewmode_title">Normal</string>
     <string name="compact_mode_title">Compacto</string>
     <string name="small_mode_title">Pequeno</string>
-    <string name="unknown_issuer">Nome do serviço desconhecido</string>
+    <string name="tiles_mode_title">Grade</string>
+    <string name="unknown_issuer">Emissor desconhecido</string>
     <string name="unknown_account_name">Nome da conta desconhecido</string>
     <plurals name="import_error_dialog">
         <item quantity="one">Aegis não pôde importar %d token. Esse token será ignorado. Pressione \'detalhes\' para ver mais informações sobre o erro.</item>
-        <item quantity="other">Aegis não pôde importar %d tokens. Esses tokens serão pulados. Pressione \'detalhes\' para ver mais informações sobre os erros.</item>
+        <item quantity="other">Aegis não pôde importar %d tokens. Esses tokens serão ignorados. Pressione \'detalhes\' para ver mais informações sobre os erros.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Incapaz de processar a ligação profunda</string>
     <string name="unable_to_read_qrcode_file">Incapaz de ler e processar o QR code do arquivo: %s.</string>
     <string name="unable_to_process_shared_text">Incapaz de processar texto compartilhado como OTP</string>
-    <string name="unable_to_read_qrcode_files">Não foi possível ler e processar alguns dos QR codes. Apenas %d/%d serão importadas.</string>
+    <string name="unable_to_read_qrcode_files">Não foi possível ler e processar alguns dos códigos QR. Somente %1$d de %2$d itens serão importados.</string>
     <string name="unable_to_generate_qrcode">Não foi possível gerar o QR code</string>
     <string name="select_picture">Selecionar imagem</string>
     <string name="select_icon">Selecionar ícone</string>
@@ -352,12 +443,16 @@
     <string name="time_sync_warning_disable">Pare de me avisar. Eu sei o que estou fazendo.</string>
     <string name="google_qr_export_unrelated">QR code não relacionado encontrado. Tente reiniciar o scanner.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d QR code escaneado</item>
-        <item quantity="other">%d/%d QR codes escaneados</item>
+        <item quantity="one">%1$d de %2$d códigos QR escaneados</item>
+        <item quantity="other">%1$d de %2$d códigos QR escaneados</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Esperados #%d QR code, mas escaneados #%d ao invés</string>
+    <string name="google_qr_export_unexpected">Esperado código QR #%1$d, mas #%2$d foi escaneado em vez disso</string>
     <string name="backup_error_bar_message"><b>Backup do cofre falhou recentemente</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Uma tentativa recente de backup do cofre utilizando o %s falhou, pois ocorreu um erro. O backup foi tentado %s. Por favor, verifique as configurações de backup para garantir que ele possa ser concluído com sucesso.    </string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Uma tentativa recente de backup do cofre usando %1$s falhou por conta de um erro. A tentativa foi feita %2$s. Verifique suas configurações de backup para ter certeza que backups possam ser feitos com sucesso.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Uma tentativa recente de backup do cofre usando %1$s falhou pois o Aegis não tinha permissão para escrever no local do backup. A tentativa foi feita %2$s. Este erro pode ocorrer se você moveu ou renomeou o local de backup ou se recentemente restaurou um backup do Aegis.
+Por favor, configure o local de backup.
+    </string>
     <string name="backup_system_builtin">Backups automáticos do Aegis</string>
     <string name="backup_system_android">Sistema de backup em nuvem do Android</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        O backup mais recente está desatualizado (%s)
@@ -390,14 +485,15 @@
     <string name="copy_uri">Copiar URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Não foi possível copiar URI para área de transferência</string>
     <string name="uri_copied_to_clipboard">URI copiada para a área de transferência</string>
-    <string name="transfer_entry">Transferir entrada</string>
     <string name="transfer_entry_description">Escaneie esse QR code com o app autenticador para o qual você gostaria de transferir essa entrada</string>
+    <string name="transfer_entry_brightness">Toque no código QR para alternar para brilho máximo da tela</string>
     <string name="google_auth_compatible_transfer_description">Escaneie esses QR codes com Aegis ou Google Authenticator.\n\nDevido a limitações do aplicativo Google Authenticator, apenas TOTP &amp; tokens HOTP que usam SHA1 e produzem códigos de 6 dígitos estão incluídos</string>
     <string name="password_strength_very_weak">Muito fraca</string>
     <string name="password_strength_weak">Fraca</string>
     <string name="password_strength_fair">Média</string>
     <string name="password_strength_good">Boa</string>
     <string name="password_strength_strong">Forte</string>
+    <string name="password_strength_unknown">Senha muito longa para análise de força</string>
     <string name="pref_pin_keyboard_title">Usar o teclado PIN na tela de bloqueio</string>
     <string name="pref_pin_keyboard_summary">Ative esta opção se quiser habilitar o teclado PIN na tela de bloqueio. Isso só funciona para senhas numéricas</string>
     <string name="title_activity_preferences">Configurações</string>
@@ -406,32 +502,43 @@
     <string name="title_activity_about">Sobre</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escanear QR code</string>
-    <string name="title_activity_manage_slots">Gerenciar slots de chaves</string>
     <string name="title_activity_import_entries">Importar entradas</string>
+    <string name="title_activity_assign_icons">Atribuir ícones</string>
+    <string name="title_activity_licenses">Licenças de terceiros</string>
     <string name="dialog_wipe_entries_title">Limpar entradas</string>
     <string name="dialog_wipe_entries_message">O seu cofre já contém entradas. Você quer remover essas entradas antes de importar este arquivo?\n\n<b>Ao fazer isso, você perderá permanentemente o acesso às entradas existentes no cofre.</b></string>
     <string name="dialog_wipe_entries_checkbox">Limpar conteúdo do cofre</string>
     <string name="panic_trigger_ignore_toast">Aegis recebeu um gatilho de pânico, mas essa configuração está desativada, portanto será ignorado</string>
     <string name="pref_panic_trigger_title">Excluir cofre após gatilho de pânico</string>
     <string name="pref_panic_trigger_summary">Excluir cofre quando um gatilho de pânico é recebido do Ripple</string>
-    <string name="import_vault">Importar cofre</string>
+    <string name="import_vault">Importar cofre Aegis</string>
+    <string name="import_vault_hint">Quer importar de um aplicativo 2FA diferente? Complete a configuração primeiro e depois vá para o menu de configurações.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Encontrado %d possíveis duplicatas. Por favor, reveja a lista de entradas.</item>
+        <item quantity="other">Desmarcadas %d possíveis duplicatas. Por favor, reveja a lista de entradas.</item>
+    </plurals>
     <string name="importer_help_2fas">Forneça um arquivo de backup do 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Fornecer um arquivo de exportação/backup do Aegis.</string>
     <string name="importer_help_authenticator_plus">Fornecer um arquivo de exportação do Autenticador Plus obtido através de <b>Configurações -&gt; Backup &amp; Restaurar -&gt; Exportar como Texto e HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Forneça um arquivo de exportação do Autenticador Pro obtido através de <b>Configurações -&gt; Fazer backup -&gt; Fazer backup para arquivo criptografado (recomendado)</b>.</string>
     <string name="importer_help_authy">Fornecer uma cópia de <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, localizado no diretório de armazenamento interno do Authy.</string>
     <string name="importer_help_andotp">Fornecer um arquivo de exportação/backup do andOTP.</string>
     <string name="importer_help_bitwarden">Forneça um arquivo de exportação/backup do Bitwarden. Arquivos criptografados não são suportados.</string>
-    <string name="importer_help_battle_net_authenticator">Forneça uma cópia de <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, localizado no diretório de armazenamento interno do Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Forneça uma cópia de <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, localizado no diretório de armazenamento interno do Battle.net Authenticator.</string>
     <string name="importer_help_duo">Forneça uma cópia de <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, localizada no diretório de armazenamento interno do DUO.</string>
-    <string name="importer_help_freeotp">Fornecer uma cópia de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, localizado no diretório de armazenamento interno do FreeOTP.</string>
+    <string name="importer_help_ente_auth">Fornecer um arquivo de exportação de Ente Auth. Atualmente são suportados apenas arquivos não criptografados.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Forneça um arquivo de backup.\nFreeOTP 1.x: Forneça uma cópia de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, localizado na pasta de armazenamento interno do FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Fornecer um arquivo de exportação FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilidade com o FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Existe um número de problemas com o FreeOTP 2 que podem resultar em backups corrompidos. O Aegis tentará salvar o máximo de itens possíveis, mas é possível que alguns ou até todos falhem ao ser importados.</string>
     <string name="importer_help_google_authenticator"><b>Apenas os arquivos de banco de dados do Google Authenticator v5.10 e anteriores são suportados</b>.\n\nForneça uma cópia de <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, localizado no diretório de armazenamento interno do Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Fornecer uma cópia de <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, localizado no diretório de armazenamento interno do Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Fornecer um arquivo de texto simples com um URI do Google Authenticator em cada linha.</string>
     <string name="importer_help_steam"><b>Steam v3.0 e mais recentes não são suportados</b>. Forneça uma cópia de <b>/data/data/com.valvesoftware. ndroid.steam.community/files/Steamguard-*.json</b>, localizado no diretório de armazenamento interno do Steam.</string>
+    <string name="importer_help_stratum">Forneça um arquivo de exportação do Stratum obtido através das <b>Configurações -&gt; Backup -&gt; Fazer backup para arquivo criptografado (recomendado)</b>.</string>
     <string name="importer_help_totp_authenticator">Fornecer um arquivo de exportação de Autenticador TOTP.</string>
     <string name="importer_help_winauth">Fornecer um arquivo de exportação do WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Atribuir ícones</string>
+    <string name="import_assign_icons_dialog_text">Você quer atribuir ícones para as entradas importadas?</string>
     <string name="importer_encrypted_exception_google_authenticator">Entrada criptografada foi ignorada: %s</string>
     <string name="importer_help_direct">Importar entradas diretamente de %s. Isto requer que a aplicação seja instalada neste dispositivo e que acesso root seja concedido ao Aegis.</string>
     <string name="groups">Grupos</string>
@@ -442,23 +549,29 @@
     <string name="pref_grouping_size_two">Grupos de 2</string>
     <string name="pref_grouping_size_three">Grupos de 3</string>
     <string name="pref_grouping_size_four">Grupos de 4</string>
-    <plurals name="time_elapsed_seconds">
+    <string name="pref_copy_behavior_never">Nunca</string>
+    <string name="pref_copy_behavior_single_tap">Toque único</string>
+    <string name="pref_copy_behavior_double_tap">Toque duplo</string>
+    <string name="pref_account_name_position_hidden">Oculto</string>
+    <string name="pref_account_name_position_end">Ao lado do emissor</string>
+    <string name="pref_account_name_position_below">Abaixo do emissor</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d segundo atrás</item>
         <item quantity="other">%d segundos atrás</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minuto atrás</item>
         <item quantity="other">%d minutos atrás</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d hora atrás</item>
         <item quantity="other">%d horas atrás</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d dia atrás</item>
         <item quantity="other">%d dias atrás</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d ano atrás</item>
         <item quantity="other">%d anos atrás</item>
     </plurals>
diff --git a/app/src/main/res/values-pt-rPT-v29/strings.xml b/app/src/main/res/values-pt-rPT-v29/strings.xml
new file mode 100644
index 00000000..6a9db6d3
--- /dev/null
+++ b/app/src/main/res/values-pt-rPT-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Predefinição do sistema</string>
+    <string name="system_amoled_theme_title">Predefinição do sistema (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ba08b2ec..7c412b57 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Definições</string>
-    <string name="action_about">Acerca</string>
+    <string name="action_about">Acerca de</string>
     <string name="action_delete">Eliminar</string>
     <string name="action_transfer">Transferir</string>
     <string name="action_edit_icon">Editar ícone</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Restaurar ícone padrão</string>
     <string name="discard">Descartar</string>
     <string name="save">Guardar</string>
+    <string name="all">Tudo</string>
     <string name="issuer">Emitente</string>
     <string name="yandex_pin">PIN (4-16 dígitos)</string>
     <string name="motp_pin">PIN (4 dígitos)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Configurar criptografia, desbloqueio biométrico, bloqueio automático e outras definições de segurança.</string>
     <string name="pref_section_import_export_title">Importar e exportar</string>
     <string name="pref_section_import_export_summary">Importar backups Aegis ou de outras aplicações de autenticação. Crie exportações manuais do seu cofre Aegis.</string>
+    <string name="pref_section_audit_log_title">Registo de auditoria</string>
+    <string name="pref_section_audit_log_summary">Encontre uma lista de todos os eventos importantes relatados que ocorreram na aplicação.</string>
     <string name="pref_section_backups_title">Backups</string>
     <string name="pref_section_backups_summary">Configure backups automáticos para uma localização à escolha ou ative a possibilidade de backup na nuvem Android.</string>
     <string name="pref_section_icon_packs">Pacotes de ícones</string>
     <string name="pref_section_icon_packs_summary">Gerir e importar pacotes de ícones</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Cores dinâmicas</string>
+    <string name="pref_dynamic_colors_summary">Aplicar uma sobreposição baseada nas cores do seu tema Android</string>
     <string name="pref_view_mode_title">Modo de exibição</string>
     <string name="pref_lang_title">Idioma</string>
     <string name="pref_show_icons_title">Mostrar ícones</string>
@@ -40,11 +45,18 @@
     <string name="pref_code_group_size_title">Agrupamento de dígitos</string>
     <string name="pref_code_group_size_summary">Selecione o número de dígitos para agrupar os códigos</string>
     <string name="pref_account_name_position_title">Mostrar nome da conta</string>
+    <string name="pref_show_next_code_title">Mostrar próximo código</string>
+    <string name="pref_show_next_code_summary">Gerar e mostrar o próximo código antes do tempo</string>
+    <string name="pref_expiration_state_title">Indicar quando os códigos estão prestes a expirar</string>
+    <string name="pref_expiration_state_summary">Alterar a cor dos códigos e fazê-los piscar quando eles estiverem prestes a expirar</string>
+    <string name="pref_expiration_state_fallback">Alterar a cor dos códigos quando eles estiverem prestes a expirar</string>
     <string name="pref_shared_issuer_account_name_title">Exibir o nome da conta apenas quando necessário</string>
+    <string name="pref_shared_issuer_account_name_summary">Mostrar apenas os nomes das contas sempre que estas partilhem o mesmo titular. Os outros nomes de contas serão ocultados.</string>
+    <string name="pref_account_name_position_summary_override">Esta definição é anulada pelo modo de visualização em mosaico. O nome da conta será apresentado por baixo do emissor.</string>
     <string name="pref_import_file_title">Importar de um ficheiro</string>
     <string name="pref_import_file_summary">Importar \'tokens\' de um ficheiro</string>
     <string name="pref_android_backups_title">Backups na nuvem Android</string>
-    <string name="pref_android_backups_summary">Permitir que o sistema de backup na nuvem Android inclua o cofre Aegis nos seus backups. Apenas possível para cofres cifrados.</string>
+    <string name="pref_android_backups_summary">Permitir que o sistema de backup na nuvem Android inclua o cofre Aegis nos seus backups. Apenas possível para cofres encriptados.</string>
     <string name="pref_android_backups_hint"><i>Backups \'Device-to-device\' (D2D) serão sempre permitidos, independentemente das definições acima</i></string>
     <string name="pref_backups_title">Backup automático do cofre</string>
     <string name="pref_backups_summary">Cria automaticamente backups no armazenamento externo, sempre que forem efetuadas alterações. Apenas possível para cofres cifrados.</string>
@@ -52,17 +64,25 @@
     <string name="pref_backups_reminder_summary">Mostrar lembrete para efetuar os backups, se as últimas alterações não tiverem sido guardadas.</string>
     <string name="pref_backups_reminder_dialog_title">Desativar lembrete de backup</string>
     <string name="pref_backups_reminder_dialog_summary">Se desativar esta opção, a aplicação não irá mostrar o lembrete mesmo que as últimas alterações não tenham sido guardadas. Desta forma, os seus \'tokens\' de acesso estarão em risco. Tem a certeza de que deseja desativar o lembrete?</string>
-    <string name="pref_backups_location_title">Diretório para os backups</string>
+    <string name="pref_backups_versioning_strategy_title">Estratégia de backup</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Manter várias versões</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Cópia de segurança única</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">A estratégia de backup selecionada não é nem fiável, nem recomendada. Uma única falha no backup pode levar à perda da sua única cópia de segurança.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Selecione uma estratégia de backup</string>
+    <string name="pref_backups_location_title">Localização da cópia de segurança</string>
     <string name="pref_backups_location_summary">Os backups serão guardados em</string>
+    <string name="pref_backup_location_summary">As cópias de segurança serão guardadas em</string>
     <string name="pref_backups_trigger_title">Ativar backup</string>
     <string name="pref_backups_trigger_summary">Ativar manualmente</string>
     <string name="pref_backups_versions_title">Número de versões a manter</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Manter %1$d versão do backup</item>
         <item quantity="other">Manter %1$d versões do backup</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Manter todas as versões de cópias de segurança efetuadas</string>
     <string name="pref_import_app_title">Importar de uma aplicação</string>
-    <string name="pref_import_app_summary">Importar \'tokens\' de uma aplicação (requer acesso root)</string>
+    <string name="pref_import_app_summary">Importar tokens de uma aplicação (requer acesso root)</string>
     <string name="pref_export_title">Exportar</string>
     <string name="pref_export_summary">Exportar cofre</string>
     <string name="pref_password_reminder_title">Lembrete de palavra-passe</string>
@@ -73,6 +93,7 @@
         <item quantity="one">Ignorada %d entrada incompatível</item>
         <item quantity="other">Ignoradas %d entradas incompatíveis</item>
     </plurals>
+    <string name="pref_password_reminder_summary">Mostra um lembrete %s para introduzir a palavra-passe, para que não se esqueça dela.</string>
     <string name="pref_password_reminder_summary_disabled">Desativado</string>
     <string name="pref_secure_screen_title">Segurança do ecrã</string>
     <string name="pref_secure_screen_summary">Bloquear capturas de ecrã e outras tentativas de capturar o ecrã na aplicação</string>
@@ -90,138 +111,271 @@
     <string name="pref_backup_password_title">Palavra-passe distinta para backups e exportação</string>
     <string name="pref_backup_password_summary">Se ativa, a palavra-passe utilizada para desbloquear a aplicação não pode ser utilizada para decifrar backups e exportações.</string>
     <string name="pref_backup_password_change_title">Alterar palavra-passe para backups e exportação</string>
-    <string name="pref_backup_password_change_summary">Defina a nova palavra-passe que será utilizada para cifrar o cofre durante os backups e a exportação.</string>
-    <string name="pref_encryption_title">Cifra</string>
-    <string name="pref_encryption_summary">Cifrar cofre e apenas desbloquear com palavra-passe ou biometria</string>
+    <string name="pref_backup_password_change_summary">Defina a nova palavra-passe que será utilizada para encriptar o cofre durante cópias de segurança e exportação.</string>
+    <string name="pref_encryption_title">Encriptação</string>
+    <string name="pref_encryption_summary">Encriptar o cofre e apenas desbloquear com palavra-passe ou biometria</string>
     <string name="pref_biometrics_title">Desbloqueio biométrico</string>
     <string name="pref_biometrics_summary">Permitir autenticação biométrica para desbloquear o cofre</string>
+    <string name="pref_search_behavior_summary">Pesquisar por %s</string>
+    <string name="pref_search_behavior_prompt">Pesquisar em qualquer um dos seguintes campos</string>
+    <string name="pref_search_behavior_type_name">Nome</string>
+    <string name="pref_search_behavior_type_issuer">Emissor</string>
+    <string name="pref_search_behavior_type_note">Nota</string>
+    <string name="pref_search_behavior_type_groups">Grupos</string>
     <string name="pref_set_password_title">Alterar palavra-passe</string>
     <string name="pref_set_password_summary">Defina a palavra-passe que será utilizada para desbloquear o cofre</string>
-    <string name="export_encrypted">Cifrar cofre</string>
+    <string name="no_events_title">Sem eventos relatados</string>
+    <string name="no_events_description">Nenhum evento importante foi relatado na aplicação</string>
+    <string name="event_title_vault_unlocked">Cofre desbloqueado</string>
+    <string name="event_description_vault_unlocked">O cofre foi desbloqueado com sucesso</string>
+    <string name="event_title_backup_created">Backup criado</string>
+    <string name="event_description_backup_created">Um backup do cofre foi criado com sucesso</string>
+    <string name="event_title_android_backup_created">Backup criado pelo Android</string>
+    <string name="event_description_android_backup_created">Um backup do cofre foi criado com sucesso pelo Android</string>
+    <string name="event_title_vault_exported">Cofre exportado</string>
+    <string name="event_description_vault_exported">Uma cópia do cofre foi exportada</string>
+    <string name="event_title_entry_shared">Entrada partilhada</string>
+    <string name="event_description_entry_shared">Uma entrada foi partilhada</string>
+    <string name="event_title_vault_unlock_failed_password">O desbloqueio do cofre falhou (palavra-passe)</string>
+    <string name="event_description_vault_unlock_failed_password">Falha ao tentar desbloquear o cofre com a palavra-passe</string>
+    <string name="event_title_vault_unlock_failed_biometrics">O desbloqueio do cofre falhou (biometria)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Falha ao tentar desbloquear o cofre com biometria</string>
+    <string name="event_unknown">Tipo de evento desconhecido</string>
+    <string name="audit_log_entry_deleted">(apagada)</string>
+    <string name="today_at_time">Hoje às %1$s</string>
+    <string name="day_of_week_at_time">%1$s às %2$s</string>
+    <string name="export_encrypted">Encriptar o cofre</string>
     <string name="export_help">Esta ação irá exportar o cofre para fora do armazenamento interno do Aegis. Selecione o formato para a exportação:</string>
-    <string name="export_warning_unencrypted">Está prestes a exportar uma cópia não cifrada do seu cofre Aegis. <b>Isto não é recomendado</b>.</string>
-    <string name="export_warning_password">As exportações serão cifradas com a palavra-passe definida nas definições de segurança.</string>
+    <string name="export_warning_unencrypted">Está prestes a exportar uma cópia não encriptada do seu cofre Aegis. <b>Isto não é recomendado</b>.</string>
+    <string name="export_warning_password">As exportações serão encriptadas com a palavra-passe definida nas definições de segurança.</string>
     <string name="understand_risk_accept">Eu compreendo os riscos</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
     <string name="export_format_google_auth_uri">Ficheiro de texto (.TXT)</string>
     <string name="export_format_html">Página Web (.HTML)</string>
+    <string name="export_format_hint">Formato de exportação</string>
+    <string name="export_all_groups">Exportar todos os grupos</string>
+    <string name="export_choose_groups">Selecionar os grupos a exportar</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="one">%d grupo selecionado</item>
+        <item quantity="other">%d grupos selecionados</item>
+    </plurals>
+    <string name="export_no_groups_selected">Nenhum grupo selecionado para exportar</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Exportação do Aegis Authenticator</string>
     <string name="choose_authentication_method">Segurança</string>
-    <string name="authentication_method_explanation">Aegis é um aplicativo 2FA focado na segurança. Tokens são armazenados em um cofre, que pode opcionalmente ser criptografado com uma senha de sua escolha. Se um invasor obtiver o seu arquivo criptografado do cofre, eles não serão capazes de acessar o conteúdo sem saber a senha.\n\nNós pré-selecionamos a opção que achamos que seria melhor para o seu dispositivo.</string>
+    <string name="authentication_method_explanation">O Aegis é uma aplicação 2FA focada em segurança. Tokens são armazenados num cofre, que pode opcionalmente ser criptografado com uma palavra-passe da sua escolha. Se um invasor obtiver o ficheiro criptografado do cofre, não conseguirá aceder ao conteúdo sem saber a palavra-passe.\n\nA opção que achamos que seria melhor para o seu dispositivo foi pré-selecionada.</string>
     <string name="authentication_method_none">Nenhum</string>
-    <string name="authentication_method_none_description">Nenhuma senha é necessária para desbloquear o cofre e não será criptografada. <b>Esta opção não é recomendada</b>.</string>
-    <string name="authentication_method_password">Senha</string>
-    <string name="authentication_method_password_description">É necessária uma senha para desbloquear o cofre.</string>
-    <string name="authentication_method_password_explanation">Aviso: Se você esquecer sua senha, você perderá permanentemente o acesso aos seus tokens. Não há como recuperá-los sem a senha.</string>
+    <string name="authentication_method_none_description">Não será necessária uma palavra-passe para desbloquear o cofre e este não será encriptado. <b>Esta opção não é recomendada</b>.</string>
+    <string name="authentication_method_password">Palavra-passe</string>
+    <string name="authentication_method_password_description">É necessária uma palavra-passe para desbloquear o cofre.</string>
+    <string name="authentication_method_password_explanation">Aviso: Se se esquecer da sua palavra-passe, perderá permanentemente o acesso aos seus tokens. Não há como recuperá-los sem a mesma.</string>
     <string name="authentication_method_biometrics">Biometria</string>
-    <string name="authentication_method_biometrics_description">Além de uma senha, a biometria registrada neste dispositivo, como uma impressão digital ou seu rosto, pode ser usada para desbloquear o cofre.</string>
+    <string name="authentication_method_biometrics_description">Para além de uma palavra-passe, a biometria registada neste dispositivo, como uma impressão digital ou o seu rosto, pode ser usada para desbloquear o cofre.</string>
     <string name="authentication">Desbloquear o cofre</string>
-    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Desbloqueie\no cofre</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Desbloqueie\no seu cofre</string>
     <string name="auth_use_biometrics">Ou toque aqui para usar <font fgcolor="#FF0D86C1">biometria</font></string>
-    <string name="set_password">Por favor, insira uma senha</string>
+    <string name="set_password">Introduza uma palavra-passe</string>
     <string name="set_group">Por favor, insira o nome do grupo</string>
     <string name="set_number">Por favor, insira um número</string>
-    <string name="set_password_confirm">Por favor, confirme a senha</string>
+    <string name="set_password_confirm">Confirme a palavra-passe</string>
     <string name="invalid_password">A senha está incorreta</string>
-    <string name="enter_password_authy_message">Parece que seus tokens Authy são criptografados. Por favor, feche o Aegis, abra o Authy e desbloqueie os tokens com sua senha. Em vez disso, Aegis também pode tentar descriptografar seus tokens Authy para você, se você inserir sua senha abaixo.</string>
+    <string name="invalidated_biometrics">Foi detetada uma alteração nas definições de segurança do dispositivo. Aceda a \"Aegis -&gt; Definições -&gt; Segurança -&gt; Desbloqueio biométrico\" para desativar e reativar o desbloqueio biométrico.</string>
+    <string name="password_reminder">Por favor, introduza a palavra-passe. Ocasionalmente, pedimos-lhe que o faça para que não se esqueça dela.</string>
+    <string name="password_reminder_dialog_title">Desbloqueio biométrico por predefinição</string>
+    <string name="password_reminder_dialog_message">Ocasionalmente, pedimos-lhe que introduza a sua palavra-passe para garantir que não se esquece dela e que não ficará bloqueado fora do cofre. Após introduzir a palavra-passe, o Aegis voltará a utilizar o desbloqueio biométrico por predefinição até ser altura de voltar a relembrar a palavra-passe.</string>
+    <string name="password_reminder_freq_never">Nunca</string>
+    <string name="password_reminder_freq_weekly">Semanal</string>
+    <string name="password_reminder_freq_biweekly">Quinzenal</string>
+    <string name="password_reminder_freq_monthly">Mensal</string>
+    <string name="password_reminder_freq_quarterly">Trimestral</string>
+    <string name="enter_password_2fas_message">Parece que esta cópia de segurança 2FAS está encriptada. Introduza abaixo a palavra-passe.</string>
+    <string name="enter_password_authy_message">Parece que os seus tokens do Authy estão encriptados. Por favor, feche o Aegis, abra o Authy e desbloqueie os tokens com a sua palavra-passe. Em vez disso, o Aegis também pode tentar desencriptar os seus tokens do Authy por si, se inserir a sua palavra-passe abaixo.</string>
+    <string name="enter_password_aegis_title">Por favor, introduza a palavra-passe de importação</string>
+    <string name="period_hint">Período (segundos)</string>
+    <string name="algorithm_hint">Função hash</string>
+    <string name="type">Tipo</string>
     <string name="share">Compartilhar</string>
     <string name="yes">Sim</string>
     <string name="no">Não</string>
+    <string name="undo">Desfazer</string>
     <string name="unlock">Desbloquear</string>
     <string name="advanced">Avançado</string>
     <string name="counter">Contador</string>
     <string name="digits">Dígitos</string>
-    <string name="secret">Secreto</string>
-    <string name="scan">Escanear código QR</string>
-    <string name="scan_image">Escanear imagem</string>
+    <string name="secret">Segredo</string>
+    <string name="scan">Ler código QR</string>
+    <string name="scan_image">Digitalizar imagem</string>
     <string name="enter_manually">Inserir manualmente</string>
-    <string name="set_up_biometric">Configurar desbloqueio biométrico</string>
+    <string name="set_up_biometric">Configurar o desbloqueio biométrico</string>
     <string name="copy">Copiar</string>
     <string name="edit">Editar</string>
-    <string name="password">Senha</string>
+    <string name="select_all">Selecionar tudo</string>
+    <string name="assign_icons">Atribuir ícones</string>
+    <string name="assign_groups">Atribuir ao grupo</string>
+    <string name="assign_groups_dialog_summary">Selecione o grupo ao qual deseja atribuir os itens selecionados.</string>
+    <string name="assign_groups_dialog_dropdown">Selecione o grupo</string>
+    <string name="favorite" comment="Verb">Favorito</string>
+    <string name="unfavorite" comment="Verb">Remover dos favoritos</string>
+    <string name="error_all_caps">ERRO</string>
+    <string name="password">Palavra-passe</string>
     <string name="confirm_password">Confirme a Senha</string>
-    <string name="show_password">Mostrar senha</string>
+    <string name="show_password">Mostrar palavra-passe</string>
     <string name="new_entry">Nova entrada</string>
     <string name="add_new_entry">Adicionar nova entrada</string>
-    <string name="unlock_vault_error">Falha ao desbloquear cofre</string>
-    <string name="unlock_vault_error_description">Senha incorreta. Certifique-se de que não digitou incorretamente sua senha.</string>
-    <string name="password_equality_error">As senhas devem ser idênticas e não vazias</string>
+    <string name="unlock_vault_error">Não foi possível desbloquear o cofre</string>
+    <string name="unlock_vault_error_description">Palavra-passe incorreta. Certifique-se de que não a digitou incorretamente.</string>
+    <string name="password_equality_error">As palavras-passe devem ser idênticas e não vazias</string>
     <string name="snackbar_authentication_method">Por favor, selecione um método de autenticação</string>
-    <string name="encrypting_vault">Criptografando o cofre</string>
-    <string name="exporting_vault">Exportando o cofre</string>
-    <string name="delete_entry">Excluir entrada</string>
+    <string name="encrypting_vault">A encriptar o cofre</string>
+    <string name="exporting_vault">A exportar o cofre</string>
+    <string name="optimizing_icon">Otimizando o ícone</string>
+    <string name="optimizing_icon_multiple">Otimizando os ícones %1$d/%2$d</string>
+    <string name="reading_file">A ler o ficheiro</string>
+    <string name="requesting_root_access">Pedir acesso root</string>
+    <string name="analyzing_qr">A analisar o código QR</string>
+    <string name="analyzing_qr_multiple">Analisando o código QR %1$d/%2$d (%3$s)</string>
+    <plurals name="added_new_entries">
+        <item quantity="one">Adicionada %d nova entrada ao cofre</item>
+        <item quantity="other">Adicionadas %d novas entradas ao cofre</item>
+    </plurals>
+    <string name="importing_icon_pack">A importar o pacote de ícones</string>
+    <string name="delete_entry">Eliminar entrada</string>
     <string name="delete_entry_description">Tem a certeza de que quer excluir esta entrada?</string>
-    <string name="delete_entries">Excluir entradas</string>
+    <string name="delete_entry_explanation">Esta ação não desativa a 2FA para:\n<b>%s</b>\n\nPara evitar a perda de acesso, certifique-se de que desativou a 2FA ou de que tem uma forma alternativa de gerar códigos para este serviço.</string>
+    <string name="delete_entries">Eliminar entradas</string>
     <plurals name="delete_entries_description">
         <item quantity="one">Você tem certeza que deseja deletar %d entrada?</item>
         <item quantity="other">Você tem certeza que deseja deletar %d entradas?</item>
     </plurals>
     <string name="discard_changes">Descartar alterações?</string>
-    <string name="discard_changes_description">Suas alterações não foram salvas</string>
-    <string name="saving_profile_error">Erro ao salvar perfil</string>
+    <string name="discard_changes_description">As suas alterações não foram guardadas</string>
+    <string name="saving_profile_error">Erro ao guardar o perfil</string>
+    <string name="saving_assign_icons_error">Erro ao atribuir ícones</string>
     <string name="welcome">Bem-vindo</string>
-    <string name="app_description">Aegis é um aplicativo 2FA gratuito, seguro e opensource</string>
+    <string name="app_description">O Aegis é uma aplicação 2FA gratuita, segura e de código aberto</string>
     <string name="setup_completed">Configuração concluída</string>
-    <string name="setup_completed_description">Aegis foi configurado e está pronto para uso.</string>
-    <string name="vault_not_found">Cofre não encontrado, iniciando configuração…</string>
+    <string name="setup_completed_description">O Aegis foi configurado e está pronto a ser usado.</string>
+    <string name="vault_not_found">Cofre não encontrado, a iniciar configuração…</string>
     <string name="copied">Copiado</string>
     <string name="errors_copied">Erros copiados para a área de transferência</string>
-    <string name="version_copied">Versão copiada para área de transferência</string>
+    <string name="version_copied">Versão copiada para a área de transferência</string>
+    <string name="error_required_field">Este campo é necessário</string>
     <string name="error_occurred">Ocorreu um erro</string>
     <string name="decryption_error">Ocorreu um erro ao tentar desbloquear o cofre</string>
-    <string name="decryption_corrupt_error">Ocorreu um erro ao tentar desbloquear o cofre. O seu arquivo de cofre pode estar corrompido.</string>
-    <string name="saving_error">Ocorreu um erro ao tentar salvar o cofre</string>
-    <string name="vault_init_error">Ocorreu um erro ao tentar inicializar o cofre</string>
+    <string name="decryption_corrupt_error">Ocorreu um erro ao tentar desbloquear o cofre. O ficheiro do cofre pode estar corrompido.</string>
+    <string name="saving_error">Ocorreu um erro ao tentar guardar o cofre</string>
+    <string name="vault_init_error">Ocorreu um erro ao tentar iniciar o cofre</string>
     <string name="vault_load_error">Ocorreu um erro ao tentar carregar o cofre do armazenamento</string>
-    <string name="biometric_decrypt_error">Ocorreu um erro ao tentar descriptografar o cofre com autenticação biométrica. Isso geralmente só acontece se as configurações de segurança do seu dispositivo foram alteradas. Por favor, desbloqueie o cofre com sua senha e reconfigure a autenticação biométrica nas configurações do Aegis.</string>
-    <string name="biometric_init_error">Ocorreu um erro ao tentar preparar a autenticação biométrica. Isso geralmente só acontece se as configurações de segurança do seu dispositivo foram alteradas. Por favor, desbloqueie o cofre com sua senha e reconfigure a autenticação biométrica nas configurações do Aegis.</string>
-    <string name="disable_encryption">Desativar criptografia</string>
-    <string name="enable_encryption_error">Ocorreu um erro ao ativar a criptografia</string>
-    <string name="disable_encryption_error">Ocorreu um erro ao desativar a criptografia</string>
-    <string name="backup_successful">O backup foi agendado com sucesso</string>
-    <string name="backup_error">Ocorreu um erro ao tentar criar um backup</string>
+    <string name="biometric_decrypt_error">Ocorreu um erro ao tentar desencriptar o cofre com autenticação biométrica. Isto só acontece normalmente se as definições de segurança do seu dispositivo foram alteradas. Por favor, desbloqueie o cofre com a sua palavra-passe e redefina a autenticação biométrica nas configurações do Aegis.</string>
+    <string name="biometric_init_error">Ocorreu um erro ao tentar preparar a autenticação biométrica. Isto só acontece normalmente se as definições de segurança do seu dispositivo foram alteradas. Por favor, desbloqueie o cofre com a sua palavra-passe e redefina a autenticação biométrica nas configurações do Aegis.</string>
+    <string name="disable_encryption">Desativar encriptação</string>
+    <string name="disable_encryption_description">Tem a certeza de que deseja desativar a encriptação? Isto fará com que o cofre seja armazenado em texto simples. <b>Os backups automáticos também serão desativados</b>.</string>
+    <string name="enable_encryption_error">Ocorreu um erro ao ativar a encriptação</string>
+    <string name="disable_encryption_error">Ocorreu um erro ao desativar a encriptação</string>
+    <string name="backup_successful">O ‘backup’ foi agendado com sucesso</string>
+    <string name="backup_error">Ocorreu um erro ao tentar criar um ‘backup’</string>
+    <string name="backup_status_success">Backup mais recente realizado com sucesso: %s</string>
+    <string name="backup_status_failed">A realização de um backup recente falhou: %s</string>
+    <string name="backup_status_none">Ainda não houve nenhum backup realizado</string>
+    <string name="backup_warning_password">Os backups são encriptados utilizando uma palavra-passe separada configurada nas definições de segurança</string>
+    <string name="documentsui_error">O módulo DocumentsUI parece estar em falta no seu dispositivo. Trata-se de um componente do sistema necessário para a seleção e criação de documentos. Se utilizou uma ferramenta para &quot;limpar&quot; o seu dispositivo, pode tê-lo eliminado acidentalmente e terá de o reinstalar.</string>
+    <string name="icon_pack_import_error">Ocorreu um erro durante o processo de importação do pacote de ícones</string>
+    <string name="icon_pack_import_exists_error">O pacote de ícones que tenta importar já existe. Pretende substituí-lo?</string>
+    <string name="icon_pack_delete_error">Ocorreu um erro durante o processo de exclusão de um pacote de ícones</string>
+    <plurals name="icon_pack_info">
+        <item quantity="one">%d ícone</item>
+        <item quantity="other">%d ícones</item>
+    </plurals>
+    <string name="icon_custom">Personalizar</string>
     <string name="permission_denied">Permissão negada</string>
     <string name="andotp_new_format">Novo formato (v0.6.3 ou mais recente) </string>
     <string name="andotp_old_format">Formato antigo (v0.6.2 ou antigo) </string>
     <string name="choose_andotp_importer">Qual o formato do arquivo de backup andOTP?</string>
     <string name="choose_totpauth_importer">Este backup TOTP Authenticator é criptografado com uma senha?</string>
-    <string name="choose_application">Selecione o aplicativo do qual você gostaria de importar</string>
+    <string name="choose_application">Selecione a aplicação da qual gostaria de importar</string>
     <string name="choose_theme">Selecione o tema</string>
+    <string name="choose_account_name_position">Selecione a posição do nome da conta desejada</string>
     <string name="choose_view_mode">Selecione o modo de visualização</string>
-    <string name="parsing_file_error">Ocorreu um erro ao tentar analisar o arquivo</string>
-    <string name="file_not_found">Erro: Arquivo não encontrado</string>
-    <string name="reading_file_error">Ocorreu um erro ao tentar ler o arquivo</string>
-    <string name="app_lookup_error">Erro: O aplicativo não está instalado</string>
+    <string name="choose_copy_behavior">Selecione o estilo de cópia que deseja efetuar </string>
+    <string name="parsing_file_error">Ocorreu um erro ao tentar analisar o ficheiro</string>
+    <string name="file_not_found">Erro: Ficheiro não encontrado</string>
+    <string name="reading_file_error">Ocorreu um erro ao tentar ler o ficheiro</string>
+    <string name="app_lookup_error">Erro: A aplicação não está instalada</string>
+    <string name="app_version_error">A versão de %s que está instalada não é suportada. As versões recentes começaram a encriptar alguns dos ficheiros no armazenamento interno, tornando o Aegis incapaz de aceder às informações necessárias para a importação. É provável que a tentativa de importação resulte num erro. Gostaria de continuar na mesma?</string>
+    <string name="root_error">Erro: Não é possível obter acesso root</string>
     <plurals name="imported_entries_count">
         <item quantity="one">%d entrada importada</item>
         <item quantity="other">%d entradas importadas</item>
     </plurals>
+    <plurals name="entries_shown">
+        <item quantity="one">A mostrar %d entrada</item>
+        <item quantity="other">A mostrar %d entradas</item>
+    </plurals>
+    <string name="intro_import_error_title">Ocorreu um erro ao importar o cofre</string>
     <string name="import_error_title">Um ou mais erros ocorreram durante a importação</string>
     <string name="exporting_vault_error">Ocorreu um erro ao tentar exportar o cofre</string>
     <string name="exported_vault">O cofre foi exportado</string>
-    <string name="encryption_set_password_error">Ocorreu um erro ao tentar definir a senha.</string>
-    <string name="encryption_enable_biometrics_error">Ocorreu um erro ao tentar ativar o desbloqueio biométrico. Alguns dispositivos têm implementações deficientes da autenticação biométrica e é provável que o seu seja um deles. Considere alternar para uma configuração somente senha.</string>
-    <string name="no_cameras_available">Nenhuma câmera disponível</string>
+    <string name="encryption_set_password_error">Ocorreu um erro ao tentar definir a palavra-passe.</string>
+    <string name="encryption_enable_biometrics_error">Ocorreu um erro ao tentar ativar o desbloqueio biométrico. Alguns dispositivos têm más implementações da autenticação biométrica e é provável que o seu seja um deles. Considere mudar para uma configuração com apenas palavra-passe.</string>
+    <string name="no_cameras_available">Nenhuma câmara disponível</string>
     <string name="read_qr_error">Ocorreu um erro ao tentar ler o código QR</string>
-    <string name="authentication_method_raw">Raw</string>
-    <string name="unlocking_vault">Desbloqueando o cofre</string>
-    <string name="slot_this_device">(este dispositivo)</string>
+    <string name="read_qr_error_phonefactor">Aegis é incompatível com o algoritmo 2FA das propriedades da Microsoft. Por favor, selecione \"Configurar aplicação sem notificações\" quando configurar 2FA no Office 365. </string>
+    <string name="partial_google_auth_import">Foi detetada uma exportação incompleta do Google Authenticator </string>
+    <string name="partial_google_auth_import_warning">Faltam alguns códigos QR na sua importação. Os seguintes códigos não foram encontrados:\n\n<b>%s</b>\n\nPode continuar a importar esta exportação parcial, mas recomendamos que tente novamente com todos os códigos QR para não correr o risco de perder o acesso a quaisquer tokens.</string>
+    <string name="missing_qr_code_descriptor">• Código QR %d</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importar %d token mesmo assim</item>
+        <item quantity="other">Importar %d tokens mesmo assim</item>
+    </plurals>
+    <string name="import_google_auth_failure">Falha ao importar a exportação do Google Authenticator</string>
+    <string name="unrelated_google_auth_batches_error">A exportação contém informações para um lote não relacionado. Experimente importar um lote de cada vez.</string>
+    <string name="no_tokens_can_be_imported">Nenhum token pode ser importado como resultado</string>
+    <string name="unlocking_vault">A desbloquear o cofre</string>
+    <string name="rename_group">Mudar o nome do grupo</string>
+    <string name="no_group_selection">Se uma entrada não faz parte de um grupo, pode ser encontrada em \"Sem grupo\".</string>
     <string name="remove_group">Remover grupo</string>
-    <string name="remove_group_description">Tem certeza que deseja remover este grupo? As entradas neste grupo automaticamente alternarão para \'Sem grupo\'.</string>
+    <string name="remove_group_description">Tem a certeza de que pretende remover este grupo? As entradas neste grupo mudarão automaticamente para \'Sem grupo\'.</string>
+    <string name="remove_unused_groups">Apagar grupos não utilizados</string>
+    <string name="remove_unused_groups_description">Tem a certeza de que pretende eliminar todos os grupos que não estão atribuídos a uma entrada?</string>
+    <string name="remove_icon_pack">Remover pacote de ícones</string>
+    <string name="remove_icon_pack_description">Tem a certeza de que pretende remover este pacote de ícones? As entradas que utilizam ícones deste pacote não serão afetadas.</string>
     <string name="details">Detalhes</string>
+    <string name="show_error_details">Mostrar detalhes do erro</string>
     <string name="lock">Bloquear</string>
     <string name="name">Nome</string>
     <string name="no_group">Sem grupo</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Ordenar</string>
     <string name="sort_alphabetically">Emissor (A a Z)</string>
     <string name="sort_alphabetically_reverse">Emissor (Z a A)</string>
     <string name="sort_alphabetically_name">Conta (A a Z)</string>
     <string name="sort_alphabetically_name_reverse">Conta (Z a A)</string>
+    <string name="sort_usage_count">Número de utilizações</string>
+    <string name="sort_last_used">Última utilização</string>
     <string name="sort_custom">Personalizado</string>
+    <string name="last_used">Última utilização</string>
+    <string name="last_used_never">nunca</string>
     <string name="new_group">Novo grupo…</string>
+    <string name="group">Grupo</string>
     <string name="group_name_hint">Nome do grupo</string>
     <string name="preference_manage_groups">Editar grupos</string>
-    <string name="preference_manage_groups_summary">Gerenciar e excluir seus grupos aqui</string>
-    <string name="pref_highlight_entry_title">Destacar tokens quando tocados</string>
-    <string name="pref_highlight_entry_summary">Faça com que os tokens sejam mais fáceis de distinguir um do outro destacando-os temporariamente ao tocá-los</string>
+    <string name="preference_manage_groups_summary">Gira e elimine os seus grupos aqui</string>
+    <string name="preference_reset_usage_count">Repor a contagem de utilização</string>
+    <string name="preference_reset_usage_count_summary">Repor a contagem de utilização de cada entrada no seu cofre</string>
+    <string name="preference_reset_usage_count_dialog">Tem a certeza de que pretende definir a contagem de utilização de cada entrada no seu cofre como 0?</string>
+    <string name="note" comment="Users can add a note to an entry">Nota</string>
+    <string name="clear">Limpar</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Entrada duplicada</string>
+    <string name="pref_haptic_feedback_summary">Faça o seu dispositivo vibrar quando os códigos forem atualizados</string>
+    <string name="pref_haptic_feedback_title">Resposta háptica</string>
+    <string name="pref_highlight_entry_title">Realçar tokens quando tocados</string>
+    <string name="pref_highlight_entry_summary">Torne os tokens mais fáceis de distinguir uns dos outros, destacando-os temporariamente quando toca neles</string>
+    <string name="pref_groups_multiselect_title">Seleção múltipla de grupos</string>
+    <string name="pref_groups_multiselect_summary">Permitir a seleção de vários grupos ao mesmo tempo</string>
+    <string name="pref_minimize_on_copy_title">Minimizar ao copiar</string>
+    <string name="pref_minimize_on_copy_summary">Após copiar um token, minimizar a aplicação </string>
+    <string name="pref_copy_behavior_title">Copiar tokens para a área de transferência</string>
+    <string name="pref_search_behavior_title">Comportamento da pesquisa</string>
+    <string name="pref_pause_entry_title">Congelar tokens quando tocados</string>
+    <string name="pref_pause_entry_summary">Pausar a atualização automática dos tokens ao tocar neles. Os tokens não serão atualizados desde que estejam em foco. Requer \"Realçar tokens quando tocados\" ou \"Toque para mostrar\".</string>
     <string name="pin_keyboard_description">Digite sua senha para ativar o teclado PIN. Observe que isso só funciona se a sua senha for constituída apenas por números</string>
     <string name="pin_keyboard_error">Erro ao habilitar o teclado PIN</string>
     <string name="pin_keyboard_error_description">Não é possível configurar o teclado PIN. A sua senha deve ser composta apenas por números.</string>
@@ -234,81 +388,171 @@
     <string name="system_amoled_theme_title">Definido pela Economia de bateria (AMOLED)</string>
     <string name="normal_viewmode_title">Normal</string>
     <string name="compact_mode_title">Compacto</string>
-    <string name="small_mode_title">Pequena</string>
+    <string name="small_mode_title">Pequeno</string>
+    <string name="tiles_mode_title">Blocos</string>
     <string name="unknown_issuer">Emissor desconhecido</string>
     <string name="unknown_account_name">Nome de conta desconhecido</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis não pôde importar %d token. Esse token será ignorado. Pressione \'detalhes\' para ver mais informações sobre o erro.</item>
-        <item quantity="other">Aegis não pôde importar %d tokens. Esses tokens serão pulados. Pressione \'detalhes\' para ver mais informações sobre os erros.</item>
+        <item quantity="one">O Aegis não conseguiu importar %d token. Este token será ignorado. Prima \"detalhes\" para obter mais informações sobre o erro.</item>
+        <item quantity="other">O Aegis não conseguiu importar %d tokens. Estes tokens serão ignorados. Prima \"detalhes\" para obter mais informações sobre os erros.</item>
     </plurals>
+    <string name="unable_to_process_deeplink">Não é possível processar a ligação profunda</string>
+    <string name="unable_to_read_qrcode_file">Não foi possível ler e processar o código QR do ficheiro: %s.</string>
+    <string name="unable_to_process_shared_text">Não é possível processar o texto partilhado como OTP</string>
+    <string name="unable_to_read_qrcode_files">Impossível ler e processar alguns códigos QR. Apenas as entradas %1$d/%2$d serão importadas.</string>
     <string name="unable_to_generate_qrcode">Não foi possível gerar o código QR</string>
     <string name="select_picture">Selecionar imagem</string>
     <string name="select_icon">Selecionar ícone</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Abrir cofre</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Abrir digitalizador</string>
     <string name="toggle_checkboxes">Alternar caixas de seleção</string>
     <string name="search">Pesquisar</string>
-    <string name="channel_name_lock_status">Status de bloqueio</string>
-    <string name="channel_description_lock_status">Aegis pode criar uma notificação persistente para notificá-lo quando o cofre estiver bloqueado</string>
-    <string name="vault_unlocked_state">O Cofre está desbloqueado. Toque aqui para bloquear.</string>
+    <string name="channel_name_lock_status">Estado de bloqueio</string>
+    <string name="channel_description_lock_status">O Aegis pode criar uma notificação persistente para informá-lo quando o cofre estiver bloqueado</string>
+    <string name="vault_unlocked_state">O cofre está desbloqueado. Toque aqui para bloquear.</string>
     <string name="version">Versão</string>
     <string name="changelog">Registo de alterações</string>
     <string name="whats_new">O que há de novo</string>
     <string name="github_description">Código fonte, problemas e informações</string>
+    <string name="license">Licença</string>
+    <string name="license_description">O Autenticador Aegis está licenciado sob GPLv3</string>
+    <string name="third_party_licenses">Licenças de terceiros</string>
+    <string name="third_party_licenses_description">Licenças das bibliotecas de terceiros utilizadas pelo Aegis</string>
     <string name="country_netherlands">Holanda</string>
     <string name="email_us">Escreva um e-mail</string>
     <string name="visit_website">Visite o nosso site</string>
     <string name="about_support">Suporte</string>
     <string name="support_rate">Avaliar</string>
     <string name="support_rate_description">Apoie-nos deixando uma avaliação na Google Play Store</string>
+    <string name="webview_error">Este dispositivo não suporta a vista web, necessária para ver o registo de alterações e a licença. Falta-lhe um componente do sistema.</string>
     <string name="email">Email</string>
     <string name="time_sync_warning_title">Sincronização de tempo automática</string>
-    <string name="time_sync_warning_message">O Aegis depende da hora do sistema para estar sincronizado para gerar códigos corretos. Um desvio de apenas alguns segundos pode resultar em códigos incorretos. Parece que seu dispositivo não está configurado para sincronizar automaticamente o tempo. Gostaria de fazer isso agora?</string>
-    <string name="time_sync_warning_disable">Pare de me avisar. Eu sei o que estou fazendo.</string>
-    <string name="google_qr_export_unrelated">Código QR não relacionado. Tente reiniciar o scanner.</string>
+    <string name="time_sync_warning_message">O Aegis depende da hora do sistema para estar sincronizado para gerar códigos corretos. Um desvio de apenas alguns segundos pode resultar em códigos incorretos. Parece que o seu dispositivo não está configurado para sincronizar automaticamente o tempo. Gostaria de o fazer agora?</string>
+    <string name="time_sync_warning_disable">Para de me avisar. Eu sei o que estou a fazer.</string>
+    <string name="google_qr_export_unrelated">Código QR não relacionado. Experimente reiniciar o digitalizador.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d QR code escaneado</item>
-        <item quantity="other">%d/%d QR codes escaneados</item>
+        <item quantity="one">%1$d/%2$d códigos QR digitalizados</item>
+        <item quantity="other">%1$d/%2$d códigos QR digitalizados</item>
     </plurals>
-    <string name="google_qr_export_unexpected">#%d códigos QR eram esperados, mas #%d foram escaneados em vez disso</string>
-    <string name="backup_error_bar_message"><b>O backup do cofre falhou recentemente</b></string>
+    <string name="google_qr_export_unexpected">Esperado o código QR #%1$d, mas digitalizado #%2$d em vez disso</string>
+    <string name="backup_error_bar_message"><b>O ‘backup’ do cofre falhou recentemente</b></string>
+    <string name="backup_system_builtin">backups automáticos do Aegis</string>
+    <string name="backup_system_android">sistema de backup na nuvem do Android</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">O último backup está desatualizado (%s)</string>
+    <string name="backup_reminder_bar_message">As mudanças não foram gravadas</string>
+    <string name="backup_reminder_bar_dialog_title">As mudanças não foram gravadas</string>
+    <string name="backup_reminder_bar_dialog_summary">        As alterações recentes ao cofre ainda não foram objeto de backup. É importante efetuar backups regulares para evitar a perda de acesso às suas contas. Considere a possibilidade de configurar backups automáticos nas definições.
+    </string>
+    <string name="backup_reminder_bar_dialog_accept">Configurar backups</string>
+    <string name="backup_plaintext_export_warning"><b>O cofre foi exportado recentemente em texto simples</b></string>
+    <string name="pref_show_plaintext_warning_hint">Não mostrar este aviso novamente</string>
+    <string name="backup_plaintext_warning_explanation">Este aviso é mostrado porque exportou recentemente uma cópia não encriptada do cofre. Para manter a segurança dos seus tokens, recomendamos que elimine este ficheiro quando já não for necessário.</string>
     <string name="switch_camera">Trocar câmara</string>
-    <string name="empty_list">Não há códigos a serem mostrados. Comece a adicionar entradas tocando no sinal de mais no canto inferior direito</string>
+    <string name="empty_list">Não há códigos a mostrar. Comece a adicionar entradas através do botão + no canto inferior direito</string>
     <string name="empty_list_title">Nenhuma entrada encontrada</string>
-    <string name="empty_group_list">Não há grupos a serem mostrados. Adicione grupos na tela de edição de uma entrada</string>
+    <string name="empty_group_list">Não existem grupos a mostrar. Adicione grupos no ecrã de edição de uma entrada</string>
     <string name="empty_group_list_title">Nenhum grupo encontrado</string>
+    <string name="no_icon_packs">Ainda não foram importados quaisquer pacotes de ícones. Toque no botão + para importar um. Dica: experimente os <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
+    <string name="no_icon_packs_title">Sem pacotes de ícones</string>
+    <string name="pick_icon">Selecionar ícone</string>
+    <string name="uncategorized">Sem categoria</string>
     <string name="done">Concluído</string>
+    <plurals name="qr_count">
+        <item quantity="one">%d / %d QR code</item>
+        <item quantity="other">Códigos QR %d / %d</item>
+    </plurals>
     <string name="next">Próximo</string>
     <string name="previous">Anterior</string>
-    <string name="transfer_entry">Transferir entrada</string>
-    <string name="transfer_entry_description">Escaneie este código QR com o aplicativo de autenticação para o qual você gostaria de transferir esta entrada</string>
+    <string name="copy_uri">Copiar URI</string>
+    <string name="unable_to_copy_uri_to_clipboard">Não é possível copiar o URI para a área de transferência</string>
+    <string name="uri_copied_to_clipboard">URI copiado para a área de transferência</string>
+    <string name="transfer_entry_description">Digitalize este código QR com a aplicação de autenticação para a qual gostaria de transferir esta entrada</string>
+    <string name="google_auth_compatible_transfer_description">Digitalize estes códigos QR com o Aegis ou o Google Authenticator.\n\nDevido às limitações do Google Authenticator, apenas estão incluídos os tokens TOTP e HOTP que utilizam SHA1 e produzem códigos de 6 dígitos</string>
     <string name="password_strength_very_weak">Muito Fraca</string>
     <string name="password_strength_weak">Fraca</string>
     <string name="password_strength_fair">Média</string>
     <string name="password_strength_good">Boa</string>
     <string name="password_strength_strong">Forte</string>
-    <string name="pref_pin_keyboard_title">Usar o teclado PIN na tela de bloqueio</string>
-    <string name="pref_pin_keyboard_summary">Ative esta opção se quiser habilitar o teclado PIN na tela de bloqueio. Isso só funciona para senhas numéricas</string>
+    <string name="password_strength_unknown">Palavra-passe demasiado longa para a análise de resistência</string>
+    <string name="pref_pin_keyboard_title">Usar o teclado numérico no ecrã de bloqueio</string>
+    <string name="pref_pin_keyboard_summary">Ative esta opção se quiser ativar o teclado numérico no ecrã de bloqueio. Isto só funciona para palavras-passe numéricas</string>
     <string name="title_activity_preferences">Configurações</string>
-    <string name="title_activity_manage_groups">Gerenciar grupos</string>
+    <string name="title_activity_manage_groups">Gerir grupos</string>
     <string name="title_activity_transfer">Transferir entradas</string>
     <string name="title_activity_about">Sobre</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escanear um código QR</string>
-    <string name="title_activity_manage_slots">Gerenciar slots de chaves</string>
+    <string name="title_activity_import_entries">Importar entradas</string>
+    <string name="title_activity_assign_icons">Atribuir ícones</string>
+    <string name="title_activity_licenses">Licenças de terceiros</string>
     <string name="dialog_wipe_entries_title">Limpar entradas</string>
     <string name="dialog_wipe_entries_message">O seu cofre já contém entradas. Você quer remover essas entradas antes de importar este arquivo?\n\n<b>Ao fazer isso, você perderá permanentemente o acesso às entradas existentes no cofre.</b></string>
     <string name="dialog_wipe_entries_checkbox">Limpar conteúdo do cofre</string>
     <string name="panic_trigger_ignore_toast">Aegis recebeu um gatilho de pânico, mas essa configuração está desativada, portanto será ignorado</string>
     <string name="pref_panic_trigger_title">Excluir cofre após gatilho de pânico</string>
     <string name="pref_panic_trigger_summary">Excluir cofre quando um gatilho de pânico é recebido do Ripple</string>
+    <string name="import_vault">Importar cofre do Aegis</string>
+    <string name="import_vault_hint">Quer importar de uma aplicação 2FA diferente? Conclua a configuração inicial e aceda às definições.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Desmarcado %d potencial duplo. Reveja a lista de entradas.</item>
+        <item quantity="other">Desmarcados %d potencial duplos. Reveja a lista de entradas.</item>
+    </plurals>
+    <string name="importer_help_2fas">Fornecer um arquivo de backup de 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Fornecer um arquivo de exportação/backup do Aegis.</string>
     <string name="importer_help_authenticator_plus">Fornecer um arquivo de exportação do Autenticador Plus obtido através de <b>Configurações -&gt; Backup &amp; Restaurar -&gt; Exportar como Texto e HTML</b>.</string>
     <string name="importer_help_authy">Fornecer uma cópia de <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, localizado no diretório de armazenamento interno do Authy.</string>
     <string name="importer_help_andotp">Fornecer um arquivo de exportação/backup do andOTP.</string>
-    <string name="importer_help_freeotp">Fornecer uma cópia de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, localizado no diretório de armazenamento interno do FreeOTP.</string>
+    <string name="importer_help_bitwarden">Forneça um ficheiro de exportação/backup Bitwarden. Os ficheiros encriptados não são suportados.</string>
+    <string name="importer_help_battle_net_authenticator">Forneça uma cópia de <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, localizado no diretório de armazenamento interno do Autenticador Battle.net.</string>
+    <string name="importer_help_duo">Forneça uma cópia de <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, localizada no diretório de armazenamento interno do DUO.</string>
     <string name="importer_help_freeotp_plus">Fornecer um arquivo de exportação FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilidade FreeOTP 2</string>
+    <string name="importer_help_google_authenticator"><b>Apenas são suportados ficheiros de bases de dados do Google Authenticator v5.10 e anteriores</b>.\n\nForneça uma cópia de <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, localizada no diretório de armazenamento interno do Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Fornecer uma cópia de <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, localizado no diretório de armazenamento interno do Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Fornecer um arquivo de texto simples com um URI do Google Authenticator em cada linha.</string>
+    <string name="importer_help_steam"><b>Steam v3.0 e versões mais recentes não são suportadas</b>. Forneça uma cópia de <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, localizada no diretório de armazenamento interno do Steam.</string>
     <string name="importer_help_totp_authenticator">Fornecer um arquivo de exportação de Autenticador TOTP.</string>
     <string name="importer_help_winauth">Fornecer um arquivo de exportação do WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Atribuir ícones</string>
+    <string name="import_assign_icons_dialog_text">Pretende atribuir ícones às entradas importadas?</string>
+    <string name="importer_encrypted_exception_google_authenticator">A entrada encriptada foi ignorada: %s</string>
     <string name="importer_help_direct">Importar entradas diretamente de %s. Isto requer que a aplicação seja instalada neste dispositivo e que acesso root seja concedido ao Aegis.</string>
+    <string name="groups">Grupos</string>
+    <string name="pref_focus_search">Focar pesquisa no início da aplicação</string>
+    <string name="pref_focus_search_summary">Focar a pesquisa imediatamente após abrir a aplicação.</string>
+    <string name="pref_grouping_halves">Metades</string>
+    <string name="pref_grouping_none">Sem grupo</string>
+    <string name="pref_grouping_size_two">Grupos de 2</string>
+    <string name="pref_grouping_size_three">Grupos de 3</string>
+    <string name="pref_grouping_size_four">Grupos de 4</string>
+    <string name="pref_copy_behavior_never">Nunca</string>
+    <string name="pref_copy_behavior_single_tap">Apenas um toque</string>
+    <string name="pref_copy_behavior_double_tap">Duplo toque</string>
+    <string name="pref_account_name_position_hidden">Ocultar / Ocultos</string>
+    <string name="pref_account_name_position_end">Ao lado do emissor</string>
+    <string name="pref_account_name_position_below">Abaixo do emissor</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="one">há %d segundo</item>
+        <item quantity="other">há %d segundos</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">há %d minuto</item>
+        <item quantity="other">há %d minutos</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="one">há %d hora</item>
+        <item quantity="other">há %d horas</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="one">há %d dia</item>
+        <item quantity="other">há %d dias</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="one">Há %d ano</item>
+        <item quantity="other">Há %d anos</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="one">%d item selecionado</item>
+        <item quantity="other">%d itens selecionados</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO-v29/strings.xml b/app/src/main/res/values-ro-rRO-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-ro-rRO-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 29ff5be5..00885606 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Setări</string>
     <string name="action_about">Despre</string>
     <string name="action_delete">Șterge</string>
     <string name="action_transfer">Transfer</string>
-    <string name="action_edit_icon">Editare pictogramă</string>
-    <string name="action_reset_usage_count">Resetează numărul de utilizări</string>
+    <string name="action_edit_icon">Editează pictogramă</string>
+    <string name="action_reset_usage_count">Resetează numărul utilizărilor</string>
     <string name="action_reset_usage_count_dialog">Sunteţi sigur că doriţi să setaţi numărul de utilizare a acestei intrări la 0?</string>
     <string name="action_default_icon">Resetare pictogramă</string>
     <string name="discard">Anulează</string>
     <string name="save">Salvare</string>
+    <string name="all">Toate</string>
     <string name="issuer">Emitent</string>
     <string name="yandex_pin">PIN (4–16 cifre)</string>
     <string name="motp_pin">PIN (4 cifre)</string>
@@ -21,18 +22,22 @@
     <string name="pref_cat_backups_android">Android</string>
     <string name="pref_cat_backups_auto">Backup automat</string>
     <string name="pref_section_behavior_title">Comportament</string>
-    <string name="pref_section_behavior_summary">Personalizați comportamentul când interacționați cu lista de intrări.</string>
+    <string name="pref_section_behavior_summary">Personalizați comportamentul când interacționați cu lista intrărilor.</string>
     <string name="pref_section_appearance_title">Prezentare</string>
-    <string name="pref_section_appearance_summary">Reglaţi setările temei, limbii şi altor setări care afectează aspectul aplicaţiei.</string>
+    <string name="pref_section_appearance_summary">Reglați setările temei, limbii și altor setări care afectează aspectul aplicației.</string>
     <string name="pref_section_security_title">Securitate</string>
     <string name="pref_section_security_summary">Configurați criptarea, deblocarea biometrică, blocarea automată și alte setări de securitate.</string>
     <string name="pref_section_import_export_title">Importă &amp; Exportă</string>
     <string name="pref_section_import_export_summary">Importă copii de rezervă ale Aegis sau ale altor aplicații de autentificare. Creează exporturi manuale în seiful dvs. Aegis.</string>
-    <string name="pref_section_backups_title">Copii de rezervă</string>
+    <string name="pref_section_audit_log_title">Jurnal de audit</string>
+    <string name="pref_section_audit_log_summary">Găsiți o listă cu toate evenimentele importante raportate care s-au întâmplat în cadrul aplicației.</string>
+    <string name="pref_section_backups_title">Backup-uri</string>
     <string name="pref_section_backups_summary">Configurați backup-urile automate într-o locație în care alegeți sau activați participarea la sistemul Android de backup în cloud.</string>
     <string name="pref_section_icon_packs">Set de pictograme</string>
     <string name="pref_section_icon_packs_summary">Gestionați și importați pachete de pictograme</string>
     <string name="pref_select_theme_title">Temă</string>
+    <string name="pref_dynamic_colors_title">Culori dinamice</string>
+    <string name="pref_dynamic_colors_summary">Aplică o culoare principală pe baza culorilor temei tale Android</string>
     <string name="pref_view_mode_title">Mod de vizualizare</string>
     <string name="pref_lang_title">Limbă</string>
     <string name="pref_show_icons_title">Arată pictograme</string>
@@ -40,8 +45,14 @@
     <string name="pref_code_group_size_title">Grupare cifre cod</string>
     <string name="pref_code_group_size_summary">Selectează numărul de cifre pentru a grupa codurile</string>
     <string name="pref_account_name_position_title">Arată numele contului</string>
+    <string name="pref_show_next_code_title">Arată următorul cod</string>
+    <string name="pref_show_next_code_summary">Generează și arată codul următor înainte</string>
+    <string name="pref_expiration_state_title">Indică momentul când codurile sunt pe cale să expire</string>
+    <string name="pref_expiration_state_summary">Schimbă culoarea codurilor și fă codurile să clipească în momentul în care expiră</string>
+    <string name="pref_expiration_state_fallback">Schimbă culoarea codurilor când sunt pe cale să expire</string>
     <string name="pref_shared_issuer_account_name_title">Arată numele contului doar atunci când este necesar</string>
     <string name="pref_shared_issuer_account_name_summary">Arată numai numele de cont ce au același emitent. Alte nume de cont vor fi ascunse.</string>
+    <string name="pref_account_name_position_summary_override">Această setare este suprascrisă de modul vizualizare dale. Numele contului va fi afișat mai jos de emitent.</string>
     <string name="pref_import_file_title">Importă din fișier</string>
     <string name="pref_import_file_summary">Importă token-uri dintr-un fișier</string>
     <string name="pref_android_backups_title">Backup-uri Android în cloud</string>
@@ -53,16 +64,24 @@
     <string name="pref_backups_reminder_summary">Arată un mesaj pentru a salva seiful în cazul în care nu ai făcut backup la ultimele modificări.</string>
     <string name="pref_backups_reminder_dialog_title">Dezactivează alerta de backup</string>
     <string name="pref_backups_reminder_dialog_summary">Dezactivarea acestei alerte înseamnă că Addis nu îți va spune dacă ai sau nu schimbări care nu sunt încă salvate. Acest lucru te pune în pericol de a pierde accesul la Cohen-urile tale. Ești sigur că vrei să dezactivezi alerta?</string>
-    <string name="pref_backups_location_title">Director pentru copiile de rezervă</string>
+    <string name="pref_backups_versioning_strategy_title">Strategie de backup</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Păstrează un număr de versiuni</string>
+    <string name="pref_backups_versioning_strategy_single_backup">O singură copie de rezervă</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Strategia de backup selectată nu este fiabilă și nu este recomandată. Un singur backup nereușit ar putea duce la pierderea singurei tale copii de rezervă.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Selectează o strategie de backup</string>
+    <string name="pref_backups_location_title">Locație backup</string>
     <string name="pref_backups_location_summary">Copiile de rezervă vor fi stocate la</string>
+    <string name="pref_backup_location_summary">Copiile de rezervă vor fi stocate la</string>
     <string name="pref_backups_trigger_title">Declanșare copie de rezervă</string>
     <string name="pref_backups_trigger_summary">Declanșează manual o copie de rezervă</string>
     <string name="pref_backups_versions_title">Numărul de versiuni de păstrat</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Păstraţi %1$d versiune a copiei de rezervă</item>
         <item quantity="few">Păstraţi %1$d versiune a copiei de rezervă</item>
         <item quantity="other">Păstraţi %1$d de versiuni ale copiei de rezervă</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Păstrează un număr infinit de versiuni ale copiei de rezervă</string>
     <string name="pref_import_app_title">Importă din aplicație</string>
     <string name="pref_import_app_summary">Importă tokeni dintr-o aplicație (necesită acces root)</string>
     <string name="pref_export_title">Exportă</string>
@@ -99,8 +118,34 @@
     <string name="pref_encryption_summary">Criptează seiful și deblochează-l cu o parolă sau biometrice</string>
     <string name="pref_biometrics_title">Deblocare biometrică</string>
     <string name="pref_biometrics_summary">Permite autentificarea biometrică pentru a debloca seiful</string>
+    <string name="pref_search_behavior_summary">Căutare prin: %s</string>
+    <string name="pref_search_behavior_prompt">Căutare în oricare dintre următoarele câmpuri</string>
+    <string name="pref_search_behavior_type_name">Nume</string>
+    <string name="pref_search_behavior_type_issuer">Emitent</string>
+    <string name="pref_search_behavior_type_note">Notă</string>
+    <string name="pref_search_behavior_type_groups">Grupuri</string>
     <string name="pref_set_password_title">Schimbă parola</string>
     <string name="pref_set_password_summary">Setează o parolă nouă cu care va trebui să deblochezi seiful</string>
+    <string name="no_events_title">Nu s-au raportat evenimente</string>
+    <string name="no_events_description">Nu au fost raportate evenimente importante în cadrul aplicației</string>
+    <string name="event_title_vault_unlocked">Seif deblocat</string>
+    <string name="event_description_vault_unlocked">Seiful a fost deblocat cu succes</string>
+    <string name="event_title_backup_created">Copie de rezervă creată</string>
+    <string name="event_description_backup_created">O copie de rezervă a seifului a fost creată cu succes</string>
+    <string name="event_title_android_backup_created">Android a creat o copie de rezervă</string>
+    <string name="event_description_android_backup_created">O copie de rezervă a seifului a fost creată cu succes de Android</string>
+    <string name="event_title_vault_exported">Seif exportat</string>
+    <string name="event_description_vault_exported">O copie a seifului a fost exportată</string>
+    <string name="event_title_entry_shared">Element distribuit</string>
+    <string name="event_description_entry_shared">Un element a fost distribuit</string>
+    <string name="event_title_vault_unlock_failed_password">Deblocarea seifului a eșuat (parolă)</string>
+    <string name="event_description_vault_unlock_failed_password">Încercarea de a debloca seiful cu o parolă a eșuat</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Deblocarea seifului a eșuat (biometrie)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Încercarea de a debloca seiful cu datele biometrice a eșuat</string>
+    <string name="event_unknown">Tipul evenimentului este necunoscut</string>
+    <string name="audit_log_entry_deleted">(șters)</string>
+    <string name="today_at_time">Astăzi, la %1$s</string>
+    <string name="day_of_week_at_time">%1$s la %2$s</string>
     <string name="export_encrypted">Criptează seiful</string>
     <string name="export_help">Această acțiune va exporta seiful din spațiul de stocare al aplicaţiei. Selectează formatul în care dorești exportul:</string>
     <string name="export_warning_unencrypted">Ești pe cale să exportezi o copie necriptată a seifului Aegis. <b>Acest lucru nu este recomandat</b>.</string>
@@ -118,7 +163,7 @@
         <item quantity="other">%d de grupuri selectate</item>
     </plurals>
     <string name="export_no_groups_selected">Nici un grup selectat pentru export</string>
-    <string name="export_html_title" context="The title of an HTML export document">Exportul aplicației Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Exportul aplicației Aegis Authenticator</string>
     <string name="choose_authentication_method">Securitate</string>
     <string name="authentication_method_explanation">Aegis este o aplicație 2FA concentrată pe securitate. Token-urile sunt stocate într-un seif, care poate criptat cu o parolă aleasă. Dacă un atacator obține fișierul criptat al seifului, nu va putea accesa conținutul fără a cunoaște parola.\n\nAm selectat opțiunea pe care o credem cea mai potrivită pentru dispozitivul tău.</string>
     <string name="authentication_method_none">Fără</string>
@@ -137,6 +182,9 @@
     <string name="set_password_confirm">Te rugăm să confirmi parola</string>
     <string name="invalid_password">Parola este incorectă</string>
     <string name="invalidated_biometrics">A fost detectată o modificare a setărilor de securitate ale dispozitivului. Vă rugăm să mergeţi la \"Aegis -&gt; Setări -&gt; Securitate -&gt; Deblocare biometrică\" pentru a dezactiva şi reactiva deblocarea biometrică.</string>
+    <string name="password_reminder">Te rugăm să introduci parola. Uneori îți cerem să faci asta pentru a nu o uita.</string>
+    <string name="password_reminder_dialog_title">Deblocare biometrică în mod implicit</string>
+    <string name="password_reminder_dialog_message">Vă recomandăm ocazional să introduci parola pentru a te asigura că nu ai uitat-o. După introducerea parolei o dată, Aegis va reveni la deblocarea biometrică până când este timpul pentru o altă reamintire a parolei.</string>
     <string name="password_reminder_freq_never">Niciodată</string>
     <string name="password_reminder_freq_weekly">Săptămânal</string>
     <string name="password_reminder_freq_biweekly">La doua săptămâni</string>
@@ -151,6 +199,7 @@
     <string name="share">Distribuie</string>
     <string name="yes">Da</string>
     <string name="no">Nu</string>
+    <string name="undo">Anulare</string>
     <string name="unlock">Deblocare</string>
     <string name="advanced">Avansat</string>
     <string name="counter">Contor</string>
@@ -162,6 +211,11 @@
     <string name="set_up_biometric">Configurează deblocarea biometrică</string>
     <string name="copy">Copiere</string>
     <string name="edit">Editare</string>
+    <string name="select_all">Selectează tot</string>
+    <string name="assign_icons">Atribuie pictograme</string>
+    <string name="assign_groups">Abonează în grup</string>
+    <string name="assign_groups_dialog_summary">Selectează un grup căruia dorești să îi atribui intrările selectate.</string>
+    <string name="assign_groups_dialog_dropdown">Selectează grupul</string>
     <string name="favorite" comment="Verb">Favorit</string>
     <string name="unfavorite" comment="Verb">Elimină din favorite</string>
     <string name="error_all_caps">EROARE</string>
@@ -176,10 +230,12 @@
     <string name="snackbar_authentication_method">Te rugăm să selectezi o metodă de autentificare</string>
     <string name="encrypting_vault">Criptează seiful</string>
     <string name="exporting_vault">Exportă seiful</string>
+    <string name="optimizing_icon">Se optimizează pictograma</string>
+    <string name="optimizing_icon_multiple">Se optimizează pictogramele %1$d/%2$d</string>
     <string name="reading_file">Citire fişier</string>
     <string name="requesting_root_access">Solicită acces root</string>
     <string name="analyzing_qr">Se analizează codul QR</string>
-    <string name="analyzing_qr_multiple">Se analizează codul QR %d%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analizând QR code %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Au fost adăugate %d de noi intrări în seif</item>
         <item quantity="few">Au fost adăugate %d noi intrări în seif</item>
@@ -198,6 +254,7 @@
     <string name="discard_changes">Renunți la modificări?</string>
     <string name="discard_changes_description">Modificările nu au fost salvate</string>
     <string name="saving_profile_error">Eroare la salvarea profilului</string>
+    <string name="saving_assign_icons_error">Eroare la atribuirea pictogramelor</string>
     <string name="welcome">Bun venit</string>
     <string name="app_description">Aegis este o aplicație 2FA gratuită, sigură și cu sursă deschisă</string>
     <string name="setup_completed">Configurare finalizată</string>
@@ -206,6 +263,7 @@
     <string name="copied">Copiat</string>
     <string name="errors_copied">Erori copiate în clipboard</string>
     <string name="version_copied">Versiune copiată în clipboard</string>
+    <string name="error_required_field">Acest câmp este obligatoriu</string>
     <string name="error_occurred">A apărut o eroare</string>
     <string name="decryption_error">A apărut o eroare în timpul deblocării seifului</string>
     <string name="decryption_corrupt_error">A apărut o eroare în timp ce se încerca deblocarea seiful. Seiful poate fi corupt.</string>
@@ -272,15 +330,16 @@
     <string name="partial_google_auth_import">S-a detectat exportul incomplet a datelor din autentificatorul Google</string>
     <string name="partial_google_auth_import_warning">Unele coduri QR lipsesc din fișerul importat. Următoarele coduri nu au fost găsite:\n\n<b>%s</b>\n\nPuteţi continua importul acestui fișier parţial, dar vă recomandăm să încercaţi din nou cu toate codurile QR pentru a nu risca pierderea niciunui token.</string>
     <string name="missing_qr_code_descriptor">• codul QR %d</string>
-    <string name="import_partial_export_anyway">Importă jetoanele %d oricum</string>
     <string name="import_google_auth_failure">Importarea din Google Authenticator a eșuat</string>
     <string name="unrelated_google_auth_batches_error">Exportul conține informații pentru un calup neasociat. Încercați să importați câte un calup pe rând.</string>
     <string name="no_tokens_can_be_imported">Nu se pot importa token-uri drept rezultat</string>
-    <string name="authentication_method_raw">Brut</string>
     <string name="unlocking_vault">Deblocarea seifului</string>
-    <string name="slot_this_device">(aceste dispozitive)</string>
+    <string name="rename_group">Redenumește grupul</string>
+    <string name="no_group_selection">În cazul în care o intrare nu face parte din niciun grup, aceasta poate fi găsită în categoria „Niciun grup”.</string>
     <string name="remove_group">Elimină grupul</string>
     <string name="remove_group_description">Ești sigur că dorești să ștergi acest grup? Intrările din acest grup vor comuta automat la \'Niciun grup\'.</string>
+    <string name="remove_unused_groups">Ștergeți grupurile neutilizate</string>
+    <string name="remove_unused_groups_description">Sunteţi sigur că doriţi să ştergeţi toate grupurile care nu sunt atribuite unei intrări?</string>
     <string name="remove_icon_pack">Ștergeți pachetul de pictograme</string>
     <string name="remove_icon_pack_description">Sunteţi sigur că doriţi să ştergeţi acest pachet de pictograme? Intrările care folosesc pictograme din acest pachet nu vor fi afectate.</string>
     <string name="details">Detalii</string>
@@ -288,13 +347,16 @@
     <string name="lock">Blocare</string>
     <string name="name">Nume</string>
     <string name="no_group">Niciun grup</string>
-    <string name="sort">Sortează</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sortează</string>
     <string name="sort_alphabetically">Emitent (A - Z)</string>
     <string name="sort_alphabetically_reverse">Emitent (Z - A)</string>
     <string name="sort_alphabetically_name">Cont (A - Z)</string>
     <string name="sort_alphabetically_name_reverse">Cont (Z - A)</string>
     <string name="sort_usage_count">Numărul de utilizări</string>
+    <string name="sort_last_used">Utilizat ultima dată</string>
     <string name="sort_custom">Personalizat</string>
+    <string name="last_used">Utilizat ultima dată</string>
+    <string name="last_used_never">niciodată</string>
     <string name="new_group">Grup nou…</string>
     <string name="group">Grup</string>
     <string name="group_name_hint">Numele grupului</string>
@@ -303,13 +365,25 @@
     <string name="preference_reset_usage_count">Resetează numărul de utilizări</string>
     <string name="preference_reset_usage_count_summary">Resetează numărul de utilizări al fiecărei intrări din seiful tău</string>
     <string name="preference_reset_usage_count_dialog">Sunteţi sigur că doriţi să setaţi numărul de utilizări pentru fiecare intrare din seif la 0?</string>
-    <string name="note">Notă</string>
+    <string name="note" comment="Users can add a note to an entry">Notă</string>
     <string name="clear">Șterge</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Intrare duplicat</string>
+    <string name="dialog_duplicate_entry_message">Această intrare are același nume și emitent ca una sau mai multe intrări existente. Cum ați dori să continuați?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Rescrie intrarea/intrările existente</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Înlocuiţi intrarea sau intrările existente cu cea nouă. Această acţiune nu poate fi anulată</string>
+    <string name="dialog_duplicate_entry_suffix_title">Adaugă sufix</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Adaugă un sufix la numele acestei noi intrări. Noul nume va fi: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Anulează salvarea</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Vă permite să editaţi intrarea înainte de a încerca să o salvaţi din nou</string>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Confirmă ștergerea</string>
     <string name="pref_highlight_entry_title">Evidențiază simbolurile când apăsați</string>
     <string name="pref_highlight_entry_summary">Fă token-urile mai ușor să se distingă între ele prin evidențierea lor temporară atunci când sunt apăsate</string>
+    <string name="pref_groups_multiselect_title">Grupuri multiple</string>
+    <string name="pref_groups_multiselect_summary">Permite selecția mai multor grupuri în același timp</string>
     <string name="pref_minimize_on_copy_title">Minimizează după copiere</string>
     <string name="pref_minimize_on_copy_summary">Minimizează aplicația după copierea unui token</string>
     <string name="pref_copy_behavior_title">Copiați tokenul în clipboard</string>
+    <string name="pref_search_behavior_title">Mod de căutare</string>
     <string name="pref_pause_entry_title">Îngheață jetoanele când sunt apăsate</string>
     <string name="pref_pause_entry_summary">Oprește reîmprospătarea automată a jetoanelor prin apăsarea lor. Token-urile nu se vor actualiza atâta timp cât sunt evidențiate. Necesită \"Evidențierea tokenurilor atunci când sunt apasate\" sau \"Atinge pentru a arăta\".</string>
     <string name="pin_keyboard_description">Introdu parola pentru a activa tastatura PIN. Reține că aceasta funcționează doar dacă parola constă doar din numere</string>
@@ -325,17 +399,18 @@
     <string name="normal_viewmode_title">Normal</string>
     <string name="compact_mode_title">Compact</string>
     <string name="small_mode_title">Mic</string>
+    <string name="tiles_mode_title">Tiles</string>
     <string name="unknown_issuer">Emitent necunoscut</string>
     <string name="unknown_account_name">Nume de cont necunoscut</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis nu a putut importa %d token. Aceste token-uri vor fi sărite. Apasă pe \'detalii\' pentru a vedea mai multe informații despre erori.</item>
-        <item quantity="few">Aegis nu a putut importa %d token. Aceste token-uri vor fi sărite. Apăsați \'detalii\' pentru a vedea mai multe informații despre erori.</item>
-        <item quantity="other">Aegis nu a putut importa %d token-rui. Aceste token-uri vor fi sărite. Apăsați \'detalii\' pentru a vedea mai multe informații despre erori.</item>
+        <item quantity="one">Aegis nu a putut importa tokenul %d. Acest token va fi omis. Apasă pe \"detalii\" pentru a vedea mai multe informații despre erori.</item>
+        <item quantity="few">Aegis nu a putut importa tokenurile %d. Aceste tokenuri vor fi omise. Apasă pe \'detalii\' pentru a vedea mai multe informații despre erori.</item>
+        <item quantity="other">Aegis nu a putut importa tokenurile %d. Aceste tokenuri vor fi omise. Apasă pe \'detalii\' pentru a vedea mai multe informații despre erori.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Nu se poate procesa link-ul</string>
     <string name="unable_to_read_qrcode_file">Nu se poate citi și procesa codul QR din fișierul: %s.</string>
     <string name="unable_to_process_shared_text">Imposibil de procesat textul partajat ca un cod OTP</string>
-    <string name="unable_to_read_qrcode_files">Nu se pot citi şi procesa unele dintre codurile QR. Doar %d/%d intrări vor fi importate.</string>
+    <string name="unable_to_read_qrcode_files">Nu a putut fi citită și procesă unele dintre QR code-urile. Numai întrările %1$d/%2$d vor fi importate.</string>
     <string name="unable_to_generate_qrcode">Nu se poate genera codul QR</string>
     <string name="select_picture">Selectare imagine</string>
     <string name="select_icon">Selectare pictogramă</string>
@@ -366,14 +441,10 @@
     <string name="time_sync_warning_message">Aegis-ul se bazează pe un sistem de timp pentru a fi sincronizat pentru a genera codurile corecte. O abatere de doar câteva secunde ar putea duce la coduri incorecte. Se pare că dispozitivul tău nu este configurat pentru a sincroniza automat timpul. Dorești să faci acest lucru acum?</string>
     <string name="time_sync_warning_disable">Nu mă mai avertiza. Ştiu ce fac.</string>
     <string name="google_qr_export_unrelated">Cod QR negăsit găsit. Încearcă să repornești scanerul.</string>
-    <plurals name="google_qr_export_scanned">
-        <item quantity="one">Cod %d/%d QR scanat</item>
-        <item quantity="few">Coduri %d/%d QR scanate</item>
-        <item quantity="other">Coduri %d/%d QR scanate</item>
-    </plurals>
-    <string name="google_qr_export_unexpected">Se aștepta codul QR #%d, dar scanat #%d în schimb</string>
+    <string name="google_qr_export_unexpected">Așteptat QR code #%1$d, dar scanat #%2$d totuși</string>
     <string name="backup_error_bar_message"><b>Copia de rezervă a seifului a eșuat recent</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">O încercare recentă de backup a seifului folosind %s a eșuat deoarece a apărut o eroare. S-a încercat crearea unei copii de siguranță la: %s. Vă rugăm să verificați setările copiilor de rezervă pentru a vă asigura că acestea pot fii create cu succes.    </string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">O tentativă recentă de backup de vault utilizând %1$s a eșuată deoarece un erori a întâmplat. Backup-ul a încercat %2$s. Va rog verificați setările backup-ului tale pentru a asigura că backup-urile pot completează cu succes.    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">O tentativă recentă de backup de vault utilizând %1$s a eșuată deoarece Aegis nu are permisiunea a scrie la destinația backup-ului. Backup-ul a încercat %2$s. Acest erori poate întâmplă dacă aveți recent restaurat Aegis dintr-un backup. Vă rog reconfigurați destinația backup-ului.    </string>
     <string name="backup_system_builtin">Copiile de siguranță încorporate în aplicație</string>
     <string name="backup_system_android">Sistemul de backup în cloud Android</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Ultima copie de rezervă este învechită (%s)
@@ -407,7 +478,6 @@
     <string name="copy_uri">Copiere URL</string>
     <string name="unable_to_copy_uri_to_clipboard">Nu se poate copia în clipboard</string>
     <string name="uri_copied_to_clipboard">URI copiat în clipboard</string>
-    <string name="transfer_entry">Transfer intrare</string>
     <string name="transfer_entry_description">Scanează acest cod QR cu aplicația de autentificare pe care dorești să o transferi</string>
     <string name="google_auth_compatible_transfer_description">Scanați aceste coduri QR cu Aegis sau Google Authenticator.\n\nDatorită limitărilor aplicației Google Authenticator, numai token-urile TOTP &amp; HOTP care folosesc SHA1 și produc coduri de 6 cifre sunt incluse</string>
     <string name="password_strength_very_weak">Foarte slabă</string>
@@ -415,6 +485,7 @@
     <string name="password_strength_fair">Acceptabilă</string>
     <string name="password_strength_good">Bună</string>
     <string name="password_strength_strong">Puternică</string>
+    <string name="password_strength_unknown">Parola este prea lungă pentru ai analiza eficacitatea</string>
     <string name="pref_pin_keyboard_title">Utilizează tastatura PIN pe ecranul de blocare</string>
     <string name="pref_pin_keyboard_summary">Activează dacă dorești să activezi tastatura PIN pe ecranul de blocare. Acest lucru funcționează numai pentru parolele numerice</string>
     <string name="title_activity_preferences">Setări</string>
@@ -423,32 +494,43 @@
     <string name="title_activity_about">Despre</string>
     <string name="title_activity_edit_entry">Editați intrarea</string>
     <string name="title_activity_scan_qr">Scanează cod QR</string>
-    <string name="title_activity_manage_slots">Gestionare sloturi cheie</string>
     <string name="title_activity_import_entries">Importă intrări</string>
+    <string name="title_activity_assign_icons">Atribuie pictograme</string>
+    <string name="title_activity_licenses">Licențe terțe</string>
     <string name="dialog_wipe_entries_title">Șterge intrările</string>
     <string name="dialog_wipe_entries_message">Seiful tău conține deja intrări. Dorești să ştergi aceste intrări înainte de a importa acest fişier?\n\n<b>Făcând acest lucru, vei pierde permanent accesul la intrările existente din seif.</b></string>
     <string name="dialog_wipe_entries_checkbox">Şterge conţinutul seifului</string>
     <string name="panic_trigger_ignore_toast">Aegis a primit un declanșator de panică, dar setarea este dezactivată, se ignoră</string>
     <string name="pref_panic_trigger_title">Șterge seiful la declanșatorul de panică</string>
     <string name="pref_panic_trigger_summary">Șterge seiful atunci când un declanșator de panică este primit de la Ripple</string>
-    <string name="import_vault">Importă seiful</string>
+    <string name="import_vault">Importă seiful Aegis</string>
+    <string name="import_vault_hint">Doriți să importați dintr-o altă aplicație 2FA? Finalizați configurarea mai întâi și apoi mergeți la meniul de setări.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Am detectat %d potențial duplicat ce a rămas nebifat. Te rugăm să revizuiești lista intrărilor.</item>
+        <item quantity="few">Am detectat %d potențiale duplicate ce au rămas nebifate. Te rugăm să revizuiești lista intrărilor.</item>
+        <item quantity="other">Am detectat %d de potențiale duplicate ce au rămas nebifate. Te rugăm să revizuiești lista intrărilor.</item>
+    </plurals>
     <string name="importer_help_2fas">Furnizează un fișier de backup 2FAS autentificator.</string>
     <string name="importer_help_aegis">Furnizează un fișier export/copie de rezervă Aegis.</string>
     <string name="importer_help_authenticator_plus">Furnizează un fişier de export de Autentificator Plus obţinut prin <b>Setări -&gt; Copie de rezervă &amp; Restore -&gt; Export ca Text şi HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Furnizează fișierul cu parole provenit de la Authenticator Pro, fișier ce poate fi obținut prin <b>Setări -&gt; Backup -&gt; Backup criptat (recomandat)</b>.</string>
     <string name="importer_help_authy">Furnizează o copie a <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, localizată în directorul de stocare internă al Authy.</string>
     <string name="importer_help_andotp">Furnizați un fişier de export/copie de rezervă andOTP.</string>
     <string name="importer_help_bitwarden">Furnizează un fișier de backup din aplicația Bitwarden. Fișierele criptate nu sunt suportate.</string>
-    <string name="importer_help_battle_net_authenticator">Furnizează o copie a <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, localizată în directorul de stocare internă al Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Furnizează o copie a <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, localizată în folderul din memoria internă al Battle.net Authenticator.</string>
     <string name="importer_help_duo">Furnizează o copie a <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, localizată în dosarul din memoria internă al DUO.</string>
-    <string name="importer_help_freeotp">Furnizează o copie de <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, localizată în directorul de stocare internă a FreeOTP.</string>
+    <string name="importer_help_ente_auth">Aprovizionați un fișier de export Ente Auth. Actualmente numai fișierului criptate sunt suportate.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Furnizează o copie de rezervă.\nFreeOTP 1.x: Furnizează o copie a <b>/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, localizată în directorul FreeOTP din stocarea internă.</string>
     <string name="importer_help_freeotp_plus">Furnizează un fișier de export FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Compatibilitate FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">În FreeOTP 2 există o serie de probleme care pot duce la copii de rezervă corupte. Aegis va încerca să salveze cât mai multe intrări, dar este posibil ca unele sau chiar toate să nu poată fi importe.</string>
     <string name="importer_help_google_authenticator"><b>Doar fișierele de la Google Authenticator v5.10 și înainte sunt acceptate</b>.\n\nFurnizează o copie a <b>/data/data/com. oogle.android.apps.authenticator2/databases/databases</b>, situat în directorul de stocare internă al Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Furnizează o copie a <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, localizată în directorul de stocare internă al Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Furnizează un fișier text simplu cu un URL de autentificare Google pe fiecare linie.</string>
     <string name="importer_help_steam"><b>Versiunile Steam v3.0 sau mai mari nu sunt suportate</b>. Furnizează o copie a <b>data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, localizat în dosarul intern Steam.</string>
     <string name="importer_help_totp_authenticator">Furnizează un fișier de export Autentificator TOTP.</string>
     <string name="importer_help_winauth">Furnizează un fișier de export WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Atribuie pictograme</string>
+    <string name="import_assign_icons_dialog_text">Dorești să atribui pictograme intrărilor importate?</string>
     <string name="importer_encrypted_exception_google_authenticator">Informațiile criptate au fost omise: %s</string>
     <string name="importer_help_direct">Importă intrările direct din %s. Aceasta necesită ca aplicația să fie instalată pe acest dispozitiv și ca accesul root să fie acordat Aegis.</string>
     <string name="groups">Grupuri</string>
@@ -465,27 +547,27 @@
     <string name="pref_account_name_position_hidden">Ascuns</string>
     <string name="pref_account_name_position_end">Alături de emitent</string>
     <string name="pref_account_name_position_below">Sub emitent</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d secundă în urmă</item>
         <item quantity="few">%d secunde în urmă</item>
         <item quantity="other">%d de secunde în urmă</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minut în urmă</item>
         <item quantity="few">%d minute în urmă</item>
         <item quantity="other">%d de minute în urmă</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d oră în urmă</item>
         <item quantity="few">Acum %d ore</item>
         <item quantity="other">Acum %d de ore</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d zi în urmă</item>
         <item quantity="few">%d zile în urmă</item>
         <item quantity="other">%d de zile în urmă</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">acum %d an</item>
         <item quantity="few">acum %d ani</item>
         <item quantity="other">acum %d de ani</item>
diff --git a/app/src/main/res/values-ru-rRU-v29/strings.xml b/app/src/main/res/values-ru-rRU-v29/strings.xml
new file mode 100644
index 00000000..4309e180
--- /dev/null
+++ b/app/src/main/res/values-ru-rRU-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Системная</string>
+    <string name="system_amoled_theme_title">Системная (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 91a78e1f..4497751c 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Настройки</string>
     <string name="action_about">О программе</string>
     <string name="action_delete">Удалить</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Восстановить значок по умолчанию</string>
     <string name="discard">Отмена</string>
     <string name="save">Сохранить</string>
+    <string name="all">Все</string>
     <string name="issuer">Эмитент</string>
     <string name="yandex_pin">PIN-код (4–16 цифр)</string>
     <string name="motp_pin">PIN-код (4 цифры)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Настройка шифрования, биометрической разблокировки, автоматической блокировки и других параметров безопасности.</string>
     <string name="pref_section_import_export_title">Импорт и экспорт</string>
     <string name="pref_section_import_export_summary">Импорт резервных копий Aegis или других приложений для аутентификации. Экспорт хранилища Aegis вручную.</string>
+    <string name="pref_section_audit_log_title">Журнал событий</string>
+    <string name="pref_section_audit_log_summary">Просмотр всех зарегистрированных важных событий, произошедших в приложении.</string>
     <string name="pref_section_backups_title">Резервные копии</string>
     <string name="pref_section_backups_summary">Настройка автоматического резервного копирования в указанное место или включение в систему облачного резервного копирования Android.</string>
     <string name="pref_section_icon_packs">Наборы значков</string>
     <string name="pref_section_icon_packs_summary">Управление наборами значков</string>
     <string name="pref_select_theme_title">Тема</string>
+    <string name="pref_dynamic_colors_title">Динамические цвета</string>
+    <string name="pref_dynamic_colors_summary">Использовать наложение на основе цветов темы Android</string>
     <string name="pref_view_mode_title">Режим отображения</string>
     <string name="pref_lang_title">Язык</string>
     <string name="pref_show_icons_title">Показывать значки</string>
@@ -40,9 +45,14 @@
     <string name="pref_code_group_size_title">Перегруппировка цифр кода</string>
     <string name="pref_code_group_size_summary">Выберите количество цифр для группировки кодов</string>
     <string name="pref_account_name_position_title">Показывать имя учётной записи</string>
+    <string name="pref_show_next_code_title">Показывать следующий код</string>
+    <string name="pref_show_next_code_summary">Заранее вычислять и показывать следующий код</string>
+    <string name="pref_expiration_state_title">Индикация окончания срока действия кодов</string>
+    <string name="pref_expiration_state_summary">Изменять цвет и начинать мигание кодов, когда срок их действия истекает</string>
+    <string name="pref_expiration_state_fallback">Изменять цвет кодов, когда срок их действия истекает</string>
     <string name="pref_shared_issuer_account_name_title">Показывать имя учётной записи только при необходимости</string>
     <string name="pref_shared_issuer_account_name_summary">Показывать названия учётных записей только в случае, если у них один эмитент. Названия других учётных записей не будут отображаться.</string>
-    <string name="pref_account_name_position_summary_override">Эта настройка переопределяется плиточным режимом просмотра. Название учётной записи всегда будет отображаться под эмитентом.</string>
+    <string name="pref_account_name_position_summary_override">Эта настройка переопределяется плиточным режимом просмотра. Название учётной записи будет отображаться под эмитентом.</string>
     <string name="pref_import_file_title">Импорт из файла</string>
     <string name="pref_import_file_summary">Импорт ключей из файла</string>
     <string name="pref_android_backups_title">Облачное резервирование Android</string>
@@ -50,21 +60,29 @@
     <string name="pref_android_backups_hint"><i>Резервное копирование между устройствами (D2D) всегда разрешено независимо от настройки выше</i></string>
     <string name="pref_backups_title">Автоматическое резервирование хранилища</string>
     <string name="pref_backups_summary">Автоматически создавать резервные копии хранилища на внешнем носителе при внесении изменений. Поддерживается только для зашифрованных хранилищ.</string>
-    <string name="pref_backups_reminder_title">Напоминания о резервном копировании</string>
+    <string name="pref_backups_reminder_title">Напоминание о резервном копировании</string>
     <string name="pref_backups_reminder_summary">Показывать напоминание о необходимости создания резервной копии хранилища, если резервирование последних изменений ещё не выполнялось.</string>
     <string name="pref_backups_reminder_dialog_title">Отключить напоминание о резервном копировании</string>
     <string name="pref_backups_reminder_dialog_summary">Отключение этого напоминания означает, что Aegis не будет сообщать вам о наличии изменений, резервная копия которых ещё не создана. В результате вы рискуете потерять доступ к своим ключам. Вы уверены, что хотите отключить напоминание?</string>
-    <string name="pref_backups_location_title">Папка для резервных копий</string>
+    <string name="pref_backups_versioning_strategy_title">Стратегия резервного копирования</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Несколько версий резервных копий</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Одна резервная копия</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Выбранная стратегия резервного копирования ненадёжна и не рекомендуется. Один сбой при резервировании может привести к потере вашей единственной резервной копии.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Выберите стратегию резервирования</string>
+    <string name="pref_backups_location_title">Расположение резервных копий</string>
     <string name="pref_backups_location_summary">Резервные копии будут храниться в</string>
+    <string name="pref_backup_location_summary">Резервная копия будет храниться в</string>
     <string name="pref_backups_trigger_title">Создать резервную копию</string>
     <string name="pref_backups_trigger_summary">Создание резервной копии вручную</string>
     <string name="pref_backups_versions_title">Количество хранимых версий</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Хранить %1$d версию резервной копии</item>
         <item quantity="few">Хранить %1$d версии резервной копии</item>
         <item quantity="many">Хранить %1$d версий резервной копии</item>
         <item quantity="other">Хранить %1$d версий резервной копии</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Не ограничивать количество версий резервных копий</string>
     <string name="pref_import_app_title">Импорт из приложения</string>
     <string name="pref_import_app_summary">Импорт ключей из другого приложения (требуются права суперпользователя)</string>
     <string name="pref_export_title">Экспорт в файл</string>
@@ -90,7 +108,7 @@
     <string name="pref_auto_lock_summary">Когда %s</string>
     <string name="pref_auto_lock_summary_disabled">Отключено</string>
     <string name="pref_auto_lock_prompt">Автоматически блокировать Aegis, когда</string>
-    <string name="pref_auto_lock_type_back_button">Кнопка \"Назад\" нажата</string>
+    <string name="pref_auto_lock_type_back_button">Нажата кнопка \"Назад\"</string>
     <string name="pref_auto_lock_type_minimize">Приложение свёрнуто</string>
     <string name="pref_auto_lock_type_device_lock">Устройство заблокировано</string>
     <string name="pref_backup_password_category">Резервирование и экспорт</string>
@@ -102,8 +120,34 @@
     <string name="pref_encryption_summary">Шифровать хранилище и разблокировать его с помощью пароля или биометрии</string>
     <string name="pref_biometrics_title">Биометрическая разблокировка</string>
     <string name="pref_biometrics_summary">Разрешить биометрическую аутентификацию для разблокировки хранилища</string>
+    <string name="pref_search_behavior_summary">Поиск в: %s</string>
+    <string name="pref_search_behavior_prompt">Поиск в любом из следующих полей</string>
+    <string name="pref_search_behavior_type_name">Имя</string>
+    <string name="pref_search_behavior_type_issuer">Эмитент</string>
+    <string name="pref_search_behavior_type_note">Заметка</string>
+    <string name="pref_search_behavior_type_groups">Группы</string>
     <string name="pref_set_password_title">Изменить пароль</string>
     <string name="pref_set_password_summary">Установить новый пароль, который вам понадобится, чтобы разблокировать хранилище</string>
+    <string name="no_events_title">Нет записей о событиях</string>
+    <string name="no_events_description">Приложение не зарегистрировало ни одного важного события</string>
+    <string name="event_title_vault_unlocked">Хранилище разблокировано</string>
+    <string name="event_description_vault_unlocked">Хранилище успешно разблокировано</string>
+    <string name="event_title_backup_created">Резервирование выполнено</string>
+    <string name="event_description_backup_created">Резервная копия хранилища успешно создана</string>
+    <string name="event_title_android_backup_created">Резервирование Android выполнено</string>
+    <string name="event_description_android_backup_created">Резервная копия хранилища успешно создана Android</string>
+    <string name="event_title_vault_exported">Хранилище экспортировано</string>
+    <string name="event_description_vault_exported">Копия хранилища экспортирована</string>
+    <string name="event_title_entry_shared">Запись опубликована</string>
+    <string name="event_description_entry_shared">К записи применена команда \"поделиться\"</string>
+    <string name="event_title_vault_unlock_failed_password">Хранилище не разблокировано (пароль)</string>
+    <string name="event_description_vault_unlock_failed_password">Попытка разблокировать хранилище с помощью пароля завершилась неудачно</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Хранилище не разблокировано (биометрия)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Попытка разблокировать хранилище с помощью биометрии завершилась неудачно</string>
+    <string name="event_unknown">Неизвестный тип события</string>
+    <string name="audit_log_entry_deleted">(удалено)</string>
+    <string name="today_at_time">Сегодня в %1$s</string>
+    <string name="day_of_week_at_time">%1$s в %2$s</string>
     <string name="export_encrypted">Шифровать хранилище</string>
     <string name="export_help">Экспорт внутреннего хранилища Aegis. Выберите формат:</string>
     <string name="export_warning_unencrypted">Вы собираетесь экспортировать незашифрованную копию хранилища Aegis. <b>Не рекомендуется</b>.</string>
@@ -122,7 +166,7 @@
         <item quantity="other">%d групп выбрано</item>
     </plurals>
     <string name="export_no_groups_selected">Не выбрано групп для экспорта</string>
-    <string name="export_html_title" context="The title of an HTML export document">Экспорт Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Экспорт Aegis Authenticator</string>
     <string name="choose_authentication_method">Безопасность</string>
     <string name="authentication_method_explanation">Aegis — приложение двухфакторной аутентификации (2FA), ориентированное на безопасность. Ключи хранятся в хранилище, которое по желанию можно зашифровать с помощью пароля. Если злоумышленник получит зашифрованный файл хранилища, он не сможет получить доступ к содержимому без указания пароля.\n\nВыбран наиболее подходящий вариант для вашего устройства.</string>
     <string name="authentication_method_none">Нет</string>
@@ -158,6 +202,7 @@
     <string name="share">Поделиться</string>
     <string name="yes">Да</string>
     <string name="no">Нет</string>
+    <string name="undo">Отмена</string>
     <string name="unlock">Разблокировать</string>
     <string name="advanced">Расширенные</string>
     <string name="counter">Счётчик</string>
@@ -169,6 +214,11 @@
     <string name="set_up_biometric">Настройка биометрической разблокировки</string>
     <string name="copy">Скопировать</string>
     <string name="edit">Изменить</string>
+    <string name="select_all">Выбрать все</string>
+    <string name="assign_icons">Назначить значки</string>
+    <string name="assign_groups">Назначить группу</string>
+    <string name="assign_groups_dialog_summary">Выберите группу, в которую вы хотите отнести выбранные записи.</string>
+    <string name="assign_groups_dialog_dropdown">Выберите группу</string>
     <string name="favorite" comment="Verb">В избранное</string>
     <string name="unfavorite" comment="Verb">Убрать из избранного</string>
     <string name="error_all_caps">ОШИБКА</string>
@@ -180,13 +230,15 @@
     <string name="unlock_vault_error">Невозможно разблокировать хранилище</string>
     <string name="unlock_vault_error_description">Неправильный пароль. Убедитесь, что вы не допустили в нём опечатку.</string>
     <string name="password_equality_error">Пароли должны быть одинаковыми и непустыми</string>
-    <string name="snackbar_authentication_method">Пожалуйста, выберите метод аутентификации</string>
+    <string name="snackbar_authentication_method">Выберите метод аутентификации</string>
     <string name="encrypting_vault">Шифрование хранилища</string>
     <string name="exporting_vault">Экспортирование хранилища</string>
+    <string name="optimizing_icon">Оптимизация значка</string>
+    <string name="optimizing_icon_multiple">Оптимизация значков: %1$d/%2$d</string>
     <string name="reading_file">Чтение файла</string>
     <string name="requesting_root_access">Запрос root-доступа</string>
     <string name="analyzing_qr">Анализ QR-кода</string>
-    <string name="analyzing_qr_multiple">Анализ QR-кода %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Анализ QR-кода %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Добавлена %d новая запись в хранилище</item>
         <item quantity="few">Добавлены %d новые записи в хранилище</item>
@@ -207,6 +259,7 @@
     <string name="discard_changes">Отменить изменения?</string>
     <string name="discard_changes_description">Ваши изменения не были сохранены</string>
     <string name="saving_profile_error">Ошибка сохранения профиля</string>
+    <string name="saving_assign_icons_error">Невозможно назначить значки</string>
     <string name="welcome">Добро пожаловать</string>
     <string name="app_description">Aegis — бесплатное, безопасное и открытое приложение 2FA.</string>
     <string name="setup_completed">Настройка завершена</string>
@@ -215,6 +268,7 @@
     <string name="copied">Скопировано</string>
     <string name="errors_copied">Ошибки скопированы в буфер обмена</string>
     <string name="version_copied">Версия скопирована в буфер обмена</string>
+    <string name="error_required_field">Поле обязательно для заполнения</string>
     <string name="error_occurred">Произошла ошибка</string>
     <string name="decryption_error">Произошла ошибка при попытке разблокировать хранилище</string>
     <string name="decryption_corrupt_error">Произошла ошибка при попытке разблокировать хранилище. Файл хранилища может быть повреждён.</string>
@@ -251,7 +305,7 @@
     <string name="choose_totpauth_importer">Эта резервная копия TOTP Authenticator зашифрована паролем?</string>
     <string name="choose_application">Выберите приложение, из которого хотите импортировать</string>
     <string name="choose_theme">Выберите тему</string>
-    <string name="choose_account_name_position">Выбор места названия учётной записи</string>
+    <string name="choose_account_name_position">Выберите место названия учётной записи</string>
     <string name="choose_view_mode">Выберите режим отображения</string>
     <string name="choose_copy_behavior">Настройка копирования</string>
     <string name="parsing_file_error">Произошла ошибка при попытке разобрать файл</string>
@@ -284,15 +338,22 @@
     <string name="partial_google_auth_import">Обнаружен неполный экспорт Google Authenticator</string>
     <string name="partial_google_auth_import_warning">Некоторые QR-коды отсутствуют в импорте. Следующие коды не найдены:\n\n<b>%s</b>\n\nВы можете продолжить импорт этого неполного экспорта, но лучше сделать повторный экспорт со всеми QR-кодами, чтобы избежать риска потери доступа к ключам.</string>
     <string name="missing_qr_code_descriptor">• QR-код %d</string>
-    <string name="import_partial_export_anyway">Принудительно импортировать %d ключей</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Принудительно импортировать %d ключ</item>
+        <item quantity="few">Принудительно импортировать %d ключа</item>
+        <item quantity="many">Принудительно импортировать %d ключей</item>
+        <item quantity="other">Принудительно импортировать %d ключей</item>
+    </plurals>
     <string name="import_google_auth_failure">Невожможно импортировать экспорт из Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">Экспорт содержит информацию для несвязанного пакета. Попробуйте импортировать по 1 пакету за раз.</string>
-    <string name="no_tokens_can_be_imported">В результате никакие ключи не могут быть импортированы</string>
-    <string name="authentication_method_raw">Необработанный</string>
+    <string name="no_tokens_can_be_imported">В результате ни один ключ не может быть импортирован</string>
     <string name="unlocking_vault">Разблокировка хранилища</string>
-    <string name="slot_this_device">(это устройство)</string>
+    <string name="rename_group">Переименовать группу</string>
+    <string name="no_group_selection">Если запись не входит ни в одну группу, её можно найти в разделе «Нет группы».</string>
     <string name="remove_group">Удалить группу</string>
     <string name="remove_group_description">Удалить группу? Записи из этой группы будут автоматически перемещены в «Нет группы».</string>
+    <string name="remove_unused_groups">Удалить неиспользуемые группы</string>
+    <string name="remove_unused_groups_description">Удалить все группы, к которым не привязаны записи?</string>
     <string name="remove_icon_pack">Удалить набор значков</string>
     <string name="remove_icon_pack_description">Удалить этот набор значков? Сами записи, использующие значки из данного набора, не будут затронуты.</string>
     <string name="details">Подробнее</string>
@@ -300,13 +361,16 @@
     <string name="lock">Заблокировать</string>
     <string name="name">Имя</string>
     <string name="no_group">Нет группы</string>
-    <string name="sort">Сортировка</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Сортировка</string>
     <string name="sort_alphabetically">Эмитент (А→Я)</string>
     <string name="sort_alphabetically_reverse">Эмитент (Я→А)</string>
     <string name="sort_alphabetically_name">Учётная запись (А→Я)</string>
     <string name="sort_alphabetically_name_reverse">Учётная запись (Я→А)</string>
     <string name="sort_usage_count">Количество использований</string>
+    <string name="sort_last_used">Последнее использование</string>
     <string name="sort_custom">Произвольно</string>
+    <string name="last_used">Последнее использование</string>
+    <string name="last_used_never">никогда</string>
     <string name="new_group">Новая группа…</string>
     <string name="group">Группа</string>
     <string name="group_name_hint">Название группы</string>
@@ -315,13 +379,33 @@
     <string name="preference_reset_usage_count">Сброс счётчика использований</string>
     <string name="preference_reset_usage_count_summary">Сброс количества использований каждой записи в хранилище</string>
     <string name="preference_reset_usage_count_dialog">Установить количество использований для каждой записи в хранилище на 0?</string>
-    <string name="note">Заметка</string>
+    <string name="note" comment="Users can add a note to an entry">Заметка</string>
     <string name="clear">Очистить</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Дублировать запись</string>
+    <string name="dialog_duplicate_entry_message">Эта запись имеет такое же имя и эмитента, как и в одной или нескольких существующих записях. Как поступить?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Перезаписать существующую запись/записи</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Заменить существующую запись или записи новой. Это действие не может быть отменено.</string>
+    <string name="dialog_duplicate_entry_suffix_title">Добавить суффикс</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Создать новую запись с суффиксом в имени. Новое имя будет: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Отменить сохранение</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Разрешать редактировать запись перед повторным сохранением</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Удалить %d запись с именем:\n\n%s — %s</item>
+        <item quantity="few">Удалить %d записи с именем:\n\n%s — %s</item>
+        <item quantity="many">Удалить %d записей с именем:\n\n%s — %s</item>
+        <item quantity="other">Удалить %d записей с именем:\n\n%s — %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Подтвердить удаление</string>
+    <string name="pref_haptic_feedback_summary">Включать вибрацию устройства при обновлении кодов</string>
+    <string name="pref_haptic_feedback_title">Виброотклик</string>
     <string name="pref_highlight_entry_title">Выделять ключи при нажатии</string>
     <string name="pref_highlight_entry_summary">Сделать ключи более различимыми, временно выделяя их при нажатии</string>
+    <string name="pref_groups_multiselect_title">Мультивыбор групп</string>
+    <string name="pref_groups_multiselect_summary">Разрешить одновременный выбор нескольких групп</string>
     <string name="pref_minimize_on_copy_title">Сворачивать при копировании</string>
     <string name="pref_minimize_on_copy_summary">Сворачивать приложение после копирования ключа</string>
     <string name="pref_copy_behavior_title">Копировать ключи в буфер обмена</string>
+    <string name="pref_search_behavior_title">Поведение поиска</string>
     <string name="pref_pause_entry_title">Замораживать ключи при нажатии</string>
     <string name="pref_pause_entry_summary">Приостановить автоматическое обновление ключей принажатии на них. Ключи не будут обновляться до тех пор, пока отображаются. Для обновления потребуется «Выделять ключи при нажатии» или «Отображение по нажатию».</string>
     <string name="pin_keyboard_description">Введите свой пароль, чтобы включить PIN-клавиатуру. Обратите внимание, что это работает, только если ваш пароль состоит из цифр.</string>
@@ -341,16 +425,16 @@
     <string name="unknown_issuer">Неизвестный эмитент</string>
     <string name="unknown_account_name">Неизвестное название учётной записи</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis не удалось импортировать %d ключ. Эти ключи будут пропущены. Нажмите «Подробнее», чтобы увидеть дополнительную информацию об ошибках.</item>
-        <item quantity="few">Aegis не удалось импортировать %d ключа. Эти ключи будут пропущены. Нажмите «Подробнее», чтобы увидеть дополнительную информацию об ошибках.</item>
-        <item quantity="many">Aegis не удалось импортировать %d ключей. Эти ключи будут пропущены. Нажмите «Подробнее», чтобы увидеть дополнительную информацию об ошибках.</item>
-        <item quantity="other">Aegis не удалось импортировать %d ключей. Эти ключи будут пропущены. Нажмите «Подробнее», чтобы увидеть дополнительную информацию об ошибках.</item>
+        <item quantity="one">Aegis не может импортировать %d ключ. Этот ключ будет пропущен. Нажмите «Подробнее», чтобы просмотреть дополнительную информацию об ошибке.</item>
+        <item quantity="few">Aegis не может импортировать %d ключа. Эти ключи будут пропущены. Нажмите «Подробнее», чтобы просмотреть дополнительную информацию об ошибке.</item>
+        <item quantity="many">Aegis не может импортировать %d ключей. Эти ключи будут пропущены. Нажмите «Подробнее», чтобы просмотреть дополнительную информацию об ошибке.</item>
+        <item quantity="other">Aegis не может импортировать %d ключей. Эти ключи будут пропущены. Нажмите «Подробнее», чтобы просмотреть дополнительную информацию об ошибке.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Невозможно обработать глубокую ссылку</string>
     <string name="unable_to_read_qrcode_file">Невозможно считать и обработать QR-код из файла: %s.</string>
     <string name="unable_to_process_shared_text">Невозможно обработать текст как OTP</string>
-    <string name="unable_to_read_qrcode_files">Невозможно считать и обработать некоторые QR-коды. Импортируется только %d/%d.</string>
-    <string name="unable_to_generate_qrcode">Невозможно сгенерировать QR-код</string>
+    <string name="unable_to_read_qrcode_files">Невозможно считать и обработать некоторые QR-коды. Импортируется только %1$d/%2$d.</string>
+    <string name="unable_to_generate_qrcode">Невозможно создать QR-код</string>
     <string name="select_picture">Выберите изображение</string>
     <string name="select_icon">Выберите значок</string>
     <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Открыть хранилище</string>
@@ -381,25 +465,27 @@
     <string name="time_sync_warning_disable">Прекратите меня предупреждать, я знаю, что делаю.</string>
     <string name="google_qr_export_unrelated">Найден несвязанный QR-код. Попробуйте перезапустить сканер.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Отсканировано QR-кодов %d/%d</item>
-        <item quantity="few">Отсканировано QR-кодов %d/%d</item>
-        <item quantity="many">Отсканировано QR-кодов %d/%d</item>
-        <item quantity="other">Отсканировано QR-кодов %d/%d</item>
+        <item quantity="one">Отсканирован %1$d/%2$d QR-код</item>
+        <item quantity="few">Отсканированы %1$d/%2$d QR-кода</item>
+        <item quantity="many">Отсканировано %1$d/%2$d QR-кодов</item>
+        <item quantity="other">Отсканировано %1$d/%2$d QR-кодов</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Ожидался QR-код #%d, но вместо этого отсканирован #%d</string>
+    <string name="google_qr_export_unexpected">Ожидался QR-код #%1$d, но вместо этого отсканирован #%2$d</string>
     <string name="backup_error_bar_message"><b>Недавно произошла ошибка резервного копирования хранилища</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Последнее резервное копирование хранилища с использованием %s не выполнено из-за ошибки. Попытка производилась %s. Убедитесь, что настройки резервного копирования правильные.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Последнее резервное копирование хранилища с использованием %1$s не выполнено из-за ошибки. Попытка производилась %2$s. Убедитесь, что настройки резервного копирования правильные.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Недавняя попытка резервного копирования хранилища с использованием %1$s не выполнена, поскольку у Aegis нет разрешения на запись в место назначения резервной копии. Попытка создания резервной копии была %2$s. Эта ошибка может возникать, если вы переместили/переименовали место назначения резервной копии или если недавно восстановили параметры Aegis из резервной копии. Пожалуйста, перенастройте место назначения резервной копии.
     </string>
     <string name="backup_system_builtin">Встроенное автоматическое резервирование Aegis</string>
     <string name="backup_system_android">Системное облачное резервирование Android</string>
-    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Последняя резервная копия устарела (%s)
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Резервная копия устарела (%s)
     </string>
     <string name="backup_reminder_bar_message">        Изменения не сохранены
     </string>
     <string name="backup_reminder_bar_dialog_title">Изменения не сохранены</string>
     <string name="backup_reminder_bar_dialog_summary">        Резервное копирование последних изменений в хранилище ещё не выполнялось. Важно регулярно делать резервные копии, чтобы не потерять доступ к своим учётным записям. По возможности настройте автоматическое резервное копирование в меню настроек.
     </string>
-    <string name="backup_reminder_bar_dialog_accept">Настройка резервного копирования</string>
+    <string name="backup_reminder_bar_dialog_accept">Настройка резервирования</string>
     <string name="backup_plaintext_export_warning"><b>Хранилище недавно было экспортировано в виде простого текста</b></string>
     <string name="pref_show_plaintext_warning_hint">Больше не показывать это предупреждение</string>
     <string name="backup_plaintext_warning_explanation">Это предупреждение отображается потому, что вы недавно экспортировали хранилище в незашифрованном виде. Для обеспечения безопасности ключей, мы рекомендуем удалить этот файл, как только он перестанет быть нужным.</string>
@@ -419,19 +505,20 @@
         <item quantity="many">%d / %d QR-кодов</item>
         <item quantity="other">%d / %d QR-кодов</item>
     </plurals>
-    <string name="next">Следующий</string>
-    <string name="previous">Предыдущий</string>
+    <string name="next">Следующее</string>
+    <string name="previous">Предыдущее</string>
     <string name="copy_uri">Копировать URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Невозможно скопировать URI в буфер обмена</string>
     <string name="uri_copied_to_clipboard">URI скопирован в буфер обмена</string>
-    <string name="transfer_entry">Передача записи</string>
     <string name="transfer_entry_description">Отсканируйте QR-код с помощью приложения для аутентификации, в которое вы хотите передать эту запись.</string>
+    <string name="transfer_entry_brightness">Нажатие на QR-код переключает полную яркость экрана</string>
     <string name="google_auth_compatible_transfer_description">Сканируйте эти QR-коды в Aegis или Google Authenticator. Из-за ограничений приложения Google Authenticator, включены только ключи TOTP и HOTP, использующие SHA1 и создающие 6-значные коды.</string>
     <string name="password_strength_very_weak">Очень слабый</string>
     <string name="password_strength_weak">Слабый</string>
     <string name="password_strength_fair">Средний</string>
     <string name="password_strength_good">Хороший</string>
     <string name="password_strength_strong">Сложный</string>
+    <string name="password_strength_unknown">Пароль слишком длинный для анализа надёжности</string>
     <string name="pref_pin_keyboard_title">PIN-клавиатура на экране блокировки</string>
     <string name="pref_pin_keyboard_summary">Включите, если хотите использовать PIN-клавиатуру на экране блокировки. Работает только для паролей из цифр.</string>
     <string name="title_activity_preferences">Настройки</string>
@@ -440,33 +527,46 @@
     <string name="title_activity_about">О программе</string>
     <string name="title_activity_edit_entry">Редактировать запись</string>
     <string name="title_activity_scan_qr">Сканировать QR-код</string>
-    <string name="title_activity_manage_slots">Управление ключевыми слотами</string>
     <string name="title_activity_import_entries">Импорт записей</string>
+    <string name="title_activity_assign_icons">Назначить значки</string>
+    <string name="title_activity_licenses">Сторонние лицензии</string>
     <string name="dialog_wipe_entries_title">Очистить записи</string>
     <string name="dialog_wipe_entries_message">В хранилище уже есть записи. Хотите удалить их перед импортом файла?\n\n<b>Если вы удалите существующие записи, то навсегда потеряете к ним доступ.</b></string>
     <string name="dialog_wipe_entries_checkbox">Очистить содержимое хранилища</string>
     <string name="panic_trigger_ignore_toast">Получен сигнал паники, но настройка отключена — сигнал паники игнорируется</string>
     <string name="pref_panic_trigger_title">Удалять хранилище при панике</string>
     <string name="pref_panic_trigger_summary">Удалить хранилище при получении сигнала паники от Ripple</string>
-    <string name="import_vault">Импорт хранилища</string>
+    <string name="import_vault">Импорт хранилища Aegis</string>
+    <string name="import_vault_hint">Хотите импортировать данные из другого приложения 2FA? Завершите настройку приложения, затем перейдите в меню настроек.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Не выбран %d потенциальный дубликат. Проверьте список записей.</item>
+        <item quantity="few">Не выбраны %d потенциальных дубликата. Проверьте список записей.</item>
+        <item quantity="many">Не выбрано %d потенциальных дубликатов. Проверьте список записей.</item>
+        <item quantity="other">Не выбрано %d потенциальных дубликатов. Проверьте список записей.</item>
+    </plurals>
     <string name="importer_help_2fas">Необходим файл резервной копии 2FAS.</string>
     <string name="importer_help_aegis">Необходим файл экспорта/резервной копии Aegis.</string>
     <string name="importer_help_authenticator_plus">Необходим файл экспорта Authenticator Plus, полученный через <b>«Настройки» → «Рез. копия и восстановление» → «Экспорт текста и HTML»</b>.</string>
-    <string name="importer_help_authenticator_pro">Необходим файл экспорта Authenticator Pro, полученный через <b>«Настройки» → «Резервное копирование» → «Резервное копирование в зашифрованный файл (рекомендуется)»</b>.</string>
     <string name="importer_help_authy">Необходима копия файла <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, расположенного в папке «Authy» во внутренней памяти.</string>
     <string name="importer_help_andotp">Необходим файл экспорта/резервной копии andOTP.</string>
     <string name="importer_help_bitwarden">Необходим файл экспорта/резервной копии Bitwarden. Зашифрованные файлы не поддерживаются.</string>
-    <string name="importer_help_battle_net_authenticator">Необходима копия файла <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, расположенного в папке «Battle.net Authenticator» во внутренней памяти.</string>
+    <string name="importer_help_battle_net_authenticator">Необходима копия файла <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, расположенного в папке «Battle.net Authenticator» во внутренней памяти.</string>
     <string name="importer_help_duo">Необходима копия файла <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, расположенного в папке «DUO» во внутренней памяти.</string>
-    <string name="importer_help_freeotp">Необходима копия файла <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, расположенного в папке «FreeOTP» во внутренней памяти.</string>
+    <string name="importer_help_ente_auth">Необходим файл экспорта Ente Auth. В настоящее время поддерживаются только незашифрованные файлы.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: необходим файл резервной копии.\nFreeOTP 1.x: необходима копия файла <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, расположенного в папке «FreeOTP» во внутренней памяти.</string>
     <string name="importer_help_freeotp_plus">Необходим файл экспорта FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Совместимость с FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">В FreeOTP 2 существует ряд проблем, которые могут привести к повреждению резервных копий. Aegis постарается сохранить как можно больше записей, но возможно, что некоторые или даже все из них не удастся импортировать.</string>
     <string name="importer_help_google_authenticator"><b>Поддерживаются только файлы баз данных Google Authenticator версии 5.10 и более ранних</b>.\n\nНеобходима копия файла <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, расположенного в папке «Google Authenticator» во внутренней памяти.</string>
     <string name="importer_help_microsoft_authenticator">Необходима копия файла <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, расположенного в папке «Microsoft Authenticator» во внутренней памяти.</string>
     <string name="importer_help_plain_text">Необходим текстовый файл с URI Google Authenticator в каждой строке.</string>
     <string name="importer_help_steam"><b>Steam v3.0 и новее не поддерживаются</b>. 
 Необходима копия файла <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, расположенного в папке «Steam» во внутренней памяти.</string>
+    <string name="importer_help_stratum">Необходим файл экспорта Stratum, полученный через <b>«Настройки» → «Резервное копирование» → «Резервное копирование в зашифрованный файл (рекомендуется)»</b>.</string>
     <string name="importer_help_totp_authenticator">Необходим файл экспорта TOTP Authenticator.</string>
     <string name="importer_help_winauth">Необходим файл экспорта WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Назначить значки</string>
+    <string name="import_assign_icons_dialog_text">Назначить значки для импортированных записей?</string>
     <string name="importer_encrypted_exception_google_authenticator">Была пропущена зашифрованная запись: %s</string>
     <string name="importer_help_direct">Импорт записей напрямую из %s. Для этого необходимо, чтобы приложение было установлено на этом устройстве и чтобы Aegis были предоставлены права суперпользователя.</string>
     <string name="groups">Группы</string>
@@ -483,31 +583,31 @@
     <string name="pref_account_name_position_hidden">Скрыта</string>
     <string name="pref_account_name_position_end">После эмитента</string>
     <string name="pref_account_name_position_below">Под эмитентом</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d секунду назад</item>
         <item quantity="few">%d секунды назад</item>
         <item quantity="many">%d секунд назад</item>
         <item quantity="other">%d секунд назад</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d минуту назад</item>
         <item quantity="few">%d минуты назад</item>
         <item quantity="many">%d минут назад</item>
         <item quantity="other">%d минут назад</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d час назад</item>
         <item quantity="few">%d часа назад</item>
         <item quantity="many">%d часов назад</item>
         <item quantity="other">%d часов назад</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d день назад</item>
         <item quantity="few">%d дня назад</item>
         <item quantity="many">%d дней назад</item>
         <item quantity="other">%d дней назад</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d год назад</item>
         <item quantity="few">%d года назад</item>
         <item quantity="many">%d лет назад</item>
diff --git a/app/src/main/res/values-sk-rSK-v29/strings.xml b/app/src/main/res/values-sk-rSK-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-sk-rSK-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index cce6e3e0..193814f3 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Nastavenia</string>
     <string name="action_about">O programe</string>
     <string name="action_delete">Odstrániť</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Obnoviť predvolenú ikonu</string>
     <string name="discard">Zahodiť</string>
     <string name="save">Uložiť</string>
+    <string name="all">Všetky</string>
     <string name="issuer">Vydavateľ</string>
     <string name="yandex_pin">PIN (4-16 číslic)</string>
     <string name="motp_pin">PIN (4 číslice)</string>
@@ -28,38 +29,53 @@
     <string name="pref_section_security_summary">Nakonfigurujte šifrovanie, biometrické odomknutie, automatické uzamknutie a ďalšie nastavenia zabezpečenia.</string>
     <string name="pref_section_import_export_title">Import &amp; export dát</string>
     <string name="pref_section_import_export_summary">Importujte zálohy Aegis alebo iných autentifikačných aplikácií. Vytvorte manuálne exporty svojho trezoru Aegis.</string>
+    <string name="pref_section_audit_log_title">Denník záznamov</string>
+    <string name="pref_section_audit_log_summary">Nájdite zoznam všetkých nahlásených dôležitých udalosti, ktoré sa stali v aplikácii.</string>
     <string name="pref_section_backups_title">Zálohy</string>
     <string name="pref_section_backups_summary">Nastavte automatické zálohovanie na miesto podľa vášho výberu alebo povoľte účasť v cloudovom zálohovacom systéme Androidu.</string>
     <string name="pref_section_icon_packs">Balíčky ikon</string>
     <string name="pref_section_icon_packs_summary">Spravovať a importovať balíčky ikon</string>
     <string name="pref_select_theme_title">Téma</string>
+    <string name="pref_dynamic_colors_title">Dynamické farby</string>
+    <string name="pref_dynamic_colors_summary">Použiť prekrytie na základe farieb vášho Android motívu</string>
     <string name="pref_view_mode_title">Režim zobrazenia</string>
     <string name="pref_lang_title">Jazyk</string>
     <string name="pref_show_icons_title">Zobraziť ikony</string>
-    <string name="pref_show_icons_summary">Zobrazte ikony vedľa každého záznamu</string>
+    <string name="pref_show_icons_summary">Zobraziť ikony vedľa každého záznamu</string>
     <string name="pref_code_group_size_title">Zoskupenie číselných znakov</string>
+    <string name="pref_code_group_size_summary">Vyberte číslo po koľkých čísliciach sa majú zoskupovať kódy</string>
     <string name="pref_account_name_position_title">Zobraziť názov účtu</string>
+    <string name="pref_show_next_code_title">Ukáž ďalší kód</string>
+    <string name="pref_show_next_code_summary">Vygenerovať a zobraziť ďalší kód v predstihu</string>
+    <string name="pref_expiration_state_title">Zobraz kedy sa skončí platnosť kódov</string>
+    <string name="pref_expiration_state_summary">Zmena farbu kódov a rozblikaj ich, keď sa blíži koniec platnosti</string>
+    <string name="pref_expiration_state_fallback">Zmena farbu kódov keď sa blíži koniec platnosti</string>
     <string name="pref_shared_issuer_account_name_title">Zobrazovať názov účtu iba pokiaľ to je potrebné</string>
-    <string name="pref_import_file_title">Importovanie zo súboru</string>
+    <string name="pref_shared_issuer_account_name_summary">Zobraziť názvy účtov len v prípade, že majú rovnakého vydavateľa. Ostatné názvy účtov budú skryté.</string>
+    <string name="pref_import_file_title">Importovať zo súboru</string>
     <string name="pref_import_file_summary">Importovať tokeny zo súboru</string>
     <string name="pref_android_backups_title">Zálohy na Android cloude</string>
+    <string name="pref_android_backups_summary">Povoliť zálohovaciemu systému Android Cloud zahrnúť Aegis\' trezor v ich zálohách. Táto možnosť je podporovaná iba pre šifrované trezory.</string>
     <string name="pref_android_backups_hint"><i>Device-to-device (D2D) zálohy sú povolené vždy, nezávisle na nastavení vyššie</i></string>
     <string name="pref_backups_title">Automaticky zálohovať trezor</string>
     <string name="pref_backups_summary">Po vykonaní zmien automaticky vytvárať zálohy trezoru na externom úložisku. Toto je podporované iba pre šifrované trezory.</string>
     <string name="pref_backups_reminder_title">Pripomienky zálohovania</string>
+    <string name="pref_backups_reminder_summary">Zobraziť pripomienku o zálohovaní vášho trezoru v prípade, že ste nezálohovali vaše najnovšie zmeny.</string>
     <string name="pref_backups_reminder_dialog_title">Zakázať pripomienky zálohovania</string>
-    <string name="pref_backups_location_title">Adresár pre zálohy</string>
+    <string name="pref_backups_reminder_dialog_summary">Ak túto pripomienku zakážete, Aegis vám nepovie, či máte alebo nemáte zmeny, ktoré ešte nie sú zálohované. Vystavujete sa tak riziku straty prístupu k svojim tokenom. Naozaj chcete zakázať pripomenutie?</string>
     <string name="pref_backups_location_summary">Zálohy budú uložené v</string>
     <string name="pref_backups_trigger_title">Spustiť zálohu</string>
     <string name="pref_backups_trigger_summary">Ručné spustenie zálohy</string>
     <string name="pref_backups_versions_title">Počet verzií na uchovanie</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Ponechať %1$d verziu zálohy</item>
         <item quantity="few">Ponechať %1$d verzie zálohy</item>
         <item quantity="many">Ponechať %1$d verzií zálohy</item>
         <item quantity="other">Ponechať %1$d verzií zálohy</item>
     </plurals>
-    <string name="pref_import_app_title">Importovanie z aplikácie</string>
+    <string name="pref_backups_versions_infinite_summary">Ponechať nekonečné množstvo verzií zálohy</string>
+    <string name="pref_import_app_title">Importovať z aplikácie</string>
     <string name="pref_import_app_summary">Importovať tokeny z aplikácie (vyžaduje sa prístup root)</string>
     <string name="pref_export_title">Exportovať</string>
     <string name="pref_export_summary">Exportovať trezor</string>
@@ -73,6 +89,7 @@
     <string name="pref_secure_screen_summary">Blokujte snímky obrazovky a iné pokusy o zachytenie obrazovky v rámci aplikácie</string>
     <string name="pref_tap_to_reveal_title">Stlač pre zobrazenie</string>
     <string name="pref_tap_to_reveal_summary">Tokeny budú predvolene skryté. Kliknite na tokeny pre zobrazenie kódu.</string>
+    <string name="pref_tap_to_reveal_time_title">Čas do skrytia zobrazeného kódu</string>
     <string name="pref_auto_lock_title">Automatické zamykanie</string>
     <string name="pref_auto_lock_summary">Keď %s</string>
     <string name="pref_auto_lock_summary_disabled">Vypnuté</string>
@@ -82,21 +99,58 @@
     <string name="pref_auto_lock_type_device_lock">Zariadenie je uzamknuté</string>
     <string name="pref_backup_password_category">Záloha &amp; Export</string>
     <string name="pref_backup_password_title">Samostatné heslo pre zálohu &amp; export</string>
+    <string name="pref_backup_password_summary">Ak je povolené, heslo, ktoré sa používa na odomknutie aplikácie, už nemožno použiť na dešifrovanie záloh a exportov.</string>
+    <string name="pref_backup_password_change_title">Zmeniť heslo pre zálohu &amp; export</string>
+    <string name="pref_backup_password_change_summary">Nastavte nové heslo, ktoré sa použije na šifrovanie trezoru počas zálohovania a exportu.</string>
     <string name="pref_encryption_title">Šifrovanie</string>
     <string name="pref_encryption_summary">Zašifrujte trezor a odomknite ho pomocou hesla alebo biometrie</string>
     <string name="pref_biometrics_title">Biometrické odomykanie</string>
     <string name="pref_biometrics_summary">Povoliť biometrické overenie na odomknutie trezoru</string>
+    <string name="pref_search_behavior_prompt">Vyhľadávanie v niektorom z nasledujúcich polí</string>
+    <string name="pref_search_behavior_type_name">Meno</string>
+    <string name="pref_search_behavior_type_issuer">Vydavateľ</string>
+    <string name="pref_search_behavior_type_note">Poznámka</string>
+    <string name="pref_search_behavior_type_groups">Skupiny</string>
     <string name="pref_set_password_title">Zmeniť heslo</string>
     <string name="pref_set_password_summary">Zadajte nové heslo, ktoré budete potrebovať na odomknutie trezoru</string>
+    <string name="no_events_title">Žiadne nahlásené udalosti</string>
+    <string name="no_events_description">V aplikácii neboli nahlásené žiadne dôležité udalosti</string>
+    <string name="event_title_vault_unlocked">Trezor odomknutý</string>
+    <string name="event_description_vault_unlocked">Trezor bol úspešne odomknutý</string>
+    <string name="event_title_backup_created">Záloha vytvorená</string>
+    <string name="event_description_backup_created">Záloha trezoru bola úspešne vytvorená</string>
+    <string name="event_title_android_backup_created">Záloha vytvorená systémom Android</string>
+    <string name="event_description_android_backup_created">Záloha trezoru bola úspešne vytvorená systémom Android</string>
+    <string name="event_title_vault_exported">Trezor exportovaný</string>
+    <string name="event_description_vault_exported">Kópia trezoru bola exportovaná</string>
+    <string name="event_title_entry_shared">Záznam zdieľaný</string>
+    <string name="event_description_entry_shared">Záznam bol zdieľaný</string>
+    <string name="event_title_vault_unlock_failed_password">Odomknutie trezora sa nepodarilo (heslo)</string>
+    <string name="event_description_vault_unlock_failed_password">Pokus o odomknutie trezora s heslom zlyhalo</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Odomknutie trezora sa nepodarilo (biometria)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Pokus o odomknutie trezora s biometriou zlyhalo</string>
+    <string name="event_unknown">Neznámy typ udalosti</string>
+    <string name="today_at_time">Dnes o %1$s</string>
+    <string name="day_of_week_at_time">%1$s o %2$s</string>
     <string name="export_encrypted">Šifrovať trezor</string>
     <string name="export_help">Touto akciou sa exportuje trezor z interného úložiska Aegis. Vyberte formát, v ktorom chcete mať export:</string>
-    <string name="export_warning_unencrypted">Chystáte sa exportovať nezašifrovanú kópiu svojho trezoru Aegis. <b> Toto sa neodporúča </b>.</string>
+    <string name="export_warning_unencrypted">Chystáte sa exportovať nezašifrovanú kópiu svojho trezoru Aegis. <b>Toto sa neodporúča</b>.</string>
+    <string name="export_warning_password">Exporty sú šifrované pomocou samostatného hesla nakonfigurovaného v nastaveniach zabezpečenia.</string>
     <string name="understand_risk_accept">Rozumiem rizikám</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
     <string name="export_format_google_auth_uri">Textový súbor (.TXT)</string>
     <string name="export_format_html">Webová stránka (.HTML)</string>
     <string name="export_format_hint">Formát exportu</string>
     <string name="export_all_groups">Exportovať všetky skupiny</string>
+    <string name="export_choose_groups">Vyberte, ktoré skupiny sa majú exportovať</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="one">%d vybraná skupina</item>
+        <item quantity="few">%d vybrané skupiny</item>
+        <item quantity="many">%d vybraných skupín</item>
+        <item quantity="other">%d vybraných skupín</item>
+    </plurals>
+    <string name="export_no_groups_selected">Nie sú vybrané žiadne skupiny na exportovanie</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Export Aegis Authenticator</string>
     <string name="choose_authentication_method">Zabezpečenie</string>
     <string name="authentication_method_none">Žiadne</string>
     <string name="authentication_method_none_description">Na odomknutie trezoru nie je potrebné žiadne heslo a nebude šifrovaný. <b> Táto možnosť sa neodporúča </b>.</string>
@@ -113,6 +167,7 @@
     <string name="set_number">Prosím zadajte číslo</string>
     <string name="set_password_confirm">Prosím potvrďte heslo</string>
     <string name="invalid_password">Heslo je nesprávne</string>
+    <string name="password_reminder_dialog_title">Predvolené biometrické odomykanie</string>
     <string name="password_reminder_freq_never">Nikdy</string>
     <string name="password_reminder_freq_weekly">Týždenne</string>
     <string name="password_reminder_freq_biweekly">Každý druhý týždeň</string>
@@ -125,16 +180,23 @@
     <string name="share">Zdieľať</string>
     <string name="yes">Áno</string>
     <string name="no">Nie</string>
+    <string name="undo">Späť</string>
     <string name="unlock">Odomknúť</string>
     <string name="advanced">Pokročilé</string>
     <string name="counter">Počítadlo</string>
     <string name="digits">Číslice</string>
+    <string name="secret">Tajný kľúč</string>
     <string name="scan">Naskenovať QR kód</string>
     <string name="scan_image">Naskenovať obrázok</string>
     <string name="enter_manually">Zadať ručne</string>
     <string name="set_up_biometric">Nastaviť biometrické odomknutie</string>
     <string name="copy">Kopírovať</string>
     <string name="edit">Upraviť</string>
+    <string name="select_all">Vybrať všetko</string>
+    <string name="assign_icons">Priradiť ikonky</string>
+    <string name="assign_groups">Priraď do skupiny</string>
+    <string name="assign_groups_dialog_summary">Vyberte skupinu, do ktorej chcete priradiť vybrané položky.</string>
+    <string name="assign_groups_dialog_dropdown">Vyber skupinu</string>
     <string name="favorite" comment="Verb">Obľúbené</string>
     <string name="unfavorite" comment="Verb">Odobrať z obľúbených</string>
     <string name="error_all_caps">CHYBA</string>
@@ -156,9 +218,16 @@
     <string name="delete_entry">Odstrániť položku</string>
     <string name="delete_entry_description">Naozaj chcete túto položku odstrániť?</string>
     <string name="delete_entries">Vymazať položky</string>
+    <plurals name="delete_entries_description">
+        <item quantity="one">Naozaj chcete odstrániť %d položku?</item>
+        <item quantity="few">Naozaj chcete odstrániť %d položky?</item>
+        <item quantity="many">Naozaj chcete odstrániť %d položiek?</item>
+        <item quantity="other">Naozaj chcete odstrániť %d položiek?</item>
+    </plurals>
     <string name="discard_changes">Zrušiť zmeny?</string>
     <string name="discard_changes_description">Vaše zmeny neboli uložené</string>
     <string name="saving_profile_error">Pri ukladaní profilu sa vyskytla chyba</string>
+    <string name="saving_assign_icons_error">Chyba priradenia ikon</string>
     <string name="welcome">Vitajte</string>
     <string name="app_description">Aegis je bezplatná, bezpečná a open source aplikácia 2FA</string>
     <string name="setup_completed">Nastavenie je dokončené</string>
@@ -167,6 +236,7 @@
     <string name="copied">Skopírované</string>
     <string name="errors_copied">Chyby boli skopírované do schránky</string>
     <string name="version_copied">Verzia bola skopírovaná do schránky</string>
+    <string name="error_required_field">Toto pole je povinné</string>
     <string name="error_occurred">Došlo k chybe</string>
     <string name="decryption_error">Pri pokuse o odomknutie trezoru sa vyskytla chyba</string>
     <string name="decryption_corrupt_error">Pri pokuse o odomknutie trezoru sa vyskytla chyba. Váš súbor trezoru môže byť poškodený.</string>
@@ -175,34 +245,61 @@
     <string name="vault_load_error">Pri pokuse o načítanie trezoru z úložiska sa vyskytla chyba</string>
     <string name="biometric_decrypt_error">Pri pokuse o dešifrovanie trezoru pomocou biometrického overenia sa vyskytla chyba. Zvyčajne sa to stane iba vtedy, ak sa zmenili nastavenia zabezpečenia vášho zariadenia. Odomknite trezor pomocou svojho hesla a prekonfigurujte biometrické overenie v nastaveniach Aegis.</string>
     <string name="disable_encryption">Vypnúť šifrovanie</string>
+    <string name="enable_encryption_error">Pri zapínaní šifrovania došlo k chybe</string>
+    <string name="disable_encryption_error">Pri vypínaní šifrovania došlo k chybe</string>
+    <string name="backup_successful">Zálohovanie bolo úspešne naplánované</string>
+    <string name="backup_error">Pri pokuse o vytvorenie zálohy došlo k chybe</string>
+    <string name="backup_status_success">Nedávna úspešná záloha: %s</string>
+    <string name="backup_status_failed">Nedávna neúspešná záloha: %s</string>
     <string name="backup_status_none">Zatiaľ neboli vytvorené žiadne zálohy</string>
+    <string name="backup_warning_password">Zálohy sú šifrované pomocou samostatného hesla zadaného v nastaveniach zabezpečenia</string>
+    <string name="icon_pack_import_error">Pri pokuse o import balíka ikon došlo k chybe</string>
+    <string name="icon_pack_import_exists_error">Balík ikon, ktorý sa snažíte importovať, už existuje. Chcete ho prepísať?</string>
+    <string name="icon_pack_delete_error">Pri pokuse o odstránenie balíka ikon došlo k chybe</string>
+    <plurals name="icon_pack_info">
+        <item quantity="one">%d ikona</item>
+        <item quantity="few">%d ikony</item>
+        <item quantity="many">%d ikon</item>
+        <item quantity="other">%d ikon</item>
+    </plurals>
     <string name="icon_custom">Vlastný</string>
     <string name="permission_denied">Prístup bol zamietnutý</string>
     <string name="andotp_new_format">Nový formát (v0.6.3 alebo novšia) </string>
     <string name="andotp_old_format">Starý formát (v0.6.2 alebo staršia) </string>
+    <string name="choose_andotp_importer">Aký formát má záložný súbor andOTP?</string>
+    <string name="choose_totpauth_importer">Je táto záloha autentifikátora TOTP zašifrovaná heslom?</string>
     <string name="choose_application">Vyberte aplikáciu, z ktorej chcete importovať</string>
     <string name="choose_theme">Vyberte si vašu želanú tému</string>
     <string name="choose_account_name_position">Vyberte si vašu želanú pozíciu názvu účtu</string>
     <string name="choose_view_mode">Vyberte si váš želaný režim zobrazenia</string>
     <string name="choose_copy_behavior">Vyberte si vaše želané správanie kopírovania</string>
+    <string name="parsing_file_error">Pri pokuse o analyzovanie súboru došlo k chybe</string>
     <string name="file_not_found">Chyba: Súbor nenájdený</string>
     <string name="reading_file_error">Pri pokuse o prečitanie súboru sa vyskytla chyba</string>
+    <string name="app_lookup_error">Chyba: Aplikácia nie je nainštalovaná</string>
+    <string name="root_error">Chyba: Nie je možné získať prístup root</string>
     <plurals name="entries_shown">
         <item quantity="one">Zobrazuje sa %d záznam</item>
         <item quantity="few">Zobrazujú sa %d záznamy</item>
         <item quantity="many">Zobrazuje sa %d záznamov</item>
         <item quantity="other">Zobrazuje sa %d záznamov</item>
     </plurals>
+    <string name="intro_import_error_title">Pri importe trezoru došlo k chybe</string>
+    <string name="import_error_title">Počas importu sa vyskytla jedna alebo viacero chýb</string>
     <string name="exported_vault">Trezor bol exportovaný</string>
     <string name="encryption_set_password_error">Pri pokuse o nastavenie hesla sa vyskytla chyba.</string>
     <string name="encryption_enable_biometrics_error">Pri pokuse o povolenie biometrického odomykania sa vyskytla chyba. Niektoré zariadenia majú slabú implementáciu biometrickej autentifikácie a je pravdepodobné, že to vaše je jedno z nich. Zvážte namiesto toho prechod na konfiguráciu iba s heslom.</string>
     <string name="no_cameras_available">K dispozícii nie sú žiadne kamery</string>
     <string name="read_qr_error">Pri pokuse o načítanie kódu QR sa vyskytla chyba</string>
     <string name="read_qr_error_phonefactor">Aegis nie je kompatibilný s proprietárnym algoritmom 2FA spoločnosti Microsoft. Pri konfigurácii 2FA v Office 365 nezabudnite vybrať možnosť „Nastaviť aplikáciu bez upozornení“.</string>
+    <string name="missing_qr_code_descriptor">• QR kód %d</string>
+    <string name="import_google_auth_failure">Importovanie exportu služby Google Authenticator zlyhalo</string>
     <string name="unlocking_vault">Odomykanie trezoru</string>
-    <string name="slot_this_device">(toto zariadenie)</string>
+    <string name="rename_group">Premenovať Skupinu</string>
     <string name="remove_group">Odstránenie skupiny</string>
     <string name="remove_group_description">Ste si istí, že chcete odstrániť túto skupinu? Záznamy v tejto skupine budú automaticky prehodené na \'Žiadna skupina\'.</string>
+    <string name="remove_unused_groups">Odstrániť nepoužité skupiny</string>
+    <string name="remove_unused_groups_description">Ste si istí, že chcete odstrániť všetky skupiny, ktoré nie sú priradené k záznamu?</string>
     <string name="remove_icon_pack">Odstrániť balíček ikon</string>
     <string name="remove_icon_pack_description">Ste si istí, že chcete odstrániť tento balíček ikon? Záznamy, ktoré používajú ikony z tohto balíka, nebudú ovplyvnené.</string>
     <string name="details">Podrobnosti</string>
@@ -210,13 +307,16 @@
     <string name="lock">Uzamknúť</string>
     <string name="name">Meno</string>
     <string name="no_group">Žiadna skupina</string>
-    <string name="sort">Zoradiť</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Zoradiť</string>
     <string name="sort_alphabetically">Vydavateľ (od A po Z)</string>
     <string name="sort_alphabetically_reverse">Vydavateľ (od Z po A)</string>
     <string name="sort_alphabetically_name">Účet (od A po Z)</string>
     <string name="sort_alphabetically_name_reverse">Účet (od Z po A)</string>
     <string name="sort_usage_count">Počet použití</string>
+    <string name="sort_last_used">Naposledy použité</string>
     <string name="sort_custom">Vlastné</string>
+    <string name="last_used">Naposledy použité</string>
+    <string name="last_used_never">nikdy</string>
     <string name="new_group">Nová skupina…</string>
     <string name="group">Skupina</string>
     <string name="group_name_hint">Názov skupiny</string>
@@ -225,12 +325,14 @@
     <string name="preference_reset_usage_count">Vynulovať počet použití</string>
     <string name="preference_reset_usage_count_summary">Vynuluje sa počet použití pre každý záznam vo vašom trezore</string>
     <string name="preference_reset_usage_count_dialog">Naozaj chcete nastaviť počet použití každého záznamu vo vašom trezore na 0?</string>
-    <string name="note">Poznámka</string>
+    <string name="note" comment="Users can add a note to an entry">Poznámka</string>
     <string name="clear">Vymazať</string>
     <string name="pref_highlight_entry_title">Zvýrazniť tokeny po klepnutí</string>
     <string name="pref_minimize_on_copy_title">Minimalizovať pri kopírovaní</string>
     <string name="pref_minimize_on_copy_summary">Minimalizujte aplikáciu po skopírovaní tokenu</string>
     <string name="pref_copy_behavior_title">Kopírovať tokeny do schránky</string>
+    <string name="pref_search_behavior_title">Správanie pri vyhľadávaní</string>
+    <string name="pref_pause_entry_title">Zmraziť tokeny po klepnutí</string>
     <string name="pin_keyboard_disabled">Heslo bolo zmenené. Klávesnica pre PIN sa už nebude zobrazovať.</string>
     <string name="selected">Zvolené</string>
     <string name="dark_theme_title">Tmavá téma</string>
@@ -244,6 +346,12 @@
     <string name="tiles_mode_title">Dlaždice</string>
     <string name="unknown_issuer">Neznámy vydavateľ</string>
     <string name="unknown_account_name">Neznámy názov účtu</string>
+    <plurals name="import_error_dialog">
+        <item quantity="one">Aegis nedokázal importovať %d token. Tento token bude preskočený. Pre zobrazenie informácii o chybe kliknite na \'podrobnosti\'.</item>
+        <item quantity="few">Aegis nedokázal importovať %d tokeny. Tieto tokeny budú preskočené. Pre zobrazenie informácii o chybách kliknite na \'podrobnosti\'.</item>
+        <item quantity="many">Aegis nedokázal importovať %d tokenov. Tieto tokeny budú preskočené. Pre zobrazenie informácii o chybách kliknite na \'podrobnosti\'.</item>
+        <item quantity="other">Aegis nedokázal importovať %d tokenov. Tieto tokeny budú preskočené. Pre zobrazenie informácii o chybách kliknite na \'podrobnosti\'.</item>
+    </plurals>
     <string name="unable_to_generate_qrcode">Nie je možné vygenerovať QR kód</string>
     <string name="select_picture">Vybrať obrázok</string>
     <string name="select_icon">Vybrať ikonu</string>
@@ -268,24 +376,34 @@
     <string name="support_rate_description">Podporte nás zanechaním recenzie v obchode Google Play</string>
     <string name="email">E-mail</string>
     <string name="time_sync_warning_title">Automatická synchronizácia času</string>
+    <string name="google_qr_export_unrelated">Nesúvisiaci QR kód bol nájdený. Pokúste sa reštartovať skener.</string>
     <string name="backup_error_bar_message"><b>Zálohovanie trezora nedávno zlyhalo</b></string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Najnovšia záloha je zastaraná (%s)
     </string>
     <string name="backup_reminder_bar_message">        Zmeny nie sú zálohované
     </string>
     <string name="backup_reminder_bar_dialog_title">Zmeny nie sú zálohované</string>
+    <string name="backup_plaintext_export_warning"><b>Trezor bol nedávno exportovaný ako obyčajný text</b></string>
+    <string name="pref_show_plaintext_warning_hint">Toto upozornenie viac nezobrazovať</string>
     <string name="switch_camera">Prepnúť fotoaparát</string>
     <string name="empty_list_title">Neboli nájdené žiadne záznamy</string>
     <string name="empty_group_list_title">Neboli nájdené žiadne skupiny</string>
     <string name="no_icon_packs">Zatiaľ neboli importované žiadne balíčky ikon. Klepnite na znamienko plus aby ste ho importovali. Tip: vyskúšajte <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
     <string name="no_icon_packs_title">Žiadne balíčky ikon</string>
+    <string name="uncategorized">Nezaradené</string>
     <string name="done">Hotovo</string>
+    <plurals name="qr_count">
+        <item quantity="one">%d / %d QR kódu</item>
+        <item quantity="few">%d / %d QR kódov</item>
+        <item quantity="many">%d / %d QR kódov</item>
+        <item quantity="other">%d / %d QR kódov</item>
+    </plurals>
     <string name="next">Ďalšie</string>
     <string name="previous">Predchádzajúce</string>
     <string name="copy_uri">Skopírovať URI</string>
     <string name="uri_copied_to_clipboard">URI bola skopírovaná do schránky</string>
-    <string name="transfer_entry">Prenos záznamu</string>
     <string name="transfer_entry_description">Naskenujte tento QR kód pomocou overovacej aplikácie, do ktorej chcete tento záznam preniesť</string>
+    <string name="google_auth_compatible_transfer_description">Naskenujte tieto QR kódy s aplikáciou Aegis alebo Google Authenticator.\n\nKvôli limitáciám aplikácie Google Authenticator sú zahrnuté iba TOTP &amp; HOTP tokény, ktoré používajú SHA1 a obsahujú 6 číselné kódy</string>
     <string name="password_strength_very_weak">Veľmi slabé</string>
     <string name="password_strength_weak">Slabé</string>
     <string name="password_strength_fair">Dostatočné</string>
@@ -298,10 +416,13 @@
     <string name="title_activity_about">O programe</string>
     <string name="title_activity_edit_entry">Upraviť záznam</string>
     <string name="title_activity_scan_qr">Skenovať QR kód</string>
-    <string name="import_vault">Importovať trezor</string>
+    <string name="title_activity_assign_icons">Priradiť ikonky</string>
+    <string name="import_vault">Importovať Aegis trezor</string>
+    <string name="importer_help_aegis">Poskytnite súbor exportu/zálohy Aegisu.</string>
     <string name="importer_help_bitwarden">Nahrajte súbor s Bitwarden exportom/zálohou. Šifrované súbory nie sú podporované.</string>
     <string name="groups">Skupiny</string>
-    <string name="pref_focus_search">Focusnúť vyhľadávanie pri spustení aplikácie</string>
+    <string name="pref_focus_search">Zamerať vyhľadávanie pri spustení aplikácie</string>
+    <string name="pref_focus_search_summary">Zamerá vyhľadávanie okamžite po otvorení aplikácie.</string>
     <string name="pref_grouping_halves">Na polovicu</string>
     <string name="pref_grouping_none">Nezoskupovať</string>
     <string name="pref_grouping_size_two">Zoskupovať po 2</string>
@@ -310,4 +431,35 @@
     <string name="pref_copy_behavior_never">Nikdy</string>
     <string name="pref_copy_behavior_single_tap">Jedno klepnutie</string>
     <string name="pref_copy_behavior_double_tap">Dvojité poklepanie</string>
+    <string name="pref_account_name_position_hidden">Skryté</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="one">Pred %d sekundou</item>
+        <item quantity="few">Pred %d sekundami</item>
+        <item quantity="many">Pred %d sekundami</item>
+        <item quantity="other">Pred %d sekundami</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">Pred %d minútou</item>
+        <item quantity="few">Pred %d minútami</item>
+        <item quantity="many">Pred %d minútami</item>
+        <item quantity="other">Pred %d minútami</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="one">Pred %d hodinou</item>
+        <item quantity="few">Pred %d hodinami</item>
+        <item quantity="many">Pred %d hodinami</item>
+        <item quantity="other">Pred %d hodinami</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="one">Pred %d dňom</item>
+        <item quantity="few">Pred %d dňami</item>
+        <item quantity="many">Pred %d dňami</item>
+        <item quantity="other">Pred %d dňami</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="one">Pred %d rokom</item>
+        <item quantity="few">Pred %d rokmi</item>
+        <item quantity="many">Pred %d rokmi</item>
+        <item quantity="other">Pred %d rokmi</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-sr-rSP-v29/strings.xml b/app/src/main/res/values-sr-rSP-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-sr-rSP-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
new file mode 100644
index 00000000..405e79e7
--- /dev/null
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="action_settings">Подешавања</string>
+    <string name="action_about">О апликацији</string>
+    <string name="action_delete">Избриши</string>
+    <string name="action_transfer">Пренеси</string>
+    <string name="action_edit_icon">Измени иконицу</string>
+    <string name="action_reset_usage_count">Ресетуј број коришћења</string>
+    <string name="action_reset_usage_count_dialog">Желите ли заиста да поставите број коришћења овог уноса на 0?</string>
+    <string name="action_default_icon">Врати подразумевану иконицу</string>
+    <string name="discard">Одбаци</string>
+    <string name="save">Сачувај</string>
+    <string name="all">Све</string>
+    <string name="issuer">Издавач</string>
+    <string name="yandex_pin">PIN (4–16 цифара)</string>
+    <string name="motp_pin">PIN (4 цифре)</string>
+    <string name="suggested">Предложено</string>
+    <string name="usage_count">Број коришћења</string>
+    <string name="warning">Упозорење</string>
+    <string name="pref_cat_appearance_app">Апликација</string>
+    <string name="pref_cat_appearance_entries">Уноси</string>
+    <string name="pref_cat_backups_android">Android</string>
+    <string name="pref_cat_backups_auto">Аутоматске резервне копије</string>
+    <string name="pref_section_behavior_title">Понашање</string>
+    <string name="pref_section_behavior_summary">Прилагодите понашање када управљате листом уноса.</string>
+    <string name="pref_section_appearance_title">Изглед</string>
+    <string name="pref_section_appearance_summary">Прилагодите тему, језик и друга подешавања која утичу на изглед апликације.</string>
+    <string name="pref_section_security_title">Безбедност</string>
+    <string name="pref_section_security_summary">Конфигуришите шифровање, биометријско откључавање и друга безбедносна подешавања.</string>
+    <string name="pref_section_import_export_title">Увоз и извоз</string>
+    <string name="pref_section_import_export_summary">Увезите резервне копије за Aegis или друге апликације за аутентификацију. Ручно извезите ваш Aegis трезор.</string>
+    <string name="pref_section_audit_log_title">Евиденција ревизије</string>
+    <string name="pref_section_audit_log_summary">Пронађите листу свих пријављених важних догађаја који су се десили у апликацији.</string>
+    <string name="pref_section_backups_title">Резервне копије</string>
+    <string name="pref_section_backups_summary">Подесите аутоматске резервне копије на локацију по вашем избору или омогућите учешће у Android систему резервних копија у облаку.</string>
+    <string name="pref_section_icon_packs">Пакети иконица</string>
+    <string name="pref_section_icon_packs_summary">Управљајте и увезите пакете иконица</string>
+    <string name="pref_select_theme_title">Изглед</string>
+    <string name="pref_dynamic_colors_title">Динамичке боје</string>
+    <string name="pref_dynamic_colors_summary">Примените изглед заснован на бојама теме вашег Android уређаја</string>
+    <string name="pref_view_mode_title">Режим приказа</string>
+    <string name="pref_lang_title">Језик</string>
+    <string name="pref_show_icons_title">Прикажи иконице</string>
+    <string name="pref_show_icons_summary">Прикажите иконице поред сваког уноса</string>
+    <string name="pref_code_group_size_title">Груписање цифара кода</string>
+    <string name="pref_code_group_size_summary">Изаберите број цифара по којима ћете груписати кодове</string>
+    <string name="pref_account_name_position_title">Прикажи име налога</string>
+    <string name="pref_show_next_code_title">Прикажи следећи кôд</string>
+    <string name="pref_show_next_code_summary">Генеришите и прикажите следећи кôд унапред</string>
+    <string name="pref_expiration_state_title">Назначи када су кодови близу истека</string>
+    <string name="pref_expiration_state_summary">Промените боју кодова и нека трепћу када су близу истека</string>
+    <string name="pref_expiration_state_fallback">Промените боју кодова када су близу истека</string>
+    <string name="pref_shared_issuer_account_name_title">Приказуј само назив налога када је неопходно</string>
+    <string name="pref_shared_issuer_account_name_summary">Приказујте називе налога само када деле истог издаваоца. Остали називи налога ће бити сакривени.</string>
+    <string name="pref_account_name_position_summary_override">Ово подешавање је замењено режимом приказа плочица. Назив налога ће бити приказан испод издаваоца.</string>
+    <string name="pref_import_file_title">Увоз из фајла</string>
+    <string name="pref_import_file_summary">Увоз токена из фајла</string>
+    <string name="pref_android_backups_title">Android резервне копије у облаку</string>
+    <string name="pref_android_backups_summary">Дозволите Android-овом систему резервних копија у облаку да укључи Aegis-ов трезор у своје резервне копије. Ово је подржано само за шифроване трезоре.</string>
+    <string name="pref_android_backups_hint"><i>Резервне копије са уређаја на уређај (D2D) су увек дозвољене, без обзира на подешавања изнад</i></string>
+    <string name="pref_backups_title">Аутоматски прави резервну копију трезора</string>
+    <string name="pref_backups_summary">Аутоматско прављење резервних копија трезора на спољној меморији када се изврше промене. Ово је подржано само за шифроване трезоре.</string>
+    <string name="pref_backups_reminder_title">Подсетник о резервним копијама</string>
+    <string name="pref_backups_reminder_summary">Приказивање подсетника за прављење резервне копије вашег трезора у случају да нисте направили резервну копију најновијих промена.</string>
+    <string name="pref_backups_reminder_dialog_title">Онемогућите подсетник о резервним копијама</string>
+    <string name="pref_backups_reminder_dialog_summary">Онемогућавање овог подсетника значи да вам Aegis неће рећи да ли имате промене за које још увек није направљена резервна копија. Ово вас доводи у опасност да изгубите приступ својим токенима. Желите ли заиста да онемогућите подсетник?</string>
+    <string name="pref_backups_versioning_strategy_title">Стратегија прављења резервних копија</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Чувај неколико верзија</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Једна резервна копија</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Изабрана стратегија резервних копија није поуздана и не препоручује се. Једно неуспешно прављење резервне копије може довести до губитка ваше једине резервне копије.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Изаберите стратегију прављења резервних копија</string>
+    <string name="pref_backups_location_title">Локација резервних копија</string>
+    <string name="pref_backups_location_summary">Резервне копије ће бити сачуване у</string>
+    <string name="pref_backup_location_summary">Резервна копија ће бити сачувана у</string>
+    <string name="pref_backups_trigger_title">Направи резервну копију</string>
+    <string name="pref_backups_trigger_summary">Ручно направи резервну копију</string>
+    <string name="pref_backups_versions_title">Број верзија за чување</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
+    <plurals name="pref_backups_versions_summary">
+        <item quantity="one">Чувај %1$d верзију резервне копије</item>
+        <item quantity="few">Чувај %1$d верзија резервне копије</item>
+        <item quantity="other">Чувај %1$d верзија резервне копије</item>
+    </plurals>
+    <string name="pref_backups_versions_infinite_summary">Чувај бесконачан број верзија резервних копија</string>
+    <string name="pref_import_app_title">Увоз из апликације</string>
+    <string name="pref_import_app_summary">Увоз токена из апликације (захтева root приступ)</string>
+    <string name="pref_export_title">Извоз</string>
+    <string name="pref_export_summary">Извоз трезора</string>
+    <string name="pref_password_reminder_title">Подсетник о лозинци</string>
+    <string name="pref_google_auth_export_title">Извоз у Google Authenticator</string>
+    <string name="pref_google_auth_export_descriptor">Генерисање QR кодова за извоз, компатибилних са Google Authenticator-ом</string>
+    <string name="pref_google_auth_export_no_data">Нема података за извоз</string>
+    <plurals name="pref_google_auth_export_incompatible_entries">
+        <item quantity="one">Прескочен %d некомпатибилни унос</item>
+        <item quantity="few">Прескочено %d некомпатибилних уноса</item>
+        <item quantity="other">Прескочено %d некомпатибилних уноса</item>
+    </plurals>
+    <string name="pref_password_reminder_summary_disabled">Онемогућено</string>
+    <string name="pref_secure_screen_title">Безбедност екрана</string>
+    <string name="pref_secure_screen_summary">Блокирај снимке екрана и остале покушаје снимања екрана у апликацији</string>
+    <string name="pref_tap_to_reveal_title">Додирни за откривање</string>
+    <string name="pref_tap_to_reveal_summary">Токени ће подразумевано бити скривени. Додирните токен за откривање кода.</string>
+    <string name="pref_tap_to_reveal_time_title">Време пре истека додира за откривање</string>
+    <string name="pref_auto_lock_title">Аутоматско закључавање</string>
+    <string name="pref_auto_lock_summary">Када %s</string>
+    <string name="pref_auto_lock_summary_disabled">Онемогућено</string>
+    <string name="pref_auto_lock_prompt">Аутоматски закључати Aegis када је</string>
+    <string name="pref_auto_lock_type_back_button">Притиснуто дугме „Назад”</string>
+    <string name="pref_auto_lock_type_minimize">Апликација минимизирана</string>
+    <string name="pref_auto_lock_type_device_lock">Уређај закључан</string>
+    <string name="pref_backup_password_category">Резервна копија и извоз</string>
+    <string name="pref_backup_password_title">Посебна лознка за резервну копију и извоз</string>
+    <string name="pref_backup_password_summary">Ако је омогућено, лозинка која се користи за откључавање апликације више не може да се користи за дешифровање резервних копија и извоза.</string>
+    <string name="pref_backup_password_change_title">Промена лозинке за резервну копију и извоз</string>
+    <string name="pref_backup_password_change_summary">Поставите нову лозинку која ће се користити за шифровање трезора током прављења резервних копија и извоза.</string>
+    <string name="pref_encryption_title">Шифровање</string>
+    <string name="pref_encryption_summary">Шифровање трезора и откључавање лозинком или биометријом</string>
+    <string name="pref_biometrics_title">Биометријско откључавање</string>
+    <string name="pref_biometrics_summary">Дозволите биометријску аутентификацију за откључавање трезора</string>
+    <string name="pref_search_behavior_summary">Претрага кроз: %s</string>
+    <string name="pref_search_behavior_prompt">Претрага у било ком од следећих поља</string>
+    <string name="pref_search_behavior_type_name">Назив</string>
+    <string name="pref_search_behavior_type_issuer">Издавач</string>
+    <string name="pref_search_behavior_type_note">Напомена</string>
+    <string name="pref_search_behavior_type_groups">Групе</string>
+    <string name="pref_set_password_title">Промена лозинке</string>
+    <string name="pref_set_password_summary">Поставите нову лозинку која ће вам требати да откључате свој трезор</string>
+    <string name="no_events_title">Нема пријављених догађаја</string>
+    <string name="no_events_description">Ниједан важан догађај није пријављен у апликацији</string>
+    <string name="event_title_vault_unlocked">Трезор откључан</string>
+    <string name="event_description_vault_unlocked">Трезор је успешно откључан</string>
+    <string name="event_title_backup_created">Резервна копија је направљена</string>
+    <string name="event_description_backup_created">Резервна копија трезора је успешно направљена</string>
+    <string name="event_title_android_backup_created">Резервну копију је направио Android</string>
+    <string name="event_description_android_backup_created">Резервну копију је успешно направио Android</string>
+    <string name="event_title_vault_exported">Трезор извезен</string>
+    <string name="event_description_vault_exported">Копија трезора је извезена</string>
+    <string name="event_title_entry_shared">Унос подељен</string>
+    <string name="event_description_entry_shared">Унос је подељен</string>
+    <string name="event_title_vault_unlock_failed_password">Откључавање трезора неуспешно (лозинка)</string>
+    <string name="event_description_vault_unlock_failed_password">Покушај откључавања трезора помоћу лозинке није успео</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Откључавање трезора неуспешно (биометрија)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Покушај откључавања трезора помоћу биометрије није успео</string>
+    <string name="event_unknown">Непознати тип догађаја</string>
+    <string name="audit_log_entry_deleted">(избрисано)</string>
+    <string name="today_at_time">Данас у %1$s</string>
+    <string name="day_of_week_at_time">%1$s у %2$s</string>
+    <string name="export_encrypted">Шифруј трезор</string>
+    <string name="export_help">Ова радња извести трезор из Aegis-ове унутрашње меморије. Изаберите формат у којем желите да извоз буде:</string>
+    <string name="export_warning_unencrypted">Управо ћете извести нешифровану копију вашег Aegis трезора. <b>Ово није препоручено</b>.</string>
+    <string name="export_warning_password">Извози су шифровани коришћењем посебне лозинке конфигурисане у подешавањима „Безбедност”.</string>
+    <string name="understand_risk_accept">Разумем ризик</string>
+    <string name="export_format_aegis">Aegis (.JSON)</string>
+    <string name="export_format_google_auth_uri">Текстуални фајл (.TXT)</string>
+    <string name="export_format_html">Веб-страница (.HTML)</string>
+    <string name="export_format_hint">Формат извоза</string>
+    <string name="export_all_groups">Извоз свих група</string>
+    <string name="export_choose_groups">Изаберите групе за извоз</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="one">%d група изабрана</item>
+        <item quantity="few">%d групе изабрано</item>
+        <item quantity="other">%d група изабрано</item>
+    </plurals>
+    <string name="export_no_groups_selected">Није изабрана ниједна група за извоз</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Извоз Aegis Authenticator-a</string>
+    <string name="choose_authentication_method">Безбедност</string>
+    <string name="authentication_method_explanation">Aegis је апликација двофакторске аутентификације (2FA), фокусирана на безбедност. Токени се чувају у трезору, који се опционално може шифровати лозинком по вашем избору. Ако нападач добије ваш шифрован фајл трезора, неће моћи да приступи садржају без познавања лозинке.\n\nУнапред смо изабрали опцију за коју мислимо да би најбоље одговарала вашем уређају.</string>
+    <string name="authentication_method_none">Ниједно</string>
+    <string name="authentication_method_none_description">За откључавање трезора није потребна лозинка и он неће бити шифрован. <b>Ова опција није препоручена</b>.</string>
+    <string name="authentication_method_password">Лозинка</string>
+    <string name="authentication_method_password_description">Неопходна је лозинка за откључавање трезора.</string>
+    <string name="authentication_method_password_explanation">Упозорење: Ако заборавите лозинку, трајно ћете изгубити приступ својим токенима. Нема начина да их повратите без лозинке.</string>
+    <string name="authentication_method_biometrics">Биометрија</string>
+    <string name="authentication_method_biometrics_description">Поред лозинке, биометрија регистрована на овом уређају, попут отиска прста или вашег лица, може се користити за откључавање трезора.</string>
+    <string name="authentication">Откључајте трезор</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Откључајте\nтрезор</string>
+    <string name="auth_use_biometrics">Или додирните овде да користите <font fgcolor="#FF0D86C1">биометрију</font></string>
+    <string name="set_password">Унесите лозинку</string>
+    <string name="set_group">Унесите назив групе</string>
+    <string name="set_number">Унесите број</string>
+    <string name="set_password_confirm">Потврдите лозинку</string>
+    <string name="invalid_password">Нетачна лозинка</string>
+    <string name="invalidated_biometrics">Откривена је промена у безбедносним подешавањима вашег уређаја. Идите у „Aegis -&gt; Подешавања -&gt; Безбедност -&gt; Биометријско откључавање” да бисте онемогућили и поново омогућили биометријско откључавање.</string>
+    <string name="password_reminder">Унесите лозинку. Повремено вас питамо да то урадите како је не бисте заборавили.</string>
+    <string name="password_reminder_dialog_title">Биометријско откључавање подразумевано</string>
+    <string name="password_reminder_dialog_message">Повремено од вас тражимо да уместо тога унесете лозинку како бисте били сигурни да је нисте заборавили и да нећете изгубити приступ свом трезору. Након што једном унесете лозинку, Aegis ће се подразумевано вратити на биометријско откључавање док не дође време за следећи подсетник за лозинку.</string>
+    <string name="password_reminder_freq_never">Никада</string>
+    <string name="password_reminder_freq_weekly">Недељно</string>
+    <string name="password_reminder_freq_biweekly">Двонедељно</string>
+    <string name="password_reminder_freq_monthly">Месечно</string>
+    <string name="password_reminder_freq_quarterly">Тромесечно</string>
+    <string name="enter_password_2fas_message">Изгледа да је ова 2FAS резервна копија шифрована. Унесите лозинку испод.</string>
+    <string name="enter_password_authy_message">Изгледа да су ваши Authy токени шифровани. Затворите Aegis, отворите Authy и откључајте токене својом лозинком. Уместо тога, Aegis такође може покушати да дешифрује ваше Authy токене за вас, ако унесете своју лозинку испод.</string>
+    <string name="enter_password_aegis_title">Унесите лозинку за увоз</string>
+    <string name="period_hint">Период (секунди)</string>
+    <string name="algorithm_hint">Функција хеша</string>
+    <string name="type">Тип</string>
+    <string name="share">Дели</string>
+    <string name="yes">Да</string>
+    <string name="no">Не</string>
+    <string name="undo">Поништи</string>
+    <string name="unlock">Откључај</string>
+    <string name="advanced">Напредно</string>
+    <string name="counter">Бројач</string>
+    <string name="digits">Цифре</string>
+    <string name="secret">Тајна</string>
+    <string name="scan">Скенирај QR кôд</string>
+    <string name="scan_image">Скенирај слику</string>
+    <string name="enter_manually">Унеси ручно</string>
+    <string name="set_up_biometric">Подесите биометријско откључавање</string>
+    <string name="copy">Копирај</string>
+    <string name="edit">Измени</string>
+    <string name="select_all">Изабери све</string>
+    <string name="assign_icons">Додели иконице</string>
+    <string name="assign_groups">Додели групи</string>
+    <string name="assign_groups_dialog_summary">Изаберите групу којој желите да доделите изабране уносе.</string>
+    <string name="assign_groups_dialog_dropdown">Изаберите групу</string>
+    <string name="favorite" comment="Verb">Додај у омиљено</string>
+    <string name="unfavorite" comment="Verb">Уклони из омиљеног</string>
+    <string name="error_all_caps">ГРЕШКА</string>
+    <string name="password">Лозинка</string>
+    <string name="confirm_password">Потврдите лозинку</string>
+    <string name="show_password">Прикажи лозинку</string>
+    <string name="new_entry">Нови унос</string>
+    <string name="add_new_entry">Додај нови унос</string>
+    <string name="unlock_vault_error">Није могуће откључати трезор</string>
+    <string name="unlock_vault_error_description">Нетачна лозинка. Проверите да нисте погрешили у куцању лозинке.</string>
+    <string name="password_equality_error">Лозинке би требало да буду идентичне и не могу бити празне</string>
+    <string name="snackbar_authentication_method">Изаберите методу за аутентификацију</string>
+    <string name="encrypting_vault">Шифровање трезора</string>
+    <string name="exporting_vault">Извожење трезора</string>
+    <string name="reading_file">Читање фајла</string>
+    <string name="requesting_root_access">Захтевање root приступа</string>
+    <string name="analyzing_qr">Анализирање QR кода</string>
+    <string name="analyzing_qr_multiple">Анализирање QR кода %1$d/%2$d (%3$s)</string>
+    <plurals name="added_new_entries">
+        <item quantity="one">Додат %d нови унос у трезор</item>
+        <item quantity="few">Додата %d нова уноса у трезор</item>
+        <item quantity="other">Додато %d нових уноса у трезор</item>
+    </plurals>
+    <string name="importing_icon_pack">Увожење пакета иконица</string>
+    <string name="delete_entry">Избришите унос</string>
+    <string name="delete_entry_description">Желите ли заиста да избришете овај унос?</string>
+    <string name="delete_entry_explanation">Ова радња не онемогућава 2FA за:\n<b>%s</b>\n\nДа бисте спречили губитак приступа, уверите се да сте онемогућили 2FA или да имате алтернативни начин за генерисање кодова за ову услугу.</string>
+    <string name="delete_entries">Избришите уносе</string>
+    <plurals name="delete_entries_description">
+        <item quantity="one">Желите ли заиста да избришете %d унос?</item>
+        <item quantity="few">Желите ли заиста да избришете %d уноса?</item>
+        <item quantity="other">Желите ли заиста да избришете %d уноса?</item>
+    </plurals>
+    <string name="discard_changes">Одбацити промене?</string>
+    <string name="discard_changes_description">Ваше промене нису сачуване</string>
+    <string name="saving_profile_error">Грешка при чувању профила</string>
+    <string name="saving_assign_icons_error">Грешка при додели иконица</string>
+    <string name="welcome">Добро дошли</string>
+    <string name="app_description">Aegis је бесплатна, безбедна и апликација отвореног кода за двофакторску аутентификацију</string>
+    <string name="setup_completed">Подешавање завршено</string>
+    <string name="setup_completed_description">Aegis је подешен и спреман за рад.</string>
+    <string name="vault_not_found">Трезор није пронађен, покретање подешавања…</string>
+    <string name="copied">Копирано</string>
+    <string name="errors_copied">Грешке су копиране у привремену меморију</string>
+    <string name="version_copied">Верзија је копирана у привремену меморију</string>
+    <string name="error_required_field">Ово поље је неопходно</string>
+    <string name="error_occurred">Дошло је до грешке</string>
+    <string name="decryption_error">Дошло је до грешке приликом покушаја откључавања трезора</string>
+    <string name="decryption_corrupt_error">Дошло је до грешке приликом покушаја откључавања трезора. Ваш трезор је можда оштећен.</string>
+    <string name="saving_error">Дошло је до грешке приликом покушаја чувања трезора</string>
+    <string name="vault_init_error">Дошло је до грешке приликом покушаја састављања трезора</string>
+    <string name="vault_load_error">Дошло је до грешке приликом покушаја учитавања трезора из меморије</string>
+    <string name="biometric_decrypt_error">Дошло је до грешке приликом покушаја дешифровања трезора биометријском аутентификацијом. Ово се обично дешава само ако су безбедносна подешавања вашег уређаја промењена. Откључајте трезор својом лозинком и поново конфигуришите биометријску аутентификацију у подешавањима Aegis-а.</string>
+    <string name="biometric_init_error">Дошло је до грешке приликом покушаја припремања биометријске аутентификације. Ово се обично дешава само ако су безбедносна подешавања вашег уређаја промењена. Откључајте трезор својом лозинком и поново конфигуришите биометријску аутентификацију у подешавањима Aegis-а.</string>
+    <string name="disable_encryption">Онемогући шифровање</string>
+    <string name="disable_encryption_description">Желите ли заиста да онемогућите шифровање? Ово ће довести до тога да трезор буде сачуван као обичан текст. <b>Аутоматско прављење резервних копија ће такође бити онемогућено</b>.</string>
+    <string name="enable_encryption_error">Дошло је до грешке приликом омогућавања шифровања</string>
+    <string name="disable_encryption_error">Дошло је до грешке приликом онемогућавања шифровања</string>
+    <string name="backup_successful">Прављење резервне копије је успешно заказано</string>
+    <string name="backup_error">Дошло је до грешке приликом покушаја прављења резервне копије</string>
+    <string name="backup_status_success">Последње прављење резервне копије успешно: %s</string>
+    <string name="backup_status_failed">Последње прављење резервне копије неуспешно: %s</string>
+    <string name="backup_status_none">Још увек није направљена ниједна резервна копија</string>
+    <string name="backup_warning_password">Резервне копије су шифроване коришћењем посебне лозинке конфигурисане у подешавањима „Безбедност”.</string>
+    <string name="documentsui_error">Изгледа да DocumentsUI недостаје на вашем уређају. Ово је важна компонента система неопходна за избор и прављење докумената. Ако сте користили алатку за чишћење вашег уређаја од „непотребних прединсталираних апликација”, можда сте га случајно избрисали и мораћете да га поново инсталирате.</string>
+    <string name="icon_pack_import_error">Дошло је до грешке приликом покушаја увожења пакета иконица</string>
+    <string name="icon_pack_import_exists_error">Пакет иконица који покушавате да увезете већ постоји. Желите ли да га замените?</string>
+    <string name="icon_pack_delete_error">Дошло је до грешке приликом покушаја брисања пакета иконица</string>
+    <plurals name="icon_pack_info">
+        <item quantity="one">%d иконица</item>
+        <item quantity="few">%d иконице</item>
+        <item quantity="other">%d иконица</item>
+    </plurals>
+    <string name="icon_custom">Прилагођена</string>
+    <string name="permission_denied">Дозвола одбијена</string>
+    <string name="andotp_new_format">Нови формат (v0.6.3 или новије) </string>
+    <string name="andotp_old_format">Стари формат (v0.6.2 или старије) </string>
+    <string name="choose_andotp_importer">Који формат има фајл резервне копије andOTP?</string>
+    <string name="choose_totpauth_importer">Да ли је ова резервна копија TOTP Authenticator шифрована лозинком?</string>
+    <string name="choose_application">Изаберите апликацију из које бисте желели да увезете</string>
+    <string name="choose_theme">Изаберите жељену тему</string>
+    <string name="choose_account_name_position">Изаберите жељени положај назива налога</string>
+    <string name="choose_view_mode">Изаберите жељени режим приказа</string>
+    <string name="choose_copy_behavior">Изаберите жељено понашање копирања</string>
+    <string name="parsing_file_error">Дошло је до грешке приликом покушаја рашчлањивања фајла</string>
+    <string name="file_not_found">Грешка: Фајл није пронађен</string>
+    <string name="reading_file_error">Дошло је до грешке приликом покушаја читања фајла</string>
+    <string name="app_lookup_error">Грешка: Апликација није инсталирана</string>
+    <string name="app_version_error">Верзија %s која је инсталирана није подржана. Недавне верзије су почеле да шифрују неке фајлове у фолдеру интерне меморије, због чега Aegis не може да приступи информацијама које су му потребне за увоз. Покушај увоза ће вероватно довести до грешке. Желите ли да ипак наставите?</string>
+    <string name="root_error">Грешка: Није могуће добити root приступ</string>
+    <plurals name="imported_entries_count">
+        <item quantity="one">Увезен %d унос</item>
+        <item quantity="few">Увезено %d уноса</item>
+        <item quantity="other">Увезено %d уноса</item>
+    </plurals>
+    <plurals name="entries_shown">
+        <item quantity="one">Приказ %d уноса</item>
+        <item quantity="few">Приказ %d уноса</item>
+        <item quantity="other">Приказ %d уноса</item>
+    </plurals>
+    <string name="intro_import_error_title">Дошло је до грешке приликом увоза трезора</string>
+    <string name="import_error_title">Дошло је до једне или више грешака приликом увоза</string>
+    <string name="exporting_vault_error">Дошло је до грешке приликом покушаја увожења трезора</string>
+    <string name="exported_vault">Трезор је извезен</string>
+    <string name="encryption_set_password_error">Дошло је до грешке приликом покушаја постављања лозинке.</string>
+    <string name="encryption_enable_biometrics_error">Дошло је до грешке приликом покушаја омогућавања биометријског откључавања. Неки уређаји имају лоше имплементације биометријске аутентификације и вероватно је да је ваш један од њих. Уместо овога, размислите о преласку на конфигурацију само са лозинком.</string>
+    <string name="no_cameras_available">Нема доступних камера</string>
+    <string name="read_qr_error">Дошло је до грешке приликом покушаја читања QR кода</string>
+    <string name="read_qr_error_phonefactor">Aegis није компатибилан са Microsoft-овим власничким 2FA алгоритмом. Обавезно изаберите „Подешавање апликације без обавештења” када конфигуришете 2FA у Office 365.</string>
+    <string name="partial_google_auth_import">Откривен је непотпун извоз Google Authenticator-а</string>
+    <string name="partial_google_auth_import_warning">Неки QR кодови недостају у вашем увозу. Следећи кодови нису пронађени:\n\n<b>%s</b>\n\nМожете да наставите са увозом овог делимичног извоза, али препоручујемо да покушате поново са свим QR кодовима како не бисте ризиковали да изгубите приступ токенима.</string>
+    <string name="missing_qr_code_descriptor">• QR кôд %d</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Ипак увести %d токен</item>
+        <item quantity="few">Ипак увести %d токена</item>
+        <item quantity="other">Ипак увести %d токена</item>
+    </plurals>
+    <string name="import_google_auth_failure">Неуспешан увоз извоза Google Authenticator-а</string>
+    <string name="unrelated_google_auth_batches_error">Извоз садржи информације за неповезану серију. Покушајте да увезете 1 по једну серију.</string>
+    <string name="no_tokens_can_be_imported">Као резултат тога, не могу се увести токени</string>
+    <string name="unlocking_vault">Откључавање трезора</string>
+    <string name="rename_group">Преименовање групе</string>
+    <string name="no_group_selection">Ако унос није део ниједне групе, може се наћи под „Нема групе”.</string>
+    <string name="remove_group">Уклоните групу</string>
+    <string name="remove_group_description">Сигурно желите да уклоните ову групу? Уноси у овој групи ће аутоматски бити пребачени у ”Без групе”.</string>
+    <string name="remove_unused_groups">Избришите некоришћене групе</string>
+    <string name="remove_unused_groups_description">Желите ли заиста да избришете све групе које нису додељене уносу?</string>
+    <string name="remove_icon_pack">Уклоните пакет иконица</string>
+    <string name="remove_icon_pack_description">Сигурно желите да уклоните овај пакет иконица? Уноси који користе овај пакет иконица неће бити промењени.</string>
+    <string name="details">Детаљи</string>
+    <string name="show_error_details">Прикажи детаље грешке</string>
+    <string name="lock">Закључавање</string>
+    <string name="name">Назив</string>
+    <string name="no_group">Без групе</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Сортирај</string>
+    <string name="sort_alphabetically">Издавач (А до Ш)</string>
+    <string name="sort_alphabetically_reverse">Издавач (Ш до А)</string>
+    <string name="sort_alphabetically_name">Налог (А до Ш)</string>
+    <string name="sort_alphabetically_name_reverse">Налог (Ш до А)</string>
+    <string name="sort_usage_count">Бројач коришћења</string>
+    <string name="sort_last_used">Последње коришћење</string>
+    <string name="sort_custom">Прилагођено</string>
+    <string name="last_used">Последње коришћење</string>
+    <string name="last_used_never">никада</string>
+    <string name="new_group">Нова група…</string>
+    <string name="group">Група</string>
+    <string name="group_name_hint">Назив групе</string>
+    <string name="preference_manage_groups">Измените групе</string>
+    <string name="preference_manage_groups_summary">Управљајте групама и бришите их овде</string>
+    <string name="preference_reset_usage_count">Поништи бројач коришћења</string>
+    <string name="preference_reset_usage_count_summary">Поништи бројач коришћења за све уносе у трезору</string>
+    <string name="preference_reset_usage_count_dialog">Сигурно подесити бројач коришћења на 0 за све уносе у трезору?</string>
+    <string name="note" comment="Users can add a note to an entry">Напомена</string>
+    <string name="clear">Обриши</string>
+    <string name="pref_highlight_entry_title">Нагласи токене на додир</string>
+    <string name="pref_highlight_entry_summary">Привремено нагласи токене на додир како би били видљивији</string>
+    <string name="pref_minimize_on_copy_title">Минимизирај приликом копирања</string>
+    <string name="pref_minimize_on_copy_summary">Минимизирајте апликацију након копирања токена</string>
+    <string name="pref_copy_behavior_title">Копирај токене у привремену меморију</string>
+    <string name="pref_search_behavior_title">Понашање претраге</string>
+    <string name="pref_pause_entry_title">Замрзните токене на додир</string>
+    <string name="pref_pause_entry_summary">Паузирајте аутоматско освежавање токена тако што ћете их додирнути. Токени се неће ажурирати све док су фокусирани. Ово захтева опције „Истакни токене приликом додира” или „Додирни за откривање”.</string>
+    <string name="pin_keyboard_description">Унесите своју лозинку да бисте омогућили PIN тастатуру. Имајте на уму да ово функционише само ако се ваша лозинка састоји само од бројева</string>
+    <string name="pin_keyboard_error">Грешка приликом омогућавања PIN тастатуре</string>
+    <string name="pin_keyboard_error_description">Није могуће подесити PIN тастатуру. Ваша лозинка мора да се састоји само од бројева.</string>
+    <string name="pin_keyboard_disabled">Лозинка је промењена. PIN тастатура више неће бити приказана.</string>
+    <string name="selected">Изабрано</string>
+    <string name="dark_theme_title">Тамна тема</string>
+    <string name="light_theme_title">Светла тема</string>
+    <string name="amoled_theme_title">AMOLED тема</string>
+    <string name="system_theme_title">Прати режим уштеде батерије</string>
+    <string name="system_amoled_theme_title">Прати режим уштеде батерије (AMOLED)</string>
+    <string name="normal_viewmode_title">Нормалан</string>
+    <string name="compact_mode_title">Компактно</string>
+    <string name="small_mode_title">Мало</string>
+    <string name="tiles_mode_title">Плочице</string>
+    <string name="unknown_issuer">Непознати издавач</string>
+    <string name="unknown_account_name">Непознати назив налога</string>
+    <plurals name="import_error_dialog">
+        <item quantity="one">Aegis није могао да увезе %d токен. Овај токен ће бити прескочен. Притисните „детаљи” да бисте видели више информација о грешци.</item>
+        <item quantity="few">Aegis није могао да увезе %d токена. Ови токени ће бити прескочени. Притисните „детаљи” да бисте видели више информација о грешкама.</item>
+        <item quantity="other">Aegis није могао да увезе %d токена. Ови токени ће бити прескочени. Притисните „детаљи” да бисте видели више информација о грешкама.</item>
+    </plurals>
+    <string name="unable_to_process_deeplink">Није могуће обрадити дубоки линк</string>
+    <string name="unable_to_read_qrcode_file">Није могуће прочитати и обрадити QR кôд из фајла: %s.</string>
+    <string name="unable_to_process_shared_text">Није могуће обрадити дељени текст као OTP</string>
+    <string name="unable_to_read_qrcode_files">Није могуће прочитати и обрадити неке QR кодове. Биће увезено само %1$d/%2$d уноса.</string>
+    <string name="unable_to_generate_qrcode">Није могуће генерисати QR кôд</string>
+    <string name="select_picture">Изаберите слику</string>
+    <string name="select_icon">Изаберите иконицу</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Отвори трезор</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Отвори скенер</string>
+    <string name="toggle_checkboxes">Укључи поља за потврду</string>
+    <string name="search">Претрага</string>
+    <string name="channel_name_lock_status">Статус закључавања</string>
+    <string name="channel_description_lock_status">Aegis може да направи трајно обавештење да вас обавести када је трезор закључан</string>
+    <string name="vault_unlocked_state">Трезор је откључан. Додирните овде да га закључате.</string>
+    <string name="version">Верзија</string>
+    <string name="changelog">Евиденција промена</string>
+    <string name="whats_new">Шта је ново</string>
+    <string name="github_description">Изворни кôд, проблеми и информације</string>
+    <string name="license">Лиценца</string>
+    <string name="license_description">Aegis Authenticator је лиценциран под GPLv3</string>
+    <string name="third_party_licenses">Лиценце треће стране</string>
+    <string name="third_party_licenses_description">Лиценце библиотека трећих страна које користи Aegis</string>
+    <string name="country_netherlands">Холандија</string>
+    <string name="email_us">Напишите имејл</string>
+    <string name="visit_website">Посетите наш веб-сајт</string>
+    <string name="about_support">Подршка</string>
+    <string name="support_rate">Оцени</string>
+    <string name="support_rate_description">Подржите нас тако што ћете оставити рецензију у Google Play продавници</string>
+    <string name="webview_error">Овај уређај не подржава веб-приказ, који је неопходан за преглед евиденције промена и лиценце. Недостаје системска компонента.</string>
+    <string name="email">Имејл</string>
+    <string name="time_sync_warning_title">Аутоматска синхронизација времена</string>
+    <string name="time_sync_warning_message">Aegis се ослања на системско време да буде синхронизовано да генерише исправне кодове. Одступање од само неколико секунди може довести до нетачних кодова. Изгледа да ваш уређај није конфигурисан да аутоматски синхронизује време. Желите ли да то урадите сада?</string>
+    <string name="time_sync_warning_disable">Престаните да ме упозоравате. Знам шта радим.</string>
+    <string name="google_qr_export_unrelated">Пронађен је неповезан QR кôд. Покушајте да рестартујете скенер.</string>
+    <plurals name="google_qr_export_scanned">
+        <item quantity="one">Скениран %1$d/%2$d QR кодова</item>
+        <item quantity="few">Скенирана %1$d/%2$d QR кодова</item>
+        <item quantity="other">Скенирано %1$d/%2$d QR кодова</item>
+    </plurals>
+    <string name="google_qr_export_unexpected">Очекиван је QR кôд #%1$d, али је уместо тога скениран #%2$d</string>
+    <string name="backup_error_bar_message"><b>Недавно није успело прављење резервне копије трезора</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Недавни покушај прављења резервне копије трезора помоћу %1$s није успео, јер је дошло до грешке. Прављење резервне копије је покушано %2$s. Проверите подешавања резервних копија да бисте били сигурни да се прављење резервних копија може успешно завршити.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">Недавни покушај прављења резервне копије трезора помоћу %1$s није успео, јер Aegis није имао дозволу да пише на одредиште резервне копије. Прављење резервне копије је покушано %2$s. До ове грешке може доћи ако сте преместили/преименовали одредиште резервне копије или ако сте недавно вратили Aegis из резервне копије. Поново конфигуришите одредиште резервне копије.    </string>
+    <string name="backup_system_builtin">уграђене аутоматске резервне копије у Aegis</string>
+    <string name="backup_system_android">система резервних копија у облаку у Android-у</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Последња резервна копија је застарела (%s)
+    </string>
+    <string name="backup_reminder_bar_message">        Нема резервне копије промена
+    </string>
+    <string name="backup_reminder_bar_dialog_title">Нема резервне копије промена</string>
+    <string name="backup_reminder_bar_dialog_summary">Недавне промене у трезору још увек немају направљену резервну копију. Важно је да редовно правите резервне копије како бисте спречили губитак приступа вашим налозима. Размислите о подешавању аутоматског прављења резервних копија у менију подешавања.
+    </string>
+    <string name="backup_reminder_bar_dialog_accept">Подесите резервне копије</string>
+    <string name="backup_plaintext_export_warning"><b>Трезор је недавно извезен као обичан текст</b></string>
+    <string name="pref_show_plaintext_warning_hint">Не приказуј поново ово упозорење</string>
+    <string name="backup_plaintext_warning_explanation">Ово упозорење се приказује зато што сте недавно извезли нешифровану копију трезора. Да бисте одржали безбедност ваших токена, препоручујемо да избришете овај фајл када више не буде потребан.</string>
+    <string name="switch_camera">Промени камеру</string>
+    <string name="empty_list">Нема кодова за приказ. Почните да додајете уносе додиром на знак плус у доњем десном углу</string>
+    <string name="empty_list_title">Нема пронађених уноса</string>
+    <string name="empty_group_list">Нема група за приказ. Додајте групе на екран за уређивање уноса</string>
+    <string name="empty_group_list_title">Нема пронађених група</string>
+    <string name="no_icon_packs">Још увек није увезен ниједан пакет иконица. Додирните знак плус да бисте га увезли. Савет: испробајте <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
+    <string name="no_icon_packs_title">Нема пакета иконица</string>
+    <string name="pick_icon">Изаберите иконицу</string>
+    <string name="uncategorized">Некатегоризовано</string>
+    <string name="done">Готово</string>
+    <plurals name="qr_count">
+        <item quantity="one">%d / %d QR кôд</item>
+        <item quantity="few">%d / %d QR кода</item>
+        <item quantity="other">%d / %d QR кодова</item>
+    </plurals>
+    <string name="next">Следеће</string>
+    <string name="previous">Претходно</string>
+    <string name="copy_uri">Копирај URI</string>
+    <string name="unable_to_copy_uri_to_clipboard">Није могуће копирати URI у привремену меморију</string>
+    <string name="uri_copied_to_clipboard">URI је копиран у привремену меморију</string>
+    <string name="transfer_entry_description">Скенирајте овај QR кôд помоћу апликације за аутентификацију у коју желите да пренесете овај унос</string>
+    <string name="google_auth_compatible_transfer_description">Скенирајте ове QR кодове користећи Aegis или Google Authenticator.\n\nЗбог ограничења апликације Google Authenticator, обухваћени су само TOTP и HOTP токени који користе SHA1 и производе 6-цифрене кодове</string>
+    <string name="password_strength_very_weak">Веома слаба</string>
+    <string name="password_strength_weak">Слаба</string>
+    <string name="password_strength_fair">Задовољавајућа</string>
+    <string name="password_strength_good">Добра</string>
+    <string name="password_strength_strong">Јака</string>
+    <string name="password_strength_unknown">Лозинка је предуга за анализу снаге</string>
+    <string name="pref_pin_keyboard_title">Користи PIN тастатуру на закључаном екрану</string>
+    <string name="pref_pin_keyboard_summary">Омогућите ово ако желите да омогућите PIN тастатуру на закључаном екрану. Ово функционише само за нумеричке лозинке</string>
+    <string name="title_activity_preferences">Подешавања</string>
+    <string name="title_activity_manage_groups">Управљање групама</string>
+    <string name="title_activity_transfer">Пренос уноса</string>
+    <string name="title_activity_about">О програму</string>
+    <string name="title_activity_edit_entry">Измена уноса</string>
+    <string name="title_activity_scan_qr">Скенирајте QR кôд</string>
+    <string name="title_activity_import_entries">Увоз уноса</string>
+    <string name="title_activity_assign_icons">Додела иконица</string>
+    <string name="title_activity_licenses">Лиценце треће стране</string>
+    <string name="dialog_wipe_entries_title">Чишћење уноса</string>
+    <string name="dialog_wipe_entries_message">Ваш трезор већ садржи уносе. Желите ли да уклоните ове уносе пре увоза овог фајла?\n\n<b>На тај начин ћете трајно изгубити приступ постојећим уносима у трезору.</b></string>
+    <string name="dialog_wipe_entries_checkbox">Очисти садржаје трезора</string>
+    <string name="panic_trigger_ignore_toast">Aegis је примио сигнал панике, али је подешавање онемогућено, сигнал панике се занемарује</string>
+    <string name="pref_panic_trigger_title">Избриши трезор при сигналу панике</string>
+    <string name="pref_panic_trigger_summary">Избришите трезор када се од Ripple прими сигнал панике</string>
+    <string name="import_vault">Увоз Aegis трезора</string>
+    <string name="import_vault_hint">Желите да увезете из друге 2FA апликације? Прво довршите подешавање, а затим пређите на мени подешавања.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Опозван је %d потенцијални дупликат. Прегледајте листу уноса.</item>
+        <item quantity="few">Опозвана су %d потенцијална дупликата. Прегледајте листу уноса.</item>
+        <item quantity="other">Опозвано је %d потенцијалних дупликата. Прегледајте листу уноса.</item>
+    </plurals>
+    <string name="importer_help_2fas">Доставите фајл резервне копије 2FAS Authenticator-а.</string>
+    <string name="importer_help_aegis">Доставите фајл извоза/резервне копије Aegis-а.</string>
+    <string name="importer_help_authenticator_plus">Доставите фајл извоза Authenticator Plus добијен преко <b>Подешавања -&gt; Резервна копија и враћање -&gt; Извоз као текст и HTML</b>.</string>
+    <string name="importer_help_authy">Доставите копију <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, која се налази у фолдеру интерне меморије Authy-а.</string>
+    <string name="importer_help_andotp">Доставите фајл извоза/резервне копије andOTP-а.</string>
+    <string name="importer_help_bitwarden">Доставите фајл извоза/резервне копије Bitwarden-а. Шифровани фајлови нису подржани.</string>
+    <string name="importer_help_battle_net_authenticator">Доставите копију <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, која се налази у фолдеру интерне меморије Battle.net Authenticator-а.</string>
+    <string name="importer_help_duo">Доставите копију <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, која се налази у фолдеру интерне меморије DUO-а.</string>
+    <string name="importer_help_ente_auth">Доставите фајл извоза Ente Auth-а. Тренутно су подржани само нешифровани фајлови.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Доставите фајл резервне копије.\nFreeOtp 1.x: Доставите копију <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, која се налази у фолдеру интерне меморије FreeOTP-а.</string>
+    <string name="importer_help_freeotp_plus">Доставите фајл извоза FreeOTP+-а.</string>
+    <string name="importer_warning_title_freeotp2">Компатибилност FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Постоји низ проблема у FreeOTP 2 који могу довести до оштећених резервних копија. Aegis ће покушати да спаси што је могуће више уноса, али је могуће да неки или чак сви не успеју да увезу.</string>
+    <string name="importer_help_google_authenticator"><b>Подржани су само фајлови базе података из Google Authenticator v5.10 и старијих</b>.\n\nДоставите копију <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, која се налази у фолдеру интерне меморије Google Authenticator-а.</string>
+    <string name="importer_help_microsoft_authenticator">Доставите копију <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, која се налази у фолдеру интерне меморије Microsoft Authenticator-а.</string>
+    <string name="importer_help_plain_text">Доставите обичан текстуални фајл са URI-јем Google Authenticator-а у сваком реду.</string>
+    <string name="importer_help_steam"><b>Steam v3.0 и новији нису подржани</b>. Доставите копију <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, која се налази у фолдеру интерне меморије Steam-а.</string>
+    <string name="importer_help_totp_authenticator">Доставите фајл извоза TOTP Authenticator-а.</string>
+    <string name="importer_help_winauth">Доставите фајл извоза WinAuth-а.</string>
+    <string name="import_assign_icons_dialog_title">Доделите иконице</string>
+    <string name="import_assign_icons_dialog_text">Желите ли да доделите иконице увезеним уносима?</string>
+    <string name="importer_encrypted_exception_google_authenticator">Шифрован унос је прескочен: %s</string>
+    <string name="importer_help_direct">Увезите уносе директно из %s. Ово захтева да апликација буде инсталирана на овом уређају и да се одобри роот приступ за Aegis.</string>
+    <string name="groups">Групе</string>
+    <string name="pref_focus_search">Фокус на претрагу приликом покретања апликације</string>
+    <string name="pref_focus_search_summary">Фокусирање на претрагу одмах након отварања апликације.</string>
+    <string name="pref_grouping_halves">Половине</string>
+    <string name="pref_grouping_none">Нема груписања</string>
+    <string name="pref_grouping_size_two">Груписање по 2</string>
+    <string name="pref_grouping_size_three">Груписање по 3</string>
+    <string name="pref_grouping_size_four">Груписање по 4</string>
+    <string name="pref_copy_behavior_never">Никада</string>
+    <string name="pref_copy_behavior_single_tap">Један додир</string>
+    <string name="pref_copy_behavior_double_tap">Дупли додир</string>
+    <string name="pref_account_name_position_hidden">Скривено</string>
+    <string name="pref_account_name_position_end">Поред издавача</string>
+    <string name="pref_account_name_position_below">Испод издавача</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="one">пре %d секунду</item>
+        <item quantity="few">пре %d секунде</item>
+        <item quantity="other">пре %d секунди</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="one">пре %d минут</item>
+        <item quantity="few">пре %d минута</item>
+        <item quantity="other">пре %d минута</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="one">пре %d сат</item>
+        <item quantity="few">пре %d сата</item>
+        <item quantity="other">пре %d сати</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="one">пре %d дан</item>
+        <item quantity="few">пре %d дана</item>
+        <item quantity="other">пре %d дана</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="one">пре %d годину</item>
+        <item quantity="few">пре %d године</item>
+        <item quantity="other">пре %d година</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="one">%d предмет изабран</item>
+        <item quantity="few">%d предмета изабрано</item>
+        <item quantity="other">%d предмета изабрано</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-sv-rSE-v29/strings.xml b/app/src/main/res/values-sv-rSE-v29/strings.xml
new file mode 100644
index 00000000..06865245
--- /dev/null
+++ b/app/src/main/res/values-sv-rSE-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Systemstandard</string>
+    <string name="system_amoled_theme_title">Systemstandard (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index bdfdb166..eb6af700 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Inställningar</string>
     <string name="action_about">Om</string>
     <string name="action_delete">Radera</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">Återställ standardikon</string>
     <string name="discard">Ignorera</string>
     <string name="save">Spara</string>
+    <string name="all">Alla</string>
     <string name="issuer">Utfärdare</string>
     <string name="yandex_pin">Pinkod (4–16 siffror)</string>
     <string name="motp_pin">Pinkod (4 siffror)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">Konfigurera kryptering, biometrisk upplåsning, automatisk låsning och andra säkerhetsinställningar.</string>
     <string name="pref_section_import_export_title">Import &amp; export</string>
     <string name="pref_section_import_export_summary">Importera säkerhetskopior från Aegis eller andra autentiseringsappar. Skapa manuella exporter av ditt Aegis-valv.</string>
+    <string name="pref_section_audit_log_title">Granskningslogg</string>
+    <string name="pref_section_audit_log_summary">Hitta en lista över alla rapporterade viktiga händelser som har inträffat i appen.</string>
     <string name="pref_section_backups_title">Säkerhetskopior</string>
     <string name="pref_section_backups_summary">Ställ in automatiska säkerhetskopior till en plats som du väljer eller aktivera deltagande i Androids molnsäkerhetskopieringssystem.</string>
     <string name="pref_section_icon_packs">Ikonpaket</string>
     <string name="pref_section_icon_packs_summary">Hantera och importera ikonpaket</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Dynamiska färger</string>
+    <string name="pref_dynamic_colors_summary">Tillämpa ett överlägg baserat på färgerna i ditt Android-tema</string>
     <string name="pref_view_mode_title">Visningsläge</string>
     <string name="pref_lang_title">Språk</string>
     <string name="pref_show_icons_title">Visa ikoner</string>
@@ -40,9 +45,14 @@
     <string name="pref_code_group_size_title">Gruppering av kodsiffror</string>
     <string name="pref_code_group_size_summary">Välj antal siffror att gruppera koder efter</string>
     <string name="pref_account_name_position_title">Visa kontonamn</string>
+    <string name="pref_show_next_code_title">Visa nästa kod</string>
+    <string name="pref_show_next_code_summary">Generera och visa nästa kod i förtid</string>
+    <string name="pref_expiration_state_title">Indikera när koder är på väg att utlöpa</string>
+    <string name="pref_expiration_state_summary">Ändra färgen på koderna och få dem att blinka när de är på väg att utlöpa</string>
+    <string name="pref_expiration_state_fallback">Ändra färgen på koderna när de är på väg att utlöpa</string>
     <string name="pref_shared_issuer_account_name_title">Visa kontonamn endast vid behov</string>
     <string name="pref_shared_issuer_account_name_summary">Visa kontonamn endast när de har samma utfärdare. Andra kontonamn kommer att döljas.</string>
-    <string name="pref_account_name_position_summary_override">Denna inställning åsidosätts av visningsläget paneler. Kontonamn kommer alltid att visas nedanför utfärdaren.</string>
+    <string name="pref_account_name_position_summary_override">Denna inställning åsidosätts av visningsläget paneler. Kontonamn kommer att visas nedanför utfärdaren.</string>
     <string name="pref_import_file_title">Importera från fil</string>
     <string name="pref_import_file_summary">Importera polletter från en fil</string>
     <string name="pref_android_backups_title">Android-molnsäkerhetskopior</string>
@@ -54,15 +64,23 @@
     <string name="pref_backups_reminder_summary">Visa en påminnelse om att säkerhetskopiera ditt valv ifall du inte har säkerhetskopierat dina senaste ändringar.</string>
     <string name="pref_backups_reminder_dialog_title">Inaktivera påminnelse om säkerhetskopiering</string>
     <string name="pref_backups_reminder_dialog_summary">Inaktivering av denna påminnelse innebär att Aegis inte kommer att meddela dig om du har ändringar som ännu inte har säkerhetskopierats. Detta utsätter dig för risken att förlora åtkomst till dina polletter. Är du säker på att du vill inaktivera påminnelsen?</string>
-    <string name="pref_backups_location_title">Katalog för säkerhetskopior</string>
+    <string name="pref_backups_versioning_strategy_title">Strategi för säkerhetskopiering</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Behåll ett antal versioner</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Enstaka säkerhetskopia</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Den valda strategin för säkerhetskopiering är inte tillförlitlig och rekommenderas inte. Ett enda säkerhetskopieringsfel kan leda till att du förlorar din enda säkerhetskopia.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Välj en strategi för säkerhetskopiering</string>
+    <string name="pref_backups_location_title">Plats för säkerhetskopior</string>
     <string name="pref_backups_location_summary">Säkerhetskopior kommer att lagras i</string>
+    <string name="pref_backup_location_summary">Säkerhetskopia kommer att lagras i</string>
     <string name="pref_backups_trigger_title">Skapa säkerhetskopia</string>
     <string name="pref_backups_trigger_summary">Skapa en säkerhetskopia manuellt</string>
     <string name="pref_backups_versions_title">Antal versioner att behålla</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Behåll %1$d version av säkerhetskopian</item>
         <item quantity="other">Behåll %1$d versioner av säkerhetskopian</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Behåll ett oändligt antal versioner av säkerhetskopian</string>
     <string name="pref_import_app_title">Importera från app</string>
     <string name="pref_import_app_summary">Importera polletter från en app (kräver rotåtkomst)</string>
     <string name="pref_export_title">Exportera</string>
@@ -98,8 +116,34 @@
     <string name="pref_encryption_summary">Kryptera valvet och lås upp det med ett lösenord eller biometri</string>
     <string name="pref_biometrics_title">Biometrisk upplåsning</string>
     <string name="pref_biometrics_summary">Tillåt biometrisk autentisering för att låsa upp valvet</string>
+    <string name="pref_search_behavior_summary">Sök igenom: %s</string>
+    <string name="pref_search_behavior_prompt">Sök i något av följande fält</string>
+    <string name="pref_search_behavior_type_name">Namn</string>
+    <string name="pref_search_behavior_type_issuer">Utfärdare</string>
+    <string name="pref_search_behavior_type_note">Anteckning</string>
+    <string name="pref_search_behavior_type_groups">Grupper</string>
     <string name="pref_set_password_title">Ändra lösenord</string>
     <string name="pref_set_password_summary">Ange ett nytt lösenord som kommer att krävas för att låsa upp ditt valv</string>
+    <string name="no_events_title">Inga rapporterade händelser</string>
+    <string name="no_events_description">Inga viktiga händelser har rapporterats i appen</string>
+    <string name="event_title_vault_unlocked">Valv upplåst</string>
+    <string name="event_description_vault_unlocked">Valvet har låsts upp</string>
+    <string name="event_title_backup_created">Säkerhetskopia skapad</string>
+    <string name="event_description_backup_created">En säkerhetskopia av valvet har skapats</string>
+    <string name="event_title_android_backup_created">Säkerhetskopia skapad av Android</string>
+    <string name="event_description_android_backup_created">En säkerhetskopia av valvet har skapats av Android</string>
+    <string name="event_title_vault_exported">Valv exporterat</string>
+    <string name="event_description_vault_exported">En kopia av valvet har exporterats</string>
+    <string name="event_title_entry_shared">Post delades</string>
+    <string name="event_description_entry_shared">En post delades</string>
+    <string name="event_title_vault_unlock_failed_password">Valvupplåsning misslyckades (lösenord)</string>
+    <string name="event_description_vault_unlock_failed_password">Ett försök att låsa upp valvet med ett lösenord misslyckades</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Valvupplåsning misslyckades (biometri)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Ett försök att låsa upp valvet med biometri misslyckades</string>
+    <string name="event_unknown">Okänd händelsetyp</string>
+    <string name="audit_log_entry_deleted">(raderad)</string>
+    <string name="today_at_time">I dag kl. %1$s</string>
+    <string name="day_of_week_at_time">%1$s kl. %2$s</string>
     <string name="export_encrypted">Kryptera valvet</string>
     <string name="export_help">Denna åtgärd kommer att exportera valvet från Aegis interna lagring. Välj det format som du vill att din export ska vara i:</string>
     <string name="export_warning_unencrypted">Du håller på att exportera en okrypterad kopia av ditt Aegis-valv. <b>Detta rekommenderas inte.</b></string>
@@ -116,7 +160,7 @@
         <item quantity="other">%d grupper valda</item>
     </plurals>
     <string name="export_no_groups_selected">Inga grupper valda för exportering</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator-export</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator-export</string>
     <string name="choose_authentication_method">Säkerhet</string>
     <string name="authentication_method_explanation">Aegis är en säkerhetsfokuserad 2FA-app. Polletter lagras i ett valv som, om så önskas, kan krypteras med ett lösenord som du väljer. Om en angripare får tag i din krypterade valvfil, kommer hen inte att kunna komma åt innehållet utan att känna till lösenordet.\n\nVi har förvalt det alternativ som vi tror passar bäst för din enhet.</string>
     <string name="authentication_method_none">Ingen</string>
@@ -152,6 +196,7 @@
     <string name="share">Dela</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
+    <string name="undo">Ångra</string>
     <string name="unlock">Lås upp</string>
     <string name="advanced">Avancerat</string>
     <string name="counter">Räknare</string>
@@ -163,6 +208,11 @@
     <string name="set_up_biometric">Konfigurera biometrisk upplåsning</string>
     <string name="copy">Kopiera</string>
     <string name="edit">Redigera</string>
+    <string name="select_all">Markera alla</string>
+    <string name="assign_icons">Tilldela ikoner</string>
+    <string name="assign_groups">Tilldela till grupp</string>
+    <string name="assign_groups_dialog_summary">Välj en grupp som du vill tilldela de valda posterna till.</string>
+    <string name="assign_groups_dialog_dropdown">Välj grupp</string>
     <string name="favorite" comment="Verb">Favoritmarkera</string>
     <string name="unfavorite" comment="Verb">Ta bort som favorit</string>
     <string name="error_all_caps">FEL</string>
@@ -177,10 +227,12 @@
     <string name="snackbar_authentication_method">Vänligen välj en autentiseringsmetod</string>
     <string name="encrypting_vault">Krypterar valvet</string>
     <string name="exporting_vault">Exporterar valvet</string>
+    <string name="optimizing_icon">Optimerar ikon</string>
+    <string name="optimizing_icon_multiple">Optimerar ikoner %1$d/%2$d</string>
     <string name="reading_file">Läser fil</string>
     <string name="requesting_root_access">Begär rotåtkomst</string>
     <string name="analyzing_qr">Analyserar rutkod</string>
-    <string name="analyzing_qr_multiple">Analyserar rutkod %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analyserar rutkod %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Lade till %d ny post i valvet</item>
         <item quantity="other">Lade till %d nya poster i valvet</item>
@@ -197,6 +249,7 @@
     <string name="discard_changes">Ignorera ändringar?</string>
     <string name="discard_changes_description">Dina ändringar har inte sparats</string>
     <string name="saving_profile_error">Fel när profil skulle sparas</string>
+    <string name="saving_assign_icons_error">Fel vid tilldelning av ikoner</string>
     <string name="welcome">Välkommen</string>
     <string name="app_description">Aegis är en gratis, säker och öppenkällkodad 2FA-app</string>
     <string name="setup_completed">Konfigurationen slutförd</string>
@@ -205,6 +258,7 @@
     <string name="copied">Kopierad</string>
     <string name="errors_copied">Fel kopierade till urklipp</string>
     <string name="version_copied">Version kopierad till urklipp</string>
+    <string name="error_required_field">Detta fält är obligatoriskt</string>
     <string name="error_occurred">Ett fel uppstod</string>
     <string name="decryption_error">Ett fel uppstod när valvet skulle låsas upp</string>
     <string name="decryption_corrupt_error">Ett fel uppstod när valvet skulle låsas upp. Din valvfil kan vara korrupt.</string>
@@ -242,7 +296,7 @@
     <string name="choose_account_name_position">Välj önskad kontonamnsplacering</string>
     <string name="choose_view_mode">Välj önskat visningsläge</string>
     <string name="choose_copy_behavior">Välj önskat kopieringsbeteende</string>
-    <string name="parsing_file_error">Ett fel uppstod när filen skulle analyseras</string>
+    <string name="parsing_file_error">Ett fel uppstod när filen skulle tolkas</string>
     <string name="file_not_found">Fel: Filen hittades inte</string>
     <string name="reading_file_error">Ett fel uppstod när filen skulle läsas</string>
     <string name="app_lookup_error">Fel: Appen är inte installerad</string>
@@ -268,15 +322,20 @@
     <string name="partial_google_auth_import">Ofullständig Google Authenticator-export upptäckt</string>
     <string name="partial_google_auth_import_warning">Vissa rutkoder saknas från din import. Följande koder hittades inte:\n\n<b>%s</b>\n\nDu kan fortsätta att importera denna partiella export, men vi rekommenderar att du försöker igen med alla rutkoder, så att du inte riskerar att förlora åtkomst till några polletter.</string>
     <string name="missing_qr_code_descriptor">• rutkod %d</string>
-    <string name="import_partial_export_anyway">Importera %d polletter ändå</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Importera %d pollett ändå</item>
+        <item quantity="other">Importera %d polletter ändå</item>
+    </plurals>
     <string name="import_google_auth_failure">Import av Google Authenticator-export misslyckades</string>
     <string name="unrelated_google_auth_batches_error">Exporten innehåller information gällande en orelaterad omgång. Försök att importera 1 omgång i taget.</string>
     <string name="no_tokens_can_be_imported">Inga polletter kan importeras till följd av detta</string>
-    <string name="authentication_method_raw">Rådata</string>
     <string name="unlocking_vault">Låser upp valvet</string>
-    <string name="slot_this_device">(denna enhet)</string>
+    <string name="rename_group">Byt namn på grupp</string>
+    <string name="no_group_selection">Om en post inte ingår i någon grupp, kan den hittas under \"Grupplös\".</string>
     <string name="remove_group">Ta bort grupp</string>
     <string name="remove_group_description">Är du säker på att du vill ta bort denna grupp? Poster i denna grupp kommer automatiskt att flyttas till \'Grupplös\'.</string>
+    <string name="remove_unused_groups">Radera oanvända grupper</string>
+    <string name="remove_unused_groups_description">Är du säker på att du vill radera alla grupper som inte är tilldelade någon post?</string>
     <string name="remove_icon_pack">Ta bort ikonpaket</string>
     <string name="remove_icon_pack_description">Är du säker på att du vill ta bort detta ikonpaket? Poster som använder ikoner från detta paket kommer inte att påverkas.</string>
     <string name="details">Detaljer</string>
@@ -284,13 +343,16 @@
     <string name="lock">Lås</string>
     <string name="name">Namn</string>
     <string name="no_group">Grupplös</string>
-    <string name="sort">Sortera</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sortera</string>
     <string name="sort_alphabetically">Utfärdare (A till Ö)</string>
     <string name="sort_alphabetically_reverse">Utfärdare (Ö till A)</string>
     <string name="sort_alphabetically_name">Konto (A till Ö)</string>
     <string name="sort_alphabetically_name_reverse">Konto (Ö till A)</string>
     <string name="sort_usage_count">Användningar</string>
+    <string name="sort_last_used">Senast använd</string>
     <string name="sort_custom">Anpassad</string>
+    <string name="last_used">Senast använd</string>
+    <string name="last_used_never">aldrig</string>
     <string name="new_group">Ny grupp…</string>
     <string name="group">Grupp</string>
     <string name="group_name_hint">Gruppnamn</string>
@@ -299,13 +361,16 @@
     <string name="preference_reset_usage_count">Nollställ användningar</string>
     <string name="preference_reset_usage_count_summary">Nollställ antalet användningar av alla poster i ditt valv</string>
     <string name="preference_reset_usage_count_dialog">Är du säker på att du vill ändra antalet användningar av alla poster i ditt valv till 0?</string>
-    <string name="note">Anteckning</string>
+    <string name="note" comment="Users can add a note to an entry">Anteckning</string>
     <string name="clear">Rensa</string>
     <string name="pref_highlight_entry_title">Markera polletter vid tryck</string>
     <string name="pref_highlight_entry_summary">Gör polletterna lättare att särskilja från varandra genom att tillfälligt markera dem vid tryck</string>
+    <string name="pref_groups_multiselect_title">Välj flera grupper</string>
+    <string name="pref_groups_multiselect_summary">Tillåt val av flera grupper samtidigt</string>
     <string name="pref_minimize_on_copy_title">Minimera vid kopiering</string>
     <string name="pref_minimize_on_copy_summary">Minimerar appen efter att en pollett har kopierats</string>
     <string name="pref_copy_behavior_title">Kopiera polletter till urklipp</string>
+    <string name="pref_search_behavior_title">Sökbeteende</string>
     <string name="pref_pause_entry_title">Frys polletter vid tryck</string>
     <string name="pref_pause_entry_summary">Pausa automatisk uppdatering av polletterna genom att trycka på dem. Polletterna kommer inte att uppdateras så länge som de är i fokus. Kräver \"Markera polletter vid tryck\" eller \"Tryck för att visa\".</string>
     <string name="pin_keyboard_description">Ange ditt lösenord för att aktivera pinkodstangentbordet. Observera att detta bara fungerar om ditt lösenord endast består av siffror.</string>
@@ -331,7 +396,7 @@
     <string name="unable_to_process_deeplink">Kunde inte bearbeta djuplänk</string>
     <string name="unable_to_read_qrcode_file">Kunde inte läsa och bearbeta rutkod från fil: %s.</string>
     <string name="unable_to_process_shared_text">Kunde inte bearbeta delad text som OTP</string>
-    <string name="unable_to_read_qrcode_files">Kunde inte läsa och bearbeta några av rutkoderna. Endast %d/%d poster kommer att importeras.</string>
+    <string name="unable_to_read_qrcode_files">Kunde inte läsa och bearbeta några av rutkoderna. Endast %1$d/%2$d poster kommer att importeras.</string>
     <string name="unable_to_generate_qrcode">Kunde inte generera rutkod</string>
     <string name="select_picture">Välj bild</string>
     <string name="select_icon">Välj ikon</string>
@@ -363,12 +428,14 @@
     <string name="time_sync_warning_disable">Sluta varna mig. Jag vet vad jag gör.</string>
     <string name="google_qr_export_unrelated">Orelaterad rutkod hittades. Pröva att starta om skannern.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Skannade %d/%d rutkoder</item>
-        <item quantity="other">Skannade %d/%d rutkoder</item>
+        <item quantity="one">Skannade %1$d/%2$d rutkod</item>
+        <item quantity="other">Skannade %1$d/%2$d rutkoder</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Förutsatte rutkod #%d men skannade #%d i stället</string>
+    <string name="google_qr_export_unexpected">Förutsatte rutkod #%1$d men skannade #%2$d i stället</string>
     <string name="backup_error_bar_message"><b>Säkerhetskopiering av valvet misslyckades nyligen</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Ett nyligt försök att säkerhetskopiera valvet via %s misslyckades eftersom ett fel uppstod. Försöket gjordes för %s. Vänligen kontrollera dina säkerhetskopieringsinställningar för att se till att säkerhetskopior kan skapas framgångsrikt.
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Ett nyligt försök att säkerhetskopiera valvet via %1$s misslyckades eftersom ett fel uppstod. Försöket gjordes för %2$s. Vänligen kontrollera dina säkerhetskopieringsinställningar för att se till att säkerhetskopior kan skapas framgångsrikt.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Ett nyligt försök att säkerhetskopiera valvet via %1$s misslyckades eftersom Aegis inte hade behörighet att skriva till lagringsplatsen för säkerhetskopior. Försöket gjordes för %2$s. Detta fel kan uppstå om du har flyttat/bytt namn på lagringsplatsen för säkerhetskopior eller om du nyligen har återställt Aegis från en säkerhetskopia. Vänligen konfigurera om lagringsplatsen för säkerhetskopior.
     </string>
     <string name="backup_system_builtin">Aegis inbyggda automatiska säkerhetskopior</string>
     <string name="backup_system_android">Androids molnsäkerhetskopieringssystem</string>
@@ -402,14 +469,15 @@
     <string name="copy_uri">Kopiera URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Kunde inte kopiera URI till urklipp</string>
     <string name="uri_copied_to_clipboard">URI kopierad till urklipp</string>
-    <string name="transfer_entry">Överför post</string>
     <string name="transfer_entry_description">Skanna denna rutkod med den autentiseringsapp som du vill överföra denna post till</string>
+    <string name="transfer_entry_brightness">Tryck på rutkoden för att växla till/från full ljusstyrka på skärmen</string>
     <string name="google_auth_compatible_transfer_description">Skanna dessa rutkoder med Aegis eller Google Authenticator.\n\nPå grund av begränsningar i Google Authenticator-appen inkluderas endast TOTP- &amp; HOTP-polletter som använder SHA1 och producerar 6-siffriga koder.</string>
     <string name="password_strength_very_weak">Mycket svagt</string>
     <string name="password_strength_weak">Svagt</string>
     <string name="password_strength_fair">Skapligt</string>
     <string name="password_strength_good">Bra</string>
     <string name="password_strength_strong">Starkt</string>
+    <string name="password_strength_unknown">Lösenordet är för långt för styrkeanalys</string>
     <string name="pref_pin_keyboard_title">Använd pinkodstangentbordet på låsskärmen</string>
     <string name="pref_pin_keyboard_summary">Aktivera denna om du vill aktivera pinkodstangentbordet på låsskärmen. Detta fungerar endast med numeriska lösenord.</string>
     <string name="title_activity_preferences">Inställningar</string>
@@ -418,32 +486,43 @@
     <string name="title_activity_about">Om</string>
     <string name="title_activity_edit_entry">Redigera post</string>
     <string name="title_activity_scan_qr">Skanna en rutkod</string>
-    <string name="title_activity_manage_slots">Hantera nyckelplatser</string>
     <string name="title_activity_import_entries">Importera poster</string>
+    <string name="title_activity_assign_icons">Tilldela ikoner</string>
+    <string name="title_activity_licenses">Tredjepartslicenser</string>
     <string name="dialog_wipe_entries_title">Rensa poster</string>
     <string name="dialog_wipe_entries_message">Ditt valv innehåller redan poster. Vill du ta bort dessa poster innan du importerar den här filen?\n\n<b>Genom att göra det så förlorar du åtkomst till de befintliga posterna i valvet för alltid.</b></string>
     <string name="dialog_wipe_entries_checkbox">Rensa valvets innehåll</string>
     <string name="panic_trigger_ignore_toast">Aegis tog emot en panikutlösare, men inställningen är inaktiverad - ignorerar</string>
     <string name="pref_panic_trigger_title">Radera valvet vid panikutlösare</string>
     <string name="pref_panic_trigger_summary">Radera valvet när en panikutlösare tas emot från Ripple</string>
-    <string name="import_vault">Importera valv</string>
+    <string name="import_vault">Importera Aegis-valv</string>
+    <string name="import_vault_hint">Vill du importera från en annan 2FA-app? Slutför installationen först och gå sedan till inställningsmenyn.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Avmarkerade %d möjlig dubblett. Vänligen granska listan över poster.</item>
+        <item quantity="other">Avmarkerade %d möjliga dubbletter. Vänligen granska listan över poster.</item>
+    </plurals>
     <string name="importer_help_2fas">Tillhandahåll en säkerhetskopieringsfil från 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Tillhandahåll en export-/säkerhetskopieringsfil från Aegis.</string>
     <string name="importer_help_authenticator_plus">Tillhandahåll en exportfil från Authenticator Plus som har erhållits genom <b>Settings -&gt; Backup &amp; Restore -&gt; Export as Text and HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Tillhandahåll en exportfil från Authenticator Pro som har erhållits genom <b>Inställningar -&gt; Säkerhetskopiera -&gt; Säkerhetskopiera till krypterad fil (rekommenderas)</b>.</string>
     <string name="importer_help_authy">Tillhandahåll en kopia av <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, som finns i den interna lagringskatalogen för Authy.</string>
     <string name="importer_help_andotp">Tillhandahåll en export-/säkerhetskopieringsfil från andOTP.</string>
     <string name="importer_help_bitwarden">Tillhandahåll en export-/säkerhetskopieringsfil från Bitwarden. Krypterade filer stöds ej.</string>
-    <string name="importer_help_battle_net_authenticator">Tillhandahåll en kopia av <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, som finns i den interna lagringskatalogen för Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Tillhandahåll en kopia av <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, som finns i den interna lagringskatalogen för Battle.net Authenticator.</string>
     <string name="importer_help_duo">Tillhandahåll en kopia av <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, som finns i den interna lagringskatalogen för DUO.</string>
-    <string name="importer_help_freeotp">Tillhandahåll en kopia av <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, som finns i den interna lagringskatalogen för FreeOTP.</string>
+    <string name="importer_help_ente_auth">Tillhandahåll en exportfil från Ente Auth. För närvarande stöds endast okrypterade filer.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Tillhandahåll en säkerhetskopiefil.\nFreeOTP 1.x: Tillhandahåll en kopia av <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, som finns i den interna lagringskatalogen för FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Tillhandahåll en exportfil från FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2-kompatibilitet</string>
+    <string name="importer_warning_message_freeotp2">Det finns ett antal problem i FreeOTP 2 som kan resultera i korrupta säkerhetskopior. Aegis kommer att försöka att rädda så många poster som möjligt, men det är möjligt att vissa eller till och med alla av dem inte kan importeras.</string>
     <string name="importer_help_google_authenticator"><b>Endast databasfiler från Google Authenticator v5.10 och tidigare stöds.</b>\n\nTillhandahåll en kopia av <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, som finns i den interna lagringskatalogen för Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Tillhandahåll en kopia av <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, som finns i den interna lagringskatalogen för Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Tillhandahåll en klartextfil med en Google Authenticator-URI per rad.</string>
     <string name="importer_help_steam"><b>Steam v3.0 och senare stöds inte.</b> Tillhandahåll en kopia av <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, som finns i den interna lagringskatalogen för Steam.</string>
+    <string name="importer_help_stratum">Tillhandahåll en exportfil från Stratum som har erhållits genom <b>Inställningar -&gt; Säkerhetskopiera -&gt; Säkerhetskopiera till krypterad fil (rekommenderas)</b>.</string>
     <string name="importer_help_totp_authenticator">Tillhandahåll en exportfil från TOTP Authenticator.</string>
     <string name="importer_help_winauth">Tillhandahåll en exportfil från WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Tilldela ikoner</string>
+    <string name="import_assign_icons_dialog_text">Vill du tilldela ikoner till de importerade posterna?</string>
     <string name="importer_encrypted_exception_google_authenticator">Krypterad post hoppades över: %s</string>
     <string name="importer_help_direct">Importera poster direkt från %s. Detta kräver att appen är installerad på den här enheten och att rotåtkomst ges till Aegis.</string>
     <string name="groups">Grupper</string>
@@ -460,23 +539,23 @@
     <string name="pref_account_name_position_hidden">Dolt</string>
     <string name="pref_account_name_position_end">Bredvid utfärdaren</string>
     <string name="pref_account_name_position_below">Nedanför utfärdaren</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d sekund sedan</item>
         <item quantity="other">%d sekunder sedan</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minut sedan</item>
         <item quantity="other">%d minuter sedan</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d timme sedan</item>
         <item quantity="other">%d timmar sedan</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d dag sedan</item>
         <item quantity="other">%d dagar sedan</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d år sedan</item>
         <item quantity="other">%d år sedan</item>
     </plurals>
diff --git a/app/src/main/res/values-tr-rTR-v29/strings.xml b/app/src/main/res/values-tr-rTR-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-tr-rTR-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 0d0b0755..75594245 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Ayarlar</string>
     <string name="action_about">Hakkında</string>
     <string name="action_delete">Sil</string>
@@ -33,6 +33,8 @@
     <string name="pref_section_icon_packs">İkon paketleri</string>
     <string name="pref_section_icon_packs_summary">İkon paketlerini yönet ve içe aktar</string>
     <string name="pref_select_theme_title">Tema</string>
+    <string name="pref_dynamic_colors_title">Dinamik renkler</string>
+    <string name="pref_dynamic_colors_summary">Android temanızın renklerine göre bir kaplama uygulayın</string>
     <string name="pref_view_mode_title">Görüntüleme biçimi</string>
     <string name="pref_lang_title">Dil</string>
     <string name="pref_show_icons_title">Simgeleri göster</string>
@@ -42,7 +44,6 @@
     <string name="pref_account_name_position_title">Hesap adını göster</string>
     <string name="pref_shared_issuer_account_name_title">Hesap adını yalnızca gerektiğinde göster</string>
     <string name="pref_shared_issuer_account_name_summary">Hesap adlarını yalnızca aynı sağlayıcıyı paylaştıklarında göster. Diğer hesap adları gizlenecektir.</string>
-    <string name="pref_account_name_position_summary_override">Bu ayar, döşeme görüntüleme modu tarafından geçersiz kılınır. Hesap adı her zaman kartı veren kuruluşun altında gösterilecektir.</string>
     <string name="pref_import_file_title">Dosyadan içeriye aktar</string>
     <string name="pref_import_file_summary">Veritabanını dosyadan içeriye aktar</string>
     <string name="pref_android_backups_title">Android bulut yedekleme</string>
@@ -54,7 +55,6 @@
     <string name="pref_backups_reminder_summary">En son değişikliklerinizi yedeklemediyseniz kasanızı yedeklemeniz için bir hatırlatıcı gösterir.</string>
     <string name="pref_backups_reminder_dialog_title">Yedekleme hatırlatıcıyı devre dışı bırak</string>
     <string name="pref_backups_reminder_dialog_summary">Bu hatırlatıcıyı devre dışı bırakmak, Aegis\'in henüz yedeklenmemiş değişiklikleriniz olup olmadığını size söylemeyeceği anlamına gelir. Bu sizi belirteçlerinize erişimi kaybetme riskiyle karşı karşıya bırakır. Hatırlatıcıyı devre dışı bırakmak istediğinizden emin misiniz?</string>
-    <string name="pref_backups_location_title">Yedek dosyaların kaydedileceği klasör</string>
     <string name="pref_backups_location_summary">Yedekler şurada depolanacak</string>
     <string name="pref_backups_trigger_title">Yedeklemeyi tetikle</string>
     <string name="pref_backups_trigger_summary">Yedeklemeyi elle tetikle</string>
@@ -116,7 +116,7 @@
         <item quantity="other">%d grup seçildi</item>
     </plurals>
     <string name="export_no_groups_selected">Dışa aktarılacak grup seçilmedi</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator Dışa Aktarma</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator Dışa Aktarma</string>
     <string name="choose_authentication_method">Güvenlik</string>
     <string name="authentication_method_explanation">Aegis güvenlik odaklı bir 2FA uygulamasıdır. Kodlar isteğiniz üzerine parolayla şifreleyebileceğiniz bir kasada saklanabilir. Eğer bir saldırgan şifrelenmiş kasa dosyanızı elde ederse parolayı bilmeden içeriğine erişemeyecektir.\n\nCihazınız için en iyi olduğunu düşündüğümüz seçeneği seçtik.</string>
     <string name="authentication_method_none">Hiçbiri</string>
@@ -152,6 +152,7 @@
     <string name="share">Paylaş</string>
     <string name="yes">Evet</string>
     <string name="no">Hayır</string>
+    <string name="undo">Geri al</string>
     <string name="unlock">Kilidi aç</string>
     <string name="advanced">Gelişmiş</string>
     <string name="counter">Sayaç</string>
@@ -163,6 +164,8 @@
     <string name="set_up_biometric">Biyometrik kilit açma kurulumu</string>
     <string name="copy">Kopyala</string>
     <string name="edit">Düzenle</string>
+    <string name="select_all">Tümünü seç</string>
+    <string name="assign_icons">Simgeleri ata</string>
     <string name="favorite" comment="Verb">Favorilere Ekle</string>
     <string name="unfavorite" comment="Verb">Favorilerden Çıkar</string>
     <string name="error_all_caps">HATA</string>
@@ -180,7 +183,6 @@
     <string name="reading_file">Dosya okunuyor</string>
     <string name="requesting_root_access">Root erişimi denetleniyor</string>
     <string name="analyzing_qr">QR kodunu analiz ediliyor</string>
-    <string name="analyzing_qr_multiple">QR kodu %d/%d (%s) analiz ediliyor</string>
     <plurals name="added_new_entries">
         <item quantity="one">Kasaya %d yeni giriş eklendi</item>
         <item quantity="other">Kasaya %d yeni giriş eklendi</item>
@@ -197,6 +199,7 @@
     <string name="discard_changes">Değişiklikler göz ardı edilsin mi?</string>
     <string name="discard_changes_description">Değişiklikleriniz kaydedilmedi</string>
     <string name="saving_profile_error">Profil kaydı sırasında hata</string>
+    <string name="saving_assign_icons_error">Simgeler atanırken hata oluştu</string>
     <string name="welcome">Hoşgeldiniz</string>
     <string name="app_description">Aegis özgür, güvenli ve açık kaynak 2FA uygulamasıdır</string>
     <string name="setup_completed">Kurulum Tamamlandı</string>
@@ -268,15 +271,14 @@
     <string name="partial_google_auth_import">Eksik Google Authenticator dışa aktarımı algılandı</string>
     <string name="partial_google_auth_import_warning">İçe aktarma işleminizde bazı QR kodları eksik. aşağıdaki kodlar bulunamadı:\n\n<b>%s</b>\n\nBu kısmi dışa aktarmayı içe aktarmaya devam edebilirsiniz, ancak herhangi bir tokena erişimi kaybetme riskine girmemek için tüm QR kodlarıyla yeniden denemenizi öneririz.</string>
     <string name="missing_qr_code_descriptor">• QR kodu %d</string>
-    <string name="import_partial_export_anyway">Yine de %d tokenı içe aktar</string>
     <string name="import_google_auth_failure">Dışa aktarılmış Google Authenticator dosyasını içe aktarma işlemi başarısız oldu</string>
     <string name="unrelated_google_auth_batches_error">Dışa aktarma, ilgisiz bir toplu iş için bilgi içerir. Bir seferde 1 partiyi içe aktarmayı deneyin.</string>
     <string name="no_tokens_can_be_imported">Sonuç olarak hiçbir token içe aktarılamaz</string>
-    <string name="authentication_method_raw">İşlenmemiş</string>
     <string name="unlocking_vault">Kasa kilidi açılıyor</string>
-    <string name="slot_this_device">(bu cihaz)</string>
     <string name="remove_group">Grubu sil</string>
     <string name="remove_group_description">Bu grubu silmek istediğinize emin misiniz? Bu gruptaki girdiler otomatik olarak \'Grupsuz\' grubuna geçecek.</string>
+    <string name="remove_unused_groups">Kullanılmayan grupları sil</string>
+    <string name="remove_unused_groups_description">Bir girişe atanmamış tüm grupları silmek istediğinizden emin misiniz?</string>
     <string name="remove_icon_pack">İkon paketini sil</string>
     <string name="remove_icon_pack_description">Bu ikon paketini silmek istediğinize emin misiniz? Bu pakete ait ikonları kullanan girdiler bundan etkilenmeyeceklerdir.</string>
     <string name="details">Detaylar</string>
@@ -284,13 +286,16 @@
     <string name="lock">Kilitle</string>
     <string name="name">Ad</string>
     <string name="no_group">Grupsuz</string>
-    <string name="sort">Sırala</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sırala</string>
     <string name="sort_alphabetically">Sağlayıcı (A\'dan Z\'ye)</string>
     <string name="sort_alphabetically_reverse">Sağlayıcı (Z\'den A\'ya)</string>
     <string name="sort_alphabetically_name">Hesap (A\'dan  Z\'ye)</string>
     <string name="sort_alphabetically_name_reverse">Hesap (Z\'den A\'ya)</string>
     <string name="sort_usage_count">Kullanım sayısı</string>
+    <string name="sort_last_used">Son kullanım</string>
     <string name="sort_custom">İsteğe göre</string>
+    <string name="last_used">Son kullanım</string>
+    <string name="last_used_never">asla</string>
     <string name="new_group">Yeni grup…</string>
     <string name="group">Grup</string>
     <string name="group_name_hint">Grup adı</string>
@@ -299,7 +304,7 @@
     <string name="preference_reset_usage_count">Kullanım sayısını sıfırla</string>
     <string name="preference_reset_usage_count_summary">Kasanızdaki bütün girdilerin kullanım sayısını sıfırlayın</string>
     <string name="preference_reset_usage_count_dialog">Kasanızdaki bütün girdilerin kullanım sayısını sıfırlamak istediğinize emin misiniz?</string>
-    <string name="note">Not</string>
+    <string name="note" comment="Users can add a note to an entry">Not</string>
     <string name="clear">Temizle</string>
     <string name="pref_highlight_entry_title">Dokunulan kodları belirt</string>
     <string name="pref_highlight_entry_summary">Kodların birbirlerinden ayırt edilmelerini kolaylaştırmak için geçici olarak belirginleştir</string>
@@ -325,13 +330,12 @@
     <string name="unknown_issuer">Bilinmeyen sağlayıcı</string>
     <string name="unknown_account_name">Bilinmeyen hesap adı</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis %d kodunu içe aktaramadı. Bu kodlar atlanacaktır. Hatalar hakkında daha detaylı bilgi için lütfen \'ayrıntılar\'a basınız.</item>
-        <item quantity="other">Aegis %d kodunu içe aktaramadı. Bu kodlar atlanacaktır. Hatalar hakkında daha detaylı bilgi için lütfen \'ayrıntılar\'a basınız.</item>
+        <item quantity="one">Aegis %d tokenı içe aktaramadı. Bu token atlanacak. Hata hakkında daha fazla bilgi görmek için \'ayrıntılar\'a basın.</item>
+        <item quantity="other">Aegis %d tokenı içe aktaramadı. Bu tokenlar atlanacak. Hata hakkında daha fazla bilgi görmek için \'ayrıntılar\'a basın.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Derin bağlantı işlenemiyor</string>
     <string name="unable_to_read_qrcode_file">Dosyadan QR kodu okunamıyor ve işlenemiyor: %s.</string>
     <string name="unable_to_process_shared_text">OTP olarak paylaşılan metin işlenemiyor</string>
-    <string name="unable_to_read_qrcode_files">Bazı QR kodlar okunamıyor ve işlenemiyor. Yalnızca %d/%d girişleri içe aktarılacak.</string>
     <string name="unable_to_generate_qrcode">QR Kodu oluşturulamadı</string>
     <string name="select_picture">Resim seç</string>
     <string name="select_icon">Simge seç</string>
@@ -348,7 +352,7 @@
     <string name="github_description">Kaynak kod, sorunlar ve bilgiler</string>
     <string name="license">Lisans</string>
     <string name="license_description">Aegis Doğrulayıcı GPLv3 lisansına sahiptir</string>
-    <string name="third_party_licenses">Üçüncü parti lisansları</string>
+    <string name="third_party_licenses">Üçüncü taraf lisanslar</string>
     <string name="third_party_licenses_description">Aegis\'in kullandığı üçüncü-parti kütüphanelerin lisansları</string>
     <string name="country_netherlands">Hollanda</string>
     <string name="email_us">Bir e-posta yazın</string>
@@ -362,14 +366,7 @@
     <string name="time_sync_warning_message">Aegis doğru kodları oluşturmak üzere sistem zamanın senkron olmasına ihtiyaç duyar. Birkaç saniyelik sapma hatalı kod oluşumuna neden olabilir. Görünüşe göre cihazınız zamanı otomatik senkronize etmeye ayarlanmamış. Şimdi ayarlamak ister misiniz?</string>
     <string name="time_sync_warning_disable">Beni uyarmayı bırak. Ne yaptığımı biliyorum.</string>
     <string name="google_qr_export_unrelated">Alakasız QR kod bulundu. Tarayıcıyı yeniden başlatmayı deneyin.</string>
-    <plurals name="google_qr_export_scanned">
-        <item quantity="one">%d/%d QR kodları tarandı</item>
-        <item quantity="other">%d/%d QR kodları tarandı</item>
-    </plurals>
-    <string name="google_qr_export_unexpected">Beklenen QR kodu #%d idi, ancak bunun yerine #%d tarandı</string>
     <string name="backup_error_bar_message"><b>Kasa yedeklenmesi başarısız oldu</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Bir hata nedeniyle %s ile son kasa yedeği alınamadı. Yedekleme denemesi %s. Yedeklemenin başarılı olması için lütfen yedekleme ayarlarınızı kontrol edin.
-    </string>
     <string name="backup_system_builtin">Aegis dahili otomatik yedekleri</string>
     <string name="backup_system_android">Android\'in bulut yedekleme sistemi</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Son yedek güncel değil (%s)
@@ -402,7 +399,6 @@
     <string name="copy_uri">URI\'ı kopyala</string>
     <string name="unable_to_copy_uri_to_clipboard">URI panoya kopyalanamıyor</string>
     <string name="uri_copied_to_clipboard">URI panoya kopyalandı</string>
-    <string name="transfer_entry">Girdiyi aktar</string>
     <string name="transfer_entry_description">Bu kare kodu aktarmak istediğiniz doğrulayıcı uygulamasıyla okutun</string>
     <string name="google_auth_compatible_transfer_description">Bu QR kodlarını Aegis veya Google Authenticator ile tarayın.\in\Google Authenticator uygulamasının sınırlamaları nedeniyle, yalnızca TOTP &amp; SHA1 kullanan ve 6 basamaklı kodlar üreten TOTP belirteçleri dahildir</string>
     <string name="password_strength_very_weak">Çok zayıf</string>
@@ -418,25 +414,28 @@
     <string name="title_activity_about">Hakkında</string>
     <string name="title_activity_edit_entry">Girdiyi düzenle</string>
     <string name="title_activity_scan_qr">QR Kodu Tara</string>
-    <string name="title_activity_manage_slots">Anahtar sıralarını yönet</string>
     <string name="title_activity_import_entries">Girdileri içe aktar</string>
+    <string name="title_activity_assign_icons">Simgeleri ata</string>
+    <string name="title_activity_licenses">Üçüncü taraf lisanslar</string>
     <string name="dialog_wipe_entries_title">Girdileri sil</string>
     <string name="dialog_wipe_entries_message">Kasanızda zaten girdiler bulunmaktadır. İçe aktarmadan önce bu girdileri silmek istediğinize emin misiniz?\n\n<b>Deponun içinde bulunan girdilere erişiminizi sonsuza dek kaybedeceksiniz.</b></string>
     <string name="dialog_wipe_entries_checkbox">Kasa içeriklerini temizle</string>
     <string name="panic_trigger_ignore_toast">Aegis panik tetiği algıladı, ancak bu ayar devre dışı, göz ardı ediliyor</string>
     <string name="pref_panic_trigger_title">Panik tetiklendiğinde kasayı sil</string>
     <string name="pref_panic_trigger_summary">Ripple\'dan panik tetiklenmesi alınca kasayı sil</string>
-    <string name="import_vault">Kasayı içeri aktar</string>
+    <string name="import_vault">Aegis kasasını içe aktar</string>
+    <string name="import_vault_hint">Farklı bir 2FA uygulamasından içe aktarmak mı istiyorsunuz? Önce kurulumu tamamlayın ve ardından ayarlar menüsüne gidin.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">%d potansiyel kopyanın işareti kaldırıldı. Lütfen giriş listesini inceleyin.</item>
+        <item quantity="other">%d potansiyel kopyanın işareti kaldırıldı. Lütfen giriş listesini inceleyin.</item>
+    </plurals>
     <string name="importer_help_2fas">2FAS Authenticator dışa aktarım dosyasını sağlayın.</string>
     <string name="importer_help_aegis">Aegis dışarı aktarım/yedek dosyası sağlayın.</string>
     <string name="importer_help_authenticator_plus"><b>Ayarlar -&gt; Yedekleme &amp; Geri Yükleme -&gt; Metin ya da HTML olarak dışa aktar</b> yolunu izleyerek bir Authenticator Plus dışa aktarım dosyası sağlayın.</string>
-    <string name="importer_help_authenticator_pro"><b>Ayarlar -&gt;; Yedekle -&gt;; Şifreli dosyaya yedekle (önerilir)</b> aracılığıyla elde edilen bir Authenticator Pro dışa aktarma dosyası sağlar.</string>
     <string name="importer_help_authy"><b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>dosyasını sağlayın, Authy\'nin dahili depolama konumunda bulunabilir.</string>
     <string name="importer_help_andotp">andOTP dışa aktarım dosyasını sağlayın.</string>
     <string name="importer_help_bitwarden">Bitwarden\'a ait bir yedekleme/aktarma dosyası sağlayın. Şifrelenmiş dosyalar desteklenmiyor.</string>
-    <string name="importer_help_battle_net_authenticator"><b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>dosyasını sağlayın, Battle.net Authenticator\'ın dahili depolama konumunda bulunabilir.</string>
     <string name="importer_help_duo">DUO\'nun dahili depolama dizininde bulunan <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> dosyasının bir kopyasını sağlayın.</string>
-    <string name="importer_help_freeotp"><b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>dosyasını sağlayın, FreeOTP\'nin dahili depolama konumunda bulunabilir.</string>
     <string name="importer_help_freeotp_plus">FreeOTP+ dışa aktarım dosyasını sağlayın.</string>
     <string name="importer_help_google_authenticator"><b>Yalnızca Google Authenticator v5.10 ve önceki sürümlerdeki veritabanı dosyaları desteklenir</b>.\n\nGoogle Authenticator\'ın dahili depolama dizininde bulunan<b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>dosyasının bir kopyasını temin edin.</string>
     <string name="importer_help_microsoft_authenticator"><b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>dosyasını sağlayın, Microsoft Authenticator\'ın dahili depolama konumunda bulunabilir.</string>
@@ -444,6 +443,8 @@
     <string name="importer_help_steam"><b>Steam v3.0 ve daha yeni sürümler desteklenmez</b>. <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> dosyasını sağlayın, Steam\'in dahili depolama konumunda bulunabilir.</string>
     <string name="importer_help_totp_authenticator">TOTP Authenticator dışa aktarım dosyasını sağlayın.</string>
     <string name="importer_help_winauth">WinAuth dışa aktarım dosyasını sağlayın.</string>
+    <string name="import_assign_icons_dialog_title">Simgeleri ata</string>
+    <string name="import_assign_icons_dialog_text">İçe aktarılan girişlere simgeler atamak istiyor musunuz?</string>
     <string name="importer_encrypted_exception_google_authenticator">Şifrelenmiş giriş geçildi: %s</string>
     <string name="importer_help_direct">Girdileri doğrudan %s\'dan içeri aktar. Bunu yapabilmek için uygulamanın cihazınızda yüklü olması ve Aegis\'in kök erişim iznine sahip olması gerekir.</string>
     <string name="groups">Gruplar</string>
@@ -460,23 +461,23 @@
     <string name="pref_account_name_position_hidden">Gizli</string>
     <string name="pref_account_name_position_end">Yayınlayanın yanında</string>
     <string name="pref_account_name_position_below">Yayınlayanın altında</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d saniye önce</item>
         <item quantity="other">%d saniye önce</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d dakika önce</item>
         <item quantity="other">%d dakika önce</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d saat önce</item>
         <item quantity="other">%d saat önce</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d gün önce</item>
         <item quantity="other">%d gün önce</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d yıl önce</item>
         <item quantity="other">%d yıl önce</item>
     </plurals>
diff --git a/app/src/main/res/values-uk-rUA-v29/strings.xml b/app/src/main/res/values-uk-rUA-v29/strings.xml
new file mode 100644
index 00000000..3ea04e70
--- /dev/null
+++ b/app/src/main/res/values-uk-rUA-v29/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 2ea664f5..ea048466 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Налаштування</string>
     <string name="action_about">Про додаток</string>
     <string name="action_delete">Видалити</string>
@@ -33,12 +33,15 @@
     <string name="pref_section_icon_packs">Пакети піктограм</string>
     <string name="pref_section_icon_packs_summary">Керування та імпорт пакетами піктограм</string>
     <string name="pref_select_theme_title">Тема</string>
+    <string name="pref_dynamic_colors_title">Динамічні кольори</string>
     <string name="pref_view_mode_title">Режим перегляду</string>
     <string name="pref_lang_title">Мова</string>
     <string name="pref_show_icons_title">Показувати піктограми</string>
     <string name="pref_show_icons_summary">Показувати піктограми біля кожного запису</string>
     <string name="pref_code_group_size_title">Групування цифр</string>
     <string name="pref_code_group_size_summary">Виберіть як групувати цифри у токенах</string>
+    <string name="pref_account_name_position_title">Показати ім\'я облікового запису</string>
+    <string name="pref_shared_issuer_account_name_title">Показувати ім\'я облікового запису лише за необхідності</string>
     <string name="pref_import_file_title">Імпорт з файлу</string>
     <string name="pref_import_file_summary">Імпортувати токени з файлу</string>
     <string name="pref_android_backups_title">Резервні копії в хмарі Android</string>
@@ -46,7 +49,6 @@
     <string name="pref_android_backups_hint"><i>Резервне копіювання між пристроями працюватиме завжди, незалежно від налаштування вище</i></string>
     <string name="pref_backups_title">Автоматично створювати резервні копії сховища</string>
     <string name="pref_backups_summary">Автоматично створювати резервні копії сховища на зовнішніх носіях при внесенні змін. Підтримується лише для зашифрованих сховищ.</string>
-    <string name="pref_backups_location_title">Каталог для резервних копій</string>
     <string name="pref_backups_location_summary">Резервні копії будуть зберігатися в</string>
     <string name="pref_backups_trigger_title">Запустити резервне копіювання</string>
     <string name="pref_backups_trigger_summary">Вручну запустити створення резервної копії</string>
@@ -105,8 +107,9 @@
     <string name="export_format_html">Веб-сторінка (.HTML)</string>
     <string name="export_format_hint">Формат експорту</string>
     <string name="export_all_groups">Експортувати усі групи</string>
+    <string name="export_choose_groups">Оберіть групи для експорту</string>
     <string name="export_no_groups_selected">Не вибрано жодної групи для експорту</string>
-    <string name="export_html_title" context="The title of an HTML export document">Експорт Aegis Authenticator</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Експорт Aegis Authenticator</string>
     <string name="choose_authentication_method">Безпека</string>
     <string name="authentication_method_explanation">Aegis - це орієнтований на безпеку додаток для двофакторної автентифікації (2FA). Токени зберігаються в сховищі, яке за бажанням можна зашифрувати за допомогою вибраного вами пароля. Якщо зловмисник отримає ваш зашифрований файл сховища, то він не зможе отримати доступ до змісту, не знаючи пароля.\n\nМи обрали варіант, який, на нашу думку, найкраще підходить для вашого пристрою.</string>
     <string name="authentication_method_none">Немає</string>
@@ -125,6 +128,7 @@
     <string name="set_password_confirm">Будь ласка, підтвердьте пароль</string>
     <string name="invalid_password">Неправильний пароль</string>
     <string name="invalidated_biometrics">Виявлено зміни в налаштуваннях безпеки вашого пристрою. Будь ласка, перейдіть до \"Aegis -&gt; Налаштування -&gt; Безпека -&gt; Біометричне розблокування\", щоб вимкнути та повторно увімкнути біометричне розблокування.</string>
+    <string name="password_reminder_dialog_title">Біометричне розблокування за замовчуванням</string>
     <string name="password_reminder_freq_never">Ніколи</string>
     <string name="password_reminder_freq_weekly">Щотижня</string>
     <string name="password_reminder_freq_biweekly">Двічі на тиждень</string>
@@ -150,6 +154,7 @@
     <string name="set_up_biometric">Налаштувати біометричне розблокування</string>
     <string name="copy">Копіювати</string>
     <string name="edit">Редагувати</string>
+    <string name="select_all">Вибрати все</string>
     <string name="favorite" comment="Verb">Додати до улюблених</string>
     <string name="unfavorite" comment="Verb">Вилучити з улюбленого</string>
     <string name="error_all_caps">ПОМИЛКА</string>
@@ -167,7 +172,6 @@
     <string name="reading_file">Читання файлу</string>
     <string name="requesting_root_access">Запит на root-доступ</string>
     <string name="analyzing_qr">Аналіз QR-коду</string>
-    <string name="analyzing_qr_multiple">Аналіз QR-коду %d/%d (%s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Додано %d новий запис у сховище</item>
         <item quantity="few">Додано %d нові записи у сховище</item>
@@ -263,13 +267,10 @@
     <string name="partial_google_auth_import">Виявлено неповний експорт з Google Authenticator</string>
     <string name="partial_google_auth_import_warning">Деякі QR-коди відсутні у вашому імпорті. Наступні коди не були знайдені:\n\n<b>%s</b>\n\nВи можете продовжити імпорт цього часткового файлу експорту, але ми рекомендуємо спробувати ще раз з усіма QR-кодами, щоб уникнути ризику втрати доступу до токенів.</string>
     <string name="missing_qr_code_descriptor">• QR-код %d</string>
-    <string name="import_partial_export_anyway">Однаково імпортувати %d токен/и/ів</string>
     <string name="import_google_auth_failure">Не вдалося імпортувати дані з Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">Експорт містить інформацію про непов\'язаний пакет. Спробуйте імпортувати пакети по одному.</string>
     <string name="no_tokens_can_be_imported">В результаті жоден токен не може бути імпортований</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Розблокування сховища</string>
-    <string name="slot_this_device">(цей пристрій)</string>
     <string name="remove_group">Видалити групу</string>
     <string name="remove_group_description">Ви впевнені, що хочете видалити цю групу? Записи у цій групі автоматично перемістяться в \'Без групи\'.</string>
     <string name="remove_icon_pack">Видалити набір піктограм</string>
@@ -279,7 +280,7 @@
     <string name="lock">Заблокувати</string>
     <string name="name">Назва</string>
     <string name="no_group">Без групи</string>
-    <string name="sort">Сортувати</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Сортувати</string>
     <string name="sort_alphabetically">Емітент (А - Я)</string>
     <string name="sort_alphabetically_reverse">Емітент (Я - А)</string>
     <string name="sort_alphabetically_name">Обліковий запис (A - Я)</string>
@@ -294,12 +295,13 @@
     <string name="preference_reset_usage_count">Скинути лічильник використання</string>
     <string name="preference_reset_usage_count_summary">Скинути кількість використань кожного запису у вашому сховищі</string>
     <string name="preference_reset_usage_count_dialog">Ви впевнені, що хочете встановити кількість використань для кожного запису у вашому сховищі на 0?</string>
-    <string name="note">Нотатка</string>
+    <string name="note" comment="Users can add a note to an entry">Нотатка</string>
     <string name="clear">Очистити</string>
     <string name="pref_highlight_entry_title">Підсвічувати токени при натисканні</string>
     <string name="pref_highlight_entry_summary">Підсвічувати токени при натисканні для того, щоб їх було легше відрізнити один від одного</string>
     <string name="pref_minimize_on_copy_title">Згортати при копіюванні</string>
     <string name="pref_minimize_on_copy_summary">Згортати додаток після копіювання токена</string>
+    <string name="pref_copy_behavior_title">Скопіювати токени в буфер обміну</string>
     <string name="pref_pause_entry_title">Заморожувати токени при натисканні</string>
     <string name="pref_pause_entry_summary">Призупиніть автоматичне оновлення токенів, натиснувши на них. Токени не будуть оновлюватися, поки вони підсвічені. Потребує увімкненої опції \"Підсвічувати токени при натисканні\", або \"Безпека -> Показувати після дотику\".</string>
     <string name="pin_keyboard_description">Введіть свій пароль, щоб увімкнути PIN-клавіатуру. Зауважте, що це можливо лише, якщо ваш пароль складається виключно з цифр</string>
@@ -317,16 +319,9 @@
     <string name="small_mode_title">Зменшений</string>
     <string name="unknown_issuer">Невідомий емітент</string>
     <string name="unknown_account_name">Невідома назва облікового запису</string>
-    <plurals name="import_error_dialog">
-        <item quantity="one">Aegis не вдалося імпортувати %d токен. Цей токен буде пропущено. Натисніть \'деталі\', щоб побачити більше інформації про помилки.</item>
-        <item quantity="few">Aegis не вдалося імпортувати %d токени. Ці токени буде пропущено. Натисніть \'деталі\', щоб побачити більше інформації про помилки.</item>
-        <item quantity="many">Aegis не вдалося імпортувати %d токенів. Ці токени буде пропущено. Натисніть \'деталі\', щоб побачити більше інформації про помилки.</item>
-        <item quantity="other">Aegis не вдалося імпортувати %d токенів. Ці токени буде пропущено. Натисніть \'деталі\', щоб побачити більше інформації про помилки.</item>
-    </plurals>
     <string name="unable_to_process_deeplink">Не вдалося обробити глибоке посилання</string>
     <string name="unable_to_read_qrcode_file">Не вдається прочитати і обробити QR-код із файлу: %s.</string>
     <string name="unable_to_process_shared_text">Неможливо обробити вхідний текст як OTP</string>
-    <string name="unable_to_read_qrcode_files">Не вдалося прочитати та обробити деякі з QR-кодів. Буде імпортовано лише %d/%d запис/и/ів.</string>
     <string name="unable_to_generate_qrcode">Не вдається згенерувати QR-код</string>
     <string name="select_picture">Виберіть зображення</string>
     <string name="select_icon">Виберіть іконку</string>
@@ -357,22 +352,14 @@
     <string name="time_sync_warning_message">Aegis залежить від системного часу для генерації правильних кодів. Відхилення всього на кілька секунд може призвести до неправильних кодів. Схоже, ваш пристрій не налаштовано на автоматичну синхронізацію часу. Бажаєте зробити це зараз?</string>
     <string name="time_sync_warning_disable">Припиніть мене попереджати. Я знаю, що роблю.</string>
     <string name="google_qr_export_unrelated">Знайдено непов\'язаний QR-код. Спробуйте перезапустити сканер.</string>
-    <plurals name="google_qr_export_scanned">
-        <item quantity="one">Відскановано %d/%d QR-кодів</item>
-        <item quantity="few">Відскановано %d/%d QR-кодів</item>
-        <item quantity="many">Відскановано %d/%d QR-кодів</item>
-        <item quantity="other">Відскановано %d/%d QR-кодів</item>
-    </plurals>
-    <string name="google_qr_export_unexpected">Очікувався QR-код #%d, але замість цього відскановано #%d</string>
     <string name="backup_error_bar_message"><b>Нещодавно не вдалося створити резервну копію сховища</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Недавня спроба резервного копіювання сховища з використанням %s зазнала невдачі. Спроба створити резервну копію була здійснена о %s. Будь ласка, перевірте налаштування резервного копіювання, щоб переконатися, що резервні копії будуть успішно виконані.
-    </string>
     <string name="backup_system_builtin">Вбудоване автоматичне резервне копіювання Aegis</string>
     <string name="backup_system_android">Система хмарного резервного копіювання Android</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Остання резервна копія застаріла (%s)
     </string>
     <string name="backup_reminder_bar_message">        Резервну копію змін не створено
     </string>
+    <string name="backup_reminder_bar_dialog_accept">Налаштування резервних копій</string>
     <string name="backup_plaintext_export_warning"><b>Сховище нещодавно було експортовано у вигляді звичайного тексту</b></string>
     <string name="pref_show_plaintext_warning_hint">Не показувати це попередження в майбутньому</string>
     <string name="backup_plaintext_warning_explanation">Це попередження показується тому, що ви нещодавно експортували незашифровану копію сховища. Задля безпеки ваших токенів, ми рекомендуємо видалити цей файл, коли він стане непотрібним.</string>
@@ -397,7 +384,6 @@
     <string name="copy_uri">Копіювати URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Не вдалося скопіювати URI в буфер обміну</string>
     <string name="uri_copied_to_clipboard">URI скопійовано в буфер обміну</string>
-    <string name="transfer_entry">Передати запис</string>
     <string name="transfer_entry_description">Відскануйте цей QR-код за допомогою додатка для авторизації, куди ви хочете перенести цей запис</string>
     <string name="google_auth_compatible_transfer_description">Проскануйте ці QR-коди за допомогою Aegis або Google Authenticator.\n\nУ зв\'язку з обмеженнями програми Google Authenticator включаються лише TOTP &amp; HOTP токени з використанням SHA1 і генерацією 6-цифрових кодів</string>
     <string name="password_strength_very_weak">Дуже слабкий</string>
@@ -413,7 +399,6 @@
     <string name="title_activity_about">Про додаток</string>
     <string name="title_activity_edit_entry">Редагування запису</string>
     <string name="title_activity_scan_qr">Сканування QR-коду</string>
-    <string name="title_activity_manage_slots">Керувати ключовими слотами</string>
     <string name="title_activity_import_entries">Імпортування записів</string>
     <string name="dialog_wipe_entries_title">Очистити записи</string>
     <string name="dialog_wipe_entries_message">Ваше сховище вже містить записи. Видалити ці записи перед імпортом цього файлу?\n\n<b>При цьому ви назавжди втратите доступ до наявних записів у сховищі.</b></string>
@@ -421,16 +406,14 @@
     <string name="panic_trigger_ignore_toast">Aegis отримав панічний тригер, але налаштування вимкнено, тому сигнал ігнорується</string>
     <string name="pref_panic_trigger_title">Видалити сховище при панічному тригері</string>
     <string name="pref_panic_trigger_summary">Видалити сховище після отримання панічного тригера Ripple</string>
-    <string name="import_vault">Імпорт сховища</string>
+    <string name="import_vault">Імпорт сховища Aegis</string>
     <string name="importer_help_2fas">Надайте файл резервної копії 2FAS Authenticator.</string>
     <string name="importer_help_aegis">Надайте файл експорту/резервної копії Aegis.</string>
     <string name="importer_help_authenticator_plus">Надайте файл експорту Authenticator Plus, отриманий через <b>Settings -&gt; Backup &amp; Restore -&gt; Export as Text and HTML</b>.</string>
     <string name="importer_help_authy">Надайте копію <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, що знаходиться в каталозі Authy у внутрішній пам\'яті.</string>
     <string name="importer_help_andotp">Надайте файл експорту/резервної копії andOTP.</string>
     <string name="importer_help_bitwarden">Надайте файл експорту/резервного копіювання Bitwarden. Зашифровані файли не підтримуються.</string>
-    <string name="importer_help_battle_net_authenticator">Необхідна копія файлу <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, який знаходиться у внутрішньому каталозі пам’яті Battle.net Authenticator.</string>
     <string name="importer_help_duo">Надайте копію <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, що знаходиться у каталозі DUO у внутрішній пам\'яті.</string>
-    <string name="importer_help_freeotp">Надайте копію <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, що знаходиться в каталозі FreeOTP у внутрішній пам\'яті.</string>
     <string name="importer_help_freeotp_plus">Надайте файл експортований з FreeOTP+.</string>
     <string name="importer_help_google_authenticator"><b>Підтримуються лише файли бази даних Google Authenticator v5.10 та попередніх версій</b>.\n\nНадайте копію <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, що знаходиться у каталозі Google Authenticator у внутрішній пам\'яті.</string>
     <string name="importer_help_microsoft_authenticator">Надайте копію <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, що знаходиться у каталозі Microsoft Authenticator у внутрішній пам\'яті.</string>
@@ -438,6 +421,7 @@
     <string name="importer_help_steam"><b>Steam v3.0 і новіші версії не підтримуються</b>. Надайте копію <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, що знаходиться у каталозі Steam у внутрішній пам\'яті.</string>
     <string name="importer_help_totp_authenticator">Надайте файл експортований з TOTP Authenticator.</string>
     <string name="importer_help_winauth">Надайте файл експортований з WinAuth.</string>
+    <string name="import_assign_icons_dialog_text">Ви хочете призначити значки для імпортованих записів?</string>
     <string name="importer_encrypted_exception_google_authenticator">Пропущено зашифрований запис: %s</string>
     <string name="importer_help_direct">Імпортувати записи безпосередньо з %s. Для цього потрібно встановити додаток на цьому пристрої і надати root-доступ додатку Aegis.</string>
     <string name="groups">Групи</string>
@@ -448,31 +432,33 @@
     <string name="pref_grouping_size_two">2 цифри у групі</string>
     <string name="pref_grouping_size_three">3 цифри у групі</string>
     <string name="pref_grouping_size_four">4 цифри у групі</string>
-    <plurals name="time_elapsed_seconds">
+    <string name="pref_copy_behavior_never">Ніколи</string>
+    <string name="pref_account_name_position_hidden">Приховано</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d секунду тому</item>
         <item quantity="few">%d секунди тому</item>
         <item quantity="many">%d секунд тому</item>
         <item quantity="other">%d секунд тому</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d хвилину тому</item>
         <item quantity="few">%d хвилини тому</item>
         <item quantity="many">%d хвилин тому</item>
         <item quantity="other">%d хвилин тому</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d годину тому</item>
         <item quantity="few">%d години тому</item>
         <item quantity="many">%d годин тому</item>
         <item quantity="other">%d годин тому</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d день тому</item>
         <item quantity="few">%d дні тому</item>
         <item quantity="many">%d днів тому</item>
         <item quantity="other">%d днів тому</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d рік тому</item>
         <item quantity="few">%d роки тому</item>
         <item quantity="many">%d років тому</item>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
deleted file mode 100644
index fbb4ea62..00000000
--- a/app/src/main/res/values-v23/styles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Aegis.Light.NoActionBar">
-        <item name="android:statusBarColor">?attr/background</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-
-    <style name="Theme.Aegis.Dark.Default">
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-
-    <style name="Theme.Aegis.Dark.NoActionBar">
-        <item name="android:statusBarColor">?attr/background</item>
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-
-    <style name="Theme.Aegis.TrueDark.Default">
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-
-    <style name="Theme.Aegis.TrueDark.NoActionBar">
-        <item name="android:statusBarColor">?attr/background</item>
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
deleted file mode 100644
index 8c5deede..00000000
--- a/app/src/main/res/values-v27/styles.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<resources>
-    <style name="Theme.Aegis.Light.Default">
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightNavigationBar">true</item>
-    </style>
-
-    <style name="Theme.Aegis.Light.NoActionBar">
-        <item name="android:statusBarColor">?attr/background</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightNavigationBar">true</item>
-    </style>
-
-    <style name="Theme.Aegis.Dark.Default">
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
-
-    <style name="Theme.Aegis.Dark.NoActionBar">
-        <item name="android:statusBarColor">?attr/background</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
-
-    <style name="Theme.Aegis.TrueDark.Default">
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
-
-    <style name="Theme.Aegis.TrueDark.NoActionBar">
-        <item name="android:statusBarColor">?attr/background</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">?attr/background</item>
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
new file mode 100644
index 00000000..49da4dd9
--- /dev/null
+++ b/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,22 @@
+<resources>
+    <style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Aegis.Dark" parent="Base.Theme.Aegis.Dark">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Aegis.Amoled" parent="Base.Theme.Aegis.Amoled">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-vi-rVN-v29/strings.xml b/app/src/main/res/values-vi-rVN-v29/strings.xml
new file mode 100644
index 00000000..12b11722
--- /dev/null
+++ b/app/src/main/res/values-vi-rVN-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">Giống hệ thống</string>
+    <string name="system_amoled_theme_title">Giống hệ thống (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 3b7e965d..a46123c6 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -1,156 +1,236 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">Cài đặt</string>
     <string name="action_about">Giới thiệu</string>
     <string name="action_delete">Xóa</string>
     <string name="action_transfer">Truyền</string>
-    <string name="action_edit_icon">Chỉnh sửa biểu tượng</string>
+    <string name="action_edit_icon">Sửa biểu tượng</string>
     <string name="action_reset_usage_count">Đặt lại số lần sử dụng</string>
-    <string name="action_reset_usage_count_dialog">Bạn có chắc bạn muốn đặt số lần sử dụng của mục này về 0 không?</string>
-    <string name="action_default_icon">Quay về logo mặc định</string>
-    <string name="discard">Huỷ thay đổi</string>
+    <string name="action_reset_usage_count_dialog">Bạn có chắc muốn đặt lại số lần sử dụng của mục này về 0?</string>
+    <string name="action_default_icon">Dùng biểu tượng mặc định</string>
+    <string name="discard">Không đổi</string>
     <string name="save">Lưu</string>
-    <string name="issuer">Người cấp</string>
+    <string name="all">Tất cả</string>
+    <string name="issuer">Dịch vụ</string>
     <string name="yandex_pin">PIN (4–16 chữ số)</string>
     <string name="motp_pin">PIN (4 chữ số)</string>
-    <string name="suggested">Được đề xuất</string>
+    <string name="suggested">Đề xuất</string>
     <string name="usage_count">Số lần sử dụng</string>
     <string name="warning">Cảnh báo</string>
     <string name="pref_cat_appearance_app">Ứng dụng</string>
     <string name="pref_cat_appearance_entries">Mục</string>
     <string name="pref_cat_backups_android">Android</string>
     <string name="pref_cat_backups_auto">Sao lưu tự động</string>
-    <string name="pref_section_behavior_title">Hành vi</string>
-    <string name="pref_section_behavior_summary">Tuỳ chỉnh hành vi khi tương tác với danh sách các mục.</string>
+    <string name="pref_section_behavior_title">Thao tác</string>
+    <string name="pref_section_behavior_summary">Cách thao tác với danh sách mục.</string>
     <string name="pref_section_appearance_title">Giao diện</string>
-    <string name="pref_section_appearance_summary">Chỉnh sửa chủ đề màu, ngôn ngữ và các cài đặt khác liên quan đến giao diện của ứng dụng.</string>
+    <string name="pref_section_appearance_summary">Chủ đề, ngôn ngữ và nhiều hơn.</string>
     <string name="pref_section_security_title">Bảo mật</string>
-    <string name="pref_section_security_summary">Thiết lập mã hoá, mở khoá sinh trắc học, tự động khoá và các cài đặt bảo mật khác.</string>
-    <string name="pref_section_import_export_title">Nhập &amp; Xuất</string>
-    <string name="pref_section_import_export_summary">Nhập các bản sao lưu của Aegis hoặc các ứng dụng xác thực khác. Tạo các bản xuất thủ công của kho Aegis của bạn.</string>
+    <string name="pref_section_security_summary">Mã hóa, mở khóa sinh trắc học, tự động khóa và các cài đặt khác.</string>
+    <string name="pref_section_import_export_title">Nhập &amp; xuất</string>
+    <string name="pref_section_import_export_summary">Nhập hoặc xuất các bản sao lưu của Aegis.</string>
+    <string name="pref_section_audit_log_title">Nhật ký</string>
+    <string name="pref_section_audit_log_summary">Danh sách tất cả các sự kiện diễn ra trong ứng dụng.</string>
     <string name="pref_section_backups_title">Sao lưu</string>
-    <string name="pref_section_backups_summary">Thiết lập các bản sao lưu tự động vào một vị trí do bạn chọn hoặc bật hệ thống sao lưu đám mây của Android.</string>
+    <string name="pref_section_backups_summary">Tự động sao lưu vào một nơi do bạn chọn hoặc bật hệ thống sao lưu trên mây Android.</string>
     <string name="pref_section_icon_packs">Gói biểu tượng</string>
-    <string name="pref_section_icon_packs_summary">Quản lý và nhập các gói biểu tượng</string>
+    <string name="pref_section_icon_packs_summary">Quản lý và nhập gói biểu tượng.</string>
     <string name="pref_select_theme_title">Chủ đề</string>
+    <string name="pref_dynamic_colors_title">Màu tương thích</string>
+    <string name="pref_dynamic_colors_summary">Theo màu sắc chủ đề Android</string>
     <string name="pref_view_mode_title">Chế độ xem</string>
     <string name="pref_lang_title">Ngôn ngữ</string>
+    <string name="pref_show_icons_title">Hiện biểu tượng</string>
+    <string name="pref_show_icons_summary">Kế bên mỗi mục</string>
     <string name="pref_code_group_size_title">Gộp nhóm chữ số mã</string>
-    <string name="pref_import_file_title">Nhập từ tệp</string>
-    <string name="pref_import_file_summary">Nhập các token từ một tệp</string>
-    <string name="pref_android_backups_title">Bản sao lưu đám mây của Android</string>
-    <string name="pref_android_backups_summary">Cho phép hệ thống sao lưu đám mây của Android bao gồm kho của Aegis trong các bản sao lưu của nó. Việc này chỉ được hỗ trợ cho các kho được mã hoá.</string>
-    <string name="pref_android_backups_hint"><i>Các bản sao lưu thiết bị đến thiết bị (D2D) luôn được cho phép, không kể đến cài đặt trên</i></string>
+    <string name="pref_code_group_size_summary">Chọn số lượng chữ số để gộp mã</string>
+    <string name="pref_account_name_position_title">Vị trí tên tài khoản</string>
+    <string name="pref_show_next_code_title">Hiện mã kế tiếp</string>
+    <string name="pref_show_next_code_summary">Trước khi mã hiện tại hết hạn</string>
+    <string name="pref_expiration_state_title">Báo mã sắp hết hạn</string>
+    <string name="pref_expiration_state_summary">Thay đổi màu sắc của mã và nhấp nháy</string>
+    <string name="pref_expiration_state_fallback">Thay đổi màu sắc của mã khi mã sắp hết hạn</string>
+    <string name="pref_shared_issuer_account_name_title">Hiện tên tài khoản khi cần</string>
+    <string name="pref_shared_issuer_account_name_summary">Chỉ hiện tên tài khoản khi có cùng dịch vụ. Những tên tài khoản khác sẽ bị ẩn.</string>
+    <string name="pref_account_name_position_summary_override">Cài đặt này bị ghi đè bởi chế độ xem theo ô. Tên tài khoản sẽ hiển thị bên dưới dịch vụ.</string>
+    <string name="pref_import_file_title">Nhập từ tập tin</string>
+    <string name="pref_import_file_summary">Nhập mã từ tập tin</string>
+    <string name="pref_android_backups_title">Sao lưu trên mây Android</string>
+    <string name="pref_android_backups_summary">Cho phép hệ thống sao lưu trên mây Android lưu trữ kho Aegis. Chỉ hỗ trợ các kho được mã hoá.</string>
+    <string name="pref_android_backups_hint"><i>Các bản sao lưu thiết bị (D2D) luôn được cho phép, không kể cài đặt trên</i></string>
     <string name="pref_backups_title">Tự động sao lưu kho</string>
-    <string name="pref_backups_summary">Tự động tạo các bản sao lưu của kho trên bộ nhớ ngoài khi các thay đổi được tạo. Việc này chỉ được hỗ trợ cho các kho được mã hoá.</string>
-    <string name="pref_backups_location_title">Thư mục cho các tệp sao lưu</string>
-    <string name="pref_backups_location_summary">Các bản sao lưu sẽ được lưu trữ tại</string>
-    <string name="pref_backups_trigger_title">Kích hoạt việc sao lưu</string>
-    <string name="pref_backups_trigger_summary">Kích hoạt việc sao lưu theo cách thủ công</string>
-    <string name="pref_backups_versions_title">Số lượng các phiên bản để giữ</string>
+    <string name="pref_backups_summary">Tự động tạo bản sao lưu kho trên bộ nhớ ngoài khi có thay đổi. Chỉ hỗ trợ các kho được mã hóa.</string>
+    <string name="pref_backups_reminder_title">Nhắc nhở sao lưu</string>
+    <string name="pref_backups_reminder_summary">Hiện lời nhắc sao lưu kho của bạn trong trường hợp bạn chưa sao lưu các thay đổi mới nhất.</string>
+    <string name="pref_backups_reminder_dialog_title">Tắt nhắc nhở sao lưu</string>
+    <string name="pref_backups_reminder_dialog_summary">Tắt lời nhắc này có nghĩa là Aegis sẽ không cho bạn biết liệu bạn có những thay đổi chưa được sao lưu hay không. Điều này khiến bạn có nguy cơ mất quyền truy cập vào mã của mình. Bạn có chắc muốn tắt lời nhắc?</string>
+    <string name="pref_backups_versioning_strategy_title">Chiến lược sao lưu</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Nhiều bản sao</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Một bản sao</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">Chiến lược sao lưu được chọn không đáng tin cậy và không được khuyến khích. Một lỗi sao lưu duy nhất có thể dẫn đến mất bản sao lưu duy nhất của bạn.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Chọn chiến lược sao lưu</string>
+    <string name="pref_backups_location_title">Vị trí sao lưu</string>
+    <string name="pref_backups_location_summary">Các bản sao lưu sẽ được lưu vào</string>
+    <string name="pref_backup_location_summary">Bản sao lưu sẽ được lưu vào</string>
+    <string name="pref_backups_trigger_title">Thực hiện sao lưu</string>
+    <string name="pref_backups_trigger_summary">Sao lưu ngay cho tôi</string>
+    <string name="pref_backups_versions_title">Số lượng phiên bản tối đa</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="other">Giữ %1$d phiên bản của bản sao lưu</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Không giới hạn số bản sao lưu</string>
     <string name="pref_import_app_title">Nhập từ ứng dụng</string>
-    <string name="pref_import_app_summary">Nhập các token từ một ứng dụng (yêu cầu truy cập root)</string>
+    <string name="pref_import_app_summary">Nhập mã từ một ứng dụng (yêu cầu truy cập root)</string>
     <string name="pref_export_title">Xuất</string>
     <string name="pref_export_summary">Xuất kho</string>
-    <string name="pref_password_reminder_title">Lời nhắc mật khẩu</string>
-    <string name="pref_google_auth_export_title">Xuất để sử dụng với Google Authenticator</string>
-    <string name="pref_google_auth_export_descriptor">Tạo mã QR xuất có tương thích với Google Authenticator</string>
+    <string name="pref_password_reminder_title">Nhắc mật khẩu</string>
+    <string name="pref_google_auth_export_title">Xuất cho Google Authenticator</string>
+    <string name="pref_google_auth_export_descriptor">Tạo mã QR xuất tương thích với Google Authenticator</string>
     <string name="pref_google_auth_export_no_data">Không có dữ liệu để xuất</string>
     <plurals name="pref_google_auth_export_incompatible_entries">
         <item quantity="other">Đã bỏ qua %d mục không tương thích</item>
     </plurals>
-    <string name="pref_password_reminder_summary">Hiện lời nhắc %s để nhập mật khẩu, để bạn không quên nó.</string>
+    <string name="pref_password_reminder_summary">Nhắc nhập mật khẩu %s để tránh bị quên</string>
     <string name="pref_password_reminder_summary_disabled">Tắt</string>
-    <string name="pref_secure_screen_title">Bảo mật màn hình</string>
-    <string name="pref_secure_screen_summary">Chặn ảnh chụp màn hình và các cố gắng khác để chụp lại màn hình trong ứng dụng</string>
-    <string name="pref_tap_to_reveal_title">Nhấn để hiện ra</string>
-    <string name="pref_tap_to_reveal_summary">Các token sẽ được ẩn theo mặc định. Nhấn vào các token để hiện ra mã.</string>
-    <string name="pref_tap_to_reveal_time_title">Thời gian chờ cho nhấn để hiện ra</string>
+    <string name="pref_secure_screen_title">Bảo vệ màn hình</string>
+    <string name="pref_secure_screen_summary">Chặn chụp ảnh màn hình trong ứng dụng</string>
+    <string name="pref_tap_to_reveal_title">Nhấn để hiện</string>
+    <string name="pref_tap_to_reveal_summary">Ẩn mã, nhấn vào mới hiện</string>
+    <string name="pref_tap_to_reveal_time_title">Thời gian hiển thị mã</string>
     <string name="pref_auto_lock_title">Tự động khóa</string>
     <string name="pref_auto_lock_summary">Khi %s</string>
     <string name="pref_auto_lock_summary_disabled">Tắt</string>
-    <string name="pref_auto_lock_prompt">Tự động khoá Aegis khi</string>
-    <string name="pref_auto_lock_type_back_button">Nút quay lại được nhấn</string>
+    <string name="pref_auto_lock_prompt">Tự động khóa Aegis khi</string>
+    <string name="pref_auto_lock_type_back_button">Nhấn nút quay lại</string>
     <string name="pref_auto_lock_type_minimize">Ứng dụng được thu nhỏ</string>
-    <string name="pref_auto_lock_type_device_lock">Thiết bị bị khoá</string>
-    <string name="pref_backup_password_category">Sao lưu &amp; Xuất</string>
+    <string name="pref_auto_lock_type_device_lock">Thiết bị bị khóa</string>
+    <string name="pref_backup_password_category">Sao lưu &amp; xuất</string>
     <string name="pref_backup_password_title">Mật khẩu riêng cho sao lưu &amp; xuất</string>
-    <string name="pref_backup_password_summary">Nếu bật, mật khẩu dùng để mở khóa ứng dụng không thể được dùng để giải mã các bản sao lưu và bản xuất được nữa.</string>
+    <string name="pref_backup_password_summary">Không dùng chung mật khẩu mở khóa kho</string>
     <string name="pref_backup_password_change_title">Đổi mật khẩu cho sao lưu &amp; xuất</string>
     <string name="pref_backup_password_change_summary">Đặt mật khẩu mới để mã hóa kho khi sao lưu và xuất.</string>
     <string name="pref_encryption_title">Mã hóa</string>
-    <string name="pref_encryption_summary">Mã hoá kho và mở khoá bằng mật khẩu hoặc sinh trắc học</string>
-    <string name="pref_biometrics_title">Mở khoá sinh trắc học</string>
-    <string name="pref_biometrics_summary">Cho phép xác thực sinh trắc học mở khoá kho</string>
+    <string name="pref_encryption_summary">Khóa kho bằng mật khẩu hoặc sinh trắc học</string>
+    <string name="pref_biometrics_title">Sinh trắc học</string>
+    <string name="pref_biometrics_summary">Dùng sinh trắc học để mở khóa kho</string>
+    <string name="pref_search_behavior_summary">Tìm trong: %s</string>
+    <string name="pref_search_behavior_prompt">Tìm trong các mục</string>
+    <string name="pref_search_behavior_type_name">Tên</string>
+    <string name="pref_search_behavior_type_issuer">Dịch vụ</string>
+    <string name="pref_search_behavior_type_note">Ghi chú</string>
+    <string name="pref_search_behavior_type_groups">Nhãn</string>
     <string name="pref_set_password_title">Đổi mật khẩu</string>
-    <string name="pref_set_password_summary">Đặt một mật khẩu mới mà bạn sẽ cần để mở khoá kho</string>
+    <string name="pref_set_password_summary">Đặt mật khẩu mở khóa kho mới</string>
+    <string name="no_events_title">Chưa có</string>
+    <string name="no_events_description">Không có sự kiện nào trong ứng dụng</string>
+    <string name="event_title_vault_unlocked">Mở khóa kho</string>
+    <string name="event_description_vault_unlocked">Đã mở khóa kho thành công</string>
+    <string name="event_title_backup_created">Tạo sao lưu</string>
+    <string name="event_description_backup_created">Đã tạo bản sao kho thành công</string>
+    <string name="event_title_android_backup_created">Tạo sao lưu bằng Android</string>
+    <string name="event_description_android_backup_created">Đã tạo bản sao kho thành công bằng Android</string>
+    <string name="event_title_vault_exported">Xuất kho</string>
+    <string name="event_description_vault_exported">Đã xuất một bản sao kho</string>
+    <string name="event_title_entry_shared">Chia sẻ mục trong kho</string>
+    <string name="event_description_entry_shared">Đã chia sẻ một mục</string>
+    <string name="event_title_vault_unlock_failed_password">Mở khóa kho thất bại (mật khẩu)</string>
+    <string name="event_description_vault_unlock_failed_password">Mở khóa kho bằng mật khẩu thất bại</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Mở khóa kho thất bại (sinh trắc học)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">Mở khóa kho bằng sinh trắc học thất bại</string>
+    <string name="event_unknown">Sự kiện chưa rõ</string>
+    <string name="audit_log_entry_deleted">(đã xóa)</string>
+    <string name="today_at_time">%1$s hôm nay</string>
+    <string name="day_of_week_at_time">%2$s lúc %1$s</string>
     <string name="export_encrypted">Mã hoá kho</string>
-    <string name="export_help">Hành động này sẽ xuất kho ra ngoài bộ nhớ trong của Aegis. Hãy chọn định dạng mà bạn muốn bản xuất của bạn có:</string>
-    <string name="export_warning_unencrypted">Bạn sắp xuất một bản sao không được mã khoá của kho Aegis. <b>Việc này không được khuyên dùng</b>.</string>
+    <string name="export_help">Hành động này sẽ xuất kho ra ngoài bộ nhớ trong của Aegis. Hãy chọn định dạng bản xuất:</string>
+    <string name="export_warning_unencrypted">Bạn sắp xuất một bản sao chưa được mã khóa của kho Aegis. <b>Việc này không được khuyến khích</b>.</string>
+    <string name="export_warning_password">Quá trình xuất được mã hóa bằng mật khẩu riêng được định cấu hình trong cài đặt Bảo mật.</string>
+    <string name="understand_risk_accept">Tôi hiểu rủi ro</string>
     <string name="export_format_aegis">Aegis (.JSON)</string>
-    <string name="export_format_google_auth_uri">Tệp văn bản (.TXT)</string>
+    <string name="export_format_google_auth_uri">Tập tin văn bản thuần (.TXT)</string>
+    <string name="export_format_html">Trang web (.HTML)</string>
     <string name="export_format_hint">Định dạng xuất</string>
+    <string name="export_all_groups">Xuất tất cả nhãn</string>
+    <string name="export_choose_groups">Chọn nhãn để xuất</string>
+    <plurals name="export_groups_selected_count">
+        <item quantity="other">%d nhãn đã chọn</item>
+    </plurals>
+    <string name="export_no_groups_selected">Chưa chọn nhãn để xuất</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Xuất Aegis Authenticator</string>
     <string name="choose_authentication_method">Bảo mật</string>
-    <string name="authentication_method_explanation">Aegis là một ứng dụng Xác thực 2 yếu tố tập trung vào sự bảo mật. Các token được lưu trữ trong một kho có thể được mã hoá bằng một mật khẩu do bạn chọn (không bắt buộc). Nếu một kẻ tấn công nhận được tệp kho đã mã hoá của bạn, họ sẽ không thể truy cập nội dung mà không biết mật khẩu.\n\nChúng tôi đã chọn trước tuỳ chọn mà chúng tôi nghĩ là sẽ phù hợp nhất với thiết bị của bạn.</string>
-    <string name="authentication_method_none">Không có</string>
-    <string name="authentication_method_none_description">Không cần mật khẩu để mở khoá kho và nó sẽ không được mã hoá. <b>Tuỳ chọn này không được khuyên dùng</b>.</string>
+    <string name="authentication_method_explanation">Aegis là ứng dụng xác thực hai yếu tố chú trọng vào bảo mật. Mã xác thực được lưu trong kho và kho này có thể được mã hóa bằng mật khẩu do bạn nhập. Trường hợp kẻ tấn công lấy được tập tin chứa kho này, y không thể truy cập nội dung trong kho nếu không biết mật khẩu.\n\nChúng tôi đã đề xuất tùy chọn phù hợp nhất với thiết bị của bạn.</string>
+    <string name="authentication_method_none">Không</string>
+    <string name="authentication_method_none_description">Kho không được mã hóa và không cần mật khẩu để mở.
+<b>Tùy chọn này không được khuyến khích</b>.</string>
     <string name="authentication_method_password">Mật khẩu</string>
-    <string name="authentication_method_password_description">Cần mật khẩu để mở khoá kho.</string>
-    <string name="authentication_method_password_explanation">Cảnh báo: Nếu bạn quên mật khẩu, bạn sẽ mất quyền truy cập vào các token vĩnh viễn. Không có cách nào để phục hồi chúng mà không có mật khẩu.</string>
+    <string name="authentication_method_password_description">Cần mật khẩu để mở khóa kho.</string>
+    <string name="authentication_method_password_explanation">Cảnh báo: Nếu bạn quên mật khẩu, sẽ không có cách để truy cập các mã xác thực. Khôi phục không cần mật khẩu là chuyện trong mơ.</string>
     <string name="authentication_method_biometrics">Sinh trắc học</string>
-    <string name="authentication_method_biometrics_description">Bên cạnh mật khẩu, thì sinh trắc học đã được đăng ký trên thiết bị, như vân tay hoặc khuôn mặt, có thể được sử dụng để mở khoá kho.</string>
-    <string name="authentication">Mở khoá kho</string>
-    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Mở khoá\nkho</string>
-    <string name="auth_use_biometrics">Hoặc nhấn vào đây để sử dụng <font fgcolor="#FF0D86C1">sinh trắc học</font></string>
+    <string name="authentication_method_biometrics_description">Cùng với mật khẩu, sinh trắc học như vân tay hoặc khuôn mặt được đăng ký trên thiết bị có thể được dùng để mở khóa kho.</string>
+    <string name="authentication">Mở khóa kho</string>
+    <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">Mở khóa\nkho</string>
+    <string name="auth_use_biometrics">Nhấn vào đây để đổi sang <font fgcolor="#FF0D86C1">sinh trắc học</font></string>
     <string name="set_password">Vui lòng nhập mật khẩu</string>
-    <string name="set_group">Vui lòng nhập tên nhóm</string>
+    <string name="set_group">Vui lòng nhập tên nhãn</string>
     <string name="set_number">Vui lòng nhập số</string>
-    <string name="set_password_confirm">Vui lòng xác nhận mật khẩu</string>
-    <string name="invalid_password">Mật khẩu không chính xác</string>
-    <string name="invalidated_biometrics">Đã phát hiện một thay đổi trong cài đặt bảo mật của thiết bị. Vui lòng đi đến \"Aegis &gt; Cài đặt &gt; Bảo mật &gt; Mở khoá sinh trắc học\" để tắt và bật lại mở khoá sinh trắc học.</string>
+    <string name="set_password_confirm">Xác nhận lại mật khẩu</string>
+    <string name="invalid_password">Mật khẩu không đúng</string>
+    <string name="invalidated_biometrics">Đã phát hiện một thay đổi trong cài đặt bảo mật của thiết bị. Vui lòng đi đến \"Aegis &gt; Cài đặt &gt; Bảo mật &gt; Mở khóa sinh trắc học\" để tắt và bật lại mở khóa sinh trắc học.</string>
+    <string name="password_reminder">Vui lòng nhập mật khẩu. Chúng tôi thỉnh thoảng hỏi điều này để cho bạn không quên mật khẩu.</string>
+    <string name="password_reminder_dialog_title">Mở khóa sinh trắc học theo mặc định</string>
+    <string name="password_reminder_dialog_message">Thỉnh thoảng chúng tôi nhắc bạn nhập mật khẩu để đảm bảo bạn không quên mật khẩu và không mất quyền truy cập vào kho của mình. Sau khi nhập mật khẩu của bạn, Aegis sẽ mặc định quay lại mở khóa sinh trắc học cho đến khi đến lần nhắc tiếp theo.</string>
     <string name="password_reminder_freq_never">Không bao giờ</string>
-    <string name="password_reminder_freq_weekly">Hàng tuần</string>
-    <string name="password_reminder_freq_biweekly">Hai tuần một lần</string>
+    <string name="password_reminder_freq_weekly">Hằng tuần</string>
+    <string name="password_reminder_freq_biweekly">Nửa tháng</string>
     <string name="password_reminder_freq_monthly">Hàng tháng</string>
-    <string name="password_reminder_freq_quarterly">Hàng quý</string>
-    <string name="enter_password_2fas_message">Có vẻ là bản sao lưu 2FAS này được mã hóa. Vui lòng nhập mật khẩu ở dưới.</string>
-    <string name="enter_password_authy_message">Có vẻ như các token Authy của bạn đã được mã hoá. Vui lòng đóng Aegis, mở Authy và mở khoá các token bằng mật khẩu của bạn. Thay vào đó, Aegis cũng có thể thử giải mã các token Authy cho bạn, nếu bạn nhập mật khẩu ở dưới.</string>
-    <string name="enter_password_aegis_title">Vui lòng nhập mật khẩu nhập</string>
-    <string name="period_hint">Khoảng thời gian (giây)</string>
-    <string name="algorithm_hint">Chức năng hash</string>
+    <string name="password_reminder_freq_quarterly">Mỗi ba tháng</string>
+    <string name="enter_password_2fas_message">Bản sao lưu 2FAS này được mã hóa. Vui lòng nhập mật khẩu ở dưới.</string>
+    <string name="enter_password_authy_message">Các mã Authy của bạn đã được mã hóa. Vui lòng đóng Aegis, mở Authy và mở khóa các mã bằng mật khẩu của bạn. Bên cạnh đó, Aegis cũng có thể thử giải các mã Authy cho bạn, nếu bạn nhập mật khẩu ở dưới.</string>
+    <string name="enter_password_aegis_title">Vui lòng nhập mật khẩu để nhập</string>
+    <string name="period_hint">Đếm ngược (s)</string>
+    <string name="algorithm_hint">Hàm băm</string>
     <string name="type">Loại</string>
     <string name="share">Chia sẻ</string>
     <string name="yes">Có</string>
     <string name="no">Không</string>
-    <string name="unlock">Mở khoá</string>
+    <string name="undo">Hoàn tác</string>
+    <string name="unlock">Mở khóa</string>
     <string name="advanced">Nâng cao</string>
     <string name="counter">Đếm</string>
     <string name="digits">Chữ số</string>
     <string name="secret">Bí mật</string>
     <string name="scan">Quét mã QR</string>
-    <string name="scan_image">Quét hình ảnh</string>
+    <string name="scan_image">Quét ảnh</string>
     <string name="enter_manually">Nhập thủ công</string>
-    <string name="set_up_biometric">Thiết lập mở khoá sinh trắc học</string>
-    <string name="copy">Sao chép</string>
-    <string name="edit">Chỉnh sửa</string>
+    <string name="set_up_biometric">Thiết lập mở khóa sinh trắc học</string>
+    <string name="copy">Chép</string>
+    <string name="edit">Sửa</string>
+    <string name="select_all">Chọn tất cả</string>
+    <string name="assign_icons">Gán biểu tượng</string>
+    <string name="assign_groups">Gán nhãn</string>
+    <string name="assign_groups_dialog_summary">Chọn nhãn muốn gán cho các mục đã chọn.</string>
+    <string name="assign_groups_dialog_dropdown">Chọn nhãn</string>
+    <string name="favorite" comment="Verb">Thích</string>
+    <string name="unfavorite" comment="Verb">Bỏ thích</string>
     <string name="error_all_caps">LỖI</string>
     <string name="password">Mật khẩu</string>
     <string name="confirm_password">Xác nhận mật khẩu</string>
     <string name="show_password">Hiện mật khẩu</string>
     <string name="new_entry">Mục mới</string>
     <string name="add_new_entry">Thêm mục mới</string>
-    <string name="unlock_vault_error">Không thể mở khoá kho</string>
-    <string name="unlock_vault_error_description">Mật khẩu không chính xác. Hãy chắc chắn là bạn không nhập nhầm mật khẩu.</string>
+    <string name="unlock_vault_error">Không thể mở khóa kho</string>
+    <string name="unlock_vault_error_description">Mật khẩu không chính xác. Hãy chắc chắn là bạn không gõ nhầm.</string>
     <string name="password_equality_error">Các mật khẩu nên y hệt nhau và không trống</string>
-    <string name="snackbar_authentication_method">Vui lòng chọn một phương pháp xác thực</string>
+    <string name="snackbar_authentication_method">Vui lòng chọn một phương pháp xác minh</string>
     <string name="encrypting_vault">Đang mã hoá kho</string>
     <string name="exporting_vault">Đang xuất kho</string>
-    <string name="reading_file">Đang đọc tệp</string>
+    <string name="optimizing_icon">Tối ưu hóa biểu tượng</string>
+    <string name="optimizing_icon_multiple">Tối ưu hóa biểu tượng %1$d/%2$d</string>
+    <string name="reading_file">Đang đọc tập tin</string>
+    <string name="requesting_root_access">Yêu cầu truy cập root</string>
     <string name="analyzing_qr">Đang phân tích mã QR</string>
-    <string name="analyzing_qr_multiple">Đang phân tích mã QR %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Đang phân tích mã QR %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="other">Đã thêm %d mục mới vào kho</item>
     </plurals>
@@ -158,202 +238,325 @@
     <string name="delete_entry">Xóa mục</string>
     <string name="delete_entry_description">Bạn có chắc bạn muốn xóa mục này không?</string>
     <string name="delete_entry_explanation">Hành động này không tắt Xác thực 2 yếu tố cho:\n<b>%s</b>\n\nĐể tránh mất quyền truy cập, hãy chắc chắn rằng bạn đã tắt Xác thực 2 yếu tố hoặc bạn có một cách khác để tạo mã cho dịch vụ này.</string>
-    <string name="delete_entries">Xoá các mục</string>
+    <string name="delete_entries">Xóa các mục</string>
     <plurals name="delete_entries_description">
-        <item quantity="other">Bạn có chắc bạn muốn xoá %d mục không?</item>
+        <item quantity="other">Bạn có chắc muốn xóa %d mục?</item>
     </plurals>
     <string name="discard_changes">Bỏ các thay đổi?</string>
     <string name="discard_changes_description">Các thay đổi chưa được lưu</string>
     <string name="saving_profile_error">Lỗi khi lưu hồ sơ</string>
+    <string name="saving_assign_icons_error">Lỗi khi gán biểu tượng</string>
     <string name="welcome">Chào mừng</string>
-    <string name="app_description">Aegis là một ứng dụng Xác thực 2 yếu tố tự do, bảo mật và mã nguồn mở</string>
+    <string name="app_description">Aegis là một ứng dụng xác thực 2 yếu tố tự do, bảo mật và nguồn mở</string>
     <string name="setup_completed">Thiết lập hoàn tất</string>
     <string name="setup_completed_description">Aegis đã được thiết lập và sẵn sàng hoạt động.</string>
     <string name="vault_not_found">Không tìm thấy kho, đang bắt đầu thiết lập…</string>
     <string name="copied">Đã sao chép</string>
     <string name="errors_copied">Đã sao chép các lỗi vào bộ nhớ tạm</string>
     <string name="version_copied">Đã sao chép phiên bản vào bộ nhớ tạm</string>
+    <string name="error_required_field">Mục này bắt buộc phải điền</string>
     <string name="error_occurred">Đã xảy ra lỗi</string>
-    <string name="decryption_error">Đã xảy ra lỗi trong khi cố gắng mở khoá kho</string>
-    <string name="decryption_corrupt_error">Đã xảy ra lỗi trong khi cố gắng mở khoá kho. Tệp kho của bạn có thể là bị hỏng.</string>
-    <string name="saving_error">Đã xảy ra lỗi trong khi cố gắng lưu kho</string>
-    <string name="vault_init_error">Đã xảy ra lỗi trong khi cố gắng khởi tạo kho</string>
-    <string name="vault_load_error">Đã xảy ra lỗi trong khi cố gắng tải kho từ bộ nhớ</string>
-    <string name="biometric_decrypt_error">Đã xảy ra lỗi trong khi cố gắng giải mã kho bằng xác thực sinh trắc học. Điều này thường chỉ xảy ra nếu cài đặt bảo mật của thiết bị đã được thay đổi. Vui lòng mở khoá kho bằng mật khẩu và thiết lập lại xác thực sinh trắc học trong cài đặt của Aegis.</string>
-    <string name="biometric_init_error">Đã xảy ra lỗi trong khi cố gắng chuẩn bị xác thực sinh trắc học. Điều này thường chỉ xảy ra nếu cài đặt bảo mật của thiết bị đã được thay đổi. Vui lòng mở khoá kho bằng mật khẩu và thiết lập lại xác thực sinh trắc học trong cài đặt của Aegis.</string>
-    <string name="disable_encryption">Tắt mã hoá</string>
-    <string name="disable_encryption_description">Bạn có chắc bạn muốn tắt mã hoá không? Việc này sẽ khiến kho được lưu trữ dưới dạng văn bản thuần. <b>Các bản sao lưu tự động cũng sẽ bị tắt</b>.</string>
-    <string name="enable_encryption_error">Đã xảy ra lỗi trong khi bật mã hoá</string>
-    <string name="disable_encryption_error">Đã xảy ra lỗi trong khi tắt mã hoá</string>
-    <string name="backup_successful">Bản sao lưu đã được lên lịch thành công</string>
-    <string name="backup_error">Đã xảy ra lỗi trong khi cố gắng tạo bản sao lưu</string>
-    <string name="documentsui_error">Giao diện Tài liệu có vẻ là bị thiếu trong thiết bị. Đây là một thành phần hệ thống quan trọng cần thiết cho việc chọn và tạo các tài liệu. Nếu bạn đã sử dụng một công cụ để &quot;xoá ứng dụng rác&quot; trong thiết bị, bạn có thể đã vô tình xoá nó và bạn sẽ phải cài đặt lại nó.</string>
-    <string name="icon_pack_import_error">Đã xảy ra lỗi trong khi cố gắng nhập gói biểu tượng</string>
-    <string name="icon_pack_import_exists_error">Gói biểu tượng bạn đang cố gắng nhập đã tồn tại. Bạn có muốn ghi đè lên nó không?</string>
-    <string name="icon_pack_delete_error">Đã xảy ra lỗi trong khi cố gắng xoá gói biểu tượng</string>
+    <string name="decryption_error">Đã xảy ra lỗi trong khi mở khóa kho</string>
+    <string name="decryption_corrupt_error">Đã xảy ra lỗi trong khi mở khóa kho. Tập tin kho của bạn có thể bị hỏng.</string>
+    <string name="saving_error">Đã xảy ra lỗi trong khi lưu kho</string>
+    <string name="vault_init_error">Đã xảy ra lỗi trong khi khởi tạo kho</string>
+    <string name="vault_load_error">Đã xảy ra lỗi trong khi nạp kho từ bộ nhớ</string>
+    <string name="biometric_decrypt_error">Đã xảy ra lỗi trong khi giải mã kho bằng xác minh sinh trắc học. Điều này thường chỉ xảy ra nếu cài đặt bảo mật của thiết bị đã được thay đổi. Vui lòng mở khóa kho bằng mật khẩu và thiết lập lại xác minh sinh trắc học trong cài đặt của Aegis.</string>
+    <string name="biometric_init_error">Đã xảy ra lỗi trong khi chuẩn bị xác minh sinh trắc học. Điều này thường chỉ xảy ra nếu cài đặt bảo mật của thiết bị đã được thay đổi. Vui lòng mở khóa kho bằng mật khẩu và thiết lập lại xác minh sinh trắc học trong cài đặt của Aegis.</string>
+    <string name="disable_encryption">Tắt mã hóa</string>
+    <string name="disable_encryption_description">Bạn có chắc muốn tắt mã hóa không? Làm vậy sẽ khiến kho được lưu trữ dưới dạng văn bản thuần. <b>Sao lưu tự động cũng sẽ bị tắt</b>.</string>
+    <string name="enable_encryption_error">Đã xảy ra lỗi trong khi bật mã hóa</string>
+    <string name="disable_encryption_error">Đã xảy ra lỗi trong khi tắt mã hóa</string>
+    <string name="backup_successful">Đã lên lịch sao lưu thành công</string>
+    <string name="backup_error">Đã xảy ra lỗi trong khi tạo bản sao lưu</string>
+    <string name="backup_status_success">Sao lưu thành công gần đây: %s</string>
+    <string name="backup_status_failed">Sao lưu thất bại gần đây: %s</string>
+    <string name="backup_status_none">Chưa có bản sao lưu</string>
+    <string name="backup_warning_password">Quá trình sao lưu được mã hóa bằng mật khẩu riêng được định cấu hình trong cài đặt Bảo mật</string>
+    <string name="documentsui_error">Giao diện Tài liệu có vẻ bị thiếu trong thiết bị. Đây là một thành phần hệ thống quan trọng cần thiết cho việc chọn và tạo các tài liệu. Nếu bạn đã sử dụng một công cụ để &quot;xóa ứng dụng rác&quot; trong thiết bị, có thể bạn đã vô tình xóa nó và bạn sẽ cần cài đặt lại.</string>
+    <string name="icon_pack_import_error">Đã xảy ra lỗi trong khi nhập gói biểu tượng</string>
+    <string name="icon_pack_import_exists_error">Gói biểu tượng bạn đang nhập đã tồn tại. Bạn có muốn ghi đè lên nó không?</string>
+    <string name="icon_pack_delete_error">Đã xảy ra lỗi trong khi xóa gói biểu tượng</string>
     <plurals name="icon_pack_info">
         <item quantity="other">%d biểu tượng</item>
     </plurals>
     <string name="icon_custom">Tùy chỉnh</string>
     <string name="permission_denied">Quyền bị từ chối</string>
-    <string name="andotp_new_format">Định dạng mới (v0.6.3 hoặc mới hơn) </string>
-    <string name="andotp_old_format">Định dạng cũ (v0.6.2 hoặc cũ hơn) </string>
-    <string name="choose_andotp_importer">Tệp sao lưu andOTP có định dạng nào?</string>
-    <string name="choose_totpauth_importer">Bản sao lưu TOTP Authenticator này có được mã hoá bằng mật khẩu không?</string>
+    <string name="andotp_new_format">Định dạng mới (v0.6.3 trở lên) </string>
+    <string name="andotp_old_format">Định dạng cũ (v0.6.2 trở xuống) </string>
+    <string name="choose_andotp_importer">Tập tin sao lưu andOTP sử dụng định dạng nào?</string>
+    <string name="choose_totpauth_importer">Bản sao lưu TOTP Authenticator này có được mã hóa bằng mật khẩu không?</string>
     <string name="choose_application">Chọn ứng dụng mà bạn muốn nhập từ đó</string>
-    <string name="choose_theme">Chọn chủ đề mong muốn của bạn</string>
-    <string name="choose_view_mode">Chọn chế độ xem mong muốn của bạn</string>
-    <string name="parsing_file_error">Đã xảy ra lỗi trong khi cố gắng xử lý tệp</string>
-    <string name="file_not_found">Lỗi: Không tìm thấy tệp</string>
-    <string name="reading_file_error">Đã xảy ra lỗi trong khi cố gắng đọc tệp</string>
+    <string name="choose_theme">Chọn chủ đề bạn thích</string>
+    <string name="choose_account_name_position">Chọn vị trí tên tài khoản mà bạn thích</string>
+    <string name="choose_view_mode">Chọn chế độ xem bạn thích</string>
+    <string name="choose_copy_behavior">Chọn thao tác sao chép mà bạn thích</string>
+    <string name="parsing_file_error">Đã xảy ra lỗi trong khi xử lý file</string>
+    <string name="file_not_found">Lỗi: Không tìm thấy tập tin</string>
+    <string name="reading_file_error">Đã xảy ra lỗi trong khi đọc tập tin</string>
     <string name="app_lookup_error">Lỗi: Ứng dụng không được cài đặt</string>
+    <string name="app_version_error">Phiên bản %s không được hỗ trợ. Các phiên bản gần đây đã bắt đầu mã hóa một số tập tin trong thư mục lưu trữ nội bộ, khiến Aegis không thể truy cập thông tin cần thiết để nhập. Việc cố gắng nhập có thể dẫn đến lỗi. Bạn vẫn muốn tiếp tục?</string>
+    <string name="root_error">Lỗi: Không thể nhận quyền truy cập root</string>
     <plurals name="imported_entries_count">
         <item quantity="other">Đã nhập %d mục</item>
     </plurals>
+    <plurals name="entries_shown">
+        <item quantity="other">Tổng cộng %d mục</item>
+    </plurals>
     <string name="intro_import_error_title">Đã xảy ra lỗi trong khi nhập kho</string>
     <string name="import_error_title">Đã xảy ra một hoặc nhiều lỗi trong khi nhập</string>
-    <string name="exporting_vault_error">Đã xảy ra lỗi trong khi cố gắng xuất kho</string>
+    <string name="exporting_vault_error">Đã xảy ra lỗi trong khi xuất kho</string>
     <string name="exported_vault">Kho đã được xuất</string>
-    <string name="encryption_set_password_error">Đã xảy ra lỗi trong khi cố gắng đặt mật khẩu.</string>
-    <string name="encryption_enable_biometrics_error">Đã xảy ra lỗi trong khi cố gắng bật mở khoá sinh trắc học. Một số thiết bị có xác thực sinh trắc học được thêm vào rất kém chất lượng và có khả năng là thiết bị của bạn là một trong số chúng. Hãy cân nhắc việc chuyển sang thiết lập chỉ dùng mật khẩu.</string>
-    <string name="no_cameras_available">Không có máy ảnh nào có sẵn</string>
-    <string name="read_qr_error">Đã xảy ra lỗi trong khi cố gắng đọc mã QR</string>
-    <string name="read_qr_error_phonefactor">Aegis không tương thích với thuật toán Xác thực 2 yếu tố độc quyền của Microsoft. Vui lòng chắc chắn là bạn chọn \"Thiết lập ứng dụng không có thông báo\" khi thiết lập Xác thực 2 yếu tố trong Office 365.</string>
-    <string name="authentication_method_raw">Thô</string>
-    <string name="unlocking_vault">Đang mở khoá kho</string>
-    <string name="slot_this_device">(thiết bị này)</string>
-    <string name="remove_group">Xoá nhóm</string>
-    <string name="remove_group_description">Bạn có chắc bạn muốn xoá nhóm này không? Các mục trong nhóm này sẽ tự động chuyển thành \"Không có nhóm\".</string>
-    <string name="remove_icon_pack">Xoá gói biểu tượng</string>
-    <string name="remove_icon_pack_description">Bạn có chắc bạn muốn xoá gói biểu tượng này không? Các mục sử dụng biểu tượng trong gói này sẽ không bị ảnh hưởng.</string>
+    <string name="encryption_set_password_error">Đã xảy ra lỗi trong khi đặt mật khẩu.</string>
+    <string name="encryption_enable_biometrics_error">Đã xảy ra lỗi trong khi bật mở khóa sinh trắc học. Một số thiết bị có xác minh sinh trắc học rất kém chất lượng và có khả năng là thiết bị của bạn là một trong số chúng. Hãy cân nhắc việc chuyển sang thiết lập chỉ dùng mật khẩu.</string>
+    <string name="no_cameras_available">Không có sẵn camera</string>
+    <string name="read_qr_error">Đã xảy ra lỗi trong khi đọc mã QR</string>
+    <string name="read_qr_error_phonefactor">Aegis không tương thích với thuật toán Xác minh 2 bước độc quyền của Microsoft. Vui lòng chắc chắn là bạn chọn \"Thiết lập ứng dụng không có thông báo\" khi thiết lập Xác minh 2 bước trong Office 365.</string>
+    <string name="partial_google_auth_import">Đã phát hiện quá trình xuất Google Authenticator chưa hoàn tất</string>
+    <string name="partial_google_auth_import_warning">Một số mã QR bị thiếu trong quá trình nhập. Không tìm thấy các mã sau:\n\n<b>%s</b>\n\nBạn có thể tiếp tục nhập bản xuất này nhưng chúng tôi khuyên bạn nên thử lại với tất cả các mã QR để không có nguy cơ mất quyền truy cập vào bất kỳ mã nào.</string>
+    <string name="missing_qr_code_descriptor">• Mã QR %d</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="other">Vẫn cứ nhập %d mã</item>
+    </plurals>
+    <string name="import_google_auth_failure">Quá trình xuất Google Authenticator thất bại</string>
+    <string name="unrelated_google_auth_batches_error">Bản xuất chứa thông tin về một batch không liên quan. Hãy thử nhập 1 batch mỗi lần.</string>
+    <string name="no_tokens_can_be_imported">Do đó, không thể nhập mã nào</string>
+    <string name="unlocking_vault">Đang mở khóa kho</string>
+    <string name="rename_group">Đổi tên nhóm</string>
+    <string name="no_group_selection">Nếu một mục không thuộc bất kỳ nhóm nào, nó sẽ ở trong \"Chưa có nhóm\".</string>
+    <string name="remove_group">Xóa nhãn</string>
+    <string name="remove_group_description">Bạn có chắc muốn xóa nhãn này? Các mục trong nhãn này sẽ tự động chuyển thành \"Không nhãn\".</string>
+    <string name="remove_unused_groups">Xóa nhãn không dùng</string>
+    <string name="remove_unused_groups_description">Bạn có chắc muốn xóa tất cả nhãn trống không?</string>
+    <string name="remove_icon_pack">Xóa gói biểu tượng</string>
+    <string name="remove_icon_pack_description">Bạn có chắc muốn xóa gói biểu tượng này? Các mục sử dụng biểu tượng trong gói này sẽ không bị ảnh hưởng.</string>
     <string name="details">Chi tiết</string>
-    <string name="lock">Khoá</string>
+    <string name="show_error_details">Xem thông tin lỗi</string>
+    <string name="lock">Khóa</string>
     <string name="name">Tên</string>
-    <string name="no_group">Không có nhóm</string>
-    <string name="sort">Sắp xếp</string>
-    <string name="sort_alphabetically">Người cấp (A đến Z)</string>
-    <string name="sort_alphabetically_reverse">Người cấp (Z đến A)</string>
-    <string name="sort_alphabetically_name">Tài khoản (A đến Z)</string>
-    <string name="sort_alphabetically_name_reverse">Tài khoản (Z đến A)</string>
+    <string name="no_group">Không</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sắp xếp</string>
+    <string name="sort_alphabetically">Dịch vụ (A → Z)</string>
+    <string name="sort_alphabetically_reverse">Dịch vụ (Z → A)</string>
+    <string name="sort_alphabetically_name">Tài khoản (A → Z)</string>
+    <string name="sort_alphabetically_name_reverse">Tài khoản (Z → A)</string>
     <string name="sort_usage_count">Số lần sử dụng</string>
+    <string name="sort_last_used">Lần dùng cuối</string>
     <string name="sort_custom">Tùy chỉnh</string>
-    <string name="new_group">Nhóm mới…</string>
-    <string name="group">Nhóm</string>
-    <string name="group_name_hint">Tên nhóm</string>
-    <string name="preference_manage_groups">Chỉnh sửa nhóm</string>
-    <string name="preference_manage_groups_summary">Quản lý và xoá các nhóm của bạn ở đây</string>
+    <string name="last_used">Dùng lần cuối</string>
+    <string name="last_used_never">chưa từng</string>
+    <string name="new_group">Nhãn mới…</string>
+    <string name="group">Nhãn</string>
+    <string name="group_name_hint">Tên nhãn</string>
+    <string name="preference_manage_groups">Quản lý nhãn</string>
+    <string name="preference_manage_groups_summary">Chỉnh sửa hoặc xóa các nhãn</string>
     <string name="preference_reset_usage_count">Đặt lại số lần sử dụng</string>
-    <string name="preference_reset_usage_count_summary">Đặt lại số lần sử dụng của mọi mục trong kho của bạn</string>
-    <string name="preference_reset_usage_count_dialog">Bạn có chắc bạn muốn đặt số lần sử dụng của mọi mục trong kho của bạn về 0 không?</string>
-    <string name="note">Chú thích</string>
-    <string name="clear">Xoá</string>
-    <string name="pref_highlight_entry_title">Đánh dấu các token khi được nhấn vào</string>
-    <string name="pref_highlight_entry_summary">Làm cho các token dễ phân biệt với nhau hơn bằng cách tạm thời đánh dấu chúng khi được nhấn vào</string>
-    <string name="pref_pause_entry_title">Đóng băng các token khi được nhấn vào</string>
-    <string name="pref_pause_entry_summary">Tạm dừng làm mới tự động các token bằng cách nhấn vào chúng. Các token sẽ không cập nhật khi chúng được tập trung vào. Bắt buộc phải có \"Đánh dấu các token khi được nhấn vào\" hoặc \"Nhấn để hiện ra\".</string>
+    <string name="preference_reset_usage_count_summary">Đối với mọi mục trong kho</string>
+    <string name="preference_reset_usage_count_dialog">Bạn có chắc muốn đặt số lần sử dụng của mọi mục trong kho của bạn về 0 không?</string>
+    <string name="note" comment="Users can add a note to an entry">Chú thích</string>
+    <string name="clear">Xóa</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Trùng lặp mục</string>
+    <string name="dialog_duplicate_entry_message">Mục này có cùng tên và dịch vụ với một hoặc nhiều mục hiện có. Bạn muốn tiếp tục như thế nào?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Ghi đè lên các mục đã tồn tại</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Thay thế mục hiện có bằng mục mới. Hành động này không thể hoàn tác</string>
+    <string name="dialog_duplicate_entry_suffix_title">Thêm hậu tố</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Thêm hậu tố vào tên của mục mới này. Tên mới sẽ là: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Hủy lưu</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Cho phép bạn chỉnh sửa mục trước khi lưu lại</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="other">Bạn có chắc muốn xóa %d mục có tên sau:\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Xác nhận xóa</string>
+    <string name="pref_haptic_feedback_summary">Rung thiết bị khi mã được làm mới</string>
+    <string name="pref_haptic_feedback_title">Phản hồi rung</string>
+    <string name="pref_highlight_entry_title">Làm nổi bật mã khi nhấn vào</string>
+    <string name="pref_highlight_entry_summary">Giúp các mã dễ phân biệt với nhau hơn</string>
+    <string name="pref_groups_multiselect_title">Chọn nhiều nhãn</string>
+    <string name="pref_groups_multiselect_summary">Cho phép chọn nhiều nhãn cùng lúc</string>
+    <string name="pref_minimize_on_copy_title">Thu nhỏ ứng dụng</string>
+    <string name="pref_minimize_on_copy_summary">Sau khi sao chép một mã</string>
+    <string name="pref_copy_behavior_title">Lưu mã vào bộ nhớ tạm</string>
+    <string name="pref_search_behavior_title">Hành vi tìm kiếm</string>
+    <string name="pref_pause_entry_title">Đóng băng mã khi nhấn vào</string>
+    <string name="pref_pause_entry_summary">Không tự động tạo mã tiếp theo nữa</string>
     <string name="pin_keyboard_description">Nhập mật khẩu để bật bàn phím mã PIN. Lưu ý rằng việc này chỉ được nếu mật khẩu của bạn chỉ chứa các chữ số</string>
     <string name="pin_keyboard_error">Lỗi khi bật bàn phím mã PIN</string>
     <string name="pin_keyboard_error_description">Không thể đặt bàn phím mã PIN. Mật khẩu của bạn phải chỉ chứa các chữ số.</string>
     <string name="pin_keyboard_disabled">Mật khẩu đã thay đổi. Bàn phím mã PIN sẽ không được hiện nữa.</string>
-    <string name="selected">Đã chọn</string>
-    <string name="dark_theme_title">Chủ đề tối</string>
-    <string name="light_theme_title">Chủ đề sáng</string>
-    <string name="amoled_theme_title">Chủ đề AMOLED</string>
-    <string name="system_theme_title">Đặt theo Trình tiết kiệm pin</string>
-    <string name="system_amoled_theme_title">Đặt theo Trình tiết kiệm pin (AMOLED)</string>
+    <string name="selected">Đang dùng</string>
+    <string name="dark_theme_title">Tối</string>
+    <string name="light_theme_title">Sáng</string>
+    <string name="amoled_theme_title">AMOLED</string>
+    <string name="system_theme_title">Mặc định hệ thống</string>
+    <string name="system_amoled_theme_title">Mặc định hệ thống (AMOLED)</string>
     <string name="normal_viewmode_title">Bình thường</string>
-    <string name="compact_mode_title">Thu gọn</string>
+    <string name="compact_mode_title">Gọn gàng</string>
     <string name="small_mode_title">Nhỏ</string>
-    <string name="unknown_issuer">Người cấp không xác định</string>
+    <string name="tiles_mode_title">Ô</string>
+    <string name="unknown_issuer">Dịch vụ chưa rõ</string>
     <string name="unknown_account_name">Tên tài khoản không xác định</string>
     <plurals name="import_error_dialog">
-        <item quantity="other">Aegis không thể nhập %d token. Các token đó sẽ bị bỏ qua. Hãy nhấn \'Chi tiết\' để xem thêm thông tin về các lỗi.</item>
+        <item quantity="other">Aegis không thể nhập %d mã. Các mã đó sẽ bị bỏ qua. Nhấn \'Chi tiết\' để xem thêm thông tin về lỗi.</item>
     </plurals>
+    <string name="unable_to_process_deeplink">Không thể xử lý deep link</string>
+    <string name="unable_to_read_qrcode_file">Không thể đọc và xử lý mã QR từ tập tin: %s.</string>
+    <string name="unable_to_process_shared_text">Không thể xử lý văn bản được chia sẻ dưới dạng OTP</string>
+    <string name="unable_to_read_qrcode_files">Không thể đọc và xử lý vài mã QR. Chỉ %1$d/%2$d mục sẽ được nhập.</string>
     <string name="unable_to_generate_qrcode">Không thể tạo mã QR</string>
     <string name="select_picture">Chọn ảnh</string>
     <string name="select_icon">Chọn biểu tượng</string>
-    <string name="toggle_checkboxes">Bật/tắt các ô đánh dấu</string>
+    <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">Mở kho</string>
+    <string name="tile_open_scanner" comment="label for a quick settings tile that opens the QR code scanner when tapped">Mở trình quét</string>
+    <string name="toggle_checkboxes">Đánh dấu các hộp kiểm</string>
     <string name="search">Tìm kiếm</string>
-    <string name="channel_name_lock_status">Trạng thái khoá</string>
-    <string name="channel_description_lock_status">Aegis có thể tạo một thông báo liên tục để báo cho bạn khi kho được khoá</string>
-    <string name="vault_unlocked_state">Kho được mở khoá. Nhấn vào đây để khoá.</string>
+    <string name="channel_name_lock_status">Trạng thái khóa</string>
+    <string name="channel_description_lock_status">Aegis có thể tạo một thông báo liên tục để báo cho bạn khi kho được khóa</string>
+    <string name="vault_unlocked_state">Đã mở khóa kho. Nhấn vào đây để khóa.</string>
     <string name="version">Phiên bản</string>
-    <string name="changelog">Nhật ký thay đổi</string>
+    <string name="changelog">Changelog</string>
     <string name="whats_new">Có gì mới</string>
-    <string name="github_description">Mã nguồn, vấn đề và thông tin</string>
+    <string name="github_description">Mã nguồn và báo lỗi</string>
     <string name="license">Giấy phép</string>
-    <string name="license_description">Trình xác thực Aegis được cấp phép dưới GPLv3</string>
+    <string name="license_description">Aegis Authenticator sử dụng giấy phép GPLv3</string>
     <string name="third_party_licenses">Giấy phép bên thứ ba</string>
-    <string name="third_party_licenses_description">Các giấy phép của các thư viện bên thứ ba mà Aegis sử dụng</string>
+    <string name="third_party_licenses_description">Các thư viện nguồn mở mà Aegis sử dụng</string>
     <string name="country_netherlands">Hà Lan</string>
-    <string name="email_us">Viết email</string>
-    <string name="visit_website">Đi đến trang web của chúng tôi</string>
+    <string name="email_us">Gửi email</string>
+    <string name="visit_website">Trang chủ</string>
     <string name="about_support">Hỗ trợ</string>
     <string name="support_rate">Đánh giá</string>
-    <string name="support_rate_description">Hỗ trợ chúng tôi bằng cách để lại một bài đánh giá trong Cửa hàng Google Play</string>
-    <string name="webview_error">Thiết bị này không hỗ trợ WebView, nó là cần thiết để xem nhật ký thay đổi và giấy phép. Thiết bị đang thiếu một thành phần hệ thống.</string>
+    <string name="support_rate_description">Đánh giá trên Cửa hàng Google Play</string>
+    <string name="webview_error">Thiết bị này không hỗ trợ WebView, nó là cần thiết để xem changelog và giấy phép. Đây là một thành phần hệ thống.</string>
     <string name="email">Email</string>
-    <string name="time_sync_warning_title">Tự động đồng bộ hoá thời gian</string>
-    <string name="time_sync_warning_message">Aegis dựa vào việc thời gian hệ thống được đồng bộ để tạo các mã chính xác. Một sự sai lệch chỉ vài giây cũng có thể dẫn đến các mã không chính xác. Có vẻ như thiết bị của bạn không được thiết lập tự động đồng bộ hoá thời gian. Bạn có muốn làm vậy luôn không?</string>
+    <string name="time_sync_warning_title">Tự đồng bộ thời gian</string>
+    <string name="time_sync_warning_message">Aegis dựa vào việc thời gian hệ thống được đồng bộ để tạo các mã chính xác. Một sự sai lệch chỉ vài giây cũng có thể dẫn đến các mã không chính xác. Có vẻ như thiết bị của bạn không được thiết lập tự đồng bộ thời gian. Bạn có muốn bật tính năng này?</string>
     <string name="time_sync_warning_disable">Đừng cảnh báo tôi nữa. Tôi biết tôi đang làm gì.</string>
     <string name="google_qr_export_unrelated">Đã tìm thấy mã QR không liên quan. Hãy thử khởi động lại trình quét.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="other">Đã quét %d/%d mã QR</item>
+        <item quantity="other">Đã quét %1$d/%2$d mã QR</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Đã mong đợi mã QR #%d, nhưng thay vào đó đã quét #%d</string>
-    <string name="backup_error_bar_message"><b>Sao lưu kho thất bại vào gần đây</b></string>
-    <string name="switch_camera">Chuyển máy ảnh</string>
-    <string name="empty_list">Không có mã nào để hiện. Hãy bắt đầu thêm các mục bằng cách nhấn vào ký hiệu dấu cộng ở góc dưới bên phải</string>
-    <string name="empty_list_title">Không tìm thấy mục nào</string>
-    <string name="empty_group_list">Không có nhóm nào để hiện. Hãy thêm các nhóm trong màn hình chỉnh sửa của một mục</string>
-    <string name="empty_group_list_title">Không tìm thấy nhóm nào</string>
-    <string name="no_icon_packs">Chưa có gói biểu tượng nào được nhập. Hãy nhấn vào ký hiệu dấu cộng để nhập một gói. Mẹo: hãy thử <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
-    <string name="no_icon_packs_title">Không có gói biểu tượng</string>
+    <string name="google_qr_export_unexpected">Dự định quét mã QR #%1$d, nhưng thay vào đó đã quét #%2$d</string>
+    <string name="backup_error_bar_message"><b>Sao lưu kho thất bại</b></string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Một bản sao lưu kho gần đây bằng cách sử dụng %1$s đã thất bại. Bản sao lưu đã thử %2$s. Vui lòng kiểm tra cài đặt sao lưu của bạn để đảm bảo quá trình sao lưu có thể hoàn tất.
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        Lần sao lưu kho gần đây bằng %1$s không thành công vì Aegis không có quyền ghi vào thư mục. Đã thử sao lưu %2$s. Lỗi này có thể xảy ra nếu bạn di chuyển/đổi tên thư mục sao lưu hoặc nếu gần đây bạn đã khôi phục Aegis từ bản sao lưu. Vui lòng chọn lại thư mục sao lưu.
+    </string>
+    <string name="backup_system_builtin">Sao lưu tự động tích hợp của Aegis</string>
+    <string name="backup_system_android">Sao lưu đám mây của Android</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        Bản sao lưu cuối cùng đã cũ (%s)
+    </string>
+    <string name="backup_reminder_bar_message">        Chưa sao lưu thay đổi
+    </string>
+    <string name="backup_reminder_bar_dialog_title">Chưa sao lưu thay đổi</string>
+    <string name="backup_reminder_bar_dialog_summary">        Những thay đổi gần đây chưa được sao lưu. Để tránh mất quyền truy cập vào tài khoản của bạn, hãy cân nhắc việc thiết lập sao lưu tự động.
+    </string>
+    <string name="backup_reminder_bar_dialog_accept">Thiết lập sao lưu</string>
+    <string name="backup_plaintext_export_warning"><b>Kho gần đây đã được xuất ở dạng văn bản thuần</b></string>
+    <string name="pref_show_plaintext_warning_hint">Không hiện cảnh báo này nữa</string>
+    <string name="backup_plaintext_warning_explanation">Cảnh báo này xuất hiện vì gần đây bạn đã xuất một bản sao chưa được mã hóa của kho. Để giữ an toàn mã xác thực của bạn, chúng tôi khuyên bạn nên xóa tập tin này ngay khi bạn không còn cần đến nữa.</string>
+    <string name="switch_camera">Đổi camera</string>
+    <string name="empty_list">Chưa có mã nào. Thêm mã mới bằng cách nhấn vào dấu cộng ở góc dưới bên phải</string>
+    <string name="empty_list_title">Chưa có mục nào</string>
+    <string name="empty_group_list">Hãy thêm các nhãn khi chỉnh sửa một mục</string>
+    <string name="empty_group_list_title">Chưa có nhãn nào</string>
+    <string name="no_icon_packs">Chưa nhập gói biểu tượng nào. Hãy nhấn vào ký hiệu dấu cộng để nhập một gói. Mẹo: thử <a href="https://aegis-icons.github.io">aegis-icons</a>.</string>
+    <string name="no_icon_packs_title">Chưa có gói biểu tượng</string>
     <string name="pick_icon">Chọn biểu tượng</string>
-    <string name="uncategorized">Chưa được phân loại</string>
+    <string name="uncategorized">Chưa phân loại</string>
     <string name="done">Xong</string>
+    <plurals name="qr_count">
+        <item quantity="other">%d / %d mã QR</item>
+    </plurals>
     <string name="next">Tiếp</string>
     <string name="previous">Trước</string>
-    <string name="transfer_entry">Truyền mục</string>
-    <string name="transfer_entry_description">Quét mã QR này bằng ứng dụng xác thực mà bạn muốn truyền mục này đến</string>
+    <string name="copy_uri">Sao chép URL</string>
+    <string name="unable_to_copy_uri_to_clipboard">Không thể sao chép vào bộ nhớ tạm</string>
+    <string name="uri_copied_to_clipboard">Đã sao chép vào bộ nhớ tạm</string>
+    <string name="transfer_entry_description">Quét mã QR này bằng ứng dụng xác minh mà bạn muốn truyền mục này đến</string>
+    <string name="transfer_entry_brightness">Nhấn vào mã QR để chuyển đổi độ sáng toàn màn hình</string>
+    <string name="google_auth_compatible_transfer_description">Quét các mã QR này bằng Aegis hoặc Google Authenticator.\n\nDo hạn chế của ứng dụng Google Authenticator, chỉ áp dụng với mã TOTP &amp; HOTP 6 chữ số sử dụng SHA1</string>
     <string name="password_strength_very_weak">Rất yếu</string>
     <string name="password_strength_weak">Yếu</string>
     <string name="password_strength_fair">Khá</string>
     <string name="password_strength_good">Tốt</string>
     <string name="password_strength_strong">Mạnh</string>
-    <string name="pref_pin_keyboard_title">Sử dụng bàn phím mã PIN trên màn hình khoá</string>
-    <string name="pref_pin_keyboard_summary">Bật tuỳ chọn này nếu bạn muốn bật bàn phím mã PIN trên màn hình khoá. Việc này chỉ được với các mật khẩu chỉ chứa chữ số</string>
+    <string name="password_strength_unknown">Mật khẩu quá dài</string>
+    <string name="pref_pin_keyboard_title">Dùng mã PIN trên màn hình khóa</string>
+    <string name="pref_pin_keyboard_summary">Chỉ áp dụng với các mật khẩu là số</string>
     <string name="title_activity_preferences">Cài đặt</string>
-    <string name="title_activity_manage_groups">Quản lý nhóm</string>
+    <string name="title_activity_manage_groups">Quản lý nhãn</string>
     <string name="title_activity_transfer">Truyền các mục</string>
     <string name="title_activity_about">Giới thiệu</string>
     <string name="title_activity_edit_entry">Chỉnh sửa mục</string>
     <string name="title_activity_scan_qr">Quét mã QR</string>
-    <string name="title_activity_manage_slots">Quản lý ô mã khoá</string>
-    <string name="title_activity_import_entries">Nhập các mục</string>
-    <string name="dialog_wipe_entries_title">Quét sạch các mục</string>
-    <string name="dialog_wipe_entries_message">Kho của bạn đã chứa các mục rồi. Bạn có muốn xoá các mục đó trước khi nhập tệp này không?\n\n<b>Khi làm vậy, bạn sẽ vĩnh viễn mất quyền truy cập vào các mục hiện có trong kho.</b></string>
-    <string name="dialog_wipe_entries_checkbox">Quét sạch nội dung kho</string>
-    <string name="panic_trigger_ignore_toast">Aegis đã nhận kích hoạt hoảng loạn nhưng cài đặt bị tắt, đang bỏ qua</string>
-    <string name="pref_panic_trigger_title">Xoá kho khi có kích hoạt hoảng loạn</string>
-    <string name="pref_panic_trigger_summary">Xoá kho khi một kích hoạt hoảng loạn được nhận từ Ripple</string>
-    <string name="importer_help_2fas">Cung cấp một tệp sao lưu 2FAS Authenticator.</string>
-    <string name="importer_help_aegis">Cung cấp một tệp xuất/sao lưu Aegis.</string>
-    <string name="importer_help_authenticator_plus">Cung cấp một tệp xuất Authenticator Plus được nhận qua <b>Cài đặt -&gt; Sao lưu &amp; Khôi phục -&gt; Xuất dưới dạng Văn bản và HTML</b>.</string>
+    <string name="title_activity_import_entries">Nhập mục</string>
+    <string name="title_activity_assign_icons">Gán biểu tượng</string>
+    <string name="title_activity_licenses">Giấy phép bên thứ ba</string>
+    <string name="dialog_wipe_entries_title">Xóa toàn bộ mục</string>
+    <string name="dialog_wipe_entries_message">Kho của bạn đã chứa các mục. Bạn có muốn xóa các mục đó trước khi nhập từ tập tin này không?\n\n<b>Nếu làm vậy, bạn sẽ vĩnh viễn mất quyền truy cập vào các mục hiện có trong kho.</b></string>
+    <string name="dialog_wipe_entries_checkbox">Xóa toàn bộ nội dung kho</string>
+    <string name="panic_trigger_ignore_toast">Aegis đã nhận kích hoạt khẩn nhưng cài đặt bị tắt, đang bỏ qua</string>
+    <string name="pref_panic_trigger_title">Xóa kho khẩn cấp</string>
+    <string name="pref_panic_trigger_summary">Khi nhận kích hoạt từ Ripple</string>
+    <string name="import_vault">Nhập kho Aegis</string>
+    <string name="import_vault_hint">Bạn muốn nhập từ một ứng dụng 2FA khác? Hoàn tất thiết lập trước và sau đó đi tới menu cài đặt.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="other">Bỏ đánh dấu %d mục khả năng trùng lặp. Vui lòng xem lại danh sách các mục.</item>
+    </plurals>
+    <string name="importer_help_2fas">Cung cấp một tập tin sao lưu 2FAS Authenticator.</string>
+    <string name="importer_help_aegis">Cung cấp một file xuất/sao lưu Aegis.</string>
+    <string name="importer_help_authenticator_plus">Cung cấp một tập tin xuất Authenticator Plus được nhận qua <b>Cài đặt -&gt; Sao lưu &amp; Khôi phục -&gt; Xuất dưới dạng Văn bản và HTML</b>.</string>
     <string name="importer_help_authy">Cung cấp một bản sao của <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, nằm trong thư mục bộ nhớ trong của Authy.</string>
-    <string name="importer_help_andotp">Cung cấp một tệp xuất/sao lưu andOTP.</string>
-    <string name="importer_help_bitwarden">Hãy chọn tệp xuất/sao lưu của Bitwarden. Tệp mã hoá không được hỗ trợ.</string>
+    <string name="importer_help_andotp">Cung cấp một tập tin xuất/sao lưu andOTP.</string>
+    <string name="importer_help_bitwarden">Hãy chọn tập tin xuất/sao lưu của Bitwarden. Tập tin mã hoá không được hỗ trợ.</string>
+    <string name="importer_help_battle_net_authenticator">Cung cấp một bản sao của <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, nằm trong thư mục bộ nhớ trong của Battle.net Authenticator.</string>
     <string name="importer_help_duo">Cung cấp một bản sao của <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, nằm trong thư mục bộ nhớ trong của DUO.</string>
-    <string name="importer_help_freeotp">Cung cấp một bản sao của <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, nằm trong thư mục bộ nhớ trong của FreeOTP.</string>
-    <string name="importer_help_freeotp_plus">Cung cấp một tệp xuất FreeOTP+.</string>
-    <string name="importer_help_google_authenticator"><b>Chỉ có tệp cơ sở dữ liệu từ Google Authenticator v5.10 và cũ hơn mới được hỗ trợ</b>.\n\nHãy lấy bản sao của <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> ở trong thư mục bộ nhớ trong của Google Authenticator.</string>
+    <string name="importer_help_ente_auth">Cung cấp tệp xuất Ente Auth. Hiện tại chỉ hỗ trợ các tệp chưa được mã hóa.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Cung cấp một file sao lưu.\nFreeOTP 1.x: Cung cấp một bản sao <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, nằm trong thư mục lưu trữ nội bộ của FreeOTP.</string>
+    <string name="importer_help_freeotp_plus">Cung cấp một tập tin xuất FreeOTP+.</string>
+    <string name="importer_warning_title_freeotp2">Tương thích FreeOTP 2</string>
+    <string name="importer_warning_message_freeotp2">Có một số vấn đề trong FreeOTP 2 có thể dẫn đến việc sao lưu bị hỏng. Aegis sẽ cố gắng cứu càng nhiều mục nhập càng tốt, nhưng có thể một số hoặc thậm chí tất cả các mục nhập đều không nhập được.</string>
+    <string name="importer_help_google_authenticator"><b>Chỉ có tập tin cơ sở dữ liệu từ Google Authenticator v5.10 và cũ hơn mới được hỗ trợ</b>.\n\nHãy lấy bản sao của <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> ở trong thư mục bộ nhớ trong của Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Cung cấp một bản sao của <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, nằm trong thư mục bộ nhớ trong của Microsoft Authenticator.</string>
-    <string name="importer_help_plain_text">Cung cấp một tệp văn bản thuần có một URI Google Authenticator trên mỗi dòng.</string>
-    <string name="importer_help_totp_authenticator">Cung cấp một tệp xuất TOTP Authenticator.</string>
-    <string name="importer_help_winauth">Cung cấp một tệp xuất WinAuth.</string>
+    <string name="importer_help_plain_text">Cung cấp một tập tin văn bản thuần có một URI Google Authenticator trên mỗi dòng.</string>
+    <string name="importer_help_steam"><b>Không hỗ trợ Steam v3.0 trở lên</b>. Cung cấp một bản sao <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, nằm trong thư mục lưu trữ nội bộ của Steam.</string>
+    <string name="importer_help_stratum">Cung cấp tập tin xuất Stratum có được thông qua <b>Cài đặt -&gt; Sao lưu -&gt; Sao lưu tập tin mã hóa (đề xuất)</b>.</string>
+    <string name="importer_help_totp_authenticator">Cung cấp một tập tin xuất TOTP Authenticator.</string>
+    <string name="importer_help_winauth">Cung cấp một tập tin xuất WinAuth.</string>
+    <string name="import_assign_icons_dialog_title">Gán biểu tượng</string>
+    <string name="import_assign_icons_dialog_text">Bạn có chắc muốn gán biểu tượng vào những mục đã nhập?</string>
     <string name="importer_encrypted_exception_google_authenticator">Đã bỏ qua mục mã hoá: %s</string>
     <string name="importer_help_direct">Nhập các mục trực tiếp từ %s. Việc này yêu cầu ứng dụng được cài đặt trên thiết bị này và quyền truy cập root được cấp cho Aegis.</string>
-    <string name="groups">Nhóm</string>
-    <string name="pref_focus_search">Tập trung vào tìm kiếm khi khởi động</string>
-    <string name="pref_focus_search_summary">Tập trung vào tìm kiếm ngay lập tức sau khi mở ứng dụng.</string>
+    <string name="groups">Nhãn</string>
+    <string name="pref_focus_search">Khởi động tìm kiếm</string>
+    <string name="pref_focus_search_summary">Hiện tìm kiếm ngay sau khi mở ứng dụng</string>
+    <string name="pref_grouping_halves">Một nửa</string>
+    <string name="pref_grouping_none">Không gộp</string>
+    <string name="pref_grouping_size_two">Gộp 2</string>
+    <string name="pref_grouping_size_three">Gộp 3</string>
+    <string name="pref_grouping_size_four">Gộp 4</string>
+    <string name="pref_copy_behavior_never">Không bao giờ</string>
+    <string name="pref_copy_behavior_single_tap">Nhấn một lần</string>
+    <string name="pref_copy_behavior_double_tap">Nhấn đúp</string>
+    <string name="pref_account_name_position_hidden">Ẩn</string>
+    <string name="pref_account_name_position_end">Kế bên dịch vụ</string>
+    <string name="pref_account_name_position_below">Dưới dịch vụ</string>
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
+        <item quantity="other">%ds trước</item>
+    </plurals>
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
+        <item quantity="other">%d phút</item>
+    </plurals>
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
+        <item quantity="other">%d giờ trước</item>
+    </plurals>
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
+        <item quantity="other">%d ngày trước</item>
+    </plurals>
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
+        <item quantity="other">%d năm trước</item>
+    </plurals>
+    <plurals name="dropdown_checkboxes_default_count">
+        <item quantity="other">%d mục đã chọn</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
deleted file mode 100644
index 311a717f..00000000
--- a/app/src/main/res/values-w600dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="auth_leader_text_size">36sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-w60dp/dimens.xml b/app/src/main/res/values-w60dp/dimens.xml
deleted file mode 100644
index f93bfa8c..00000000
--- a/app/src/main/res/values-w60dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="auth_leader_text_size">32sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-zh-rCN-v29/strings.xml b/app/src/main/res/values-zh-rCN-v29/strings.xml
new file mode 100644
index 00000000..1042a3d8
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">系统默认</string>
+    <string name="system_amoled_theme_title">系统默认（AMOLED）</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2b08d82e..f82cb13a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">设置</string>
     <string name="action_about">关于</string>
     <string name="action_delete">删除</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">恢复默认图标</string>
     <string name="discard">放弃</string>
     <string name="save">保存</string>
+    <string name="all">全部</string>
     <string name="issuer">服务商</string>
     <string name="yandex_pin">PIN (4-16 位数字)</string>
     <string name="motp_pin">PIN (4 位数)</string>
@@ -28,11 +29,15 @@
     <string name="pref_section_security_summary">配置加密、生物识别解锁、自动锁定和其他安全设置。</string>
     <string name="pref_section_import_export_title">导入 &amp; 导出</string>
     <string name="pref_section_import_export_summary">导入 Aegis 或其他身份验证程序的备份。创建您的 Aegis 数据库的手动导出。</string>
+    <string name="pref_section_audit_log_title">审计日志</string>
+    <string name="pref_section_audit_log_summary">查找应用内发生的所有报告的重要事件列表。</string>
     <string name="pref_section_backups_title">备份</string>
     <string name="pref_section_backups_summary">设定自动备份到您选择的某个位置，或允许参与 Android 的云备份体系。</string>
     <string name="pref_section_icon_packs">图标包</string>
     <string name="pref_section_icon_packs_summary">管理和导入图标包</string>
     <string name="pref_select_theme_title">主题</string>
+    <string name="pref_dynamic_colors_title">动态色彩</string>
+    <string name="pref_dynamic_colors_summary">基于您的 Android 主题颜色的皮肤</string>
     <string name="pref_view_mode_title">视图模式</string>
     <string name="pref_lang_title">语言</string>
     <string name="pref_show_icons_title">显示图标</string>
@@ -40,9 +45,14 @@
     <string name="pref_code_group_size_title">分组显示验证码</string>
     <string name="pref_code_group_size_summary">选择按多少位数字进行代码分组</string>
     <string name="pref_account_name_position_title">显示账户名称</string>
+    <string name="pref_show_next_code_title">显示下一组代码</string>
+    <string name="pref_show_next_code_summary">提前显示下一组代码</string>
+    <string name="pref_expiration_state_title">显示代码将要过期</string>
+    <string name="pref_expiration_state_summary">更改代码的颜色，并在代码即将过期时闪烁。</string>
+    <string name="pref_expiration_state_fallback">当代码即将过期时，更改代码的颜色</string>
     <string name="pref_shared_issuer_account_name_title">仅在必要时显示账户名</string>
     <string name="pref_shared_issuer_account_name_summary">仅在多项具有相同颁发者时显示账户名。隐藏其他账户名。</string>
-    <string name="pref_account_name_position_summary_override">此设置被瓷贴视图模式覆盖。账户名将始终显示在发行者下方。</string>
+    <string name="pref_account_name_position_summary_override">此设置被瓷贴视图模式覆盖。账户名将显示在发行者下方。</string>
     <string name="pref_import_file_title">从文件导入</string>
     <string name="pref_import_file_summary">从文件导入令牌</string>
     <string name="pref_android_backups_title">Android 云备份</string>
@@ -54,14 +64,22 @@
     <string name="pref_backups_reminder_summary">如果没有备份最新的变更，提醒您备份自己的数据库。</string>
     <string name="pref_backups_reminder_dialog_title">禁用提醒备份</string>
     <string name="pref_backups_reminder_dialog_summary">禁用后 Aegis 不会再提醒您备份变更。这有可能促使您遗失令牌。确定禁用吗？</string>
-    <string name="pref_backups_location_title">备份文件目录</string>
+    <string name="pref_backups_versioning_strategy_title">备份策略</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">保留版本数</string>
+    <string name="pref_backups_versioning_strategy_single_backup">单个备份</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">所选的备份策略不可靠、不推荐。单个备份如遇故障可能导致您遗失唯一的备份。</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">选择备份策略</string>
+    <string name="pref_backups_location_title">备份位置</string>
     <string name="pref_backups_location_summary">备份将存储在</string>
+    <string name="pref_backup_location_summary">备份将存储在</string>
     <string name="pref_backups_trigger_title">触发备份</string>
     <string name="pref_backups_trigger_summary">手动触发备份</string>
     <string name="pref_backups_versions_title">要保留的版本数</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="other">保留 %1$d 个版本备份</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">备份版本无限量保留</string>
     <string name="pref_import_app_title">从应用导入</string>
     <string name="pref_import_app_summary">从其他应用导入令牌（需要 root 权限）</string>
     <string name="pref_export_title">导出</string>
@@ -96,8 +114,34 @@
     <string name="pref_encryption_summary">加密数据库，并在解锁时要求密码或生物识别验证。</string>
     <string name="pref_biometrics_title">生物识别解锁</string>
     <string name="pref_biometrics_summary">通过生物识别验证来解锁数据库</string>
+    <string name="pref_search_behavior_summary">搜索方式：%s</string>
+    <string name="pref_search_behavior_prompt">搜索下列任意字段</string>
+    <string name="pref_search_behavior_type_name">名称</string>
+    <string name="pref_search_behavior_type_issuer">颁发者</string>
+    <string name="pref_search_behavior_type_note">备注</string>
+    <string name="pref_search_behavior_type_groups">分组</string>
     <string name="pref_set_password_title">更改密码</string>
     <string name="pref_set_password_summary">设置解锁数据库所需的新密码</string>
+    <string name="no_events_title">没有报告的事件</string>
+    <string name="no_events_description">应用内还没有已报告的重要事件</string>
+    <string name="event_title_vault_unlocked">保险库已解锁</string>
+    <string name="event_description_vault_unlocked">成功解锁了保险库</string>
+    <string name="event_title_backup_created">创建了备份</string>
+    <string name="event_description_backup_created">已成功创建了保险库的备份</string>
+    <string name="event_title_android_backup_created">Android 创建了备份</string>
+    <string name="event_description_android_backup_created">保险库备份已成功由 Android 创建</string>
+    <string name="event_title_vault_exported">导出了保险库</string>
+    <string name="event_description_vault_exported">已导出保险库的副本</string>
+    <string name="event_title_entry_shared">共享条目</string>
+    <string name="event_description_entry_shared">共享了条目</string>
+    <string name="event_title_vault_unlock_failed_password">保险库解锁失败了(密码)</string>
+    <string name="event_description_vault_unlock_failed_password">尝试用密码解锁保险库失败</string>
+    <string name="event_title_vault_unlock_failed_biometrics">密码库解锁失败 (生物特征)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">尝试用生物特征解锁保险库失败</string>
+    <string name="event_unknown">未知事件类型</string>
+    <string name="audit_log_entry_deleted">(已删除)</string>
+    <string name="today_at_time">今天 %1$s</string>
+    <string name="day_of_week_at_time">%2$s 的 %1$s</string>
     <string name="export_encrypted">加密数据库</string>
     <string name="export_help">此操作将从 Aegis 的内部存储中导出数据库。选择您想要的导出格式：</string>
     <string name="export_warning_unencrypted">您将导出一个未加密的 Aegis 数据库副本。<b>不建议这么做</b></string>
@@ -113,7 +157,7 @@
         <item quantity="other">已选择 %d 个群组</item>
     </plurals>
     <string name="export_no_groups_selected">没有选择要导出的组</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis 身份验证器导出</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis 身份验证器导出</string>
     <string name="choose_authentication_method">安全</string>
     <string name="authentication_method_explanation">Aegis 是一款专注于安全性的双重认证（2FA）应用。令牌存储在数据库中，可以选择使用您选择的密码进行加密。如果攻击者获得了加密的数据库文件，他们将无法在不知道密码的情况下访问内容。\n\n我们已预先选择了我们认为最适合您的设备的选项。</string>
     <string name="authentication_method_none">无</string>
@@ -127,7 +171,7 @@
     <string name="authentication_multiline" comment="The newline in the middle is used for aesthetic purposes">解锁\n数据库</string>
     <string name="auth_use_biometrics">或者点击此处以使用 <font fgcolor="#FF0D86C1">生物识别</font></string>
     <string name="set_password">请输入密码</string>
-    <string name="set_group">请输入群组名称</string>
+    <string name="set_group">请输入分组名称</string>
     <string name="set_number">请选择时长</string>
     <string name="set_password_confirm">请确认密码</string>
     <string name="invalid_password">密码错误</string>
@@ -149,6 +193,7 @@
     <string name="share">分享</string>
     <string name="yes">确定</string>
     <string name="no">取消</string>
+    <string name="undo">撤销</string>
     <string name="unlock">解锁</string>
     <string name="advanced">高级设置</string>
     <string name="counter">计数器</string>
@@ -160,6 +205,11 @@
     <string name="set_up_biometric">设置生物识别解锁</string>
     <string name="copy">复制</string>
     <string name="edit">编辑</string>
+    <string name="select_all">全选</string>
+    <string name="assign_icons">分配图标</string>
+    <string name="assign_groups">分配给组</string>
+    <string name="assign_groups_dialog_summary">选择您想要将选中条目分配到的组。</string>
+    <string name="assign_groups_dialog_dropdown">选择组</string>
     <string name="favorite" comment="Verb">加入收藏</string>
     <string name="unfavorite" comment="Verb">取消收藏</string>
     <string name="error_all_caps">错误</string>
@@ -174,10 +224,12 @@
     <string name="snackbar_authentication_method">请选择身份验证方法</string>
     <string name="encrypting_vault">正在加密数据库</string>
     <string name="exporting_vault">正在导出数据库</string>
+    <string name="optimizing_icon">优化图标</string>
+    <string name="optimizing_icon_multiple">正在优化第 %1$d 个图标，共 %2$d 个</string>
     <string name="reading_file">正在读取文件</string>
     <string name="requesting_root_access">正在请求 root 权限</string>
     <string name="analyzing_qr">正在分析二维码</string>
-    <string name="analyzing_qr_multiple">正在分析二维码 %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">正在分析二维码 %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="other">添加了 %d 个新条目到保险库</item>
     </plurals>
@@ -192,6 +244,7 @@
     <string name="discard_changes">放弃更改？</string>
     <string name="discard_changes_description">您的更改尚未保存</string>
     <string name="saving_profile_error">保存配置文件时出错</string>
+    <string name="saving_assign_icons_error">分配图标时出错</string>
     <string name="welcome">欢迎使用</string>
     <string name="app_description">Aegis 是一款免费，安全和开源的双重认证（2FA）应用</string>
     <string name="setup_completed">设置完成</string>
@@ -200,6 +253,7 @@
     <string name="copied">已复制</string>
     <string name="errors_copied">错误已复制到剪贴板</string>
     <string name="version_copied">版本号已复制到剪贴板</string>
+    <string name="error_required_field">此字段为必填</string>
     <string name="error_occurred">发生了一个错误</string>
     <string name="decryption_error">试图解锁数据库时出错</string>
     <string name="decryption_corrupt_error">尝试解锁数据库时发生错误，您的数据库文件可能已损坏。</string>
@@ -260,44 +314,68 @@
     <string name="partial_google_auth_import">检测到不完整的 Google 身份验证器导出</string>
     <string name="partial_google_auth_import_warning">您的导入缺少一些  QR 码。 找不到下列代码：\n\n<b>%s</b>\n\n您仍可以继续导入已有部分，但建议您重试所有 QR 码，以避免出现丢失令牌的风险。</string>
     <string name="missing_qr_code_descriptor">• QR 码 %d</string>
-    <string name="import_partial_export_anyway">继续导入 %d 个令牌</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="other">继续导入 %d 个令牌</item>
+    </plurals>
     <string name="import_google_auth_failure">导入 Google 身份验证器的导出文件失败</string>
     <string name="unrelated_google_auth_batches_error">导出文件包含多个批次的内容。请一次只导入一个批次。</string>
     <string name="no_tokens_can_be_imported">没有可导入的令牌</string>
-    <string name="authentication_method_raw">源文件</string>
     <string name="unlocking_vault">解锁数据库</string>
-    <string name="slot_this_device">（本设备）</string>
-    <string name="remove_group">删除群组</string>
-    <string name="remove_group_description">您确定要删除这个群组吗？此群组内的条目将自动移动到“无群组”。</string>
+    <string name="rename_group">重命名组</string>
+    <string name="no_group_selection">不在任何组中的条目会出现在“无分组”中。</string>
+    <string name="remove_group">删除分组</string>
+    <string name="remove_group_description">您确定要删除这个分组吗？此分组内的条目将自动移动到“无分组”。</string>
+    <string name="remove_unused_groups">删除未使用的组</string>
+    <string name="remove_unused_groups_description">您确定要删除所有未分配条目的组吗？</string>
     <string name="remove_icon_pack">删除图标包</string>
     <string name="remove_icon_pack_description">您确定要删除此图标包吗？使用此包图标的条目不会受到影响。</string>
     <string name="details">详细信息</string>
     <string name="show_error_details">显示错误详情</string>
     <string name="lock">锁定</string>
     <string name="name">名称</string>
-    <string name="no_group">无群组</string>
-    <string name="sort">排序</string>
+    <string name="no_group">无分组</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">排序</string>
     <string name="sort_alphabetically">服务商（从 A 到 Z）</string>
     <string name="sort_alphabetically_reverse">服务商（从 Z 到 A）</string>
     <string name="sort_alphabetically_name">账户（从 A 到 Z）</string>
     <string name="sort_alphabetically_name_reverse">账户（从 Z 到 A）</string>
     <string name="sort_usage_count">使用计数</string>
+    <string name="sort_last_used">上次使用</string>
     <string name="sort_custom">自定义</string>
-    <string name="new_group">新建群组…</string>
-    <string name="group">群组</string>
-    <string name="group_name_hint">群组名称</string>
-    <string name="preference_manage_groups">编辑群组</string>
-    <string name="preference_manage_groups_summary">管理和删除您的群组</string>
+    <string name="last_used">上次使用</string>
+    <string name="last_used_never">从不</string>
+    <string name="new_group">新建分组…</string>
+    <string name="group">分组</string>
+    <string name="group_name_hint">分组名称</string>
+    <string name="preference_manage_groups">编辑分组</string>
+    <string name="preference_manage_groups_summary">管理和删除您的分组</string>
     <string name="preference_reset_usage_count">重置使用计数</string>
     <string name="preference_reset_usage_count_summary">重置数据库中每个条目的使用计数</string>
     <string name="preference_reset_usage_count_dialog">您确定要将数据库中所有条目的使用计数设置为 0？</string>
-    <string name="note">备注</string>
+    <string name="note" comment="Users can add a note to an entry">备注</string>
     <string name="clear">清空</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">复制条目</string>
+    <string name="dialog_duplicate_entry_message">此条目与一个或多个现有条目具有相同的名称和发行者。您想如何继续？</string>
+    <string name="dialog_duplicate_entry_overwrite_title">覆盖现有的条目</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">用新条目替换现有条目。此操作不能撤消</string>
+    <string name="dialog_duplicate_entry_suffix_title">添加后缀</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">添加后缀后新条目的名称。新名称将是： %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">取消保存</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">允许您在尝试再次保存之前编辑条目</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="other">您确定要删除以下名称的 %d 条记录：\n\n%s - %s</item>
+    </plurals>
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">确认删除</string>
+    <string name="pref_haptic_feedback_summary">代码刷新时使您的设备振动</string>
+    <string name="pref_haptic_feedback_title">触觉反馈</string>
     <string name="pref_highlight_entry_title">点击时高亮令牌</string>
     <string name="pref_highlight_entry_summary">使令牌在点击后暂时高亮显示以便区分</string>
+    <string name="pref_groups_multiselect_title">多选分组</string>
+    <string name="pref_groups_multiselect_summary">允许同时选中多个分组</string>
     <string name="pref_minimize_on_copy_title">复制时最小化</string>
     <string name="pref_minimize_on_copy_summary">复制令牌后最小化应用</string>
     <string name="pref_copy_behavior_title">复制令牌到剪贴板</string>
+    <string name="pref_search_behavior_title">搜索行为</string>
     <string name="pref_pause_entry_title">轻按冻结令牌</string>
     <string name="pref_pause_entry_summary">通过轻按令牌来暂停它们的自动刷新。 只要被聚焦，令牌就不会更新。 需要启用“轻按突出显示令牌”或“轻按显示”。</string>
     <string name="pin_keyboard_description">请输入您的密码以启用 PIN 键盘。请注意，只有当您的密码仅由数字构成时才能使用</string>
@@ -317,12 +395,12 @@
     <string name="unknown_issuer">未知的服务商</string>
     <string name="unknown_account_name">未知的帐户名称</string>
     <plurals name="import_error_dialog">
-        <item quantity="other">Aegis 无法导入 %d 个令牌。这些令牌将被忽略。点击“详细信息”查看更多关于错误的信息。</item>
+        <item quantity="other">Aegis 无法导入 %d 个令牌。此类令牌将被忽略。点击 “详细信息” 查看关于错误的更多信息。</item>
     </plurals>
     <string name="unable_to_process_deeplink">无法处理深层链接</string>
     <string name="unable_to_read_qrcode_file">无法从文件读取和处理二维码: %s。</string>
     <string name="unable_to_process_shared_text">无法将共享文本作为 OTP 进行处理</string>
-    <string name="unable_to_read_qrcode_files">无法读取和处理一些二维码。仅导入 %d/%d 条目。</string>
+    <string name="unable_to_read_qrcode_files">无法读取和处理一些二维码。将只导入 %2$d 中的 %1$d 个条目。</string>
     <string name="unable_to_generate_qrcode">无法生成二维码</string>
     <string name="select_picture">选择图片</string>
     <string name="select_icon">选择图标</string>
@@ -354,11 +432,14 @@
     <string name="time_sync_warning_disable">不要再次提醒。我知道我在做什么。</string>
     <string name="google_qr_export_unrelated">找到不相关的二维码。请尝试重新扫描。</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="other">已扫描 %d/%d 二维码</item>
+        <item quantity="other">已扫描 %1$d 个 二维码，共 %2$d 个</item>
     </plurals>
-    <string name="google_qr_export_unexpected">预期二维码 #%d，已扫描 #%d</string>
+    <string name="google_qr_export_unexpected">预期二维码 #%1$d，但扫描了 #%2$d</string>
     <string name="backup_error_bar_message"><b>数据库最近备份失败</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">因发生错误，上次使用 %s 备份密码库的尝试失败。尝试于 %s。请检查您的备份设置以确保备份成功完成。    </string>
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        最近使用%1$s 备份密码库的尝试失败了，因为发生了错误。 备份尝试发生在 %2$s 前。请检查你的备份设备，确保备份可以成功完成。
+    </string>
+    <string name="backup_permission_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        最近使用 %1$s 备份密码库的尝试失败了，因为 Aegis 没有写入备份目的地的权限。备份尝试发生在%2$s前。发生错误的原因可能是你 移动或重命名了备份目的地或者你近期从备份恢复了 Aegis。请重新配置备份目的地。
+    </string>
     <string name="backup_system_builtin">Aegis 内置的自动备份</string>
     <string name="backup_system_android">Android 的云备份系统</string>
     <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        最新备份已过时 (%s)
@@ -374,8 +455,8 @@
     <string name="switch_camera">切换摄像头</string>
     <string name="empty_list">没有可显示的验证码。点击右下角的加号，开始添加条目</string>
     <string name="empty_list_title">未找到条目</string>
-    <string name="empty_group_list">没有要显示的群组。在条目编辑页面中添加群组</string>
-    <string name="empty_group_list_title">未找到群组</string>
+    <string name="empty_group_list">没有找到可以被显示的分组，请在条目编辑页面中添加分组</string>
+    <string name="empty_group_list_title">未找到分组</string>
     <string name="no_icon_packs">尚未导入图标包。点击加号标记来导入一个。提示：尝试 <a href="https://aegis-icons.github.io">aegis-icons</a>。</string>
     <string name="no_icon_packs_title">没有图标包</string>
     <string name="pick_icon">选择一个图标</string>
@@ -389,51 +470,62 @@
     <string name="copy_uri">复制 URI</string>
     <string name="unable_to_copy_uri_to_clipboard">无法复制 URI 到剪贴板</string>
     <string name="uri_copied_to_clipboard">URI 已复制到剪贴板</string>
-    <string name="transfer_entry">迁移条目</string>
     <string name="transfer_entry_description">使用您想将此条目迁移到的其它身份验证器应用扫描此二维码</string>
+    <string name="transfer_entry_brightness">轻按二维码切换全屏亮度</string>
     <string name="google_auth_compatible_transfer_description">使用 Aegis 或 Google 身份验证器扫描这些二维码。\n\n由于 Google 身份验证器应用的限制， 只包含使用 SHA1 并生成 6 位数字代码的 TOTP &amp; HOTP 令牌</string>
     <string name="password_strength_very_weak">很弱</string>
     <string name="password_strength_weak">弱</string>
     <string name="password_strength_fair">中等</string>
     <string name="password_strength_good">好</string>
     <string name="password_strength_strong">强</string>
+    <string name="password_strength_unknown">密码太长无法分析强度</string>
     <string name="pref_pin_keyboard_title">在锁屏界面上使用 PIN 键盘</string>
     <string name="pref_pin_keyboard_summary">如果您想要在锁屏界面启用 PIN 键盘，请启用此选项。这只适用于数字密码</string>
     <string name="title_activity_preferences">设置</string>
-    <string name="title_activity_manage_groups">管理群组</string>
+    <string name="title_activity_manage_groups">管理分组</string>
     <string name="title_activity_transfer">转移条目</string>
     <string name="title_activity_about">关于</string>
     <string name="title_activity_edit_entry">编辑条目</string>
     <string name="title_activity_scan_qr">扫描二维码</string>
-    <string name="title_activity_manage_slots">管理密钥槽位</string>
     <string name="title_activity_import_entries">导入条目</string>
+    <string name="title_activity_assign_icons">分配图标</string>
+    <string name="title_activity_licenses">第三方许可</string>
     <string name="dialog_wipe_entries_title">擦除条目</string>
     <string name="dialog_wipe_entries_message">您的数据库已经包含条目。 您想要在导入此文件之前删除这些条目吗？\n\n<b>这样做，您将永久失去对数据库中现有条目的访问权限。</b></string>
     <string name="dialog_wipe_entries_checkbox">擦除数据库内容</string>
     <string name="panic_trigger_ignore_toast">Aegis 收到紧急触发信号，但您未启用相关设置，忽略中</string>
     <string name="pref_panic_trigger_title">收到紧急触发信号时删除数据库</string>
     <string name="pref_panic_trigger_summary">从 Ripple 收到紧急触发信号时删除数据库</string>
-    <string name="import_vault">导入数据库</string>
+    <string name="import_vault">导入 Aegis 数据库</string>
+    <string name="import_vault_hint">想要从其他 2FA 应用程序导入吗？请先完成设置，然后转到设置菜单。</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="other">未选中 %d 个潜在重复项。请检视条目列表。</item>
+    </plurals>
     <string name="importer_help_2fas">提供一个 2FAS 身份验证器备份文件。</string>
     <string name="importer_help_aegis">提供一个 Aegis 导出/备份文件。</string>
     <string name="importer_help_authenticator_plus">提供一个通过 <b>设置 -&gt; 备份 &amp; 还原 -&gt; 导出为纯文本和 HTML</b> 获得的 Authenticator Plus 导出文件。</string>
-    <string name="importer_help_authenticator_pro">提供一个用如下方式获取的 Authenticator Pro 导出文件：<b>设置 -&gt; 备份 -&gt; 备份到加密文件（推荐）</b>。</string>
     <string name="importer_help_authy">提供 <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> 的一个副本，位于 Authy 的内部存储目录。</string>
     <string name="importer_help_andotp">提供 andOTP 导出/备份文件。</string>
     <string name="importer_help_bitwarden">提供 Bitwarden 导出 / 备份文件。不支持加密的文件。</string>
-    <string name="importer_help_battle_net_authenticator">提供<b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b> 的拷贝, 位于Battle.net Authenticator内部存储目录。</string>
+    <string name="importer_help_battle_net_authenticator">提供 <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b> 的副本，这位于 Battle.net Authenticator 的内部存储目录。</string>
     <string name="importer_help_duo">提供 <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> 的一个副本，位于 DUO 的内部存储目录。</string>
-    <string name="importer_help_freeotp">提供 <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> 的一个副本，位于 FreeOTP 的内部存储目录。</string>
+    <string name="importer_help_ente_auth">提供一个 Ente Auth 导出文件。目前只支持未加密文件。</string>
+    <string name="importer_help_freeotp">FreeOTP 2: 提供备份文件.\nFreeOTP 1.x: 提供<b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>的副本，位于 FreeOTP 的内部存储目录。</string>
     <string name="importer_help_freeotp_plus">提供 FreeOTP+ 导出文件。</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2 兼容性</string>
+    <string name="importer_warning_message_freeotp2">FreeOTP 2 有许多问题可能导致备份损坏。 Aegis 将试着挽救尽可能多的条目，但有些条目甚至全部都未能导入。</string>
     <string name="importer_help_google_authenticator"><b>仅支持来自 Google Authenticator v5.10 及先前版本的数据库</b>。\n\n提供 <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> 的副本，文件位于 Google Authenticator 的内部存储目录。</string>
     <string name="importer_help_microsoft_authenticator">提供 <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> 的一个副本，位于 Microsoft Authenticator 的内部存储目录。</string>
     <string name="importer_help_plain_text">提供一个每一行都有一个 Google Authenticator URI 的纯文本文件。</string>
     <string name="importer_help_steam"><b>不支持 Steam v3.0 和更新版本</b>。提供 <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>的副本, 位于Steam 内部存储目录。</string>
+    <string name="importer_help_stratum">提供一个用如下方式获取的 Stratum 导出文件：<b>设置 -&gt; 备份 -&gt; 备份到加密文件（推荐）</b>。</string>
     <string name="importer_help_totp_authenticator">提供一个 TOTP 身份验证器导出文件。</string>
     <string name="importer_help_winauth">提供 WinAuth 导出文件。</string>
+    <string name="import_assign_icons_dialog_title">分配图标</string>
+    <string name="import_assign_icons_dialog_text">您想给导入的条目分配图标吗？</string>
     <string name="importer_encrypted_exception_google_authenticator">加密条目已跳过：%s</string>
     <string name="importer_help_direct">直接导入来自 %s 的条目。这要求将应用程序安装在此设备上，并授予 Aegis root 权限。</string>
-    <string name="groups">群组</string>
+    <string name="groups">分组</string>
     <string name="pref_focus_search">应用启动后聚焦搜索</string>
     <string name="pref_focus_search_summary">打开应用程序后立即聚焦搜索</string>
     <string name="pref_grouping_halves">均分</string>
@@ -447,19 +539,19 @@
     <string name="pref_account_name_position_hidden">隐藏</string>
     <string name="pref_account_name_position_end">发行者旁边</string>
     <string name="pref_account_name_position_below">发行者下方</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="other">%d 秒前</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="other">%d 分钟前</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="other">%d 小时前</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="other">%d 天前</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="other">%d 年前</item>
     </plurals>
     <plurals name="dropdown_checkboxes_default_count">
diff --git a/app/src/main/res/values-zh-rTW-v29/strings.xml b/app/src/main/res/values-zh-rTW-v29/strings.xml
new file mode 100644
index 00000000..65db2384
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW-v29/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="system_theme_title">系統預設</string>
+    <string name="system_amoled_theme_title">系統預設 (AMOLED)</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b3568f92..9bf79c68 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_settings">設定</string>
     <string name="action_about">關於</string>
     <string name="action_delete">刪除</string>
@@ -10,6 +10,7 @@
     <string name="action_default_icon">恢復為默認圖示</string>
     <string name="discard">放棄</string>
     <string name="save">儲存</string>
+    <string name="all">所有</string>
     <string name="issuer">服務商</string>
     <string name="yandex_pin">PIN (4 到 16 碼)</string>
     <string name="motp_pin">PIN (4 位數)</string>
@@ -28,11 +29,14 @@
     <string name="pref_section_security_summary">設定加密、生物特徵辨識解鎖、自動鎖定以及其他安全性選項。</string>
     <string name="pref_section_import_export_title">匯入 &amp; 匯出</string>
     <string name="pref_section_import_export_summary">匯入 Aegis 或其他驗證程式的備份檔，或手動匯出 Aegis 保險箱。</string>
+    <string name="pref_section_audit_log_title">稽核記錄</string>
     <string name="pref_section_backups_title">備份</string>
     <string name="pref_section_backups_summary">設定自動備份至指定位置或啟用 Android 內建的雲端備份系統。</string>
     <string name="pref_section_icon_packs">圖示合輯</string>
     <string name="pref_section_icon_packs_summary">管理與匯入圖示合輯</string>
     <string name="pref_select_theme_title">主題</string>
+    <string name="pref_dynamic_colors_title">動態色彩</string>
+    <string name="pref_dynamic_colors_summary">基於您的 Android 主題配色設定程式配色</string>
     <string name="pref_view_mode_title">檢視模式</string>
     <string name="pref_lang_title">語言</string>
     <string name="pref_show_icons_title">顯示圖示</string>
@@ -40,9 +44,9 @@
     <string name="pref_code_group_size_title">分組顯示驗證碼</string>
     <string name="pref_code_group_size_summary">選擇群組編號</string>
     <string name="pref_account_name_position_title">顯示帳戶名稱</string>
+    <string name="pref_show_next_code_title">顯示下一組驗證碼</string>
     <string name="pref_shared_issuer_account_name_title">只在必要時顯示帳戶名稱</string>
     <string name="pref_shared_issuer_account_name_summary">只顯示擁有共同發行者的帳戶名稱（並隱藏其他帳戶名稱）</string>
-    <string name="pref_account_name_position_summary_override">本項設定將被「條列式顯示模式」覆蓋，帳戶名稱將總是在發行者之下顯示。</string>
     <string name="pref_import_file_title">從檔案匯入</string>
     <string name="pref_import_file_summary">從檔案匯入憑證</string>
     <string name="pref_android_backups_title">Android 雲端備份</string>
@@ -53,14 +57,21 @@
     <string name="pref_backups_reminder_title">備份提醒</string>
     <string name="pref_backups_reminder_summary">提示您備份保險箱以避免最後的變更狀態未被加入備份。</string>
     <string name="pref_backups_reminder_dialog_title">關閉備份提醒</string>
-    <string name="pref_backups_location_title">備份檔案的目錄</string>
+    <string name="pref_backups_versioning_strategy_title">備份策略</string>
+    <string name="pref_backups_versioning_strategy_single_backup">單一備份</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">您選擇的備份方案並不可靠，我們也強烈反對。要是此單一備份有任何錯誤，將導致您失去唯一的備份。</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">選擇備份策略</string>
+    <string name="pref_backups_location_title">備份位置</string>
     <string name="pref_backups_location_summary">備份將儲存在</string>
+    <string name="pref_backup_location_summary">備份將儲存於</string>
     <string name="pref_backups_trigger_title">觸發備份</string>
     <string name="pref_backups_trigger_summary">手動觸發備份</string>
     <string name="pref_backups_versions_title">保留的版本數</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="other">保留 %1$d 個備份</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">保留不限版本數的備份</string>
     <string name="pref_import_app_title">從其他應用程式匯入</string>
     <string name="pref_import_app_summary">從其他應用程式匯入驗證碼（需要系統管理員 root 權限）</string>
     <string name="pref_export_title">匯出</string>
@@ -95,8 +106,32 @@
     <string name="pref_encryption_summary">加密保險箱，並以密碼或生物特徵辨識解鎖。</string>
     <string name="pref_biometrics_title">生物特徵辨識解鎖</string>
     <string name="pref_biometrics_summary">允許使用生物特徵辨識驗證來解鎖保險箱</string>
+    <string name="pref_search_behavior_summary">在 %s 中搜尋</string>
+    <string name="pref_search_behavior_prompt">在以下項目中搜尋</string>
+    <string name="pref_search_behavior_type_name">名稱</string>
+    <string name="pref_search_behavior_type_issuer">簽發者</string>
+    <string name="pref_search_behavior_type_note">備註</string>
+    <string name="pref_search_behavior_type_groups">群組</string>
     <string name="pref_set_password_title">變更密碼</string>
     <string name="pref_set_password_summary">為保險箱設定新解鎖密碼</string>
+    <string name="event_title_vault_unlocked">保險箱已解鎖</string>
+    <string name="event_description_vault_unlocked">保險箱已成功解鎖</string>
+    <string name="event_title_backup_created">備份已建立</string>
+    <string name="event_description_backup_created">保險箱備份已成功建立</string>
+    <string name="event_title_android_backup_created">備份已由 Android 建立</string>
+    <string name="event_description_android_backup_created">保險箱備份已由 Android 成功建立</string>
+    <string name="event_title_vault_exported">已匯出保險箱</string>
+    <string name="event_description_vault_exported">已匯出一份保險箱的複本</string>
+    <string name="event_title_entry_shared">已分享項目</string>
+    <string name="event_description_entry_shared">已分享一筆資料</string>
+    <string name="event_title_vault_unlock_failed_password">密碼庫解鎖失敗（密碼）</string>
+    <string name="event_description_vault_unlock_failed_password">以密碼解鎖保險箱的失敗乙次</string>
+    <string name="event_title_vault_unlock_failed_biometrics">密碼庫解鎖失敗（生物特徵辨識）</string>
+    <string name="event_description_vault_unlock_failed_biometrics">以生物特徵解鎖保險箱的失敗乙次</string>
+    <string name="event_unknown">未知的事件類型</string>
+    <string name="audit_log_entry_deleted">（已刪除）</string>
+    <string name="today_at_time">今天 %1$s</string>
+    <string name="day_of_week_at_time">%1$s 的 %2$s</string>
     <string name="export_encrypted">加密保險箱</string>
     <string name="export_help">此動作將保險箱從 Aegis 的內部儲存空間裡匯出，請選擇欲匯出的格式：</string>
     <string name="export_warning_unencrypted">即將匯出未加密的 Aegis 保險箱。<b>不建議</b>。</string>
@@ -112,11 +147,11 @@
         <item quantity="other">選取了 %d 個群組</item>
     </plurals>
     <string name="export_no_groups_selected">尚未選擇要匯出的群組</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis 驗證器匯出</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis 驗證器匯出</string>
     <string name="choose_authentication_method">安全性</string>
     <string name="authentication_method_explanation">Aegis 是一款安全第一的雙因素驗證（2FA）應用程式。憑證儲存於特殊的保險箱檔案中，此保險箱可依照使用者的設定以密碼金鑰加密。就算駭客取得了被加密的保險箱檔案，他們也無法在不知道密碼的情況下取得內含的憑證。 \n\n我們已預先為您的裝置選擇了我們認為最適合的選項。</string>
     <string name="authentication_method_none">沒有</string>
-    <string name="authentication_method_none_description">保險箱並未上鎖也未加密。 <b>不建議使用此選項</b>。</string>
+    <string name="authentication_method_none_description">保險箱並未上鎖也未加密。<b>不建議使用此選項</b>。</string>
     <string name="authentication_method_password">密碼</string>
     <string name="authentication_method_password_description">需要密碼來解鎖保險箱。</string>
     <string name="authentication_method_password_explanation">警告：如果您忘記密碼，您將會無法還原憑證而不可逆的失去它們。</string>
@@ -147,17 +182,22 @@
     <string name="share">分享</string>
     <string name="yes">確定</string>
     <string name="no">取消</string>
+    <string name="undo">復原</string>
     <string name="unlock">解鎖</string>
     <string name="advanced">進階設定</string>
     <string name="counter">計數器</string>
     <string name="digits">位數</string>
     <string name="secret">密鑰</string>
-    <string name="scan">掃描QR碼</string>
+    <string name="scan">掃描 QR Code</string>
     <string name="scan_image">掃描圖片</string>
     <string name="enter_manually">手動輸入</string>
     <string name="set_up_biometric">設定生物特徵辨識解鎖</string>
     <string name="copy">複製</string>
     <string name="edit">編輯</string>
+    <string name="select_all">選擇全部</string>
+    <string name="assign_icons">分配圖示</string>
+    <string name="assign_groups">指派給群組</string>
+    <string name="assign_groups_dialog_dropdown">選擇群組</string>
     <string name="favorite" comment="Verb">加入最愛</string>
     <string name="unfavorite" comment="Verb">移出最愛</string>
     <string name="error_all_caps">錯誤</string>
@@ -172,9 +212,12 @@
     <string name="snackbar_authentication_method">請選擇驗證方式</string>
     <string name="encrypting_vault">正在加密保險箱</string>
     <string name="exporting_vault">正在匯出保險箱</string>
+    <string name="optimizing_icon">正在最佳化圖示</string>
+    <string name="optimizing_icon_multiple">正在最佳化圖示 %1$d/%2$d</string>
     <string name="reading_file">讀取檔案中</string>
     <string name="requesting_root_access">需要使用 root</string>
-    <string name="analyzing_qr">分析 QR code 中</string>
+    <string name="analyzing_qr">分析 QR Code 中</string>
+    <string name="analyzing_qr_multiple">正在分析 QR Code %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="other">增加 %d 個條目進保險箱</item>
     </plurals>
@@ -188,6 +231,7 @@
     <string name="discard_changes">要捨棄變更嗎？</string>
     <string name="discard_changes_description">您的變更尚未儲存</string>
     <string name="saving_profile_error">儲存設定檔時發生錯誤</string>
+    <string name="saving_assign_icons_error">指派圖示時發生錯誤</string>
     <string name="welcome">歡迎使用</string>
     <string name="app_description">Aegis 是一款免費、安全與開放原始碼的雙因素驗證（2FA）應用程式</string>
     <string name="setup_completed">設定完成</string>
@@ -196,6 +240,7 @@
     <string name="copied">已複製</string>
     <string name="errors_copied">錯誤已複製至剪貼簿</string>
     <string name="version_copied">版本號已複製至剪貼簿</string>
+    <string name="error_required_field">此欄位必填</string>
     <string name="error_occurred">發生了一個錯誤</string>
     <string name="decryption_error">解鎖保險箱時發生錯誤</string>
     <string name="decryption_corrupt_error">解鎖保險箱時發生錯誤，您的保險箱檔案可能已損壞。</string>
@@ -210,7 +255,7 @@
     <string name="disable_encryption_error">停用加密時出錯</string>
     <string name="backup_successful">已成功排程備份</string>
     <string name="backup_error">嘗試建立備份時發生錯誤</string>
-    <string name="backup_status_success">最近備份成攻: %s</string>
+    <string name="backup_status_success">最近備份成功: %s</string>
     <string name="backup_status_failed">最近備份失敗: %s</string>
     <string name="backup_status_none">尚未建立任何備份</string>
     <string name="documentsui_error">似乎無法在您的裝置上找到 DocumentsUI。此為新增與建立文件的重要系統元件。若您曾使用&quot;debloat&quot; 軟體替您的裝置「瘦身」，極有可能您誤刪此程式，請將其重新安裝。</string>
@@ -231,9 +276,13 @@
     <string name="file_not_found">錯誤：找不到檔案</string>
     <string name="reading_file_error">試圖開啟檔案時發生錯誤</string>
     <string name="app_lookup_error">錯誤：應用程式未安裝</string>
+    <string name="root_error">錯誤：無法取得 root 權限</string>
     <plurals name="imported_entries_count">
         <item quantity="other">已匯入 %d 個條目</item>
     </plurals>
+    <plurals name="entries_shown">
+        <item quantity="other">正在顯示 %d 條條目</item>
+    </plurals>
     <string name="intro_import_error_title">匯入至保險箱時發生錯誤</string>
     <string name="import_error_title">匯入時發生了一些錯誤。</string>
     <string name="exporting_vault_error">匯出保險箱時發生錯誤</string>
@@ -241,28 +290,35 @@
     <string name="encryption_set_password_error">試圖設定密碼時發生錯誤。</string>
     <string name="encryption_enable_biometrics_error">嘗試啟用生物特徵辨識解鎖時發生錯誤。某些裝置的生物特徵辨識認證實作欠佳，您手中的裝置或許就是其中之一。考慮改用僅密碼設定。</string>
     <string name="no_cameras_available">鏡頭不可用</string>
-    <string name="read_qr_error">試圖讀取QR碼時出錯</string>
+    <string name="read_qr_error">試圖讀取 QR Code 時出錯</string>
     <string name="read_qr_error_phonefactor">Aegis 不相容於微軟私有的雙因素驗證演算法。請確保在 Microsoft 365 設定雙因素驗證時選擇「設定無通知的應用程式」。</string>
     <string name="partial_google_auth_import">偵測到不完整的 Google Authenticator 匯出</string>
+    <string name="partial_google_auth_import_warning">您的匯入中缺少部分 QR Code。詳情如下：\n\n<b>%s</b>\n\n您可以繼續匯入這份闕漏的匯出檔，但我們建議您在補齊 QR Code 後再嘗試匯入，以免無法存取憑證。</string>
+    <string name="missing_qr_code_descriptor">• QR Code %d</string>
     <string name="import_google_auth_failure">匯入 Google Authenticator 失敗</string>
-    <string name="authentication_method_raw">原始檔案</string>
     <string name="unlocking_vault">解鎖保險箱</string>
-    <string name="slot_this_device"> （此裝置）</string>
+    <string name="rename_group">重新命名群組</string>
+    <string name="no_group_selection">倘若一個條目並不歸類在任何群組內，它會被歸類進「無群組」。</string>
     <string name="remove_group">移除群組</string>
     <string name="remove_group_description">您確定要刪除這個群組嗎？此群組內的條目將自動移動到「無群組」。</string>
+    <string name="remove_unused_groups">刪除未使用的群組</string>
+    <string name="remove_unused_groups_description">您確定要刪除所有沒有歸類任何條目的群組嗎？</string>
     <string name="remove_icon_pack">移除圖示合輯</string>
     <string name="details">詳細資訊</string>
     <string name="show_error_details">顯示錯誤詳細內容</string>
     <string name="lock">鎖定</string>
     <string name="name">名稱</string>
     <string name="no_group">無群組</string>
-    <string name="sort">排序</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">排序</string>
     <string name="sort_alphabetically">服務商（A 到 Z）</string>
     <string name="sort_alphabetically_reverse">服務商（Z 到 A）</string>
     <string name="sort_alphabetically_name">帳戶（A 到 Z）</string>
     <string name="sort_alphabetically_name_reverse">帳戶（Z 到 A）</string>
     <string name="sort_usage_count">使用次數</string>
+    <string name="sort_last_used">最近已使用</string>
     <string name="sort_custom">自訂</string>
+    <string name="last_used">最近已使用</string>
+    <string name="last_used_never">從不</string>
     <string name="new_group">新增群組…</string>
     <string name="group">群組</string>
     <string name="group_name_hint">群組名稱</string>
@@ -271,10 +327,20 @@
     <string name="preference_reset_usage_count">重設使用次數</string>
     <string name="preference_reset_usage_count_summary">重設保險箱內所有條目的使用次數</string>
     <string name="preference_reset_usage_count_dialog">確定要將保險箱內所有條目的使用次數重設為零嗎？</string>
-    <string name="note">備註</string>
+    <string name="note" comment="Users can add a note to an entry">備註</string>
     <string name="clear">清除</string>
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">複製條目</string>
+    <string name="dialog_duplicate_entry_message">本條目與其他既存條目具有相同的名稱或發行者。您想要怎麼做？</string>
+    <string name="dialog_duplicate_entry_overwrite_title">覆蓋既存條目（們）</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">使用新的設定置換既存的條目（們），本更動無法復原</string>
+    <string name="dialog_duplicate_entry_suffix_title">增加尾註</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">為新的條目增加一個後綴詞，新的名稱如下：%s</string>
+    <string name="dialog_duplicate_entry_cancel_title">取消儲存</string>
     <string name="pref_highlight_entry_title">強調選取的憑證</string>
     <string name="pref_highlight_entry_summary">輕觸後暫時凸顯該驗證碼以與它者區分</string>
+    <string name="pref_minimize_on_copy_title">複製後最小化</string>
+    <string name="pref_copy_behavior_title">複製令牌至剪貼簿</string>
+    <string name="pref_search_behavior_title">搜尋行為</string>
     <string name="pref_pause_entry_title">被觸碰時凍結驗證碼</string>
     <string name="pref_pause_entry_summary">輕觸以暫停驗證碼的自動更新機制：只要驗證碼還在焦點上，它們就不會被自動更新。需要啟用「輕觸以顯示」或「強調選取的憑證」功能。</string>
     <string name="pin_keyboard_description">請輸入您的密碼以啟用 PIN 鍵盤。請注意，只有當您的密碼僅由數字構成時才能使用</string>
@@ -292,11 +358,9 @@
     <string name="tiles_mode_title">平鋪</string>
     <string name="unknown_issuer">未知的服務商</string>
     <string name="unknown_account_name">未知帳戶</string>
-    <plurals name="import_error_dialog">
-        <item quantity="other">Aegis 已忽略無法匯入的 %d 個憑證。如欲了解更詳細的錯誤資訊，請按「詳細內容」。</item>
-    </plurals>
-    <string name="unable_to_read_qrcode_file">無法從 %s 檔案讀取和處理QR碼</string>
-    <string name="unable_to_generate_qrcode">無法產生QR碼</string>
+    <string name="unable_to_read_qrcode_file">無法從 %s 檔案讀取和處理 QR Code</string>
+    <string name="unable_to_process_shared_text">無法將共用文本作為 OTP 進行處理</string>
+    <string name="unable_to_generate_qrcode">無法產生 QR Code</string>
     <string name="select_picture">選擇圖片</string>
     <string name="select_icon">選擇圖示</string>
     <string name="tile_open_vault" comment="label for a quick settings tile that opens the app when tapped">打開保險箱</string>
@@ -325,18 +389,24 @@
     <string name="time_sync_warning_title">自動同步時間</string>
     <string name="time_sync_warning_message">僅幾秒鐘的偏差可能會導致驗證碼錯誤。您的裝置似乎未設定為自動同步時間。您現在要設定自動同步時間嗎？</string>
     <string name="time_sync_warning_disable">不要再次提醒。我知道我在做什麼。</string>
-    <string name="google_qr_export_unrelated">找到不相關的QR碼。請嘗試重新掃描。</string>
+    <string name="google_qr_export_unrelated">發現無關的 QR Code。請重新開啟掃描器。</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="other">已掃描 %d/%d</item>
+        <item quantity="other">已掃描 %1$d/%2$d 個 QR Code</item>
     </plurals>
-    <string name="google_qr_export_unexpected">預期QR碼 %d，已掃描 %d</string>
+    <string name="google_qr_export_unexpected">預期 QR Code 個數 %1$d，然而已掃描個數 %2$d</string>
     <string name="backup_error_bar_message"><b>近期的保險箱備份失敗</b></string>
-    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        因為錯誤發生，最近一次嘗試使用 %s 的備份行為失敗。本次備份使用 %s。請檢查您的備份設定以確保備份能順利完成。
+    <string name="backup_error_dialog_details" comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">        最近一次嘗試使用 %1$s 的備份行為失敗。本次備份發生於 %2$s。請檢查您的備份設定以確保備份能順利完成。
     </string>
     <string name="backup_system_builtin">Aegis 內建的自動備份</string>
     <string name="backup_system_android">Android 雲端備份</string>
+    <string name="backup_reminder_bar_message_with_latest" comment="The parameter is an elapsed time in the style of 'x seconds/minutes/days ago'">        最新的備份已過時 (%s)    
+    </string>
+    <string name="backup_reminder_bar_message">        變更尚未備份。
+    </string>
+    <string name="backup_reminder_bar_dialog_title">變更尚未備份</string>
     <string name="backup_reminder_bar_dialog_summary">        尚未備份最近針對保險箱的操作。週期性的備份是避免遺失登入方法的最佳良方。請考慮在設定選單內啟用自動備份。
     </string>
+    <string name="backup_reminder_bar_dialog_accept">設置備份</string>
     <string name="backup_plaintext_export_warning"><b>最近保險箱曾匯出為純文字</b></string>
     <string name="pref_show_plaintext_warning_hint">不再顯示這則警告</string>
     <string name="backup_plaintext_warning_explanation">本警示會跳出來因為您最近匯出了未加密的保險箱複本。為保護憑證的安全性，我們建議您在不需要使用後刪除此檔案。</string>
@@ -350,19 +420,23 @@
     <string name="pick_icon">選取圖示</string>
     <string name="uncategorized">未分類</string>
     <string name="done">完成</string>
+    <plurals name="qr_count">
+        <item quantity="other">%d / %d QR Code</item>
+    </plurals>
     <string name="next">下一個</string>
     <string name="previous">上一個</string>
     <string name="copy_uri">複製 URI</string>
     <string name="unable_to_copy_uri_to_clipboard">無法複製 URI 到剪貼簿</string>
     <string name="uri_copied_to_clipboard">URI 已複製到剪貼簿</string>
-    <string name="transfer_entry">轉移條目</string>
-    <string name="transfer_entry_description">使用您想轉移至其他驗證器應用程式，請掃描此QR碼</string>
+    <string name="transfer_entry_description">請使用您欲轉移至的驗證器應用程式掃描此 QR Code</string>
+    <string name="transfer_entry_brightness">觸碰 QR code 使螢幕達到最大亮度</string>
     <string name="google_auth_compatible_transfer_description">請使用 Aegis 或 Google Authenticator 掃描以下 QR Code。\n\n由於 Google Authenticator 程式的限制，將僅包含使用 SHA1 並產生六位數密碼的 TOTP &amp; HOTP 憑證</string>
     <string name="password_strength_very_weak">很弱</string>
     <string name="password_strength_weak">弱</string>
     <string name="password_strength_fair">中等</string>
     <string name="password_strength_good">好</string>
     <string name="password_strength_strong">强</string>
+    <string name="password_strength_unknown">密碼太長，無法進行強度分析</string>
     <string name="pref_pin_keyboard_title">在螢幕鎖定畫面上使用 PIN 鍵盤</string>
     <string name="pref_pin_keyboard_summary">啟用此選項以螢幕鎖定畫面上使用 PIN 鍵盤，密碼僅支援純數字</string>
     <string name="title_activity_preferences">設定</string>
@@ -370,25 +444,36 @@
     <string name="title_activity_transfer">轉移條目</string>
     <string name="title_activity_about">關於</string>
     <string name="title_activity_edit_entry">編輯條目</string>
-    <string name="title_activity_scan_qr">掃描QR碼</string>
-    <string name="title_activity_manage_slots">管理密鎖槽位</string>
+    <string name="title_activity_scan_qr">掃描 QR Code</string>
     <string name="title_activity_import_entries">匯入條目</string>
+    <string name="title_activity_assign_icons">分配圖示</string>
+    <string name="title_activity_licenses">第三方許可證</string>
     <string name="dialog_wipe_entries_title">清除條目</string>
     <string name="dialog_wipe_entries_message">您的保險箱中已包含某些條目，您是否想在匯入這個檔案前，先移除這些重複的條目？\n\n<b>如此將永久刪除保險箱中原本存在的重複條目。</b></string>
     <string name="dialog_wipe_entries_checkbox">清除保險箱中的所有內容</string>
     <string name="pref_panic_trigger_title">危急時刪除保險箱</string>
     <string name="pref_panic_trigger_summary">從 Ripple 收到危急指令時刪除保險箱</string>
-    <string name="import_vault">匯入保險箱</string>
+    <string name="import_vault">匯入 Aegis 金鑰庫</string>
+    <string name="import_vault_hint">想從其他 2FA 驗證器應用程式匯入？先完成首次設定，就可在設定功能表中匯入。</string>
     <string name="importer_help_authy">提供 <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b> 的複本，其位於 Authy 的內部儲存空間。</string>
     <string name="importer_help_andotp">提供 andOTP 的匯出/備份檔。</string>
-    <string name="importer_help_freeotp">提供 <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b> 的複本，其位於 FreeOTP 的內部儲存空間。</string>
+    <string name="importer_help_bitwarden">請提供 Bitwarden 匯出/備份檔案。不支援加密檔案。</string>
+    <string name="importer_help_battle_net_authenticator">請提供 <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b> 的副本；其位於 Battle.net Authenticator 的內部儲存空間。</string>
+    <string name="importer_help_duo">請提供 <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b> 的副本，其位於 DUO 的內部儲存空間。</string>
+    <string name="importer_help_ente_auth">請提供 Ente Auth 匯出檔案。目前只支援未加密的檔案。</string>
     <string name="importer_help_freeotp_plus">提供 FreeOTP+ 的匯出檔。</string>
+    <string name="importer_help_google_authenticator"><b>僅支援 Google Authenticator v5.10 及之前版本的資料庫檔案</b>。\n\n請提供 <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b> 的副本，其位於 Google Authenticator 的內部儲存空間中。</string>
     <string name="importer_help_microsoft_authenticator">提供 <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b> 的複本，其位於 Microsoft Authenticator 的內部儲存空間。</string>
     <string name="importer_help_plain_text">提供純文字檔，其中每行都是完整的 Google Authenticator URI</string>
+    <string name="importer_help_steam"><b>僅支援 Steam v3.0或更新版本</b>。 請提供 <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b> 的副本，其位於 Steam 的內部儲存空間。</string>
     <string name="importer_help_totp_authenticator">提供 TOTP 驗證程式的匯出檔。</string>
     <string name="importer_help_winauth">提供 WinAuth 的匯出檔。</string>
+    <string name="import_assign_icons_dialog_title">分配圖示</string>
+    <string name="importer_encrypted_exception_google_authenticator">已跳過已加密的條目：%s</string>
     <string name="importer_help_direct">直接從 %s 匯入條目。這個裝置需已安裝此應用程式且 Aegis 擁有 root 權限。</string>
     <string name="groups">群組</string>
+    <string name="pref_focus_search">在應用程式啟動時把焦點放在搜尋上</string>
+    <string name="pref_focus_search_summary">開啟應用程式後立即把焦點放在搜尋上</string>
     <string name="pref_grouping_halves">對分</string>
     <string name="pref_grouping_none">未分組</string>
     <string name="pref_grouping_size_two">分成兩群</string>
@@ -400,19 +485,19 @@
     <string name="pref_account_name_position_hidden">隱藏</string>
     <string name="pref_account_name_position_end">在發行者旁</string>
     <string name="pref_account_name_position_below">在發行者下</string>
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="other">%d 秒前</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="other">%d 分前</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="other">%d 小時前</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="other">%d 天前</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="other">%d 年前</item>
     </plurals>
     <plurals name="dropdown_checkboxes_default_count">
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 99a98d72..14f10385 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="authentication_methods">
-        <item>@string/authentication_method_none</item>
-        <item>@string/authentication_method_password</item>
-        <item>@string/authentication_method_biometrics</item>
-    </string-array>
-
     <string-array name="otp_types_array">
         <item>TOTP</item>
         <item>HOTP</item>
@@ -49,6 +43,7 @@
         <item>Dutch</item>
         <item>Dutch (Frysian)</item>
         <item>English</item>
+        <item>Estonian</item>
         <item>Finnish</item>
         <item>French</item>
         <item>Galician</item>
@@ -61,14 +56,18 @@
         <item>Indonesian</item>
         <item>Japanese</item>
         <item>Kannada</item>
+        <item>Korean</item>
         <item>Latvian</item>
         <item>Lithuanian</item>
+        <item>Norwegian (Bokmål)</item>
+        <item>Malayalam</item>
         <item>Persian</item>
         <item>Polish</item>
         <item>Portuguese</item>
         <item>Portuguese (Brazilian)</item>
         <item>Romanian</item>
         <item>Russian</item>
+        <item>Serbian</item>
         <item>Slovak</item>
         <item>Spanish</item>
         <item>Swedish</item>
@@ -90,6 +89,7 @@
         <item>nl</item>
         <item>fy_NL</item>
         <item>en</item>
+        <item>et</item>
         <item>fi</item>
         <item>fr</item>
         <item>gl</item>
@@ -102,14 +102,18 @@
         <item>in</item>
         <item>ja</item>
         <item>kn</item>
+        <item>ko</item>
         <item>lv</item>
         <item>lt</item>
+        <item>nb</item>
+        <item>ml</item>
         <item>fa</item>
         <item>pl</item>
-        <item>pt</item>
+        <item>pt_PT</item>
         <item>pt_BR</item>
         <item>ro</item>
         <item>ru</item>
+        <item>sr</item>
         <item>sk</item>
         <item>es</item>
         <item>sv</item>
@@ -131,6 +135,13 @@
         <item>@string/pref_auto_lock_type_device_lock</item>
     </string-array>
 
+    <string-array name="pref_search_behavior_types">
+        <item>@string/pref_search_behavior_type_issuer</item>
+        <item>@string/pref_search_behavior_type_name</item>
+        <item>@string/pref_search_behavior_type_note</item>
+        <item>@string/pref_search_behavior_type_groups</item>
+    </string-array>
+
     <string-array name="export_formats">
         <item>@string/export_format_aegis</item>
         <item>@string/export_format_html</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 70a703c7..8baea4f4 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="primaryText" format="color" />
-    <attr name="secondaryText" format="color" />
-    <attr name="authText" format="color" />
-    <attr name="backgroundColor" format="color" />
-    <attr name="cardBackground" format="color" />
-    <attr name="cardBackgroundFocused" format="color" />
-    <attr name="codePrimaryText" format="color" />
-    <attr name="iconColorPrimary" format="color" />
-    <attr name="iconColorInverted" format="color" />
     <attr name="dropdownStyle" format="reference" />
-    <attr name="colorAppBar" format="color" />
-    <attr name="outlineButtonStyle" format="reference" />
+    <attr name="colorFavorite" format="color" />
+    <attr name="colorPrimaryAlternative" format="color" />
+    <attr name="colorProgressbar" format="color" />
+    <attr name="colorOnDark" />
+    <attr name="colorSuccess" />
+    <attr name="colorOnSurfaceDim" />
+    <attr name="colorCode" />
+    <attr name="colorCodeHidden" />
 
     <declare-styleable name="SlideIndicator">
         <attr name="dot_radius" format="dimension" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 09567b50..a71bdfbc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,54 +1,110 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#0d47a1</color>
-    <color name="colorPrimarySelected">#FF1565C0</color>
-    <color name="colorSecondary">#FF5252</color>
-    <color name="colorPrimaryDark">#002171</color>
-    <color name="colorHeaderSuccess">#12b600</color>
-    <color name="colorPrimaryLight">#5472d3</color>
-    <color name="colorAccent">#FF5252</color>
-    <color name="colorAccentPressed">#FF5252</color>
-    <color name="colorFavorite">#F9A825</color>
-    <color name="primary_text">#212121</color>
-    <color name="secondary_text">#A0A0A0</color>
-    <color name="auth_text">#4c4c4c</color>
-    <color name="auth_button">#0d86c1</color>
-    <color name="extra_info_text">#8e8e8e</color>
-    <color name="primary_text_inverted">#ffffff</color>
-    <color name="secondary_text_inverted">#efefef</color>
-    <color name="icons">#FFFFFF</color>
-    <color name="divider">#BDBDBD</color>
-    <color name="divider2">#DADADA</color>
-    <color name="background">#f2f2f2</color>
-    <color name="card_background">#ffffff</color>
-    <color name="card_background_focused">#DBDBDB</color>
-
-    <color name="icon_primary">#757575</color>
-    <color name="icon_primary_inverted">#ffffff</color>
-    <color name="icon_primary_dark">#ffffff</color>
-    <color name="icon_primary_dark_inverted">#212121</color>
-
-    <color name="indicator_dot">#aaaaaa</color>
-    <color name="indicator_dot_selected">#4c4c4c</color>
-    <color name="indicator_dot_dark">#656565</color>
-    <color name="indicator_dot_selected_dark">#ffffff</color>
-
-    <color name="code_primary_text">#1058C9</color>
-    <color name="code_primary_text_dark">#ffffff</color>
-
-    <color name="card_background_dark">#2B2B2B</color>
-    <color name="card_background_focused_dark">#303030</color>
-    <color name="card_background_focused_true_dark">#363636</color>
-    <color name="primary_text_dark">#ffffff</color>
-    <color name="hint_text_dark">#a7a7a7</color>
-    <color name="secondary_text_dark">#FF5252</color>
-    <color name="background_dark">#212121</color>
-    <color name="background_dark_statusbar">#101010</color>
-    <color name="background_true_dark">#000000</color>
-    <color name="divider_dark">#393939</color>
-    <color name="divider_true_dark">#222222</color>
-
-    <color name="warning_color">#f4511e</color>
-    <color name="hint_color">#42000000</color>
-    <color name="success_color">#009688</color>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+    <color name="md_theme_light_primary">#2b5bb5</color>
+    <color name="md_theme_light_onPrimary">#ffffff</color>
+    <color name="md_theme_light_primaryContainer">#d9e2ff</color>
+    <color name="md_theme_light_onPrimaryContainer">#001945</color>
+    <color name="md_theme_light_primaryFixed">#d9e2ff</color>
+    <color name="md_theme_light_onPrimaryFixed">#001945</color>
+    <color name="md_theme_light_primaryFixedDim">#b0c6ff</color>
+    <color name="md_theme_light_onPrimaryFixedVariant">#00429c</color>
+    <color name="md_theme_light_secondary">#365ca8</color>
+    <color name="md_theme_light_onSecondary">#ffffff</color>
+    <color name="md_theme_light_secondaryContainer">#d9e2ff</color>
+    <color name="md_theme_light_onSecondaryContainer">#001944</color>
+    <color name="md_theme_light_secondaryFixed">#d9e2ff</color>
+    <color name="md_theme_light_onSecondaryFixed">#001944</color>
+    <color name="md_theme_light_secondaryFixedDim">#b0c6ff</color>
+    <color name="md_theme_light_onSecondaryFixedVariant">#18438f</color>
+    <color name="md_theme_light_tertiary">#006491</color>
+    <color name="md_theme_light_onTertiary">#ffffff</color>
+    <color name="md_theme_light_tertiaryContainer">#c9e6ff</color>
+    <color name="md_theme_light_onTertiaryContainer">#001e2f</color>
+    <color name="md_theme_light_tertiaryFixed">#c9e6ff</color>
+    <color name="md_theme_light_onTertiaryFixed">#001e2f</color>
+    <color name="md_theme_light_tertiaryFixedDim">#8aceff</color>
+    <color name="md_theme_light_onTertiaryFixedVariant">#004c6e</color>
+    <color name="md_theme_light_error">#ba1a1a</color>
+    <color name="md_theme_light_errorContainer">#ffdad6</color>
+    <color name="md_theme_light_onError">#ffffff</color>
+    <color name="md_theme_light_onErrorContainer">#410002</color>
+    <color name="md_theme_light_background">#fefbff</color>
+    <color name="md_theme_light_onBackground">#1b1b1f</color>
+    <color name="md_theme_light_outline">#757780</color>
+    <color name="md_theme_light_inverseOnSurface">#f2f0f4</color>
+    <color name="md_theme_light_inverseSurface">#303034</color>
+    <color name="md_theme_light_inversePrimary">#b0c6ff</color>
+    <color name="md_theme_light_shadow">#000000</color>
+    <color name="md_theme_light_surfaceTint">#2b5bb5</color>
+    <color name="md_theme_light_outlineVariant">#c5c6d0</color>
+    <color name="md_theme_light_scrim">#000000</color>
+    <color name="md_theme_light_surface">#fbf8fd</color>
+    <color name="md_theme_light_onSurface">#1b1b1f</color>
+    <color name="md_theme_light_surfaceVariant">#e1e2ec</color>
+    <color name="md_theme_light_onSurfaceVariant">#44464f</color>
+    <color name="md_theme_light_surfaceContainerHighest">#e4e2e6</color>
+    <color name="md_theme_light_surfaceContainerHigh">#e9e7ec</color>
+    <color name="md_theme_light_surfaceContainer">#efedf1</color>
+    <color name="md_theme_light_surfaceContainerLow">#f5f3f7</color>
+    <color name="md_theme_light_surfaceContainerLowest">#ffffff</color>
+    <color name="md_theme_light_surfaceDim">#dbd9dd</color>
+    <color name="md_theme_light_surfaceBright">#fbf8fd</color>
+    <color name="md_theme_dark_primary">#b0c6ff</color>
+    <color name="md_theme_dark_onPrimary">#002d6f</color>
+    <color name="md_theme_dark_primaryContainer">#00429c</color>
+    <color name="md_theme_dark_onPrimaryContainer">#d9e2ff</color>
+    <color name="md_theme_dark_primaryFixed">#d9e2ff</color>
+    <color name="md_theme_dark_onPrimaryFixed">#001945</color>
+    <color name="md_theme_dark_primaryFixedDim">#b0c6ff</color>
+    <color name="md_theme_dark_onPrimaryFixedVariant">#00429c</color>
+    <color name="md_theme_dark_secondary">#b0c6ff</color>
+    <color name="md_theme_dark_onSecondary">#002d6e</color>
+    <color name="md_theme_dark_secondaryContainer">#18438f</color>
+    <color name="md_theme_dark_onSecondaryContainer">#d9e2ff</color>
+    <color name="md_theme_dark_secondaryFixed">#d9e2ff</color>
+    <color name="md_theme_dark_onSecondaryFixed">#001944</color>
+    <color name="md_theme_dark_secondaryFixedDim">#b0c6ff</color>
+    <color name="md_theme_dark_onSecondaryFixedVariant">#18438f</color>
+    <color name="md_theme_dark_tertiary">#8aceff</color>
+    <color name="md_theme_dark_onTertiary">#00344e</color>
+    <color name="md_theme_dark_tertiaryContainer">#004c6e</color>
+    <color name="md_theme_dark_onTertiaryContainer">#c9e6ff</color>
+    <color name="md_theme_dark_tertiaryFixed">#c9e6ff</color>
+    <color name="md_theme_dark_onTertiaryFixed">#001e2f</color>
+    <color name="md_theme_dark_tertiaryFixedDim">#8aceff</color>
+    <color name="md_theme_dark_onTertiaryFixedVariant">#004c6e</color>
+    <color name="md_theme_dark_error">#ffb4ab</color>
+    <color name="md_theme_dark_errorContainer">#93000a</color>
+    <color name="md_theme_dark_onError">#690005</color>
+    <color name="md_theme_dark_onErrorContainer">#ffdad6</color>
+    <color name="md_theme_dark_background">#1b1b1f</color>
+    <color name="md_theme_dark_onBackground">#e4e2e6</color>
+    <color name="md_theme_dark_outline">#8f9099</color>
+    <color name="md_theme_dark_inverseOnSurface">#1b1b1f</color>
+    <color name="md_theme_dark_inverseSurface">#e4e2e6</color>
+    <color name="md_theme_dark_inversePrimary">#2b5bb5</color>
+    <color name="md_theme_dark_shadow">#000000</color>
+    <color name="md_theme_dark_surfaceTint">#b0c6ff</color>
+    <color name="md_theme_dark_outlineVariant">#44464f</color>
+    <color name="md_theme_dark_scrim">#000000</color>
+    <color name="md_theme_dark_surface">#131316</color>
+    <color name="md_theme_dark_onSurface">#c7c6ca</color>
+    <color name="md_theme_dark_surfaceVariant">#44464f</color>
+    <color name="md_theme_dark_onSurfaceVariant">#c5c6d0</color>
+    <color name="md_theme_dark_surfaceContainerHighest">#343438</color>
+    <color name="md_theme_dark_surfaceContainerHigh">#292a2d</color>
+    <color name="md_theme_dark_surfaceContainer">#1f1f23</color>
+    <color name="md_theme_dark_surfaceContainerLow">#1b1b1f</color>
+    <color name="md_theme_dark_surfaceContainerLowest">#0d0e11</color>
+    <color name="md_theme_dark_surfaceDim">#131316</color>
+    <color name="md_theme_dark_surfaceBright">#39393c</color>
+    <!-- Custom -->
+    <color name="aegis_theme_all_favorite">#F9A825</color>
+    <color name="aegis_theme_light_success">#518242</color>
+    <color name="aegis_theme_dark_success">#d9e7cb</color>
+    <color name="aegis_theme_light_onSurfaceDim">#9D9EA2</color>
+    <color name="aegis_theme_dark_onSurfaceDim">#616371</color>
+    <!-- Hacks to force the status bar to the correct color during action mode.
+         These colors are used by AppCompatDelegateImpl.updateStatusGuardColor -->
+    <color name="abc_decor_view_status_guard_light" tools:override="true">@android:color/transparent</color>
+    <color name="abc_decor_view_status_guard" tools:override="true">@android:color/transparent</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 48b396f6..104bdeb9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,8 +1,4 @@
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="list_item_height">48dp</dimen>
-    <dimen name="auth_leader_text_size">46sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 65323954..4fe617bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">Aegis</string>
     <string name="app_name_full" translatable="false">Aegis Authenticator</string>
     <string name="org_name_full" translatable="false">Beem Development</string>
@@ -12,6 +12,7 @@
     <string name="action_default_icon">Restore default icon</string>
     <string name="discard">Discard</string>
     <string name="save">Save</string>
+    <string name="all">All</string>
     <string name="issuer">Issuer</string>
     <string name="yandex_pin">PIN (4–16 digits)</string>
     <string name="motp_pin">PIN (4 digits)</string>
@@ -31,11 +32,15 @@
     <string name="pref_section_security_summary">Configure encryption, biometric unlock, auto lock and other security settings.</string>
     <string name="pref_section_import_export_title">Import &amp; Export</string>
     <string name="pref_section_import_export_summary">Import backups of Aegis or other authenticator apps. Create manual exports of your Aegis vault.</string>
+    <string name="pref_section_audit_log_title">Audit log</string>
+    <string name="pref_section_audit_log_summary">Find a list of all reported important events that happened within the app.</string>
     <string name="pref_section_backups_title">Backups</string>
     <string name="pref_section_backups_summary">Set up automatic backups to a location of your choosing or enable participation in Android\'s cloud backup system.</string>
     <string name="pref_section_icon_packs">Icon packs</string>
     <string name="pref_section_icon_packs_summary">Manage and import icon packs</string>
     <string name="pref_select_theme_title">Theme</string>
+    <string name="pref_dynamic_colors_title">Dynamic colors</string>
+    <string name="pref_dynamic_colors_summary">Apply an overlay based on the colors of your Android theme</string>
     <string name="pref_view_mode_title">View mode</string>
     <string name="pref_lang_title">Language</string>
     <string name="pref_show_icons_title">Show icons</string>
@@ -43,9 +48,14 @@
     <string name="pref_code_group_size_title">Code digit grouping</string>
     <string name="pref_code_group_size_summary">Select number of digits to group codes by</string>
     <string name="pref_account_name_position_title">Show the account name</string>
+    <string name="pref_show_next_code_title">Show next code</string>
+    <string name="pref_show_next_code_summary">Generate and show the next code ahead of time</string>
+    <string name="pref_expiration_state_title">Indicate when codes are about to expire</string>
+    <string name="pref_expiration_state_summary">Change the color of the codes and have them blink when they are about to expire</string>
+    <string name="pref_expiration_state_fallback">Change the color of the codes when they are about to expire</string>
     <string name="pref_shared_issuer_account_name_title">Only show account name when necessary</string>
     <string name="pref_shared_issuer_account_name_summary">Only show account names whenever they share the same issuer. Other account names will be hidden.</string>
-    <string name="pref_account_name_position_summary_override">This setting is overridden by the tiles view mode. Account name will always be shown below the issuer.</string>
+    <string name="pref_account_name_position_summary_override">This setting is overridden by the tiles view mode. Account name will be shown below the issuer.</string>
     <string name="pref_import_file_title">Import from file</string>
     <string name="pref_import_file_summary">Import tokens from a file</string>
     <string name="pref_android_backups_title">Android cloud backups</string>
@@ -57,15 +67,23 @@
     <string name="pref_backups_reminder_summary">Show a reminder to backup your vault in case you haven\'t backed up your latest changes.</string>
     <string name="pref_backups_reminder_dialog_title">Disable backup reminder</string>
     <string name="pref_backups_reminder_dialog_summary">Disabling this reminder means Aegis won\'t tell you whether or not you have changes that are not backed up yet. This puts you at risk of losing access to your tokens. Are you sure you want to disable the reminder?</string>
-    <string name="pref_backups_location_title">Directory for backup files</string>
+    <string name="pref_backups_versioning_strategy_title">Backup strategy</string>
+    <string name="pref_backups_versioning_strategy_keep_x_versions">Keep a number of versions</string>
+    <string name="pref_backups_versioning_strategy_single_backup">Single backup</string>
+    <string name="pref_backups_versioning_strategy_single_backup_warning">The selected backup strategy is not reliable and not recommended. A single backup failure could lead to losing your only backup.</string>
+    <string name="pref_backups_versioning_strategy_dialog_title">Select a backup strategy</string>
+    <string name="pref_backups_location_title">Backup location</string>
     <string name="pref_backups_location_summary">Backups will be stored at</string>
+    <string name="pref_backup_location_summary">Backup will be stored at</string>
     <string name="pref_backups_trigger_title">Trigger backup</string>
     <string name="pref_backups_trigger_summary">Manually trigger a backup</string>
     <string name="pref_backups_versions_title">Number of versions to keep</string>
+    <string name="pref_backups_versions_infinite">\u221E</string>
     <plurals name="pref_backups_versions_summary">
         <item quantity="one">Keep %1$d version of the backup</item>
         <item quantity="other">Keep %1$d versions of the backup</item>
     </plurals>
+    <string name="pref_backups_versions_infinite_summary">Keep an infinite number of versions of the backup</string>
     <string name="pref_import_app_title">Import from app</string>
     <string name="pref_import_app_summary">Import tokens from an app (requires root access)</string>
     <string name="pref_export_title">Export</string>
@@ -101,9 +119,37 @@
     <string name="pref_encryption_summary">Encrypt the vault and unlock it with a password or biometrics</string>
     <string name="pref_biometrics_title">Biometric unlock</string>
     <string name="pref_biometrics_summary">Allow biometric authentication to unlock the vault</string>
+    <string name="pref_search_behavior_summary">Search through: %s</string>
+    <string name="pref_search_behavior_prompt">Search in any of the following fields</string>
+    <string name="pref_search_behavior_type_name">Name</string>
+    <string name="pref_search_behavior_type_issuer">Issuer</string>
+    <string name="pref_search_behavior_type_note">Note</string>
+    <string name="pref_search_behavior_type_groups">Groups</string>
     <string name="pref_set_password_title">Change password</string>
     <string name="pref_set_password_summary">Set a new password which you will need to unlock your vault</string>
 
+    <string name="no_events_title">No reported events</string>
+    <string name="no_events_description">No important events have been reported within the app</string>
+    <string name="event_title_vault_unlocked">Vault unlocked</string>
+    <string name="event_description_vault_unlocked">The vault has been successfully unlocked</string>
+    <string name="event_title_backup_created">Backup created</string>
+    <string name="event_description_backup_created">A backup of the vault has been successfully created</string>
+    <string name="event_title_android_backup_created">Backup created by Android</string>
+    <string name="event_description_android_backup_created">A backup of the vault has been successfully created by Android</string>
+    <string name="event_title_vault_exported">Vault exported</string>
+    <string name="event_description_vault_exported">A copy of the vault has been exported</string>
+    <string name="event_title_entry_shared">Entry shared</string>
+    <string name="event_description_entry_shared">An entry was shared</string>
+    <string name="event_title_vault_unlock_failed_password">Vault unlock failed (password)</string>
+    <string name="event_description_vault_unlock_failed_password">An attempt to unlock the vault with a password failed</string>
+    <string name="event_title_vault_unlock_failed_biometrics">Vault unlock failed (biometrics)</string>
+    <string name="event_description_vault_unlock_failed_biometrics">An attempt to unlock the vault with biometrics failed</string>
+    <string name="event_unknown">Unknown event type</string>
+    <string name="audit_log_entry_deleted">(deleted)</string>
+
+    <string name="today_at_time">Today at %1$s</string>
+    <string name="day_of_week_at_time">%1$s at %2$s</string>
+
     <string name="export_encrypted">Encrypt the vault</string>
     <string name="export_help">This action will export the vault out of Aegis\' internal storage. Select the format you\'d like your export to be in:</string>
     <string name="export_warning_unencrypted">You are about to export an unencrypted copy of your Aegis vault. <b>This is not recommended</b>.</string>
@@ -120,7 +166,7 @@
         <item quantity="other">%d groups selected</item>
     </plurals>
     <string name="export_no_groups_selected">No groups selected to export</string>
-    <string name="export_html_title" context="The title of an HTML export document">Aegis Authenticator Export</string>
+    <string name="export_html_title" comment="The title of an HTML export document">Aegis Authenticator Export</string>
 
     <string name="choose_authentication_method">Security</string>
     <string name="authentication_method_explanation">Aegis is a security-focused 2FA app. Tokens are stored in a vault, that can optionally be encrypted with a password of your choosing. If an attacker obtains your encrypted vault file, they will not be able to access the contents without knowing the password.\n\nWe\'ve preselected the option that we think would fit best for your device.</string>
@@ -159,6 +205,7 @@
     <string name="share">Share</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="undo">Undo</string>
     <string name="unlock">Unlock</string>
     <string name="advanced">Advanced</string>
     <string name="counter">Counter</string>
@@ -170,6 +217,11 @@
     <string name="set_up_biometric">Set up biometric unlock</string>
     <string name="copy">Copy</string>
     <string name="edit">Edit</string>
+    <string name="select_all">Select all</string>
+    <string name="assign_icons">Assign icons</string>
+    <string name="assign_groups">Assign to group</string>
+    <string name="assign_groups_dialog_summary">Select a group you wish to assign the selected entries to.</string>
+    <string name="assign_groups_dialog_dropdown">Select group</string>
     <string name="favorite" comment="Verb">Favorite</string>
     <string name="unfavorite" comment="Verb">Unfavorite</string>
     <string name="error_all_caps">ERROR</string>
@@ -184,10 +236,12 @@
     <string name="snackbar_authentication_method">Please select an authentication method</string>
     <string name="encrypting_vault">Encrypting the vault</string>
     <string name="exporting_vault">Exporting the vault</string>
+    <string name="optimizing_icon">Optimizing icon</string>
+    <string name="optimizing_icon_multiple">Optimizing icons %1$d/%2$d</string>
     <string name="reading_file">Reading file</string>
     <string name="requesting_root_access">Requesting root access</string>
     <string name="analyzing_qr">Analyzing QR code</string>
-    <string name="analyzing_qr_multiple">Analyzing QR code %d/%d (%s)</string>
+    <string name="analyzing_qr_multiple">Analyzing QR code %1$d/%2$d (%3$s)</string>
     <plurals name="added_new_entries">
         <item quantity="one">Added %d new entry to the vault</item>
         <item quantity="other">Added %d new entries to the vault</item>
@@ -204,6 +258,7 @@
     <string name="discard_changes">Discard changes?</string>
     <string name="discard_changes_description">Your changes have not been saved</string>
     <string name="saving_profile_error">Error saving profile</string>
+    <string name="saving_assign_icons_error">Error assigning icons</string>
     <string name="welcome">Welcome</string>
     <string name="app_description">Aegis is a free, secure and open source 2FA app</string>
     <string name="setup_completed">Setup completed</string>
@@ -212,6 +267,7 @@
     <string name="copied">Copied</string>
     <string name="errors_copied">Errors copied to the clipboard</string>
     <string name="version_copied">Version copied to the clipboard</string>
+    <string name="error_required_field">This field is required</string>
     <string name="error_occurred">An error occurred</string>
     <string name="decryption_error">An error occurred while trying to unlock the vault</string>
     <string name="decryption_corrupt_error">An error occurred while trying to unlock the vault. Your vault file might be corrupt.</string>
@@ -275,15 +331,20 @@
     <string name="partial_google_auth_import">Incomplete Google Authenticator export detected</string>
     <string name="partial_google_auth_import_warning">Some QR codes are missing from your import. The following codes were not found:\n\n<b>%s</b>\n\nYou may continue importing this partial export but we recommend retrying with all of the QR codes so you don\'t risk losing access to any tokens.</string>
     <string name="missing_qr_code_descriptor">• QR code %d</string>
-    <string name="import_partial_export_anyway">Import %d tokens anyway</string>
+    <plurals name="import_partial_export_anyway">
+        <item quantity="one">Import %d token anyway</item>
+        <item quantity="other">Import %d tokens anyway</item>
+    </plurals>
     <string name="import_google_auth_failure">Importing Google Authenticator export failed</string>
     <string name="unrelated_google_auth_batches_error">Export contains information for an unrelated batch. Try importing 1 batch at a time.</string>
     <string name="no_tokens_can_be_imported">No tokens can be imported as a result</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Unlocking the vault</string>
-    <string name="slot_this_device">(this devices)</string>
+    <string name="rename_group">Rename Group</string>
+    <string name="no_group_selection">If an entry is not part of any group, it can be found under \"No group\".</string>
     <string name="remove_group">Remove group</string>
     <string name="remove_group_description">Are you sure you want to remove this group? Entries in this group will automatically switch to \'No group\'.</string>
+    <string name="remove_unused_groups">Delete unused groups</string>
+    <string name="remove_unused_groups_description">Are you sure you want to delete all groups that are not assigned to an entry?</string>
     <string name="remove_icon_pack">Remove icon pack</string>
     <string name="remove_icon_pack_description">Are you sure you want to remove this icon pack? Entries that use icons from this pack will not be affected.</string>
     <string name="details">Details</string>
@@ -291,13 +352,16 @@
     <string name="lock">Lock</string>
     <string name="name">Name</string>
     <string name="no_group">No group</string>
-    <string name="sort">Sort</string>
+    <string name="sort" comment="Title of the Sort button in the top action bar of the main view">Sort</string>
     <string name="sort_alphabetically">Issuer (A to Z)</string>
     <string name="sort_alphabetically_reverse">Issuer (Z to A)</string>
     <string name="sort_alphabetically_name">Account (A to Z)</string>
     <string name="sort_alphabetically_name_reverse">Account (Z to A)</string>
     <string name="sort_usage_count">Usage count</string>
+    <string name="sort_last_used">Last used</string>
     <string name="sort_custom">Custom</string>
+    <string name="last_used">Last used</string>
+    <string name="last_used_never">never</string>
     <string name="new_group">New group…</string>
     <string name="group">Group</string>
     <string name="group_name_hint">Group name</string>
@@ -306,14 +370,34 @@
     <string name="preference_reset_usage_count">Reset usage count</string>
     <string name="preference_reset_usage_count_summary">Reset the usage count of every entry in your vault</string>
     <string name="preference_reset_usage_count_dialog">Are you sure you want to set the usage count of every entry in your vault to 0?</string>
-    <string name="note">Note</string>
+    <string name="note" comment="Users can add a note to an entry">Note</string>
     <string name="clear">Clear</string>
 
+    <string name="dialog_duplicate_entry_title" comment="'Duplicate' is a noun here">Duplicate entry</string>
+    <string name="dialog_duplicate_entry_message">This entry has the same name and issuer as one or more existing entries. How would you like to proceed?</string>
+    <string name="dialog_duplicate_entry_overwrite_title">Overwrite existing entry/entries</string>
+    <string name="dialog_duplicate_entry_overwrite_subtitle">Replace the existing entry or entries with the new one. This action cannot be undone</string>
+    <string name="dialog_duplicate_entry_suffix_title">Add suffix</string>
+    <string name="dialog_duplicate_entry_suffix_subtitle">Add a suffix to the name of this new entry. The new name will be: %s</string>
+    <string name="dialog_duplicate_entry_cancel_title">Cancel save</string>
+    <string name="dialog_duplicate_entry_cancel_subtitle">Allows you to edit the entry before attempting to save it again</string>
+    <plurals name="dialog_duplicate_entry_overwrite_dialog_message">
+        <item quantity="one">Are you sure you want to delete %d entry with the following name:\n\n%s - %s</item>
+        <item quantity="other">Are you sure you want to delete %d entries with the following name:\n\n%s - %s</item>
+    </plurals>
+
+    <string name="dialog_duplicate_entry_overwrite_dialog_title">Confirm deletion</string>
+
+    <string name="pref_haptic_feedback_summary">Make your device vibrate when codes are refreshing</string>
+    <string name="pref_haptic_feedback_title">Haptic feedback</string>
     <string name="pref_highlight_entry_title">Highlight tokens when tapped</string>
     <string name="pref_highlight_entry_summary">Make tokens easier to distinguish from each other by temporarily highlighting them when tapped</string>
+    <string name="pref_groups_multiselect_title">Multiselect groups</string>
+    <string name="pref_groups_multiselect_summary">Allow the selection of multiple groups at the same time</string>
     <string name="pref_minimize_on_copy_title">Minimize on copy</string>
     <string name="pref_minimize_on_copy_summary">Minimize the app after copying a token</string>
     <string name="pref_copy_behavior_title">Copy tokens to the clipboard</string>
+    <string name="pref_search_behavior_title">Search behavior</string>
     <string name="pref_pause_entry_title">Freeze tokens when tapped</string>
     <string name="pref_pause_entry_summary">Pause automatic refresh of tokens by tapping them. Tokens will not update as long as they are focused. Requires \"Highlight tokens when tapped\" or \"Tap to reveal\".</string>
 
@@ -334,13 +418,13 @@
     <string name="unknown_issuer">Unknown issuer</string>
     <string name="unknown_account_name">Unknown account name</string>
     <plurals name="import_error_dialog">
-        <item quantity="one">Aegis could not import %d token. These tokens will be skipped. Press \'details\' to see more information about the errors.</item>
+        <item quantity="one">Aegis could not import %d token. This token will be skipped. Press \'details\' to see more information about the error.</item>
         <item quantity="other">Aegis could not import %d tokens. These tokens will be skipped. Press \'details\' to see more information about the errors.</item>
     </plurals>
     <string name="unable_to_process_deeplink">Unable to process deep link</string>
     <string name="unable_to_read_qrcode_file">Unable to read and process QR code from file: %s.</string>
     <string name="unable_to_process_shared_text">Unable to process shared text as OTP</string>
-    <string name="unable_to_read_qrcode_files">Unable to read and process some of the QR codes. Only %d/%d entries will be imported.</string>
+    <string name="unable_to_read_qrcode_files">Unable to read and process some of the QR codes. Only %1$d/%2$d entries will be imported.</string>
     <string name="unable_to_generate_qrcode">Unable to generate QR code</string>
     <string name="select_picture">Select picture</string>
     <string name="select_icon">Select icon</string>
@@ -376,15 +460,20 @@
     <string name="time_sync_warning_disable">Stop warning me. I know what I\'m doing.</string>
     <string name="google_qr_export_unrelated">Unrelated QR code found. Try restarting the scanner.</string>
     <plurals name="google_qr_export_scanned">
-        <item quantity="one">Scanned %d/%d QR codes</item>
-        <item quantity="other">Scanned %d/%d QR codes</item>
+        <item quantity="one">Scanned %1$d/%2$d QR codes</item>
+        <item quantity="other">Scanned %1$d/%2$d QR codes</item>
     </plurals>
-    <string name="google_qr_export_unexpected">Expected QR code #%d, but scanned #%d instead</string>
+    <string name="google_qr_export_unexpected">Expected QR code #%1$d, but scanned #%2$d instead</string>
     <string name="backup_error_bar_message"><b>Vault backup failed recently</b></string>
     <string
         name="backup_error_dialog_details"
         comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">
-        A recent vault backup attempt using %s failed because an error occurred. The backup was attempted %s. Please check your backup settings to make sure backups can complete successfully.
+        A recent vault backup attempt using %1$s failed because an error occurred. The backup was attempted %2$s. Please check your backup settings to make sure backups can complete successfully.
+    </string>
+    <string
+        name="backup_permission_error_dialog_details"
+        comment="The first parameter is the type of backup (e.g. built-in or Android backup). The second parameter is an elapsed time in the style of 'x seconds/minutes/days ago'.">
+        A recent vault backup attempt using %1$s failed because Aegis did not have permission to write to the backup destination. The backup was attempted %2$s. This error can occur if you moved/renamed the backup destination or if you recently restored Aegis from a backup. Please reconfigure the backup destination.
     </string>
     <string name="backup_system_builtin">Aegis\' built-in automatic backups</string>
     <string name="backup_system_android">Android\'s cloud backup system</string>
@@ -406,22 +495,6 @@
     <string name="backup_plaintext_warning_explanation">This warning is shown because you recently exported an unencrypted copy of the vault. To maintain security of your tokens, we recommend deleting this file once it\'s no longer needed.</string>
     <string name="switch_camera">Switch camera</string>
 
-    <string name="custom_notices_format_style" translatable="false" >
-        body {
-            background-color: #%1$s;
-            color: #%2$s;
-            font-family: sans-serif;
-            overflow-wrap: break-word;
-        }
-        pre {
-            background-color: #%3$s;
-            padding: 1em;
-            white-space: pre-wrap;
-        }
-        a {
-            color: #%4$s;
-        }
-    </string>
     <string name="empty_list">There are no codes to be shown. Start adding entries by tapping the plus sign in the bottom right corner</string>
     <string name="empty_list_title">No entries found</string>
     <string name="empty_group_list">There are no groups to be shown. Add groups in the edit screen of an entry</string>
@@ -440,8 +513,8 @@
     <string name="copy_uri">Copy URI</string>
     <string name="unable_to_copy_uri_to_clipboard">Unable to copy URI to clipboard</string>
     <string name="uri_copied_to_clipboard">URI copied to clipboard</string>
-    <string name="transfer_entry">Transfer entry</string>
     <string name="transfer_entry_description">Scan this QR code with the authenticator app you would like to transfer this entry to</string>
+    <string name="transfer_entry_brightness">Tap the QR code to toggle full screen brightness</string>
     <string name="google_auth_compatible_transfer_description">Scan these QR codes with Aegis or Google Authenticator.\n\nDue to limitations of the Google Authenticator app, only TOTP &amp; HOTP tokens that use SHA1 and produce 6-digit codes are included</string>
 
     <string name="password_strength_very_weak">Very weak</string>
@@ -449,6 +522,7 @@
     <string name="password_strength_fair">Fair</string>
     <string name="password_strength_good">Good</string>
     <string name="password_strength_strong">Strong</string>
+    <string name="password_strength_unknown">Password too long for strength analysis</string>
     <string name="pref_pin_keyboard_title">Use PIN keyboard on lockscreen</string>
     <string name="pref_pin_keyboard_summary">Enable this if you want to enable the PIN keyboard on the lockscreen. This only works for numeric passwords</string>
 
@@ -458,8 +532,9 @@
     <string name="title_activity_about">About</string>
     <string name="title_activity_edit_entry">Edit entry</string>
     <string name="title_activity_scan_qr">Scan a QR code</string>
-    <string name="title_activity_manage_slots">Manage key slots</string>
     <string name="title_activity_import_entries">Import entries</string>
+    <string name="title_activity_assign_icons">Assign icons</string>
+    <string name="title_activity_licenses">Third-party licenses</string>
     <string name="dialog_wipe_entries_title">Wipe entries</string>
     <string name="dialog_wipe_entries_message">Your vault already contains entries. Do you want to remove these entries before importing this file?\n\n<b>In doing so, you will permanently lose access to the existing entries in the vault.</b></string>
     <string name="dialog_wipe_entries_checkbox">Wipe vault contents</string>
@@ -468,24 +543,34 @@
     <string name="pref_panic_trigger_title">Delete vault on panic trigger</string>
     <string name="pref_panic_trigger_summary">Delete vault when a panic trigger is received from Ripple</string>
 
-    <string name="import_vault">Import vault</string>
+    <string name="import_vault">Import Aegis vault</string>
+    <string name="import_vault_hint">Want to import from a different 2FA app? Complete the setup first and then head over to the settings menu.</string>
+    <plurals name="import_duplicate_toast">
+        <item quantity="one">Unchecked %d potential duplicate. Please review the list of entries.</item>
+        <item quantity="other">Unchecked %d potential duplicates. Please review the list of entries.</item>
+    </plurals>
     <string name="importer_help_2fas">Supply a 2FAS Authenticator backup file.</string>
     <string name="importer_help_aegis">Supply an Aegis export/backup file.</string>
     <string name="importer_help_authenticator_plus">Supply an Authenticator Plus export file obtained through <b>Settings -> Backup &amp; Restore -> Export as Text and HTML</b>.</string>
-    <string name="importer_help_authenticator_pro">Supply an Authenticator Pro export file obtained through <b>Settings -> Back up -> Back up to encrypted file (recommended)</b>.</string>
     <string name="importer_help_authy">Supply a copy of <b>/data/data/com.authy.authy/shared_prefs/com.authy.storage.tokens.authenticator.xml</b>, located in the internal storage directory of Authy.</string>
     <string name="importer_help_andotp">Supply an andOTP export/backup file.</string>
     <string name="importer_help_bitwarden">Supply a Bitwarden export/backup file. Encrypted files are not supported.</string>
-    <string name="importer_help_battle_net_authenticator">Supply a copy of <b>/data/data/com.blizzard.bma/shared_prefs/com.blizzard.bma.AUTH_STORE.xml</b>, located in the internal storage directory of Battle.net Authenticator.</string>
+    <string name="importer_help_battle_net_authenticator">Supply a copy of <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, located in the internal storage directory of Battle.net Authenticator.</string>
     <string name="importer_help_duo">Supply a copy of <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, located in the internal storage directory of DUO.</string>
-    <string name="importer_help_freeotp">Supply a copy of <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, located in the internal storage directory of FreeOTP.</string>
+    <string name="importer_help_ente_auth">Supply an Ente Auth export file. Currently only unencrypted files are supported.</string>
+    <string name="importer_help_freeotp">FreeOTP 2: Supply a backup file.\nFreeOTP 1.x: Supply a copy of <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, located in the internal storage directory of FreeOTP.</string>
     <string name="importer_help_freeotp_plus">Supply a FreeOTP+ export file.</string>
+    <string name="importer_warning_title_freeotp2">FreeOTP 2 compatibility</string>
+    <string name="importer_warning_message_freeotp2">There are a number of issues in FreeOTP 2 that can result in corrupt backups. Aegis will try to salvage as many entries as possible, but it\'s possible that some or even all of them fail to import.</string>
     <string name="importer_help_google_authenticator"><b>Only database files from Google Authenticator v5.10 and prior are supported</b>.\n\nSupply a copy of <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, located in the internal storage directory of Google Authenticator.</string>
     <string name="importer_help_microsoft_authenticator">Supply a copy of <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, located in the internal storage directory of Microsoft Authenticator.</string>
     <string name="importer_help_plain_text">Supply a plain text file with a Google Authenticator URI on each line.</string>
     <string name="importer_help_steam"><b>Steam v3.0 and newer are not supported</b>. Supply a copy of <b>/data/data/com.valvesoftware.android.steam.community/files/Steamguard-*.json</b>, located in the internal storage directory of Steam.</string>
+    <string name="importer_help_stratum">Supply a Stratum export file obtained through <b>Settings -> Back up -> Back up to encrypted file (recommended)</b>.</string>
     <string name="importer_help_totp_authenticator">Supply a TOTP Authenticator export file.</string>
     <string name="importer_help_winauth">Supply a WinAuth export file.</string>
+    <string name="import_assign_icons_dialog_title">Assign icons</string>
+    <string name="import_assign_icons_dialog_text">Do you want to assign icons to the imported entries?</string>
 
     <string name="importer_encrypted_exception_google_authenticator">Encrypted entry was skipped: %s</string>
 
@@ -508,23 +593,23 @@
     <string name="pref_account_name_position_end">Next to the issuer</string>
     <string name="pref_account_name_position_below">Below the issuer</string>
 
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d second ago</item>
         <item quantity="other">%d seconds ago</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minute ago</item>
         <item quantity="other">%d minutes ago</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d hour ago</item>
         <item quantity="other">%d hours ago</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d day ago</item>
         <item quantity="other">%d days ago</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d year ago</item>
         <item quantity="other">%d years ago</item>
     </plurals>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index cfdf3d38..00000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Aegis.Launch" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- colorPrimary in the root theme sets the task description color (seen in task switcher) -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
-    <style name="Theme.Aegis.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="colorAppBar">@color/colorPrimary</item>
-
-        <item name="primaryText">@color/primary_text</item>
-        <item name="secondaryText">@color/secondary_text</item>
-        <item name="cardBackground">@color/card_background</item>
-        <item name="cardBackgroundFocused">@color/card_background_focused</item>
-        <item name="codePrimaryText">@color/code_primary_text</item>
-        <item name="background">@color/background</item>
-        <item name="divider">@color/divider</item>
-        <item name="authText">@color/auth_text</item>
-
-        <item name="iconColorPrimary">@color/icon_primary</item>
-        <item name="iconColorInverted">@color/icon_primary_inverted</item>
-        <item name="dot_color">@color/indicator_dot</item>
-        <item name="dot_color_selected">@color/indicator_dot_selected</item>
-
-        <item name="popupTheme">@style/ThemeOverlay.Aegis.Popup.Light</item>
-        <item name="actionModeStyle">@style/Theme.Aegis.ActionMode.Light</item>
-        <item name="alertDialogTheme">@style/Theme.Aegis.Dialog.Light</item>
-        <item name="preferenceTheme">@style/Theme.Aegis.Preference.Light</item>
-        <item name="textInputStyle">@style/Widget.Aegis.TextInput.Light</item>
-        <item name="outlineButtonStyle">@style/Widget.Aegis.OutlinedButton.Light</item>
-        <item name="dropdownStyle">@style/Widget.Aegis.Dropdown.Light</item>
-        <item name="bottomSheetDialogTheme">@style/ThemeOverLay.Aegis.BottomSheetDialog.Rounded</item>
-
-        <item name="windowActionModeOverlay">true</item>
-        <item name="android:statusBarColor">?attr/colorAppBar</item>
-        <item name="android:indeterminateTint">@color/colorSecondary</item>
-    </style>
-
-    <style name="Theme.Aegis.Light.Default" />
-
-    <style name="Theme.Aegis.Light.NoActionBar">
-        <item name="android:statusBarColor">@android:color/black</item>
-    </style>
-
-    <style name="Theme.Aegis.Light.Fullscreen" parent="Theme.Aegis.Light.Default">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
-    </style>
-
-    <style name="Theme.Aegis.Dark" parent="Theme.MaterialComponents.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="colorAppBar">@color/colorPrimary</item>
-
-        <item name="primaryText">@color/primary_text_dark</item>
-        <item name="secondaryText">@color/secondary_text_dark</item>
-        <item name="cardBackground">@color/card_background_dark</item>
-        <item name="cardBackgroundFocused">@color/card_background_focused_dark</item>
-        <item name="codePrimaryText">@color/code_primary_text_dark</item>
-        <item name="background">@color/background_dark</item>
-        <item name="divider">@color/divider_dark</item>
-        <item name="authText">@color/primary_text_inverted</item>
-
-        <item name="iconColorPrimary">@color/icon_primary_dark</item>
-        <item name="iconColorInverted">@color/icon_primary_dark_inverted</item>
-        <item name="dot_color">@color/indicator_dot_dark</item>
-        <item name="dot_color_selected">@color/indicator_dot_selected_dark</item>
-
-        <item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Dark</item>
-        <item name="actionModeStyle">@style/Theme.Aegis.ActionMode.Dark</item>
-        <item name="alertDialogTheme">@style/Theme.Aegis.Dialog.Dark</item>
-        <item name="preferenceTheme">@style/Theme.Aegis.Preference.Dark</item>
-        <item name="textInputStyle">@style/Widget.Aegis.TextInput.Dark</item>
-        <item name="outlineButtonStyle">@style/Widget.Aegis.OutlinedButton.Dark</item>
-        <item name="dropdownStyle">@style/Widget.Aegis.Dropdown.Dark</item>
-        <item name="bottomSheetDialogTheme">@style/ThemeOverLay.Aegis.BottomSheetDialog.Rounded</item>
-
-        <item name="windowActionModeOverlay">true</item>
-        <item name="android:statusBarColor">?attr/colorAppBar</item>
-        <item name="android:indeterminateTint">@color/colorSecondary</item>
-        <item name="android:colorBackground">@color/background_dark</item>
-        <item name="android:colorEdgeEffect">@color/background_dark</item>
-        <item name="android:colorControlActivated">@color/colorSecondary</item>
-    </style>
-
-    <style name="Theme.Aegis.Dark.Default" />
-    <style name="Theme.Aegis.Dark.NoActionBar">
-        <item name="android:statusBarColor">?attr/background</item>
-        <item name="android:navigationBarColor">?attr/background</item>
-    </style>
-
-    <style name="Theme.Aegis.Dark.Fullscreen" parent="Theme.Aegis.Dark.Default">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
-    </style>
-
-    <style name="Theme.Aegis.TrueDark" parent="Theme.Aegis.Dark">
-        <item name="colorAppBar">@color/background_true_dark</item>
-        <item name="cardBackground">@color/background_true_dark</item>
-        <item name="background">@color/background_true_dark</item>
-        <item name="cardBackgroundFocused">@color/card_background_focused_true_dark</item>
-        <item name="divider">@color/divider_true_dark</item>
-
-        <item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Dark</item>
-        <item name="actionModeStyle">@style/Theme.Aegis.ActionMode.TrueDark</item>
-        <item name="alertDialogTheme">@style/Theme.Aegis.Dialog.TrueDark</item>
-        <item name="preferenceTheme">@style/Theme.Aegis.Preference.Dark</item>
-        <item name="textInputStyle">@style/Widget.Aegis.TextInput.Dark</item>
-        <item name="outlineButtonStyle">@style/Widget.Aegis.OutlinedButton.Dark</item>
-        <item name="dropdownStyle">@style/Widget.Aegis.Dropdown.Dark</item>
-        <item name="bottomSheetDialogTheme">@style/ThemeOverLay.Aegis.BottomSheetDialog.Rounded</item>
-
-        <item name="windowActionModeOverlay">true</item>
-        <item name="android:statusBarColor">@color/background_true_dark</item>
-        <item name="android:windowBackground">@color/background_true_dark</item>
-        <item name="android:colorBackground">@color/background_true_dark</item>
-        <item name="android:colorEdgeEffect">@color/background_true_dark</item>
-    </style>
-
-    <style name="Theme.Aegis.TrueDark.Default" />
-    <style name="Theme.Aegis.TrueDark.NoActionBar">
-        <item name="android:statusBarColor">?attr/background</item>
-        <item name="android:navigationBarColor">?attr/background</item>
-    </style>
-
-    <style name="Theme.Aegis.TrueDark.Fullscreen" parent="Theme.Aegis.TrueDark.Default">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
-    </style>
-
-    <style name="Theme.Aegis.Preference.Light" parent="@style/PreferenceThemeOverlay.v14.Material">
-        <item name="android:tint">@color/icon_primary</item>
-    </style>
-
-    <style name="Theme.Aegis.Preference.Dark" parent="@style/PreferenceThemeOverlay.v14.Material">
-        <item name="android:tint">@color/icon_primary_dark</item>
-    </style>
-
-    <style name="Theme.Aegis.ActionMode.Light" parent="@style/Widget.AppCompat.Light.ActionMode.Inverse">
-        <item name="background">@color/colorPrimary</item>
-        <item name="titleTextStyle">@style/Theme.Aegis.ActionMode.Title</item>
-        <item name="iconColorPrimary">@color/icon_primary</item>
-        <item name="iconColorInverted">@color/icon_primary_inverted</item>
-    </style>
-
-    <style name="Theme.Aegis.ActionMode.Dark" parent="@style/Widget.AppCompat.Light.ActionMode.Inverse">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="background">@color/colorPrimary</item>
-        <item name="titleTextStyle">@style/Theme.Aegis.ActionMode.Title</item>
-        <item name="iconColorPrimary">@color/icon_primary</item>
-        <item name="iconColorInverted">@color/icon_primary_inverted</item>
-    </style>
-
-    <style name="Theme.Aegis.ActionMode.TrueDark" parent="@style/Widget.AppCompat.Light.ActionMode.Inverse">
-        <item name="colorPrimary">@color/background_true_dark</item>
-        <item name="background">@color/background_true_dark</item>
-        <item name="titleTextStyle">@style/Theme.Aegis.ActionMode.Title</item>
-        <item name="iconColorPrimary">@color/icon_primary</item>
-        <item name="iconColorInverted">@color/icon_primary_inverted</item>
-    </style>
-
-    <style name="Theme.Aegis.ActionMode.Title" parent="@style/TextAppearance.AppCompat.Widget.ActionMode.Title">
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
-    <style name="Theme.Aegis.Dialog.Light" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-        <item name="android:background">@color/card_background</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="textColorAlertDialogListItem">@color/primary_text</item>
-
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.Aegis.DialogButton</item>
-        <item name="buttonBarNegativeButtonStyle">@style/Widget.Aegis.DialogButton</item>
-        <item name="buttonBarNeutralButtonStyle">@style/Widget.Aegis.DialogButton</item>
-    </style>
-
-    <style name="Theme.Aegis.Dialog.Dark" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="android:background">@color/card_background_dark</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="textColorAlertDialogListItem">@color/primary_text_dark</item>
-
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.Aegis.DialogButton</item>
-        <item name="buttonBarNegativeButtonStyle">@style/Widget.Aegis.DialogButton</item>
-        <item name="buttonBarNeutralButtonStyle">@style/Widget.Aegis.DialogButton</item>
-
-        <!--The following lines are needed because the non-light version of this parent changes the
-        min width to 80% or something. Looks weird.-->
-        <item name="android:windowMinWidthMajor">97%</item>
-        <item name="android:windowMinWidthMinor">97%</item>
-    </style>
-
-    <style name="Theme.Aegis.Dialog.TrueDark" parent="Theme.Aegis.Dialog.Dark">
-        <item name="android:background">@color/card_background_focused_true_dark</item>
-    </style>
-
-    <style name="ThemeOverlay.Aegis.AppBar" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
-        <item name="android:tint">@color/icon_primary_inverted</item>
-    </style>
-
-    <style name="ThemeOverlay.Aegis.Popup.Light" parent="ThemeOverlay.MaterialComponents.Light">
-        <item name="android:tint">@color/icon_primary</item>
-    </style>
-
-    <style name="ThemeOverLay.Aegis.BottomSheetDialog.Rounded" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="bottomSheetStyle">@style/Widget.Aegis.BottomSheet.Rounded</item>
-    </style>
-
-    <style name="Widget.Aegis.Dropdown.Light" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"/>
-    <style name="Widget.Aegis.Dropdown.Dark" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu">
-        <item name="boxStrokeColor">@color/text_input_box_stroke_dark</item>
-        <item name="hintTextColor">@color/text_input_box_stroke_dark</item>
-        <item name="endIconTint">@color/text_input_box_icon_dark</item>
-    </style>
-
-    <style name="Widget.Aegis.TextInput.Light" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"/>
-    <style name="Widget.Aegis.TextInput.Dark" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
-        <item name="boxStrokeColor">@color/text_input_box_stroke_dark</item>
-        <item name="hintTextColor">@color/text_input_box_stroke_dark</item>
-    </style>
-
-    <style name="Widget.Aegis.DialogButton" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="rippleColor">@color/colorSecondary</item>
-        <item name="android:textColor">@color/dialog_button_color</item>
-    </style>
-
-    <style name="Widget.Aegis.OutlinedButton.Light" parent="Widget.MaterialComponents.Button.OutlinedButton"/>
-    <style name="Widget.Aegis.OutlinedButton.Dark" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:textColor">@color/secondary_text</item>
-        <item name="rippleColor">@color/secondary_text</item>
-    </style>
-
-    <style name="Widget.Aegis.BottomSheet.Rounded" parent="Widget.MaterialComponents.BottomSheet">
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Aegis.BottomSheetDialog.Rounded</item>
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
-    <style name="TextAppearance.Aegis.ActionChip" parent="TextAppearance.MaterialComponents.Chip">
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="ShapeAppearanceOverlay.Aegis.BottomSheetDialog.Rounded" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopRight">10dp</item>
-        <item name="cornerSizeTopLeft">10dp</item>
-        <item name="cornerSizeBottomRight">0dp</item>
-        <item name="cornerSizeBottomLeft">0dp</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 00000000..f490f38b
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,279 @@
+<resources>
+    <style name="Theme.Aegis.Launch" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- colorPrimary in the root theme sets the task description color (seen in task switcher) -->
+        <item name="colorPrimary">@color/md_theme_light_primary</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="Base.Theme.Aegis.Light" parent="Theme.Material3.Light">
+        <!-- Material colors -->
+        <item name="colorPrimary">@color/md_theme_light_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
+        <item name="colorPrimaryFixed">@color/md_theme_light_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_light_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_light_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_light_onPrimaryFixedVariant</item>
+        <item name="colorSecondary">@color/md_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
+        <item name="colorSecondaryFixed">@color/md_theme_light_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_light_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_light_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_light_onSecondaryFixedVariant</item>
+        <item name="colorTertiary">@color/md_theme_light_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
+        <item name="colorTertiaryFixed">@color/md_theme_light_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_light_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_light_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_light_onTertiaryFixedVariant</item>
+        <item name="colorError">@color/md_theme_light_error</item>
+        <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_light_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
+        <item name="colorOutline">@color/md_theme_light_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
+        <item name="colorOutlineVariant">@color/md_theme_light_outlineVariant</item>
+        <item name="colorSurface">@color/md_theme_light_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_light_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_light_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainer">@color/md_theme_light_surfaceContainer</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_light_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_light_surfaceContainerLowest</item>
+        <item name="colorSurfaceDim">@color/md_theme_light_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_light_surfaceBright</item>
+        <!-- Custom colors -->
+        <item name="colorFavorite">@color/aegis_theme_all_favorite</item>
+        <item name="colorPrimaryAlternative">?attr/colorPrimary</item>
+        <item name="colorProgressbar">?attr/colorPrimaryAlternative</item>
+        <item name="colorOnDark">@android:color/white</item>
+        <item name="colorSuccess">@color/aegis_theme_light_success</item>
+        <item name="colorOnSurfaceDim">@color/aegis_theme_light_onSurfaceDim</item>
+        <item name="colorCode">?attr/colorPrimary</item>
+        <item name="colorCodeHidden">?attr/colorOutlineVariant</item>
+        <!-- Intro colors -->
+        <item name="dot_color">?attr/colorSurfaceVariant</item>
+        <item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
+        <!-- Styles -->
+        <item name="dropdownStyle">@style/Widget.Aegis.Dropdown</item>
+        <item name="preferenceTheme">@style/ThemeOverlay.Aegis.Preference</item>
+        <item name="actionModeTheme">@style/ThemeOverlay.Aegis.ActionMode</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.Aegis.AlertDialog</item>
+        <!-- Settings -->
+        <item name="windowActionModeOverlay">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Base.Theme.Aegis.Dark" parent="Theme.Material3.Dark">
+        <!-- Material colors -->
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
+        <item name="colorPrimaryFixed">@color/md_theme_dark_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_dark_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_dark_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_dark_onPrimaryFixedVariant</item>
+        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
+        <item name="colorSecondaryFixed">@color/md_theme_dark_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_dark_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_dark_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_dark_onSecondaryFixedVariant</item>
+        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
+        <item name="colorTertiaryFixed">@color/md_theme_dark_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_dark_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_dark_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_dark_onTertiaryFixedVariant</item>
+        <item name="colorError">@color/md_theme_dark_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorOutline">@color/md_theme_dark_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="colorOutlineVariant">@color/md_theme_dark_outlineVariant</item>
+        <item name="colorSurface">@color/md_theme_dark_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_dark_surfaceContainerHighest</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_dark_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainer">@color/md_theme_dark_surfaceContainer</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_dark_surfaceContainerLow</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_dark_surfaceContainerLowest</item>
+        <item name="colorSurfaceDim">@color/md_theme_dark_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_dark_surfaceBright</item>
+        <!-- Custom colors -->
+        <item name="colorFavorite">@color/aegis_theme_all_favorite</item>
+        <item name="colorPrimaryAlternative">?attr/colorPrimaryInverse</item>
+        <item name="colorProgressbar">?attr/colorPrimaryAlternative</item>
+        <item name="colorOnDark">@android:color/white</item>
+        <item name="colorSuccess">@color/aegis_theme_dark_success</item>
+        <item name="colorOnSurfaceDim">@color/aegis_theme_dark_onSurfaceDim</item>
+        <item name="colorCode">?attr/colorPrimary</item>
+        <item name="colorCodeHidden">?attr/colorOutlineVariant</item>
+        <!-- Intro colors -->
+        <item name="dot_color">?attr/colorSurfaceVariant</item>
+        <item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
+        <!-- Styles -->
+        <item name="dropdownStyle">@style/Widget.Aegis.Dropdown</item>
+        <item name="preferenceTheme">@style/ThemeOverlay.Aegis.Preference</item>
+        <item name="actionModeTheme">@style/ThemeOverlay.Aegis.ActionMode</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.Aegis.AlertDialog</item>
+        <!-- Settings -->
+        <item name="windowActionModeOverlay">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Base.Theme.Aegis.Amoled" parent="Base.Theme.Aegis.Dark">
+        <!-- Setting android:colorBackground to #000000 on API 28 and below causes smearing -->
+        <item name="android:colorBackground">@android:color/black</item>
+        <item name="colorSurface">#000000</item>
+        <item name="colorSurfaceVariant">#000000</item>
+        <item name="colorSurfaceContainerHighest">#000000</item>
+        <item name="colorSurfaceContainerHigh">#000000</item>
+        <item name="colorSurfaceContainer">#000000</item>
+        <item name="colorSurfaceContainerLow">#000000</item>
+        <item name="colorSurfaceContainerLowest">#000000</item>
+        <item name="colorSurfaceDim">#000000</item>
+        <item name="colorSurfaceBright">#000000</item>
+        <item name="colorCode">@android:color/white</item>
+        <item name="colorCodeHidden">#2F2F2F</item>
+        <item name="colorProgressbar">@android:color/white</item>
+    </style>
+
+    <style name="ThemeOverlay.Aegis.Dynamic.Dark" parent="ThemeOverlay.Material3.DynamicColors.Dark">
+        <item name="colorProgressbar">?attr/colorCode</item>
+    </style>
+
+    <style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark">
+        <!-- Setting android:colorBackground to #000000 on API 28 and below causes smearing -->
+        <item name="android:colorBackground">@android:color/black</item>
+        <item name="colorSurface">#000000</item>
+        <item name="colorSurfaceVariant">#000000</item>
+        <item name="colorSurfaceContainerHighest">#000000</item>
+        <item name="colorSurfaceContainerHigh">#000000</item>
+        <item name="colorSurfaceContainer">#000000</item>
+        <item name="colorSurfaceContainerLow">#000000</item>
+        <item name="colorSurfaceContainerLowest">#000000</item>
+        <item name="colorSurfaceDim">#000000</item>
+        <item name="colorSurfaceBright">#000000</item>
+        <item name="colorCode">@android:color/white</item>
+        <item name="colorCodeHidden">#2F2F2F</item>
+        <item name="colorProgressbar">@android:color/white</item>
+    </style>
+
+    <style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Aegis.Dark" parent="Base.Theme.Aegis.Dark">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Aegis.Amoled" parent="Base.Theme.Aegis.Amoled">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Widget.Aegis.Dropdown" parent="Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu" />
+
+    <style name="ThemeOverlay.Aegis.Preference" parent="@style/PreferenceThemeOverlay">
+        <item name="android:tint">?attr/colorOnSurface</item>
+        <item name="switchPreferenceCompatStyle">@style/Preference.Aegis.SwitchPreference</item>
+    </style>
+
+    <style name="Preference.Aegis.SwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/view_preference_switch</item>
+    </style>
+
+    <style name="Widget.Aegis.EntryCardView" parent="Widget.Material3.CardView.Elevated">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Aegis.EntryCardView</item>
+    </style>
+
+    <style name="Widget.Aegis.CompactEntryCardView" parent="Widget.Material3.CardView.Elevated">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Aegis.CompactEntryCardView</item>
+    </style>
+
+    <style name="ThemeOverlay.Aegis.EntryCardView" parent="">
+        <item name="colorSurfaceContainerLow">?attr/colorSurfaceContainer</item>
+    </style>
+
+    <style name="ThemeOverlay.Aegis.CompactEntryCardView" parent="">
+        <item name="colorSurfaceContainerLow">?attr/colorSurface</item>
+    </style>
+
+    <style name="Widget.Aegis.ErrorCardView" parent="Widget.Material3.CardView.Filled">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Aegis.ErrorCardView</item>
+    </style>
+
+    <style name="ThemeOverlay.Aegis.ErrorCardView" parent="">
+        <item name="colorSurfaceContainerHighest">?attr/colorErrorContainer</item>
+    </style>
+
+    <style name="ThemeOverlay.Aegis.ActionMode" parent="">
+        <!-- Magically give the action mode icons the right color -->
+        <item name="actionButtonStyle">@style/Widget.AppCompat.ActionButton</item>
+        <!-- The hack below is necessary to force the action mode overflow menu to the right color -->
+        <item name="actionBarPopupTheme">@style/Widget.Material3.PopupMenu.ContextMenu</item>
+    </style>
+
+    <style name="ThemeOverlay.Aegis.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog.Centered">
+
+    </style>
+
+    <style name="ThemeOverlay.Aegis.AlertDialog.Error">
+        <item name="android:alertDialogIcon">@drawable/ic_outline_error_24</item>
+        <item name="materialAlertDialogTitleIconStyle">@style/Widget.Aegis.AlertDialog.Icon.Error</item>
+    </style>
+
+    <style name="ThemeOverlay.Aegis.AlertDialog.Warning">
+        <item name="android:alertDialogIcon">@drawable/ic_outline_warning_24</item>
+        <item name="materialAlertDialogTitleIconStyle">@style/Widget.Aegis.AlertDialog.Icon.Warning</item>
+    </style>
+
+    <style name="Widget.Aegis.AlertDialog.Icon.Error" parent="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked">
+        <item name="android:tint">?attr/colorError</item>
+    </style>
+
+    <style name="Widget.Aegis.AlertDialog.Icon.Warning" parent="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked">
+        <item name="android:tint">?attr/colorError</item>
+    </style>
+
+    <style name="ShapeAppearanceOverlay.Aegis.ImageView.Rounded" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">8dp</item>
+    </style>
+
+    <style name="ShapeAppearanceOverlay.Aegis.ImageView.Circle" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index aee053b3..b893fcce 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -6,13 +6,13 @@
 
     <Preference
         android:fragment="com.beemdevelopment.aegis.ui.fragments.preferences.AppearancePreferencesFragment"
-        app:icon="@drawable/ic_brush_black_24dp"
+        app:icon="@drawable/ic_outline_brush_24"
         app:title="@string/pref_section_appearance_title"
         app:summary="@string/pref_section_appearance_summary" />
 
     <Preference
         android:fragment="com.beemdevelopment.aegis.ui.fragments.preferences.BehaviorPreferencesFragment"
-        app:icon="@drawable/ic_gesture_tap_24dp"
+        app:icon="@drawable/ic_outline_touch_app_24"
         app:title="@string/pref_section_behavior_title"
         app:summary="@string/pref_section_behavior_summary" />
 
@@ -20,24 +20,30 @@
         android:fragment="com.beemdevelopment.aegis.ui.fragments.preferences.IconPacksManagerFragment"
         android:title="@string/pref_section_icon_packs"
         android:summary="@string/pref_section_icon_packs_summary"
-        app:icon="@drawable/ic_package_variant_black_24dp"/>
+        app:icon="@drawable/ic_outline_package_variant_24"/>
 
     <Preference
         android:fragment="com.beemdevelopment.aegis.ui.fragments.preferences.SecurityPreferencesFragment"
-        app:icon="@drawable/ic_vpn_key_black_24dp"
+        app:icon="@drawable/ic_outline_key_24"
         app:title="@string/pref_section_security_title"
         app:summary="@string/pref_section_security_summary" />
 
     <Preference
         android:fragment="com.beemdevelopment.aegis.ui.fragments.preferences.BackupsPreferencesFragment"
-        app:icon="@drawable/ic_cloud_upload_outline_black_24dp"
+        app:icon="@drawable/ic_outline_cloud_upload_24"
         app:title="@string/pref_section_backups_title"
         app:summary="@string/pref_section_backups_summary" />
 
     <Preference
         android:fragment="com.beemdevelopment.aegis.ui.fragments.preferences.ImportExportPreferencesFragment"
-        app:icon="@drawable/ic_tools_black_24dp"
+        app:icon="@drawable/ic_outline_construction_24"
         app:title="@string/pref_section_import_export_title"
         app:summary="@string/pref_section_import_export_summary" />
 
+    <Preference
+        android:fragment="com.beemdevelopment.aegis.ui.fragments.preferences.AuditLogPreferencesFragment"
+        app:icon="@drawable/ic_timeline_24"
+        app:title="@string/pref_section_audit_log_title"
+        app:summary="@string/pref_section_audit_log_summary" />
+
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml
index b3b53987..b025315c 100644
--- a/app/src/main/res/xml/preferences_appearance.xml
+++ b/app/src/main/res/xml/preferences_appearance.xml
@@ -11,12 +11,16 @@
             android:title="@string/pref_select_theme_title"
             app:iconSpaceReserved="false"/>
 
-        <ListPreference
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_dynamic_colors"
+            android:title="@string/pref_dynamic_colors_title"
+            android:summary="@string/pref_dynamic_colors_summary"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
             android:key="pref_lang"
             android:title="@string/pref_lang_title"
-            android:summary="%s"
-            android:entries="@array/pref_lang_entries"
-            android:entryValues="@array/pref_lang_values"
             android:defaultValue="system"
             app:iconSpaceReserved="false"/>
     </PreferenceCategory>
@@ -37,12 +41,24 @@
             android:summary="@string/pref_show_icons_summary"
             app:iconSpaceReserved="false"/>
 
-        <ListPreference
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_show_next_code"
+            android:title="@string/pref_show_next_code_title"
+            android:summary="@string/pref_show_next_code_summary"
+            app:iconSpaceReserved="false"/>
+
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="pref_expiration_state"
+            android:title="@string/pref_expiration_state_title"
+            android:summary="@string/pref_expiration_state_summary"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
             android:key="pref_code_group_size_string"
             android:title="@string/pref_code_group_size_title"
             android:summary="@string/pref_code_group_size_summary"
-            android:entries="@array/pref_code_groupings"
-            android:entryValues="@array/pref_code_groupings_values"
             android:defaultValue="GROUPING_THREES"
             app:iconSpaceReserved="false"/>
 
diff --git a/app/src/main/res/xml/preferences_backups.xml b/app/src/main/res/xml/preferences_backups.xml
index 8965973f..ed512e93 100644
--- a/app/src/main/res/xml/preferences_backups.xml
+++ b/app/src/main/res/xml/preferences_backups.xml
@@ -8,7 +8,7 @@
         android:selectable="false"
         android:summary="@string/backup_warning_password"
         app:isPreferenceVisible="false"
-        app:icon="@drawable/ic_info_outline_black_24dp" />
+        app:icon="@drawable/ic_outline_info_24" />
     <PreferenceCategory
         android:title="@string/pref_cat_backups_auto">
         <androidx.preference.SwitchPreferenceCompat
@@ -16,13 +16,17 @@
             android:key="pref_backups"
             android:title="@string/pref_backups_title"
             android:summary="@string/pref_backups_summary"
-            app:icon="@drawable/ic_cloud_upload_outline_black_24dp" />
+            app:icon="@drawable/ic_outline_cloud_upload_24" />
 
         <androidx.preference.SwitchPreferenceCompat
             android:key="pref_backup_reminder"
             android:title="@string/pref_backups_reminder_title"
             android:summary="@string/pref_backups_reminder_summary" />
 
+        <Preference
+            android:key="pref_versioning_strategy"
+            android:title="@string/pref_backups_versioning_strategy_title" />
+
         <Preference
             android:key="pref_backups_location"
             android:title="@string/pref_backups_location_title"
@@ -46,7 +50,7 @@
             android:key="pref_android_backups"
             android:title="@string/pref_android_backups_title"
             android:summary="@string/pref_android_backups_summary"
-            app:icon="@drawable/ic_android" />
+            app:icon="@drawable/ic_outline_android_24" />
         <Preference
             android:key="pref_status_backup_android"
             android:persistent="false"
diff --git a/app/src/main/res/xml/preferences_behavior.xml b/app/src/main/res/xml/preferences_behavior.xml
index f5fd3535..1c123164 100644
--- a/app/src/main/res/xml/preferences_behavior.xml
+++ b/app/src/main/res/xml/preferences_behavior.xml
@@ -8,6 +8,11 @@
         android:title="@string/pref_focus_search"
         android:summary="@string/pref_focus_search_summary"
         app:iconSpaceReserved="false"/>
+    <Preference
+        android:defaultValue="false"
+        android:key="pref_search_behavior"
+        android:title="@string/pref_search_behavior_title"
+        app:iconSpaceReserved="false"/>
     <androidx.preference.SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="pref_minimize_on_copy"
@@ -21,6 +26,20 @@
         android:title="@string/pref_copy_behavior_title"
         app:iconSpaceReserved="false"/>
 
+    <androidx.preference.SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:key="pref_haptic_feedback"
+        android:title="@string/pref_haptic_feedback_title"
+        android:summary="@string/pref_haptic_feedback_summary"
+        app:iconSpaceReserved="false"/>
+
+    <androidx.preference.SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="pref_groups_multiselect"
+        android:title="@string/pref_groups_multiselect_title"
+        android:summary="@string/pref_groups_multiselect_summary"
+        app:iconSpaceReserved="false"/>
+
     <androidx.preference.SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="pref_highlight_entry"
diff --git a/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java b/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java
index 166d6a47..5a487aea 100644
--- a/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java
+++ b/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java
@@ -7,15 +7,13 @@ import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
-import android.preference.PreferenceManager;
 
+import androidx.preference.PreferenceManager;
 import androidx.test.core.app.ApplicationProvider;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.util.Date;
 
diff --git a/app/src/test/java/com/beemdevelopment/aegis/crypto/otp/YAOTPTest.java b/app/src/test/java/com/beemdevelopment/aegis/crypto/otp/YAOTPTest.java
index c215962a..785d4a71 100644
--- a/app/src/test/java/com/beemdevelopment/aegis/crypto/otp/YAOTPTest.java
+++ b/app/src/test/java/com/beemdevelopment/aegis/crypto/otp/YAOTPTest.java
@@ -32,8 +32,8 @@ public class YAOTPTest {
                     testCase.pin,
                     8,
                     "HmacSHA256",
-                    testCase.timestamp,
-                    30
+                    30,
+                    testCase.timestamp
             );
             assertEquals(testCase.expected, otp.toString());
         }
diff --git a/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java b/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java
index d255f68a..1457d118 100644
--- a/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java
+++ b/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java
@@ -84,6 +84,12 @@ public class DatabaseImporterTest {
         }
     }
 
+    @Test
+    public void testImportEnteAuth() throws IOException, DatabaseImporterException, OtpInfoException {
+        List<VaultEntry> entries = importPlain(EnteAuthImporter.class, "ente_auth.txt");
+        checkImportedEntries(entries);
+    }
+
     @Test
     public void testImportWinAuth() throws IOException, DatabaseImporterException, OtpInfoException {
         List<VaultEntry> entries = importPlain(WinAuthImporter.class, "plain.txt");
@@ -143,27 +149,32 @@ public class DatabaseImporterTest {
     }
 
     @Test
-    public void testImportAuthProEncrypted() throws DatabaseImporterException, IOException, OtpInfoException {
-        List<VaultEntry> entries = importEncrypted(AuthenticatorProImporter.class, "authpro_encrypted.bin", state -> {
+    public void testImportStratumEncrypted() throws DatabaseImporterException, IOException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(StratumImporter.class, "stratum_encrypted.bin", state -> {
             char[] password = "test".toCharArray();
-            try {
-                return ((AuthenticatorProImporter.EncryptedState) state).decrypt(password);
-            } catch (DatabaseImporterException e) {
-                throw new DatabaseImporterException(e);
-            }
+            return ((StratumImporter.EncryptedState) state).decrypt(password);
         });
         checkImportedEntries(entries);
     }
 
     @Test
-    public void testImportAuthProInternal() throws DatabaseImporterException, IOException, OtpInfoException {
-        List<VaultEntry> entries = importPlain(AuthenticatorProImporter.class, "authpro_internal.db", true);
+    public void testImportStratumEncryptedLegacy() throws DatabaseImporterException, IOException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(StratumImporter.class, "stratum_encrypted_legacy.bin", state -> {
+            char[] password = "test".toCharArray();
+            return ((StratumImporter.LegacyEncryptedState) state).decrypt(password);
+        });
         checkImportedEntries(entries);
     }
 
     @Test
-    public void testImportAuthProPlain() throws DatabaseImporterException, IOException, OtpInfoException {
-        List<VaultEntry> entries = importPlain(AuthenticatorProImporter.class, "authpro_plain.json");
+    public void testImportStratumInternal() throws DatabaseImporterException, IOException, OtpInfoException {
+        List<VaultEntry> entries = importPlain(StratumImporter.class, "stratum_internal.db", true);
+        checkImportedEntries(entries);
+    }
+
+    @Test
+    public void testImportStratumPlain() throws DatabaseImporterException, IOException, OtpInfoException {
+        List<VaultEntry> entries = importPlain(StratumImporter.class, "stratum_plain.json");
         checkImportedEntries(entries);
     }
 
@@ -205,21 +216,66 @@ public class DatabaseImporterTest {
     }
 
     @Test
-    public void testImportFreeOtp() throws IOException, DatabaseImporterException, OtpInfoException {
+    public void testImportFreeOtpV1() throws IOException, DatabaseImporterException, OtpInfoException {
         List<VaultEntry> entries = importPlain(FreeOtpImporter.class, "freeotp.xml");
-        checkImportedFreeOtpEntries(entries);
+        checkImportedFreeOtpEntriesV1(entries);
+    }
+
+    @Test
+    public void testImportFreeOtpV2Api23() throws IOException, DatabaseImporterException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(FreeOtpImporter.class, "freeotp_v2_api23.xml", encryptedState -> {
+            final char[] password = "test".toCharArray();
+            return ((FreeOtpImporter.EncryptedState) encryptedState).decrypt(password);
+        });
+        checkImportedEntries(entries);
+    }
+
+    @Test
+    public void testImportFreeOtpV2Api25() throws IOException, DatabaseImporterException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(FreeOtpImporter.class, "freeotp_v2_api25.xml", encryptedState -> {
+            final char[] password = "test".toCharArray();
+            return ((FreeOtpImporter.EncryptedState) encryptedState).decrypt(password);
+        });
+        checkImportedEntries(entries);
+    }
+
+    @Test
+    public void testImportFreeOtpV2Api27() throws IOException, DatabaseImporterException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(FreeOtpImporter.class, "freeotp_v2_api27.xml", encryptedState -> {
+            final char[] password = "test".toCharArray();
+            return ((FreeOtpImporter.EncryptedState) encryptedState).decrypt(password);
+        });
+        checkImportedEntries(entries);
+    }
+
+    @Test
+    public void testImportFreeOtpV2Api34() throws IOException, DatabaseImporterException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(FreeOtpImporter.class, "freeotp_v2_api34.xml", encryptedState -> {
+            final char[] password = "test".toCharArray();
+            return ((FreeOtpImporter.EncryptedState) encryptedState).decrypt(password);
+        });
+        checkImportedEntries(entries);
+    }
+
+    @Test
+    public void testImportFreeOtpV2NullAlgo() throws IOException, DatabaseImporterException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(FreeOtpImporter.class, "freeotp_v2_null_algo.xml", encryptedState -> {
+            final char[] password = "test".toCharArray();
+            return ((FreeOtpImporter.EncryptedState) encryptedState).decrypt(password);
+        });
+        checkImportedEntries(entries);
     }
 
     @Test
     public void testImportFreeOtpPlus() throws IOException, DatabaseImporterException, OtpInfoException {
         List<VaultEntry> entries = importPlain(FreeOtpPlusImporter.class, "freeotp_plus.json");
-        checkImportedFreeOtpEntries(entries);
+        checkImportedFreeOtpEntriesV1(entries);
     }
 
     @Test
     public void testImportFreeOtpPlusInternal() throws IOException, DatabaseImporterException, OtpInfoException {
         List<VaultEntry> entries = importPlain(FreeOtpPlusImporter.class, "freeotp_plus_internal.xml", true);
-        checkImportedFreeOtpEntries(entries);
+        checkImportedFreeOtpEntriesV1(entries);
     }
 
     @Test
@@ -258,6 +314,16 @@ public class DatabaseImporterTest {
         }
     }
 
+    @Test
+    public void testImportSteamOld() throws IOException, DatabaseImporterException, OtpInfoException {
+        List<VaultEntry> entries = importPlain(SteamImporter.class, "steam_old.json");
+        for (VaultEntry entry : entries) {
+            VaultEntry entryVector = getEntryVectorBySecret(entry.getInfo().getSecret());
+            entryVector.setIssuer("Steam");
+            checkImportedEntry(entryVector, entry);
+        }
+    }
+
     @Test
     public void testImportAuthenticatorPlus() throws IOException, DatabaseImporterException, OtpInfoException {
         List<VaultEntry> entries = importEncrypted(AuthenticatorPlusImporter.class, "authenticator_plus.zip", encryptedState -> {
@@ -309,6 +375,21 @@ public class DatabaseImporterTest {
         checkImportedEntries(entries);
     }
 
+    @Test
+    public void testImportTwoFASAuthenticatorSchema4Plain() throws DatabaseImporterException, IOException, OtpInfoException {
+        List<VaultEntry> entries = importPlain(TwoFASImporter.class, "2fas_authenticator_plain_v4.2fas");
+        checkImportedEntries(entries);
+    }
+
+    @Test
+    public void testImportTwoFASAuthenticatorSchema4Encrypted() throws DatabaseImporterException, IOException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(TwoFASImporter.class, "2fas_authenticator_encrypted_v4.2fas", encryptedState -> {
+            final char[] password = "test".toCharArray();
+            return ((TwoFASImporter.EncryptedState) encryptedState).decrypt(password);
+        });
+        checkImportedEntries(entries);
+    }
+
     private List<VaultEntry> importPlain(Class<? extends DatabaseImporter> type, String resName)
             throws IOException, DatabaseImporterException {
         return importPlain(type, resName, false);
@@ -387,7 +468,7 @@ public class DatabaseImporterTest {
         }
     }
 
-    private void checkImportedFreeOtpEntries(List<VaultEntry> entries) throws OtpInfoException {
+    private void checkImportedFreeOtpEntriesV1(List<VaultEntry> entries) throws OtpInfoException {
         for (VaultEntry entry : entries) {
             // for some reason, FreeOTP adds -1 to the counter
             VaultEntry entryVector = getEntryVectorBySecret(entry.getInfo().getSecret());
diff --git a/app/src/test/java/com/beemdevelopment/aegis/vault/VaultTest.java b/app/src/test/java/com/beemdevelopment/aegis/vault/VaultTest.java
new file mode 100644
index 00000000..30f875c9
--- /dev/null
+++ b/app/src/test/java/com/beemdevelopment/aegis/vault/VaultTest.java
@@ -0,0 +1,71 @@
+package com.beemdevelopment.aegis.vault;
+
+import static org.junit.Assert.assertEquals;
+
+import com.beemdevelopment.aegis.util.IOUtils;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class VaultTest {
+    @Test
+    public void testGroupConversion()
+            throws IOException, VaultFileException, VaultException {
+        Vault vault;
+        try (InputStream inStream = getClass().getResourceAsStream("aegis_plain_grouped_v2.json")) {
+            byte[] bytes = IOUtils.readAll(inStream);
+            VaultFile file = VaultFile.fromBytes(bytes);
+            vault = Vault.fromJson(file.getContent());
+        }
+
+        checkGroups(vault);
+
+        // After saving to and loading from the new format, the same checks should still pass
+        vault = Vault.fromJson(vault.toJson());
+        checkGroups(vault);
+    }
+
+    private static void checkGroups(Vault vault) {
+        // No old groups should be present anymore
+        assertEquals(0, vault.getEntries().getValues().stream()
+                .filter(e -> e.getOldGroup() != null)
+                .count());
+
+        // New groups should have been created, and groups with the same name
+        // should have been merged into a single group
+        assertEquals(2, vault.getGroups().getValues().size());
+
+        // Only one group with name group1
+        List<VaultGroup> foundGroups = vault.getGroups().getValues().stream()
+                .filter(g -> g.getName().equals("group1"))
+                .collect(Collectors.toList());
+        assertEquals(1, foundGroups.size());
+        VaultGroup group1 = foundGroups.get(0);
+
+        // Only one group with name group2
+        foundGroups = vault.getGroups().getValues().stream()
+                .filter(g -> g.getName().equals("group2"))
+                .collect(Collectors.toList());
+        assertEquals(1, foundGroups.size());
+        VaultGroup group2 = foundGroups.get(0);
+
+        // Two entries in group1
+        assertEquals(2, vault.getEntries().getValues().stream()
+                .filter(e -> e.getGroups().contains(group1.getUUID()))
+                .count());
+
+        // One entry in group2
+        assertEquals(1, vault.getEntries().getValues().stream()
+                .filter(e -> e.getGroups().contains(group2.getUUID()))
+                .count());
+
+        // Rest of the entries in no groups
+        assertEquals(vault.getEntries().getValues().size() - 3, vault.getEntries().getValues().stream()
+                .filter(e -> e.getGroups().isEmpty())
+                .count());
+    }
+}
diff --git a/app/src/test/java/com/beemdevelopment/aegis/vault/slots/SlotTest.java b/app/src/test/java/com/beemdevelopment/aegis/vault/slots/SlotTest.java
index 345c8f1d..56a939b2 100644
--- a/app/src/test/java/com/beemdevelopment/aegis/vault/slots/SlotTest.java
+++ b/app/src/test/java/com/beemdevelopment/aegis/vault/slots/SlotTest.java
@@ -1,7 +1,6 @@
 package com.beemdevelopment.aegis.vault.slots;
 
 import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThrows;
 
 import com.beemdevelopment.aegis.crypto.CryptoUtils;
@@ -96,22 +95,85 @@ public class SlotTest {
     }
 
     @Test
-    public void testPasswordSlotExclusion() {
-        SlotList slots = new SlotList();
-        PasswordSlot passSlot = new PasswordSlot();
-        PasswordSlot passSlot2 = new PasswordSlot();
-        slots.add(passSlot);
-        slots.add(passSlot2);
-
-        assertArrayEquals(slots.getValues().toArray(), slots.exportable().getValues().toArray());
-
-        SlotList backupSlots = new SlotList();
+    public void testNonExportableSlotsExclusion() {
+        // If a backup password slot, multiple regular password slots and a biometric slot are present:
+        // -> The Regular password slots and the biometric slot get stripped
+        Slot passwordSlot = new PasswordSlot();
+        Slot passwordSlot2 = new PasswordSlot();
+        Slot biometricSlot = new BiometricSlot();
         PasswordSlot backupSlot = new PasswordSlot();
         backupSlot.setIsBackup(true);
+        SlotList slots = new SlotList();
+        slots.add(passwordSlot);
+        slots.add(passwordSlot2);
+        slots.add(biometricSlot);
         slots.add(backupSlot);
-        backupSlots.add(backupSlot);
+        SlotList actual = slots.exportable();
+        SlotList expected = new SlotList();
+        expected.add(backupSlot);
+        assertArrayEquals(expected.getValues().toArray(), actual.getValues().toArray());
 
-        assertArrayEquals(backupSlots.getValues().toArray(), slots.exportable().getValues().toArray());
-        assertNotEquals(slots.getValues().toArray(), slots.exportable().getValues().toArray());
+        // If a backup password slot, a regular password slot and a biometric slot are present:
+        // -> The Regular password slot and the biometric slot get stripped
+        slots = new SlotList();
+        slots.add(passwordSlot);
+        slots.add(biometricSlot);
+        slots.add(backupSlot);
+        actual = slots.exportable();
+        expected = new SlotList();
+        expected.add(backupSlot);
+        assertArrayEquals(expected.getValues().toArray(), actual.getValues().toArray());
+
+        // If a backup password slot and a regular password slot are present:
+        // -> The regular password slot get stripped
+        slots = new SlotList();
+        slots.add(passwordSlot);
+        slots.add(backupSlot);
+        actual = slots.exportable();
+        expected = new SlotList();
+        expected.add(backupSlot);
+        assertArrayEquals(expected.getValues().toArray(), actual.getValues().toArray());
+
+        // If a backup password slot and multiple regular password slot are present:
+        // -> The regular password slots get stripped
+        slots = new SlotList();
+        slots.add(passwordSlot);
+        slots.add(passwordSlot2);
+        slots.add(backupSlot);
+        actual = slots.exportable();
+        expected = new SlotList();
+        expected.add(backupSlot);
+        assertArrayEquals(expected.getValues().toArray(), actual.getValues().toArray());
+
+        // If multiple regular password slots and a biometric slot are present:
+        // -> The biometric slot gets stripped
+        slots = new SlotList();
+        slots.add(passwordSlot);
+        slots.add(passwordSlot2);
+        slots.add(biometricSlot);
+        actual = slots.exportable();
+        expected = new SlotList();
+        expected.add(passwordSlot);
+        expected.add(passwordSlot2);
+        assertArrayEquals(expected.getValues().toArray(), actual.getValues().toArray());
+
+        // If a regular password slot and a biometric slot are present
+        // -> The biometric slot gets stripped
+        slots = new SlotList();
+        slots.add(passwordSlot);
+        slots.add(biometricSlot);
+        actual = slots.exportable();
+        expected = new SlotList();
+        expected.add(passwordSlot);
+        assertArrayEquals(expected.getValues().toArray(), actual.getValues().toArray());
+
+        // If a regular password slot is present
+        // -> No slots get stripped
+        slots = new SlotList();
+        slots.add(passwordSlot);
+        actual = slots.exportable();
+        expected = new SlotList();
+        expected.add(passwordSlot);
+        assertArrayEquals(expected.getValues().toArray(), actual.getValues().toArray());
     }
 }
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/2fas_authenticator_encrypted_v4.2fas b/app/src/test/resources/com/beemdevelopment/aegis/importers/2fas_authenticator_encrypted_v4.2fas
new file mode 100644
index 00000000..d064d875
--- /dev/null
+++ b/app/src/test/resources/com/beemdevelopment/aegis/importers/2fas_authenticator_encrypted_v4.2fas
@@ -0,0 +1 @@
+{"services":[],"groups":[],"updatedAt":1702934782660,"schemaVersion":4,"appVersionCode":5000009,"appVersionName":"5.1.0","appOrigin":"android","servicesEncrypted":"PCeJ8H3t2vpQZE1HJdDygnK+Cc+B3RmxrxdiuMd93Hd/wX6KXLaiDN6ILMO8Yu9VbVJ1C7U104pR6eIGTmC5EWGmh/mcD9E5PA+vNZdupcpU6ZjwMsguVGGfi5XEhG9LXZVkYk24rlXiScGxsJEWxfkBTIjPKG/D0fvkcqzIVYH6rbFCDbyKHeKtm5DrL1c7DPA+5xz7YRbMCqmHkM6bwfg0cLlIJnHfsFhDpDBr+2G9I3Ugsp1X8ah/376IGwfmvLxpUfyHtDpKsvmiX8qfffWDGp4D869Anem9z4wG4qYRHEgmfuG6Fb3siRjLbg8sYAl7UDqsc3FTIYUPBWlmU4dgAyPjsp53SXxzQUn6ZofOvluW4Pc0RVcmeWa4ED0nQ2HwJdsfgpk9qOunc5uAUDpAKAKbmoA8nutzFarUeZ9ZZzLiDNwGQx1yncr6Gl/goiBeBTo78doyhxW+OrmY5ODmSx7zxus+CEcfS0iZfVpg+6084qEo8UGiXRwRrJGWaoWEN8Y2gfE9Lab8RnJ57NQ+drW3fIrMK4Az7XPEpoCzmID4ipORmjgcydxfA8WfvVkGRP4mfP20nr0xxzrNNjlqU10TLTsZWadlHTwciltbXU1FFZYTKHE3Dt4Uv3B96lIDdQ4fbr7N/xw0MiJMNys3t3wwbINiwoxw4LLC59MHwk7ZZNgPg73yIJFM7ynwLmFx05Og15xf32DvwiImulLWjUix06LmoycdCOSP20LbPIhmXm0GT528/EFMM4ty7m1QEFnUs3PA5V7Eufe1qVXduvMJVkGUiAoE802zP1WlXL6fKZudl1jB5mf9x91IFWc+fOuVCuHahRIWcjeiUqRi3cWjO2LlN9471xeUy3ey2aIReCoB6SzhmbmCluKHg60AZrkaQYAGq7m4EQgmfP0EfiWZz9qvoP7qw6U53AfDLYS+cB+NT6A7bd+ofInyBIv8V8HMhKe3Gv2rdLNGrV0RhmbJeZq8z0aQQKPX6Td41+gWMmR0hd7PBzpMaLWbQi2g+r04G0p/RW0ZlTr0K1sIr6T05yBwQbDGCZNnq1y8pGBkNHe5u8y1OxG9LPnd3KzFz0y7TNSqQkonQWMeXyx3FiFgGDLcUjdooLsvh3vtLR1PIXRSicSWE2nHA+j+9zk9/yJ7V6UtxZg3yQbWbBqtGmk7zcDL6rRtrEOl7yS6ZjLdeNH3b3S4OQb3YqS38W78SKW1Czc70ZDoGKmuBSZaWA8/teGXMDAzcyhosFRkNxznQpCvNdsJn5mI9H8RiXffyGSy8qQlFxRqlzsG5LRPThzXVEuYg7q4sybIkzqcpUKzMIjwiOvkluvqlbF7KBYxoyfVSAz6w6ZFwklzIxh1V1AvuFwUQENE8yX/LoLyo+WC987oQqGIU2FwWpo0mUNxwM12ZYnL/i7UQzmMlKh0iHKq2FMq9+RtQuJ40g6nGCrj/G0LXfUB2OD5IHCTR3ujxXhFLumLbiLzpdXVl0qQ4n8f3xKT3lY9+Uul94t1J1huOrhteVqd+a0wuphFD/z23NkyWHJCsfTFBmAb0GPENP1gBBWdABDfxobCgBNJIOsMx66eO2uxqssHaf9GqkYvmpqRso2gLQrzNND8HVQVpZxUjd/EHc9GdCsMYxJUqyS6SrAzIusBqPrs1wHMR+w18YW3LtOLDe7TCodB1Q0QVJsQeNcWzxzMMXX+7mbGw3cIEb1UG8b2SKY8qZCTbJyJOlKvq0dOW/NB0z+QC2u3ax/0ReKRJpTBOF0SWC1pOCwFurjvSN6rR52jrIf5Kx/od0RKWtcNQJh8781gAxyGjwadiIWZN8VzXlHf+ve3SfPlLdIVCOtybxcVKkDekro4svAk2b7Qh8TD84KJxK16JyqWPc3/QummR2y9N8hAV+lbNLVaOcmvH+K0U9Fxeogcmzi0f3xq/bhRs9tvIKOay3vPyxzXljlHPM8hZ83oMVzPbE6X64BES4PwWYeshq01aQaLDhOvLLvHmWAT4BA3bSedbF/OjX4X5orSXjetzQtdtgbXqla4Vdmu2YFk0vt1YjBPlUHW6tsYFqz6qjCCri3LmgugfBYnhR2erSQhvTDTATsdRYe3Ytc8FiaLkLIBMym1L+ct9etEHHgkZBbI/K2g2NRkf8DgHXS+ngbKEb4Yg0X7KMzF5W6TTz7k1IN0r+cLwpgKSL+ACO5FOINa6J9tGUFYRa6clD8Ra9mZnB1+oJkOcs3UNJeNR2vDwNz8JePaKBOBrHumpHAyk2WWdMdqOHQ2yXAlxJioF3QXLKtDewJFdn+gISIQFSt5HGMy9vs+kNa8Y5OjSvuqkTLMRaIYYsRXA2rTBwf0E6FHcBKwnTOQIRgbsaQw38Qo9ovtcjAZ69rlmGdc3w716Ubhb1KVtHv8lzUv4MKAmjjgf+OoELWpW7qKRNLrv5siLiL/EOTq+VBK7Edfnh9fiDuV5xpEn1UQcMnp5H3Nv0oetLa9fuStYfDQzbfywjni+QjQOTlF0udRYQTEMNVRB3zycWxf0eZlbVOBsOkQjoq33b9pGYOHuczqB4G/2c+dV10HOGo6IwExyED2cvXKIJk9SlQfp/jxdGBZ1umUoRgQl7h3miJqY9DasgaQXu6nMx8e0Tso3D6A0exaMTun8taR69OzQMDlQUxs9pYsIICmXTTRWXxoKCTtsF6CCZGEU3IhuvSZR9YNXYyPL34l2Qszcs8DBrQpZvJL8aOxrw7wCtlN0kVrhVZ+UOr9ux/+1sRo2fvm54cKo/C0lNJDU5X+EDLojmjqWTkKBsZJNRPTDIbyAvE3Awn0vs2Oc/M25/RTCOgcJ+MoLM6D/irdgnCjk18HA7iPIeqdrxaDSrLfufCL8Tj+qab6z7F628eneeYNvBysw9CrX56/EfrbopV0d/bs9rTCJrh+XWuULXHtqsZOkXToy+AAlkzTga6bOYnuihxITHZSGaJTQQCLG7bokMGELbmwzDOeAoRdRA2reE15TNRv2Ltd/olHk55iDNxBgtlFmGam7NlhG0H9s0FqavwFqowlI+9RWMQiLyPe4f8uQmlRMcuY/rjpIehC8u210kcCR1oEtbPn2JmIvUzK79H4HMTh3g6aRf/kKGjSLFCLHQI0MOAE6oZJVGVTVOWFwwmcb1W/Zrr3eoseDuH3MD3X+0zvbPDNOOYa7g/bSqONTKRTDnLhB1cmQp7HP81PstDnV68ochm7RQEwWB79aZX/APRxB3AM/UxC4ytOYJN9ZjOfFm9RbcPlDxOj/sKWk86pGHK0utjIaNMZ3jfi1I3JX9m9XkxOX6b9tRl/jU2TMljBzLfo7YPUKAW4TqcFp17/VDD1WdxMKY9iwFlqDaZpbzAYZpQrW9nV8lKZlHmvRDSVlVov9jCb28EIH/A=:dhXb6HzrC+U59zVJXnImEPsfhv1QxfxcgLeR80iKdwe7p4nfZ39VjMOiVlw2hOBHOX6qithmOvMBxxHMF/o7z6Ve+nIkBpZM59l12FcLPrMPihNtROYPCbJjjIxthpROhsI+VLuednyNaJYym0yfFli0wiWxU1xL4O4nyFIXWg3ZkbTVE0SiKI6ZmgsX2EmkJ9ZnKBVY00+62nxInCy8wgHfWZuD3jQlxccJrFezwg7KYNTZUuxAZmZl1nZIOdjhhPu4YMlHIMliiSLeJEPvTS5tmzOSMzjDXrwBl7pv8jtcYQSMfJPsVbFV4+Y1LA4E9jDzJcBgNU0sS5cbwLji8g==:6i0mYmyWAq70J5bD","reference":"QkyMxyhB3DZkI2hpz1c9OpnrWtcAkHXbTPgGFcXKRwvSR8DxaFem7cJz06ybopbBaxzELw+95jtYf5O90956urWFVD0G62xNj0gfqtwty3jXVRYimp+V6ufLlJx3b6aINwiDs/59GweFXaLTIju5HXen2gBiay5GkE2SUzaDaDovWXQ4XgQGdLHDkMuPMScNOhaU019zKYXcXM7wyG+8o/VtybIrc74U/C7d/Y2wz5e2/CjuwbLlGlEdYXx5+dggHhIJRLiLtN4KNwCY1fSP0J/y/sxoaYv3FP9tUIdG84yQvDgu6VOl7swC0+O1GiAcTzb3aygEmlssbx8+8cdb0cZf9Oq/aoxa1Qm5g8dtKrY=:dhXb6HzrC+U59zVJXnImEPsfhv1QxfxcgLeR80iKdwe7p4nfZ39VjMOiVlw2hOBHOX6qithmOvMBxxHMF/o7z6Ve+nIkBpZM59l12FcLPrMPihNtROYPCbJjjIxthpROhsI+VLuednyNaJYym0yfFli0wiWxU1xL4O4nyFIXWg3ZkbTVE0SiKI6ZmgsX2EmkJ9ZnKBVY00+62nxInCy8wgHfWZuD3jQlxccJrFezwg7KYNTZUuxAZmZl1nZIOdjhhPu4YMlHIMliiSLeJEPvTS5tmzOSMzjDXrwBl7pv8jtcYQSMfJPsVbFV4+Y1LA4E9jDzJcBgNU0sS5cbwLji8g==:u6Y8Kcpqe8hQaOW6"}
\ No newline at end of file
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/2fas_authenticator_plain_v4.2fas b/app/src/test/resources/com/beemdevelopment/aegis/importers/2fas_authenticator_plain_v4.2fas
new file mode 100644
index 00000000..013fadc3
--- /dev/null
+++ b/app/src/test/resources/com/beemdevelopment/aegis/importers/2fas_authenticator_plain_v4.2fas
@@ -0,0 +1 @@
+{"services":[{"name":"Deno","secret":"4SJHB4GSD43FZBAI7C2HLRJGPQ","updatedAt":1702934567518,"otp":{"link":"otpauth://totp/Deno:Mason?secret=4SJHB4GSD43FZBAI7C2HLRJGPQ&issuer=Deno&algorithm=SHA1&digits=6&period=30","label":"Mason","account":"Mason","issuer":"Deno","digits":6,"period":30,"algorithm":"SHA1","tokenType":"TOTP","source":"Link"},"order":{"position":0},"icon":{"selected":"Label","label":{"text":"DE","backgroundColor":"Yellow"},"iconCollection":{"id":"a5b3fb65-4ec5-43e6-8ec1-49e24ca9e7ad"}}},{"name":"Issuu","secret":"YOOMIXWS5GN6RTBPUFFWKTW5M4","updatedAt":1702934586420,"otp":{"link":"otpauth://hotp/Issuu:James?secret=YOOMIXWS5GN6RTBPUFFWKTW5M4&issuer=Issuu&algorithm=SHA1&digits=6&counter=1","label":"James","account":"James","issuer":"Issuu","digits":6,"algorithm":"SHA1","counter":1,"tokenType":"HOTP","source":"Link"},"order":{"position":1},"icon":{"selected":"Label","label":{"text":"IS","backgroundColor":"Brown"},"iconCollection":{"id":"a5b3fb65-4ec5-43e6-8ec1-49e24ca9e7ad"}}},{"name":"Air Canada","secret":"KUVJJOM753IHTNDSZVCNKL7GII","updatedAt":1702934590910,"otp":{"link":"otpauth://hotp/Air%20Canada:Benjamin?secret=KUVJJOM753IHTNDSZVCNKL7GII&issuer=Air+Canada&algorithm=SHA256&digits=7&counter=50","label":"Benjamin","account":"Benjamin","issuer":"Air Canada","digits":7,"algorithm":"SHA256","counter":50,"tokenType":"HOTP","source":"Link"},"order":{"position":2},"icon":{"selected":"Label","label":{"text":"AI","backgroundColor":"Orange"},"iconCollection":{"id":"a5b3fb65-4ec5-43e6-8ec1-49e24ca9e7ad"}}},{"name":"WWE","secret":"5VAML3X35THCEBVRLV24CGBKOY","updatedAt":1702934596091,"otp":{"link":"otpauth://hotp/WWE:Mason?secret=5VAML3X35THCEBVRLV24CGBKOY&issuer=WWE&algorithm=SHA512&digits=8&counter=10300","label":"Mason","account":"Mason","issuer":"WWE","digits":8,"algorithm":"SHA512","counter":10300,"tokenType":"HOTP","source":"Link"},"order":{"position":3},"icon":{"selected":"Label","label":{"text":"WW","backgroundColor":"Default"},"iconCollection":{"id":"a5b3fb65-4ec5-43e6-8ec1-49e24ca9e7ad"}}},{"name":"Boeing","secret":"JRZCL47CMXVOQMNPZR2F7J4RGI","updatedAt":1702934600248,"otp":{"link":"otpauth://steam/Boeing:Sophia?secret=JRZCL47CMXVOQMNPZR2F7J4RGI&issuer=Boeing&algorithm=SHA1&digits=5&period=30","label":"Sophia","account":"Sophia","issuer":"Boeing","digits":5,"period":30,"algorithm":"SHA1","tokenType":"STEAM","source":"Link"},"order":{"position":4},"icon":{"selected":"Label","label":{"text":"BO","backgroundColor":"Pink"},"iconCollection":{"id":"a5b3fb65-4ec5-43e6-8ec1-49e24ca9e7ad"}}}],"groups":[],"updatedAt":1702934732299,"schemaVersion":4,"appVersionCode":5000009,"appVersionName":"5.1.0","appOrigin":"android"}
\ No newline at end of file
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/battle_net_authenticator.xml b/app/src/test/resources/com/beemdevelopment/aegis/importers/battle_net_authenticator.xml
index 16714447..dcaa8707 100644
--- a/app/src/test/resources/com/beemdevelopment/aegis/importers/battle_net_authenticator.xml
+++ b/app/src/test/resources/com/beemdevelopment/aegis/importers/battle_net_authenticator.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <map>
-    <int name="com.blizzard.bma.AUTH_STORE_HASH_VERSION" value="20600015" />
-    <string name="com.blizzard.bma.AUTH_STORE.HASH">09ec179861450806035080d113c5f05e62f67316110eec1bd495a9cdb65a3cb3f93b1f80b80b4507f0c8894e25fb5d494b31692d76b8bc5fac</string>
-    <long name="com.blizzard.bma.AUTH_STORE.CLOCK_OFFSET" value="193" />
-    <long name="com.blizzard.bma.AUTH_STORE.LAST_MODIFIED" value="1668980752290" />
-</map>
\ No newline at end of file
+    <string name="com.blizzard.messenger.AUTHENTICATOR_CREDENTIALS_ENCRYPTION_TYPE">MASK</string>
+    <boolean name="com.blizzard.messenger.AUTHENTICATOR_SETUP_POSTPONE_LOGIN" value="false" />
+    <string name="com.blizzard.messenger.AUTHENTICATOR_DEVICE_SECRET">09ec179861450806035080d113c5f05e62f67316110eec1bd495a9cdb65a3cb3f93b1f80b80b4507</string>
+    <string name="com.blizzard.messenger.PREF_AUTHENTICATION_PROVIDER_HOST_URL">oauth.battle.net</string>
+    <string name="com.blizzard.messenger.AUTHENTICATOR_BGS_REGION_CODE">EU</string>
+    <string name="com.blizzard.messenger.AUTHENTICATOR_SERIAL">6cdd0ace62165b48525585d508c7f35832</string>
+    <long name="com.blizzard.messenger.AUTHENTICATOR_SERVER_TIME_DIFF" value="15" />
+</map>
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/ente_auth.txt b/app/src/test/resources/com/beemdevelopment/aegis/importers/ente_auth.txt
new file mode 100644
index 00000000..8c52e62c
--- /dev/null
+++ b/app/src/test/resources/com/beemdevelopment/aegis/importers/ente_auth.txt
@@ -0,0 +1,7 @@
+otpauth://hotp/Air%20Canada:Benjamin?secret=KUVJJOM753IHTNDSZVCNKL7GII&issuer=Air+Canada&algorithm=SHA256&digits=7&counter=50&codeDisplay=%7B%22pinned%22%3Afalse%2C%22trashed%22%3Afalse%2C%22lastUsedAt%22%3A0%2C%22tapCount%22%3A0%2C%22tags%22%3A%5B%5D%7D
+otpauth://totp/Airbnb:Elijah?secret=7ELGJSGXNCCTV3O6LKJWYFV2RA&issuer=Airbnb&algorithm=SHA512&digits=8&period=50&codeDisplay=%7B%22pinned%22%3Afalse%2C%22trashed%22%3Afalse%2C%22lastUsedAt%22%3A0%2C%22tapCount%22%3A0%2C%22tags%22%3A%5B%5D%7D
+otpauth://steam/Boeing:Sophia?secret=JRZCL47CMXVOQMNPZR2F7J4RGI&issuer=Boeing&algorithm=SHA1&digits=5&period=30&codeDisplay=%7B%22pinned%22%3Afalse%2C%22trashed%22%3Afalse%2C%22lastUsedAt%22%3A0%2C%22tapCount%22%3A0%2C%22tags%22%3A%5B%5D%7D
+otpauth://totp/Deno:Mason?secret=4SJHB4GSD43FZBAI7C2HLRJGPQ&issuer=Deno&algorithm=SHA1&digits=6&period=30&codeDisplay=%7B%22pinned%22%3Afalse%2C%22trashed%22%3Afalse%2C%22lastUsedAt%22%3A0%2C%22tapCount%22%3A0%2C%22tags%22%3A%5B%5D%7D
+otpauth://hotp/Issuu:James?secret=YOOMIXWS5GN6RTBPUFFWKTW5M4&issuer=Issuu&algorithm=SHA1&digits=6&counter=1&codeDisplay=%7B%22pinned%22%3Afalse%2C%22trashed%22%3Afalse%2C%22lastUsedAt%22%3A0%2C%22tapCount%22%3A0%2C%22tags%22%3A%5B%5D%7D
+otpauth://totp/SPDX:James?secret=5OM4WOOGPLQEF6UGN3CPEOOLWU&issuer=SPDX&algorithm=SHA256&digits=7&period=20&codeDisplay=%7B%22pinned%22%3Afalse%2C%22trashed%22%3Afalse%2C%22lastUsedAt%22%3A0%2C%22tapCount%22%3A0%2C%22tags%22%3A%5B%5D%7D
+otpauth://hotp/WWE:Mason?algorithm=sha512&digits=8&issuer=WWE&period=30&secret=5VAML3X35THCEBVRLV24CGBKOY&counter=10300&codeDisplay=%7B%22pinned%22%3Afalse%2C%22trashed%22%3Afalse%2C%22lastUsedAt%22%3A0%2C%22tapCount%22%3A0%2C%22tags%22%3A%5B%5D%7D
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api23.xml b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api23.xml
new file mode 100644
index 00000000..553192de
Binary files /dev/null and b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api23.xml differ
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api25.xml b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api25.xml
new file mode 100644
index 00000000..0d459fbe
Binary files /dev/null and b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api25.xml differ
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api27.xml b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api27.xml
new file mode 100644
index 00000000..9f4b19b0
Binary files /dev/null and b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api27.xml differ
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api34.xml b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api34.xml
new file mode 100644
index 00000000..c17a5023
Binary files /dev/null and b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_api34.xml differ
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_null_algo.xml b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_null_algo.xml
new file mode 100644
index 00000000..dc890c5c
Binary files /dev/null and b/app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_null_algo.xml differ
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/steam.json b/app/src/test/resources/com/beemdevelopment/aegis/importers/steam.json
index 126f6e3f..4df35308 100644
--- a/app/src/test/resources/com/beemdevelopment/aegis/importers/steam.json
+++ b/app/src/test/resources/com/beemdevelopment/aegis/importers/steam.json
@@ -1 +1 @@
-{"steamid":"1234","shared_secret":"THIl8+Jl6ugxr8x0X6eRMg==","serial_number":"12345678901234567890","revocation_code":"R1234","uri":"otpauth:\/\/totp\/Steam:Sophia?secret=JRZCL47CMXVOQMNPZR2F7J4RGI&issuer=Steam","server_time":"0","account_name":"Sophia","token_gid":"894820a474c9","identity_secret":"dGhpcyBpcyBhIHRlc3Qgc3RyaW5n","secret_1":"eWV0IGFub3RoZXIgdGVzdCBzdHJpbmc=","status":1,"steamguard_scheme":"2"}
+{"accounts":{"abcdefg":{"steamid":"1234","shared_secret":"THIl8+Jl6ugxr8x0X6eRMg==","serial_number":"12345678901234567890","revocation_code":"R1234","uri":"otpauth:\/\/totp\/Steam:Sophia?secret=JRZCL47CMXVOQMNPZR2F7J4RGI&issuer=Steam","server_time":"0","account_name":"Sophia","token_gid":"894820a474c9","identity_secret":"dGhpcyBpcyBhIHRlc3Qgc3RyaW5n","secret_1":"eWV0IGFub3RoZXIgdGVzdCBzdHJpbmc=","status":1,"steamguard_scheme":"2"}}}
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/steam_old.json b/app/src/test/resources/com/beemdevelopment/aegis/importers/steam_old.json
new file mode 100644
index 00000000..126f6e3f
--- /dev/null
+++ b/app/src/test/resources/com/beemdevelopment/aegis/importers/steam_old.json
@@ -0,0 +1 @@
+{"steamid":"1234","shared_secret":"THIl8+Jl6ugxr8x0X6eRMg==","serial_number":"12345678901234567890","revocation_code":"R1234","uri":"otpauth:\/\/totp\/Steam:Sophia?secret=JRZCL47CMXVOQMNPZR2F7J4RGI&issuer=Steam","server_time":"0","account_name":"Sophia","token_gid":"894820a474c9","identity_secret":"dGhpcyBpcyBhIHRlc3Qgc3RyaW5n","secret_1":"eWV0IGFub3RoZXIgdGVzdCBzdHJpbmc=","status":1,"steamguard_scheme":"2"}
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_encrypted.bin b/app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_encrypted.bin
new file mode 100644
index 00000000..b515a7b3
Binary files /dev/null and b/app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_encrypted.bin differ
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/authpro_encrypted.bin b/app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_encrypted_legacy.bin
similarity index 100%
rename from app/src/test/resources/com/beemdevelopment/aegis/importers/authpro_encrypted.bin
rename to app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_encrypted_legacy.bin
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/authpro_internal.db b/app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_internal.db
similarity index 100%
rename from app/src/test/resources/com/beemdevelopment/aegis/importers/authpro_internal.db
rename to app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_internal.db
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/importers/authpro_plain.json b/app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_plain.json
similarity index 100%
rename from app/src/test/resources/com/beemdevelopment/aegis/importers/authpro_plain.json
rename to app/src/test/resources/com/beemdevelopment/aegis/importers/stratum_plain.json
diff --git a/app/src/test/resources/com/beemdevelopment/aegis/vault/aegis_plain_grouped_v2.json b/app/src/test/resources/com/beemdevelopment/aegis/vault/aegis_plain_grouped_v2.json
new file mode 100644
index 00000000..4e601ed8
--- /dev/null
+++ b/app/src/test/resources/com/beemdevelopment/aegis/vault/aegis_plain_grouped_v2.json
@@ -0,0 +1,117 @@
+{
+    "version": 1,
+    "header": {
+        "slots": null,
+        "params": null
+    },
+    "db": {
+        "version": 2,
+        "entries": [
+            {
+                "type": "totp",
+                "uuid": "3ae6f1ad-2e65-4ed2-a953-1ec0dff2386d",
+                "name": "Mason",
+                "issuer": "Deno",
+                "icon": null,
+                "icon_mime": null,
+                "group": "group1",
+                "info": {
+                    "secret": "4SJHB4GSD43FZBAI7C2HLRJGPQ",
+                    "algo": "SHA1",
+                    "digits": 6,
+                    "period": 30
+                }
+            },
+            {
+                "type": "totp",
+                "uuid": "84b55971-a3d2-4173-a5bb-0aea113dbc17",
+                "name": "James",
+                "issuer": "SPDX",
+                "icon": null,
+                "icon_mime": null,
+                "group": null,
+                "info": {
+                    "secret": "5OM4WOOGPLQEF6UGN3CPEOOLWU",
+                    "algo": "SHA256",
+                    "digits": 7,
+                    "period": 20
+                }
+            },
+            {
+                "type": "totp",
+                "uuid": "3deaff2e-f181-4837-80e1-fdf0c54e9363",
+                "name": "Elijah",
+                "issuer": "Airbnb",
+                "icon": null,
+                "icon_mime": null,
+                "group": "group1",
+                "info": {
+                    "secret": "7ELGJSGXNCCTV3O6LKJWYFV2RA",
+                    "algo": "SHA512",
+                    "digits": 8,
+                    "period": 50
+                }
+            },
+            {
+                "type": "hotp",
+                "uuid": "0a8c0571-ff6f-4b02-aa4b-50553b4fb4fe",
+                "name": "James",
+                "issuer": "Issuu",
+                "icon": null,
+                "icon_mime": null,
+                "group": "group2",
+                "info": {
+                    "secret": "YOOMIXWS5GN6RTBPUFFWKTW5M4",
+                    "algo": "SHA1",
+                    "digits": 6,
+                    "counter": 1
+                }
+            },
+            {
+                "type": "hotp",
+                "uuid": "03e572f2-8ebd-44b0-a57e-e958af74815d",
+                "name": "Benjamin",
+                "issuer": "Air Canada",
+                "icon": null,
+                "icon_mime": null,
+                "group": null,
+                "info": {
+                    "secret": "KUVJJOM753IHTNDSZVCNKL7GII",
+                    "algo": "SHA256",
+                    "digits": 7,
+                    "counter": 50
+                }
+            },
+            {
+                "type": "hotp",
+                "uuid": "b25f8815-007f-40f7-a700-ce058ac05435",
+                "name": "Mason",
+                "issuer": "WWE",
+                "icon": null,
+                "icon_mime": null,
+                "group": null,
+                "info": {
+                    "secret": "5VAML3X35THCEBVRLV24CGBKOY",
+                    "algo": "SHA512",
+                    "digits": 8,
+                    "counter": 10300
+                }
+            },
+            {
+                "type": "steam",
+                "uuid": "5b11ae3b-6fc3-4d46-8ca7-cf0aea7de920",
+                "name": "Sophia",
+                "issuer": "Boeing",
+                "icon": null,
+                "icon_mime": null,
+                "group": null,
+                "info": {
+                    "secret": "JRZCL47CMXVOQMNPZR2F7J4RGI",
+                    "algo": "SHA1",
+                    "digits": 5,
+                    "period": 30
+                }
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ec555792..ba69c120 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.47'
+        classpath 'com.android.tools.build:gradle:8.10.0'
+        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.56.2'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -15,12 +15,15 @@ buildscript {
     }
 }
 
+plugins {
+    id 'com.mikepenz.aboutlibraries.plugin' version '11.2.3'
+}
+
 allprojects {
     repositories {
         mavenCentral()
         google()
         maven { url 'https://jitpack.io' }
-        jcenter()
     }
 }
 
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 00000000..59912b50
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,14 @@
+project_id: "372633"
+preserve_hierarchy: true
+base_path: "app/src/main"
+base_url: "https://api.crowdin.com"
+api_token_env: "CROWDIN_PERSONAL_TOKEN"
+files:
+  - type: "android"
+    source: "res/values/strings.xml"
+    dest: "strings.xml"
+    translation: "res/values-%android_code%/%original_file_name%"
+  - type: "android"
+    source: "res/values-v29/strings.xml"
+    dest: "strings-v29.xml"
+    translation: "res/values-%android_code%-v29/%original_file_name%"
diff --git a/docs/iconpacks.md b/docs/iconpacks.md
index 2b98fe88..a3b72f8d 100644
--- a/docs/iconpacks.md
+++ b/docs/iconpacks.md
@@ -15,11 +15,13 @@ is randomly generated once and stays the same across different versions.
     "version": 1,
     "icons": [
         {
+            "name": "Google",
             "filename": "services/Google.png",
             "category": "Services",
             "issuer": [ "google" ]
         },
         {
+            "name": "Blizzard",
             "filename": "services/Blizzard.png",
             "category": "Gaming",
             "issuer": [ "blizzard", "battle.net" ]
@@ -32,7 +34,7 @@ Every icon definition contains the filename of the icon file, relative to the
 root of the .ZIP archive. Icon definitions also have a list of strings that the
 Issuer field in Aegis is matched against for automatic selection of an icon for
 new entries. Matching is done in a case-insensitive manner. There's also a
-category field.
+category field. Optionally, icons can also have a name.
 
 The following image formats are supported, in order of preference:
 
diff --git a/docs/vault.md b/docs/vault.md
index 6a892a00..e60d244d 100644
--- a/docs/vault.md
+++ b/docs/vault.md
@@ -14,8 +14,10 @@ format of the vault.
 ### Primitives
 
 Two cryptographic primitives were selected for use in Aegis. An Authenticated
-Encryption with Associated Data (AEAD) cipher and a Key Derivation Function
-(KDF).
+Encryption with Associated Data
+([AEAD](https://en.wikipedia.org/wiki/Authenticated_encryption#Authenticated_encryption_with_associated_data))
+cipher and a Key Derivation Function
+([KDF](https://en.wikipedia.org/wiki/Key_derivation_function)).
 
 #### AEAD
 
@@ -36,15 +38,16 @@ This is a reasonable assumption to make, because it's highly unlikely that an
 Aegis user will ever come close to saving the vault 2<sup>32</sup> times.
 
 _Switching to a nonce misuse-resistant cipher like AES-GCM-SIV or a cipher with
-a larger (192 bits) nonce like XChaCha-Poly1305 will be considered in the future._
+a larger (192 bits) nonce like XChaCha-Poly1305 will be considered in the
+future._
 
 #### KDF
 
-__scrypt__ is used as the KDF to derive a key from a user-provided password,
-with the following parameters:
+[__scrypt__](https://en.wikipedia.org/wiki/Scrypt) is used as the KDF to derive
+a key from a user-provided password, with the following parameters:
 
-| Parameter |  Value         |
-| :-------- | :------------- |
+| Parameter | Value          |
+|:----------|:---------------|
 | N         | 2<sup>15</sup> |
 | r         | 8              |
 | p         | 1              |
@@ -104,12 +107,17 @@ shown below:
 }
 ```
 
-It starts with a ``version`` number and a ``header``. If a backwards
-incompatible change is introduced to the content format, the version number will
-be incremented. The vault contents are stored under ``db``. Its value depends on
-whether the vault is encrypted or not. If it is, the value is a string containing
-the Base64 encoded (with padding) ciphertext of the vault contents. Otherwise,
-the value is a JSON object.
+It starts with a ``version`` number. If a forwards incompatible change is
+introduced to the vault format, the version number will be incremented. The
+current version of the vault format is ``1``.
+
+The [``header``](#header), if not empty, contains the list of slots and the
+encryption parameters used for decrypting the vault.
+
+The vault contents are stored under ``db``. Its value depends on whether the
+vault is encrypted or not. If it is, the value is a string containing the Base64
+encoded (with padding) ciphertext of the vault contents. Otherwise, the value is
+a JSON object. See [vault content](#vault-content) for details.
 
 Full examples of a [plain text
 vault](/app/src/test/resources/com/beemdevelopment/aegis/importers/aegis_plain.json)
@@ -122,9 +130,14 @@ password: [decrypt.py](/docs/decrypt.py).
 
 ### Header
 
-The header starts with the list of ``slots``. It also has a ``params`` object
-that holds the ``nonce`` and ``tag`` that were produced during encryption,
-encoded as a hexadecimal string. 
+The header starts with the list of [``slots``](#slots-1). Each slot contains the
+master key in an encrypted form together with the key wrapping parameters.
+
+It also has a ``params`` object that holds the ``nonce`` and ``tag`` that were
+produced during the AES-GCM encryption, encoded as a hexadecimal string. These
+encryption parameters together with the master key (which can be retrieved by
+decrypting the ``key`` from one of the slots) are used to decrypt the vault
+contents found in the ``db`` field.
 
 Setting ``slots`` and ``params`` to null indicates that the vault is not
 encrypted and Aegis will try to parse it as such.
@@ -141,13 +154,13 @@ encrypted and Aegis will try to parse it as such.
 
 #### Slots
 
-The different slot types are identified with a numerical ID. 
+The different slot types are identified with a numerical ID.
 
-| Type        | ID   |
-| :---------- | :--- |
-| Raw         | 0x00 |
-| Password    | 0x01 |
-| Biometric   | 0x02 |
+| Type      | ID   |
+|:----------|:-----|
+| Raw       | 0x00 |
+| Password  | 0x01 |
+| Biometric | 0x02 |
 
 ##### Raw
 
@@ -182,7 +195,7 @@ Raw slots don't imply use of a particular storage type.
 
 As noted earlier, scrypt is used to derive a 256-bit key from a user-provided
 password. A random 256-bit ``salt`` is generated and passed to scrypt to protect
-against rainbow table attacks. Its stored along with the ``N``, ``r`` and ``p``
+against rainbow table attacks. It's stored along with the ``N``, ``r`` and ``p``
 parameters.
 
 ```json
@@ -201,56 +214,69 @@ parameters.
 }
 ```
 
-### Content
+### Vault content
 
 The content is a JSON object encoded in UTF-8.
 
 ```json
 {
-    "version": 1,
-    "entries": []
+    "version": 3,
+    "entries": [],
+    "groups": []
 }
 ```
 
-It has a ``version`` number and a list of ``entries``. If a backwards
-incompatible change is introduced to the content format, the version number will
-be incremented.
+It has a ``version`` number, a list of ``entries`` and a list of ``groups``. If
+a forwards incompatible change is introduced to the content format, the version
+number will be incremented. The current version of the vault content format is
+``3``.
+
+| Field       | Type  | Description                              |
+|:------------|:------|:-----------------------------------------|
+| ``version`` | int   | The version of the vault content format. |
+| ``entries`` | array | A list of [entries](#entries).           |
+| ``groups``  | array | A list of [groups](#groups).             |
 
 #### Entries
 
-Each entry has a unique randomly generated ``UUID`` (version 4), as well as a
-``name`` and ``issuer`` to identify the account name and service that the token
-is for. Entries can also have an icon. These are JPEG's encoded in Base64 with
-padding. The ``info`` object holds information specific to the OTP type. The
-``secret`` is encoded in Base32 without padding.
+Each entry has a unique randomly generated ``UUID``, as well as a ``name`` and
+``issuer`` to identify the account name and service that the token is for.
+
+Entries hold the following fields:
+
+| Field         | Type           | Description                                                                     |
+|:--------------|:---------------|:--------------------------------------------------------------------------------|
+| ``type``      | string         | The type of the OTP algorithm. See table below.                                 |
+| ``uuid``      | string         | A UUID (version 4).                                                             |
+| ``name``      | string         | The account name.                                                               |
+| ``issuer``    | string         | The service that the token is for.                                              |
+| ``note``      | string         | A personal note about the entry.                                                |
+| ``icon``      | string \| null | JPEG's encoded in Base64 with padding.                                          |
+| ``icon_mime`` | string \| null | The MIME type of the icon. Is null if ``icon`` is null.                         |
+| ``icon_hash`` | string \| null | The SHA-256 hash of the icon. Is null if ``icon`` is null.                      |
+| ``favorite``  | bool           | Whether the entry is a favorite or not.                                         |
+| ``info``      | object         | Information specific to the OTP type.                                           |
+| ``groups``    | array          | A list of UUIDs of groups that the entry is a member of. See [Groups](#groups). |
+
+The ``info`` object contains different fields depending on the type of the OTP.
 
 There are a number of supported types:
 
-| Type                | ID       | Spec      |
-| :------------------ | :------- | :-------- |
-| HOTP                | "hotp"   | [RFC 4226](https://datatracker.ietf.org/doc/html/rfc4226)
-| TOTP                | "totp"   | [RFC 6238](https://datatracker.ietf.org/doc/html/rfc6238)
-| Steam               | "steam"  | N/A
-| Yandex              | "yandex" | N/A
+| Type   | ID       | Spec                                                      |
+|:-------|:---------|:----------------------------------------------------------|
+| HOTP   | "hotp"   | [RFC 4226](https://datatracker.ietf.org/doc/html/rfc4226) |
+| TOTP   | "totp"   | [RFC 6238](https://datatracker.ietf.org/doc/html/rfc6238) |
+| Steam  | "steam"  | N/A                                                       |
+| MOTP   | "motp"   | N/A                                                       |
+| Yandex | "yandex" | N/A                                                       |
 
-There is no specification available for Steam's OTP algorithm. It's essentially
-the same as TOTP, but it uses a different final encoding step. Aegis'
-implementation of it can be found in
-[crypto/otp/OTP.java](https://github.com/beemdevelopment/Aegis/blob/master/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/OTP.java).
+Common ``info`` fields for all types:
 
-There is also no specification available for Yandex's OTP algorithm. Aegis'
-implementation can be found in
-[crypto/otp/YAOTP.java](https://github.com/beemdevelopment/Aegis/blob/master/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/YAOTP.java)
-
-The following algorithms are supported for HOTP and TOTP:
-
-| Algorithm | ID       |
-| :-------- | :------- |
-| SHA-1     | "SHA1"   |
-| SHA-256   | "SHA256" |
-| SHA-512   | "SHA512" |
-
-For Steam, only SHA-1 is supported. For Yandex, only SHA-256 is supported.
+| Field      | Type   | Description                        |
+|:-----------|:-------|:-----------------------------------|
+| ``secret`` | string | The Base32 encoded secret.         |
+| ``algo``   | string | The hashing algorithm.             |
+| ``digits`` | int    | The number of digits in the token. |
 
 Example of a TOTP entry:
 
@@ -260,12 +286,105 @@ Example of a TOTP entry:
     "uuid": "01234567-89ab-cdef-0123-456789abcdef",
     "name": "Bob",
     "issuer": "Google",
+    "note": "Main account",
+    "favorite": false,
     "icon": null,
+    "icon_mime": null,
+    "icon_hash": null,
     "info": {
         "secret": "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567",
         "algo": "SHA1",
         "digits": 6,
         "period": 30
-    }
+    },
+    "groups": [
+        "01234567-89ab-cdef-0123-456789abcdef"
+    ]
+}
+```
+
+##### HOTP and TOTP
+
+TOTP uses the ``period`` field, which is the time step in seconds. HOTP uses the
+``counter`` field, which is incremented every time a token is generated.
+
+The following algorithms are supported for HOTP and TOTP:
+
+| Algorithm | ID       |
+|:----------|:---------|
+| SHA-1     | "SHA1"   |
+| SHA-256   | "SHA256" |
+| SHA-512   | "SHA512" |
+
+##### Steam
+
+There is no specification available for Steam's OTP algorithm. It's essentially
+the same as TOTP, but it uses a different final encoding step. Aegis'
+implementation of it can be found in
+[crypto/otp/OTP.java](/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/OTP.java).
+
+A couple of fields have fixed values:
+
+| Field      | Value  |
+|:-----------|:-------|
+| ``algo``   | "SHA1" |
+| ``period`` | 30     |
+| ``digits`` | 5      |
+
+##### MOTP
+
+There is no specification available for MOTP. Aegis' implementation of it can be
+found in
+[crypto/otp/MOTP.java](/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/MOTP.java).
+
+A couple of fields have fixed values:
+
+| Field      | Value |
+|:-----------|:------|
+| ``algo``   | "MD5" |
+| ``period`` | 10    |
+| ``digits`` | 6     |
+
+MOTP-specific fields:
+
+| Field   | Type   | Description |
+|:--------|:-------|:------------|
+| ``pin`` | string | 4-digit PIN |
+
+##### Yandex
+
+There is no specification available for Yandex's OTP algorithm. Aegis'
+implementation can be found in
+[crypto/otp/YAOTP.java](/app/src/main/java/com/beemdevelopment/aegis/crypto/otp/YAOTP.java)
+
+A couple of fields have fixed values:
+
+| Field      | Value    |
+|:-----------|:---------|
+| ``algo``   | "SHA256" |
+| ``period`` | 30       |
+| ``digits`` | 8        |
+
+Yandex-specific fields:
+
+| Field   | Type   | Description    |
+|:--------|:-------|:---------------|
+| ``pin`` | string | 4-16 digit PIN |
+
+#### Groups
+
+A group consists of a ``name`` and a randomly generated ``uuid`` (version 4).
+
+| Field    | Type   | Description            |
+|:---------|:-------|:-----------------------|
+| ``uuid`` | string | A UUID (version 4).    |
+| ``name`` | string | The name of the group. |
+
+Example:
+
+```json
+{
+    "uuid": "01234567-89ab-cdef-0123-456789abcdef",
+    "name": "Personal"
 }
 ```
diff --git a/gradle.properties b/gradle.properties
index 8b4fd0ea..09f93466 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,9 +17,6 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=false
-android.nonFinalResIds=false
-android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx8g
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 482c29a8..e6ab6fc5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Aug 15 23:01:16 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/metadata/en-US/images/iconPacks/aegis-icons.png b/metadata/en-US/images/iconPacks/aegis-icons.png
new file mode 100644
index 00000000..f16ee21a
Binary files /dev/null and b/metadata/en-US/images/iconPacks/aegis-icons.png differ
diff --git a/metadata/en-US/images/iconPacks/aegis-simple-icons-outlined.png b/metadata/en-US/images/iconPacks/aegis-simple-icons-outlined.png
new file mode 100644
index 00000000..f2cda8a9
Binary files /dev/null and b/metadata/en-US/images/iconPacks/aegis-simple-icons-outlined.png differ
diff --git a/metadata/en-US/images/iconPacks/aegis-simple-icons.png b/metadata/en-US/images/iconPacks/aegis-simple-icons.png
new file mode 100644
index 00000000..ca6eaeed
Binary files /dev/null and b/metadata/en-US/images/iconPacks/aegis-simple-icons.png differ
diff --git a/metadata/en-US/images/iconPacks/delta-icons.png b/metadata/en-US/images/iconPacks/delta-icons.png
new file mode 100644
index 00000000..21d53b37
Binary files /dev/null and b/metadata/en-US/images/iconPacks/delta-icons.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot1.png b/metadata/en-US/images/phoneScreenshots/screenshot1.png
index da53b84f..930630c1 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot1.png and b/metadata/en-US/images/phoneScreenshots/screenshot1.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot2.png b/metadata/en-US/images/phoneScreenshots/screenshot2.png
index c9df80ea..224d624e 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot2.png and b/metadata/en-US/images/phoneScreenshots/screenshot2.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot3.png b/metadata/en-US/images/phoneScreenshots/screenshot3.png
index b8b7c579..3bc07d8c 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot3.png and b/metadata/en-US/images/phoneScreenshots/screenshot3.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot4.png b/metadata/en-US/images/phoneScreenshots/screenshot4.png
index 90ab353b..2011fed4 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot4.png and b/metadata/en-US/images/phoneScreenshots/screenshot4.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot5.png b/metadata/en-US/images/phoneScreenshots/screenshot5.png
index 07dd476e..7ebaaab6 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot5.png and b/metadata/en-US/images/phoneScreenshots/screenshot5.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot6.png b/metadata/en-US/images/phoneScreenshots/screenshot6.png
index 0a8228bf..8a0625be 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot6.png and b/metadata/en-US/images/phoneScreenshots/screenshot6.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot7.png b/metadata/en-US/images/phoneScreenshots/screenshot7.png
index 57e0ee7e..ce6ba254 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot7.png and b/metadata/en-US/images/phoneScreenshots/screenshot7.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot8.png b/metadata/en-US/images/phoneScreenshots/screenshot8.png
index 38b043f1..dd3a1a0a 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot8.png and b/metadata/en-US/images/phoneScreenshots/screenshot8.png differ
diff --git a/metadata/hu/full_description.txt b/metadata/hu/full_description.txt
deleted file mode 100644
index 6fd81970..00000000
--- a/metadata/hu/full_description.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-Az Aegis hitelesítő egy szabad, biztonságos és nyílt forráskódú alkalmazás
-az online szolgáltatásainál használt kétlépcsős hitelesítési tokenek
-kezeléséhez.
-
-<b>Titkosítás</b>
-Az összes egyszer használatos jelszavát egy széfben tároljuk. Ha úgy dönt,
-hogy jelszót állít be – ami erősen javasolt –, akkor a széfet AES-256
-algoritmussal lesz titkosítva. Ha valaki ártó szándékkal meg is szerzi a
-széfjét, akkor is lehetetlen a jelszó ismerete nélkül kinyerni a tartalmát. 
-
-<b>Biometrikus feloldás</b>
-A jelszó megadása minden egyes hozzáféréskor fárasztó lehet, szerencsére
-bekapcsolhatja a biometrikus feloldást, hogy az eszköze biometrikus
-érzékelőjével oldja fel a zárolást.
-
-<b>Kompatibilitás</b>
-Az Aegis a HOTP és a TOTP algoritmusokat támogatja. Ez a két algoritmus
-iparági szabvány, és széles körben támogatott, így az Aegis szolgáltatások
-ezreivel kompatibilis. Néhány példa: Google, GitHub, Dropbox, Facebook és
-az Instagram.
-
-Kompatibilis a Google hitelesítővel is. Bármilyen weboldal, ahol Google
-hitelesítőhöz való QR-kód található, működik az Aegisszel is.
-
-<b>Csoportok</b>
-Sok egyszer használatos jelszava van? Adja őket egyéni csoportokhoz a
-könnyebb elérés érdekében A személyes, munkahelyi és közösségi jelszavaknak
-is lehet saját csoportja.
-
-<b>Biztonsági mentések</b>
-Hogy sose veszítse el az online fiókjai hozzáférését, az Aegis hitelesítő
-támogatja a széfje exportálását, és egy új eszközön történő importálását.
-Az Aegis hitelesítővel importálhat is az andOTP és a FreeOTP adatbázisaiból,
-így még könnyebb az Aegisre váltás.
-
-<b>Nyílt forráskód és licencek</b>
-Az Aegis hitelesítő nyílt forráskódú (GPLv3 licenc alatt érhető el), és a
-forráskódja itt található: http://github.com/beemdevelopment/Aegis
diff --git a/metadata/hu/short_description.txt b/metadata/hu/short_description.txt
deleted file mode 100644
index df2e0ef6..00000000
--- a/metadata/hu/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Szabad, biztonságos és nyílt forráskódú kétfaktoros hitelesítő alkalmazás
diff --git a/metadata/hu/title.txt b/metadata/hu/title.txt
deleted file mode 100644
index 2f97e51b..00000000
--- a/metadata/hu/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Aegis hitelesítő
diff --git a/metadata/tr/full_description.txt b/metadata/tr/full_description.txt
deleted file mode 100644
index d5e07ae4..00000000
--- a/metadata/tr/full_description.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Çevrimiçi hizmetlerinde doğrulama kodlarınızı yönetmeniz için özgür, 
-güvenli ve açık kaynak 2FA uygulaması
-
-<b>Şifreleme</b>
-Tüm tek kullanımlık kodlarınız bir kasada saklanır. Kasaya bir parola atamayı 
-seçerseniz, ki bu şiddetle tavsiye edilir, kasanız AES-256 kullanılarak şifrelenecektir.
-Kötü niyetli birisi kasanızı ele geçirmeyi başarsa bile kasa içeriğini parolayı bilmeden
-elde etmesi mümkün olmayabilir.
-
-<b>Biyometrik Kilit Açma</b>
-Her tek kullanımlık koda ihtiyacınız olduğunda kasayı parolayla açmak yavaş olabilir.
-Neyse ki, cihanızınız biyometrik sensöre sahipse biyometrik kilit açmayı aktifleştirebilirsiniz.
-
-<b>Uyumluluk</b>
-Aegis HOTP ve TOTP algoritmalarını destekler. Bu iki algoritma endüstride standarttır ve
-geniş ölçekte desteklenir. Bu Aegis'i binlerce servisle uyumlu yapar.
-Bazı örnekler: Google, GitHub, Dropbox, Facebook ve Instagram.
-
-Aynı zamanda Google Authenticator ile de uyumludur. Herhangi bir site Google Authenticator
-için QR kod gösteriyorsa bu kod aynı zamanda Aegis tarafından da tanınır.
-
-<b>Gruplama</b>
-Bir sürü tek kullanımlık parolanız mı var? Onlara kolay erişmek için gruplandırabilirsiniz.
-Kişisel, İş veya Sosyal hepsi kendi grubunda bulunabilir.
-
-<b>Yedekler</b>
-Çevrimiçi hesaplarınıza erişiminizi hiçbir zaman kaybetmemeniz için Aegis Authenticator
-kasanızı başka bir cihaza aktarabileceğiniz şekilde dışarıya aktarmayı destekler.
-Aegis Authenticator AndOTP ve FreeOTP veritabanlarını içeriye aktarmayı da destekler, 
-bu Aegis'e geçiş yapmanızı sizin için kolaylaştırır.
-
-<b>Açık Kaynak Kod ve Lisanslar</b>
-Aegis Authenticator açık kaynaktır (GPL v3 altında lisanslanır) ve 
-kaynak kodu şurada bulunabilir: http://github.com/beemdevelopment/Aegis
diff --git a/metadata/tr/short_description.txt b/metadata/tr/short_description.txt
deleted file mode 100644
index 3cc56765..00000000
--- a/metadata/tr/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Çevrimiçi hizmetlerinde doğrulama kodlarınızı yönetmeniz için özgür, güvenli ve açık kaynak 2FA uygulaması
diff --git a/metadata/tr/title.txt b/metadata/tr/title.txt
deleted file mode 100644
index f33251a0..00000000
--- a/metadata/tr/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Aegis Authenticator
diff --git a/metadata/zh-CN/full_description.txt b/metadata/zh-CN/full_description.txt
deleted file mode 100644
index ec3b496b..00000000
--- a/metadata/zh-CN/full_description.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Aegis 验证器是一款免费，安全和开源应用，用于管理您的在线服务两步验证令牌。
-
-<b>加密</b>
-您的所有一次密钥存储在数据库中。如果您选择设置一个密码，我们推荐您这么做，数据库将使用 AES-256 加密。如果恶意的攻击者获取了您的数据库文件，他们无法在不知道密码的情况下获取内容。
-
-<b>生物识别解锁</b>
-每次需要访问一次密钥时都输入密码会很麻烦。幸运的是，如果您的设备具有生物识别传感器，您也可以启用生物识别解锁。
-
-<b>兼容性</b>
-Aegis 支持 HOTP 和 TOTP 算法。这两种算法使受到广泛支持的工业标准，这使得 Aegis 与几千种服务兼容。例如：Google, GitHub, Dropbox, Facebook 和 Instagram。
-
-它也兼容 Google 验证器。任何显示 Google 验证器二维码的网站都可以使用 Aegis。
-
-<b>群组</b>
-有大量一次密钥？将它们添加到自定义群组以便轻松访问。个人，工作和社交都能有各自的群组。
-
-<b>备份</b>
-为确保您永远不会失去在线服务的访问权，Aegis 验证器支持导出您的数据库并在新的设备上导入。Aegis 验证器也允许您导入 AndOTP 和 FreeOTP 数据库因此切换到 Aegis 对您很容易。
-
-<b>开源及许可证</b>
-Aegis 验证器开源（在 GPL v3 许可证下发布）并可在此找到源代码：http://github.com/beemdevelopment/Aegis
diff --git a/metadata/zh-CN/short_description.txt b/metadata/zh-CN/short_description.txt
deleted file mode 100644
index 0424621d..00000000
--- a/metadata/zh-CN/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-免费，安全和开源的双重认证（2FA）应用，用于管理您的在线服务令牌
diff --git a/metadata/zh-CN/title.txt b/metadata/zh-CN/title.txt
deleted file mode 100644
index b0c996f0..00000000
--- a/metadata/zh-CN/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Aegis 验证器