Corrects "Choose" button colour in FolderPickerActivity. Removes un-used import from NotificationListAdapter.

MaterialButtons.
SearchView highlight text colour.
First run activity, outlined button colour.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java

@@ -28,7 +28,6 @@ import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
@@ -81,8 +80,8 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
         setSlideshowSize(getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
 
         Button loginButton = findViewById(R.id.login);
-        loginButton.setBackgroundColor(Color.WHITE);
-        loginButton.setTextColor(getResources().getColor(R.color.primary));
+        loginButton.setBackgroundColor(getResources().getColor(R.color.bg_default));
+        loginButton.setTextColor(getResources().getColor(R.color.fg_default));
 
         loginButton.setOnClickListener(v -> {
             if (getIntent().getBooleanExtra(EXTRA_ALLOW_CLOSE, false)) {
@@ -95,7 +94,7 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
         });
 
         Button providerButton = findViewById(R.id.signup);
-        providerButton.setBackgroundColor(getResources().getColor(R.color.primary_dark));
+        providerButton.setBackgroundColor(getResources().getColor(R.color.primary));
         providerButton.setTextColor(getResources().getColor(R.color.login_text_color));
         providerButton.setVisibility(isProviderOrOwnInstallationVisible ? View.VISIBLE : View.GONE);
         providerButton.setOnClickListener(v -> {

src/main/java/com/nextcloud/client/preferences/AppPreferences.java

@@ -239,6 +239,8 @@ public interface AppPreferences {
      */
     int getUploaderBehaviour();
 
+    boolean isDarkThemeEnabled();
+
     /**
      * Saves the uploader behavior which the user has set last.
      *

src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java

@@ -342,7 +342,7 @@ public final class AppPreferencesImpl implements AppPreferences {
     }
 
     @Override
-    public boolean getTheme() {
+    public boolean isDarkThemeEnabled() {
         return preferences.getBoolean(PREF__DARK_THEME, false);
     }
 

src/main/java/com/owncloud/android/MainApp.java

@@ -231,7 +231,7 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
     @SuppressFBWarnings("ST")
     @Override
     public void onCreate() {
-        setAppTheme(preferences.getTheme());
+        setAppTheme(preferences.isDarkThemeEnabled());
         super.onCreate();
 
         insertConscrypt();

src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -410,7 +410,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             new Handler().postDelayed(() -> DisplayUtils.createSnackbar(mLoginWebView,
                                                                         R.string.fallback_weblogin_text,
                                                                         Snackbar.LENGTH_INDEFINITE)
-                .setActionTextColor(getResources().getColor(R.color.white))
+                .setActionTextColor(getResources().getColor(R.color.fg_inverse))
                 .setAction(R.string.fallback_weblogin_back, v -> {
                     mLoginWebView.setVisibility(View.INVISIBLE);
                     webViewLoginMethod = false;

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -1173,7 +1173,7 @@ public final class ThumbnailsCacheManager {
         Bitmap resultBitmap = Bitmap.createBitmap(pxW, pxH, Bitmap.Config.ARGB_8888);
         Canvas c = new Canvas(resultBitmap);
 
-        c.drawColor(MainApp.getAppContext().getResources().getColor(R.color.background_color));
+        c.drawColor(MainApp.getAppContext().getResources().getColor(R.color.bg_default));
         c.drawBitmap(bitmap, 0, 0, null);
 
         return resultBitmap;

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -1267,7 +1267,7 @@ public abstract class DrawerActivity extends ToolbarActivity
     @Override
     protected void onResume() {
         super.onResume();
-        getDelegate().setLocalNightMode(preferences.getTheme() ?
+        getDelegate().setLocalNightMode(preferences.isDarkThemeEnabled() ?
                                         AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
         getDelegate().applyDayNight();
         setDrawerMenuItemChecked(mCheckedMenuItem);

src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -26,6 +26,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.ColorStateList;
 import android.content.res.Resources.NotFoundException;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
@@ -37,10 +38,10 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.preferences.AppPreferences;
+import com.google.android.material.button.MaterialButton;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -90,8 +91,8 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
     private boolean mSearchOnlyFolders;
     private boolean mDoNotEnterEncryptedFolder;
 
-    protected Button mCancelBtn;
-    protected Button mChooseBtn;
+    protected MaterialButton mCancelBtn;
+    protected MaterialButton mChooseBtn;
     private String caption;
     @Inject AppPreferences preferences;
 
@@ -416,7 +417,8 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
         mChooseBtn = findViewById(R.id.folder_picker_btn_choose);
 
         if (mChooseBtn != null) {
-            mChooseBtn.getBackground().setColorFilter(ThemeUtils.primaryColor(this, true), PorterDuff.Mode.SRC_ATOP);
+            mChooseBtn.setBackgroundTintMode(PorterDuff.Mode.SRC_ATOP);
+            mChooseBtn.setBackgroundTintList(ColorStateList.valueOf(ThemeUtils.primaryColor(this, true)));
             mChooseBtn.setOnClickListener(this);
         }
 

src/main/java/com/owncloud/android/ui/activity/RichDocumentsWebView.java

@@ -250,7 +250,7 @@ public class RichDocumentsWebView extends ExternalSiteWebView {
                 }
 
                 if ("image/png".equalsIgnoreCase(file.getMimeType())) {
-                    thumbnailView.setBackgroundColor(getResources().getColor(R.color.background_color));
+                    thumbnailView.setBackgroundColor(getResources().getColor(R.color.bg_default));
                 }
             } else {
                 thumbnailView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(), file.getFileName(),

src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -692,10 +692,8 @@ public class SettingsActivity extends PreferenceActivity
         loadStoragePath();
 
         SwitchPreference themePref = (SwitchPreference) findPreference(getString(R.string.prefs_key_theme));
-        SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
-        themePref.setSummary(appPrefs.getBoolean(com.owncloud.android.db.PreferenceManager.PREF__DARK_THEME,
-                            false) ?
+        themePref.setSummary(preferences.isDarkThemeEnabled() ?
                             getString(R.string.prefs_value_theme_dark) : getString(R.string.prefs_value_theme_light));
         themePref.setOnPreferenceChangeListener((preference, newValue) -> {
             MainApp.setAppTheme((Boolean) newValue);
@@ -739,7 +737,7 @@ public class SettingsActivity extends PreferenceActivity
         Window window = getWindow();
         if (window != null) {
             window.getDecorView().setBackgroundDrawable(new ColorDrawable(ResourcesCompat
-                    .getColor(getResources(), R.color.background_color, null)));
+                    .getColor(getResources(), R.color.bg_default, null)));
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 window.setStatusBarColor(ThemeUtils.primaryColor(this));

src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -25,6 +25,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.ColorStateList;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Environment;
@@ -34,7 +35,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
@@ -91,7 +91,7 @@ public class UploadFilesActivity extends FileActivity implements
     private boolean mSelectAll;
     private boolean mLocalFolderPickerMode;
     private LocalFileListFragment mFileListFragment;
-    protected Button mUploadBtn;
+    protected MaterialButton mUploadBtn;
     private Spinner mBehaviourSpinner;
     private Account mAccountOnCreation;
     private DialogFragment mCurrentDialog;
@@ -177,7 +177,8 @@ public class UploadFilesActivity extends FileActivity implements
         mCancelButton.setOnClickListener(this);
 
         mUploadBtn = findViewById(R.id.upload_files_btn_upload);
-        mUploadBtn.setBackgroundColor(ThemeUtils.primaryColor(this,true));
+        mUploadBtn.setBackgroundTintMode(PorterDuff.Mode.SRC_ATOP);
+        mUploadBtn.setBackgroundTintList(ColorStateList.valueOf(ThemeUtils.primaryColor(this, true)));
         mUploadBtn.setOnClickListener(this);
 
         int localBehaviour = preferences.getUploaderBehaviour();

src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java

@@ -26,7 +26,7 @@
 package com.owncloud.android.ui.activity;
 
 import android.accounts.Account;
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.app.Dialog;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;

src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java

@@ -155,7 +155,7 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
                     gridViewHolder.checkbox.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_checkbox_marked,
                             ThemeUtils.primaryColor(mContext)));
                 } else {
-                    gridViewHolder.itemLayout.setBackgroundColor(mContext.getResources().getColor(R.color.background_color));
+                    gridViewHolder.itemLayout.setBackgroundColor(mContext.getResources().getColor(R.color.bg_default));
                     gridViewHolder.checkbox.setImageResource(R.drawable.ic_checkbox_blank_outline);
                 }
 

src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -30,7 +30,6 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
@@ -330,7 +329,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 gridViewHolder.checkbox.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_checkbox_marked,
                                                                                  ThemeUtils.primaryColor(mContext)));
             } else {
-                gridViewHolder.itemLayout.setBackgroundColor(mContext.getResources().getColor(R.color.background_color));
+                gridViewHolder.itemLayout.setBackgroundColor(mContext.getResources().getColor(R.color.bg_default));
                 gridViewHolder.checkbox.setImageResource(R.drawable.ic_checkbox_blank_outline);
             }
 
@@ -597,7 +596,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 }
 
                 if ("image/png".equalsIgnoreCase(file.getMimeType())) {
-                    thumbnailView.setBackgroundColor(mContext.getResources().getColor(R.color.background_color));
+                    thumbnailView.setBackgroundColor(mContext.getResources().getColor(R.color.bg_default));
                 }
             } else {
                 thumbnailView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(),

src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java

@@ -253,7 +253,7 @@ public class TrashbinListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 }
 
                 if ("image/png".equalsIgnoreCase(file.getMimeType())) {
-                    thumbnailView.setBackgroundColor(context.getResources().getColor(R.color.background_color));
+                    thumbnailView.setBackgroundColor(context.getResources().getColor(R.color.bg_default));
                 }
             } else {
                 thumbnailView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(), file.getFileName(),

src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -416,7 +416,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
 
             if ("image/png".equals(item.getMimeType())) {
                 itemViewHolder.thumbnail.setBackgroundColor(parentActivity.getResources()
-                        .getColor(R.color.background_color));
+                        .getColor(R.color.bg_default));
             }
 
 
@@ -451,7 +451,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
 
             if ("image/png".equalsIgnoreCase(item.getMimeType())) {
                 itemViewHolder.thumbnail.setBackgroundColor(parentActivity.getResources()
-                        .getColor(R.color.background_color));
+                        .getColor(R.color.bg_default));
             }
         } else {
             itemViewHolder.thumbnail.setImageDrawable(MimeTypeUtil.getFileTypeIcon(item.getMimeType(), fileName,

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -56,6 +56,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.preferences.AppPreferences;
+import com.nextcloud.client.preferences.PreferenceManager;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -193,6 +194,13 @@ public class ExtendedListFragment extends Fragment implements
         searchView.setOnCloseListener(this);
         ThemeUtils.themeSearchView(searchView, true, requireContext());
 
+
+        SearchView.SearchAutoComplete theTextArea = (SearchView.SearchAutoComplete) searchView.findViewById(R.id.search_src_text);
+        theTextArea.setHighlightColor(ThemeUtils.primaryAccentColor(getContext()));
+
+//        EditText searchText = searchView.findViewById(R.id.searchView);
+//        searchText.setHighlightColor(ThemeUtils.primaryColor(getContext(), true));
+
         final Handler handler = new Handler();
 
         DisplayMetrics displaymetrics = new DisplayMetrics();

src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -449,7 +449,11 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
                 }
             });
 
+            datePickerDialog.setTitle("");
             datePickerDialog.show();
+            // TODO How do we deal with primary colours that are too light or dark
+            datePickerDialog.getButton(DatePickerDialog.BUTTON_NEGATIVE).setTextColor(ThemeUtils.primaryColor(getContext()));
+            datePickerDialog.getButton(DatePickerDialog.BUTTON_POSITIVE).setTextColor(ThemeUtils.primaryColor(getContext()));
         } else {
             DisplayUtils.showSnackMessage(getView().findViewById(R.id.contacts_linear_layout),
                     R.string.contacts_preferences_something_strange_happened);

src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -617,7 +617,7 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
     private LayerDrawable generateCheckerboardLayeredDrawable(LoadImage result, Bitmap bitmap) {
         Resources r = getResources();
         Drawable[] layers = new Drawable[2];
-        layers[0] = r.getDrawable(R.color.background_color);
+        layers[0] = r.getDrawable(R.color.bg_default);
         Drawable bitmapDrawable;
 
         if (MIME_TYPE_PNG.equalsIgnoreCase(result.ocFile.getMimeType())) {
@@ -766,7 +766,7 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
                 Drawable layerOne;
 
                 if (previewImageActivity.isSystemUIVisible()) {
-                    layerOne = getResources().getDrawable(R.color.background_color);
+                    layerOne = getResources().getDrawable(R.color.bg_default);
                 } else {
                     layerOne = getResources().getDrawable(R.drawable.backrepeat);
                 }

src/main/res/drawable/list_selector.xml

@@ -22,6 +22,6 @@
 
     <item android:drawable="@color/owncloud_blue_bright" android:state_pressed="true"/>
     <item android:drawable="@color/owncloud_blue_bright" android:state_focused="true"/>
-    <item android:drawable="@color/background_color" />
+    <item android:drawable="@color/bg_default" />
 
 </selector>

src/main/res/layout/account_setup.xml

@@ -26,7 +26,7 @@
             android:fillViewport="true"
             android:orientation="vertical"
             android:id="@+id/scroll"
-    >
+            android:background="@color/primary">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -35,191 +35,191 @@
         android:orientation="vertical"
         android:padding="@dimen/standard_padding" >
 
-		<ImageView
-			android:id="@+id/thumbnail"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/standard_padding"
-			android:src="@drawable/logo"
-			android:contentDescription="@string/app_name"/>
+        <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/standard_padding"
+            android:contentDescription="@string/app_name"
+            android:src="@drawable/logo" />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="302dp"
             android:gravity="center"
             android:orientation="vertical"
             android:padding="@dimen/standard_half_padding">
 
             <com.google.android.material.button.MaterialButton
-            android:id="@+id/centeredRefreshButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="@dimen/alternate_margin"
-            android:theme="@style/Button"
-            android:text="@string/auth_check_server"
-            android:visibility="gone"
-            android:contentDescription="@string/auth_check_server"
-            app:cornerRadius="@dimen/button_corner_radius"
-                style="@style/Button.Primary" />
-
-        <TextView
-            android:id="@+id/instructions_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="fill_horizontal"
-            android:text="@string/auth_expired_basic_auth_toast"
-            android:visibility="gone"
-            android:layout_marginBottom="@dimen/alternate_margin"
-            android:textColor="@color/login_text_color"
-            android:contentDescription="@string/auth_expired_basic_auth_toast"/>
+                android:id="@+id/centeredRefreshButton"
+                style="@style/Button.Primary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="@dimen/alternate_margin"
+                android:contentDescription="@string/auth_check_server"
+                android:text="@string/auth_check_server"
+                android:theme="@style/Button"
+                android:visibility="gone"
+                app:cornerRadius="@dimen/button_corner_radius" />
 
-            <FrameLayout
-	        android:id="@+id/hostUrlFrame"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/zero">
+            <TextView
+                android:id="@+id/instructions_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="fill_horizontal"
+                android:layout_marginBottom="@dimen/alternate_margin"
+                android:contentDescription="@string/auth_expired_basic_auth_toast"
+                android:text="@string/auth_expired_basic_auth_toast"
+                android:textColor="@color/login_text_color"
+                android:visibility="gone" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/input_layout_hostUrl"
-                android:theme="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            <FrameLayout
+                android:id="@+id/hostUrlFrame"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/zero"
+                android:background="@color/primary">
 
-                <com.owncloud.android.ui.components.CustomEditText
-                    android:id="@+id/hostUrlInput"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/input_layout_hostUrl"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:contentDescription="@string/auth_host_address"
-                    android:drawablePadding="@dimen/alternate_half_padding"
-                    android:inputType="textUri"
-                    android:paddingRight="@dimen/alternate_padding_right"
-                    android:paddingEnd="@dimen/alternate_padding_right"
-                    android:paddingStart="@dimen/zero"
-                    android:paddingLeft="@dimen/zero"
-                    android:textColor="@color/login_text_color"
-                    android:textColorHint="@color/login_text_color">
-
-                    <requestFocus/>
-                </com.owncloud.android.ui.components.CustomEditText>
+                    app:boxBackgroundColor="@color/primary"
+                    app:hintTextColor="@color/fg_inverse">
+
+                    <com.owncloud.android.ui.components.CustomEditText
+                        android:id="@+id/hostUrlInput"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        android:contentDescription="@string/auth_host_address"
+                        android:drawablePadding="@dimen/alternate_half_padding"
+                        android:inputType="textUri"
+                        android:paddingStart="@dimen/zero"
+                        android:paddingLeft="@dimen/zero"
+                        android:paddingEnd="@dimen/alternate_padding_right"
+                        android:paddingRight="@dimen/alternate_padding_right"
+                        android:textColor="@color/login_text_color"
+                        android:theme="@style/Nextcloud.EditText.Login">
+
+                        <requestFocus />
+                    </com.owncloud.android.ui.components.CustomEditText>
 
                 </com.google.android.material.textfield.TextInputLayout>
 
-            <ImageButton
-                android:id="@+id/testServerButton"
-                android:layout_width="wrap_content"
+                <ImageButton
+                    android:id="@+id/testServerButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_marginEnd="@dimen/alternate_half_padding"
+                    android:layout_marginRight="@dimen/alternate_half_padding"
+                    android:background="@android:color/transparent"
+                    android:contentDescription="@string/test_server_button"
+                    android:onClick="onTestServerConnectionClick"
+                    android:padding="@dimen/zero"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/arrow_right"
+                    android:tint="@color/login_text_color" />
+
+                <ImageButton
+                    android:id="@+id/embeddedRefreshButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_marginEnd="@dimen/alternate_half_padding"
+                    android:layout_marginRight="@dimen/alternate_half_padding"
+                    android:background="@android:color/transparent"
+                    android:contentDescription="@string/auth_refresh_button"
+                    android:padding="@dimen/zero"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_action_refresh"
+                    android:visibility="gone" />
+            </FrameLayout>
+
+            <TextView
+                android:id="@+id/server_status_text"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                android:layout_marginRight="@dimen/alternate_half_padding"
-                android:layout_marginEnd="@dimen/alternate_half_padding"
-                android:padding="@dimen/zero"
-                android:scaleType="fitCenter"
-                android:src="@drawable/arrow_right"
-                android:tint="@color/login_text_color"
-                android:background="@android:color/transparent"
-                android:onClick="onTestServerConnectionClick"
-                android:contentDescription="@string/test_server_button"
-                />
-
-            <ImageButton
-                android:id="@+id/embeddedRefreshButton"
+                android:layout_marginBottom="@dimen/alternate_margin"
+                android:contentDescription="@string/auth_testing_connection"
+                android:drawableStart="@android:drawable/stat_notify_sync"
+                android:drawableLeft="@android:drawable/stat_notify_sync"
+                android:drawablePadding="@dimen/alternate_half_padding"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/display_text_min_height"
+                android:text="@string/auth_testing_connection"
+                android:textColor="@color/login_text_color" />
+
+            <CheckBox
+                android:id="@+id/oauth_onOff_check"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                android:layout_marginRight="@dimen/alternate_half_padding"
-                android:layout_marginEnd="@dimen/alternate_half_padding"
-                android:padding="@dimen/zero"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_action_refresh"
-                android:visibility="gone"
-                android:background="@android:color/transparent"
-                android:contentDescription="@string/auth_refresh_button"
-			    />
-		</FrameLayout>
-
-		<TextView
-            android:id="@+id/server_status_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/alternate_margin"
-            android:drawableLeft="@android:drawable/stat_notify_sync"
-            android:drawableStart="@android:drawable/stat_notify_sync"
-            android:drawablePadding="@dimen/alternate_half_padding"
-            android:gravity="center_vertical"
-            android:textColor="@color/login_text_color"
-            android:text="@string/auth_testing_connection"
-            android:minHeight="@dimen/display_text_min_height"
-            android:contentDescription="@string/auth_testing_connection"/>
+                android:checked="false"
+                android:contentDescription="@string/oauth_check_onoff"
+                android:onClick="onCheckClick"
+                android:text="@string/oauth_check_onoff"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/login_text_hint_color" />
 
             <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/input_layout_account_username"
-            android:theme="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone">
+                android:id="@+id/input_layout_oAuthEntryPoint_1"
+                android:layout_width="114dp"
+                android:layout_height="wrap_content">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/account_username"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/auth_username"
-                android:inputType="textNoSuggestions"
-                android:textColor="@color/login_text_color"
-                android:textColorHint="@color/login_text_hint_color"
-                android:autofillHints="username"/>
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/input_layout_account_password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:visibility="gone"
-            app:passwordToggleDrawable="@drawable/password_visibility_selector"
-            app:passwordToggleTint="@color/login_text_hint_color">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/account_password"
+                android:id="@+id/input_layout_account_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawablePadding="@dimen/alternate_half_padding"
-                android:ems="10"
-                android:hint="@string/auth_password"
-                android:inputType="textPassword"
-                android:textColor="@color/login_text_color"
-                android:textColorHint="@color/login_text_hint_color"
-                android:autofillHints="password"/>
+                android:theme="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:visibility="gone"
+                app:passwordToggleDrawable="@drawable/password_visibility_selector"
+                app:passwordToggleTint="@color/login_text_hint_color">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/account_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="password"
+                    android:drawablePadding="@dimen/alternate_half_padding"
+                    android:ems="10"
+                    android:hint="@string/auth_password"
+                    android:inputType="textPassword"
+                    android:textColor="@color/login_text_color"
+                    android:textColorHint="@color/login_text_hint_color" />
             </com.google.android.material.textfield.TextInputLayout>
 
-        <TextView
-            android:id="@+id/auth_status_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/alternate_margin"
-            android:drawableLeft="@android:drawable/stat_notify_sync"
-            android:drawableStart="@android:drawable/stat_notify_sync"
-            android:drawablePadding="@dimen/alternate_half_padding"
-            android:gravity="center_vertical"
-            android:text="@string/auth_unauthorized"
-            android:textColor="@color/login_text_color"
-            android:contentDescription="@string/auth_unauthorized"/>
+            <TextView
+                android:id="@+id/auth_status_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/alternate_margin"
+                android:contentDescription="@string/auth_unauthorized"
+                android:drawableStart="@android:drawable/stat_notify_sync"
+                android:drawableLeft="@android:drawable/stat_notify_sync"
+                android:drawablePadding="@dimen/alternate_half_padding"
+                android:gravity="center_vertical"
+                android:text="@string/auth_unauthorized"
+                android:textColor="@color/login_text_color" />
 
             <com.google.android.material.button.MaterialButton
-            android:id="@+id/buttonOK"
-            android:theme="@style/Button.Login"
-            style="@style/Button.Login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:padding="@dimen/standard_padding"
-            android:enabled="false"
-            android:text="@string/setup_btn_connect"
-            android:contentDescription="@string/setup_btn_connect"
-            android:visibility="gone"
-            app:cornerRadius="@dimen/button_corner_radius"/>
+                android:id="@+id/buttonOK"
+                style="@style/Button.Login"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:contentDescription="@string/setup_btn_connect"
+                android:enabled="false"
+                android:padding="@dimen/standard_padding"
+                android:text="@string/setup_btn_connect"
+                android:theme="@style/Button.Login"
+                android:visibility="gone"
+                app:cornerRadius="@dimen/button_corner_radius" />
         </LinearLayout>
 
         <ImageButton

src/main/res/layout/accounts_layout.xml

@@ -24,7 +24,8 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
-	android:orientation="vertical">
+	android:orientation="vertical"
+    android:background="@color/bg_default">
 
 	<include
 		layout="@layout/toolbar_standard"/>

src/main/res/layout/activity_list_item.xml

@@ -26,7 +26,7 @@
     android:paddingRight="@dimen/standard_padding"
     android:paddingBottom="@dimen/standard_padding"
     android:paddingLeft="@dimen/standard_padding"
-    android:background="@color/background_color">
+    android:background="@color/bg_default">
 
     <ImageView
         android:id="@+id/activity_icon"

src/main/res/layout/activity_list_layout.xml

@@ -57,7 +57,7 @@
                     android:scrollbarStyle="outsideOverlay"
                     android:scrollbars="vertical"
                     android:visibility="visible"
-                    android:background="@color/background_color" />
+                    android:background="@color/bg_default" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 

src/main/res/layout/community_layout.xml

@@ -140,7 +140,7 @@
                         android:id="@+id/community_release_candidate_fdroid"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="@color/background_color"
+                        android:background="@color/bg_default"
                         android:onClick="onGetRCFDroidClick"
                         android:padding="@dimen/zero"
                         android:src="@drawable/fdroid"
@@ -150,7 +150,7 @@
                         android:id="@+id/community_release_candidate_playstore"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="@color/background_color"
+                        android:background="@color/bg_default"
                         android:onClick="onGetRCPlayStoreClick"
                         android:padding="@dimen/zero"
                         android:src="@drawable/playstore"
@@ -181,7 +181,7 @@
                     android:id="@+id/community_beta_fdroid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:onClick="onGetBetaFDroidClick"
                     android:padding="@dimen/zero"
                     android:src="@drawable/fdroid"
@@ -191,7 +191,7 @@
                     android:id="@+id/community_beta_apk"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:onClick="onGetBetaApkClick"
                     android:padding="@dimen/zero"
                     android:src="@drawable/apk"

src/main/res/layout/contactlist_fragment.xml

@@ -39,7 +39,7 @@
             android:id="@+id/contactlist_restore_selected_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/background_color"
+            android:background="@color/bg_default"
             android:orientation="vertical"
             android:visibility="gone">
 

src/main/res/layout/contacts_backup_fragment.xml

@@ -22,7 +22,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/contacts_linear_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/bg_default">
 
     <LinearLayout
         android:layout_width="match_parent"

src/main/res/layout/drawer.xml

@@ -37,7 +37,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:background="@color/background_color"
+            android:background="@color/bg_default"
             android:clickable="false"
             android:orientation="vertical"
             android:paddingLeft="@dimen/standard_padding"

src/main/res/layout/file_details_fragment.xml

@@ -134,7 +134,7 @@
                     android:id="@+id/overflow_menu"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:contentDescription="@string/overflow_menu"
                     android:src="@drawable/ic_dots_vertical" />
             </LinearLayout>
@@ -193,7 +193,7 @@
                 android:id="@+id/tab_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/background_color"
+                android:background="@color/bg_default"
                 app:tabGravity="center"
                 app:tabMode="fixed"
                 app:tabTextColor="@color/textColor"

src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml

@@ -21,7 +21,7 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:orientation="vertical"
-              android:background="@color/background_color">
+              android:background="@color/bg_default">
 
     <TextView
         android:id="@+id/add_to_cloud"

src/main/res/layout/files.xml

@@ -37,7 +37,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/background_color"
+            android:background="@color/bg_default"
             android:baselineAligned="false"
             android:orientation="horizontal"
             android:id="@+id/ListLayout"

src/main/res/layout/generic_explanation.xml

@@ -19,7 +19,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
+    android:background="@color/bg_default"
     android:id="@+id/explanation"
     android:orientation="vertical">
 

src/main/res/layout/sorting_order_fragment.xml

@@ -53,7 +53,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
@@ -92,7 +92,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
@@ -132,7 +132,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
@@ -171,7 +171,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
@@ -212,7 +212,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
@@ -251,7 +251,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/background_color"
+                    android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"

src/main/res/layout/storage_path_item.xml

@@ -32,7 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:background="@color/white"
+        android:background="@color/bg_default"
         android:contentDescription="@string/user_icon"
         android:paddingStart="@dimen/standard_padding"
         android:paddingLeft="@dimen/standard_padding"
@@ -50,7 +50,7 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:singleLine="true"
-        android:textColor="@color/black"
+        android:textColor="@color/fg_default"
         android:textSize="@dimen/file_details_username_text_size"
         tools:text="DCIM" />
 </LinearLayout>

src/main/res/layout/toolbar_standard.xml

@@ -24,7 +24,7 @@
                                             android:id="@+id/appbar"
                                             android:layout_width="match_parent"
                                             android:layout_height="wrap_content"
-                                            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+                                            android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
 
     <RelativeLayout
         android:layout_width="match_parent"

src/main/res/layout/user_info_layout.xml

@@ -22,7 +22,8 @@
                                                  xmlns:app="http://schemas.android.com/apk/res-auto"
                                                  xmlns:card_view="http://schemas.android.com/apk/res-auto"
                                                  android:layout_width="match_parent"
-                                                 android:layout_height="match_parent">
+                                                 android:layout_height="match_parent"
+                                                 android:background="@color/bg_default">
 
     <include
         layout="@layout/toolbar_user_information"/>

src/main/res/values-night/colors.xml

@@ -36,8 +36,9 @@
 
     <!-- Colors -->
     <color name="standard_grey">#757575</color>
-    <!--<color name="elementFallbackColor">#555555</color>-->
+    <color name="elementFallbackColor">#555555</color>
     <color name="grey_200">#EEEEEE</color>
+    <color name="actionbar_shadow">#222222</color>
 
     <!-- standard material color definitions -->
 
@@ -53,7 +54,7 @@
     <color name="login_text_hint_color">#7fC0E3</color>
     <color name="login_btn_tint">#ffffff</color>
     <color name="login_asset">#ffffff</color>
-    <color name="background_color">#222222</color>
+    <color name="bg_default">#222222</color>
     <color name="background_color_inverse">#000000</color>
     <color name="primary_button_background_color">@color/color_accent</color>
     <color name="primary_button_text_color">#000000</color>
@@ -71,13 +72,15 @@
     <color name="color_dark_transparent">#40162233</color>
 
     <!-- Multiselect backgrounds -->
-    <color name="action_mode_background">#D6D7D7</color>
+    <color name="action_mode_background">#757575</color>
     <color name="action_mode_status_bar_background">#ECECEC</color>
-    <color name="selected_item_background">#616161</color>
+    <color name="selected_item_background">#757575</color>
 
     <!--<color name="background_material_light">#555555</color>-->
     <color name="drawer_menu_icon">#ffffff</color>
     <color name="date_picker_header_text">#616161</color>
-    <color name="date_picker_header_bg">#111111</color>
+    <color name="bg_fallback_highlight">#737373</color>
+    <color name="switchpref_track">#4DFFFFFF</color>
 
+    <color name="bg_fallback_activated">#525252</color>
 </resources>

src/main/res/values-v21/styles.xml

@@ -32,6 +32,6 @@
 
     <style name="Theme.ownCloud.Toolbar.Drawer">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:colorBackground">@color/background_color</item>
+        <item name="android:colorBackground">@color/bg_default</item>
     </style>
 </resources>

src/main/res/values/colors.xml

@@ -57,8 +57,9 @@
     <color name="login_text_color">#ffffff</color>
     <color name="login_text_hint_color">#7fC0E3</color>
     <color name="login_btn_tint">#ffffff</color>
+    <color name="login_btn_stroke">#ffffff</color>
     <color name="login_asset">#ffffff</color>
-    <color name="background_color">#FFFFFF</color>
+    <color name="bg_default">#FFFFFF</color>
     <color name="background_color_inverse">#000000</color>
     <color name="primary_button_background_color">@color/color_accent</color>
     <color name="primary_button_text_color">#ffffff</color>
@@ -83,10 +84,13 @@
     <!--<color name="background_material_light">#ef4</color>-->
     <color name="drawer_menu_icon">#757575</color>
     <color name="date_picker_header_text">#ffffff</color>
-    <color name="date_picker_header_bg">#757575</color>
+    <color name="bg_fallback_highlight">#616161</color>
+    <color name="switchpref_track">#4D000000</color>
 
     <!-- Excluded from future app dark theme -->
     <color name="themed_fg">#FFFFFF</color>
     <color name="themed_fg_inverse">#000000</color>
 
+    <color name="bg_fallback_activated">#737373</color>
+
 </resources>

src/main/res/values/styles.xml

@@ -23,21 +23,15 @@
 	<style name="Theme.ownCloud" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
     	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
-		<item name="actionModeBackground">@color/action_mode_background</item>
-		<!--<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>-->
-		<item name="actionBarPopupTheme">@style/ThemeOverlay.AppTheme.PopupMenu</item>
-        <item name="android:actionBarPopupTheme">@style/ThemeOverlay.AppTheme.PopupMenu</item>
-		<item name="colorPrimary">@color/primary</item>
-		<item name="colorPrimaryDark">@color/primary_dark</item>
-		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
-		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
-		<item name="android:windowBackground">@color/background_color</item>
-		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
+        <item name="actionModeBackground">@color/action_mode_background</item>
+        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppTheme.PopupMenu</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="android:alertDialogTheme">@style/ownCloud.AlertDialog</item>
+        <item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textColor">@color/textColor</item>
         <item name="colorSecondary">@color/textColor</item>
-        <item name="android:colorSecondary">@color/textColor</item>
-        <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
     </style>
 
 	<style name="FallbackThemingTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
@@ -46,37 +40,34 @@
 		<item name="colorAccent">#757575</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textColor">@color/textColor</item>
-        <item name="colorSecondary">@color/textColor</item>
-        <item name="android:colorSecondary">@color/textColor</item>
+        <item name="android:alertDialogTheme">@style/FallbackTheming.Dialog</item>
+        <item name="dialogTheme">@style/FallbackTheming.Dialog</item>
+        <item name="android:windowBackground">@color/bg_default</item>
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
     </style>
 
-	<style name="FallbackDatePickerDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog">
-		<item name="colorPrimary">#424242</item>
-		<item name="colorPrimaryDark">#212121</item>
-        <item name="android:colorAccent">@color/date_picker_header_bg</item>
-        <item name="colorAccent">@color/date_picker_header_bg</item>
+	<style name="FallbackDatePickerDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+        <!-- TODO change these reference names -->
         <item name="android:textAllCaps">false</item>
-        <item name="android:windowBackground">@color/background_color</item>
-        <item name="android:textColor">@color/textColor</item>
+        <item name="android:windowBackground">@color/bg_default</item>
+        <item name="android:textColor">@color/textColor_inverse</item>
         <item name="android:datePickerStyle">@style/DatePickerStyle</item>
-        <!--&lt;!&ndash; TODO change these references &ndash;&gt;-->
-        <item name="colorControlHighlight">@color/date_picker_header_bg</item>
-        <item name="colorControlActivated">@color/textColor</item>
+        <item name="colorControlHighlight">@color/bg_fallback_highlight</item>
+        <item name="colorControlActivated">@color/bg_fallback_highlight</item>
     </style>
 
-    <style name="DatePickerStyle" parent="Theme.MaterialComponents.DayNight.Dialog">
-        <item name="android:headerBackground">@color/date_picker_header_bg</item>
+    <style name="DatePickerStyle" parent="">
+        <item name="android:headerBackground">@color/bg_fallback_highlight</item>
+        <!-- TODO for < API21 -->
         <item name="android:datePickerMode">calendar</item>
     </style>
 
-    <style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+    <style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
 		<item name="colorPrimary">#424242</item>
 		<item name="colorPrimaryDark">#212121</item>
 		<item name="colorAccent">#757575</item>
 		<item name="windowNoTitle">false</item>
-		<item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
-		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
+        <item name="android:windowBackground">@color/bg_default</item>
 	</style>
 
 	<!-- separate action bar style for activities without an action bar -->
@@ -88,7 +79,7 @@
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
 		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
-		<item name="android:windowBackground">@color/background_color</item>
+		<item name="android:windowBackground">@color/bg_default</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
 		<item name="windowActionModeOverlay">true</item>
     </style>
@@ -111,7 +102,7 @@
 		<item name="android:textColorPrimary">@color/primary</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:colorBackground">@color/background_color</item>
+        <item name="android:windowBackground">@color/bg_default</item>
     </style>
 
 	<style name="ownCloud.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
@@ -153,7 +144,7 @@
         <item name="colorAccent">@color/transparent</item>
         <item name="android:textColor">@color/textColor</item>
         <item name="android:textAllCaps">false</item>
-        <item name="strokeColor">@color/textColor</item>
+        <item name="strokeColor">@color/login_btn_stroke</item>
     </style>
 
 	<style name="Button.Primary" parent="Button">
@@ -232,9 +223,7 @@
 	<style name="Theme.ownCloud.Dialog" parent="@style/Theme.MaterialComponents.DayNight.Dialog.Alert">
 		<item name="windowNoTitle">false</item>
 		<item name="colorAccent">@color/color_accent</item>
-		<item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
-		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
-        <item name="android:windowBackground">@color/background_color</item>
+        <item name="android:windowBackground">@color/bg_default</item>
     </style>
 
 	<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">
@@ -250,6 +239,8 @@
 	<style name="NavigationView_ItemTextAppearance">
 		<item name="android:ellipsize">end</item>
 		<item name="android:listDivider">@color/transparent</item>
+
+        <!-- TODO are these two necessary -->
 		<item name="android:textColor">@color/textColor</item>
 		<item name="android:color">@color/textColor</item>
 	</style>
@@ -275,6 +266,7 @@
 		<!-- setting a fixed width as follows results in narrow buttons with line breaks, but of course this is not a solution -->
 		<!-- <item name="android:width">100dp</item> -->
         <item name="android:textAllCaps">false</item>
+        <item name="backgroundTint">@color/bg_default</item>
 	</style>
 
     <style name="PassCodeStyle">
@@ -303,12 +295,16 @@
 	<style name="NextcloudTextAppearanceMedium" parent="@style/TextAppearance.AppCompat.Medium">
 	</style>
 
-	<style name="TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="TextInputLayout" parent="Base.Widget.MaterialComponents.TextInputEditText"></style>
+
+    <style name="Nextcloud.TextInputLayout.Login" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
+        <item name="boxBackgroundColor">@color/primary</item>
+        <item name="android:textColorHint">@color/fg_inverse</item>
 	</style>
-	<style name="EditText" parent="Theme.MaterialComponents.DayNight">
+
+	<style name="Nextcloud.EditText.Login" parent="ThemeOverlay.MaterialComponents.TextInputEditText">
+        <item name="colorControlNormal">@color/login_text_color</item>
 		<item name="colorControlActivated">@color/login_text_color</item>
-		<item name="colorControlNormal">@color/login_text_color</item>
-		<item name="android:textColorHint">@color/login_text_color</item>
 	</style>
 
 	<style name="AppTabTextAppearance" parent="@style/TextAppearance.Design.Tab">
@@ -319,7 +315,7 @@
 
     <style name="ThemeOverlay.AppTheme.PopupMenu" parent="ThemeOverlay.MaterialComponents.Dark">
         <!-- popup menu background - NEVER "android:background" !!! in themes -->
-        <item name="android:colorBackground">@color/background_color</item>
+        <item name="android:colorBackground">@color/bg_default</item>
         <!-- popup menu item text color -->
         <item name="android:textColorPrimary">@color/textColor</item>
     </style>