diff --git a/Simplenote/src/main/AndroidManifest.xml b/Simplenote/src/main/AndroidManifest.xml
index e01a921bb..e757a862a 100644
--- a/Simplenote/src/main/AndroidManifest.xml
+++ b/Simplenote/src/main/AndroidManifest.xml
@@ -174,10 +174,10 @@
 
         <activity
             android:name=".authentication.SimplenoteSignupActivity"
-            android:theme="@style/SignUpOverride" />
+            android:theme="@style/Style.Authentication" />
 
         <activity android:name=".authentication.NewCredentialsActivity"
-            android:theme="@style/SignUpOverride"/>
+            android:theme="@style/Style.Authentication"/>
 
         <activity
             android:name="com.automattic.simplenote.StyleActivity"
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java
index f8fa1b462..398dcd0eb 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java
@@ -56,7 +56,6 @@
 import com.automattic.simplenote.utils.PrefUtils;
 import com.automattic.simplenote.utils.SimplenoteProgressDialogFragment;
 import com.simperium.Simperium;
-import com.simperium.android.ProgressDialogFragment;
 import com.simperium.client.Bucket;
 import com.simperium.client.BucketObjectMissingException;
 import com.simperium.client.BucketObjectNameInvalid;
@@ -397,7 +396,7 @@ private void showProgressDialogDeleteAccount() {
         }
 
         mProgressDialogFragment = SimplenoteProgressDialogFragment.newInstance(getString(R.string.requesting_message));
-        mProgressDialogFragment.show(activity.getSupportFragmentManager(), ProgressDialogFragment.TAG);
+        mProgressDialogFragment.show(activity.getSupportFragmentManager(), SimplenoteProgressDialogFragment.TAG);
     }
 
     private void closeProgressDialogDeleteAccount() {
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/authentication/MagicLinkableFragment.kt b/Simplenote/src/main/java/com/automattic/simplenote/authentication/MagicLinkableFragment.kt
index f20380694..5c8f98f53 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/MagicLinkableFragment.kt
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/MagicLinkableFragment.kt
@@ -14,15 +14,15 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.automattic.simplenote.R
 import com.automattic.simplenote.authentication.magiclink.MagicLinkConfirmationFragment
+import com.automattic.simplenote.utils.SimplenoteProgressDialogFragment
 import com.google.android.material.textfield.TextInputLayout
-import com.simperium.android.ProgressDialogFragment
 
 /**
  * Base class used to share logic between sign up and login, specifically related to magic links.
  */
 abstract class MagicLinkableFragment : Fragment() {
 
-    private var progressDialogFragment: ProgressDialogFragment? = null
+    private var progressDialogFragment: SimplenoteProgressDialogFragment? = null
 
     private var emailField: EditText? = null
 
@@ -92,17 +92,17 @@ abstract class MagicLinkableFragment : Fragment() {
     }
 
     fun showProgressDialog(label: String) {
-        val existingProgressFrag = parentFragmentManager.findFragmentByTag(ProgressDialogFragment.TAG)
+        val existingProgressFrag = parentFragmentManager.findFragmentByTag(SimplenoteProgressDialogFragment.TAG)
         if (existingProgressFrag == null) {
             progressDialogFragment =
-                ProgressDialogFragment.newInstance(label)
+                SimplenoteProgressDialogFragment.newInstance(label)
             progressDialogFragment?.setStyle(DialogFragment.STYLE_NO_TITLE, R.style.Simperium)
-            progressDialogFragment?.show(requireFragmentManager(), ProgressDialogFragment.TAG)
+            progressDialogFragment?.show(requireFragmentManager(), SimplenoteProgressDialogFragment.TAG)
         }
     }
 
     protected fun hideDialogProgress() {
-        val existingProgressFrag = progressDialogFragment ?: (parentFragmentManager.findFragmentByTag(ProgressDialogFragment.TAG) as ProgressDialogFragment?)
+        val existingProgressFrag = progressDialogFragment ?: (parentFragmentManager.findFragmentByTag(SimplenoteProgressDialogFragment.TAG) as SimplenoteProgressDialogFragment?)
         existingProgressFrag?.let {
             if (!it.isHidden) {
                 it.dismiss()
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/authentication/NewCredentialsActivity.kt b/Simplenote/src/main/java/com/automattic/simplenote/authentication/NewCredentialsActivity.kt
index bebe34929..36beab96d 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/NewCredentialsActivity.kt
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/NewCredentialsActivity.kt
@@ -26,17 +26,18 @@ import androidx.appcompat.widget.AppCompatButton
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import com.automattic.simplenote.R
+import com.automattic.simplenote.ThemedAppCompatActivity
 import com.automattic.simplenote.utils.AccountNetworkUtils
 import com.automattic.simplenote.utils.AccountVerificationEmailHandler
 import com.automattic.simplenote.utils.AppLog
 import com.automattic.simplenote.utils.HtmlCompat
+import com.automattic.simplenote.utils.SimplenoteProgressDialogFragment
 import com.automattic.simplenote.utils.SystemBarUtils
-import com.google.android.material.color.MaterialColors
+import com.automattic.simplenote.utils.getColorStr
 import com.google.android.material.textfield.TextInputLayout
 import com.simperium.Simperium
 import com.simperium.SimperiumNotInitializedException
 import com.simperium.android.CredentialsActivity
-import com.simperium.android.ProgressDialogFragment
 import com.simperium.client.AuthException
 import com.simperium.client.AuthException.FailureType
 import com.simperium.client.AuthProvider
@@ -48,14 +49,14 @@ import java.io.UnsupportedEncodingException
 import java.net.URLEncoder
 import java.util.regex.Pattern
 
-open class NewCredentialsActivity : AppCompatActivity() {
+open class NewCredentialsActivity : ThemedAppCompatActivity() {
     companion object {
         val PATTERN_NEWLINES_RETURNS_TABS: Pattern = Pattern.compile("[\n\r\t]")
         const val PREF_HIDE_EMAIL_FIELD: String = "pref_hide_email_field"
         const val PASSWORD_LENGTH_LOGIN: Int = 4
         const val PASSWORD_LENGTH_MINIMUM: Int = 8
     }
-    private var progressDialogFragment: ProgressDialogFragment? = null
+    private var progressDialogFragment: SimplenoteProgressDialogFragment? = null
     private var button: AppCompatButton? = null
     private var simperium: Simperium? = null
     private var missingEmailMessage: TextView? = null
@@ -155,8 +156,7 @@ open class NewCredentialsActivity : AppCompatActivity() {
                 missingEmailMessage?.visibility = View.VISIBLE
                 inputEmail?.visibility = View.GONE
 
-                val colorLink: String =
-                    Integer.toHexString(MaterialColors.getColor(missingEmailMessage!!, R.attr.onMainBackgroundColor) and 16777215)
+                val colorLink = getColorStr(R.color.text_link)
                 val boldEmail = "<b><font color=\"#${colorLink}\">${email}<font/></b>"
                 missingEmailMessage?.text = HtmlCompat.fromHtml(
                     String.format(
@@ -488,8 +488,8 @@ open class NewCredentialsActivity : AppCompatActivity() {
         val password = this.getEditTextString(inputPassword!!)
         if (this.isValidPasswordLogin()) {
             this.progressDialogFragment =
-                ProgressDialogFragment.newInstance(this.getString(R.string.simperium_dialog_progress_logging_in))
-            progressDialogFragment?.show(this.supportFragmentManager, ProgressDialogFragment.TAG)
+                SimplenoteProgressDialogFragment.newInstance(this.getString(R.string.simperium_dialog_progress_logging_in))
+            progressDialogFragment?.show(this.supportFragmentManager, SimplenoteProgressDialogFragment.TAG)
             simperium?.authorizeUser(email, password, this.authListener)
         } else {
             this.showDialogError(this.getString(R.string.simperium_dialog_message_password_login, PASSWORD_LENGTH_LOGIN))
@@ -500,10 +500,10 @@ open class NewCredentialsActivity : AppCompatActivity() {
         val email = this.getEditTextString(inputEmail)
         val password = this.getEditTextString(inputPassword)
         if (this.isValidPassword(email, password)) {
-            this.progressDialogFragment = ProgressDialogFragment.newInstance(
+            this.progressDialogFragment = SimplenoteProgressDialogFragment.newInstance(
                 this.getString(R.string.simperium_dialog_progress_signing_up)
             )
-            progressDialogFragment?.show(this.supportFragmentManager, ProgressDialogFragment.TAG)
+            progressDialogFragment?.show(this.supportFragmentManager, SimplenoteProgressDialogFragment.TAG)
             simperium?.createUser(email, password, this.authListener)
         } else {
             this.showDialogError(this.getString(R.string.simperium_dialog_message_password, PASSWORD_LENGTH_MINIMUM))
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SignupFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SignupFragment.java
index df2413bcc..d4a9589e9 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SignupFragment.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SignupFragment.java
@@ -29,8 +29,8 @@
 import com.automattic.simplenote.utils.BrowserUtils;
 import com.automattic.simplenote.utils.DisplayUtils;
 import com.automattic.simplenote.utils.NetworkUtils;
+import com.automattic.simplenote.utils.SimplenoteProgressDialogFragment;
 import com.google.android.material.textfield.TextInputLayout;
-import com.simperium.android.ProgressDialogFragment;
 import com.simperium.util.Logger;
 
 import org.json.JSONException;
@@ -59,7 +59,7 @@ public class SignupFragment extends Fragment {
     private static final MediaType JSON_MEDIA_TYPE =
         MediaType.parse("application/json; charset=utf-8");
 
-    private ProgressDialogFragment progressDialogFragment;
+    private SimplenoteProgressDialogFragment progressDialogFragment;
 
     @Nullable
     @Override
@@ -117,9 +117,9 @@ public void onClick(View v) {
 
     private void showProgressDialog() {
         progressDialogFragment =
-            ProgressDialogFragment.newInstance(getString(R.string.simperium_dialog_progress_signing_up));
+                SimplenoteProgressDialogFragment.newInstance(getString(R.string.simperium_dialog_progress_signing_up));
         progressDialogFragment.setStyle(DialogFragment.STYLE_NO_TITLE, R.style.Simperium);
-        progressDialogFragment.show(requireFragmentManager(), ProgressDialogFragment.TAG);
+        progressDialogFragment.show(requireFragmentManager(), SimplenoteProgressDialogFragment.TAG);
     }
 
     private void hideDialogProgress() {
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteAuthenticationActivity.java b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteAuthenticationActivity.java
index 839943087..7270f7bdb 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteAuthenticationActivity.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteAuthenticationActivity.java
@@ -24,13 +24,13 @@
 import com.automattic.simplenote.Simplenote;
 import com.automattic.simplenote.analytics.AnalyticsTracker;
 import com.automattic.simplenote.utils.IntentUtils;
+import com.automattic.simplenote.utils.SimplenoteProgressDialogFragment;
 import com.automattic.simplenote.utils.StrUtils;
 import com.automattic.simplenote.utils.SystemBarUtils;
 import com.automattic.simplenote.utils.WordPressUtils;
 import com.automattic.simplenote.viewmodels.MagicLinkUiState;
 import com.automattic.simplenote.viewmodels.CompleteMagicLinkViewModel;
 import com.simperium.android.AuthenticationActivity;
-import com.simperium.android.ProgressDialogFragment;
 
 import net.openid.appauth.AuthorizationException;
 import net.openid.appauth.AuthorizationRequest;
@@ -65,20 +65,20 @@ public class SimplenoteAuthenticationActivity extends AuthenticationActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
+
         // Setup edge-to-edge display only on Android 15+ to avoid breaking existing theming
         // Since this extends Simperium's AuthenticationActivity, we need to be conservative
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
             WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
             // Use auto-theming to properly handle dark mode
-            boolean isLightTheme = (getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) 
+            boolean isLightTheme = (getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK)
                 != android.content.res.Configuration.UI_MODE_NIGHT_YES;
             SystemBarUtils.setSystemBarsAppearance(this, isLightTheme, isLightTheme);
-            
+
             // Apply navigation bar insets to avoid button overlap with 3-button navigation
             ViewCompat.setOnApplyWindowInsetsListener(findViewById(android.R.id.content), (v, windowInsets) -> {
                 Insets systemBars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-                
+
                 // Apply bottom padding to avoid navigation bar overlap
                 v.setPadding(
                     v.getPaddingLeft(),
@@ -86,13 +86,13 @@ public void onCreate(Bundle savedInstanceState) {
                     v.getPaddingRight(),
                     systemBars.bottom
                 );
-                
+
                 return WindowInsetsCompat.CONSUMED;
             });
         }
 
         final Intent intent = getIntent();
-        
+
         final boolean isMagicLink = intent.getBooleanExtra(KEY_IS_MAGIC_LINK, false);
         final String authKey = intent.getStringExtra(KEY_MAGIC_LINK_AUTH_KEY);
         final String authCode = intent.getStringExtra(KEY_MAGIC_LINK_AUTH_CODE);
@@ -245,24 +245,24 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
     }
 
     private void showLoadingDialog(@StringRes int stringRes) {
-        final Fragment fragment = getSupportFragmentManager().findFragmentByTag(ProgressDialogFragment.TAG);
+        final Fragment fragment = getSupportFragmentManager().findFragmentByTag(SimplenoteProgressDialogFragment.TAG);
         if (fragment == null) {
-            final ProgressDialogFragment progressDialogFragment = ProgressDialogFragment.newInstance(getString(stringRes));
+            final SimplenoteProgressDialogFragment progressDialogFragment = SimplenoteProgressDialogFragment.newInstance(getString(stringRes));
             progressDialogFragment.setStyle(DialogFragment.STYLE_NO_TITLE, R.style.Simperium);
-            progressDialogFragment.show(getSupportFragmentManager(), ProgressDialogFragment.TAG);
+            progressDialogFragment.show(getSupportFragmentManager(), SimplenoteProgressDialogFragment.TAG);
         }
     }
 
     private void hideDialog() {
-        final Fragment fragment = getSupportFragmentManager().findFragmentByTag(ProgressDialogFragment.TAG);
+        final Fragment fragment = getSupportFragmentManager().findFragmentByTag(SimplenoteProgressDialogFragment.TAG);
         if (fragment != null) {
             try {
-                final ProgressDialogFragment progressDialogFragment = (ProgressDialogFragment) fragment;
+                final SimplenoteProgressDialogFragment progressDialogFragment = (SimplenoteProgressDialogFragment) fragment;
                 if (!progressDialogFragment.isHidden()) {
                     progressDialogFragment.dismiss();
                 }
             } catch (final ClassCastException e) {
-                Log.e(TAG, "We have a class other than ProgressDialogFragment", e);
+                Log.e(TAG, "We have a class other than SimplenoteProgressDialogFragment", e);
             }
         }
     }
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteSignupActivity.java b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteSignupActivity.java
index eb153339c..2d168e938 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteSignupActivity.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteSignupActivity.java
@@ -11,13 +11,14 @@
 import androidx.fragment.app.FragmentManager;
 
 import com.automattic.simplenote.R;
+import com.automattic.simplenote.ThemedAppCompatActivity;
 import com.automattic.simplenote.authentication.magiclink.MagicLinkConfirmationFragment;
 import com.automattic.simplenote.utils.SystemBarUtils;
 
 import dagger.hilt.android.AndroidEntryPoint;
 
 @AndroidEntryPoint
-public class SimplenoteSignupActivity extends AppCompatActivity {
+public class SimplenoteSignupActivity extends ThemedAppCompatActivity {
     public final static String SIGNUP_FRAGMENT_TAG = "signup";
 
     // Used to differentiate between sign in and sign up in the sign in activity
@@ -46,7 +47,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         final boolean isSignUp = !getIntent().getBooleanExtra(KEY_IS_LOGIN, false);
         initContainer(isSignUp);
         initToolbar(isSignUp);
-        
+
         // Setup edge-to-edge display with proper WindowInsets handling
         // Use auto-theming to properly handle status bar appearance based on theme
         SystemBarUtils.setupEdgeToEdgeWithAutoTheming(
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/authentication/magiclink/MagicLinkConfirmationFragment.kt b/Simplenote/src/main/java/com/automattic/simplenote/authentication/magiclink/MagicLinkConfirmationFragment.kt
index 18a2bc9b9..a46d31a21 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/magiclink/MagicLinkConfirmationFragment.kt
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/magiclink/MagicLinkConfirmationFragment.kt
@@ -18,9 +18,9 @@ import com.automattic.simplenote.Simplenote
 import com.automattic.simplenote.authentication.SignInFragment
 import com.automattic.simplenote.utils.HtmlCompat
 import com.automattic.simplenote.utils.NetworkUtils
+import com.automattic.simplenote.utils.SimplenoteProgressDialogFragment
 import com.automattic.simplenote.viewmodels.CompleteMagicLinkViewModel
 import com.automattic.simplenote.viewmodels.MagicLinkUiState
-import com.simperium.android.ProgressDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -29,7 +29,7 @@ class MagicLinkConfirmationFragment : Fragment() {
 
     @Inject lateinit var simplenote: Simplenote
 
-    private var progressDialogFragment: ProgressDialogFragment? = null
+    private var progressDialogFragment: SimplenoteProgressDialogFragment? = null
 
     private var codeEditText: EditText? = null
     private var actionCodeButton: Button? = null
@@ -124,9 +124,9 @@ class MagicLinkConfirmationFragment : Fragment() {
 
     private fun showProgressDialog(label: String) {
         progressDialogFragment =
-            ProgressDialogFragment.newInstance(label)
+            SimplenoteProgressDialogFragment.newInstance(label)
         progressDialogFragment?.setStyle(DialogFragment.STYLE_NO_TITLE, R.style.Simperium)
-        progressDialogFragment?.show(requireFragmentManager(), ProgressDialogFragment.TAG)
+        progressDialogFragment?.show(requireFragmentManager(), SimplenoteProgressDialogFragment.TAG)
     }
 
     private fun hideDialogProgress() {
diff --git a/Simplenote/src/main/res/drawable/ic_simplenote_blue_24dp.xml b/Simplenote/src/main/res/drawable/ic_simplenote_blue_24dp.xml
index 6b5edbaa3..829be579a 100644
--- a/Simplenote/src/main/res/drawable/ic_simplenote_blue_24dp.xml
+++ b/Simplenote/src/main/res/drawable/ic_simplenote_blue_24dp.xml
@@ -8,7 +8,7 @@
     android:viewportWidth="24">
 
     <path
-        android:fillColor="@color/blue"
+        android:fillColor="@color/authentication_logo"
         android:pathData="M24,12c0-6.3-5-11.7-10.9-12C11.9,0,10.7,0.3,9.8,1C8.9,1.8,8.3,2.9,8.2,4.1c-0.2,2.7,2.2,4.3,4.5,5c5.6,1.6,8.9,5.6,8.6,10.5C23,17.5,24,14.9,24,12L24,12z M11.5,13.7c-5.3-1.5-8.4-5.4-8-10c0-0.1,0-0.1,0-0.2C1.3,5.7,0,8.7,0,12c0,6.3,5.1,11.8,11.1,12c1.3,0,2.6-0.3,3.6-1.2c1-0.9,1.7-2.1,1.8-3.5C16.9,15.7,13.5,14.3,11.5,13.7L11.5,13.7z" >
     </path>
 
diff --git a/Simplenote/src/main/res/layout/activity_signup.xml b/Simplenote/src/main/res/layout/activity_signup.xml
index 4dd3d0ac3..88993038c 100644
--- a/Simplenote/src/main/res/layout/activity_signup.xml
+++ b/Simplenote/src/main/res/layout/activity_signup.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
     android:layout_width="match_parent"
@@ -12,13 +11,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/toolbarColor"
+        android:layout_height="wrap_content"
         android:elevation="0dp"
-        app:titleTextColor="@color/text_title"
-        app:navigationIconTint="@color/text_title"
-        app:popupTheme="@style/ThemeOverlay.MaterialComponents"
-        app:theme="@style/ThemeOverlay.MaterialComponents"
         tools:layout_height="wrap_content" />
 
     <FrameLayout
diff --git a/Simplenote/src/main/res/layout/authentication_fancy_or.xml b/Simplenote/src/main/res/layout/authentication_fancy_or.xml
index adeb8fedf..b4dc3f5cd 100644
--- a/Simplenote/src/main/res/layout/authentication_fancy_or.xml
+++ b/Simplenote/src/main/res/layout/authentication_fancy_or.xml
@@ -18,7 +18,7 @@ android:layout_marginVertical="10dp">
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:text="@string/magic_link_login_with_wordpress_or_break"
-    android:textColor="?attr/onMainBackgroundColor"
+    android:textColor="@color/text_subtitle"
     android:paddingHorizontal="5dp"
     />
 <View
diff --git a/Simplenote/src/main/res/layout/fragment_confirmation.xml b/Simplenote/src/main/res/layout/fragment_confirmation.xml
index 9661b18cc..a1ba74bf3 100644
--- a/Simplenote/src/main/res/layout/fragment_confirmation.xml
+++ b/Simplenote/src/main/res/layout/fragment_confirmation.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,7 +15,7 @@
         android:layout_gravity="center"
         android:layout_marginBottom="@dimen/padding_large"
         android:src="@drawable/ic_mail"
-        android:tint="@color/text_description" />
+        app:tint="?attr/emptyImageColor" />
 
     <com.automattic.simplenote.widgets.RobotoRegularTextView
         android:id="@+id/email_confirmation_text"
@@ -23,8 +25,8 @@
         android:layout_marginEnd="@dimen/padding_extra_extra_large"
         android:layout_marginBottom="@dimen/padding_extra_large"
         android:gravity="center"
-        android:textColor="@color/text_description"
-        android:textSize="16sp"
+        android:textColor="@color/text_title"
+        android:textSize="@dimen/text_content_title"
         tools:text="We've sent an email to example@email.com. Please check your inbox and follow the instructions." />
 
     <com.automattic.simplenote.widgets.RobotoRegularTextView
@@ -35,9 +37,9 @@
         android:layout_marginEnd="@dimen/padding_extra_extra_large"
         android:layout_marginBottom="@dimen/padding_extra_large"
         android:gravity="center"
-        android:textColor="@color/text_description_secondary"
-        android:textColorLink="@color/text_description_secondary"
-        android:textSize="16sp"
+        android:textColor="@color/text_subtitle"
+        android:textColorLink="@color/text_link"
+        android:textSize="@dimen/text_content"
         tools:text="Didn't get an email? You may already have an account. Contact simplenote@support.com for help." />
 
 </LinearLayout>
diff --git a/Simplenote/src/main/res/layout/fragment_login.xml b/Simplenote/src/main/res/layout/fragment_login.xml
index f180096b9..6e94b2c02 100644
--- a/Simplenote/src/main/res/layout/fragment_login.xml
+++ b/Simplenote/src/main/res/layout/fragment_login.xml
@@ -1,79 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/width_layout"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:padding="@dimen/margin_default"
     android:background="?mainBackgroundColor"
-    tools:layout_width="match_parent">
+    android:fillViewport="true"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/input_email"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
+    <RelativeLayout
+        android:layout_width="@dimen/width_layout"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="@dimen/margin_default_quarter"
-        android:layout_marginTop="@dimen/margin_default_quarter"
-        android:layout_marginEnd="@dimen/margin_default_quarter"
-        android:layout_marginBottom="@dimen/margin_default_quarter"
-        android:hint="@string/simperium_hint_email"
-        app:errorEnabled="true">
+        android:clipToPadding="false"
+        android:padding="@dimen/margin_default"
+        tools:layout_width="match_parent">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/email_edit_text"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_email"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:inputType="textEmailAddress" />
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_default_quarter"
+            android:hint="@string/simperium_hint_email"
+            android:theme="@style/TextInput"
+            app:errorEnabled="true">
 
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/email_edit_text"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:inputType="textEmailAddress" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/button"
-        style="@style/Widget.AppCompat.Button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/input_email"
-        android:layout_marginTop="@dimen/margin_default_quarter"
-        android:layout_marginBottom="@dimen/margin_default_quarter"
-        android:backgroundTint="@color/button_primary_disabled_selector"
-        android:minHeight="@dimen/height_button"
-        android:text="@string/magic_link_login"
-        android:textAllCaps="true"
-        android:textColor="@color/text_button_primary" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-    <TextView
-        android:id="@+id/sign_in_login_manually"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:text="@string/signin_login_with_email_manually"
-        android:layout_below="@id/button"
-        android:textSize="15sp"
-        android:textColor="?attr/onMainBackgroundColor"
-        android:gravity="center_horizontal"
-        android:layout_marginVertical="10dp"/>
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/button"
+            style="@style/Widget.AppCompat.Button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/input_email"
+            android:layout_marginTop="@dimen/margin_default_quarter"
+            android:layout_marginBottom="@dimen/margin_default_quarter"
+            android:backgroundTint="@color/button_primary_disabled_selector"
+            android:minHeight="@dimen/height_button"
+            android:text="@string/magic_link_login"
+            android:textAllCaps="true"
+            android:textColor="@color/text_button_primary" />
 
-    <include layout="@layout/authentication_fancy_or"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/sign_in_login_manually"
-        android:layout_marginVertical="10dp"
-        />
+        <TextView
+            android:id="@+id/sign_in_login_manually"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:gravity="center"
+            android:layout_below="@id/button"
+            android:layout_marginVertical="@dimen/margin_default_half"
+            android:minHeight="@dimen/minimum_target"
+            android:textColor="@color/text_subtitle"
+            android:textSize="@dimen/text_footer"
+            tools:text="@string/signin_login_with_email_manually" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/button_login_with_wordpress"
-        style="@style/Widget.AppCompat.Button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/or_row"
-        android:layout_marginTop="@dimen/margin_default_quarter"
-        android:layout_marginBottom="@dimen/margin_default_quarter"
-        android:backgroundTint="@color/button_secondary_disabled_selector"
-        android:minHeight="@dimen/height_button"
-        android:text="@string/simperium_button_login_other"
-        android:textAllCaps="true"
-        android:textColor="@color/text_button_primary" />
+        <include layout="@layout/authentication_fancy_or"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/sign_in_login_manually"
+            android:layout_marginVertical="10dp" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/button_login_with_wordpress"
+            style="@style/Widget.AppCompat.Button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/or_row"
+            android:layout_marginTop="@dimen/margin_default_quarter"
+            android:layout_marginBottom="@dimen/margin_default_quarter"
+            android:backgroundTint="@color/button_secondary_disabled_selector"
+            android:minHeight="@dimen/height_button"
+            android:text="@string/simperium_button_login_other"
+            android:textAllCaps="true"
+            android:textColor="@color/text_button_primary" />
+
+    </RelativeLayout>
 
-</RelativeLayout>
+</ScrollView>
diff --git a/Simplenote/src/main/res/layout/fragment_magic_link_code.xml b/Simplenote/src/main/res/layout/fragment_magic_link_code.xml
index a9aa601ee..83a06a89d 100644
--- a/Simplenote/src/main/res/layout/fragment_magic_link_code.xml
+++ b/Simplenote/src/main/res/layout/fragment_magic_link_code.xml
@@ -12,22 +12,20 @@
         android:id="@+id/magic_link_enter_code_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_default_half"
         android:gravity="center_horizontal"
-        android:textColor="?attr/onMainBackgroundColor"
         android:textSize="18sp"
         tools:text="We\'ve sent a code to example@email.com. The code will be valid for a few minutes"
-        android:layout_marginVertical="15dp"
+        android:layout_marginVertical="@dimen/margin_default"
         />
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/confirmation_code_input_layout"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_default_quarter"
-        android:layout_marginTop="@dimen/margin_default"
-        android:layout_marginEnd="@dimen/margin_default_quarter"
-        android:layout_marginBottom="@dimen/margin_default_quarter"
+        android:layout_margin="@dimen/margin_default_quarter"
         android:hint="@string/magic_link_code_hint"
+        android:theme="@style/TextInput"
         app:errorEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -38,7 +36,7 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.button.MaterialButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/confirmation_code_button"
         style="@style/Widget.AppCompat.Button"
         android:layout_width="match_parent"
@@ -49,7 +47,7 @@
         android:minHeight="@dimen/height_button"
         android:text="@string/login_screen_title"
         android:textAllCaps="true"
-        android:textColor="@android:color/white" />
+        android:textColor="@color/text_button_primary" />
 
     <include
         layout="@layout/authentication_fancy_or"
@@ -58,7 +56,7 @@
         android:layout_marginVertical="10dp"
         />
 
-    <com.google.android.material.button.MaterialButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/login_with_password_button"
         style="@style/Widget.AppCompat.Button.Borderless"
         android:layout_width="match_parent"
@@ -67,11 +65,9 @@
         android:backgroundTint="@color/button_disabled_selector"
         android:layout_marginTop="@dimen/margin_default_quarter"
         android:layout_marginBottom="@dimen/margin_default_quarter"
-        app:strokeColor="@color/background_dark_black_0"
-        app:strokeWidth="1dp"
         android:minHeight="@dimen/height_button"
         android:text="@string/magic_link_confirm_code_enter_pass_label"
         android:textAllCaps="true"
-        android:textColor="@color/text_button_tertiary"/>
+        android:textColor="@color/button_tertiary_disabled_selector"/>
 
 </LinearLayout>
diff --git a/Simplenote/src/main/res/layout/fragment_signup.xml b/Simplenote/src/main/res/layout/fragment_signup.xml
index 707e3e48b..ad8b6004e 100644
--- a/Simplenote/src/main/res/layout/fragment_signup.xml
+++ b/Simplenote/src/main/res/layout/fragment_signup.xml
@@ -14,11 +14,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginStart="@dimen/margin_default_quarter"
-        android:layout_marginTop="@dimen/margin_default_quarter"
-        android:layout_marginEnd="@dimen/margin_default_quarter"
-        android:layout_marginBottom="@dimen/margin_default_quarter"
+        android:layout_margin="@dimen/margin_default_quarter"
         android:hint="@string/simperium_hint_email"
+        android:theme="@style/TextInput"
         app:errorEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText
diff --git a/Simplenote/src/main/res/layout/new_activity_credentials.xml b/Simplenote/src/main/res/layout/new_activity_credentials.xml
index c3d366dcf..98d7dfe2e 100644
--- a/Simplenote/src/main/res/layout/new_activity_credentials.xml
+++ b/Simplenote/src/main/res/layout/new_activity_credentials.xml
@@ -1,129 +1,129 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/main_parent_view"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="?mainBackgroundColor"
+    android:fillViewport="true"
     android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:fitsSystemWindows="false">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:background="?attr/toolbarColor"
-        android:elevation="0dp"
-        android:layout_height="?attr/actionBarSize"
-        android:layout_width="match_parent"
-        app:popupTheme="@style/ThemeOverlay.MaterialComponents"
-        app:theme="@style/ThemeOverlay.MaterialComponents"
-        tools:layout_height="wrap_content">
-    </androidx.appcompat.widget.Toolbar>
+    android:layout_width="match_parent">
 
     <RelativeLayout
-        android:clipToPadding="false"
-        android:id="@+id/content_view"
-        android:layout_centerHorizontal="true"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
-        android:layout_width="@dimen/width_layout"
-        android:padding="@dimen/padding_large"
-        android:paddingTop="@dimen/padding_extra_large"
-        tools:layout_width="match_parent">
-
-        <LinearLayout
-            android:id="@+id/email_field_and_message_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/padding_extra_extra_large"
-            android:orientation="vertical"
+        android:id="@+id/main_parent_view"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:fitsSystemWindows="false">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:elevation="0dp"
             android:layout_alignParentTop="true"
-            >
-            <TextView
-                android:id="@+id/login_with_password_email_message"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            tools:layout_height="wrap_content">
+        </androidx.appcompat.widget.Toolbar>
+
+        <RelativeLayout
+            android:clipToPadding="false"
+            android:id="@+id/content_view"
+            android:layout_below="@id/toolbar"
+            android:layout_centerHorizontal="true"
+            android:layout_height="match_parent"
+            android:layout_width="@dimen/width_layout"
+            android:padding="@dimen/padding_large"
+            tools:layout_width="match_parent">
+
+            <LinearLayout
+                android:id="@+id/email_field_and_message_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:textSize="18sp"
-                tools:text="@string/login_with_password_message"
-                android:layout_marginVertical="15dp"
-                android:visibility="gone"
-                />
+                android:orientation="vertical"
+                android:layout_alignParentTop="true"
+                >
+                <TextView
+                    android:id="@+id/login_with_password_email_message"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/margin_default_half"
+                    android:gravity="center_horizontal"
+                    android:textSize="18sp"
+                    tools:text="@string/login_with_password_message"
+                    android:layout_marginVertical="15dp"
+                    android:visibility="gone"
+                    />
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/input_email"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/margin_default_quarter"
+                    android:layout_width="match_parent"
+                    android:hint="@string/simperium_hint_email"
+                    android:theme="@style/TextInput"
+                    app:errorEnabled="true"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:inputType="textEmailAddress"
+                        android:layout_height="match_parent"
+                        android:layout_width="match_parent">
+                    </com.google.android.material.textfield.TextInputEditText>
+
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/input_email"
+                android:id="@+id/input_password"
+                android:layout_below="@id/email_field_and_message_container"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/margin_default_quarter"
-                android:layout_marginEnd="@dimen/margin_default_quarter"
-                android:layout_marginStart="@dimen/margin_default_quarter"
-                android:layout_marginTop="@dimen/margin_default"
+                android:layout_margin="@dimen/margin_default_quarter"
                 android:layout_width="match_parent"
-                android:hint="@string/simperium_hint_email"
+                android:hint="@string/simperium_hint_password"
+                android:theme="@style/TextInput"
+                app:endIconMode="password_toggle"
                 app:errorEnabled="true"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:inputType="textEmailAddress"
+                    android:inputType="textPassword"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent">
                 </com.google.android.material.textfield.TextInputEditText>
 
             </com.google.android.material.textfield.TextInputLayout>
-        </LinearLayout>
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/input_password"
-            android:layout_below="@id/email_field_and_message_container"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_default_quarter"
-            android:layout_marginEnd="@dimen/margin_default_quarter"
-            android:layout_marginStart="@dimen/margin_default_quarter"
-            android:layout_marginTop="@dimen/margin_default"
-            android:layout_width="match_parent"
-            android:hint="@string/simperium_hint_password"
-            app:endIconMode="password_toggle"
-            app:errorEnabled="true"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:inputType="textPassword"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent">
-            </com.google.android.material.textfield.TextInputEditText>
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/button"
-            android:backgroundTint="@color/button_primary_disabled_selector"
-            android:layout_below="@id/input_password"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/padding_medium"
-            android:layout_marginTop="@dimen/padding_medium"
-            android:layout_width="match_parent"
-            android:minHeight="@dimen/height_button"
-            android:textAllCaps="true"
-            android:textColor="@android:color/white"
-            tools:text="@string/simperium_button_login"
-            style="@style/Widget.AppCompat.Button">
-        </androidx.appcompat.widget.AppCompatButton>
-
-        <TextView
-            android:id="@+id/text_footer"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center"
-            android:layout_below="@id/button"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:minHeight="@dimen/height_footer"
-            android:padding="@dimen/padding_medium"
-            android:textColor="@color/text_footer"
-            android:textSize="@dimen/text_footer"
-            tools:text="@string/simperium_footer_login">
-        </TextView>
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/button"
+                android:backgroundTint="@color/button_primary_disabled_selector"
+                android:layout_below="@id/input_password"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/padding_medium"
+                android:layout_width="match_parent"
+                android:minHeight="@dimen/height_button"
+                android:textAllCaps="true"
+                android:textColor="@color/text_button_primary"
+                tools:text="@string/simperium_button_login"
+                style="@style/Widget.AppCompat.Button">
+            </androidx.appcompat.widget.AppCompatButton>
+
+            <TextView
+                android:id="@+id/text_footer"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                android:layout_below="@id/button"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:minHeight="@dimen/height_footer"
+                android:padding="@dimen/padding_medium"
+                android:textColor="@color/text_footer"
+                android:textSize="@dimen/text_footer"
+                tools:text="@string/simperium_footer_login">
+            </TextView>
+
+        </RelativeLayout>
 
     </RelativeLayout>
 
-</RelativeLayout>
+</ScrollView>
diff --git a/Simplenote/src/main/res/values-night/colors.xml b/Simplenote/src/main/res/values-night/colors.xml
index 400140567..29a034266 100644
--- a/Simplenote/src/main/res/values-night/colors.xml
+++ b/Simplenote/src/main/res/values-night/colors.xml
@@ -3,6 +3,7 @@
 <resources>
 
     <!-- SEMANTIC -->
+    <color name="authentication_logo">@color/simplenote_blue_20</color>
     <color name="background_list_black_activated">@color/background_dark_black_8</color>
     <color name="background_list_black_ripple">@color/background_dark_black_2</color>
     <color name="background_list_classic_activated">@color/blue_70</color>
@@ -24,12 +25,17 @@
     <color name="style_preview_default_title">@color/text_title_dark</color>
     <color name="text_button_red">@color/red_20</color>
 
-    <!-- STANDALONE CLARIFICATION TEXT -->
-    <color name="text_description">@color/gray_20</color>
-    <color name="text_description_secondary">@color/gray_30</color>
-
-    <!-- Button text colors for dark theme -->
-    <color name="text_button_primary">@color/gray_1</color>
-    <color name="text_button_secondary">@color/gray_1</color>
+    <!-- SIMPERIUM -->
+    <color name="background">@color/background_dark</color>
+    <color name="background_button_disabled">@color/gray_50</color>
+    <color name="background_button_primary">@color/simplenote_blue_20</color>
+    <color name="background_button_secondary">@color/wordpress_blue_20</color>
+    <color name="text_button_disabled">@color/gray_50</color>
+    <color name="text_button_primary">@color/gray_100</color>
+    <color name="text_button_secondary">@color/gray_100</color>
+    <color name="text_button_tertiary">@color/simplenote_blue_10</color>
+    <color name="text_link">@color/simplenote_blue_20</color>
+    <color name="text_subtitle">@android:color/white</color>
+    <color name="text_title">@android:color/white</color>
 
 </resources>
diff --git a/Simplenote/src/main/res/values-night/styles.xml b/Simplenote/src/main/res/values-night/styles.xml
index 044541ef2..e1cfe6c9a 100755
--- a/Simplenote/src/main/res/values-night/styles.xml
+++ b/Simplenote/src/main/res/values-night/styles.xml
@@ -182,6 +182,10 @@
         <item name="statusBarBackground">@android:color/transparent</item>
     </style>
 
+    <style name="Style.Authentication" parent="Theme.Simplestyle">
+        <item name="toolbarColor">@color/background_dark</item>
+    </style>
+
     <style name="Style.Black" parent="Theme.Simplestyle">
         <item name="android:alertDialogTheme">@style/Dialog.Black</item>
         <item name="android:navigationBarColor">@android:color/black</item>
@@ -329,10 +333,4 @@
         <item name="android:backgroundTint">@color/background_dark_sepia_8</item>
     </style>
 
-    <!-- Dark mode variant of SignUpOverride theme -->
-    <style name="SignUpOverride" parent="Theme.Simplestyle">
-        <item name="mainBackgroundColor">@color/background_dark</item>
-        <item name="onMainBackgroundColor">@android:color/white</item>
-    </style>
-
 </resources>
diff --git a/Simplenote/src/main/res/values/attrs.xml b/Simplenote/src/main/res/values/attrs.xml
index 8fff73677..452da58ac 100644
--- a/Simplenote/src/main/res/values/attrs.xml
+++ b/Simplenote/src/main/res/values/attrs.xml
@@ -8,7 +8,6 @@
     <attr name="notePreviewColor" format="reference|color"/>
     <attr name="noteEditorTextColor" format="reference|color"/>
     <attr name="mainBackgroundColor" format="reference|color"/>
-    <attr name="onMainBackgroundColor" format="reference|color"/>
     <attr name="sheetBackgroundColor" format="reference|color"/>
     <attr name="dividerColor" format="reference|color"/>
     <attr name="iconTintColor" format="reference|color"/>
diff --git a/Simplenote/src/main/res/values/colors.xml b/Simplenote/src/main/res/values/colors.xml
index 75f13b15f..8097350bb 100644
--- a/Simplenote/src/main/res/values/colors.xml
+++ b/Simplenote/src/main/res/values/colors.xml
@@ -55,6 +55,7 @@
     <color name="passcodelock_prompt_text_color">@android:color/white</color>
 
     <!-- SEMANTIC -->
+    <color name="authentication_logo">@color/simplenote_blue_50</color>
     <color name="background_dark">@color/background_dark_1</color>
     <color name="background_dark_highlight">@color/background_dark_8</color>
     <color name="background_dark_highlight_drawer">#4d5152</color>
@@ -128,11 +129,8 @@
     <color name="text_title_light">@color/gray_80</color>
     <color name="text_button_red">@color/red_50</color>
 
-    <!-- STANDALONE CLARIFICATION TEXT -->
-    <color name="text_description">@color/gray_80</color>
-    <color name="text_description_secondary">@color/gray_50</color>
-
     <!-- SIMPERIUM -->
+    <color name="background">@color/background_light</color>
     <color name="background_button_disabled">@color/gray_20</color>
     <color name="background_button_primary">@color/simplenote_blue_50</color>
     <color name="background_button_secondary">@color/wordpress_blue_50</color>
diff --git a/Simplenote/src/main/res/values/styles.xml b/Simplenote/src/main/res/values/styles.xml
index baa1f5761..ca96380a7 100644
--- a/Simplenote/src/main/res/values/styles.xml
+++ b/Simplenote/src/main/res/values/styles.xml
@@ -122,6 +122,14 @@
         <item name="iconTint">?attr/colorAccent</item>
     </style>
 
+    <style name="Style.Authentication" parent="Theme.Simplestyle">
+        <item name="toolbarColor">@color/background_light</item>
+    </style>
+
+    <style name="TextInput" parent="ThemeOverlay.MaterialComponents">
+        <item name="colorPrimary">?attr/colorAccent</item>
+    </style>
+
     <style name="Theme.Simplestyle" parent="Base.Theme.Simplestyle">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
@@ -592,9 +600,4 @@
         <item name="android:backgroundTint">@color/background_light_sepia</item>
     </style>
 
-    <style name="SignUpOverride" parent="Theme.Simplestyle">
-        <item name="mainBackgroundColor">@color/background_light</item>
-        <item name="onMainBackgroundColor">#000000</item>
-    </style>
-
 </resources>