all: format XML files to 2 space indent

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

9 files changed, 572 insertions, 572 deletions

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 246417ad..7a6191ff 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -4,51 +4,51 @@
   -->
 
 <resources>
-    <string-array name="sort_order_entries">
-        <item>@string/pref_folder_first_sort_order</item>
-        <item>@string/pref_file_first_sort_order</item>
-        <item>@string/pref_type_independent_sort_order</item>
-        <item>@string/pref_recently_used_sort_order</item>
-    </string-array>
-    <string-array name="sort_order_values">
-        <item>FOLDER_FIRST</item>
-        <item>FILE_FIRST</item>
-        <item>INDEPENDENT</item>
-        <item>RECENTLY_USED</item>
-    </string-array>
-    <string-array name="capitalization_type_values">
-        <item>lowercase</item>
-        <item>UPPERCASE</item>
-        <item>TitleCase</item>
-        <item>Sentence</item>
-    </string-array>
-    <string-array name="pwgen_provider_labels">
-        <item>Classic</item>
-        <item>XKPasswd</item>
-    </string-array>
-    <string-array name="pwgen_provider_values">
-        <item>classic</item>
-        <item>xkpasswd</item>
-    </string-array>
-    <string-array name="oreo_autofill_directory_structure_entries">
-        <item>work/example.org(.gpg)</item>
-        <item>work/example.org/john@doe.org(.gpg)</item>
-        <item>work/example.org/john@doe.org/password(.gpg)</item>
-    </string-array>
-    <string-array name="oreo_autofill_directory_structure_values">
-        <item>encrypted_username</item>
-        <item>file</item>
-        <item>directory</item>
-    </string-array>
-    <string-array name="app_theme_options">
-        <item>@string/pref_app_theme_value_light</item>
-        <item>@string/pref_app_theme_value_dark</item>
-        <item>@string/pref_app_theme_value_battery_saver</item>
-    </string-array>
-    <string-array name="app_theme_values">
-        <item>light</item>
-        <item>dark</item>
-        <item>battery_saver</item>
-    </string-array>
+  <string-array name="sort_order_entries">
+    <item>@string/pref_folder_first_sort_order</item>
+    <item>@string/pref_file_first_sort_order</item>
+    <item>@string/pref_type_independent_sort_order</item>
+    <item>@string/pref_recently_used_sort_order</item>
+  </string-array>
+  <string-array name="sort_order_values">
+    <item>FOLDER_FIRST</item>
+    <item>FILE_FIRST</item>
+    <item>INDEPENDENT</item>
+    <item>RECENTLY_USED</item>
+  </string-array>
+  <string-array name="capitalization_type_values">
+    <item>lowercase</item>
+    <item>UPPERCASE</item>
+    <item>TitleCase</item>
+    <item>Sentence</item>
+  </string-array>
+  <string-array name="pwgen_provider_labels">
+    <item>Classic</item>
+    <item>XKPasswd</item>
+  </string-array>
+  <string-array name="pwgen_provider_values">
+    <item>classic</item>
+    <item>xkpasswd</item>
+  </string-array>
+  <string-array name="oreo_autofill_directory_structure_entries">
+    <item>work/example.org(.gpg)</item>
+    <item>work/example.org/john@doe.org(.gpg)</item>
+    <item>work/example.org/john@doe.org/password(.gpg)</item>
+  </string-array>
+  <string-array name="oreo_autofill_directory_structure_values">
+    <item>encrypted_username</item>
+    <item>file</item>
+    <item>directory</item>
+  </string-array>
+  <string-array name="app_theme_options">
+    <item>@string/pref_app_theme_value_light</item>
+    <item>@string/pref_app_theme_value_dark</item>
+    <item>@string/pref_app_theme_value_battery_saver</item>
+  </string-array>
+  <string-array name="app_theme_values">
+    <item>light</item>
+    <item>dark</item>
+    <item>battery_saver</item>
+  </string-array>
 
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 03732478..82ff593e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -4,7 +4,7 @@
   -->
 
 <resources>
-    <declare-styleable name="Multiselected">
-        <attr name="state_multiselected" format="boolean" />
-    </declare-styleable>
+  <declare-styleable name="Multiselected">
+    <attr name="state_multiselected" format="boolean" />
+  </declare-styleable>
 </resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 89376958..78f5307a 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -4,6 +4,6 @@
   -->
 
 <resources>
-    <bool name="leak_canary_allow_in_non_debuggable_build">true</bool>
-    <bool name="light_status_bar">true</bool>
+  <bool name="leak_canary_allow_in_non_debuggable_build">true</bool>
+  <bool name="light_status_bar">true</bool>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d9dd1d24..6c48ce96 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,20 +4,20 @@
   -->
 
 <resources>
-    <!-- Base palette -->
-    <color name="primary_color">@color/white</color>
-    <color name="primary_light_color">@color/white</color>
-    <color name="secondary_color">#003e5b</color>
-    <color name="secondary_dark_color">#001831</color>
-    <color name="secondary_light_color">#3b6888</color>
-    <color name="primary_text_color">#212121</color>
-    <color name="white">#ffffffff</color>
+  <!-- Base palette -->
+  <color name="primary_color">@color/white</color>
+  <color name="primary_light_color">@color/white</color>
+  <color name="secondary_color">#003e5b</color>
+  <color name="secondary_dark_color">#001831</color>
+  <color name="secondary_light_color">#3b6888</color>
+  <color name="primary_text_color">#212121</color>
+  <color name="white">#ffffffff</color>
 
-    <!-- Theme variables -->
-    <color name="color_control_normal">@color/primary_text_color</color>
-    <color name="list_multiselect_background">#668eacbb</color>
-    <color name="navigation_bar_color">#000000</color>
-    <color name="status_bar_color">@color/primary_color</color>
-    <color name="ripple_color">#aa003e5b</color>
-    <color name="button_color">#44003e5b</color>
+  <!-- Theme variables -->
+  <color name="color_control_normal">@color/primary_text_color</color>
+  <color name="list_multiselect_background">#668eacbb</color>
+  <color name="navigation_bar_color">#000000</color>
+  <color name="status_bar_color">@color/primary_color</color>
+  <color name="ripple_color">#aa003e5b</color>
+  <color name="button_color">#44003e5b</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a92268ef..8923fc3f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,14 +4,14 @@
   -->
 
 <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_compat_margin">16dp</dimen>
-    <dimen name="normal_margin">8dp</dimen>
-    <dimen name="bottom_sheet_item_height">56dp</dimen>
-    <dimen name="toggle_group_text_size">14sp</dimen>
-    <dimen name="onboarding_icon_margin_top">100dp</dimen>
-    <dimen name="onboarding_button_margin_top">140dp</dimen>
-    <dimen name="onboarding_desc_margin_top">48dp</dimen>
+  <!-- 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_compat_margin">16dp</dimen>
+  <dimen name="normal_margin">8dp</dimen>
+  <dimen name="bottom_sheet_item_height">56dp</dimen>
+  <dimen name="toggle_group_text_size">14sp</dimen>
+  <dimen name="onboarding_icon_margin_top">100dp</dimen>
+  <dimen name="onboarding_button_margin_top">140dp</dimen>
+  <dimen name="onboarding_desc_margin_top">48dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/prefs.xml b/app/src/main/res/values/prefs.xml
index f000ff09..2fea32e5 100644
--- a/app/src/main/res/values/prefs.xml
+++ b/app/src/main/res/values/prefs.xml
@@ -4,5 +4,5 @@
   -->
 
 <resources>
-    <string name="app_theme_def" translatable="false">battery_saver</string>
+  <string name="app_theme_def" translatable="false">battery_saver</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e00c2ac..f71ddb75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,402 +5,402 @@
 
 <resources>
 
-    <plurals name="delete_title">
-        <item quantity="one">%d item selected</item>
-        <item quantity="other">%d items selected</item>
-    </plurals>
-
-    <!-- Activity names -->
-    <string name="app_name" translatable="false">Password Store</string>
-
-    <string name="action_settings">Settings</string>
-    <string name="dialog_delete_title">Directory already exists</string>
-    <string name="dialog_delete_msg">Target directory already exists. Current version only supports a single store. Do you want to delete the current password store directory?\n(%1$s)</string>
-    <string name="dialog_delete">Delete directory</string>
-    <string name="dialog_do_not_delete">Cancel</string>
-    <string name="title_activity_git_clone">Repository information</string>
-    <string name="title_activity_git_config" translatable="false">Git configuration</string>
-    <string name="title_activity_git_log">Commit log</string>
-
-    <!-- Password Store -->
-    <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or running any synchronization operation.</string>
-    <plurals name="delete_dialog_text">
-        <item quantity="one">Are you sure you want to delete the password?</item>
-        <item quantity="other">Are you sure you want to delete %d passwords?</item>
-    </plurals>
-    <string name="delete_directory_progress_text">Deleting…</string>
-    <string name="move">Move</string>
-    <string name="edit">Edit</string>
-    <string name="delete">Delete</string>
-    <string name="change">Change</string>
-    <string name="use">Use</string>
-    <string name="directory_selected_title">Directory already selected</string>
-    <string name="directory_selected_message">Do you want to use \"%1$s\"?</string>
-    <string name="password_exists_title">Password already exists!</string>
-    <string name="password_exists_message">This will overwrite %1$s with %2$s.</string>
-    <string name="password_move_error_title">Error while moving passwords</string>
-    <string name="password_move_error_message">Failed to move %1$s to %2$s</string>
-
-    <!-- git commits -->
-    <string name="git_commit_add_text">Add generated password for %1$s using Android Password Store.</string>
-    <string name="git_commit_edit_text">Edit password for %1$s using Android Password Store.</string>
-    <string name="git_commit_remove_text">Remove %1$s from store.</string>
-    <string name="git_commit_move_text">Rename %1$s to %2$s.</string>
-    <string name="git_commit_move_multiple_text">Move multiple passwords to %1$s.</string>
-    <string name="git_commit_gpg_id">Initialize GPG IDs in %1$s.</string>
-
-    <!-- PGPHandler -->
-    <string name="clipboard_password_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string>
-    <string name="clipboard_password_no_clear_toast_text">Password copied to clipboard</string>
-    <string name="clipboard_copied_text">Copied to clipboard</string>
-    <string name="clipboard_otp_copied_text">OTP code copied to clipboard</string>
-    <string name="file_toast_text">Please provide a file name</string>
-    <string name="path_toast_text">Please provide a file path</string>
-    <string name="empty_toast_text">You cannot use an empty password or empty extra content</string>
-
-    <!-- Git Async Task -->
-    <string name="jgit_error_dialog_title">An error occurred during a Git operation</string>
-
-    <!-- Git Handler -->
-    <string name="ssh_preferences_dialog_text">Please import or generate your SSH key file in the preferences</string>
-    <string name="ssh_preferences_dialog_title">No SSH key</string>
-    <string name="ssh_preferences_dialog_import">Import</string>
-    <string name="ssh_preferences_dialog_generate">Generate</string>
-    <string name="passphrase_dialog_title">Authenticate</string>
-    <string name="passphrase_dialog_text">Please provide the passphrase for your SSH key</string>
-    <string name="password_dialog_text">Please provide the password for this repository</string>
-
-    <!-- Clone fragment -->
-    <string name="location_dialog_create_text">Select where do you want to create your password repository</string>
-    <string name="location_sdcard">SD-Card</string>
-    <string name="location_hidden">Hidden (Preferred)</string>
-    <string name="external_repository_dialog_title">Choose where to store the passwords</string>
-    <string name="external_repository_dialog_text">You must select a directory where to store your passwords. If you want to store your passwords within the hidden storage of the application, cancel this dialog and disable the \"External Repository\" option.</string>
-
-    <string name="server_name">Server</string>
-    <string name="server_url">Repository URL</string>
-    <string name="server_branch">Branch</string>
-
-    <string name="connection_mode">Authentication Mode</string>
-
-    <!-- Git Config fragment -->
-    <string name="git_user_name_hint">Username</string>
-    <string name="git_user_email">Email</string>
-    <string name="invalid_email_dialog_text">Please enter a valid email address</string>
-    <string name="clone_button">Clone</string>
-
-    <!-- PGP Handler -->
-    <string name="crypto_name_hint">Name</string>
-    <string name="crypto_pass_label">Password</string>
-    <string name="crypto_extra_label">Extra content</string>
-    <string name="crypto_encrypt_username_label">Encrypt username</string>
-    <string name="crypto_select">Select</string>
-    <string name="crypto_save">Save</string>
-    <string name="crypto_save_and_copy">Save and Copy</string>
-
-    <!-- DECRYPT Layout -->
-    <string name="action_search">Search</string>
-    <string name="password">Password</string>
-    <string name="otp">OTP</string>
-    <string name="extra_content">Extra content:</string>
-    <string name="username">Username</string>
-    <string name="edit_password">Edit password</string>
-    <string name="copy_password">Copy password</string>
-    <string name="share_as_plaintext">Share as plaintext</string>
-    <string name="last_changed">Last changed %s</string>
-
-    <!-- Preferences -->
-    <string name="pref_category_repository_title">Repository</string>
-    <string name="pref_edit_git_server_settings">Edit Git server settings</string>
-    <string name="pref_edit_git_config">Local Git config &amp; utilities</string>
-    <string name="pref_import_ssh_key_title">Import SSH key</string>
-    <string name="pref_ssh_keygen_title">Generate SSH key pair</string>
-    <string name="pref_ssh_see_key_title">View generated public SSH key</string>
-    <string name="pref_git_delete_repo_title">Delete repository</string>
-    <string name="pref_dialog_delete_title">Clear repository</string>
-    <string name="pref_category_general_title">General</string>
-    <string name="pref_category_passwords_title">Passwords</string>
-    <string name="pref_clipboard_timeout_title">Password copy timeout</string>
-    <string name="pref_clipboard_timeout_summary">Set the time (in seconds) you want the password to be in clipboard. 0 means forever. Current value: %1$s</string>
-    <string name="pref_copy_title">Automatically copy password</string>
-    <string name="pref_copy_summary">Automatically copy the password to the clipboard after decryption was successful.</string>
-    <string name="ssh_key_import_error_not_an_ssh_key_message">Selected file does not appear to be an SSH private key.</string>
-    <string name="ssh_key_success_dialog_title">SSH-key imported</string>
-    <string name="ssh_key_error_dialog_title">Key import error</string>
-    <string name="ssh_key_error_dialog_text">Message : \n</string>
-    <string name="pref_recursive_filter_title">Recursive filtering</string>
-    <string name="pref_recursive_filter_summary">Recursively find passwords of the current directory.</string>
-    <string name="pref_sort_order_title">Password sort order</string>
-    <string name="pref_folder_first_sort_order">Folders first</string>
-    <string name="pref_file_first_sort_order">Files first</string>
-    <string name="pref_type_independent_sort_order">Type independent</string>
-    <string name="pref_recently_used_sort_order">Recently used</string>
-    <string name="pref_category_autofill_title">Autofill</string>
-    <string name="pref_autofill_enable_title">Enable Autofill</string>
-    <string name="pref_category_misc_title">Misc</string>
-    <string name="pref_clear_clipboard_title">Workaround clipboard history feature</string>
-    <string name="pref_clear_clipboard_summary">Enable to flood clipboard history on devices that include such a feature with consecutive numbers, flushing out any passwords</string>
-    <string name="pref_git_delete_repo_summary">Deletes local (hidden) repository</string>
-    <string name="pref_external_repository_title">External repository</string>
-    <string name="pref_external_repository_summary">Use an external password repository</string>
-    <string name="pref_select_external_repository_title">Select external repository</string>
-    <string name="pref_select_external_repository_summary_no_repo_selected">No external repository selected</string>
-    <string name="prefs_export_passwords_title">Export passwords</string>
-    <string name="prefs_export_passwords_summary">Exports the encrypted passwords to an external directory</string>
-    <string name="pref_rebase_on_pull_title">Rebase on pull</string>
-    <string name="pref_rebase_on_pull_summary">When pulling or syncing, create a merge commit with upstream changes</string>
-    <string name="pref_rebase_on_pull_summary_on">When pulling or syncing, rebase commits that are not present in the remote repository</string>
-
-    <!-- PasswordGenerator fragment -->
-    <string name="pwgen_title">Generate Password</string>
-    <string name="pwgen_generate">Generate</string>
-    <string name="pwgen_include">Include</string>
-    <string name="pwgen_length">Length</string>
-    <string name="pwgen_numerals">Numerals</string>
-    <string name="pwgen_symbols">Symbols</string>
-    <string name="pwgen_uppercase">Uppercase</string>
-    <string name="pwgen_lowercase">Lowercase</string>
-    <string name="pwgen_ambiguous">Ambiguous</string>
-    <string name="pwgen_pronounceable">Pronounceable</string>
-    <string name="pwgen_no_chars_error">No characters included</string>
-    <string name="pwgen_length_too_short_error">Length too short for selected criteria</string>
-    <string name="pwgen_max_iterations_exceeded">Failed to generate a password satisfying the constraints. Try to increase the length.</string>
-
-    <!-- XKPWD password generator -->
-    <string name="xkpwgen_title">Xkpasswd Generator</string>
-    <string name="xkpwgen_length">Total words</string>
-    <string name="xkpwgen_separator">Separator</string>
-    <string name="xkpwgen_custom_dict_imported">Custom wordlist: %1$s</string>
-    <string name="xkpwgen_builder_error">Selected dictionary does not contain enough words of given length %1$d..%2$d</string>
-
-    <!-- XKPWD prefs -->
-    <string name="pref_password_generator_type_title">Password generator type</string>
-    <string name="pref_xkpwgen_custom_wordlist_enabled_title">Custom wordlist</string>
-    <string name="pref_xkpwgen_custom_dict_summary_on">Using custom wordlist file</string>
-    <string name="pref_xkpwgen_custom_dict_summary_off">Using built-in wordlist</string>
-    <string name="pref_xkpwgen_custom_dict_picker_title">Custom worldlist file</string>
-    <string name="pref_xkpwgen_custom_dict_picker_summary">Tap to pick a custom wordlist file containing one word per line</string>
-
-    <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_passphrase">Passphrase</string>
-    <string name="ssh_keygen_generate">Generate</string>
-    <string name="ssh_keygen_share">Share</string>
-    <string name="ssh_keygen_later">Later</string>
-    <string name="ssh_keygen_message">%1$s\n\nProvide this public key to your Git server.</string>
-    <string name="ssh_key_gen_generating_progress">Generating keys…</string>
-    <string name="ssh_keygen_require_authentication">Protect with screen lock credential</string>
-    <string name="ssh_keygen_label_rsa">RSA</string>
-    <string name="ssh_keygen_label_ecdsa">ECDSA</string>
-    <string name="ssh_keygen_label_ed25519">Ed25519</string>
-    <string name="ssh_keygen_explanation_rsa"><b>RSA (3072 bit)</b>\nSupported by all servers, but authentication is comparatively slow.</string>
-    <string name="ssh_keygen_explanation_ecdsa"><b>ECDSA (NIST P-256)</b>\nFast authentication and supported by most servers that are still receiving updates.</string>
-    <string name="ssh_keygen_explanation_ed25519"><b>Ed25519</b>\nFast authentication, but only supported by rather modern servers.</string>
-    <string name="ssh_keygen_existing_title">SSH key</string>
-    <string name="ssh_keygen_existing_message">Replace existing SSH key? You might lose access to your server.</string>
-    <string name="ssh_keygen_existing_replace">Replace</string>
-    <string name="ssh_keygen_existing_keep">Keep</string>
-
-
-    <!-- SSH Android Keystore auth -->
-    <string name="biometric_auth_generic_failure">Screen lock authentication failed</string>
-    <string name="biometric_prompt_title_ssh_auth">Unlock SSH key</string>
-    <string name="biometric_prompt_title_ssh_keygen">Generate SSH key</string>
-
-    <!-- Misc -->
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_yes">Yes</string>
-    <string name="dialog_no">No</string>
-    <string name="dialog_cancel">Cancel</string>
-    <string name="dialog_skip">Skip</string>
-    <string name="git_sync">Synchronize repository</string>
-    <string name="git_pull">Pull from remote</string>
-    <string name="git_push">Push to remote</string>
-    <string name="git_push_up_to_date">Everything up-to-date</string>
-    <string name="git_log">Show commit log</string>
-    <string name="show_password_pref_title">Show the password</string>
-    <string name="show_password_pref_summary">Control the visibility of the passwords once decrypted. This does not disable copying to clipboard.</string>
-    <string name="show_extra_content_pref_title">Show extra content</string>
-    <string name="show_extra_content_pref_summary">Control the visibility of the extra content once decrypted.</string>
-    <string name="pwd_generate_button">Generate</string>
-    <string name="refresh_list">Refresh list</string>
-    <string name="send_plaintext_password_to">Send password as plaintext using…</string>
-    <string name="app_icon_hint">App icon</string>
-
-    <!-- Oreo Autofill -->
-    <string name="oreo_autofill_select_and_fill_into">Select entry to fill into</string>
-    <string name="oreo_autofill_strict_domain_search">Phishing-resistant search</string>
-    <string name="oreo_autofill_match_with">Match with %1$s</string>
-    <string name="oreo_autofill_matches_clear_existing">Clear existing matches</string>
-    <string name="oreo_autofill_filter_no_results">No results.</string>
-    <string name="oreo_autofill_search_in_store">Search entry</string>
-    <string name="oreo_autofill_save_internal_error">Save failed due to an internal error</string>
-    <string name="oreo_autofill_save_app_not_supported">This app is currently not supported</string>
-    <string name="oreo_autofill_save_passwords_dont_match">Passwords don\'t match</string>
-    <string name="oreo_autofill_generate_password">Create entry</string>
-    <string name="oreo_autofill_fill_otp_from_sms">Extract code from SMS</string>
-    <string name="oreo_autofill_max_matches_reached">Maximum number of matches (%1$d) reached; clear matches before adding new ones.</string>
-    <string name="oreo_autofill_warning_publisher_header">This app\'s publisher has changed since you first associated a Password Store entry with it:</string>
-    <string name="oreo_autofill_warning_publisher_footer"><b>The currently installed app may be trying to steal your credentials by pretending to be a trusted app.</b>\n\nTry to uninstall and reinstall the app from a trusted source, such as the Play Store, Amazon Appstore, F-Droid, or your phone manufacturer\'s store.</string>
-    <string name="oreo_autofill_warning_publisher_install_time">Installed: %1$s</string>
-    <string name="oreo_autofill_warning_publisher_advanced_info_template" translatable="false">Package:\n%1$s\n\nHash:\n%2$s</string>
-    <string name="oreo_autofill_warning_publisher_advanced_info_button">Advanced information</string>
-    <string name="oreo_autofill_warning_publisher_changed_disable_autofill_button">Keep Autofill disabled</string>
-    <string name="oreo_autofill_warning_publisher_reenable_button">Re-enable Autofill</string>
-    <string name="oreo_autofill_warning_publisher_warning_sign_description">Warning</string>
-    <string name="oreo_autofill_warning_publisher_dataset_summary">Tap for details</string>
-    <string name="oreo_autofill_warning_publisher_dataset_title">Possible phishing attempt</string>
-    <string name="oreo_autofill_general_fill_and_save_support">Fill and save credentials</string>
-    <string name="oreo_autofill_general_fill_support">Fill credentials</string>
-    <string name="oreo_autofill_password_fill_support">Fill passwords</string>
-    <string name="oreo_autofill_flaky_fill_support">Fill passwords (may require restarting the browser from time to time)</string>
-    <string name="oreo_autofill_no_support">No support</string>
-    <string name="oreo_autofill_preference_directory_structure">Password file organization</string>
-    <string name="oreo_autofill_enable_dialog_description">Password Store can offer to fill login forms and even save credentials you enter in apps or on websites.</string>
-    <string name="oreo_autofill_enable_dialog_instructions">To enable this feature, tap OK to go to Autofill settings. There, select Password Store from the list and confirm the confirmation prompt with OK.</string>
-    <string name="oreo_autofill_enable_dialog_installed_browsers">Autofill support with installed browsers:</string>
-
-    <!-- Autofill -->
-    <string name="ssh_key_does_not_exist">Unable to open the ssh private key, please check that the file exists</string>
-    <string name="new_password_title">New password</string>
-    <string name="clear_saved_passphrase_ssh">Clear saved passphrase for local SSH key</string>
-    <string name="clear_saved_passphrase_https">Clear saved HTTPS password</string>
-    <string name="git_operation_remember_passphrase">Remember key passphrase</string>
-    <string name="git_tools">Utilities</string>
-    <string name="abort_rebase">Abort rebase and push new branch</string>
-    <string name="reset_to_remote">Hard reset to remote branch</string>
-    <string name="git_head_on_branch">On branch %1$s</string>
-    <string name="git_head_detached">HEAD detached at %1$s</string>
-    <string name="git_head_missing">Unable to locate HEAD</string>
-    <string name="sdcard_root_warning_title">SD-Card root selected</string>
-    <string name="sdcard_root_warning_message">You have selected the root of your sdcard for the store. This is extremely dangerous and you will lose your data as its content will, eventually, be deleted</string>
-    <string name="sdcard_root_warning_remove_everything">Remove everything</string>
-    <string name="git_abort_and_push_title">Abort and Push</string>
-    <string name="biometric_prompt_title">Biometric Prompt</string>
-    <string name="biometric_auth_error">Authentication failure</string>
-    <string name="biometric_auth_error_reason">Authentication failure: %s</string>
-    <string name="pref_biometric_auth_title">Enable biometric authentication</string>
-    <string name="pref_biometric_auth_summary">When enabled, Password Store will prompt you for your fingerprint when launching the app</string>
-    <string name="pref_biometric_auth_summary_error">Fingerprint hardware not accessible or missing</string>
-    <string name="pref_title_openkeystore_clear_keyid">Clear remembered OpenKeystore SSH Key ID</string>
-    <string name="access_sdcard_text">The store location is in your SD Card or Internal storage, but the app does not have permission to access it.</string>
-    <string name="your_public_key">Your public key</string>
-    <string name="error_generate_ssh_key">Error while trying to generate the ssh-key</string>
-    <string name="pref_show_hidden_title">Show all files and folders</string>
-    <string name="pref_show_hidden_summary">Include non-password files and directories in the password list</string>
-    <string name="title_create_folder">Create folder</string>
-    <string name="title_rename_folder">Rename folder</string>
-    <string name="message_category_error_empty_field">Category name can\'t be empty</string>
-    <string name="message_category_error_category_exists">Category name already exists</string>
-    <string name="message_error_destination_outside_repo">Destination must be within the repository</string>
-    <string name="message_rename_folder">Enter destination for %1$s</string>
-    <string name="button_create">Create</string>
-    <string name="pref_search_on_start_title">Open search on start</string>
-    <string name="pref_search_on_start_summary">Open search bar when app is launched</string>
-    <string name="tap_clear_clipboard">Tap here to clear clipboard</string>
-    <string name="clone_git_repo">The repository must be cloned before syncing changes.</string>
-    <string name="pref_app_theme_title">App theme</string>
-    <string name="pref_app_theme_value_light">Light</string>
-    <string name="pref_app_theme_value_dark">Dark</string>
-    <string name="pref_app_theme_value_battery_saver">Set by Battery Saver</string>
-    <string name="pref_app_theme_value_follow_system">System default</string>
-    <string name="connection_mode_ssh_key">SSH key</string>
-    <string name="connection_mode_basic_authentication">Password</string>
-    <string name="connection_mode_openkeychain" translatable="false">OpenKeychain</string>
-    <string name="git_server_config_save_success">Successfully saved configuration</string>
-    <string name="git_server_config_save_error">The provided repository URL is not valid</string>
-    <string name="git_server_config_save_missing_username_https">Please specify the HTTPS username in the form https://username@example.com/…</string>
-    <string name="git_server_config_save_missing_username_ssh">Please specify the SSH username in the form username@example.com:…</string>
-    <string name="git_server_config_save_auth_mode_mismatch">Valid authentication modes for %1$s: %2$s</string>
-    <string name="git_operation_wrong_passphrase">Wrong passphrase</string>
-    <string name="git_operation_wrong_password">Wrong password</string>
-    <string name="bottom_sheet_create_new_folder">Create new folder</string>
-    <string name="bottom_sheet_create_new_password">Create new password</string>
-    <string name="snackbar_action_grant">Grant</string>
-    <string name="pref_debug_logging_summary">Enable debug logging (requires app restart)</string>
-    <string name="pref_debug_logging_title">Debug logging</string>
-    <string name="preference_default_username_summary">If Autofill is unable to determine a username from your password file or directory structure, it will use the value specified here</string>
-    <string name="preference_default_username_title">Default username</string>
-    <string name="git_operation_remember_password">Remember password</string>
-    <string name="git_operation_hint_password">Password</string>
-    <string name="preference_custom_public_suffixes_title">Custom domains</string>
-    <string name="preference_custom_public_suffixes_summary">Autofill will distinguish subdomains of these domains</string>
-    <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string>
-
-    <!-- OpenKeychain errors -->
-    <string name="openpgp_error_wrong_passphrase">Incorrect passphrase</string>
-    <string name="openpgp_error_no_user_ids">No matching PGP keys found</string>
-    <string name="openpgp_error_unknown">Error from OpenKeyChain : %s</string>
-
-    <!-- Password creation failure -->
-    <string name="password_creation_file_fail_title">Error</string>
-    <string name="password_creation_file_write_fail_message">Failed to write password file to the store, please try again.</string>
-    <string name="password_creation_file_delete_fail_message">Failed to delete password file %1$s from the store, please delete it manually.</string>
-    <string name="password_creation_duplicate_error">File already exists, please use a different name</string>
-    <string name="add_otp">Add OTP</string>
-    <string name="otp_import_success">Successfully imported TOTP configuration</string>
-    <string name="otp_import_failure">Failed to import TOTP configuration</string>
-    <string name="exporting_passwords">Exporting passwords…</string>
-    <string name="invalid_gpg_id">Found .gpg-id, but it contains an invalid key ID, fingerprint or user ID</string>
-    <string name="short_key_ids_unsupported">A key ID in .gpg-id is too short, please use either long key IDs (16 characters) or fingerprints (40 characters)</string>
-    <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string>
-    <string name="directory_hint">Directory</string>
-    <string name="new_folder_set_gpg_key">Set GPG key for directory</string>
-
-    <!-- GitException messages -->
-    <string name="git_unknown_error">Unknown error</string>
-    <string name="git_pull_rebase_fail_error">Pull has failed, you\'re in a detached head. Using "settings > git utils", save your changes to the remote in a new branch and resolve the conflict on your computer.</string>
-    <string name="git_pull_merge_fail_error">Merge has failed, you\'re in a conflicting state. TODO: Add a recovery method.</string>
-
-    <string name="git_push_nff_error">Push was rejected by remote, run pull before pushing again. You can use Synchronize rather than pull/push as it implements both</string>
-    <string name="git_push_generic_error">Push was rejected by remote, reason: %1$s</string>
-    <string name="git_push_other_error">Remote rejected non-fast-forward push. Check receive.denyNonFastForwards variable in config file of destination repository.</string>
-    <string name="git_unknown_host">Unknown host: %1$s</string>
-    <string name="git_operation_running">Running git operation…</string>
-    <string name="git_break_out_of_detached_success">There was a conflict when trying to rebase. Your local %1$s branch was pushed to another branch named %2$s\n Use this branch to resolve conflict on your computer</string>
-    <string name="git_break_out_of_detached_unneeded">The repository is not rebasing, no need to push to another branch</string>
-
-    <!-- OpenKeychain not installed -->
-    <string name="openkeychain_not_installed_title">OpenKeychain not installed</string>
-    <string name="openkeychain_not_installed_message">OpenKeychain is required for Password Store to function, please install it from the stores below</string>
-    <string name="openkeychain_not_installed_google_play">Google Play</string>
-    <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string>
-    <string name="openkeychain_not_installed_fdroid">F-Droid</string>
-    <string name="fdroid_deeplink_template">https://f-droid.org/en/packages/%1$s/</string>
-
-    <!-- GPG key selection in folder creation -->
-    <string name="folder_creation_err_file_exists">A file by that name already exists</string>
-    <string name="folder_creation_err_folder_exists">A folder by that name already exists</string>
-    <string name="xkpwgen_extrachars_label">Digits/Symbols (d/s)</string>
-    <string name="xk_numbers_symbols_append_default">ds</string>
-
-    <!-- Onboarding flow -->
-    <string name="repository_n_location">Repository \nLocation</string>
-    <string name="let_s_go">Let\'s Go</string>
-    <string name="select_n_repository_type">Select \nRepository Type</string>
-    <string name="select_repo_type_text">Select if you want to create a local repo or clone a remote repo.</string>
-    <string name="clone_remote_repo">Clone Remote Repo</string>
-    <string name="create_local_repo">Create Local Repo</string>
-    <string name="select_gpg_key_title">Select\nGPG Key</string>
-    <string name="select_gpg_key_message">Select a GPG key to initialize your store with</string>
-    <string name="gpg_key_select">Select key</string>
-
-    <!-- SSH port validation -->
-    <string name="ssh_scheme_needed_title">Potentially incorrect URL</string>
-    <string name="ssh_scheme_needed_message">It appears that your URL contains a custom port, but does not specify the ssh:// scheme.\nThis can cause the port to be considered a part of your path. Press OK here to fix the URL.</string>
-    <string name="https_scheme_with_port_title">HTTPS URL with custom port</string>
-    <string name="https_scheme_with_port_message">It looks like you are using a HTTPS URL with a custom port. This is not supported, and will cause problems down the line. Press OK to remove the port from your URL.</string>
-
-    <!-- Proxy configuration activity -->
-    <string name="proxy_hostname">Proxy hostname</string>
-    <string name="port">Port</string>
-    <string name="pref_edit_proxy_settings">HTTP(S) proxy settings</string>
-    <string name="invalid_proxy_url">Invalid URL</string>
-    <string name="oreo_autofill_password_fill_and_conditional_save_support">Fill and save passwords (saving requires that no accessibility services are enabled)</string>
-    <string name="clear_saved_host_key">Clear saved host key</string>
-    <string name="clear_saved_host_key_success">Successfully cleared saved host key!</string>
-    <string name="otp_import_qr_code">Scan QR code</string>
-    <string name="otp_import_manual_entry">Enter manually</string>
-    <string name="otp_import_manual_hint_secret">Secret</string>
-    <string name="otp_import_manual_hint_account">Account</string>
+  <plurals name="delete_title">
+    <item quantity="one">%d item selected</item>
+    <item quantity="other">%d items selected</item>
+  </plurals>
+
+  <!-- Activity names -->
+  <string name="app_name" translatable="false">Password Store</string>
+
+  <string name="action_settings">Settings</string>
+  <string name="dialog_delete_title">Directory already exists</string>
+  <string name="dialog_delete_msg">Target directory already exists. Current version only supports a single store. Do you want to delete the current password store directory?\n(%1$s)</string>
+  <string name="dialog_delete">Delete directory</string>
+  <string name="dialog_do_not_delete">Cancel</string>
+  <string name="title_activity_git_clone">Repository information</string>
+  <string name="title_activity_git_config" translatable="false">Git configuration</string>
+  <string name="title_activity_git_log">Commit log</string>
+
+  <!-- Password Store -->
+  <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or running any synchronization operation.</string>
+  <plurals name="delete_dialog_text">
+    <item quantity="one">Are you sure you want to delete the password?</item>
+    <item quantity="other">Are you sure you want to delete %d passwords?</item>
+  </plurals>
+  <string name="delete_directory_progress_text">Deleting…</string>
+  <string name="move">Move</string>
+  <string name="edit">Edit</string>
+  <string name="delete">Delete</string>
+  <string name="change">Change</string>
+  <string name="use">Use</string>
+  <string name="directory_selected_title">Directory already selected</string>
+  <string name="directory_selected_message">Do you want to use \"%1$s\"?</string>
+  <string name="password_exists_title">Password already exists!</string>
+  <string name="password_exists_message">This will overwrite %1$s with %2$s.</string>
+  <string name="password_move_error_title">Error while moving passwords</string>
+  <string name="password_move_error_message">Failed to move %1$s to %2$s</string>
+
+  <!-- git commits -->
+  <string name="git_commit_add_text">Add generated password for %1$s using Android Password Store.</string>
+  <string name="git_commit_edit_text">Edit password for %1$s using Android Password Store.</string>
+  <string name="git_commit_remove_text">Remove %1$s from store.</string>
+  <string name="git_commit_move_text">Rename %1$s to %2$s.</string>
+  <string name="git_commit_move_multiple_text">Move multiple passwords to %1$s.</string>
+  <string name="git_commit_gpg_id">Initialize GPG IDs in %1$s.</string>
+
+  <!-- PGPHandler -->
+  <string name="clipboard_password_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string>
+  <string name="clipboard_password_no_clear_toast_text">Password copied to clipboard</string>
+  <string name="clipboard_copied_text">Copied to clipboard</string>
+  <string name="clipboard_otp_copied_text">OTP code copied to clipboard</string>
+  <string name="file_toast_text">Please provide a file name</string>
+  <string name="path_toast_text">Please provide a file path</string>
+  <string name="empty_toast_text">You cannot use an empty password or empty extra content</string>
+
+  <!-- Git Async Task -->
+  <string name="jgit_error_dialog_title">An error occurred during a Git operation</string>
+
+  <!-- Git Handler -->
+  <string name="ssh_preferences_dialog_text">Please import or generate your SSH key file in the preferences</string>
+  <string name="ssh_preferences_dialog_title">No SSH key</string>
+  <string name="ssh_preferences_dialog_import">Import</string>
+  <string name="ssh_preferences_dialog_generate">Generate</string>
+  <string name="passphrase_dialog_title">Authenticate</string>
+  <string name="passphrase_dialog_text">Please provide the passphrase for your SSH key</string>
+  <string name="password_dialog_text">Please provide the password for this repository</string>
+
+  <!-- Clone fragment -->
+  <string name="location_dialog_create_text">Select where do you want to create your password repository</string>
+  <string name="location_sdcard">SD-Card</string>
+  <string name="location_hidden">Hidden (Preferred)</string>
+  <string name="external_repository_dialog_title">Choose where to store the passwords</string>
+  <string name="external_repository_dialog_text">You must select a directory where to store your passwords. If you want to store your passwords within the hidden storage of the application, cancel this dialog and disable the \"External Repository\" option.</string>
+
+  <string name="server_name">Server</string>
+  <string name="server_url">Repository URL</string>
+  <string name="server_branch">Branch</string>
+
+  <string name="connection_mode">Authentication Mode</string>
+
+  <!-- Git Config fragment -->
+  <string name="git_user_name_hint">Username</string>
+  <string name="git_user_email">Email</string>
+  <string name="invalid_email_dialog_text">Please enter a valid email address</string>
+  <string name="clone_button">Clone</string>
+
+  <!-- PGP Handler -->
+  <string name="crypto_name_hint">Name</string>
+  <string name="crypto_pass_label">Password</string>
+  <string name="crypto_extra_label">Extra content</string>
+  <string name="crypto_encrypt_username_label">Encrypt username</string>
+  <string name="crypto_select">Select</string>
+  <string name="crypto_save">Save</string>
+  <string name="crypto_save_and_copy">Save and Copy</string>
+
+  <!-- DECRYPT Layout -->
+  <string name="action_search">Search</string>
+  <string name="password">Password</string>
+  <string name="otp">OTP</string>
+  <string name="extra_content">Extra content:</string>
+  <string name="username">Username</string>
+  <string name="edit_password">Edit password</string>
+  <string name="copy_password">Copy password</string>
+  <string name="share_as_plaintext">Share as plaintext</string>
+  <string name="last_changed">Last changed %s</string>
+
+  <!-- Preferences -->
+  <string name="pref_category_repository_title">Repository</string>
+  <string name="pref_edit_git_server_settings">Edit Git server settings</string>
+  <string name="pref_edit_git_config">Local Git config &amp; utilities</string>
+  <string name="pref_import_ssh_key_title">Import SSH key</string>
+  <string name="pref_ssh_keygen_title">Generate SSH key pair</string>
+  <string name="pref_ssh_see_key_title">View generated public SSH key</string>
+  <string name="pref_git_delete_repo_title">Delete repository</string>
+  <string name="pref_dialog_delete_title">Clear repository</string>
+  <string name="pref_category_general_title">General</string>
+  <string name="pref_category_passwords_title">Passwords</string>
+  <string name="pref_clipboard_timeout_title">Password copy timeout</string>
+  <string name="pref_clipboard_timeout_summary">Set the time (in seconds) you want the password to be in clipboard. 0 means forever. Current value: %1$s</string>
+  <string name="pref_copy_title">Automatically copy password</string>
+  <string name="pref_copy_summary">Automatically copy the password to the clipboard after decryption was successful.</string>
+  <string name="ssh_key_import_error_not_an_ssh_key_message">Selected file does not appear to be an SSH private key.</string>
+  <string name="ssh_key_success_dialog_title">SSH-key imported</string>
+  <string name="ssh_key_error_dialog_title">Key import error</string>
+  <string name="ssh_key_error_dialog_text">Message : \n</string>
+  <string name="pref_recursive_filter_title">Recursive filtering</string>
+  <string name="pref_recursive_filter_summary">Recursively find passwords of the current directory.</string>
+  <string name="pref_sort_order_title">Password sort order</string>
+  <string name="pref_folder_first_sort_order">Folders first</string>
+  <string name="pref_file_first_sort_order">Files first</string>
+  <string name="pref_type_independent_sort_order">Type independent</string>
+  <string name="pref_recently_used_sort_order">Recently used</string>
+  <string name="pref_category_autofill_title">Autofill</string>
+  <string name="pref_autofill_enable_title">Enable Autofill</string>
+  <string name="pref_category_misc_title">Misc</string>
+  <string name="pref_clear_clipboard_title">Workaround clipboard history feature</string>
+  <string name="pref_clear_clipboard_summary">Enable to flood clipboard history on devices that include such a feature with consecutive numbers, flushing out any passwords</string>
+  <string name="pref_git_delete_repo_summary">Deletes local (hidden) repository</string>
+  <string name="pref_external_repository_title">External repository</string>
+  <string name="pref_external_repository_summary">Use an external password repository</string>
+  <string name="pref_select_external_repository_title">Select external repository</string>
+  <string name="pref_select_external_repository_summary_no_repo_selected">No external repository selected</string>
+  <string name="prefs_export_passwords_title">Export passwords</string>
+  <string name="prefs_export_passwords_summary">Exports the encrypted passwords to an external directory</string>
+  <string name="pref_rebase_on_pull_title">Rebase on pull</string>
+  <string name="pref_rebase_on_pull_summary">When pulling or syncing, create a merge commit with upstream changes</string>
+  <string name="pref_rebase_on_pull_summary_on">When pulling or syncing, rebase commits that are not present in the remote repository</string>
+
+  <!-- PasswordGenerator fragment -->
+  <string name="pwgen_title">Generate Password</string>
+  <string name="pwgen_generate">Generate</string>
+  <string name="pwgen_include">Include</string>
+  <string name="pwgen_length">Length</string>
+  <string name="pwgen_numerals">Numerals</string>
+  <string name="pwgen_symbols">Symbols</string>
+  <string name="pwgen_uppercase">Uppercase</string>
+  <string name="pwgen_lowercase">Lowercase</string>
+  <string name="pwgen_ambiguous">Ambiguous</string>
+  <string name="pwgen_pronounceable">Pronounceable</string>
+  <string name="pwgen_no_chars_error">No characters included</string>
+  <string name="pwgen_length_too_short_error">Length too short for selected criteria</string>
+  <string name="pwgen_max_iterations_exceeded">Failed to generate a password satisfying the constraints. Try to increase the length.</string>
+
+  <!-- XKPWD password generator -->
+  <string name="xkpwgen_title">Xkpasswd Generator</string>
+  <string name="xkpwgen_length">Total words</string>
+  <string name="xkpwgen_separator">Separator</string>
+  <string name="xkpwgen_custom_dict_imported">Custom wordlist: %1$s</string>
+  <string name="xkpwgen_builder_error">Selected dictionary does not contain enough words of given length %1$d..%2$d</string>
+
+  <!-- XKPWD prefs -->
+  <string name="pref_password_generator_type_title">Password generator type</string>
+  <string name="pref_xkpwgen_custom_wordlist_enabled_title">Custom wordlist</string>
+  <string name="pref_xkpwgen_custom_dict_summary_on">Using custom wordlist file</string>
+  <string name="pref_xkpwgen_custom_dict_summary_off">Using built-in wordlist</string>
+  <string name="pref_xkpwgen_custom_dict_picker_title">Custom worldlist file</string>
+  <string name="pref_xkpwgen_custom_dict_picker_summary">Tap to pick a custom wordlist file containing one word per line</string>
+
+  <!-- ssh keygen fragment -->
+  <string name="ssh_keygen_passphrase">Passphrase</string>
+  <string name="ssh_keygen_generate">Generate</string>
+  <string name="ssh_keygen_share">Share</string>
+  <string name="ssh_keygen_later">Later</string>
+  <string name="ssh_keygen_message">%1$s\n\nProvide this public key to your Git server.</string>
+  <string name="ssh_key_gen_generating_progress">Generating keys…</string>
+  <string name="ssh_keygen_require_authentication">Protect with screen lock credential</string>
+  <string name="ssh_keygen_label_rsa">RSA</string>
+  <string name="ssh_keygen_label_ecdsa">ECDSA</string>
+  <string name="ssh_keygen_label_ed25519">Ed25519</string>
+  <string name="ssh_keygen_explanation_rsa"><b>RSA (3072 bit)</b>\nSupported by all servers, but authentication is comparatively slow.</string>
+  <string name="ssh_keygen_explanation_ecdsa"><b>ECDSA (NIST P-256)</b>\nFast authentication and supported by most servers that are still receiving updates.</string>
+  <string name="ssh_keygen_explanation_ed25519"><b>Ed25519</b>\nFast authentication, but only supported by rather modern servers.</string>
+  <string name="ssh_keygen_existing_title">SSH key</string>
+  <string name="ssh_keygen_existing_message">Replace existing SSH key? You might lose access to your server.</string>
+  <string name="ssh_keygen_existing_replace">Replace</string>
+  <string name="ssh_keygen_existing_keep">Keep</string>
+
+
+  <!-- SSH Android Keystore auth -->
+  <string name="biometric_auth_generic_failure">Screen lock authentication failed</string>
+  <string name="biometric_prompt_title_ssh_auth">Unlock SSH key</string>
+  <string name="biometric_prompt_title_ssh_keygen">Generate SSH key</string>
+
+  <!-- Misc -->
+  <string name="dialog_ok">OK</string>
+  <string name="dialog_yes">Yes</string>
+  <string name="dialog_no">No</string>
+  <string name="dialog_cancel">Cancel</string>
+  <string name="dialog_skip">Skip</string>
+  <string name="git_sync">Synchronize repository</string>
+  <string name="git_pull">Pull from remote</string>
+  <string name="git_push">Push to remote</string>
+  <string name="git_push_up_to_date">Everything up-to-date</string>
+  <string name="git_log">Show commit log</string>
+  <string name="show_password_pref_title">Show the password</string>
+  <string name="show_password_pref_summary">Control the visibility of the passwords once decrypted. This does not disable copying to clipboard.</string>
+  <string name="show_extra_content_pref_title">Show extra content</string>
+  <string name="show_extra_content_pref_summary">Control the visibility of the extra content once decrypted.</string>
+  <string name="pwd_generate_button">Generate</string>
+  <string name="refresh_list">Refresh list</string>
+  <string name="send_plaintext_password_to">Send password as plaintext using…</string>
+  <string name="app_icon_hint">App icon</string>
+
+  <!-- Oreo Autofill -->
+  <string name="oreo_autofill_select_and_fill_into">Select entry to fill into</string>
+  <string name="oreo_autofill_strict_domain_search">Phishing-resistant search</string>
+  <string name="oreo_autofill_match_with">Match with %1$s</string>
+  <string name="oreo_autofill_matches_clear_existing">Clear existing matches</string>
+  <string name="oreo_autofill_filter_no_results">No results.</string>
+  <string name="oreo_autofill_search_in_store">Search entry</string>
+  <string name="oreo_autofill_save_internal_error">Save failed due to an internal error</string>
+  <string name="oreo_autofill_save_app_not_supported">This app is currently not supported</string>
+  <string name="oreo_autofill_save_passwords_dont_match">Passwords don\'t match</string>
+  <string name="oreo_autofill_generate_password">Create entry</string>
+  <string name="oreo_autofill_fill_otp_from_sms">Extract code from SMS</string>
+  <string name="oreo_autofill_max_matches_reached">Maximum number of matches (%1$d) reached; clear matches before adding new ones.</string>
+  <string name="oreo_autofill_warning_publisher_header">This app\'s publisher has changed since you first associated a Password Store entry with it:</string>
+  <string name="oreo_autofill_warning_publisher_footer"><b>The currently installed app may be trying to steal your credentials by pretending to be a trusted app.</b>\n\nTry to uninstall and reinstall the app from a trusted source, such as the Play Store, Amazon Appstore, F-Droid, or your phone manufacturer\'s store.</string>
+  <string name="oreo_autofill_warning_publisher_install_time">Installed: %1$s</string>
+  <string name="oreo_autofill_warning_publisher_advanced_info_template" translatable="false">Package:\n%1$s\n\nHash:\n%2$s</string>
+  <string name="oreo_autofill_warning_publisher_advanced_info_button">Advanced information</string>
+  <string name="oreo_autofill_warning_publisher_changed_disable_autofill_button">Keep Autofill disabled</string>
+  <string name="oreo_autofill_warning_publisher_reenable_button">Re-enable Autofill</string>
+  <string name="oreo_autofill_warning_publisher_warning_sign_description">Warning</string>
+  <string name="oreo_autofill_warning_publisher_dataset_summary">Tap for details</string>
+  <string name="oreo_autofill_warning_publisher_dataset_title">Possible phishing attempt</string>
+  <string name="oreo_autofill_general_fill_and_save_support">Fill and save credentials</string>
+  <string name="oreo_autofill_general_fill_support">Fill credentials</string>
+  <string name="oreo_autofill_password_fill_support">Fill passwords</string>
+  <string name="oreo_autofill_flaky_fill_support">Fill passwords (may require restarting the browser from time to time)</string>
+  <string name="oreo_autofill_no_support">No support</string>
+  <string name="oreo_autofill_preference_directory_structure">Password file organization</string>
+  <string name="oreo_autofill_enable_dialog_description">Password Store can offer to fill login forms and even save credentials you enter in apps or on websites.</string>
+  <string name="oreo_autofill_enable_dialog_instructions">To enable this feature, tap OK to go to Autofill settings. There, select Password Store from the list and confirm the confirmation prompt with OK.</string>
+  <string name="oreo_autofill_enable_dialog_installed_browsers">Autofill support with installed browsers:</string>
+
+  <!-- Autofill -->
+  <string name="ssh_key_does_not_exist">Unable to open the ssh private key, please check that the file exists</string>
+  <string name="new_password_title">New password</string>
+  <string name="clear_saved_passphrase_ssh">Clear saved passphrase for local SSH key</string>
+  <string name="clear_saved_passphrase_https">Clear saved HTTPS password</string>
+  <string name="git_operation_remember_passphrase">Remember key passphrase</string>
+  <string name="git_tools">Utilities</string>
+  <string name="abort_rebase">Abort rebase and push new branch</string>
+  <string name="reset_to_remote">Hard reset to remote branch</string>
+  <string name="git_head_on_branch">On branch %1$s</string>
+  <string name="git_head_detached">HEAD detached at %1$s</string>
+  <string name="git_head_missing">Unable to locate HEAD</string>
+  <string name="sdcard_root_warning_title">SD-Card root selected</string>
+  <string name="sdcard_root_warning_message">You have selected the root of your sdcard for the store. This is extremely dangerous and you will lose your data as its content will, eventually, be deleted</string>
+  <string name="sdcard_root_warning_remove_everything">Remove everything</string>
+  <string name="git_abort_and_push_title">Abort and Push</string>
+  <string name="biometric_prompt_title">Biometric Prompt</string>
+  <string name="biometric_auth_error">Authentication failure</string>
+  <string name="biometric_auth_error_reason">Authentication failure: %s</string>
+  <string name="pref_biometric_auth_title">Enable biometric authentication</string>
+  <string name="pref_biometric_auth_summary">When enabled, Password Store will prompt you for your fingerprint when launching the app</string>
+  <string name="pref_biometric_auth_summary_error">Fingerprint hardware not accessible or missing</string>
+  <string name="pref_title_openkeystore_clear_keyid">Clear remembered OpenKeystore SSH Key ID</string>
+  <string name="access_sdcard_text">The store location is in your SD Card or Internal storage, but the app does not have permission to access it.</string>
+  <string name="your_public_key">Your public key</string>
+  <string name="error_generate_ssh_key">Error while trying to generate the ssh-key</string>
+  <string name="pref_show_hidden_title">Show all files and folders</string>
+  <string name="pref_show_hidden_summary">Include non-password files and directories in the password list</string>
+  <string name="title_create_folder">Create folder</string>
+  <string name="title_rename_folder">Rename folder</string>
+  <string name="message_category_error_empty_field">Category name can\'t be empty</string>
+  <string name="message_category_error_category_exists">Category name already exists</string>
+  <string name="message_error_destination_outside_repo">Destination must be within the repository</string>
+  <string name="message_rename_folder">Enter destination for %1$s</string>
+  <string name="button_create">Create</string>
+  <string name="pref_search_on_start_title">Open search on start</string>
+  <string name="pref_search_on_start_summary">Open search bar when app is launched</string>
+  <string name="tap_clear_clipboard">Tap here to clear clipboard</string>
+  <string name="clone_git_repo">The repository must be cloned before syncing changes.</string>
+  <string name="pref_app_theme_title">App theme</string>
+  <string name="pref_app_theme_value_light">Light</string>
+  <string name="pref_app_theme_value_dark">Dark</string>
+  <string name="pref_app_theme_value_battery_saver">Set by Battery Saver</string>
+  <string name="pref_app_theme_value_follow_system">System default</string>
+  <string name="connection_mode_ssh_key">SSH key</string>
+  <string name="connection_mode_basic_authentication">Password</string>
+  <string name="connection_mode_openkeychain" translatable="false">OpenKeychain</string>
+  <string name="git_server_config_save_success">Successfully saved configuration</string>
+  <string name="git_server_config_save_error">The provided repository URL is not valid</string>
+  <string name="git_server_config_save_missing_username_https">Please specify the HTTPS username in the form https://username@example.com/…</string>
+  <string name="git_server_config_save_missing_username_ssh">Please specify the SSH username in the form username@example.com:…</string>
+  <string name="git_server_config_save_auth_mode_mismatch">Valid authentication modes for %1$s: %2$s</string>
+  <string name="git_operation_wrong_passphrase">Wrong passphrase</string>
+  <string name="git_operation_wrong_password">Wrong password</string>
+  <string name="bottom_sheet_create_new_folder">Create new folder</string>
+  <string name="bottom_sheet_create_new_password">Create new password</string>
+  <string name="snackbar_action_grant">Grant</string>
+  <string name="pref_debug_logging_summary">Enable debug logging (requires app restart)</string>
+  <string name="pref_debug_logging_title">Debug logging</string>
+  <string name="preference_default_username_summary">If Autofill is unable to determine a username from your password file or directory structure, it will use the value specified here</string>
+  <string name="preference_default_username_title">Default username</string>
+  <string name="git_operation_remember_password">Remember password</string>
+  <string name="git_operation_hint_password">Password</string>
+  <string name="preference_custom_public_suffixes_title">Custom domains</string>
+  <string name="preference_custom_public_suffixes_summary">Autofill will distinguish subdomains of these domains</string>
+  <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string>
+
+  <!-- OpenKeychain errors -->
+  <string name="openpgp_error_wrong_passphrase">Incorrect passphrase</string>
+  <string name="openpgp_error_no_user_ids">No matching PGP keys found</string>
+  <string name="openpgp_error_unknown">Error from OpenKeyChain : %s</string>
+
+  <!-- Password creation failure -->
+  <string name="password_creation_file_fail_title">Error</string>
+  <string name="password_creation_file_write_fail_message">Failed to write password file to the store, please try again.</string>
+  <string name="password_creation_file_delete_fail_message">Failed to delete password file %1$s from the store, please delete it manually.</string>
+  <string name="password_creation_duplicate_error">File already exists, please use a different name</string>
+  <string name="add_otp">Add OTP</string>
+  <string name="otp_import_success">Successfully imported TOTP configuration</string>
+  <string name="otp_import_failure">Failed to import TOTP configuration</string>
+  <string name="exporting_passwords">Exporting passwords…</string>
+  <string name="invalid_gpg_id">Found .gpg-id, but it contains an invalid key ID, fingerprint or user ID</string>
+  <string name="short_key_ids_unsupported">A key ID in .gpg-id is too short, please use either long key IDs (16 characters) or fingerprints (40 characters)</string>
+  <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string>
+  <string name="directory_hint">Directory</string>
+  <string name="new_folder_set_gpg_key">Set GPG key for directory</string>
+
+  <!-- GitException messages -->
+  <string name="git_unknown_error">Unknown error</string>
+  <string name="git_pull_rebase_fail_error">Pull has failed, you\'re in a detached head. Using "settings > git utils", save your changes to the remote in a new branch and resolve the conflict on your computer.</string>
+  <string name="git_pull_merge_fail_error">Merge has failed, you\'re in a conflicting state. TODO: Add a recovery method.</string>
+
+  <string name="git_push_nff_error">Push was rejected by remote, run pull before pushing again. You can use Synchronize rather than pull/push as it implements both</string>
+  <string name="git_push_generic_error">Push was rejected by remote, reason: %1$s</string>
+  <string name="git_push_other_error">Remote rejected non-fast-forward push. Check receive.denyNonFastForwards variable in config file of destination repository.</string>
+  <string name="git_unknown_host">Unknown host: %1$s</string>
+  <string name="git_operation_running">Running git operation…</string>
+  <string name="git_break_out_of_detached_success">There was a conflict when trying to rebase. Your local %1$s branch was pushed to another branch named %2$s\n Use this branch to resolve conflict on your computer</string>
+  <string name="git_break_out_of_detached_unneeded">The repository is not rebasing, no need to push to another branch</string>
+
+  <!-- OpenKeychain not installed -->
+  <string name="openkeychain_not_installed_title">OpenKeychain not installed</string>
+  <string name="openkeychain_not_installed_message">OpenKeychain is required for Password Store to function, please install it from the stores below</string>
+  <string name="openkeychain_not_installed_google_play">Google Play</string>
+  <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string>
+  <string name="openkeychain_not_installed_fdroid">F-Droid</string>
+  <string name="fdroid_deeplink_template">https://f-droid.org/en/packages/%1$s/</string>
+
+  <!-- GPG key selection in folder creation -->
+  <string name="folder_creation_err_file_exists">A file by that name already exists</string>
+  <string name="folder_creation_err_folder_exists">A folder by that name already exists</string>
+  <string name="xkpwgen_extrachars_label">Digits/Symbols (d/s)</string>
+  <string name="xk_numbers_symbols_append_default">ds</string>
+
+  <!-- Onboarding flow -->
+  <string name="repository_n_location">Repository \nLocation</string>
+  <string name="let_s_go">Let\'s Go</string>
+  <string name="select_n_repository_type">Select \nRepository Type</string>
+  <string name="select_repo_type_text">Select if you want to create a local repo or clone a remote repo.</string>
+  <string name="clone_remote_repo">Clone Remote Repo</string>
+  <string name="create_local_repo">Create Local Repo</string>
+  <string name="select_gpg_key_title">Select\nGPG Key</string>
+  <string name="select_gpg_key_message">Select a GPG key to initialize your store with</string>
+  <string name="gpg_key_select">Select key</string>
+
+  <!-- SSH port validation -->
+  <string name="ssh_scheme_needed_title">Potentially incorrect URL</string>
+  <string name="ssh_scheme_needed_message">It appears that your URL contains a custom port, but does not specify the ssh:// scheme.\nThis can cause the port to be considered a part of your path. Press OK here to fix the URL.</string>
+  <string name="https_scheme_with_port_title">HTTPS URL with custom port</string>
+  <string name="https_scheme_with_port_message">It looks like you are using a HTTPS URL with a custom port. This is not supported, and will cause problems down the line. Press OK to remove the port from your URL.</string>
+
+  <!-- Proxy configuration activity -->
+  <string name="proxy_hostname">Proxy hostname</string>
+  <string name="port">Port</string>
+  <string name="pref_edit_proxy_settings">HTTP(S) proxy settings</string>
+  <string name="invalid_proxy_url">Invalid URL</string>
+  <string name="oreo_autofill_password_fill_and_conditional_save_support">Fill and save passwords (saving requires that no accessibility services are enabled)</string>
+  <string name="clear_saved_host_key">Clear saved host key</string>
+  <string name="clear_saved_host_key_success">Successfully cleared saved host key!</string>
+  <string name="otp_import_qr_code">Scan QR code</string>
+  <string name="otp_import_manual_entry">Enter manually</string>
+  <string name="otp_import_manual_hint_secret">Secret</string>
+  <string name="otp_import_manual_hint_account">Account</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0eb3f975..d354799b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,87 +5,87 @@
 
 <resources>
 
-    <style name="AppTheme.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
-        <item name="boxStrokeColor">@color/outlined_box_selector</item>
-        <item name="hintTextColor">?attr/colorSecondary</item>
-        <item name="materialThemeOverlay">
-            @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox
-        </item>
-    </style>
+  <style name="AppTheme.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
+    <item name="boxStrokeColor">@color/outlined_box_selector</item>
+    <item name="hintTextColor">?attr/colorSecondary</item>
+    <item name="materialThemeOverlay">
+      @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox
+    </item>
+  </style>
 
-    <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
-        <item name="colorControlActivated">@color/color_control_normal</item>
-    </style>
+  <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
+    <item name="colorControlActivated">@color/color_control_normal</item>
+  </style>
 
-    <style name="AppTheme.MaterialButton" parent="Widget.MaterialComponents.Button">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="backgroundTint">?attr/colorSecondary</item>
-        <item name="rippleColor">?attr/colorControlHighlight</item>
-    </style>
+  <style name="AppTheme.MaterialButton" parent="Widget.MaterialComponents.Button">
+    <item name="android:textColor">@android:color/white</item>
+    <item name="backgroundTint">?attr/colorSecondary</item>
+    <item name="rippleColor">?attr/colorControlHighlight</item>
+  </style>
 
-    <style name="AppTheme.OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="rippleColor">@color/ripple_color</item>
-        <item name="strokeColor">?attr/colorSecondary</item>
-        <item name="backgroundTint">@color/toggle_button_selector</item>
-    </style>
+  <style name="AppTheme.OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="rippleColor">@color/ripple_color</item>
+    <item name="strokeColor">?attr/colorSecondary</item>
+    <item name="backgroundTint">@color/toggle_button_selector</item>
+  </style>
 
-    <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
-        <item name="colorPrimary">@color/secondary_color</item>
-        <item name="colorSecondary">@color/secondary_color</item>
-    </style>
+  <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+    <item name="colorPrimary">@color/secondary_color</item>
+    <item name="colorSecondary">@color/secondary_color</item>
+  </style>
 
-    <style name="AppTheme.Chip.Choice" parent="Widget.MaterialComponents.Chip.Choice">
-        <item name="chipSurfaceColor">@color/chip_surface_color</item>
-        <item name="android:textColor">@color/chip_text_color</item>
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearance.AppTheme.SmallComponent</item>
-        <item name="textAppearanceBody2">@style/TextAppearance.AppTheme.Body2</item>
-    </style>
+  <style name="AppTheme.Chip.Choice" parent="Widget.MaterialComponents.Chip.Choice">
+    <item name="chipSurfaceColor">@color/chip_surface_color</item>
+    <item name="android:textColor">@color/chip_text_color</item>
+    <item name="shapeAppearanceOverlay">@style/ShapeAppearance.AppTheme.SmallComponent</item>
+    <item name="textAppearanceBody2">@style/TextAppearance.AppTheme.Body2</item>
+  </style>
 
-    <style name="TextAppearance.AppTheme.Body2" parent="TextAppearance.MaterialComponents.Body2">
-        <item name="android:textStyle">bold</item>
-    </style>
+  <style name="TextAppearance.AppTheme.Body2" parent="TextAppearance.MaterialComponents.Body2">
+    <item name="android:textStyle">bold</item>
+  </style>
 
-    <style name="ShapeAppearance.AppTheme.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">8dp</item>
-    </style>
+  <style name="ShapeAppearance.AppTheme.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+    <item name="cornerFamily">rounded</item>
+    <item name="cornerSize">8dp</item>
+  </style>
 
-    <style name="ActionMode" parent="@style/Widget.AppCompat.ActionMode">
-        <item name="background">@color/primary_color</item>
-    </style>
+  <style name="ActionMode" parent="@style/Widget.AppCompat.ActionMode">
+    <item name="background">@color/primary_color</item>
+  </style>
 
-    <style name="BottomSheetDialogTheme" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:windowIsTranslucent">false</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:backgroundDimAmount">0.5</item>
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:colorBackground">@android:color/transparent</item>
-    </style>
+  <style name="BottomSheetDialogTheme" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:windowTranslucentNavigation">false</item>
+    <item name="android:windowIsTranslucent">false</item>
+    <item name="android:backgroundDimEnabled">true</item>
+    <item name="android:backgroundDimAmount">0.5</item>
+    <item name="android:windowTranslucentStatus">false</item>
+    <item name="android:colorBackground">@android:color/transparent</item>
+  </style>
 
-    <style name="NoBackgroundTheme" parent="@style/AppTheme">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
-        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
-        <item name="colorPrimaryDark">@android:color/transparent</item>
-        <item name="windowNoTitle">true</item>
-    </style>
+  <style name="NoBackgroundTheme" parent="@style/AppTheme">
+    <item name="android:background">@android:color/transparent</item>
+    <item name="android:backgroundDimEnabled">true</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:windowIsTranslucent">true</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
+    <item name="android:windowExitAnimation">@android:anim/fade_out</item>
+    <item name="colorPrimaryDark">@android:color/transparent</item>
+    <item name="windowNoTitle">true</item>
+  </style>
 
-    <style name="DialogLikeTheme" parent="AppTheme">
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <!-- Needs to be set without android: prefix as per https://stackoverflow.com/a/33417456 -->
-        <item name="windowNoTitle">true</item>
-    </style>
+  <style name="DialogLikeTheme" parent="AppTheme">
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowIsFloating">true</item>
+    <item name="android:backgroundDimEnabled">true</item>
+    <!-- Needs to be set without android: prefix as per https://stackoverflow.com/a/33417456 -->
+    <item name="windowNoTitle">true</item>
+  </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8a57f448..5891d019 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,31 +4,31 @@
   -->
 
 <resources>
-    <!-- Base application theme. -->
-    <style name="APSTheme" parent="Theme.MaterialComponents.DayNight">
-        <item name="colorPrimary">@color/primary_color</item>
-        <item name="colorOnPrimary">@color/color_control_normal</item>
-        <item name="colorPrimaryDark">@color/primary_color</item>
-        <item name="colorPrimaryVariant">@color/primary_light_color</item>
-        <item name="colorSecondary">@color/secondary_color</item>
-        <item name="colorSecondaryVariant">@color/secondary_dark_color</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <item name="colorSurface">@color/primary_color</item>
-        <item name="colorOnSurface">@color/color_control_normal</item>
-        <item name="colorControlNormal">@color/color_control_normal</item>
-        <item name="android:textColor">@color/primary_text_color</item>
-        <item name="android:colorBackgroundFloating">@color/primary_color</item>
-        <item name="android:statusBarColor">@color/status_bar_color</item>
-        <item name="android:navigationBarColor">@color/navigation_bar_color</item>
-        <item name="android:windowLightStatusBar">@bool/light_status_bar</item>
-        <item name="actionModeStyle">@style/ActionMode</item>
-        <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
-        <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
-        <item name="materialButtonStyle">@style/AppTheme.MaterialButton</item>
-        <item name="materialButtonOutlinedStyle">@style/AppTheme.OutlinedButton</item>
-        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
-        <item name="textInputStyle">@style/AppTheme.TextInputLayout</item>
-    </style>
+  <!-- Base application theme. -->
+  <style name="APSTheme" parent="Theme.MaterialComponents.DayNight">
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorOnPrimary">@color/color_control_normal</item>
+    <item name="colorPrimaryDark">@color/primary_color</item>
+    <item name="colorPrimaryVariant">@color/primary_light_color</item>
+    <item name="colorSecondary">@color/secondary_color</item>
+    <item name="colorSecondaryVariant">@color/secondary_dark_color</item>
+    <item name="colorOnSecondary">@color/white</item>
+    <item name="colorSurface">@color/primary_color</item>
+    <item name="colorOnSurface">@color/color_control_normal</item>
+    <item name="colorControlNormal">@color/color_control_normal</item>
+    <item name="android:textColor">@color/primary_text_color</item>
+    <item name="android:colorBackgroundFloating">@color/primary_color</item>
+    <item name="android:statusBarColor">@color/status_bar_color</item>
+    <item name="android:navigationBarColor">@color/navigation_bar_color</item>
+    <item name="android:windowLightStatusBar">@bool/light_status_bar</item>
+    <item name="actionModeStyle">@style/ActionMode</item>
+    <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
+    <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
+    <item name="materialButtonStyle">@style/AppTheme.MaterialButton</item>
+    <item name="materialButtonOutlinedStyle">@style/AppTheme.OutlinedButton</item>
+    <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
+    <item name="textInputStyle">@style/AppTheme.TextInputLayout</item>
+  </style>
 
-    <style name="AppTheme" parent="APSTheme" />
+  <style name="AppTheme" parent="APSTheme" />
 </resources>