For #24252 - Rename primaryText attribute to textPrimary

2 years ago · f1e7b49425
parent a14c437924
commit f1e7b49425
165 changed files with 340 additions and 337 deletions
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionDetailsBindingDelegate.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionDetailsBindingDelegate.kt
@ -41,7 +41,7 @@ class AddonPermissionDetailsBindingDelegate(
            adapter = AddonPermissionsAdapter(
                sortedPermissions,
                style = AddonPermissionsAdapter.Style(
-                    ThemeManager.resolveAttribute(R.attr.primaryText, context)
+                    ThemeManager.resolveAttribute(R.attr.textPrimary, context)
                )
            )
        }
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@ -184,8 +184,8 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)

    private fun createAddonStyle(context: Context): AddonsManagerAdapter.Style {
        return AddonsManagerAdapter.Style(
-            sectionsTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context),
-            addonNameTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context),
+            sectionsTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
+            addonNameTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
            addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.secondaryText, context),
            sectionsTypeFace = ResourcesCompat.getFont(context, R.font.metropolis_semibold),
            addonAllowPrivateBrowsingLabelDrawableRes = R.drawable.ic_add_on_private_browsing_label
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@ -774,7 +774,7 @@ abstract class BaseBrowserFragment :

        if (binding.swipeRefresh.isEnabled) {
            val primaryTextColor =
-                ThemeManager.resolveAttribute(R.attr.primaryText, context)
+                ThemeManager.resolveAttribute(R.attr.textPrimary, context)
            binding.swipeRefresh.setColorSchemeColors(primaryTextColor)
            swipeRefreshFeature.set(
                feature = SwipeRefreshFeature(
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@ -77,14 +77,14 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                R.drawable.mozac_ic_home
            )!!,
            contentDescription = context.getString(R.string.browser_toolbar_home),
-            iconTintColorResource = ThemeManager.resolveAttribute(R.attr.primaryText, context),
+            iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
            listener = browserToolbarInteractor::onHomeButtonClicked
        )

        browserToolbarView.view.addNavigationAction(homeAction)

        if (resources.getBoolean(R.bool.tablet)) {
-            val enableTint = ThemeManager.resolveAttribute(R.attr.primaryText, context)
+            val enableTint = ThemeManager.resolveAttribute(R.attr.textPrimary, context)
            val disableTint = ThemeManager.resolveAttribute(R.attr.disabled, context)
            val backAction = BrowserToolbar.TwoStateButton(
                primaryImage = AppCompatResources.getDrawable(
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@ -101,7 +101,7 @@ class BrowserToolbarView(

                val primaryTextColor = ContextCompat.getColor(
                    context,
-                    ThemeManager.resolveAttribute(R.attr.primaryText, context)
+                    ThemeManager.resolveAttribute(R.attr.textPrimary, context)
                )
                val secondaryTextColor = ContextCompat.getColor(
                    context,
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@ -306,7 +306,7 @@ open class DefaultToolbarMenu(
            ThemeManager.resolveAttribute(R.attr.syncDisconnected, context) else
            primaryTextColor(),
        textColorResource = if (hasAccountProblem)
-            ThemeManager.resolveAttribute(R.attr.primaryText, context) else
+            ThemeManager.resolveAttribute(R.attr.textPrimary, context) else
            primaryTextColor(),
        highlight = BrowserMenuHighlight.HighPriority(
            endImageResource = R.drawable.ic_sync_disconnected,
@ -399,7 +399,7 @@ open class DefaultToolbarMenu(

    @ColorRes
    @VisibleForTesting
-    internal fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.primaryText, context)
+    internal fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.textPrimary, context)

    @ColorRes
    @VisibleForTesting
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
@ -43,7 +43,7 @@ abstract class ToolbarIntegration(
        sessionId,
        ToolbarFeature.UrlRenderConfiguration(
            context.components.publicSuffixList,
-            ThemeManager.resolveAttribute(R.attr.primaryText, context),
+            ThemeManager.resolveAttribute(R.attr.textPrimary, context),
            renderStyle = renderStyle
        )
    )
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
@ -177,7 +177,7 @@ class CustomTabToolbarMenu(
    )

    @ColorRes
-    private fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.primaryText, context)
+    private fun primaryTextColor() = ThemeManager.resolveAttribute(R.attr.textPrimary, context)

    companion object {
        private const val CAPTION_TEXT_SIZE = 12f
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@ -518,7 +518,7 @@ class HomeFragment : Fragment() {
        binding.menuButton.setColorFilter(
            ContextCompat.getColor(
                requireContext(),
-                ThemeManager.resolveAttribute(R.attr.primaryText, requireContext())
+                ThemeManager.resolveAttribute(R.attr.textPrimary, requireContext())
            )
        )

--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@ -55,7 +55,7 @@ class HomeMenu(
        data class DesktopMode(val checked: Boolean) : Item()
    }

-    private val primaryTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context)
+    private val primaryTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context)
    private val syncDisconnectedColor =
        ThemeManager.resolveAttribute(R.attr.syncDisconnected, context)
    private val syncDisconnectedBackgroundColor =
--- a/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt
@ -40,7 +40,7 @@ abstract class LibraryPageFragment<T> : Fragment() {
        super.onDetach()
        context?.let {
            activity?.findViewById<Toolbar>(R.id.navigationToolbar)?.setToolbarColors(
-                it.getColorFromAttr(R.attr.primaryText),
+                it.getColorFromAttr(R.attr.textPrimary),
                it.getColorFromAttr(R.attr.foundation)
            )
        }
--- a/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt
@ -24,7 +24,7 @@ open class LibraryPageView(
    ) {
        updateToolbar(
            title = title,
-            foregroundColor = context.getColorFromAttr(R.attr.primaryText),
+            foregroundColor = context.getColorFromAttr(R.attr.textPrimary),
            backgroundColor = context.getColorFromAttr(R.attr.foundation)
        )
    }
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
@ -165,7 +165,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
        val actionBar = (activity as NavHostActivity).getSupportActionBarAndInflateIfNecessary()
        val toolbar = activity.findViewById<Toolbar>(R.id.navigationToolbar)
        toolbar?.setToolbarColors(
-            foreground = activity.getColorFromAttr(R.attr.primaryText),
+            foreground = activity.getColorFromAttr(R.attr.textPrimary),
            background = activity.getColorFromAttr(R.attr.foundation)
        )
        actionBar.show()
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt
@ -42,7 +42,7 @@ class HistoryView(
        }

        val primaryTextColor =
-            ThemeManager.resolveAttribute(R.attr.primaryText, context)
+            ThemeManager.resolveAttribute(R.attr.textPrimary, context)
        binding.swipeRefresh.setColorSchemeColors(primaryTextColor)
        binding.swipeRefresh.setOnRefreshListener {
            interactor.onRequestSync()
--- a/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt
@ -55,7 +55,7 @@ class AwesomeBarWrapper @JvmOverloads constructor(
                orientation = orientation,
                colors = AwesomeBarDefaults.colors(
                    background = Color.Transparent,
-                    title = ThemeManager.resolveAttributeColor(R.attr.primaryText),
+                    title = ThemeManager.resolveAttributeColor(R.attr.textPrimary),
                    description = ThemeManager.resolveAttributeColor(R.attr.secondaryText),
                    autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.secondaryText)
                ),
--- a/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt
@ -58,13 +58,13 @@ class ToolbarView(
            edit.hint = context.getString(R.string.history_search_1)

            edit.colors = edit.colors.copy(
-                text = context.getColorFromAttr(R.attr.primaryText),
+                text = context.getColorFromAttr(R.attr.textPrimary),
                hint = context.getColorFromAttr(R.attr.secondaryText),
                suggestionBackground = ContextCompat.getColor(
                    context,
                    R.color.suggestion_highlight_color
                ),
-                clear = context.getColorFromAttr(R.attr.primaryText)
+                clear = context.getColorFromAttr(R.attr.textPrimary)
            )

            edit.setUrlBackground(
--- a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt
@ -71,7 +71,7 @@ class OnboardingRadioButton(

        val spannableTitle = SpannableString(resources.getString(title))
        spannableTitle.setTextSize(context, TITLE_TEXT_SIZE)
-        spannableTitle.setTextColor(context, R.attr.primaryText)
+        spannableTitle.setTextColor(context, R.attr.textPrimary)

        builder.append(spannableTitle)

--- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
@ -711,7 +711,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
            binding.searchEnginesShortcutButton.isVisible = areShortcutsAvailable
            binding.searchEnginesShortcutButton.isChecked = showShortcuts

-            val color = if (showShortcuts) R.attr.contrastText else R.attr.primaryText
+            val color = if (showShortcuts) R.attr.contrastText else R.attr.textPrimary
            binding.searchEnginesShortcutButton.compoundDrawables[0]?.setTint(
                requireContext().getColorFromAttr(color)
            )
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@ -93,7 +93,7 @@ class AwesomeBarView(

    init {
        val components = activity.components
-        val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText)
+        val primaryTextColor = activity.getColorFromAttr(R.attr.textPrimary)

        val engineForSpeculativeConnects = when (activity.browsingModeManager.mode) {
            BrowsingMode.Normal -> components.core.engine
@ -333,7 +333,7 @@ class AwesomeBarView(
    private fun getSuggestionProviderForEngine(engine: SearchEngine): List<AwesomeBar.SuggestionProvider> {
        return searchSuggestionProviderMap.getOrPut(engine) {
            val components = activity.components
-            val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText)
+            val primaryTextColor = activity.getColorFromAttr(R.attr.textPrimary)

            val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {
                colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt
@ -55,7 +55,7 @@ class AwesomeBarWrapper @JvmOverloads constructor(
                orientation = orientation,
                colors = AwesomeBarDefaults.colors(
                    background = Color.Transparent,
-                    title = ThemeManager.resolveAttributeColor(R.attr.primaryText),
+                    title = ThemeManager.resolveAttributeColor(R.attr.textPrimary),
                    description = ThemeManager.resolveAttributeColor(R.attr.secondaryText),
                    autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.secondaryText)
                ),
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt
@ -31,7 +31,7 @@ class ShortcutsSuggestionProvider(
    private val settingsIcon by lazy {
        AppCompatResources.getDrawable(context, R.drawable.mozac_ic_settings)?.apply {
            colorFilter = createBlendModeColorFilterCompat(
-                context.getColorFromAttr(R.attr.primaryText),
+                context.getColorFromAttr(R.attr.textPrimary),
                SRC_IN
            )
        }?.toBitmap()
--- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
@ -85,13 +85,13 @@ class ToolbarView(
            edit.hint = context.getString(R.string.search_hint)

            edit.colors = edit.colors.copy(
-                text = context.getColorFromAttr(R.attr.primaryText),
+                text = context.getColorFromAttr(R.attr.textPrimary),
                hint = context.getColorFromAttr(R.attr.secondaryText),
                suggestionBackground = ContextCompat.getColor(
                    context,
                    R.color.suggestion_highlight_color
                ),
-                clear = context.getColorFromAttr(R.attr.primaryText)
+                clear = context.getColorFromAttr(R.attr.textPrimary)
            )

            edit.setUrlBackground(
--- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
@ -132,7 +132,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
            onPreferenceClickListener = getClickListenerForSyncNow()

            icon = icon.mutate().apply {
-                setTint(context.getColorFromAttr(R.attr.primaryText))
+                setTint(context.getColorFromAttr(R.attr.textPrimary))
            }

            // Current sync state
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt
@ -122,7 +122,7 @@ class CreditCardEditorView(

        if (binding.cardNumberInput.text.toString().validateCreditCardNumber()) {
            binding.cardNumberLayout.error = null
-            binding.cardNumberTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.primaryText))
+            binding.cardNumberTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.textPrimary))
        } else {
            isValid = false

@ -133,7 +133,7 @@ class CreditCardEditorView(

        if (binding.nameOnCardInput.text.toString().isNotBlank()) {
            binding.nameOnCardInput.error = null
-            binding.nameOnCardTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.primaryText))
+            binding.nameOnCardTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.textPrimary))
        } else {
            isValid = false

--- a/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsSortingStrategyMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsSortingStrategyMenu.kt
@ -36,7 +36,7 @@ class SavedLoginsSortingStrategyMenu(
    @VisibleForTesting
    internal fun menuItems(itemToHighlight: Item): List<TextMenuCandidate> {
        val textStyle = TextStyle(
-            color = context.getColorFromAttr(R.attr.primaryText)
+            color = context.getColorFromAttr(R.attr.textPrimary)
        )

        val highlight = HighPriorityHighlightEffect(
--- a/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt
@ -54,7 +54,7 @@ class ClearableEditText @JvmOverloads constructor(
        val textLength = text?.length ?: 0
        val drawable = if (shouldShowClearButton(textLength)) {
            AppCompatResources.getDrawable(context, R.drawable.mozac_ic_clear)?.apply {
-                colorFilter = createBlendModeColorFilterCompat(context.getColorFromAttr(R.attr.primaryText), SRC_IN)
+                colorFilter = createBlendModeColorFilterCompat(context.getColorFromAttr(R.attr.textPrimary), SRC_IN)
            }
        } else {
            null
--- a/app/src/main/res/color/primary_state_list_text_color.xml
+++ b/app/src/main/res/color/primary_state_list_text_color.xml
@ -4,5 +4,5 @@
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false" android:color="?disabled" />
-    <item android:color="?primaryText"/>
+    <item android:color="?attr/textPrimary"/>
 </selector>
--- a/app/src/main/res/color/save_enabled_ic_color.xml
+++ b/app/src/main/res/color/save_enabled_ic_color.xml
@ -3,6 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:color="?primaryText"/>
+    <item android:state_enabled="true" android:color="?attr/textPrimary"/>
    <item android:state_enabled="false" android:color="?disabled" />
 </selector>
--- a/app/src/main/res/color/saved_login_clear_edit_text_tint.xml
+++ b/app/src/main/res/color/saved_login_clear_edit_text_tint.xml
@ -4,7 +4,7 @@
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="true"
-        android:color="?primaryText" />
+        android:color="?attr/textPrimary" />
    <item android:state_enabled="false"
        android:color="?disabled" />
 </selector>
--- a/app/src/main/res/color/state_list_text_color.xml
+++ b/app/src/main/res/color/state_list_text_color.xml
@ -4,5 +4,5 @@
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false" android:color="?disabled" />
-    <item android:color="?primaryText"/>
+    <item android:color="?attr/textPrimary"/>
 </selector>
--- a/app/src/main/res/color/toggle_text_color.xml
+++ b/app/src/main/res/color/toggle_text_color.xml
@ -5,5 +5,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:color="?contrastText" android:state_checked="true" />
    <!-- Default State -->
-    <item android:color="?primaryText" />
+    <item android:color="?attr/textPrimary" />
 </selector>
--- a/app/src/main/res/drawable/ic_account.xml
+++ b/app/src/main/res/drawable/ic_account.xml
@ -8,5 +8,5 @@
    android:viewportHeight="24">
  <path
      android:pathData="m10,20c-5.5228,0 -10,-4.4772 -10,-10s4.4772,-10 10,-10 10,4.4772 10,10c-0.0061,5.5203 -4.4797,9.9939 -10,10zM10,2c-4.4183,0 -8,3.5817 -8,8s3.5817,8 8,8 8,-3.5817 8,-8c-0.005,-4.4162 -3.5838,-7.995 -8,-8zM15.6655,12.2092c-1.4812,-1.7094 -3.5322,0.5908 -5.6658,0.5908 -2.1322,0 -4.1846,-2.3002 -5.6658,-0.5908 -0.42,0.4844 -0.4536,1.19 -0.0938,1.7192 1.2558,1.848 3.3558,3.0716 5.7596,3.0716 2.4038,0 4.5038,-1.2236 5.7596,-3.0716 0.3612,-0.5292 0.3262,-1.2348 -0.0938,-1.7192m-5.6655,-0.7092c2.3474,0 4.25,-1.9026 4.25,-4.25 0,-2.3474 -1.9026,-4.25 -4.25,-4.25 -2.3474,0 -4.25,1.9026 -4.25,4.25 0,2.3474 1.9026,4.25 4.25,4.25"
-      android:fillColor="?primaryText"/>
+      android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_addons_extensions.xml
+++ b/app/src/main/res/drawable/ic_addons_extensions.xml
@ -9,5 +9,5 @@
    android:viewportHeight="24">
    <path
        android:pathData="M17.5,7H15.5V5.127C15.5,3.533 14.317,2.166 12.807,2.015C11.958,1.931 11.116,2.206 10.488,2.775C9.86,3.342 9.5,4.154 9.5,4.999V7H6.5C5.119,7 4,8.119 4,9.5V11.75C4,12.44 4.56,13 5.25,13H6.873C7.706,13 8.417,13.59 8.493,14.343C8.536,14.775 8.402,15.188 8.114,15.506C7.829,15.82 7.424,16 7.001,16H5.25C4.56,16 4,16.56 4,17.25V19.5C4,20.881 5.119,22 6.5,22H17.5C18.881,22 20,20.881 20,19.5V9.5C20,8.119 18.881,7 17.5,7ZM18.5,19.7L17.7,20.5H6.3L5.5,19.7V17.5H7.001C7.847,17.5 8.658,17.14 9.226,16.512C9.794,15.885 10.07,15.039 9.985,14.194C9.834,12.683 8.467,11.5 6.873,11.5H5.5V9.3L6.3,8.5H10C10.552,8.5 11,8.052 11,7.5V4.999C11,4.576 11.18,4.171 11.494,3.887C11.812,3.599 12.227,3.466 12.657,3.507C13.41,3.582 14,4.294 14,5.127V7.5C14,8.052 14.448,8.5 15,8.5H17.7L18.5,9.3V19.7Z"
-        android:fillColor="?primaryText" />
+        android:fillColor="?attr/textPrimary" />
 </vector>
--- a/app/src/main/res/drawable/ic_arrowhead_right.xml
+++ b/app/src/main/res/drawable/ic_arrowhead_right.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M14.289,12 L7.57,5.28a0.75,0.75 0,1 1,1.061 -1.061l7.37,7.37v0.821l-7.37,7.37a0.748,0.748 0,0 1,-1.061 0,0.75 0.75,0 0,1 0,-1.061L14.289,12z" />
 </vector>
--- a/app/src/main/res/drawable/ic_autoplay_disabled.xml
+++ b/app/src/main/res/drawable/ic_autoplay_disabled.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M3.326 4.265A0.83 0.83 0 0 1 3.225 4h-0.36C2.842 4 2.822 4.008 2.8 4.01a0.737 0.737 0 0 0-0.58 0.21 0.75 0.75 0 0 0 0 1.061l1.847 1.847A9.441 9.441 0 0 0 2.7 12c0 5.238 4.262 9.5 9.5 9.5a9.42 9.42 0 0 0 4.879-1.36l1.64 1.64a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.326 4.265zM12.2 20c-4.411 0-8-3.589-8-8 0-1.328 0.352-2.609 0.975-3.764l4.301 4.301v3.026a0.89 0.89 0 0 0 1.333 0.773l1.569-0.897 3.601 3.601A7.918 7.918 0 0 1 12.2 20zM8 4.364L7.636 4H5.14L8 6.86V4.364zM12.2 4c2.137 0 4.146 0.832 5.657 2.343A7.948 7.948 0 0 1 20.2 12a7.964 7.964 0 0 1-1.898 5.162l1.06 1.06A9.45 9.45 0 0 0 21.7 12a9.442 9.442 0 0 0-2.782-6.718A9.442 9.442 0 0 0 12.2 2.5a0.75 0.75 0 0 0 0 1.5z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M17.046 12.773a0.89 0.89 0 0 0 0-1.547L10.81 7.664a0.887 0.887 0 0 0-1.322 0.685l5.564 5.564 1.994-1.14z" />
 </vector>
--- a/app/src/main/res/drawable/ic_autoplay_enabled.xml
+++ b/app/src/main/res/drawable/ic_autoplay_enabled.xml
@ -6,9 +6,9 @@
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M18.918 5.282A9.442 9.442 0 0 0 12.2 2.5a0.75 0.75 0 0 0 0 1.5c2.137 0 4.146 0.832 5.657 2.343A7.948 7.948 0 0 1 20.2 12c0 4.411-3.589 8-8 8s-8-3.589-8-8c0-1.427 0.393-2.806 1.107-4.026l1.61 1.61A0.635 0.635 0 0 0 8 9.135V4.364L7.636 4H2.865a0.635 0.635 0 0 0-0.449 1.083l1.789 1.789A9.472 9.472 0 0 0 2.7 12c0 5.238 4.262 9.5 9.5 9.5s9.5-4.262 9.5-9.5a9.442 9.442 0 0 0-2.782-6.718z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M9.5 15.554V8.446a0.89 0.89 0 0 1 1.33-0.772l6.222 3.554a0.889 0.889 0 0 1 0 1.543l-6.222 3.554a0.888 0.888 0 0 1-1.33-0.771z" />
 </vector>
--- a/app/src/main/res/drawable/ic_back_button.xml
+++ b/app/src/main/res/drawable/ic_back_button.xml
@ -9,6 +9,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M20.25,11.5H5.461L11.431,5.53C11.724,5.237 11.724,4.762 11.431,4.469C11.138,4.176 10.663,4.176 10.37,4.469L3,11.839V12.66L10.37,20.03C10.516,20.176 10.708,20.25 10.9,20.25C11.092,20.25 11.284,20.177 11.43,20.03C11.723,19.737 11.723,19.262 11.43,18.969L5.461,13H20.25C20.664,13 21,12.664 21,12.25C21,11.836 20.664,11.5 20.25,11.5Z" />
 </vector>
--- a/app/src/main/res/drawable/ic_bookmark_filled.xml
+++ b/app/src/main/res/drawable/ic_bookmark_filled.xml
@ -8,7 +8,7 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M6.505 14.215L3.033 11.33a1.465 1.465 0 0 1-0.46-1.59c0.187-0.576 0.7-0.974 1.305-1.013l4.489-0.29 0.609-0.455 1.656-4.161A1.467 1.467 0 0 1 12 2.892c0.606 0 1.143 0.366 1.368 0.927l1.656 4.162 0.608 0.455 4.489 0.29a1.464 1.464 0 0 1 1.305 1.014 1.465 1.465 0 0 1-0.46 1.589L17.5 14.208l-0.218 0.719 1.105 4.34a1.462 1.462 0 0 1-0.562 1.555 1.472 1.472 0 0 1-1.652 0.055l-3.797-2.4h-0.755l-3.796 2.4a1.473 1.473 0 0 1-1.653-0.055 1.462 1.462 0 0 1-0.562-1.554l1.103-4.33-0.208-0.723z"
        android:strokeWidth="1" />
 </vector>
--- a/app/src/main/res/drawable/ic_bookmark_list.xml
+++ b/app/src/main/res/drawable/ic_bookmark_list.xml
@ -11,8 +11,8 @@
        android:viewportHeight="24">
    <path
        android:pathData="m7.225,11.324 l-2.86,-2.375a1.207,1.207 0,0 1,-0.378 -1.309,1.205 1.205,0 0,1 1.074,-0.835l3.697,-0.239 0.501,-0.375 1.364,-3.427A1.209,1.209 0,0 1,11.75 2c0.499,0 0.941,0.3 1.127,0.763v0.001l1.364,3.427 0.501,0.375 3.697,0.239c0.498,0.032 0.92,0.36 1.074,0.835 0.155,0.476 0.006,0.99 -0.378,1.309L16.28,11.32l-0.18,0.592 0.91,3.575c0.123,0.485 -0.059,0.986 -0.463,1.279a1.202,1.202 0,0 1,-1.359 0.046l-3.127,-1.977h-0.621l-3.126,1.977c-0.426,0.266 -0.96,0.247 -1.361,-0.045a1.205,1.205 0,0 1,-0.463 -1.279l0.908,-3.566 -0.173,-0.598z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
    <path
        android:pathData="m5.782,20.5 l-0.8,-0.8v-1.95a0.75,0.75 0,0 0,-1.5 0v1.75a2.5,2.5 0,0 0,2.5 2.5h11.535a2.5,2.5 0,0 0,2.5 -2.5v-1.75a0.75,0.75 0,0 0,-1.5 0v1.95l-0.8,0.8H5.782z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_bookmark_outline.xml
+++ b/app/src/main/res/drawable/ic_bookmark_outline.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M16.6,21.1a2,2 0,0 1,-1.2 -0.3l-3.3,-2H12l-3.3,2c-0.8,0.5 -1.7,0.4 -2.4,0a2,2 0,0 1,-0.8 -2.3l1,-3.8 -0.1,-0.2 -3,-2.5a2,2 0,0 1,-0.7 -2.3,2 2,0 0,1 1.9,-1.5L8.4,8l0.2,-0.2L10,4.2a2.1,2.1 0,0 1,2 -1.3c0.9,0 1.6,0.5 2,1.3l1.4,3.6 0.2,0.2 4,0.2a2,2 0,0 1,1.8 1.5,2 2,0 0,1 -0.7,2.3l-3,2.5v0.2l1,3.8a2,2 0,0 1,-0.9 2.2,2 2,0 0,1 -1.2,0.4zM12,4.4a0.6,0.6 0,0 0,-0.6 0.3l-1.6,4 -0.9,0.8 -4.3,0.2a0.6,0.6 0,0 0,-0.6 0.5,0.6 0.6,0 0,0 0.2,0.6l3.4,2.8 0.3,1L7,19a0.6,0.6 0,0 0,0.2 0.6,0.6 0.6,0 0,0 0.7,0l3.6,-2.3h1.2l3.6,2.3c0.2,0.2 0.5,0.2 0.7,0a0.6,0.6 0,0 0,0.3 -0.6L16,14.7l0.3,-1.1 3.4,-2.8a0.6,0.6 0,0 0,0.2 -0.6,0.6 0.6,0 0,0 -0.6,-0.5l-4.3,-0.2 -1,-0.7 -1.5,-4a0.6,0.6 0,0 0,-0.6 -0.4z" />
 </vector>
--- a/app/src/main/res/drawable/ic_bookmarks_menu.xml
+++ b/app/src/main/res/drawable/ic_bookmarks_menu.xml
@ -9,8 +9,8 @@
    android:viewportHeight="24">
    <path
        android:pathData="m7.225,11.324 l-2.86,-2.375a1.207,1.207 0,0 1,-0.378 -1.309,1.205 1.205,0 0,1 1.074,-0.835l3.697,-0.239 0.501,-0.375 1.364,-3.427A1.209,1.209 0,0 1,11.75 2c0.499,0 0.941,0.3 1.127,0.763v0.001l1.364,3.427 0.501,0.375 3.697,0.239c0.498,0.032 0.92,0.36 1.074,0.835 0.155,0.476 0.006,0.99 -0.378,1.309L16.28,11.32l-0.18,0.592 0.91,3.575c0.123,0.485 -0.059,0.986 -0.463,1.279a1.202,1.202 0,0 1,-1.359 0.046l-3.127,-1.977h-0.621l-3.126,1.977c-0.426,0.266 -0.96,0.247 -1.361,-0.045a1.205,1.205 0,0 1,-0.463 -1.279l0.908,-3.566 -0.173,-0.598z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
    <path
        android:pathData="m5.782,20.5 l-0.8,-0.8v-1.95a0.75,0.75 0,0 0,-1.5 0v1.75a2.5,2.5 0,0 0,2.5 2.5h11.535a2.5,2.5 0,0 0,2.5 -2.5v-1.75a0.75,0.75 0,0 0,-1.5 0v1.95l-0.8,0.8H5.782z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_camera_disabled.xml
+++ b/app/src/main/res/drawable/ic_camera_disabled.xml
@ -9,6 +9,6 @@
    android:viewportHeight="24">
    <path
        android:name="icon"
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M17.28 19.72l-14-14a0.75 0.75 0 1 0-1.061 1.061L3 7.561V17a2.5 2.5 0 0 0 2.5 2.5h9.44l1.28 1.28a0.748 0.748 0 0 0 1.06 0 0.749 0.749 0 0 0 0-1.06zM5.3 18l-0.8-0.8V9.061L13.439 18H5.3zM15.5 6.8v3.025h0.796l2.496-2.497a0.949 0.949 0 0 1 0.689-0.298c0.423 0 1.018 0.312 1.018 1.005v7.929c0 0.693-0.595 1.005-1.018 1.005-0.26 0-0.491-0.1-0.689-0.298l-2.496-2.497H15.5v1.349l1.498 1.498L17 17l0.732 0.732a2.448 2.448 0 0 0 1.75 0.737c1.285 0 2.518-0.998 2.518-2.505V8.036c0-1.507-1.233-2.505-2.518-2.505-0.614 0-1.24 0.228-1.75 0.737L17 7a2.5 2.5 0 0 0-2.5-2.5h-9c-0.396 0-0.766 0.101-1.099 0.265L5.636 6H14.7l0.8 0.8z" />
 </vector>
--- a/app/src/main/res/drawable/ic_camera_enabled.xml
+++ b/app/src/main/res/drawable/ic_camera_enabled.xml
@ -9,6 +9,6 @@
        android:viewportHeight="24">
    <path
        android:name="icon"
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M19.482 5.531c-0.614 0-1.24 0.228-1.75 0.737L17 7a2.5 2.5 0 0 0-2.5-2.5h-9A2.5 2.5 0 0 0 3 7v10a2.5 2.5 0 0 0 2.5 2.5h9A2.5 2.5 0 0 0 17 17l0.732 0.732a2.448 2.448 0 0 0 1.75 0.737c1.285 0 2.518-0.998 2.518-2.505V8.036c0-1.507-1.233-2.505-2.518-2.505zM20.5 15.964c0 0.693-0.595 1.005-1.018 1.005-0.26 0-0.491-0.1-0.689-0.298l-2.496-2.497H15.5V17.2L14.7 18H5.3l-0.8-0.8V6.8L5.3 6h9.4l0.8 0.8v3.025h0.796l2.496-2.497a0.949 0.949 0 0 1 0.689-0.298c0.423 0 1.018 0.312 1.018 1.005v7.929H20.5z" />
 </vector>
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@ -7,6 +7,6 @@
        android:height="24dp"
        android:viewportWidth="24"
        android:viewportHeight="24">
-    <path android:fillColor="?primaryText"
+    <path android:fillColor="?attr/textPrimary"
          android:pathData="M12 14.289L5.28 7.57a0.75 0.75 0 1 0-1.061 1.061l7.37 7.37h0.821l7.37-7.37a0.748 0.748 0 0 0 0-1.061 0.75 0.75 0 0 0-1.061 0L12 14.289z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@ -7,6 +7,6 @@
        android:height="24dp"
        android:viewportWidth="24"
        android:viewportHeight="24">
-    <path android:fillColor="?primaryText"
+    <path android:fillColor="?attr/textPrimary"
          android:pathData="m12,8.711 l-6.72,6.72a0.75,0.75 0,1 1,-1.061 -1.061L11.589,7h0.821l7.37,7.37c0.147,0.146 0.22,0.338 0.22,0.53a0.75,0.75 0,0 1,-1.281 0.53L12,8.711z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M13.108 11.776l4.709-4.709c0.244-0.244 0.244-0.641 0-0.885s-0.64-0.244-0.884 0l-4.689 4.689h-0.488L7.067 6.183c-0.244-0.244-0.64-0.244-0.884 0s-0.244 0.641 0 0.885l4.687 4.686v0.491l-4.687 4.687c-0.244 0.244-0.244 0.641 0 0.885C6.305 17.939 6.465 18 6.625 18c0.16 0 0.32-0.061 0.442-0.183l4.687-4.687h0.491l4.687 4.687C17.055 17.939 17.215 18 17.375 18c0.16 0 0.32-0.061 0.442-0.183 0.244-0.244 0.244-0.641 0-0.885l-4.709-4.709v-0.447z" />
 </vector>
--- a/app/src/main/res/drawable/ic_cookies_disabled.xml
+++ b/app/src/main/res/drawable/ic_cookies_disabled.xml
@ -10,6 +10,6 @@
    android:viewportWidth="16"
    android:viewportHeight="16">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M15.379,8a0.142,0.142 0,0 0,0.02 0,7.978 7.978,0 0,1 -1.858,-0.356 0.981,0.981 0,0 1,-0.054 0.847,1 1,0 1,1 -1.735,-0.994 0.981,0.981 0,0 1,0.481 -0.407c-0.069,-0.036 -0.13,-0.083 -0.2,-0.121l-5.42,5.418a0.977,0.977 0,0 1,-0.4 0.476,0.85 0.85,0 0,1 -0.117,0.04l-2.065,2.066c0.509,0.219 1,0.24 1.161,-0.147 -0.424,1.025 2.823,1.668 2.822,0.558 0,1.11 3.246,0.461 2.821,-0.564 0.425,1.025 3.175,-0.816 2.39,-1.6 0.785,0.784 2.621,-1.97 1.6,-2.394 1.021,0.424 1.664,-2.822 0.554,-2.822zM10.306,13a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1zM14.707,1.293a1,1 0,0 0,-1.414 0L9.679,4.907A7.942,7.942 0,0 1,8 0.61v0.025C8,-0.474 4.753,0.174 5.179,1.2 4.753,0.174 2,2.016 2.788,2.8 2,2.016 0.167,4.77 1.193,5.193 0.167,4.77 -0.476,8.016 0.634,8.015c-1.11,0 -0.461,3.247 0.564,2.821 -0.639,0.265 -0.163,1.428 0.475,2.077l-0.38,0.38a1,1 0,1 0,1.414 1.414l12,-12a1,1 0,0 0,0 -1.414zM5.707,2.993a1,1 0,1 1,-1 1A1,1 0,0 1,5.706 3zM2.524,7.508a1,1 0,1 1,0.37 1.364,1 1,0 0,1 -0.37,-1.364zM7.293,7.293z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_cookies_enabled.xml
+++ b/app/src/main/res/drawable/ic_cookies_enabled.xml
@ -10,6 +10,6 @@
    android:viewportWidth="16"
    android:viewportHeight="16">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M15.379,8a0.142,0.142 0,0 0,0.02 0,7.978 7.978,0 0,1 -1.858,-0.356 0.981,0.981 0,0 1,-0.054 0.847,1 1,0 1,1 -1.735,-0.994 0.981,0.981 0,0 1,0.481 -0.407A8.02,8.02 0,0 1,8 0.61v0.025C8,-0.474 4.753,0.174 5.179,1.2 4.753,0.174 2,2.016 2.788,2.8 2,2.016 0.167,4.77 1.193,5.193 0.167,4.77 -0.476,8.016 0.634,8.015c-1.11,0 -0.461,3.247 0.564,2.821 -1.025,0.426 0.817,3.175 1.6,2.39 -0.784,0.785 1.969,2.621 2.393,1.6 -0.424,1.025 2.823,1.668 2.822,0.558 0,1.11 3.246,0.461 2.821,-0.564 0.425,1.025 3.175,-0.816 2.39,-1.6 0.785,0.784 2.621,-1.97 1.6,-2.394 1.022,0.42 1.665,-2.826 0.555,-2.826zM4.259,8.5a1,1 0,1 1,-0.37 -1.365,1 1,0 0,1 0.37,1.365zM6.214,12.861a1,1 0,1 1,0.36 -1.367,1 1,0 0,1 -0.36,1.369zM5.706,5a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1zM8,9a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1zM10.306,13a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1z" />
 </vector>
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@ -8,7 +8,7 @@
    android:viewportWidth="17"
    android:viewportHeight="20">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:fillType="nonZero"
        android:pathData="M10.69,3A3.313,3.313 0,0 1,14 6.31v10.38A3.313,3.313 0,0 1,10.69 20L3.31,20A3.313,3.313 0,0 1,0 16.69L0,6.31A3.313,3.313 0,0 1,3.31 3h7.38zM10.69,5L3.31,5C2.587,5 2,5.587 2,6.31v10.38c0,0.723 0.587,1.31 1.31,1.31h7.38c0.723,0 1.31,-0.587 1.31,-1.31L12,6.31C12,5.587 11.413,5 10.69,5zM10.995,0A6.003,6.003 0,0 1,17 6v0.016l-0.024,8.987a2,2 0,0 1,-2.005 1.994h-0.002l0.03,-10.986L14.999,6c0,-2.21 -1.793,-4 -4.004,-4L3,2a2,2 0,0 1,2 -2h5.995z" />
 </vector>
--- a/app/src/main/res/drawable/ic_customize.xml
+++ b/app/src/main/res/drawable/ic_customize.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M21.6 3.6c0.4 0.4 0.4 1 0.05 1.343l-8.75 10.035a1 1 0 0 1-0.7 0.4h-0c-0.3 0-0.5-0.1-0.7-0.3l-1.3-1.3a1 1 0 0 1-0.3-0.7 1 1 0 0 1 0.3-0.7l10-8.75a1 1 0 0 1 1.3 0zM7.1 15.5c1 0 2 0.6 2.3 1.6 0.4 1 0 2-0.7 2.7-0 0-0 0-0 0-1.25 1.25-3.5 2-6 1.9-0.3 0-0.625-0.3-0.625-0.625 0-0.2 0.1-0.4 0.3-0.54l 0 0c0 0 0-0 0 0 1.3-0.6 1.7-1.8 2.2-3.2 0-0 0-0 0-0a2.5 2.5 0 0 1 2.4-1.8z" />
 </vector>
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@ -9,8 +9,8 @@
    android:viewportHeight="24">
  <path
      android:pathData="M20.25,6L16,6L16,4.5A2.5,2.5 0,0 0,13.5 2h-3A2.5,2.5 0,0 0,8 4.5L8,6L3.75,6a0.75,0.75 0,0 0,0 1.5L4,7.5v12A2.5,2.5 0,0 0,6.5 22h11a2.5,2.5 0,0 0,2.5 -2.5v-12h0.25a0.75,0.75 0,0 0,0 -1.5zM9.5,4.3l0.8,-0.8h3.4l0.8,0.8L14.5,6h-5L9.5,4.3zM18.5,19.7 L17.7,20.5L6.3,20.5l-0.8,-0.8L5.5,7.5h13v12.2z"
-      android:fillColor="?primaryText"/>
+      android:fillColor="?attr/textPrimary"/>
  <path
      android:pathData="M10.5,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0zM15,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0z"
-      android:fillColor="?primaryText"/>
+      android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_desktop.xml
+++ b/app/src/main/res/drawable/ic_desktop.xml
@ -7,6 +7,6 @@
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
-    <path android:fillColor="?primaryText"
+    <path android:fillColor="?attr/textPrimary"
        android:pathData="M20.5,17h-2a2.5,2.5 0,0 0,2.5 -2.5v-9A2.5,2.5 0,0 0,18.5 3h-13A2.5,2.5 0,0 0,3 5.5v9A2.5,2.5 0,0 0,5.5 17h-2a1.5,1.5 0,0 0,0 3h17a1.5,1.5 0,0 0,0 -3zM5.3,15.5l-0.8,-0.8L4.5,5.3l0.8,-0.8h13.4l0.8,0.8v9.4l-0.8,0.8L5.3,15.5zM13.25,18.5h-2.5a0.75,0.75 0,0 1,0 -1.5h2.5a0.75,0.75 0,0 1,0 1.5z" />
 </vector>
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M5.782 20.5l-0.8-0.8v-1.95a0.75 0.75 0 0 0-1.5 0v1.75a2.5 2.5 0 0 0 2.5 2.5h11.535a2.5 2.5 0 0 0 2.5-2.5v-1.75a0.75 0.75 0 0 0-1.5 0v1.95l-0.8 0.8H5.782z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M18.03 10.059a0.75 0.75 0 0 0-1.061 0l-4.47 4.47V2.75a0.749 0.749 0 1 0-1.499 0v11.779l-4.47-4.47a0.75 0.75 0 1 0-1.061 1.061L11.35 17h0.8l5.88-5.88a0.75 0.75 0 0 0 0-1.061z" />
 </vector>
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@ -8,6 +8,6 @@
        android:height="24dp"
        android:viewportWidth="24"
        android:viewportHeight="24">
-    <path android:fillColor="?primaryText"
+    <path android:fillColor="?attr/textPrimary"
          android:pathData="M20.976 19.308l-0.752-4.055a2.602 2.602 0 0 0-0.719-1.369L8.356 2.735a2.522 2.522 0 0 0-3.559 0L2.735 4.797a2.522 2.522 0 0 0 0 3.559l11.151 11.15c0.375 0.374 0.849 0.622 1.366 0.717l4.056 0.752a1.43 1.43 0 0 0 1.668-1.667zM5.166 8.666L3.642 7.142V6.011l2.369-2.369h1.131l1.524 1.524-3.5 3.5zm10.357 10.082a1.098 1.098 0 0 1-0.577-0.303l-8.72-8.719 3.5-3.5 8.714 8.714c0.161 0.162 0.267 0.363 0.308 0.586l0.625 3.371-0.476 0.476-3.374-0.625z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_file_type_apk.xml
+++ b/app/src/main/res/drawable/ic_file_type_apk.xml
@ -7,6 +7,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M16.9,9.634l1.665,-2.883a0.347,0.347 0,0 0,-0.6 -0.347L16.281,9.323a10.472,10.472 0,0 0,-8.562 0L6.034,6.4a0.347,0.347 0,0 0,-0.6 0.347L7.1,9.634A9.826,9.826 0,0 0,2 17.5L22,17.5A9.826,9.826 0,0 0,16.9 9.634ZM7.4,14.65a0.833,0.833 0,1 1,0.833 -0.833A0.833,0.833 0,0 1,7.4 14.65ZM16.606,14.65a0.833,0.833 0,1 1,0.832 -0.833A0.832,0.832 0,0 1,16.6 14.65Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_file_type_audio_note.xml
+++ b/app/src/main/res/drawable/ic_file_type_audio_note.xml
@ -7,7 +7,7 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M18,3H9A2,2 0,0 0,7 5V15.171a3.077,3.077 0,0 0,-1.95 -0.025A2.927,2.927 0,0 0,3.131 17.1,3.009 3.009,0 0,0 5.98,21 3.139,3.139 0,0 0,9 17.788V7h9v8.171a3.077,3.077 0,0 0,-1.952 -0.024A2.925,2.925 0,0 0,14.131 17.1a3.008,3.008 0,0 0,2.85 3.9A3.139,3.139 0,0 0,20 17.788V5A2,2 0,0 0,18 3Z"
      android:fillType="evenOdd"/>
 </vector>
--- a/app/src/main/res/drawable/ic_file_type_default.xml
+++ b/app/src/main/res/drawable/ic_file_type_default.xml
@ -7,6 +7,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M18,22H6a3,3 0,0 1,-3 -3V5A3,3 0,0 1,6 2H18a3,3 0,0 1,3 3V19A3,3 0,0 1,18 22ZM6,4A1,1 0,0 0,5 5V19a1,1 0,0 0,1 1H18a1,1 0,0 0,1 -1V5a1,1 0,0 0,-1 -1Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_file_type_document.xml
+++ b/app/src/main/res/drawable/ic_file_type_document.xml
@ -7,18 +7,18 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M18,2L6,2A3,3 0,0 0,3 5L3,19a3,3 0,0 0,3 3L18,22a3,3 0,0 0,3 -3L21,5A3,3 0,0 0,18 2ZM19,19a1,1 0,0 1,-1 1L6,20a1,1 0,0 1,-1 -1L5,5A1,1 0,0 1,6 4L18,4a1,1 0,0 1,1 1Z"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M9.5,6L9.5,6A1.5,1.5 0,0 1,11 7.5L11,7.5A1.5,1.5 0,0 1,9.5 9L9.5,9A1.5,1.5 0,0 1,8 7.5L8,7.5A1.5,1.5 0,0 1,9.5 6z"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M15.5,11h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1Z"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M15.5,14h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1Z"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M11.5,17h-3a0.5,0.5 0,0 0,0 1h3a0.5,0.5 0,0 0,0 -1Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_file_type_image.xml
+++ b/app/src/main/res/drawable/ic_file_type_image.xml
@ -7,12 +7,12 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M15.455,9.826a0.573,0.573 0,0 0,-0.912 0L12.275,12.65a0.584,0.584 0,0 1,-0.684 0.188l-2.273,-0.952a0.576,0.576 0,0 0,-0.594 0.09l-2.5,2.087A0.621,0.621 0,0 0,6 14.55V16.5a0.5,0.5 0,0 0,0.5 0.5h11a0.5,0.5 0,0 0,0.5 -0.5V13.225a0.61,0.61 0,0 0,-0.144 -0.4Z"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M8.5,9.25m-1.25,0a1.25,1.25 0,1 1,2.5 0a1.25,1.25 0,1 1,-2.5 0"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M19,3L5,3A3,3 0,0 0,2 6L2,18a3,3 0,0 0,3 3L19,21a3,3 0,0 0,3 -3L22,6A3,3 0,0 0,19 3ZM20,18a1,1 0,0 1,-1 1L5,19a1,1 0,0 1,-1 -1L4,6A1,1 0,0 1,5 5L19,5a1,1 0,0 1,1 1Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_file_type_video.xml
+++ b/app/src/main/res/drawable/ic_file_type_video.xml
@ -7,6 +7,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M18.622,11.134 L6.5,4.135A1,1 0,0 0,5 5V19a1,1 0,0 0,1.5 0.867l12.122,-7A1,1 0,0 0,18.622 11.134Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_file_type_zip.xml
+++ b/app/src/main/res/drawable/ic_file_type_zip.xml
@ -7,15 +7,15 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M12,6h2v2h-2z"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M10,8h2v2h-2z"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M10.5,12a0.5,0.5 0,0 0,-0.5 0.5v5a0.5,0.5 0,0 0,0.5 0.5h3a0.5,0.5 0,0 0,0.5 -0.5V10H12v2ZM13,17H11V15h2Z"/>
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M18,2L6,2A3,3 0,0 0,3 5L3,19a3,3 0,0 0,3 3L18,22a3,3 0,0 0,3 -3L21,5A3,3 0,0 0,18 2ZM19,19a1,1 0,0 1,-1 1L6,20a1,1 0,0 1,-1 -1L5,5A1,1 0,0 1,6 4h4L10,6h2L12,4h6a1,1 0,0 1,1 1Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_folder_icon.xml
+++ b/app/src/main/res/drawable/ic_folder_icon.xml
@ -8,6 +8,6 @@
        android:height="24dp"
        android:viewportWidth="24"
        android:viewportHeight="24">
-    <path android:fillColor="?primaryText"
+    <path android:fillColor="?attr/textPrimary"
          android:pathData="M18.5 6h-6.354l-2.039-2.199A2.503 2.503 0 0 0 8.274 3H4.5A2.502 2.502 0 0 0 2 5.5v12C2 18.879 3.121 20 4.5 20h14c1.379 0 2.5-1.121 2.5-2.5v-9C21 7.121 19.879 6 18.5 6zm1 11.7l-0.8 0.8H4.3l-0.8-0.8V5.3l0.8-0.8h3.974c0.277 0 0.545 0.117 0.733 0.32l2.146 2.315 0.869 0.365H18.7l0.8 0.8v9.4z" />
 </vector>
--- a/app/src/main/res/drawable/ic_folder_new.xml
+++ b/app/src/main/res/drawable/ic_folder_new.xml
@ -8,10 +8,10 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M21 18.5a0.745 0.745 0 0 0 0.53-0.22A0.75 0.75 0 0 0 21 17h-1.7l-0.8-0.8v-1.7a0.75 0.75 0 0 0-1.5 0v1.7L16.2 17h-1.7a0.75 0.75 0 0 0 0 1.5h1.7l0.8 0.8V21a0.75 0.75 0 0 0 1.5 0v-1.7l0.8-0.8H21z" />
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M18.5 6h-6.354l-2.039-2.199A2.503 2.503 0 0 0 8.274 3H4.5A2.502 2.502 0 0 0 2 5.5v12C2 18.879 3.121 20 4.5 20H12a0.75 0.75 0 0 0 0-1.5H4.3l-0.8-0.8V5.3l0.8-0.8h3.974c0.277 0 0.545 0.117 0.733 0.32l2.146 2.315 0.869 0.365H18.7l0.8 0.8v4.2a0.75 0.75 0 0 0 1.5 0v-4C21 7.121 19.879 6 18.5 6z" />

 </vector>
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M11.974 21.5c-5.238 0-9.5-4.262-9.5-9.5s4.262-9.5 9.5-9.5 9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zm0-17.5c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M15.414 14.948a0.748 0.748 0 0 1-0.385-0.106l-3.664-2.198L11 12V7.75a0.75 0.75 0 0 1 1.5 0v3.825l3.3 1.979a0.75 0.75 0 0 1-0.386 1.394z" />
 </vector>
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@ -9,8 +9,8 @@
    android:viewportHeight="24">
    <path
        android:pathData="M11.75,17a0.75,0.75 0,0 1,-0.75 -0.75v-5.5a0.75,0.75 0,0 1,1.5 0v5.5a0.75,0.75 0,0 1,-0.75 0.75zM12.2,7h-0.9l-0.3,0.3v0.9l0.3,0.3h0.9l0.3,-0.3v-0.9l-0.3,-0.3z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
    <path
        android:pathData="M11.75,4c4.411,0 8,3.589 8,8s-3.589,8 -8,8 -8,-3.589 -8,-8 3.589,-8 8,-8zM11.75,2.5a9.5,9.5 0,0 0,-9.5 9.5,9.5 9.5,0 0,0 9.5,9.5 9.5,9.5 0,0 0,9.5 -9.5,9.5 9.5,0 0,0 -9.5,-9.5z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_internet.xml
+++ b/app/src/main/res/drawable/ic_internet.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M12 2.5A9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5zm7.962 8.75h-3.008a11.503 11.503 0 0 0-2.666-6.65h0.742a8.014 8.014 0 0 1 4.932 6.65zm-7.749 8.15h-0.429a9.988 9.988 0 0 1-3.238-6.65h6.908a9.978 9.978 0 0 1-3.241 6.65zm-3.667-8.15a10.007 10.007 0 0 1 3.232-6.65h0.446a10.015 10.015 0 0 1 3.231 6.65H8.546zM8.97 4.6h0.743a11.499 11.499 0 0 0-2.667 6.65H4.038A8.014 8.014 0 0 1 8.97 4.6zm-4.932 8.15h3.008a11.476 11.476 0 0 0 2.67 6.65H8.97a8.014 8.014 0 0 1-4.932-6.65zM15.03 19.4h-0.733a11.465 11.465 0 0 0 2.658-6.65h3.007a8.014 8.014 0 0 1-4.932 6.65z" />
 </vector>
--- a/app/src/main/res/drawable/ic_link_disabled.xml
+++ b/app/src/main/res/drawable/ic_link_disabled.xml
@ -9,12 +9,12 @@
    android:viewportHeight="24">

    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M10.08 15.526l4.324 4.324h1.13l3.815-3.815v-1.13l-4.324-4.324a1.5 1.5 0 0 1 2.12 0l3.123 3.123a2.498 2.498 0 0 1 0 3.533l-3.533 3.533a2.498 2.498 0 0 1-3.533 0l-3.123-3.123a1.5 1.5 0 0 1 0.001-2.121z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M7.791 8.997l6.712 6.712a0.749 0.749 0 1 0 1.06-1.06L8.85 7.937a0.749 0.749 0 1 0-1.059 1.06z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M7.974 13.42L3.65 9.096v-1.13L7.466 4.15h1.13l4.324 4.324a1.5 1.5 0 0 0 0-2.12L9.797 3.232a2.498 2.498 0 0 0-3.533 0L2.732 6.764a2.498 2.498 0 0 0 0 3.533l3.123 3.123a1.497 1.497 0 0 0 2.119 0z" />
 </vector>
--- a/app/src/main/res/drawable/ic_link_enabled.xml
+++ b/app/src/main/res/drawable/ic_link_enabled.xml
@ -8,12 +8,12 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M10.08 15.526l4.324 4.324h1.13l3.815-3.815v-1.13l-4.324-4.324a1.5 1.5 0 0 1 2.12 0l3.123 3.123a2.498 2.498 0 0 1 0 3.533l-3.533 3.533a2.498 2.498 0 0 1-3.533 0l-3.123-3.123a1.5 1.5 0 0 1 0.001-2.121z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M7.791 8.997l6.712 6.712a0.749 0.749 0 1 0 1.06-1.06L8.85 7.937a0.749 0.749 0 1 0-1.059 1.06z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M7.974 13.42L3.65 9.096v-1.13L7.466 4.15h1.13l4.324 4.324a1.5 1.5 0 0 0 0-2.12L9.797 3.232a2.498 2.498 0 0 0-3.533 0L2.732 6.764a2.498 2.498 0 0 0 0 3.533l3.123 3.123a1.497 1.497 0 0 0 2.119 0z" />
 </vector>
--- a/app/src/main/res/drawable/ic_location_disabled.xml
+++ b/app/src/main/res/drawable/ic_location_disabled.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M3.78 5.22a0.75 0.75 0 1 0-1.061 1.061l1.318 1.318a8.367 8.367 0 0 0-0.535 3.105c0.081 3.397 4.401 8.09 6.968 10.585a2.487 2.487 0 0 0 1.806 0.71 2.485 2.485 0 0 0 1.77-0.796 51.854 51.854 0 0 0 1.692-1.905l2.482 2.482a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.78 5.22zm9.171 14.959a0.968 0.968 0 0 1-0.281 0.196h-0.897a0.957 0.957 0 0 1-0.257-0.161c-4.029-3.916-6.464-7.484-6.513-9.545a6.917 6.917 0 0 1 0.219-1.886l9.447 9.447a48.709 48.709 0 0 1-1.718 1.949zM11.833 3.502c3.859-0.092 7.074 2.971 7.166 6.83 0.031 1.298-0.856 3.238-2.473 5.521l1.076 1.076c1.608-2.227 2.944-4.678 2.897-6.633-0.112-4.686-4.016-8.406-8.702-8.294A8.472 8.472 0 0 0 5.6 4.928L6.662 5.99a6.976 6.976 0 0 1 5.171-2.488z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M10.152 9.48a2.245 2.245 0 0 1 1.794-0.978 2.246 2.246 0 0 1 1.327 4.099l1.062 1.062a3.734 3.734 0 0 0 1.413-3.003 3.754 3.754 0 0 0-3.839-3.659 3.728 3.728 0 0 0-2.821 1.415l1.064 1.064z" />
 </vector>
--- a/app/src/main/res/drawable/ic_location_enabled.xml
+++ b/app/src/main/res/drawable/ic_location_enabled.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M12.09 14.5a3.755 3.755 0 0 1-3.839-3.659 3.755 3.755 0 0 1 3.659-3.839 3.755 3.755 0 0 1 3.839 3.659A3.755 3.755 0 0 1 12.09 14.5zm-0.144-5.998a2.252 2.252 0 0 0-2.195 2.303A2.252 2.252 0 0 0 12.054 13a2.252 2.252 0 0 0 2.195-2.303 2.252 2.252 0 0 0-2.303-2.195z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M11.797 2.002C7.111 2.115 3.39 6.018 3.502 10.704c0.081 3.397 4.4 8.09 6.968 10.585a2.487 2.487 0 0 0 1.806 0.71 2.485 2.485 0 0 0 1.77-0.796c2.445-2.615 6.534-7.51 6.453-10.907-0.113-4.685-4.017-8.406-8.702-8.294zm1.154 18.177a0.968 0.968 0 0 1-0.281 0.196h-0.897a0.957 0.957 0 0 1-0.257-0.161c-4.029-3.916-6.464-7.484-6.513-9.545a7.008 7.008 0 0 1 6.83-7.167c3.858-0.092 7.074 2.971 7.166 6.83 0.05 2.062-2.212 5.742-6.048 9.847z" />
 </vector>
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@ -8,6 +8,6 @@
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="?attr/primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M17.5 11H17V7A5 5 0 0 0 7 7v4H6.5A2.5 2.5 0 0 0 4 13.5v6A2.5 2.5 0 0 0 6.5 22h11a2.5 2.5 0 0 0 2.5-2.5v-6a2.5 2.5 0 0 0-2.5-2.5zm-9-4c0-1.93 1.57-3.5 3.5-3.5s3.5 1.57 3.5 3.5v4h-7V7zm10 12.7l-0.8 0.8H6.3l-0.8-0.8v-6.4l0.8-0.8h11.4l0.8 0.8v6.4z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@ -9,5 +9,5 @@
    android:viewportHeight="24">
  <path
      android:pathData="M21.25 11h-9.351A5.01 5.01 0 0 0 7 7c-2.757 0-5 2.243-5 5s2.243 5 5 5c2.586 0 4.694-1.98 4.949-4.5H18.5v2.75a0.75 0.75 0 0 0 1.5 0V12.5h1.25a0.75 0.75 0 0 0 0-1.5zM7 15.5c-1.93 0-3.5-1.57-3.5-3.5S5.07 8.5 7 8.5s3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"
-      android:fillColor="?primaryText" />
+      android:fillColor="?attr/textPrimary" />
 </vector>
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M14,6a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM12,20a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z" />
 </vector>
--- a/app/src/main/res/drawable/ic_microphone_disabled.xml
+++ b/app/src/main/res/drawable/ic_microphone_disabled.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M20.78 19.72L4.28 3.22a0.75 0.75 0 1 0-1.061 1.061l5.787 5.787a2.992 2.992 0 0 0 2.926 2.926l1.312 1.312A4.32 4.32 0 0 1 12 14.5c-2.225 0-4.14-1.658-4.455-3.856a0.742 0.742 0 0 0-0.849-0.636 0.75 0.75 0 0 0-0.636 0.849c0.355 2.478 2.244 4.404 4.608 4.95l0.582 0.485V19.5h-2.5a0.75 0.75 0 0 0 0 1.5h6.5a0.75 0.75 0 0 0 0-1.5h-2.5v-3.227l0.491-0.447a6.09 6.09 0 0 0 1.147-0.377l5.331 5.331a0.748 0.748 0 0 0 1.06 0 0.748 0.748 0 0 0 0.001-1.06zM10.5 6c0-0.827 0.673-1.5 1.5-1.5s1.5 0.673 1.5 1.5v4c0 0.107-0.012 0.211-0.034 0.312l1.142 1.142C14.851 11.022 15 10.531 15 10V6a3 3 0 0 0-3-3 2.993 2.993 0 0 0-2.986 2.859L10.5 7.345V6zm7.439 4.856a0.75 0.75 0 0 0-0.636-0.849 0.745 0.745 0 0 0-0.849 0.636 4.43 4.43 0 0 1-0.763 1.894l1.066 1.066a5.808 5.808 0 0 0 1.182-2.747z" />
 </vector>
--- a/app/src/main/res/drawable/ic_microphone_enabled.xml
+++ b/app/src/main/res/drawable/ic_microphone_enabled.xml
@ -8,9 +8,9 @@
        android:viewportWidth="24"
        android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M12 4.5c0.827 0 1.5 0.673 1.5 1.5v4c0 0.827-0.673 1.5-1.5 1.5s-1.5-0.673-1.5-1.5V6c0-0.827 0.673-1.5 1.5-1.5zM12 3a3 3 0 0 0-3 3v4a3 3 0 1 0 6 0V6a3 3 0 0 0-3-3z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M13.241 15.827c2.406-0.517 4.338-2.46 4.698-4.969a0.75 0.75 0 0 0-0.636-0.849 0.745 0.745 0 0 0-0.849 0.636c-0.315 2.198-2.23 3.856-4.454 3.856-2.224 0-4.139-1.658-4.454-3.856a0.742 0.742 0 0 0-0.849-0.636 0.75 0.75 0 0 0-0.636 0.849c0.355 2.478 2.244 4.403 4.607 4.95l0.582 0.485V19.5h-2.5a0.75 0.75 0 0 0 0 1.5h6.499a0.75 0.75 0 0 0 0-1.5h-2.5v-3.227l0.492-0.446z" />
 </vector>
--- a/app/src/main/res/drawable/ic_multiple_tabs.xml
+++ b/app/src/main/res/drawable/ic_multiple_tabs.xml
@ -9,5 +9,5 @@
    android:viewportHeight="24">
    <path
        android:pathData="M5.5 3A2.5 2.5 0 0 0 3 5.5v8A2.5 2.5 0 0 0 5.5 16h13a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 18.5 3h-13zm14 10.7l-0.8 0.8H5.3l-0.8-0.8V5.3l0.8-0.8h13.4l0.8 0.8v8.4zM5.3 19.5l-0.8-0.8v-0.95a0.75 0.75 0 0 0-1.5 0v0.75A2.5 2.5 0 0 0 5.5 21h13a2.5 2.5 0 0 0 2.5-2.5v-0.75a0.75 0.75 0 0 0-1.5 0v0.95l-0.8 0.8H5.3z"
-        android:fillColor="?primaryText" />
+        android:fillColor="?attr/textPrimary" />
 </vector>
--- a/app/src/main/res/drawable/ic_new.xml
+++ b/app/src/main/res/drawable/ic_new.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M19.25 12.75c0.207 0 0.395-0.084 0.53-0.22C19.916 12.394 20 12.207 20 12c0-0.414-0.336-0.75-0.75-0.75h-5.7l-0.8-0.8v-5.7C12.75 4.336 12.414 4 12 4s-0.75 0.336-0.75 0.75v5.7l-0.8 0.8h-5.7C4.336 11.25 4 11.586 4 12s0.336 0.75 0.75 0.75h5.7l0.8 0.8v5.7c0 0.414 0.336 0.75 0.75 0.75 0.207 0 0.395-0.084 0.53-0.22 0.136-0.136 0.22-0.323 0.22-0.53v-5.7l0.8-0.8h5.7z" />
 </vector>
--- a/app/src/main/res/drawable/ic_notifications_disabled.xml
+++ b/app/src/main/res/drawable/ic_notifications_disabled.xml
@ -9,8 +9,8 @@
        android:viewportHeight="24">
    <path
        android:pathData="M11.732,8.5h4.518a0.75,0.75 0,0 0,0 -1.5h-6.018l1.5,1.5zM3.28,2.22a0.75,0.75 0,1 0,-1.061 1.061L3.3,4.361c-0.18,0.343 -0.3,0.723 -0.3,1.139v9A2.5,2.5 0,0 0,5.5 17h5.036l5,4h1.607v-2.797l2.577,2.577a0.748,0.748 0,0 0,1.06 0,0.75 0.75,0 0,0 0,-1.061L3.28,2.22zM15.643,19.165 L11.063,15.501L5.301,15.501l-0.8,-0.8v-9.14L9.939,11L7.75,11a0.75,0.75 0,0 0,0 1.5h3.689l4.203,4.203v2.462h0.001z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
    <path
        android:pathData="M18.5,3H6.232l1.5,1.5H18.7l0.8,0.8v9.4l-0.784,0.784 1.122,1.122A2.494,2.494 0,0 0,21 14.5v-9A2.5,2.5 0,0 0,18.5 3z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_notifications_enabled.xml
+++ b/app/src/main/res/drawable/ic_notifications_enabled.xml
@ -8,9 +8,9 @@
        android:viewportWidth="24"
        android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M21 5.5A2.5 2.5 0 0 0 18.5 3h-13A2.5 2.5 0 0 0 3 5.5v9A2.5 2.5 0 0 0 5.5 17h5.036l5 4h1.607v-4H18.5a2.5 2.5 0 0 0 2.5-2.5v-9zM4.5 5.3l0.8-0.8h13.4l0.8 0.8v9.4l-0.8 0.8h-2.307a0.75 0.75 0 0 0-0.75 0.75v2.915l-4.17-3.336a1.498 1.498 0 0 0-0.937-0.329H5.3l-0.8-0.8" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M13.25 12.5h-5.5a0.75 0.75 0 0 1 0-1.5h5.5a0.75 0.75 0 0 1 0 1.5zm3-4h-8.5a0.75 0.75 0 0 1 0-1.5h8.5a0.75 0.75 0 0 1 0 1.5z" />
 </vector>
--- a/app/src/main/res/drawable/ic_open_in_app.xml
+++ b/app/src/main/res/drawable/ic_open_in_app.xml
@ -9,5 +9,5 @@
    android:viewportHeight="24">
    <path
        android:pathData="M5.5 16C6.88 16 8 17.12 8 18.5S6.88 21 5.5 21 3 19.88 3 18.5 4.12 16 5.5 16zm13 0c1.38 0 2.5 1.12 2.5 2.5S19.88 21 18.5 21 16 19.88 16 18.5s1.12-2.5 2.5-2.5zM12 16c1.38 0 2.5 1.12 2.5 2.5S13.38 21 12 21s-2.5-1.12-2.5-2.5S10.62 16 12 16zM5.5 9.5C6.88 9.5 8 10.62 8 12s-1.12 2.5-2.5 2.5S3 13.38 3 12s1.12-2.5 2.5-2.5zm13 0c1.38 0 2.5 1.12 2.5 2.5s-1.12 2.5-2.5 2.5S16 13.38 16 12s1.12-2.5 2.5-2.5zm-6.5 0c1.38 0 2.5 1.12 2.5 2.5s-1.12 2.5-2.5 2.5-2.5-1.12-2.5-2.5 1.12-2.5 2.5-2.5zM5.5 3C6.88 3 8 4.12 8 5.5S6.88 8 5.5 8 3 6.88 3 5.5 4.12 3 5.5 3zm13 0C19.88 3 21 4.12 21 5.5S19.88 8 18.5 8 16 6.88 16 5.5 17.12 3 18.5 3zM12 3c1.38 0 2.5 1.12 2.5 2.5S13.38 8 12 8 9.5 6.88 9.5 5.5 10.62 3 12 3z"
-        android:fillColor="?primaryText" />
+        android:fillColor="?attr/textPrimary" />
 </vector>
--- a/app/src/main/res/drawable/ic_open_in_new.xml
+++ b/app/src/main/res/drawable/ic_open_in_new.xml
@ -8,7 +8,7 @@
    android:viewportWidth="18"
    android:viewportHeight="18">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:fillType="evenOdd"
        android:pathData="M9,0a1.005,1.005 0,1 1,0 2.012L4.557,2.012a2.55,2.55 0,0 0,-2.547 2.547v8.883a2.55,2.55 0,0 0,2.547 2.547h8.883a2.55,2.55 0,0 0,2.547 -2.547L15.987,8.97a1.006,1.006 0,1 1,2.011 0v4.472A4.564,4.564 0,0 1,13.441 18L4.558,18A4.564,4.564 0,0 1,0 13.442L0,4.559a4.564,4.564 0,0 1,4.56 -4.56zM17,0a1,1 0,0 1,1 1v4a1,1 0,1 1,-2 0L16,3.414l-5.293,5.293a0.999,0.999 0,1 1,-1.414 -1.414L14.586,2L13,2a1,1 0,1 1,0 -2z" />
 </vector>
--- a/app/src/main/res/drawable/ic_permission.xml
+++ b/app/src/main/res/drawable/ic_permission.xml
@ -9,5 +9,5 @@
    android:viewportHeight="24">
  <path
      android:pathData="M12 20h5a3 3 0 0 0 3-3V7a3 3 0 0 0-3-3h-5zM7 2h10a5 5 0 0 1 5 5v10a5 5 0 0 1-5 5H7a5 5 0 0 1-5-5V7a5 5 0 0 1 5-5zm-0.8 13l0.4-0.2 3-5a0.5 0.5 0 0 0-0.8-0.6L6 13.7l-1-1a0.5 0.5 0 0 0-0.7 0.7l1.4 1.4 0.4 0.2zm7-5.1a0.5 0.5 0 0 1 0.7-0.8l2.1 2.2L18.1 9a0.5 0.5 0 0 1 0.8 0.8L16.7 12l2.2 2.1a0.5 0.5 0 0 1-0.8 0.8L16 12.7 13.9 15a0.5 0.5 0 0 1-0.8-0.8l2.2-2.1z"
-      android:fillColor="?primaryText" />
+      android:fillColor="?attr/textPrimary" />
 </vector>
--- a/app/src/main/res/drawable/ic_qr.xml
+++ b/app/src/main/res/drawable/ic_qr.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M15.8 4.5a0.8 0.8 0 0 1 0-1.5h2.7A2.5 2.5 0 0 1 21 5.5v2.8a0.8 0.8 0 0 1-1.5 0v-3l-0.8-0.8h-3zm-7.6 0a0.8 0.8 0 0 0 0-1.5H5.5A2.5 2.5 0 0 0 3 5.5v2.8a0.8 0.8 0 0 0 1.5 0v-3l0.8-0.8h3zm7.6 15a0.8 0.8 0 0 0 0 1.5h2.7a2.5 2.5 0 0 0 2.5-2.5v-2.8a0.8 0.8 0 0 0-1.5 0v3l-0.8 0.8h-3zm-7.6 0a0.8 0.8 0 0 1 0 1.5H5.5A2.5 2.5 0 0 1 3 18.5v-2.8a0.8 0.8 0 0 1 1.5 0v3l0.8 0.8h3zm2-8.5H7.8A0.8 0.8 0 0 1 7 10.2V7.8A0.8 0.8 0 0 1 7.8 7h2.5A0.8 0.8 0 0 1 11 7.8v2.5a0.8 0.8 0 0 1-0.8 0.7zm6.6 4H15v1.8s0.1 0.2 0.3 0.2h1.4a0.3 0.3 0 0 0 0.3-0.3v-1.4a0.3 0.3 0 0 0-0.3-0.3zm0-6H15V7.2A0.3 0.3 0 0 1 15.3 7h1.4A0.3 0.3 0 0 1 17 7.3v1.5A0.3 0.3 0 0 1 16.7 9zM15 11h-1.8a0.3 0.3 0 0 1-0.2-0.3V9.3A0.3 0.3 0 0 1 13.3 9H15v2zm1.8 2H15v-2h1.8a0.3 0.3 0 0 1 0.2 0.3v1.4a0.3 0.3 0 0 1-0.3 0.3zM15 13h-1.8a0.3 0.3 0 0 0-0.2 0.3V15h2v-2zm-2 2h-2v1.8s0.1 0.2 0.3 0.2h1.4a0.3 0.3 0 0 0 0.3-0.3V15zm-2.3-2H9.3A0.3 0.3 0 0 0 9 13.3V15h2v-1.8a0.3 0.3 0 0 0-0.3-0.2zM9 15H7.2A0.3 0.3 0 0 0 7 15.3v1.4C7 16.9 7.1 17 7.3 17h1.5A0.3 0.3 0 0 0 9 16.7V15z" />
 </vector>
--- a/app/src/main/res/drawable/ic_readermode.xml
+++ b/app/src/main/res/drawable/ic_readermode.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M6.5 3A2.5 2.5 0 0 0 4 5.5v13A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5v-13A2.5 2.5 0 0 0 17.5 3h-11zm12 15.7l-0.8 0.8H6.3l-0.8-0.8V5.3l0.8-0.8h11.4l0.8 0.8v13.4z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M15.25 8.5h-6.5a0.75 0.75 0 0 1 0-1.5h6.5a0.75 0.75 0 0 1 0 1.5zm0 4h-6.5a0.75 0.75 0 0 1 0-1.5h6.5a0.75 0.75 0 0 1 0 1.5zm-3 4h-3.5a0.75 0.75 0 0 1 0-1.5h3.5a0.75 0.75 0 0 1 0 1.5z" />
 </vector>
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M15.685,14.074C16.511,12.925 17,11.519 17,10C17,6.141 13.86,3 10,3C6.14,3 3,6.141 3,10C3,13.859 6.14,17 10,17C11.525,17 12.936,16.508 14.087,15.676L14.611,15.67L19.721,20.78C19.867,20.926 20.059,21 20.251,21C20.443,21 20.635,20.927 20.781,20.78C21.074,20.487 21.074,20.012 20.781,19.719L15.675,14.612L15.685,14.074ZM10,15.5C6.967,15.5 4.5,13.032 4.5,10C4.5,6.968 6.967,4.5 10,4.5C13.033,4.5 15.5,6.968 15.5,10C15.5,13.032 13.033,15.5 10,15.5Z" />
 </vector>
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@ -8,6 +8,6 @@
        android:viewportWidth="24"
        android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M18.4 14.1a3.5 3.5 0 0 0-3.6 1.2l-5-2.4a3.6 3.6 0 0 0 0-1.7l5-2.5a3.5 3.5 0 0 0 3.6 1.2 3.5 3.5 0 0 0 2.5-4.3 3.5 3.5 0 0 0-1.7-2.1 3.5 3.5 0 0 0-2.6-0.4A3.5 3.5 0 0 0 14 7.4L9.2 9.8 9 9.5a3.5 3.5 0 0 0-5 0 3.5 3.5 0 0 0 0 5 3.5 3.5 0 0 0 2.5 1c0.9 0 1.8-0.3 2.5-1l0.2-0.3 5 2.4a3.5 3.5 0 0 0 3.3 4.4c0.6 0 1.2-0.2 1.7-0.5a3.5 3.5 0 0 0 1.7-2 3.5 3.5 0 0 0-2.5-4.4zM17 4.6a2 2 0 0 1 1.5 0.2A2 2 0 0 1 18 8.4 2 2 0 0 1 15.6 7 2 2 0 0 1 17 4.6zm-9 8.8a2 2 0 0 1-3 0 2 2 0 0 1 0-2.8 2 2 0 0 1 3 0c0.7 0.8 0.7 2 0 2.8zM19.3 18a2 2 0 0 1-0.9 1.2 2 2 0 0 1-1.5 0.2 2 2 0 0 1-1.4-2.4 2 2 0 0 1 2.4-1.4 2 2 0 0 1 1.4 2.4z" />
 </vector>
--- a/app/src/main/res/drawable/ic_sign_in.xml
+++ b/app/src/main/res/drawable/ic_sign_in.xml
@ -9,5 +9,5 @@
    android:viewportHeight="24">
    <path
        android:pathData="M12 2.5c-5.238 0-9.5 4.262-9.5 9.5s4.262 9.5 9.5 9.5 9.5-4.262 9.5-9.5-4.262-9.5-9.5-9.5zM12 7a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm0 12c-2.353 0-4.395-1.277-5.525-3.162A2.451 2.451 0 0 1 8.314 15h7.373c0.734 0 1.386 0.328 1.839 0.838C16.395 17.723 14.353 19 12 19z"
-        android:fillColor="?primaryText" />
+        android:fillColor="?attr/textPrimary" />
 </vector>
--- a/app/src/main/res/drawable/ic_signed_out.xml
+++ b/app/src/main/res/drawable/ic_signed_out.xml
@ -9,12 +9,12 @@
    android:viewportHeight="24">

    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M12 6.5a3 3 0 1 0 0 6 3 3 0 0 0 0-6z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M12 21.5c-5.238 0-9.5-4.262-9.5-9.5S6.762 2.5 12 2.5s9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zM12 4c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M8.314 14c-0.652 0-1.232 0.269-1.672 0.684A6.014 6.014 0 0 0 12 18a6.355 6.355 0 0 0 1.084-0.104c0.083-0.014 0.165-0.033 0.247-0.051a6.014 6.014 0 0 0 4.027-3.162A2.43 2.43 0 0 0 15.686 14H8.314z" />
 </vector>
--- a/app/src/main/res/drawable/ic_storage_disabled.xml
+++ b/app/src/main/res/drawable/ic_storage_disabled.xml
@ -9,8 +9,8 @@
    android:autoMirrored="true">
  <path
      android:pathData="M7.2,11h-0.9l-0.3,0.3v0.9l0.3,0.3h0.9l0.3,-0.3v-0.9l-0.3,-0.3z"
-      android:fillColor="?primaryText"/>
+      android:fillColor="?attr/textPrimary"/>
  <path
      android:pathData="M3.78,2.22a0.75,0.75 0,1 0,-1.061 1.061L5.439,6H4.5A2.5,2.5 0,0 0,2 8.5v6A2.5,2.5 0,0 0,4.5 17h11.939l3.78,3.78a0.748,0.748 0,0 0,1.06 0,0.75 0.75,0 0,0 0,-1.061L3.78,2.22zM4.3,15.5l-0.8,-0.8V8.3l0.8,-0.8h2.639l8,8H4.3zM19.5,6H9.691l1.5,1.5H19.7l0.8,0.8v6.4l-0.8,0.8h-0.509l1.296,1.296A2.499,2.499 0,0 0,22 14.5v-6A2.5,2.5 0,0 0,19.5 6z"
-      android:fillColor="?primaryText"/>
+      android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_storage_enabled.xml
+++ b/app/src/main/res/drawable/ic_storage_enabled.xml
@ -10,9 +10,9 @@
    android:viewportHeight="24"
    android:autoMirrored="true">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M7.2 11H6.3L6 11.3v0.9l0.3 0.3h0.9l0.3-0.3v-0.9L7.2 11z" />
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M19.7 7.5l0.8 0.8v6.4l-0.8 0.8H4.3l-0.8-0.8V8.3l0.8-0.8h15.4zM19.5 6h-15A2.5 2.5 0 0 0 2 8.5v6A2.5 2.5 0 0 0 4.5 17h15a2.5 2.5 0 0 0 2.5-2.5v-6A2.5 2.5 0 0 0 19.5 6z" />
 </vector>
--- a/app/src/main/res/drawable/ic_sync_disconnected.xml
+++ b/app/src/main/res/drawable/ic_sync_disconnected.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M10.07 20.336l1.198-2.089A6.364 6.364 0 0 1 9.5 18.5c-2.353 0-4.395-1.277-5.525-3.162a2.451 2.451 0 0 1 1.84-0.838h7.372c0.075 0 0.144 0.017 0.217 0.024l1.28-2.231c0.916-1.596 3.218-1.596 4.134 0l0.12 0.208a9.71 9.71 0 0 0-0.07-2.613c-0.65-3.933-3.823-7.105-7.756-7.755C4.62 1.06-0.94 6.62 0.133 13.111c0.65 3.933 3.822 7.105 7.755 7.755a9.794 9.794 0 0 0 1.93 0.111c0.052-0.217 0.132-0.432 0.251-0.641zM9.5 6.5a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" />
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M21.58 20.073l-3.68-6.414c-0.504-0.879-1.795-0.879-2.299 0l-3.679 6.414C11.427 20.935 12.062 22 13.072 22h7.358c1.008 0 1.643-1.065 1.15-1.927zM16.75 21a0.75 0.75 0 1 1 0-1.5 0.75 0.75 0 0 1 0 1.5zM16 15.725a0.75 0.75 0 0 1 1.5 0V17.9a0.75 0.75 0 0 1-1.5 0v-2.175z" />
 </vector>
--- a/app/src/main/res/drawable/ic_synced_tabs.xml
+++ b/app/src/main/res/drawable/ic_synced_tabs.xml
@ -9,8 +9,8 @@
    android:viewportHeight="24">
  <path
      android:pathData="M20.5 19h-2a2.5 2.5 0 0 0 2.5-2.5v-7A2.5 2.5 0 0 0 18.5 7h-1v1.5h1.2l0.8 0.8v7.4l-0.8 0.8H7.3l-0.8-0.8V13H5v3.5A2.5 2.5 0 0 0 7.5 19h-2a1.5 1.5 0 0 0 0 3h15a1.5 1.5 0 0 0 0-3zm-6.75 1.5h-1.5a0.75 0.75 0 0 1 0-1.5h1.5a0.75 0.75 0 0 1 0 1.5z"
-      android:fillColor="?primaryText"/>
+      android:fillColor="?attr/textPrimary"/>
  <path
      android:pathData="M13.5 2.5h-9A2.5 2.5 0 0 0 2 5v4a2.5 2.5 0 0 0 2.5 2.5h9A2.5 2.5 0 0 0 16 9V5a2.5 2.5 0 0 0-2.5-2.5zM11 10H4.3L3.5 9.2V4.8L4.3 4H11v6zm3.25-2.25a0.75 0.75 0 0 1-1.5 0v-1.5a0.75 0.75 0 0 1 1.5 0v1.5z"
-      android:fillColor="?primaryText"/>
+      android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_tab_collection.xml
+++ b/app/src/main/res/drawable/ic_tab_collection.xml
@ -8,9 +8,9 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M8.75 12.5h6.5a0.75 0.75 0 0 0 0-1.5h-6.5a0.75 0.75 0 0 0 0 1.5zm0 4h6.5a0.75 0.75 0 0 0 0-1.5h-6.5a0.75 0.75 0 0 0 0 1.5z" />
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M19.962 7.811l0.018-0.005-0.788-2.951A2.504 2.504 0 0 0 16.776 3H7.22a2.502 2.502 0 0 0-2.419 1.868L4.088 7.596C4.072 7.632 4.07 7.673 4.058 7.711L4.041 7.777l0.004 0.001C4.028 7.852 4 7.921 4 8v10.5A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5V8c0-0.067-0.026-0.125-0.038-0.189zM7.12 4.5h9.756l0.858 0.713L18.212 7H5.794l0.484-1.787L7.12 4.5zM18.5 18.7l-0.8 0.8H6.3l-0.8-0.8V8.5h13v10.2z" />
   </vector>
--- a/app/src/main/res/drawable/ic_top_sites.xml
+++ b/app/src/main/res/drawable/ic_top_sites.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M21.28 20.22l-5.472-5.472 2.986-2.986c0.527-0.528 0.68-1.285 0.398-1.976a1.796 1.796 0 0 0-1.665-1.133l-2.475-0.029-3.775-3.776 1.068-1.068a0.75 0.75 0 1 0-1.061-1.061L2.72 11.287a0.75 0.75 0 0 0 1.06 1.061l1.079-1.079 3.775 3.775 0.029 2.475a1.794 1.794 0 0 0 1.135 1.665 1.795 1.795 0 0 0 1.973-0.398l2.977-2.977 5.472 5.472a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061zm-10.569-2.495a0.304 0.304 0 0 1-0.348 0.07 0.307 0.307 0 0 1-0.2-0.294l-0.037-3.086-4.207-4.207 4.299-4.299 4.206 4.207 3.086 0.037a0.306 0.306 0 0 1 0.294 0.199 0.31 0.31 0 0 1-0.07 0.349l-7.023 7.024z" />
 </vector>
--- a/app/src/main/res/drawable/ic_tracking_protection_disabled.xml
+++ b/app/src/main/res/drawable/ic_tracking_protection_disabled.xml
@ -9,8 +9,8 @@
    android:viewportHeight="24">
    <path
        android:pathData="M3.53,3.22C3.237,2.927 2.762,2.927 2.469,3.22C2.176,3.513 2.176,3.988 2.469,4.281L4.069,5.881C3.158,6.571 2.698,7.719 2.909,8.872L3.617,12.717C3.888,14.198 4.386,15.493 5.095,16.567C6.525,18.736 8.496,20.547 10.647,21.669C11.066,21.885 11.534,22 12,22C12.468,22 12.937,21.885 13.355,21.667C14.687,20.972 15.944,20.007 17.051,18.862L19.47,21.281C19.616,21.427 19.808,21.501 20,21.501C20.192,21.501 20.384,21.428 20.53,21.281C20.823,20.988 20.823,20.513 20.53,20.22L3.53,3.22ZM12.663,20.337H11.339C9.412,19.332 7.639,17.7 6.347,15.74C5.75,14.836 5.327,13.727 5.092,12.445L4.338,8.368L4.844,7.131L5.154,6.965L15.993,17.804C14.995,18.841 13.861,19.711 12.663,20.337Z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
    <path
        android:pathData="M19.533,5.683L13.431,2.36C12.535,1.881 11.462,1.881 10.564,2.364L6.795,4.378L7.907,5.49L11.516,3.556H12.495L19.054,7.128L19.664,8.368L18.911,12.455C18.701,13.59 18.336,14.58 17.84,15.423L18.936,16.519C19.628,15.457 20.118,14.183 20.386,12.729L21.091,8.937C21.334,7.622 20.707,6.313 19.533,5.683Z"
-        android:fillColor="?primaryText"/>
+        android:fillColor="?attr/textPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_tracking_protection_enabled.xml
+++ b/app/src/main/res/drawable/ic_tracking_protection_enabled.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z" />
 </vector>
--- a/app/src/main/res/drawable/ic_whats_new.xml
+++ b/app/src/main/res/drawable/ic_whats_new.xml
@ -8,6 +8,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="?primaryText"
+      android:fillColor="?attr/textPrimary"
      android:pathData="M18.5 7h-1.1A3.3 3.3 0 0 0 17 3a3.3 3.3 0 0 0-4.6 0 2 2 0 0 0-0.3 0.2A1.9 1.9 0 0 0 12 3a3.3 3.3 0 0 0-4.6 0A3.3 3.3 0 0 0 7 7H5.5A2.5 2.5 0 0 0 3 9.5v1c0 0.8 0.4 1.5 1 2v6A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5v-6a2.5 2.5 0 0 0 1-2v-1A2.5 2.5 0 0 0 18.5 7zm0.2 1.5l0.8 0.8v1.4l-0.8 0.8h-6v-3h6zM13.4 4c0.7-0.7 1.8-0.7 2.5 0a1.8 1.8 0 0 1 0 2.5C15.5 6.9 14 7 12.9 7V6.3c0-1 0.2-2 0.5-2.3zm-5 2.5a1.8 1.8 0 0 1 1.2-3c0.5 0 1 0.2 1.3 0.5 0.3 0.3 0.5 1.3 0.5 2.3V7h-0.8c-1 0-1.9-0.2-2.2-0.5zM4.5 9.3l0.8-0.8h6v3h-6l-0.8-0.8V9.3zm1.8 10.2l-0.8-0.8V13h5.8v6.5h-5zm12.2-0.8l-0.8 0.8h-5V13h5.8v5.7z"/>
 </vector>
--- a/app/src/main/res/drawable/mozac_ic_broken_lock.xml
+++ b/app/src/main/res/drawable/mozac_ic_broken_lock.xml
@ -8,12 +8,12 @@
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="?attr/primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M7 7.562V11H6.5A2.5 2.5 0 0 0 4 13.5v6A2.5 2.5 0 0 0 6.5 22h11c1.066 0 1.97-0.67 2.329-1.61L18.5 19.061V19.7l-0.8 0.8H6.3l-0.8-0.8v-6.4l0.8-0.8h5.638l-1.5-1.5H8.5V9.062L7 7.562z" />
    <path
        android:fillColor="#FF4F5E"
        android:pathData="M4.78 3.22l17.5 17.5A0.748 0.748 0 0 1 21.749 22a0.748 0.748 0 0 1-0.53-0.22L3.719 4.281A0.75 0.75 0 1 1 4.78 3.22z" />
    <path
-        android:fillColor="?attr/primaryText"
+        android:fillColor="?attr/textPrimary"
        android:pathData="M12 3.5c1.93 0 3.5 1.57 3.5 3.5v4h-0.809l1.5 1.5H17.7l0.8 0.8v1.509l1.5 1.5V13.5a2.5 2.5 0 0 0-2.5-2.5H17V7a5 5 0 0 0-5-5 4.99 4.99 0 0 0-4.127 2.182L8.971 5.28C9.574 4.222 10.698 3.5 12 3.5z" />
 </vector>
--- a/app/src/main/res/layout/account_preference.xml
+++ b/app/src/main/res/layout/account_preference.xml
@ -36,7 +36,7 @@
            android:layout_height="wrap_content"
            android:ellipsize="marquee"
            android:fadingEdge="horizontal"
-            android:textColor="?primaryText"
+            android:textColor="?attr/textPrimary"
            android:textSize="16sp"
            android:visibility="gone" />

--- a/app/src/main/res/layout/account_share_list_item.xml
+++ b/app/src/main/res/layout/account_share_list_item.xml
@ -37,7 +37,7 @@
        android:lines="2"
        android:textAlignment="gravity"
        android:textSize="10sp"
-        android:textColor="?primaryText"
+        android:textColor="?attr/textPrimary"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/Show More
+++ b/Show More