diff --git a/opencloudApp/src/androidTest/java/eu/opencloud/android/settings/SettingsFragmentTest.kt b/opencloudApp/src/androidTest/java/eu/opencloud/android/settings/SettingsFragmentTest.kt
index 20407c6947..3d96809dcd 100644
--- a/opencloudApp/src/androidTest/java/eu/opencloud/android/settings/SettingsFragmentTest.kt
+++ b/opencloudApp/src/androidTest/java/eu/opencloud/android/settings/SettingsFragmentTest.kt
@@ -24,7 +24,9 @@ import android.content.ClipboardManager
 import android.content.Context
 import androidx.fragment.app.testing.FragmentScenario
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.preference.ListPreference
 import androidx.preference.Preference
+import androidx.preference.PreferenceManager
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -38,6 +40,7 @@ import eu.opencloud.android.R
 import eu.opencloud.android.presentation.releasenotes.ReleaseNotesActivity
 import eu.opencloud.android.presentation.settings.privacypolicy.PrivacyPolicyActivity
 import eu.opencloud.android.presentation.settings.SettingsFragment
+import eu.opencloud.android.presentation.settings.AppearanceMode
 import eu.opencloud.android.presentation.releasenotes.ReleaseNotesViewModel
 import eu.opencloud.android.presentation.settings.more.SettingsMoreViewModel
 import eu.opencloud.android.presentation.settings.SettingsViewModel
@@ -61,6 +64,7 @@ class SettingsFragmentTest {
     private lateinit var fragmentScenario: FragmentScenario<SettingsFragment>
 
     private var subsectionSecurity: Preference? = null
+    private var prefAppearance: ListPreference? = null
     private var subsectionLogging: Preference? = null
     private var subsectionPictureUploads: Preference? = null
     private var subsectionVideoUploads: Preference? = null
@@ -79,6 +83,7 @@ class SettingsFragmentTest {
     @Before
     fun setUp() {
         context = InstrumentationRegistry.getInstrumentation().targetContext
+        PreferenceManager.getDefaultSharedPreferences(context).edit().remove(AppearanceMode.PREFERENCE_KEY).commit()
         settingsViewModel = mockk(relaxed = true)
         moreViewModel = mockk(relaxed = true)
         releaseNotesViewModel = mockk(relaxed = true)
@@ -134,6 +139,7 @@ class SettingsFragmentTest {
         fragmentScenario = launchFragmentInContainer(themeResId = R.style.Theme_openCloud)
         fragmentScenario.onFragment { fragment ->
             subsectionSecurity = fragment.findPreference(SUBSECTION_SECURITY)
+            prefAppearance = fragment.findPreference(AppearanceMode.PREFERENCE_KEY)
             subsectionLogging = fragment.findPreference(SUBSECTION_LOGGING)
             subsectionPictureUploads = fragment.findPreference(SUBSECTION_PICTURE_UPLOADS)
             subsectionVideoUploads = fragment.findPreference(SUBSECTION_VIDEO_UPLOADS)
@@ -148,6 +154,24 @@ class SettingsFragmentTest {
     fun settingsViewCommon() {
         launchTest(attachedAccount = false)
 
+        assertEquals(
+            listOf(
+                context.getString(R.string.prefs_appearance_system),
+                context.getString(R.string.prefs_appearance_light),
+                context.getString(R.string.prefs_appearance_dark)
+            ),
+            prefAppearance?.entries?.toList()
+        )
+        assertEquals(AppearanceMode.entries.map { it.name }, prefAppearance?.entryValues?.map { it.toString() })
+        assertEquals(AppearanceMode.SYSTEM.name, prefAppearance?.value)
+        prefAppearance?.verifyPreference(
+            keyPref = AppearanceMode.PREFERENCE_KEY,
+            titlePref = context.getString(R.string.prefs_appearance),
+            summaryPref = context.getString(R.string.prefs_appearance_system),
+            visible = true,
+            enabled = true
+        )
+
         subsectionSecurity?.verifyPreference(
             keyPref = SUBSECTION_SECURITY,
             titlePref = context.getString(R.string.prefs_subsection_security),
@@ -195,6 +219,24 @@ class SettingsFragmentTest {
         )
     }
 
+    @Test
+    fun invalidAppearanceModeIsNormalizedToSystem() {
+        PreferenceManager.getDefaultSharedPreferences(context)
+            .edit()
+            .putString(AppearanceMode.PREFERENCE_KEY, "INVALID")
+            .commit()
+
+        launchTest(attachedAccount = false)
+
+        assertEquals(AppearanceMode.SYSTEM.name, prefAppearance?.value)
+        assertEquals(context.getString(R.string.prefs_appearance_system), prefAppearance?.summary)
+        assertEquals(
+            AppearanceMode.SYSTEM.name,
+            PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(AppearanceMode.PREFERENCE_KEY, null)
+        )
+    }
+
     @Test
     fun settingsViewNoAccountAttached() {
         launchTest(attachedAccount = false)
diff --git a/opencloudApp/src/main/java/eu/opencloud/android/MainApp.kt b/opencloudApp/src/main/java/eu/opencloud/android/MainApp.kt
index 1a87639d88..a610a8a7a8 100644
--- a/opencloudApp/src/main/java/eu/opencloud/android/MainApp.kt
+++ b/opencloudApp/src/main/java/eu/opencloud/android/MainApp.kt
@@ -37,6 +37,7 @@ import android.os.Bundle
 import android.view.WindowManager
 import android.widget.CheckBox
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.pm.PackageInfoCompat
 import eu.opencloud.android.data.providers.implementation.OCSharedPreferencesProvider
 
@@ -64,6 +65,7 @@ import eu.opencloud.android.presentation.security.passcode.PassCodeManager
 import eu.opencloud.android.presentation.security.pattern.PatternActivity
 import eu.opencloud.android.presentation.security.pattern.PatternManager
 import eu.opencloud.android.presentation.settings.logging.SettingsLogsFragment.Companion.PREFERENCE_ENABLE_LOGGING
+import eu.opencloud.android.presentation.settings.AppearanceMode
 import eu.opencloud.android.providers.CoroutinesDispatcherProvider
 import eu.opencloud.android.providers.LogsProvider
 import eu.opencloud.android.providers.MdmProvider
@@ -103,6 +105,14 @@ class MainApp : Application() {
 
         appContext = applicationContext
 
+        val appearancePreferences = androidx.preference.PreferenceManager.getDefaultSharedPreferences(appContext)
+        val storedAppearanceMode = appearancePreferences.getString(AppearanceMode.PREFERENCE_KEY, null)
+        val appearanceMode = AppearanceMode.fromPreferenceValue(storedAppearanceMode)
+        if (storedAppearanceMode != appearanceMode.name) {
+            appearancePreferences.edit().putString(AppearanceMode.PREFERENCE_KEY, appearanceMode.name).apply()
+        }
+        AppCompatDelegate.setDefaultNightMode(appearanceMode.nightMode)
+
         // Ensure Logcat shows Timber logs in debug builds
         if (BuildConfig.DEBUG) {
             try {
diff --git a/opencloudApp/src/main/java/eu/opencloud/android/presentation/accounts/ManageAccountsDialogFragment.kt b/opencloudApp/src/main/java/eu/opencloud/android/presentation/accounts/ManageAccountsDialogFragment.kt
index d471b22b20..991a5b04a5 100644
--- a/opencloudApp/src/main/java/eu/opencloud/android/presentation/accounts/ManageAccountsDialogFragment.kt
+++ b/opencloudApp/src/main/java/eu/opencloud/android/presentation/accounts/ManageAccountsDialogFragment.kt
@@ -30,7 +30,6 @@ import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import android.security.KeyChain
-import android.view.ContextThemeWrapper
 import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
@@ -79,7 +78,7 @@ class ManageAccountsDialogFragment : DialogFragment(), ManageAccountsAdapter.Acc
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(ContextThemeWrapper(requireContext(), R.style.Theme_AppCompat_Dialog_Alert))
+        val builder = AlertDialog.Builder(requireContext())
         val inflater = this.layoutInflater
         dialogView = inflater.inflate(R.layout.manage_accounts_dialog, null)
         builder.setView(dialogView)
diff --git a/opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/FileListAdapter.kt b/opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/FileListAdapter.kt
index b7a9b2e5ea..b8c88957c4 100644
--- a/opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/FileListAdapter.kt
+++ b/opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/FileListAdapter.kt
@@ -64,6 +64,24 @@ class FileListAdapter(
     private var fileListOption: FileListOption = FileListOption.ALL_FILES
     private val disallowTouchesWithOtherWindows =
         PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(context)
+    private val colorSurface by lazy {
+        context.obtainStyledAttributes(intArrayOf(R.attr.colorSurface)).run {
+            try {
+                getColor(0, Color.TRANSPARENT)
+            } finally {
+                recycle()
+            }
+        }
+    }
+    private val colorSelection by lazy {
+        context.obtainStyledAttributes(intArrayOf(R.attr.colorSelection)).run {
+            try {
+                getColor(0, Color.TRANSPARENT)
+            } finally {
+                recycle()
+            }
+        }
+    }
 
     init {
         setHasStableIds(true)
@@ -255,17 +273,17 @@ class FileListAdapter(
                     position = adapterPosition
                 )
             }
-            holder.itemView.setBackgroundColor(Color.WHITE)
+            holder.itemView.setBackgroundColor(colorSurface)
 
             val checkBoxV = holder.itemView.findViewById<ImageView>(R.id.custom_checkbox).apply {
                 isVisible = hasActiveSelection
             }
 
             if (isSelected(position)) {
-                holder.itemView.setBackgroundColor(ContextCompat.getColor(context, R.color.selected_item_background))
+                holder.itemView.setBackgroundColor(colorSelection)
                 checkBoxV.setImageResource(R.drawable.ic_checkbox_marked)
             } else {
-                holder.itemView.setBackgroundColor(Color.WHITE)
+                holder.itemView.setBackgroundColor(colorSurface)
                 checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline)
             }
 
diff --git a/opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/AppearanceMode.kt b/opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/AppearanceMode.kt
new file mode 100644
index 0000000000..14cdcb524d
--- /dev/null
+++ b/opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/AppearanceMode.kt
@@ -0,0 +1,33 @@
+/**
+ * openCloud Android client application
+ *
+ * Copyright (C) 2026 openCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package eu.opencloud.android.presentation.settings
+
+import androidx.appcompat.app.AppCompatDelegate
+
+enum class AppearanceMode(val nightMode: Int) {
+    SYSTEM(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM),
+    LIGHT(AppCompatDelegate.MODE_NIGHT_NO),
+    DARK(AppCompatDelegate.MODE_NIGHT_YES);
+
+    companion object {
+        const val PREFERENCE_KEY = "appearance_mode"
+
+        fun fromPreferenceValue(value: String?) = entries.firstOrNull { it.name == value } ?: SYSTEM
+    }
+}
\ No newline at end of file
diff --git a/opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/SettingsFragment.kt b/opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/SettingsFragment.kt
index c5e390fd09..35ea457697 100644
--- a/opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/SettingsFragment.kt
+++ b/opencloudApp/src/main/java/eu/opencloud/android/presentation/settings/SettingsFragment.kt
@@ -27,6 +27,8 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
@@ -47,6 +49,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private val releaseNotesViewModel by viewModel<ReleaseNotesViewModel>()
 
     private var settingsScreen: PreferenceScreen? = null
+    private var prefAppearance: ListPreference? = null
     private var subsectionPictureUploads: Preference? = null
     private var subsectionVideoUploads: Preference? = null
     private var subsectionMore: Preference? = null
@@ -59,6 +62,22 @@ class SettingsFragment : PreferenceFragmentCompat() {
         setPreferencesFromResource(R.xml.settings, rootKey)
 
         settingsScreen = findPreference(SCREEN_SETTINGS)
+        prefAppearance = findPreference<ListPreference>(AppearanceMode.PREFERENCE_KEY)?.apply {
+            entries = arrayOf(
+                getString(R.string.prefs_appearance_system),
+                getString(R.string.prefs_appearance_light),
+                getString(R.string.prefs_appearance_dark)
+            )
+            entryValues = AppearanceMode.entries.map { it.name }.toTypedArray()
+            value = AppearanceMode.fromPreferenceValue(value).name
+            summary = entry
+            setOnPreferenceChangeListener { preference, newValue ->
+                val appearanceMode = AppearanceMode.fromPreferenceValue(newValue as String)
+                preference.summary = entries[findIndexOfValue(appearanceMode.name)]
+                AppCompatDelegate.setDefaultNightMode(appearanceMode.nightMode)
+                true
+            }
+        }
         subsectionPictureUploads = findPreference(SUBSECTION_PICTURE_UPLOADS)
         subsectionVideoUploads = findPreference(SUBSECTION_VIDEO_UPLOADS)
         subsectionMore = findPreference(SUBSECTION_MORE)
diff --git a/opencloudApp/src/main/res/drawable/list_selector.xml b/opencloudApp/src/main/res/drawable/list_selector.xml
index af7ce4b6f4..93fddea71a 100644
--- a/opencloudApp/src/main/res/drawable/list_selector.xml
+++ b/opencloudApp/src/main/res/drawable/list_selector.xml
@@ -20,8 +20,8 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
 
-    <item android:drawable="@color/opencloud_blue_bright" android:state_pressed="true" />
-    <item android:drawable="@color/opencloud_blue_bright" android:state_focused="true" />
-    <item android:drawable="@color/background_color" />
+    <item android:drawable="?attr/colorSelection" android:state_pressed="true" />
+    <item android:drawable="?attr/colorSelection" android:state_focused="true" />
+    <item android:drawable="?android:attr/colorBackground" />
 
 </selector>
diff --git a/opencloudApp/src/main/res/drawable/numberkeyboard_key_bg_pressed.xml b/opencloudApp/src/main/res/drawable/numberkeyboard_key_bg_pressed.xml
index 3c6edc4831..586b386e44 100644
--- a/opencloudApp/src/main/res/drawable/numberkeyboard_key_bg_pressed.xml
+++ b/opencloudApp/src/main/res/drawable/numberkeyboard_key_bg_pressed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/white_pressed" />
+    <solid android:color="?attr/colorSelection" />
 </shape>
diff --git a/opencloudApp/src/main/res/drawable/top_progress_bar_determinate.xml b/opencloudApp/src/main/res/drawable/top_progress_bar_determinate.xml
index 84f79db007..de9bc6237e 100644
--- a/opencloudApp/src/main/res/drawable/top_progress_bar_determinate.xml
+++ b/opencloudApp/src/main/res/drawable/top_progress_bar_determinate.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@android:id/background"
-        android:drawable="@color/background_color" />
+        android:drawable="?attr/colorSurface" />
     <item android:id="@android:id/secondaryProgress">
         <scale
             android:drawable="@color/actionbar_start_color"
diff --git a/opencloudApp/src/main/res/layout/account_action.xml b/opencloudApp/src/main/res/layout/account_action.xml
index 44b285e291..ca352111a8 100644
--- a/opencloudApp/src/main/res/layout/account_action.xml
+++ b/opencloudApp/src/main/res/layout/account_action.xml
@@ -35,7 +35,7 @@
         app:layout_constraintEnd_toStartOf="@+id/name"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/black" />
+        app:tint="?attr/colorOnSurface" />
 
     <TextView
         android:id="@+id/name"
@@ -44,7 +44,7 @@
         android:gravity="center_vertical"
         android:paddingEnd="@dimen/standard_padding"
         android:text="@string/placeholder_filename"
-        android:textColor="@color/black"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="@dimen/two_line_primary_text_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/opencloudApp/src/main/res/layout/account_item.xml b/opencloudApp/src/main/res/layout/account_item.xml
index 2591c18641..f11c1459a9 100644
--- a/opencloudApp/src/main/res/layout/account_item.xml
+++ b/opencloudApp/src/main/res/layout/account_item.xml
@@ -65,7 +65,7 @@
             android:gravity="bottom"
             android:maxLines="1"
             android:text="@string/placeholder_filename"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/account"
@@ -80,7 +80,7 @@
             android:layout_marginStart="8dp"
             android:ellipsize="middle"
             android:text="@string/placeholder_sentence"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp"
             android:lines="1"
             app:layout_constraintEnd_toStartOf="@+id/mtls_account_button"
@@ -103,7 +103,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/clean_account_local_storage_button"
             app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/black" />
+            app:tint="?attr/colorOnSurface" />
 
         <ImageView
             android:id="@+id/clean_account_local_storage_button"
@@ -121,7 +121,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/removeButton"
             app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/black" />
+            app:tint="?attr/colorOnSurface" />
 
         <ImageView
             android:id="@+id/removeButton"
@@ -139,7 +139,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             android:contentDescription="@string/content_description_remove_account"
-            app:tint="@color/black" />
+            app:tint="?attr/colorOnSurface" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -156,7 +156,7 @@
             android:text="@string/used_quota_title_manage_accounts"
             android:layout_marginEnd="@dimen/item_file_grid_margin"
             android:textSize="@dimen/two_line_secondary_text_size"
-            android:textColor="@color/textColor"/>
+            android:textColor="?attr/colorOnSurfaceVariant"/>
 
         <ProgressBar
             android:id="@+id/manage_accounts_quota_bar"
@@ -171,7 +171,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/drawer_loading_quota"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="@dimen/two_line_secondary_text_size" />
     </LinearLayout>
 
diff --git a/opencloudApp/src/main/res/layout/activity_pattern_lock.xml b/opencloudApp/src/main/res/layout/activity_pattern_lock.xml
index ba99a5fc9f..94d4bab0ba 100644
--- a/opencloudApp/src/main/res/layout/activity_pattern_lock.xml
+++ b/opencloudApp/src/main/res/layout/activity_pattern_lock.xml
@@ -32,7 +32,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="@color/background_color"
+        android:background="?android:attr/colorBackground"
         android:paddingHorizontal="@dimen/standard_padding"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/standard_margin"
             android:text="@string/pass_code_enter_pass_code"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -59,6 +59,7 @@
             android:gravity="center"
             android:text="@string/pattern_configure_your_pattern_explanation"
             android:textAppearance="@android:style/TextAppearance.Small"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/opencloudApp/src/main/res/layout/create_shortcut_dialog.xml b/opencloudApp/src/main/res/layout/create_shortcut_dialog.xml
index c633a0251b..c8cda66404 100644
--- a/opencloudApp/src/main/res/layout/create_shortcut_dialog.xml
+++ b/opencloudApp/src/main/res/layout/create_shortcut_dialog.xml
@@ -30,7 +30,7 @@
                     android:layout_marginTop="@dimen/standard_half_padding"
                     android:padding="@dimen/standard_padding"
                     android:text="@string/create_shortcut_dialog_url"
-                    android:textColor="@color/black"
+                    android:textColor="?attr/colorOnSurface"
                     android:gravity="bottom"
                     android:textSize="15sp" />
 
@@ -71,7 +71,7 @@
                     android:layout_marginTop="@dimen/standard_half_padding"
                     android:padding="@dimen/standard_padding"
                     android:text="@string/global_name"
-                    android:textColor="@color/black"
+                    android:textColor="?attr/colorOnSurface"
                     android:gravity="bottom"
                     android:textSize="15sp" />
 
@@ -102,7 +102,7 @@
                             android:layout_alignParentEnd="true"
                             android:layout_centerVertical="true"
                             android:text="@string/create_shortcut_dialog_url_extension"
-                            android:textColor="@color/black"
+                            android:textColor="?attr/colorOnSurface"
                             android:textSize="15sp" />
                     </RelativeLayout>
 
@@ -127,7 +127,7 @@
                 <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/createButton"
                     android:enabled="false"
-                    android:textColor="@color/grey"
+                    android:textColor="?attr/colorOnSurfaceVariant"
                     style="?android:attr/borderlessButtonStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/opencloudApp/src/main/res/layout/dialog_file_already_exists.xml b/opencloudApp/src/main/res/layout/dialog_file_already_exists.xml
index 4f604b3d5b..8e04c0747c 100644
--- a/opencloudApp/src/main/res/layout/dialog_file_already_exists.xml
+++ b/opencloudApp/src/main/res/layout/dialog_file_already_exists.xml
@@ -14,7 +14,7 @@
         android:layout_height="match_parent"
         android:elevation="10dp"
         android:padding="@dimen/activity_horizontal_margin"
-        app:cardBackgroundColor="@color/background_color"
+        app:cardBackgroundColor="?attr/colorSurface"
         app:cardCornerRadius="8dp"
         app:cardElevation="0dp">
 
@@ -38,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginVertical="@dimen/activity_vertical_margin"
-                android:textColor="@color/black"
+                android:textColor="?attr/colorOnSurface"
                 tools:text="@tools:sample/lorem[8]" />
 
             <CheckBox
diff --git a/opencloudApp/src/main/res/layout/edit_share_layout.xml b/opencloudApp/src/main/res/layout/edit_share_layout.xml
index 812fef43b5..2eb7b4eebd 100644
--- a/opencloudApp/src/main/res/layout/edit_share_layout.xml
+++ b/opencloudApp/src/main/res/layout/edit_share_layout.xml
@@ -105,7 +105,7 @@
                 android:gravity="center_vertical"
                 android:paddingStart="0dp"
                 android:paddingEnd="0dp"
-                android:textColor="@color/secondaryTextColor"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 android:textSize="13sp"
                 android:visibility="gone" />
         </LinearLayout>
diff --git a/opencloudApp/src/main/res/layout/file_details_empty.xml b/opencloudApp/src/main/res/layout/file_details_empty.xml
index 46bd088636..ae55a6cedc 100644
--- a/opencloudApp/src/main/res/layout/file_details_empty.xml
+++ b/opencloudApp/src/main/res/layout/file_details_empty.xml
@@ -20,7 +20,7 @@
     android:id="@+id/fileDetailsEmptyLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
+    android:background="?android:attr/colorBackground"
     android:orientation="vertical"
     android:filterTouchesWhenObscured="true">
 
diff --git a/opencloudApp/src/main/res/layout/file_details_fragment.xml b/opencloudApp/src/main/res/layout/file_details_fragment.xml
index ca656fb80a..58aaf2e9f6 100644
--- a/opencloudApp/src/main/res/layout/file_details_fragment.xml
+++ b/opencloudApp/src/main/res/layout/file_details_fragment.xml
@@ -28,14 +28,14 @@
                 android:layout_height="match_parent"
                 android:layout_margin="5dp"
                 android:elevation="10dp"
-                app:cardBackgroundColor="@color/background_color"
+                app:cardBackgroundColor="?attr/colorSurface"
                 app:cardCornerRadius="8dp">
 
                 <ImageView
                     android:id="@+id/fdImageDetailFile"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@color/white"
+                    android:background="?attr/colorSurface"
                     android:contentDescription="@string/filedetails_file_image_content_description"
                     android:scaleType="centerInside"
                     android:src="@drawable/file"
@@ -116,7 +116,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/activity_vertical_margin"
-            app:dividerColor="@color/list_divider_background"
+            app:dividerColor="?attr/colorOutline"
             app:layout_constraintBottom_toTopOf="@id/fdTypeLabel"
             app:layout_constraintStart_toStartOf="@id/fdProgressBar"
             app:layout_constraintTop_toBottomOf="@id/fdProgressBar" />
@@ -173,7 +173,7 @@
             android:id="@+id/divider2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:dividerColor="@color/list_divider_background"
+            app:dividerColor="?attr/colorOutline"
             app:layout_constraintBottom_toTopOf="@id/fdSize"
             app:layout_constraintStart_toStartOf="@id/fdModified"
             app:layout_constraintTop_toBottomOf="@id/fdModified" />
@@ -266,7 +266,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/activity_vertical_margin"
-            app:dividerColor="@color/list_divider_background"
+            app:dividerColor="?attr/colorOutline"
             app:layout_constraintStart_toStartOf="@id/fdLastSync"
             app:layout_constraintTop_toBottomOf="@id/fdLastSync" />
 
diff --git a/opencloudApp/src/main/res/layout/file_options_bottom_sheet_fragment.xml b/opencloudApp/src/main/res/layout/file_options_bottom_sheet_fragment.xml
index 9c05116af0..ff292527f8 100644
--- a/opencloudApp/src/main/res/layout/file_options_bottom_sheet_fragment.xml
+++ b/opencloudApp/src/main/res/layout/file_options_bottom_sheet_fragment.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?attr/colorSurface"
     android:padding="@dimen/standard_padding">
 
     <ImageView
@@ -22,7 +22,7 @@
         android:layout_marginHorizontal="@dimen/standard_half_margin"
         android:ellipsize="end"
         android:maxLines="3"
-        android:textColor="@color/textColor"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="@dimen/two_line_primary_text_size"
         app:layout_constraintEnd_toStartOf="@id/close_bottom_sheet"
         app:layout_constraintStart_toEndOf="@id/thumbnail_bottom_sheet"
@@ -33,7 +33,7 @@
         android:id="@+id/file_size_bottom_sheet"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/list_item_lastmod_and_filesize_text"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:textSize="@dimen/two_line_secondary_text_size"
         app:layout_constraintStart_toStartOf="@+id/file_name_bottom_sheet"
         app:layout_constraintTop_toBottomOf="@+id/file_name_bottom_sheet"
@@ -45,7 +45,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text=","
-        android:textColor="@color/list_item_lastmod_and_filesize_text"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:textSize="@dimen/two_line_secondary_text_size"
         app:layout_constraintStart_toEndOf="@+id/file_size_bottom_sheet"
         app:layout_constraintTop_toBottomOf="@+id/file_name_bottom_sheet" />
@@ -55,7 +55,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_quarter_margin"
-        android:textColor="@color/list_item_lastmod_and_filesize_text"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:textSize="@dimen/two_line_secondary_text_size"
         app:layout_constraintEnd_toEndOf="@+id/file_name_bottom_sheet"
         app:layout_constraintStart_toEndOf="@+id/file_separator_bottom_sheet"
@@ -80,7 +80,7 @@
         android:layout_width="0dp"
         android:layout_height="@dimen/bottom_sheet_fragment_divider_height"
         android:layout_marginTop="@dimen/standard_margin"
-        android:background="@color/bottom_sheet_fragment_item_color"
+        android:background="?attr/colorOutline"
         app:layout_constraintBottom_toTopOf="@id/scroll_bottom_sheet"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/opencloudApp/src/main/res/layout/fragment_migration_choice.xml b/opencloudApp/src/main/res/layout/fragment_migration_choice.xml
index 16520abe06..1601202906 100644
--- a/opencloudApp/src/main/res/layout/fragment_migration_choice.xml
+++ b/opencloudApp/src/main/res/layout/fragment_migration_choice.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/login_background_color"
+    android:background="?attr/colorPrimary"
     tools:context=".presentation.migration.MigrationIntroFragment">
 
     <TextView
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_margin"
         android:text="@string/scoped_storage_wizard_title"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constraintBottom_toTopOf="@id/migration_choice_logo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_margin"
         android:gravity="center"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constraintBottom_toTopOf="@id/migration_choice_not_enough_space_warning"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -52,7 +52,7 @@
         android:layout_margin="@dimen/standard_margin"
         android:gravity="center"
         android:text="@string/scoped_storage_wizard_not_enough_space_warning"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/migration_choice_migrate_now_button"
         app:layout_constraintEnd_toEndOf="parent"
@@ -67,7 +67,7 @@
         android:layout_margin="@dimen/standard_margin"
         android:background="@color/action_mode_background"
         android:text="@string/scoped_storage_wizard_migrate_and_clean_button"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/opencloudApp/src/main/res/layout/fragment_migration_completed.xml b/opencloudApp/src/main/res/layout/fragment_migration_completed.xml
index 20d9d3e867..6287f7644b 100644
--- a/opencloudApp/src/main/res/layout/fragment_migration_completed.xml
+++ b/opencloudApp/src/main/res/layout/fragment_migration_completed.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/login_background_color"
+    android:background="?attr/colorPrimary"
     tools:context=".presentation.migration.MigrationCompletedFragment">
 
     <TextView
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_margin"
         android:text="@string/scoped_storage_wizard_title"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constraintBottom_toTopOf="@id/migration_completed_logo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +39,7 @@
         android:layout_margin="@dimen/standard_margin"
         android:gravity="center"
         android:text="@string/scoped_storage_wizard_migration_completed"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constraintBottom_toTopOf="@id/migration_completed_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -52,7 +52,7 @@
         android:layout_margin="@dimen/standard_margin"
         android:background="@color/action_mode_background"
         android:text="@string/scoped_storage_wizard_migration_completed_access_files_button"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/opencloudApp/src/main/res/layout/fragment_migration_intro.xml b/opencloudApp/src/main/res/layout/fragment_migration_intro.xml
index c2de8e4832..b37e530a52 100644
--- a/opencloudApp/src/main/res/layout/fragment_migration_intro.xml
+++ b/opencloudApp/src/main/res/layout/fragment_migration_intro.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/login_background_color"
+    android:background="?attr/colorPrimary"
     tools:context=".presentation.migration.MigrationIntroFragment">
 
     <TextView
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_margin"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         android:text="@string/scoped_storage_wizard_title"
         app:layout_constraintBottom_toTopOf="@id/migration_info_logo"
         app:layout_constraintEnd_toEndOf="parent"
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_margin"
         android:gravity="center"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         android:text="@string/scoped_storage_wizard_intro"
         app:layout_constraintBottom_toTopOf="@id/migration_info_button"
         app:layout_constraintEnd_toEndOf="parent"
@@ -51,7 +51,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_margin"
         android:background="@color/action_mode_background"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         android:text="@string/scoped_storage_wizard_intro_button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/opencloudApp/src/main/res/layout/fragment_migration_progress.xml b/opencloudApp/src/main/res/layout/fragment_migration_progress.xml
index 26f464e6ba..7a8470433d 100644
--- a/opencloudApp/src/main/res/layout/fragment_migration_progress.xml
+++ b/opencloudApp/src/main/res/layout/fragment_migration_progress.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/login_background_color"
+    android:background="?attr/colorPrimary"
     tools:context=".presentation.migration.MigrationIntroFragment">
 
     <TextView
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_margin"
         android:text="@string/scoped_storage_wizard_title"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constraintBottom_toTopOf="@id/migration_info_logo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +39,7 @@
         android:layout_margin="@dimen/standard_margin"
         android:gravity="center"
         android:text="@string/scoped_storage_wizard_migration_in_progress"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constraintBottom_toTopOf="@id/migration_progress"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -52,7 +52,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/standard_margin"
         android:indeterminate="true"
-        android:progressTint="@color/login_text_color"
+        android:progressTint="?attr/colorOnPrimary"
         app:layout_constraintBottom_toTopOf="@id/migration_progress_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -66,7 +66,7 @@
         android:layout_margin="@dimen/standard_margin"
         android:layout_marginTop="@dimen/standard_margin"
         android:background="@color/action_mode_background"
-        android:textColor="@color/login_text_color"
+        android:textColor="?attr/colorOnPrimary"
         android:enabled="false"
         android:text="@string/scoped_storage_wizard_migration_in_progress_button"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/opencloudApp/src/main/res/layout/grid_item.xml b/opencloudApp/src/main/res/layout/grid_item.xml
index b28a993bdf..4e7a6673c5 100644
--- a/opencloudApp/src/main/res/layout/grid_item.xml
+++ b/opencloudApp/src/main/res/layout/grid_item.xml
@@ -99,7 +99,7 @@
         android:ellipsize="middle"
         android:gravity="center_horizontal"
         android:singleLine="true"
-        android:textColor="@color/textColor"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16dip"
         tools:text="TextView" />
 
diff --git a/opencloudApp/src/main/res/layout/item_empty_dataset.xml b/opencloudApp/src/main/res/layout/item_empty_dataset.xml
index 6204f63d7c..e86ddbc3c5 100644
--- a/opencloudApp/src/main/res/layout/item_empty_dataset.xml
+++ b/opencloudApp/src/main/res/layout/item_empty_dataset.xml
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        app:tint="@color/grey"
+        app:tint="?attr/colorOnSurfaceVariant"
         tools:src="@drawable/ic_folder" />
 
     <TextView
@@ -28,7 +28,7 @@
         android:layout_marginEnd="@dimen/standard_margin"
         android:gravity="center"
         android:padding="@dimen/standard_half_padding"
-        android:textColor="@color/half_black"
+        android:textColor="?attr/colorOnSurface"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/list_empty_dataset_sub_title"
         app:layout_constraintEnd_toEndOf="parent"
@@ -44,7 +44,7 @@
         android:layout_marginStart="@dimen/standard_margin"
         android:layout_marginEnd="@dimen/standard_margin"
         android:gravity="center"
-        android:textColor="@color/grey"
+        android:textColor="?attr/colorOnSurfaceVariant"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/opencloudApp/src/main/res/layout/item_file_list.xml b/opencloudApp/src/main/res/layout/item_file_list.xml
index 73b7e11c02..ea3b177478 100644
--- a/opencloudApp/src/main/res/layout/item_file_list.xml
+++ b/opencloudApp/src/main/res/layout/item_file_list.xml
@@ -5,6 +5,7 @@
     android:id="@+id/file_list_constraint_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/colorSurface"
     android:minHeight="@dimen/item_file_list_min_height">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -58,7 +59,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:singleLine="true"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="@dimen/two_line_primary_text_size"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -84,7 +85,7 @@
                 android:layout_marginEnd="2dp"
                 android:src="@drawable/ic_share_generic"
                 android:visibility="gone"
-                app:tint="@color/list_item_lastmod_and_filesize_text"
+                app:tint="?attr/colorOnSurfaceVariant"
                 tools:visibility="visible" />
 
             <ImageView
@@ -93,7 +94,7 @@
                 android:layout_height="15dp"
                 android:src="@drawable/ic_shared_by_link"
                 android:visibility="gone"
-                app:tint="@color/list_item_lastmod_and_filesize_text"
+                app:tint="?attr/colorOnSurfaceVariant"
                 tools:visibility="visible" />
 
         </LinearLayout>
@@ -102,7 +103,7 @@
             android:id="@+id/file_list_size"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/list_item_lastmod_and_filesize_text"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="@dimen/two_line_secondary_text_size"
             app:layout_constraintStart_toEndOf="@+id/share_icons_layout"
             app:layout_constraintTop_toBottomOf="@+id/Filename"
@@ -114,7 +115,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text=","
-            android:textColor="@color/list_item_lastmod_and_filesize_text"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="@dimen/two_line_secondary_text_size"
             app:layout_constraintStart_toEndOf="@+id/file_list_size"
             app:layout_constraintTop_toBottomOf="@+id/Filename" />
@@ -124,7 +125,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/standard_quarter_margin"
-            android:textColor="@color/list_item_lastmod_and_filesize_text"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="@dimen/two_line_secondary_text_size"
             app:layout_constraintStart_toEndOf="@+id/file_list_separator"
             app:layout_constraintTop_toBottomOf="@id/Filename"
diff --git a/opencloudApp/src/main/res/layout/list_footer.xml b/opencloudApp/src/main/res/layout/list_footer.xml
index d5a9a86926..ffa963eb2f 100644
--- a/opencloudApp/src/main/res/layout/list_footer.xml
+++ b/opencloudApp/src/main/res/layout/list_footer.xml
@@ -15,7 +15,7 @@
         android:padding="@dimen/standard_padding"
         android:layout_gravity="center"
         android:gravity="center"
-        android:textColor="@color/list_item_lastmod_and_filesize_text"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:layout_marginBottom="56dp"
         />
 
diff --git a/opencloudApp/src/main/res/layout/log_list_item.xml b/opencloudApp/src/main/res/layout/log_list_item.xml
index 6fa92026b5..d59ee81c27 100644
--- a/opencloudApp/src/main/res/layout/log_list_item.xml
+++ b/opencloudApp/src/main/res/layout/log_list_item.xml
@@ -66,7 +66,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:singleLine="true"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="@dimen/two_line_primary_text_size"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -77,7 +77,7 @@
             android:id="@+id/textView_subtitle_activity_logs_list"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:textColor="@color/list_item_lastmod_and_filesize_text"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="@dimen/two_line_secondary_text_size"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintStart_toStartOf="@id/textView_title_activity_logs_list"
diff --git a/opencloudApp/src/main/res/layout/main_file_list_fragment.xml b/opencloudApp/src/main/res/layout/main_file_list_fragment.xml
index de6c1c3603..5e2e71bf77 100644
--- a/opencloudApp/src/main/res/layout/main_file_list_fragment.xml
+++ b/opencloudApp/src/main/res/layout/main_file_list_fragment.xml
@@ -83,14 +83,14 @@
                     android:layout_marginTop="@dimen/standard_quarter_margin"
                     android:text="@string/fab_refresh_text"
                     android:textAllCaps="false"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/colorOnPrimary"
                     android:theme="@style/Theme.MaterialComponents.Bridge"
                     android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:icon="@drawable/ic_action_refresh"
-                    app:iconTint="@color/white"
+                    app:iconTint="?attr/colorOnPrimary"
                     app:backgroundTint="@color/primary_button_background_color"/>
 
                 <include
@@ -137,7 +137,7 @@
         android:visibility="visible"
         fab:fab_addButtonColorNormal="@color/primary_button_background_color"
         fab:fab_addButtonColorPressed="@color/opencloud_petrol"
-        fab:fab_addButtonPlusIconColor="@color/white"
+        fab:fab_addButtonPlusIconColor="?attr/colorOnPrimary"
         fab:fab_labelStyle="@style/menu_labels_style"
         fab:layout_dodgeInsetEdges="bottom">
 
diff --git a/opencloudApp/src/main/res/layout/manage_accounts_dialog.xml b/opencloudApp/src/main/res/layout/manage_accounts_dialog.xml
index 84264206b5..88e47ee384 100644
--- a/opencloudApp/src/main/res/layout/manage_accounts_dialog.xml
+++ b/opencloudApp/src/main/res/layout/manage_accounts_dialog.xml
@@ -33,7 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:padding="@dimen/activity_horizontal_margin"
-            app:cardBackgroundColor="@color/background_color"
+            app:cardBackgroundColor="?attr/colorSurface"
             app:cardCornerRadius="@dimen/standard_margin"
             app:cardElevation="0dp"
             app:cardUseCompatPadding="true">
@@ -59,7 +59,7 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:tint="@color/white" />
+                        app:tint="?attr/colorOnPrimary" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -68,7 +68,7 @@
                         android:gravity="center"
                         android:maxLines="1"
                         android:text="@string/drawer_manage_accounts"
-                        android:textColor="@color/white"
+                        android:textColor="?attr/colorOnPrimary"
                         android:textSize="18sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/opencloudApp/src/main/res/layout/nav_coordinator_layout.xml b/opencloudApp/src/main/res/layout/nav_coordinator_layout.xml
index b47c9632da..e1cc445d0b 100644
--- a/opencloudApp/src/main/res/layout/nav_coordinator_layout.xml
+++ b/opencloudApp/src/main/res/layout/nav_coordinator_layout.xml
@@ -48,8 +48,8 @@
         android:layout_gravity="bottom"
         android:background="@color/actionbar_start_color"
         android:visibility="visible"
-        app:itemIconTint="@color/primary_button_text_color"
-        app:itemTextColor="@color/primary_button_text_color"
+        app:itemIconTint="?attr/colorOnPrimary"
+        app:itemTextColor="?attr/colorOnPrimary"
         app:labelVisibilityMode="labeled"
         app:layout_constraintBottom_toTopOf="@id/bottom_nav_view_spacer"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/opencloudApp/src/main/res/layout/nav_drawer_content.xml b/opencloudApp/src/main/res/layout/nav_drawer_content.xml
index 151b465a60..8617f4a849 100644
--- a/opencloudApp/src/main/res/layout/nav_drawer_content.xml
+++ b/opencloudApp/src/main/res/layout/nav_drawer_content.xml
@@ -23,6 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
+        android:background="?attr/colorSurface"
         android:fitsSystemWindows="true">
 
         <androidx.core.widget.NestedScrollView
@@ -36,6 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="start"
+                android:background="?attr/colorSurface"
                 android:fitsSystemWindows="true"
                 app:headerLayout="@layout/nav_drawer_header"
                 app:menu="@menu/drawer_menu">
diff --git a/opencloudApp/src/main/res/layout/nav_drawer_footer.xml b/opencloudApp/src/main/res/layout/nav_drawer_footer.xml
index 43a158ae50..6deb025c63 100644
--- a/opencloudApp/src/main/res/layout/nav_drawer_footer.xml
+++ b/opencloudApp/src/main/res/layout/nav_drawer_footer.xml
@@ -52,7 +52,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_half_margin"
         android:singleLine="true"
-        android:textColor="@color/textColor"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="16sp"
         android:textStyle="bold"
         android:ellipsize="end"
@@ -81,7 +81,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/drawer_loading_quota"
-        android:textColor="@color/list_item_lastmod_and_filesize_text"
+        android:textColor="?attr/colorOnSurfaceVariant"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/account_quota_bar" />
@@ -90,7 +90,7 @@
         android:id="@+id/account_quota_status_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColor="@color/list_item_lastmod_and_filesize_text"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/opencloudApp/src/main/res/layout/nav_drawer_header.xml b/opencloudApp/src/main/res/layout/nav_drawer_header.xml
index bb84e64cd1..cd98023fbb 100644
--- a/opencloudApp/src/main/res/layout/nav_drawer_header.xml
+++ b/opencloudApp/src/main/res/layout/nav_drawer_header.xml
@@ -53,7 +53,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@android:color/white"
+            android:textColor="?attr/colorOnPrimary"
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/drawer_username_full"
@@ -67,7 +67,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@android:color/white"
+            android:textColor="?attr/colorOnPrimary"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/drawer_username"
diff --git a/opencloudApp/src/main/res/layout/nav_main_container.xml b/opencloudApp/src/main/res/layout/nav_main_container.xml
index 55788fa809..99dc1c1101 100644
--- a/opencloudApp/src/main/res/layout/nav_main_container.xml
+++ b/opencloudApp/src/main/res/layout/nav_main_container.xml
@@ -19,7 +19,7 @@
     android:id="@+id/list_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color" >
+    android:background="?android:attr/colorBackground" >
 
     <FrameLayout
         android:id="@+id/left_fragment_container"
diff --git a/opencloudApp/src/main/res/layout/newfile_bottom_sheet_fragment.xml b/opencloudApp/src/main/res/layout/newfile_bottom_sheet_fragment.xml
index c97150d30f..77a31d1151 100644
--- a/opencloudApp/src/main/res/layout/newfile_bottom_sheet_fragment.xml
+++ b/opencloudApp/src/main/res/layout/newfile_bottom_sheet_fragment.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?attr/colorSurface"
     android:padding="@dimen/standard_padding">
 
     <TextView
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_half_margin"
         android:text="@string/pick_document_type"
-        android:textColor="@color/bottom_sheet_fragment_title_color"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="@dimen/two_line_primary_text_size"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
         android:layout_width="0dp"
         android:layout_height="@dimen/bottom_sheet_fragment_divider_height"
         android:layout_marginTop="@dimen/standard_half_margin"
-        android:background="@color/bottom_sheet_fragment_item_color"
+        android:background="?attr/colorOutline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/pick_doc_type_text_view" />
diff --git a/opencloudApp/src/main/res/layout/opencloud_toolbar.xml b/opencloudApp/src/main/res/layout/opencloud_toolbar.xml
index e0b09b443a..92e32093be 100644
--- a/opencloudApp/src/main/res/layout/opencloud_toolbar.xml
+++ b/opencloudApp/src/main/res/layout/opencloud_toolbar.xml
@@ -62,11 +62,11 @@
             android:gravity="center_vertical"
             android:maxLines="1"
             android:paddingHorizontal="@dimen/standard_half_padding"
-            android:textColor="@color/white"
+            android:textColor="?attr/colorOnPrimary"
             android:textSize="@dimen/toolbar_title_text_size"
             android:contentDescription="@string/content_description_search"
             app:drawableEndCompat="@drawable/ic_search"
-            app:drawableTint="@color/white"
+            app:drawableTint="?attr/colorOnPrimary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/root_toolbar_avatar"
             app:layout_constraintStart_toEndOf="@id/root_toolbar_left_icon"
diff --git a/opencloudApp/src/main/res/layout/passcodelock.xml b/opencloudApp/src/main/res/layout/passcodelock.xml
index 85328fad0f..8f5f3c7d71 100644
--- a/opencloudApp/src/main/res/layout/passcodelock.xml
+++ b/opencloudApp/src/main/res/layout/passcodelock.xml
@@ -37,7 +37,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="@color/background_color"
+        android:background="?android:attr/colorBackground"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/pass_code_enter_pass_code"
-                android:textColor="@android:color/black"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toTopOf="@id/explanation"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -73,6 +73,7 @@
                 android:gravity="center"
                 android:text="@string/pass_code_configure_your_pass_code_explanation"
                 android:textAppearance="@android:style/TextAppearance.Small"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -113,7 +114,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/passcode_standard_margin"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16sp"
             android:visibility="invisible"
             app:layout_constraintBottom_toTopOf="@id/numberKeyboard"
diff --git a/opencloudApp/src/main/res/layout/rate_me_dialog.xml b/opencloudApp/src/main/res/layout/rate_me_dialog.xml
index 6bd50f1500..22130f92d9 100644
--- a/opencloudApp/src/main/res/layout/rate_me_dialog.xml
+++ b/opencloudApp/src/main/res/layout/rate_me_dialog.xml
@@ -67,7 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="@color/color_accent"
-            android:textColor="@color/white"
+            android:textColor="?attr/colorOnPrimary"
             android:textSize="12sp"
             android:text="@string/button_no_thanks_name" />
 
@@ -79,7 +79,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:background="@color/color_accent"
-            android:textColor="@color/white"
+            android:textColor="?attr/colorOnPrimary"
             android:textSize="12sp"
             android:text="@string/button_later_name" />
 
@@ -89,7 +89,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="@color/color_accent"
-            android:textColor="@color/white"
+            android:textColor="?attr/colorOnPrimary"
             android:textSize="12sp"
             android:text="@string/button_rate_now_name" />
     </LinearLayout>
diff --git a/opencloudApp/src/main/res/layout/remove_files_dialog.xml b/opencloudApp/src/main/res/layout/remove_files_dialog.xml
index 2eda3dadfb..c462bc525c 100644
--- a/opencloudApp/src/main/res/layout/remove_files_dialog.xml
+++ b/opencloudApp/src/main/res/layout/remove_files_dialog.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="@dimen/activity_horizontal_margin"
-        app:cardBackgroundColor="@color/background_color"
+        app:cardBackgroundColor="?attr/colorSurface"
         app:cardCornerRadius="@dimen/standard_half_margin"
         app:cardElevation="0dp">
 
@@ -41,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:layout_gravity="center_vertical"
-                    android:textColor="@color/black"
+                    android:textColor="?attr/colorOnSurface"
                     android:textSize="@dimen/two_line_primary_text_size"
                     android:layout_marginStart="@dimen/standard_margin"
                     android:layout_marginEnd="@dimen/standard_margin"
diff --git a/opencloudApp/src/main/res/layout/share_file_layout.xml b/opencloudApp/src/main/res/layout/share_file_layout.xml
index 0cf292f7eb..1a495629b9 100644
--- a/opencloudApp/src/main/res/layout/share_file_layout.xml
+++ b/opencloudApp/src/main/res/layout/share_file_layout.xml
@@ -51,7 +51,7 @@
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="@string/placeholder_filename"
-                android:textColor="@color/black"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="16sp" />
 
             <TextView
@@ -63,7 +63,7 @@
                 android:layout_marginStart="4dp"
                 android:layout_toEndOf="@+id/shareFileIcon"
                 android:text="@string/placeholder_filesize"
-                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 android:textSize="12sp" />
 
             <ImageButton
@@ -104,7 +104,7 @@
                     android:paddingStart="@dimen/standard_half_padding"
                     android:text="@string/share_with_user_section_title"
                     android:textAllCaps="true"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/colorOnPrimary"
                     android:textStyle="bold"
                     android:accessibilityHeading="true"/>
 
@@ -159,7 +159,7 @@
                     android:paddingStart="@dimen/standard_half_padding"
                     android:text="@string/share_via_link_section_title"
                     android:textAllCaps="true"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/colorOnPrimary"
                     android:textStyle="bold"
                     android:accessibilityHeading="true"/>
 
diff --git a/opencloudApp/src/main/res/layout/share_public_dialog.xml b/opencloudApp/src/main/res/layout/share_public_dialog.xml
index 084e702add..1c42f81ea9 100644
--- a/opencloudApp/src/main/res/layout/share_public_dialog.xml
+++ b/opencloudApp/src/main/res/layout/share_public_dialog.xml
@@ -36,7 +36,7 @@
                     android:layout_height="wrap_content"
                     android:padding="@dimen/standard_half_padding"
                     android:text="@string/share_via_link_name_label"
-                    android:textColor="@color/black"
+                    android:textColor="?attr/colorOnSurface"
                     android:textSize="15sp" />
 
                 <EditText
@@ -101,7 +101,7 @@
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/share_via_link_password_label"
-                    android:textColor="@color/black"
+                    android:textColor="?attr/colorOnSurface"
                     android:textSize="15sp" />
 
             </RelativeLayout>
@@ -137,7 +137,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/share_via_link_copy_password_button"
                     android:backgroundTint="@color/transparent"
-                    android:textColor="@color/grey"
+                    android:textColor="?attr/colorOnSurfaceVariant"
                     android:enabled="false"
                     style="?android:attr/borderlessButtonStyle" />
 
@@ -292,7 +292,7 @@
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/share_via_link_expiration_date_label"
-                    android:textColor="@color/black"
+                    android:textColor="?attr/colorOnSurface"
                     android:textSize="15sp"
                     android:focusable="false"/>
 
@@ -307,7 +307,7 @@
                     android:paddingLeft="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_half_padding"
                     android:textSize="12sp"
-                    android:textColor="@color/list_item_lastmod_and_filesize_text"
+                    android:textColor="?attr/colorOnSurfaceVariant"
                     android:visibility="gone"
                     android:focusable="false"/>
 
@@ -321,7 +321,7 @@
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/share_via_link_expiration_date_label"
-                    android:textColor="@color/half_black"
+                    android:textColor="?attr/colorOnSurfaceVariant"
                     android:textSize="15sp"
                     android:visibility="gone" />
 
@@ -343,7 +343,7 @@
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_half_padding"
-                    android:textColor="@color/secondaryTextColor"
+                    android:textColor="?attr/colorOnSurfaceVariant"
                     android:textSize="13sp"
                     android:visibility="gone" />
 
diff --git a/opencloudApp/src/main/res/layout/share_public_link_item.xml b/opencloudApp/src/main/res/layout/share_public_link_item.xml
index 179cad1a82..aeb97d613f 100644
--- a/opencloudApp/src/main/res/layout/share_public_link_item.xml
+++ b/opencloudApp/src/main/res/layout/share_public_link_item.xml
@@ -37,7 +37,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="@string/username"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="@dimen/two_line_primary_text_size" />
 
         <ImageButton
diff --git a/opencloudApp/src/main/res/layout/share_user_item.xml b/opencloudApp/src/main/res/layout/share_user_item.xml
index f89b31d88c..4bdfe010ee 100644
--- a/opencloudApp/src/main/res/layout/share_user_item.xml
+++ b/opencloudApp/src/main/res/layout/share_user_item.xml
@@ -46,7 +46,7 @@
             android:layout_marginTop="@dimen/standard_half_margin"
             android:layout_marginBottom="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_half_margin"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurface"
             android:singleLine="true"
             android:ellipsize="middle"
             android:layout_gravity="center_vertical" />
diff --git a/opencloudApp/src/main/res/layout/sort_bottom_sheet_fragment.xml b/opencloudApp/src/main/res/layout/sort_bottom_sheet_fragment.xml
index bf7d407785..fb7850bbd0 100644
--- a/opencloudApp/src/main/res/layout/sort_bottom_sheet_fragment.xml
+++ b/opencloudApp/src/main/res/layout/sort_bottom_sheet_fragment.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?attr/colorSurface"
     android:padding="@dimen/standard_padding">
 
     <TextView
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_half_margin"
         android:text="@string/actionbar_sort_title"
-        android:textColor="@color/bottom_sheet_fragment_title_color"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="@dimen/two_line_primary_text_size"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
         android:layout_width="0dp"
         android:layout_height="@dimen/bottom_sheet_fragment_divider_height"
         android:layout_marginTop="@dimen/standard_half_margin"
-        android:background="@color/bottom_sheet_fragment_item_color"
+        android:background="?attr/colorOutline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title" />
diff --git a/opencloudApp/src/main/res/layout/sort_options_layout.xml b/opencloudApp/src/main/res/layout/sort_options_layout.xml
index 35d66edea3..0c71863f62 100644
--- a/opencloudApp/src/main/res/layout/sort_options_layout.xml
+++ b/opencloudApp/src/main/res/layout/sort_options_layout.xml
@@ -24,7 +24,7 @@
             android:id="@+id/sort_type_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/white"
+            android:textColor="?attr/colorOnPrimary"
             android:textSize="@dimen/two_line_primary_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/sort_type_icon"
@@ -36,7 +36,7 @@
             android:id="@+id/sort_type_icon"
             android:layout_width="@dimen/bottom_sheet_fragment_item_icon_size"
             android:layout_height="@dimen/bottom_sheet_fragment_arrow_icon_size"
-            android:tint="@color/white"
+            android:tint="?attr/colorOnPrimary"
             app:layout_constraintBottom_toBottomOf="@+id/sort_type_title"
             app:layout_constraintStart_toEndOf="@+id/sort_type_title"
             app:layout_constraintTop_toTopOf="@+id/sort_type_title"
@@ -49,7 +49,7 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/standard_half_padding"
         android:src="@drawable/ic_baseline_view_list"
-        android:tint="@color/white"
+        android:tint="?attr/colorOnPrimary"
         android:contentDescription="@string/content_description_type_view"
         app:layout_constraintBottom_toBottomOf="@id/sort_type_selector"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/opencloudApp/src/main/res/layout/space_header.xml b/opencloudApp/src/main/res/layout/space_header.xml
index 0e2784f49c..7206694ee5 100644
--- a/opencloudApp/src/main/res/layout/space_header.xml
+++ b/opencloudApp/src/main/res/layout/space_header.xml
@@ -25,14 +25,14 @@
     android:layout_height="wrap_content"
     android:paddingHorizontal="@dimen/standard_padding"
     android:paddingVertical="@dimen/standard_half_padding"
-    android:background="@color/spaces_card_background_color">
+    android:background="?attr/colorSurface">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/space_header_card"
         android:layout_width="@dimen/spaces_header_card_height"
         android:layout_height="@dimen/spaces_header_card_height"
         android:foreground="?android:attr/selectableItemBackground"
-        app:cardBackgroundColor="@color/spaces_card_background_color"
+        app:cardBackgroundColor="?attr/colorSurface"
         app:cardCornerRadius="10dp"
         app:cardElevation="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -55,7 +55,7 @@
         android:textSize="26sp"
         android:layout_marginHorizontal="@dimen/standard_margin"
         android:layout_marginVertical="@dimen/standard_half_margin"
-        android:textColor="@color/textColor"
+        android:textColor="?attr/colorOnSurface"
         android:textStyle="bold"
         android:maxLines="2"
         android:ellipsize="end"
@@ -72,7 +72,7 @@
         android:textSize="17sp"
         android:layout_marginHorizontal="@dimen/standard_margin"
         android:layout_marginVertical="@dimen/standard_half_margin"
-        android:textColor="@color/textColor"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:maxLines="2"
         android:ellipsize="end"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/opencloudApp/src/main/res/layout/space_path_line.xml b/opencloudApp/src/main/res/layout/space_path_line.xml
index 5bba51456b..ff257cb1fa 100644
--- a/opencloudApp/src/main/res/layout/space_path_line.xml
+++ b/opencloudApp/src/main/res/layout/space_path_line.xml
@@ -13,7 +13,7 @@
         android:layout_marginEnd="2dp"
         android:src="@drawable/ic_spaces"
         android:visibility="gone"
-        app:tint="@color/list_item_lastmod_and_filesize_text"
+        app:tint="?attr/colorOnSurfaceVariant"
         tools:visibility="visible" />
 
     <TextView
@@ -22,7 +22,7 @@
         android:maxWidth="100dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/standard_half_margin"
-        android:textColor="@color/list_item_lastmod_and_filesize_text"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:textStyle="bold"
         android:ellipsize="middle"
         android:singleLine="true"
@@ -35,7 +35,7 @@
         android:id="@+id/path"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/list_item_lastmod_and_filesize_text"
+        android:textColor="?attr/colorOnSurfaceVariant"
         android:ellipsize="middle"
         android:singleLine="true"
         android:textSize="12sp"
diff --git a/opencloudApp/src/main/res/layout/spaces_list_item.xml b/opencloudApp/src/main/res/layout/spaces_list_item.xml
index f178d8014c..0ed0eca85e 100644
--- a/opencloudApp/src/main/res/layout/spaces_list_item.xml
+++ b/opencloudApp/src/main/res/layout/spaces_list_item.xml
@@ -32,7 +32,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:foreground="?android:attr/selectableItemBackground"
-        app:cardBackgroundColor="@color/spaces_card_background_color"
+        app:cardBackgroundColor="?attr/colorSurface"
         app:cardCornerRadius="10dp"
         app:cardElevation="0dp">
 
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/standard_half_margin"
                 android:singleLine="true"
-                android:textColor="@color/textColor"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 tools:text="Name" />
@@ -71,7 +71,7 @@
                 android:layout_marginHorizontal="@dimen/standard_half_margin"
                 android:layout_marginBottom="@dimen/standard_half_margin"
                 android:singleLine="true"
-                android:textColor="@color/textColor"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 android:textSize="15sp"
                 tools:text="Subtitle" />
 
diff --git a/opencloudApp/src/main/res/layout/ssl_untrusted_cert_layout.xml b/opencloudApp/src/main/res/layout/ssl_untrusted_cert_layout.xml
index 67b75a831f..c129f9528e 100644
--- a/opencloudApp/src/main/res/layout/ssl_untrusted_cert_layout.xml
+++ b/opencloudApp/src/main/res/layout/ssl_untrusted_cert_layout.xml
@@ -33,7 +33,7 @@
         android:paddingBottom="@dimen/standard_padding"
         android:text="@string/ssl_validator_header"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@android:color/black"
+        android:textColor="?attr/colorOnSurface"
         />
 
     <TextView
diff --git a/opencloudApp/src/main/res/layout/ssl_validator_layout.xml b/opencloudApp/src/main/res/layout/ssl_validator_layout.xml
index 7c2cabfc6a..91032f5167 100644
--- a/opencloudApp/src/main/res/layout/ssl_validator_layout.xml
+++ b/opencloudApp/src/main/res/layout/ssl_validator_layout.xml
@@ -33,7 +33,7 @@
         android:text="@string/ssl_validator_header"
         android:paddingBottom="@dimen/standard_padding"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/black"
+        android:textColor="?attr/colorOnSurface"
         />
 
     <TextView
diff --git a/opencloudApp/src/main/res/layout/upload_bottom_sheet_fragment.xml b/opencloudApp/src/main/res/layout/upload_bottom_sheet_fragment.xml
index 40d4f6b2a8..927b007e1f 100644
--- a/opencloudApp/src/main/res/layout/upload_bottom_sheet_fragment.xml
+++ b/opencloudApp/src/main/res/layout/upload_bottom_sheet_fragment.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?attr/colorSurface"
     android:padding="@dimen/standard_padding">
 
     <TextView
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_half_margin"
         android:text="@string/upload_to"
-        android:textColor="@color/bottom_sheet_fragment_title_color"
+        android:textColor="?attr/colorOnSurface"
         android:textSize="@dimen/two_line_primary_text_size"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
         android:layout_width="0dp"
         android:layout_height="@dimen/bottom_sheet_fragment_divider_height"
         android:layout_marginTop="@dimen/standard_half_margin"
-        android:background="@color/bottom_sheet_fragment_item_color"
+        android:background="?attr/colorOutline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/upload_to_text_view" />
diff --git a/opencloudApp/src/main/res/layout/upload_list_item.xml b/opencloudApp/src/main/res/layout/upload_list_item.xml
index ae2348c0bb..4567673c0a 100755
--- a/opencloudApp/src/main/res/layout/upload_list_item.xml
+++ b/opencloudApp/src/main/res/layout/upload_list_item.xml
@@ -41,7 +41,7 @@
             android:layout_gravity="center_vertical"
             android:ellipsize="middle"
             android:singleLine="true"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurface"
             tools:text="@string/placeholder_filename"
             android:textSize="16sp" />
 
@@ -54,7 +54,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
-                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 android:ellipsize="middle"
                 android:singleLine="true"
                 tools:text="@string/placeholder_filesize"
@@ -64,7 +64,7 @@
                 android:id="@+id/upload_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 tools:text="@string/placeholder_timestamp"
                 android:textSize="12sp" />
 
@@ -72,7 +72,7 @@
                 android:id="@+id/upload_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 tools:text="@string/uploads_view_upload_status_succeeded"
                 android:textSize="12sp" />
 
@@ -89,7 +89,7 @@
             android:id="@+id/upload_account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/list_item_lastmod_and_filesize_text"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:singleLine="true"
             tools:text="@string/auth_username"
             android:textSize="12sp" />
diff --git a/opencloudApp/src/main/res/layout/uploader_layout.xml b/opencloudApp/src/main/res/layout/uploader_layout.xml
index 8c81f8ca42..96947d1a8a 100644
--- a/opencloudApp/src/main/res/layout/uploader_layout.xml
+++ b/opencloudApp/src/main/res/layout/uploader_layout.xml
@@ -65,7 +65,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
-            android:divider="@color/list_divider_background"
+            android:divider="?attr/colorOutline"
             android:dividerHeight="1dip"
             android:visibility="gone"
             tools:listitem="@layout/uploader_list_item_layout" />
diff --git a/opencloudApp/src/main/res/layout/uploader_list_item_layout.xml b/opencloudApp/src/main/res/layout/uploader_list_item_layout.xml
index 8998d0828a..e3eeeb4f9c 100644
--- a/opencloudApp/src/main/res/layout/uploader_list_item_layout.xml
+++ b/opencloudApp/src/main/res/layout/uploader_list_item_layout.xml
@@ -49,7 +49,7 @@
             android:layout_marginEnd="4dp"
             android:ellipsize="middle"
             android:singleLine="true"
-            android:textColor="@color/textColor"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="16dip" />
 
         <LinearLayout
@@ -64,7 +64,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Size MB"
-                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 android:textSize="@dimen/two_line_secondary_text_size" />
 
             <TextView
@@ -73,7 +73,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:text=", "
-                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 android:textSize="@dimen/two_line_secondary_text_size" />
 
             <TextView
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:text="Mod Date"
-                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textColor="?attr/colorOnSurfaceVariant"
                 android:textSize="@dimen/two_line_secondary_text_size" />
 
         </LinearLayout>
diff --git a/opencloudApp/src/main/res/layout/whats_new_activity.xml b/opencloudApp/src/main/res/layout/whats_new_activity.xml
index 56cf720573..3dd1b25ccb 100644
--- a/opencloudApp/src/main/res/layout/whats_new_activity.xml
+++ b/opencloudApp/src/main/res/layout/whats_new_activity.xml
@@ -37,7 +37,7 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_weight="1"
             android:text="@string/welcome_feature_skip_button"
-            android:textColor="@color/white" />
+            android:textColor="?attr/colorOnPrimary" />
 
         <eu.opencloud.android.wizard.ProgressIndicator
             android:id="@+id/progressIndicator"
diff --git a/opencloudApp/src/main/res/layout/whats_new_element.xml b/opencloudApp/src/main/res/layout/whats_new_element.xml
index b45aa8b94b..4fe9be1990 100644
--- a/opencloudApp/src/main/res/layout/whats_new_element.xml
+++ b/opencloudApp/src/main/res/layout/whats_new_element.xml
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textStyle="bold"
-        android:textColor="@color/white"
+        android:textColor="?attr/colorOnPrimary"
         android:id="@+id/whatsNewTitle"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal" />
@@ -32,5 +32,5 @@
         android:layout_margin="@dimen/standard_margin"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal"
-        android:textColor="@color/white" />
+        android:textColor="?attr/colorOnPrimary" />
 </LinearLayout>
\ No newline at end of file
diff --git a/opencloudApp/src/main/res/values-night/colors.xml b/opencloudApp/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..18db5eb8f2
--- /dev/null
+++ b/opencloudApp/src/main/res/values-night/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- DayNight semantic color tokens -->
+    <color name="theme_color_background">#121212</color>
+    <color name="theme_color_surface">#1E1E1E</color>
+    <color name="theme_color_on_surface">#FFFFFF</color>
+    <color name="theme_color_on_surface_variant">#E0E0E0</color>
+    <color name="theme_color_outline">#A5ABAF</color>
+    <color name="theme_color_on_primary">#FFFFFF</color>
+    <color name="theme_color_selection">#31515D</color>
+</resources>
\ No newline at end of file
diff --git a/opencloudApp/src/main/res/values/attrs.xml b/opencloudApp/src/main/res/values/attrs.xml
index 8d571eb0c3..f46bfb558b 100644
--- a/opencloudApp/src/main/res/values/attrs.xml
+++ b/opencloudApp/src/main/res/values/attrs.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <attr name="colorSelection" format="color" />
+
     <declare-styleable name="ActionEditText">
 
         <attr name="optionOneString" format="string" />
diff --git a/opencloudApp/src/main/res/values/colors.xml b/opencloudApp/src/main/res/values/colors.xml
index 02e687b6dc..6a60acac2b 100644
--- a/opencloudApp/src/main/res/values/colors.xml
+++ b/opencloudApp/src/main/res/values/colors.xml
@@ -24,6 +24,15 @@
     <color name="primary_dark">#19353F</color>
     <color name="color_accent">@color/opencloud_petrol_accent</color>
 
+    <!-- DayNight semantic color tokens -->
+    <color name="theme_color_background">#FFFFFF</color>
+    <color name="theme_color_surface">#FFFFFF</color>
+    <color name="theme_color_on_surface">#000000</color>
+    <color name="theme_color_on_surface_variant">#525757</color>
+    <color name="theme_color_outline">#707575</color>
+    <color name="theme_color_on_primary">#FFFFFF</color>
+    <color name="theme_color_selection">#D6E6EC</color>
+
     <!-- Colors -->
     <color name="opencloud_petrol">#21434F</color>
     <color name="opencloud_petrol_accent">#396676</color>
diff --git a/opencloudApp/src/main/res/values/strings.xml b/opencloudApp/src/main/res/values/strings.xml
index 0a4de8366d..a28f5cf4d8 100644
--- a/opencloudApp/src/main/res/values/strings.xml
+++ b/opencloudApp/src/main/res/values/strings.xml
@@ -39,6 +39,10 @@
     <string name="drawer_feedback">GitHub Discussions</string>
     <string name="drawer_help">Help</string>
     <string name="prefs_category_general">General</string>
+    <string name="prefs_appearance">Appearance</string>
+    <string name="prefs_appearance_system">System default</string>
+    <string name="prefs_appearance_light">Light</string>
+    <string name="prefs_appearance_dark">Dark</string>
     <string name="prefs_subsection_logging">Logging</string>
     <string name="prefs_subsection_more">More</string>
     <string name="prefs_subsection_security">Security</string>
diff --git a/opencloudApp/src/main/res/values/styles.xml b/opencloudApp/src/main/res/values/styles.xml
index cdf9a08a29..53e98ed25d 100644
--- a/opencloudApp/src/main/res/values/styles.xml
+++ b/opencloudApp/src/main/res/values/styles.xml
@@ -25,8 +25,8 @@
     <!-- General openCloud app style.
          To apply directly only on Activities that cannot extend ToolbarActivity;
          otherwise, prefer Theme.openCloud.Toolbar -->
-    <style name="Theme.openCloud" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:windowBackground">@color/background_color</item>
+    <style name="Theme.openCloud" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="android:windowBackground">?android:attr/colorBackground</item>
 
         <!-- theme for the app bar (both for old actionbar and new toolbar) -->
         <item name="actionBarTheme">@style/openCloud.Appbar</item>
@@ -39,6 +39,14 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/actionbar_start_color</item>
         <item name="colorAccent">@color/color_accent</item>
+        <item name="android:colorBackground">@color/theme_color_background</item>
+        <item name="colorSurface">@color/theme_color_surface</item>
+        <item name="colorOnSurface">@color/theme_color_on_surface</item>
+        <item name="colorOnSurfaceVariant">@color/theme_color_on_surface_variant</item>
+        <item name="colorOutline">@color/theme_color_outline</item>
+        <item name="colorOnPrimary">@color/theme_color_on_primary</item>
+        <item name="colorOnBackground">@color/theme_color_on_surface</item>
+        <item name="colorSelection">@color/theme_color_selection</item>
 
         <!-- default theme for alert dialogs -->
         <item name="alertDialogTheme">@style/Theme.openCloud.AlertDialog</item>
@@ -88,9 +96,9 @@
     <!-- DIALOG THEMES: styles for DIALOGs -->
 
     <!-- DEFAULT (via Theme.openCloud), and explicitly used ONCE, in Preference "behaviour" for instant uploads - NO MORE, not needed, it's default -->
-    <style name="Theme.openCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <style name="Theme.openCloud.AlertDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@color/color_accent</item>
-        <item name="android:textColorPrimary">@color/primary</item>
+        <item name="android:textColorPrimary">?attr/colorOnSurface</item>
         <item name="searchViewStyle">@style/openCloud.SearchView</item>
         <item name="buttonBarButtonStyle">@style/Theme.openCloud.Dialog.ButtonBar.Button</item>
         <item name="buttonBarStyle">@style/Theme.openCloud.Dialog.ButtonBar</item>
diff --git a/opencloudApp/src/main/res/xml/settings.xml b/opencloudApp/src/main/res/xml/settings.xml
index 46749074b0..7f7af84e22 100644
--- a/opencloudApp/src/main/res/xml/settings.xml
+++ b/opencloudApp/src/main/res/xml/settings.xml
@@ -18,7 +18,15 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
     app:key="settings_screen">
 
+    <ListPreference
+        app:defaultValue="SYSTEM"
+        app:dialogTitle="@string/prefs_appearance"
+        app:iconSpaceReserved="false"
+        app:key="appearance_mode"
+        app:title="@string/prefs_appearance" />
+
     <Preference
+        app:allowDividerAbove="true"
         app:fragment="eu.opencloud.android.presentation.settings.security.SettingsSecurityFragment"
         app:icon="@drawable/ic_lock_colored"
         app:key="security_subsection"
diff --git a/opencloudApp/src/test/java/eu/opencloud/android/presentation/settings/AppearanceModeTest.kt b/opencloudApp/src/test/java/eu/opencloud/android/presentation/settings/AppearanceModeTest.kt
new file mode 100644
index 0000000000..249c2b9aaf
--- /dev/null
+++ b/opencloudApp/src/test/java/eu/opencloud/android/presentation/settings/AppearanceModeTest.kt
@@ -0,0 +1,47 @@
+/**
+ * openCloud Android client application
+ *
+ * Copyright (C) 2026 openCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package eu.opencloud.android.presentation.settings
+
+import androidx.appcompat.app.AppCompatDelegate
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class AppearanceModeTest {
+
+    @Test
+    fun `maps persisted appearance values to night modes`() {
+        assertEquals(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, AppearanceMode.fromPreferenceValue("SYSTEM").nightMode)
+        assertEquals(AppCompatDelegate.MODE_NIGHT_NO, AppearanceMode.fromPreferenceValue("LIGHT").nightMode)
+        assertEquals(AppCompatDelegate.MODE_NIGHT_YES, AppearanceMode.fromPreferenceValue("DARK").nightMode)
+    }
+
+    @Test
+    fun `uses system mode for missing or invalid persisted appearance values`() {
+        assertEquals(AppearanceMode.SYSTEM, AppearanceMode.fromPreferenceValue(null))
+        assertEquals(AppearanceMode.SYSTEM, AppearanceMode.fromPreferenceValue("INVALID"))
+    }
+
+    @Test
+    fun `uses the mode name as its canonical persisted value`() {
+        assertEquals("SYSTEM", AppearanceMode.fromPreferenceValue(null).name)
+        assertEquals("SYSTEM", AppearanceMode.fromPreferenceValue("INVALID").name)
+        assertEquals("LIGHT", AppearanceMode.fromPreferenceValue("LIGHT").name)
+        assertEquals("DARK", AppearanceMode.fromPreferenceValue("DARK").name)
+    }
+}
\ No newline at end of file