diff --git a/app/src/main/java/com/owncloud/android/ui/AppVersionPreference.kt b/app/src/main/java/com/owncloud/android/ui/AppVersionPreference.kt
index f561ab71260a..ee0e0b43402a 100644
--- a/app/src/main/java/com/owncloud/android/ui/AppVersionPreference.kt
+++ b/app/src/main/java/com/owncloud/android/ui/AppVersionPreference.kt
@@ -25,7 +25,7 @@ class AppVersionPreference : Preference {
     private fun updatePreferenceView(title: TextView, summary: TextView) {
         val appVersion = appVersion
         val titleColor: Int = context.resources.getColor(R.color.fontAppbar, null)
-        title.text = StringUtils.getColoredSpan(
+        title.text = StringUtils.getColorSpan(
             context.getString(R.string.app_name),
             titleColor
         )
diff --git a/app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java b/app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java
index 0840470a135e..a63bb42e6d29 100644
--- a/app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java
+++ b/app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java
@@ -102,8 +102,8 @@ private void findSwitch(ViewGroup viewGroup) {
 
 
                 int trackColorCheckedEnabled =
-                    getContext().getResources().getColor(R.color.switch_thumb_checked_enabled, null);
-                int trackColorUncheckedEnabled = getContext().getResources().getColor(R.color.dark_grey, null);
+                    getContext().getResources().getColor(R.color.switch_track_checked_enabled, null);
+                int trackColorUncheckedEnabled = getContext().getResources().getColor(R.color.switch_track_unchecked_enabled, null);
                 int trackColorCheckedDisabled =
                      getContext().getResources().getColor(R.color.switch_track_checked_disabled, null);
                 int trackColorUncheckedDisabled =
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
index 17c41d7f0d3b..a61e542e1bca 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
@@ -40,6 +40,7 @@
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -59,6 +60,7 @@
 import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
+import com.nmc.android.ui.PrivacySettingsActivity;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
@@ -188,6 +190,10 @@ public void onCreate(Bundle savedInstanceState) {
         // More
         setupMoreCategory(titleColor);
 
+        // About
+        // Not required in NMC
+        //setupAboutCategory(appVersion);
+
         // Data Privacy
         setupDataPrivacyCategory(titleColor);
 
@@ -247,18 +253,110 @@ private void setupDevCategory(PreferenceScreen preferenceScreen) {
         }
     }
 
+    private void setupAboutCategory(String appVersion) {
+        final PreferenceCategory preferenceCategoryAbout = (PreferenceCategory) findPreference("about");
+        viewThemeUtils.files.themePreferenceCategory(preferenceCategoryAbout);
+
+        /* About App */
+        Preference pAboutApp = findPreference("about_app");
+        if (pAboutApp != null) {
+            pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
+
+            String buildNumber = getResources().getString(R.string.buildNumber);
+
+            if (TextUtils.isEmpty(buildNumber)) {
+                pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
+            } else {
+                pAboutApp.setSummary(String.format(getString(R.string.about_version_with_build),
+                                                   appVersion,
+                                                   buildNumber));
+            }
+        }
+
+        // license
+        boolean licenseEnabled = getResources().getBoolean(R.bool.license_enabled);
+        Preference licensePreference = findPreference("license");
+        if (licensePreference != null) {
+            if (licenseEnabled) {
+                licensePreference.setSummary(R.string.prefs_gpl_v2);
+                licensePreference.setOnPreferenceClickListener(preference -> {
+                    DisplayUtils.startLinkIntent(this, R.string.license_url);
+                    return true;
+                });
+            } else {
+                preferenceCategoryAbout.removePreference(licensePreference);
+            }
+        }
+
+        // privacy
+        boolean privacyEnabled = getResources().getBoolean(R.bool.privacy_enabled);
+        Preference privacyPreference = findPreference("privacy");
+        if (privacyPreference != null) {
+            if (privacyEnabled && URLUtil.isValidUrl(getString(R.string.privacy_url))) {
+                privacyPreference.setOnPreferenceClickListener(preference -> {
+                    try {
+                        Uri privacyUrl = Uri.parse(getString(R.string.privacy_url));
+                        String mimeType = MimeTypeUtil.getBestMimeTypeByFilename(privacyUrl.getLastPathSegment());
+
+                        Intent intent;
+                        if (MimeTypeUtil.isPDF(mimeType)) {
+                            intent = new Intent(Intent.ACTION_VIEW, privacyUrl);
+                            DisplayUtils.startIntentIfAppAvailable(intent, this, R.string.no_pdf_app_available);
+                        } else {
+                            intent = new Intent(getApplicationContext(), ExternalSiteWebView.class);
+                            intent.putExtra(ExternalSiteWebView.EXTRA_TITLE,
+                                            getResources().getString(R.string.privacy));
+                            intent.putExtra(ExternalSiteWebView.EXTRA_URL, privacyUrl.toString());
+                            intent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
+                            intent.putExtra(ExternalSiteWebView.EXTRA_MENU_ITEM_ID, -1);
+                        }
+
+                        startActivity(intent);
+                    } catch (Exception e) {
+                        Log_OC.e(TAG, "Could not parse privacy url");
+                        preferenceCategoryAbout.removePreference(privacyPreference);
+                    }
+                    return true;
+                });
+            } else {
+                preferenceCategoryAbout.removePreference(privacyPreference);
+            }
+        }
+
+        // source code
+        boolean sourcecodeEnabled = getResources().getBoolean(R.bool.sourcecode_enabled);
+        Preference sourcecodePreference = findPreference("sourcecode");
+        if (sourcecodePreference != null) {
+            if (sourcecodeEnabled) {
+                sourcecodePreference.setOnPreferenceClickListener(preference -> {
+                    DisplayUtils.startLinkIntent(this, R.string.sourcecode_url);
+                    return true;
+                });
+            } else {
+                preferenceCategoryAbout.removePreference(sourcecodePreference);
+            }
+        }
+    }
+
+    /**
+     * NMC customization
+     */
     private void setupDataPrivacyCategory(int titleColor) {
         PreferenceCategory preferenceCategoryAbout = (PreferenceCategory) findPreference("data_protection");
-        preferenceCategoryAbout.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_category_data_privacy),
+        preferenceCategoryAbout.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_data_privacy),
                                                                         titleColor));
 
         //privacy settings
         Preference privacySettingPreference = findPreference("privacy_settings");
         if (privacySettingPreference != null) {
-            privacySettingPreference.setTitle(StringUtils.getColoredSpan(getString(R.string.privacy_settings),
+            privacySettingPreference.setTitle(StringUtils.getColorSpan(getString(R.string.privacy_settings),
                                                                              titleColor));
             privacySettingPreference.setOnPreferenceClickListener(preference -> {
-
+                //Compile time error will be shown here while running build from here
+                //look for nmc/1878-privacy for the PrivacySettingsActivity.
+                //this is workaround to avoid code conflict of settings and privacy
+                // TODO: 05/17/23 find a way to have the redirection in privacy branch.
+                PrivacySettingsActivity.openPrivacySettingsActivity(this, false);
                 return true;
             });
         }
@@ -267,7 +365,7 @@ private void setupDataPrivacyCategory(int titleColor) {
         Preference privacyPolicyPreference = findPreference("privacy_policy");
 
         if (privacyPolicyPreference != null) {
-            privacyPolicyPreference.setTitle(StringUtils.getColoredSpan(getString(R.string.privacy_policy),
+            privacyPolicyPreference.setTitle(StringUtils.getColorSpan(getString(R.string.privacy_policy),
                                                                             titleColor));
             if (URLUtil.isValidUrl(getString(R.string.privacy_url))) {
                 privacyPolicyPreference.setOnPreferenceClickListener(preference -> {
@@ -303,7 +401,7 @@ private void setupDataPrivacyCategory(int titleColor) {
         // source code
         Preference sourcecodePreference = findPreference("sourcecode");
         if (sourcecodePreference != null) {
-            sourcecodePreference.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_open_source),
+            sourcecodePreference.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_open_source),
                                                                          titleColor));
             if (URLUtil.isValidUrl(getString(R.string.sourcecode_url))) {
                 sourcecodePreference.setOnPreferenceClickListener(preference -> {
@@ -324,13 +422,13 @@ private void setupDataPrivacyCategory(int titleColor) {
 
     private void setUpInfoCategory(int titleColor) {
         PreferenceCategory preferenceCategoryAbout = (PreferenceCategory) findPreference("info");
-        preferenceCategoryAbout.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_category_info),
+        preferenceCategoryAbout.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_info),
                                                                      titleColor));
     }
 
     private void setupMoreCategory(int titleColor) {
         PreferenceCategory preferenceCategoryMore = (PreferenceCategory) findPreference("more");
-        preferenceCategoryMore.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_category_more),
+        preferenceCategoryMore.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_more),
                                                                        titleColor));
 
         setupAutoUploadPreference(preferenceCategoryMore, titleColor);
@@ -359,7 +457,7 @@ private void setupLoggingPreference(PreferenceCategory preferenceCategoryMore, i
         boolean loggerEnabled = getResources().getBoolean(R.bool.logger_enabled) || BuildConfig.DEBUG;
         Preference pLogger = findPreference("logger");
         if (pLogger != null) {
-            pLogger.setTitle(StringUtils.getColoredSpan(getString(R.string.logs_title),
+            pLogger.setTitle(StringUtils.getColorSpan(getString(R.string.logs_title),
                                                             titleColor));
             if (loggerEnabled) {
                 pLogger.setOnPreferenceClickListener(preference -> {
@@ -513,7 +611,7 @@ private void removeE2E(PreferenceCategory preferenceCategoryMore) {
 
     private void setupAutoUploadPreference(PreferenceCategory preferenceCategoryMore, int titleColor) {
         Preference autoUpload = findPreference("syncedFolders");
-        autoUpload.setTitle(StringUtils.getColoredSpan(getString(R.string.drawer_synced_folders),
+        autoUpload.setTitle(StringUtils.getColorSpan(getString(R.string.drawer_synced_folders),
                                                            titleColor));
         if (getResources().getBoolean(R.bool.syncedFolder_light)) {
             preferenceCategoryMore.removePreference(autoUpload);
@@ -530,12 +628,11 @@ private void setupBackupPreference(int titleColor) {
         Preference pContactsBackup = findPreference("backup");
         if (pContactsBackup != null) {
             boolean showCalendarBackup = getResources().getBoolean(R.bool.show_calendar_backup);
-            pContactsBackup.setTitle(showCalendarBackup
-                                         ? StringUtils.getColorSpan(getString(R.string.backup_title), titleColor)
-                                         : StringUtils.getColorSpan(getString(R.string.contact_backup_title), titleColor));
+            //NMC Customization
+            pContactsBackup.setTitle(StringUtils.getColorSpan(getString(R.string.actionbar_contacts), titleColor));
             pContactsBackup.setSummary(showCalendarBackup
-                                           ? StringUtils.getColorSpan(getString(R.string.prefs_daily_backup_summary), titleColor)
-                                           : StringUtils.getColorSpan(getString(R.string.prefs_daily_contact_backup_summary), titleColor));
+                                           ? getString(R.string.prefs_daily_backup_summary)
+                                           : getString(R.string.prefs_daily_contact_backup_summary));
             pContactsBackup.setOnPreferenceClickListener(preference -> {
                 ContactsPreferenceActivity.startActivityWithoutSidebar(this);
                 return true;
@@ -568,7 +665,7 @@ private void setupCalendarPreference(PreferenceCategory preferenceCategoryMore)
 
     private void setupDetailsCategory(int titleColor, PreferenceScreen preferenceScreen) {
         PreferenceCategory preferenceCategoryDetails = (PreferenceCategory) findPreference("details");
-        preferenceCategoryDetails.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_category_details),
+        preferenceCategoryDetails.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_details),
                                                                           titleColor));
 
         boolean fPassCodeEnabled = getResources().getBoolean(R.bool.passcode_enabled);
@@ -592,7 +689,7 @@ private void setupDetailsCategory(int titleColor, PreferenceScreen preferenceScr
     private void setupShowMediaScanNotifications(PreferenceCategory preferenceCategoryDetails,
                                                  boolean fShowMediaScanNotifications, int titleColor) {
         SwitchPreference mShowMediaScanNotifications = (SwitchPreference) findPreference(PREFERENCE_SHOW_MEDIA_SCAN_NOTIFICATIONS);
-        mShowMediaScanNotifications.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_storage_path),
+        mShowMediaScanNotifications.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_storage_path),
                                                                             titleColor));
         if (fShowMediaScanNotifications) {
             preferenceCategoryDetails.removePreference(mShowMediaScanNotifications);
@@ -602,7 +699,7 @@ private void setupShowMediaScanNotifications(PreferenceCategory preferenceCatego
     private void setupHiddenFilesPreference(PreferenceCategory preferenceCategoryDetails,
                                             boolean fShowHiddenFilesEnabled, int titleColor) {
         showHiddenFiles = (ThemeableSwitchPreference) findPreference("show_hidden_files");
-        showHiddenFiles.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_show_hidden_files),
+        showHiddenFiles.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_show_hidden_files),
                                                                 titleColor));
         if (fShowHiddenFilesEnabled) {
             showHiddenFiles.setOnPreferenceClickListener(preference -> {
@@ -618,7 +715,7 @@ private void setupLockPreference(PreferenceCategory preferenceCategoryDetails,
                                      boolean passCodeEnabled,
                                      boolean deviceCredentialsEnabled, int titleColor) {
         lock = (ListPreference) findPreference(PREFERENCE_LOCK);
-        lock.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_lock),
+        lock.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_lock),
                                                      titleColor));
         if (lock != null && (passCodeEnabled || deviceCredentialsEnabled)) {
             ArrayList<String> lockEntries = new ArrayList<>(3);
@@ -669,7 +766,7 @@ private void setupLockPreference(PreferenceCategory preferenceCategoryDetails,
     private void setupAutoUploadCategory(int titleColor, PreferenceScreen preferenceScreen) {
         PreferenceCategory preferenceCategorySyncedFolders =
             (PreferenceCategory) findPreference("synced_folders_category");
-        preferenceCategorySyncedFolders.setTitle(StringUtils.getColoredSpan(getString(R.string.drawer_synced_folders),
+        preferenceCategorySyncedFolders.setTitle(StringUtils.getColorSpan(getString(R.string.drawer_synced_folders),
                                                                                 titleColor));
 
         if (!getResources().getBoolean(R.bool.syncedFolder_light)) {
@@ -679,7 +776,7 @@ private void setupAutoUploadCategory(int titleColor, PreferenceScreen preference
             final ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
 
             final SwitchPreference pUploadOnWifiCheckbox = (SwitchPreference) findPreference("synced_folder_on_wifi");
-            pUploadOnWifiCheckbox.setTitle(StringUtils.getColoredSpan(getString(R.string.auto_upload_on_wifi),
+            pUploadOnWifiCheckbox.setTitle(StringUtils.getColorSpan(getString(R.string.auto_upload_on_wifi),
                                                                           titleColor));
             pUploadOnWifiCheckbox.setChecked(
                 arbitraryDataProvider.getBooleanValue(user, SYNCED_FOLDER_LIGHT_UPLOAD_ON_WIFI));
@@ -708,7 +805,7 @@ private void setupAutoUploadCategory(int titleColor, PreferenceScreen preference
 
     private void setUpServiceCategory(int titleColor) {
         PreferenceCategory preferenceCategoryService = (PreferenceCategory) findPreference("service");
-        preferenceCategoryService.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_category_service),
+        preferenceCategoryService.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_service),
                                                                           titleColor));
         setupHelpPreference(titleColor);
         setupImprintPreference(titleColor);
@@ -717,7 +814,7 @@ private void setUpServiceCategory(int titleColor) {
     private void setupHelpPreference(int titleColor) {
         Preference pHelp = findPreference("help");
         if (pHelp != null) {
-            pHelp.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_help),
+            pHelp.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_help),
                                                           titleColor));
             pHelp.setOnPreferenceClickListener(preference -> {
                 String helpWeb = getString(R.string.url_help);
@@ -733,7 +830,7 @@ private void setupHelpPreference(int titleColor) {
     private void setupImprintPreference(int titleColor) {
         Preference pImprint = findPreference("imprint");
         if (pImprint != null) {
-            pImprint.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_imprint),
+            pImprint.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_imprint),
                                                              titleColor));
             pImprint.setOnPreferenceClickListener(preference -> {
                 String imprintWeb = getString(R.string.url_imprint);
@@ -792,21 +889,21 @@ private void disableLock(String lock) {
 
     private void setupAccountInfoCategory(int titleColor) {
         PreferenceCategory preferenceCategoryAccountInfo = (PreferenceCategory) findPreference("account_info");
-        preferenceCategoryAccountInfo.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_category_account_info),
+        preferenceCategoryAccountInfo.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_account_info),
                                                                           titleColor));
 
         Preference autoUpload = findPreference("user_name");
-        autoUpload.setTitle(StringUtils.getColoredSpan(accountManager.getUser().toOwnCloudAccount().getDisplayName(),
+        autoUpload.setTitle(StringUtils.getColorSpan(accountManager.getUser().toOwnCloudAccount().getDisplayName(),
                                                            titleColor));
     }
 
     private void setupGeneralCategory(int titleColor) {
         PreferenceCategory preferenceCategoryGeneral = (PreferenceCategory) findPreference("general");
-        preferenceCategoryGeneral.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_category_general),
+        preferenceCategoryGeneral.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_general),
                                                                           titleColor));
 
         prefStoragePath = (ListPreference) findPreference(AppPreferencesImpl.STORAGE_PATH);
-        prefStoragePath.setTitle(StringUtils.getColoredSpan(getString(R.string.prefs_storage_path),
+        prefStoragePath.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_storage_path),
                                                                 titleColor));
         if (prefStoragePath != null) {
             StoragePoint[] storageOptions = DataStorageProvider.getInstance().getAvailableStoragePoints();
diff --git a/app/src/main/java/com/owncloud/android/utils/StringUtils.java b/app/src/main/java/com/owncloud/android/utils/StringUtils.java
index 93a5df9840eb..cab320ee9901 100644
--- a/app/src/main/java/com/owncloud/android/utils/StringUtils.java
+++ b/app/src/main/java/com/owncloud/android/utils/StringUtils.java
@@ -73,6 +73,15 @@ String searchAndColor(@Nullable String text, @Nullable String searchText,
         }
     }
 
+    public static Spannable getColorSpan(@NonNull String title, @ColorInt int color) {
+        Spannable text = new SpannableString(title);
+        text.setSpan(new ForegroundColorSpan(color),
+                     0,
+                     text.length(),
+                     Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        return text;
+    }
+
     public static
     @NonNull
     String removePrefix(@NonNull String s, @NonNull String prefix) {
@@ -81,15 +90,4 @@ String removePrefix(@NonNull String s, @NonNull String prefix) {
         }
         return s;
     }
-
-    public static Spannable getColoredSpan(String title, int color) {
-        Spannable text  = new SpannableString(title);
-        text.setSpan(
-            new ForegroundColorSpan(color),
-            0,
-            text.length(),
-            Spannable.SPAN_INCLUSIVE_INCLUSIVE
-                    );
-        return text;
-    }
 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ef57b767e59e..64aa9760a932 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -856,6 +856,14 @@
     <string name="uploader_error_title_file_cannot_be_uploaded">Diese Datei kann nicht hochgeladen werden</string>
     <string name="uploader_error_title_no_file_to_upload">Keine Datei zum Hochladen</string>
     <string name="uploader_info_dirname">Ordnername</string>
+    <string name="prefs_category_account_info">Kontoinformationen</string>
+    <string name="prefs_category_data_privacy">Datenschutz</string>
+    <string name="privacy_settings">Datenschutz</string>
+    <string name="privacy_policy">Datenschutzbestimmungen</string>
+    <string name="prefs_open_source">Verwendete OpenSource Software</string>
+    <string name="prefs_category_info">Info</string>
+    <string name="prefs_category_service">Bedienung</string>
+    <string name="prefs_keys_exist_summary">Die Ende-zu-Ende Verschlüsselung wurde bereits auf einem anderen Gerät eingerichtet. Bitte geben Sie Ihre Passphrase ein, damit die Dateien synchronisiert und entschlüsselt werden.</string>
     <string name="uploader_top_message">Hochladeordner auswählen</string>
     <string name="uploader_upload_failed_content_single">Konnte %1$s nicht hochladen</string>
     <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, bitte erneut anmelden</string>
@@ -921,14 +929,6 @@
     <string name="write_email">E-Mail senden</string>
     <string name="wrong_storage_path">Speicherordner existiert nicht!</string>
     <string name="wrong_storage_path_desc">Ursache könnte die Wiederherstellung einer Sicherungskopie auf einem anderen Gerät sein. Der Standard-Ordner wird jetzt wieder verwendet. Bitte überprüfen Sie die Einstellungen bezüglich des Speicherortes.</string>
-    <string name="prefs_category_account_info">Kontoinformationen</string>
-    <string name="prefs_category_data_privacy">Datenschutz</string>
-    <string name="privacy_settings">Datenschutz</string>
-    <string name="privacy_policy">Datenschutzbestimmungen</string>
-    <string name="prefs_open_source">Verwendete OpenSource Software</string>
-    <string name="prefs_category_info">Info</string>
-    <string name="prefs_category_service">Bedienung</string>
-    <string name="prefs_keys_exist_summary">Die Ende-zu-Ende Verschlüsselung wurde bereits auf einem anderen Gerät eingerichtet. Bitte geben Sie Ihre Passphrase ein, damit die Dateien synchronisiert und entschlüsselt werden.</string>
     <plurals name="sync_fail_in_favourites_content">
         <item quantity="one">Inhalte von %1$d Datei konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
         <item quantity="other">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index ac510a277d71..88a29668c4cd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -31,16 +31,9 @@
     <color name="bg_default">#121212</color>
     <color name="primary_button_text_color">#000000</color>
     <color name="grey_200">#818181</color>
-    <color name="divider_color">@color/grey_70</color>
     <color name="nc_grey">#222222</color>
     <color name="icon_on_nc_grey">#ffffff</color>
 
-    <!-- Switch Compat Colors -->
-    <color name="switch_thumb_checked_disabled">@color/grey_70</color>
-    <color name="switch_track_checked_disabled">@color/grey_60</color>
-    <color name="switch_thumb_unchecked_disabled">@color/grey_70</color>
-    <color name="switch_track_unchecked_disabled">@color/grey_60</color>
-
     <!-- Multiselect backgrounds -->
     <color name="action_mode_background">@color/appbar</color>
     <color name="selected_item_background">#373535</color>
@@ -55,4 +48,70 @@
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">@android:color/white</color>
+
+    <!-- NMC Colors -->
+    <color name="icon_color">#FFFFFF</color>
+    <color name="sort_text_color">@color/grey_30</color>
+    <color name="list_icon_color">@color/grey_30</color>
+    <color name="warning_icon_color">#CCCCCC</color>
+    <color name="divider_color">@color/grey_70</color>
+    <color name="spinner_bg_color">@color/grey_80</color>
+    <color name="refresh_layout_bg_color">#2D2D2D</color>
+    <color name="primary_button_disabled_color">@color/grey_70</color>
+    <color name="toolbar_divider_color">@color/grey_70</color>
+
+    <!-- Snackbar Colors -->
+    <color name="snackbar_bg_color">@color/grey_80</color>
+    <color name="snackbar_txt_color">@color/grey_0</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">@color/grey_80</color>
+    <color name="alert_txt_color">@color/grey_0</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_60</color>
+    <color name="nav_txt_unselected_color">@color/grey_0</color>
+    <color name="nav_txt_selected_color">@color/grey_0</color>
+    <color name="nav_icon_unselected_color">@color/grey_30</color>
+    <color name="nav_icon_selected_color">#FFFFFF</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/grey_80</color>
+    <color name="drawer_quota_txt_color">#FFFFFF</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">@color/grey_80</color>
+    <color name="bottom_sheet_icon_color">@color/grey_30</color>
+    <color name="bottom_sheet_txt_color">@color/grey_0</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">@color/grey_80</color>
+    <color name="popup_menu_txt_color">@color/grey_0</color>
+    <color name="overflow_bg_color">@color/grey_80</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_disabled">@color/grey_70</color>
+    <color name="switch_track_checked_disabled">@color/grey_60</color>
+    <color name="switch_thumb_unchecked_disabled">@color/grey_70</color>
+    <color name="switch_track_unchecked_disabled">@color/grey_60</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_disabled">@color/grey_70</color>
+    <color name="checkbox_unchecked_disabled">@color/grey_70</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#FFFFFF</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">@color/grey_0</color>
+    <color name="share_search_border_color">@color/grey_0</color>
+    <color name="share_btn_txt_color">@color/grey_0</color>
+    <color name="share_list_item_txt_color">@color/grey_0</color>
+    <color name="share_disabled_txt_color">@color/grey_60</color>
+    <color name="share_txt_color">@color/grey_0</color>
+    <color name="share_et_divider">#FFFFFF</color>
+
+    <!-- Scan Colors -->
+    <color name="scan_doc_bg_color">#121212</color>
+    <color name="scan_text_color">@color/grey_0</color>
+    <color name="scan_edit_bottom_color">@color/grey_80</color>
+    <color name="scan_count_bg_color">@color/grey_80</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 132a1e8c815c..1ddf1a93ca08 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,7 +32,6 @@
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="transparent">#00000000</color>
     <color name="secondary_text_color">#666666</color>
-    <color name="divider_color">@color/grey_30</color>
     <color name="highlight_textColor_Warning">#e53935</color>
 
     <!-- Colors -->
@@ -40,11 +39,6 @@
     <color name="actionbar_shadow">#222222</color>
     <color name="grey_200">#EEEEEE</color>
     <color name="grey_400">#BDBDBD</color>
-    <color name="grey_60">#666666</color>
-    <color name="grey_0">#F2F2F2</color>
-    <color name="grey_30">#B2B2B2</color>
-    <color name="grey_70">#4C4C4C</color>
-    <color name="dark_grey">#101010</color>
     <color name="grey_600">#666666</color>
 
     <!-- standard material color definitions -->
@@ -83,6 +77,62 @@
     <color name="bg_fallback_highlight">#616161</color>
     <color name="drawer_active_item_background">#80000000</color>
 
+    <!-- App bar -->
+    <color name="appbar">@android:color/white</color>
+    <color name="fontAppbar">#666666</color>
+    <color name="fontSecondaryAppbar">#A5A5A5</color>
+
+    <!--  NMC Colors  -->
+    <color name="icon_color">#191919</color>
+    <color name="sort_text_color">@color/primary</color>
+    <color name="list_icon_color">#191919</color>
+    <color name="warning_icon_color">#191919</color>
+    <color name="divider_color">@color/grey_30</color>
+    <color name="spinner_bg_color">@android:color/white</color>
+    <color name="refresh_layout_bg_color">#FFFFFF</color>
+    <color name="primary_button_disabled_color">@color/grey_0</color>
+    <color name="toolbar_divider_color">#CCCCCC</color>
+    <color name="et_highlight_color">#77c4ff</color>
+    <color name="white_trans_70">#B3FFFFFF</color>
+    <color name="progress_bar_background">@color/grey_10</color>
+
+    <!-- Grey Colors -->
+    <color name="dark_grey">#101010</color>
+    <color name="grey_0">#F2F2F2</color>
+    <color name="grey_10">#E5E5E5</color>
+    <color name="grey_30">#B2B2B2</color>
+    <color name="grey_60">#666666</color>
+    <color name="grey_70">#4C4C4C</color>
+    <color name="grey_80">#333333</color>
+
+    <!-- Snackbar Colors  -->
+    <color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
+    <color name="snackbar_txt_color">@color/white</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">#FFFFFF</color>
+    <color name="alert_txt_color">#191919</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_0</color>
+    <color name="nav_txt_unselected_color">#191919</color>
+    <color name="nav_txt_selected_color">@color/primary</color>
+    <color name="nav_icon_unselected_color">#191919</color>
+    <color name="nav_icon_selected_color">@color/primary</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/white</color>
+    <color name="drawer_quota_txt_color">#191919</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">#FFFFFF</color>
+    <color name="bottom_sheet_icon_color">#191919</color>
+    <color name="bottom_sheet_txt_color">#191919</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">#FFFFFF</color>
+    <color name="popup_menu_txt_color">#191919</color>
+    <color name="overflow_bg_color">#FFFFFF</color>
+
     <!-- Switch Compat Colors -->
     <color name="switch_thumb_checked_enabled">@color/primary</color>
     <color name="switch_track_checked_enabled">#F399C7</color>
@@ -93,8 +143,33 @@
     <color name="switch_thumb_unchecked_disabled">@color/grey_0</color>
     <color name="switch_track_unchecked_disabled">@color/grey_0</color>
 
-    <!-- App bar -->
-    <color name="appbar">@android:color/white</color>
-    <color name="fontAppbar">#666666</color>
-    <color name="fontSecondaryAppbar">#A5A5A5</color>
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_enabled">@color/primary</color>
+    <color name="checkbox_unchecked_enabled">@color/grey_30</color>
+    <color name="checkbox_checked_disabled">@color/grey_30</color>
+    <color name="checkbox_unchecked_disabled">#CCCCCC</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#191919</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">#191919</color>
+    <color name="share_search_border_color">#191919</color>
+    <color name="share_btn_txt_color">#191919</color>
+    <color name="share_list_item_txt_color">#191919</color>
+    <color name="share_disabled_txt_color">@color/grey_30</color>
+    <color name="share_txt_color">#191919</color>
+    <color name="share_et_divider">#000000</color>
+    <color name="share_warning_txt_color">#191919</color>
+    <color name="sharing_warning_bg_color">#F6E5EB</color>
+    <color name="sharing_warning_border_color">#C16F81</color>
+    <color name="share_color">#0D39DF</color>
+    <color name="shared_with_me_color">#0099ff</color>
+
+    <!--  Scan Colors  -->
+    <color name="scan_doc_bg_color">@color/grey_0</color>
+    <color name="scan_text_color">#191919</color>
+    <color name="scan_edit_bottom_color">@color/grey_0</color>
+    <color name="scan_count_bg_color">@color/grey_30</color>
+    <color name="neptune">#77b6bb</color>
+    <color name="neptune_50">#5077b6bb</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d976f96e19d6..7c23544141a7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -31,4 +31,4 @@
     <dimen name="notification_row_item_height">145dp</dimen>
     <dimen name="button_stroke_width">1dp</dimen>
     <dimen name="txt_size_13sp">13sp</dimen>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74a8ef1358f5..8ea7f30bad3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -995,12 +995,6 @@
     <string name="delete_link">Delete Link</string>
     <string name="share_settings">Settings</string>
     <string name="common_confirm">Confirm</string>
-    <string name="prefs_category_info">Info</string>
-    <string name="prefs_category_data_privacy">Data Privacy</string>
-    <string name="privacy_settings">Privacy Settings</string>
-    <string name="privacy_policy">Privacy Policy</string>
-    <string name="prefs_open_source">Used OpenSource Software</string>
-    <string name="prefs_category_service">Service</string>
     <string name="strict_mode">Strict mode: no HTTP connection allowed!</string>
     <string name="destination_filename">Destination filename</string>
     <string name="suggest">Suggest</string>
@@ -1080,6 +1074,12 @@
     <string name="add_new_secure_file_drop">Add new secure file drop</string>
     <string name="scan_page">Scan page</string>
     <string name="done">Done</string>
+    <string name="prefs_category_info">Info</string>
+    <string name="prefs_category_data_privacy">Data Privacy</string>
+    <string name="privacy_settings">Privacy Settings</string>
+    <string name="privacy_policy">Privacy Policy</string>
+    <string name="prefs_open_source">Used OpenSource Software</string>
+    <string name="prefs_category_service">Service</string>
     <string name="document_scan_pdf_generation_in_progress">Generating PDF…</string>
     <string name="error_starting_doc_scan">Error starting document scan</string>
     <string name="document_scan_pdf_generation_failed">PDF generation failed</string>