diff --git a/Simplenote/build.gradle b/Simplenote/build.gradle
index a48c58be2..d070f825d 100644
--- a/Simplenote/build.gradle
+++ b/Simplenote/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     // Fastlane screengrab for screenshots automation
     androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion"
     // Automattic and WordPress dependencies
-    implementation 'com.automattic:simperium:v1.3.1'
+    implementation 'com.automattic:simperium:v1.4.0'
     implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion"
     implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion"
 
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 4b47e4f0d..bebe34929 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/NewCredentialsActivity.kt
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/NewCredentialsActivity.kt
@@ -30,6 +30,7 @@ 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.SystemBarUtils
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.textfield.TextInputLayout
 import com.simperium.Simperium
@@ -249,6 +250,15 @@ open class NewCredentialsActivity : AppCompatActivity() {
         ) {
             Handler().postDelayed({ startLogin() }, 600L)
         }
+
+        // Setup edge-to-edge display with proper WindowInsets handling
+        // Use auto-theming to properly handle status bar appearance based on theme
+        SystemBarUtils.setupEdgeToEdgeWithAutoTheming(
+            this,
+            findViewById(R.id.main_parent_view),
+            toolbar,
+            findViewById(R.id.content_view)
+        );
     }
 
     protected fun handleResponseSuccess(user: User, userId: String?, token: String?, provider: AuthProvider) {
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 7ce9eb4dd..839943087 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteAuthenticationActivity.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteAuthenticationActivity.java
@@ -70,7 +70,10 @@ public void onCreate(Bundle savedInstanceState) {
         // 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);
-            SystemBarUtils.setSystemBarsAppearance(this, true, true); // Dark icons on light background
+            // Use auto-theming to properly handle dark mode
+            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) -> {
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 6b5e73cba..eb153339c 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteSignupActivity.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteSignupActivity.java
@@ -48,14 +48,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         initToolbar(isSignUp);
         
         // Setup edge-to-edge display with proper WindowInsets handling
-        // Toolbar has white background, so we need light status bar appearance (dark icons)
-        SystemBarUtils.setupEdgeToEdgeWithToolbar(
+        // Use auto-theming to properly handle status bar appearance based on theme
+        SystemBarUtils.setupEdgeToEdgeWithAutoTheming(
             this,
             findViewById(R.id.main),
             mToolbar,
-            findViewById(R.id.fragment_container),
-            true, // Light status bar (dark icons) for white toolbar background
-            true  // Light navigation bar (dark icons)
+            findViewById(R.id.fragment_container)
         );
     }
 
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/utils/ThemeUtils.java b/Simplenote/src/main/java/com/automattic/simplenote/utils/ThemeUtils.java
index 081f45489..4dc399b6a 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/utils/ThemeUtils.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/utils/ThemeUtils.java
@@ -66,16 +66,14 @@ public static void setTheme(Activity activity) {
             }
         }
 
-        switch (PrefUtils.getIntPref(activity, PrefUtils.PREF_THEME, THEME_LIGHT)) {
-            case THEME_AUTO:
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_TIME);
-                break;
+        switch (PrefUtils.getIntPref(activity, PrefUtils.PREF_THEME, THEME_SYSTEM)) {
             case THEME_DARK:
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                 break;
             case THEME_LIGHT:
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                 break;
+            case THEME_AUTO:
             case THEME_SYSTEM:
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
                 break;
diff --git a/Simplenote/src/main/res/layout/activity_signup.xml b/Simplenote/src/main/res/layout/activity_signup.xml
index f96187a25..4dd3d0ac3 100644
--- a/Simplenote/src/main/res/layout/activity_signup.xml
+++ b/Simplenote/src/main/res/layout/activity_signup.xml
@@ -13,10 +13,12 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@android:color/white"
+        android:background="?attr/toolbarColor"
         android:elevation="0dp"
-        app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light"
-        app:theme="@style/ThemeOverlay.MaterialComponents.Light"
+        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 a9186f568..adeb8fedf 100644
--- a/Simplenote/src/main/res/layout/authentication_fancy_or.xml
+++ b/Simplenote/src/main/res/layout/authentication_fancy_or.xml
@@ -18,6 +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:paddingHorizontal="5dp"
     />
 <View
diff --git a/Simplenote/src/main/res/layout/fragment_confirmation.xml b/Simplenote/src/main/res/layout/fragment_confirmation.xml
index 605219fde..9661b18cc 100644
--- a/Simplenote/src/main/res/layout/fragment_confirmation.xml
+++ b/Simplenote/src/main/res/layout/fragment_confirmation.xml
@@ -13,7 +13,7 @@
         android:layout_gravity="center"
         android:layout_marginBottom="@dimen/padding_large"
         android:src="@drawable/ic_mail"
-        android:tint="@color/gray_50" />
+        android:tint="@color/text_description" />
 
     <com.automattic.simplenote.widgets.RobotoRegularTextView
         android:id="@+id/email_confirmation_text"
@@ -23,7 +23,7 @@
         android:layout_marginEnd="@dimen/padding_extra_extra_large"
         android:layout_marginBottom="@dimen/padding_extra_large"
         android:gravity="center"
-        android:textColor="@color/gray_80"
+        android:textColor="@color/text_description"
         android:textSize="16sp"
         tools:text="We've sent an email to example@email.com. Please check your inbox and follow the instructions." />
 
@@ -35,8 +35,8 @@
         android:layout_marginEnd="@dimen/padding_extra_extra_large"
         android:layout_marginBottom="@dimen/padding_extra_large"
         android:gravity="center"
-        android:textColor="@color/gray_50"
-        android:textColorLink="@color/gray_50"
+        android:textColor="@color/text_description_secondary"
+        android:textColorLink="@color/text_description_secondary"
         android:textSize="16sp"
         tools:text="Didn't get an email? You may already have an account. Contact simplenote@support.com for help." />
 
diff --git a/Simplenote/src/main/res/layout/fragment_login.xml b/Simplenote/src/main/res/layout/fragment_login.xml
index 4a5f7b5ef..f180096b9 100644
--- a/Simplenote/src/main/res/layout/fragment_login.xml
+++ b/Simplenote/src/main/res/layout/fragment_login.xml
@@ -42,7 +42,7 @@
         android:minHeight="@dimen/height_button"
         android:text="@string/magic_link_login"
         android:textAllCaps="true"
-        android:textColor="@android:color/white" />
+        android:textColor="@color/text_button_primary" />
 
     <TextView
         android:id="@+id/sign_in_login_manually"
@@ -51,6 +51,7 @@
         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"/>
 
@@ -73,6 +74,6 @@
         android:minHeight="@dimen/height_button"
         android:text="@string/simperium_button_login_other"
         android:textAllCaps="true"
-        android:textColor="@android:color/white" />
+        android:textColor="@color/text_button_primary" />
 
 </RelativeLayout>
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 78cd09ed6..a9aa601ee 100644
--- a/Simplenote/src/main/res/layout/fragment_magic_link_code.xml
+++ b/Simplenote/src/main/res/layout/fragment_magic_link_code.xml
@@ -72,6 +72,6 @@
         android:minHeight="@dimen/height_button"
         android:text="@string/magic_link_confirm_code_enter_pass_label"
         android:textAllCaps="true"
-        android:textColor="@android:color/black"/>
+        android:textColor="@color/text_button_tertiary"/>
 
 </LinearLayout>
diff --git a/Simplenote/src/main/res/layout/fragment_signup.xml b/Simplenote/src/main/res/layout/fragment_signup.xml
index 356dc9447..707e3e48b 100644
--- a/Simplenote/src/main/res/layout/fragment_signup.xml
+++ b/Simplenote/src/main/res/layout/fragment_signup.xml
@@ -41,7 +41,7 @@
         android:minHeight="@dimen/height_button"
         android:text="@string/simperium_button_signup"
         android:textAllCaps="true"
-        android:textColor="@android:color/white" />
+        android:textColor="@color/text_button_primary" />
 
     <TextView
         android:id="@+id/text_footer"
diff --git a/Simplenote/src/main/res/layout/new_activity_credentials.xml b/Simplenote/src/main/res/layout/new_activity_credentials.xml
index 0b0e8fc2d..c3d366dcf 100644
--- a/Simplenote/src/main/res/layout/new_activity_credentials.xml
+++ b/Simplenote/src/main/res/layout/new_activity_credentials.xml
@@ -4,34 +4,38 @@
     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"
+    android:id="@+id/main_parent_view"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="false">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
-        android:background="@android:color/white"
+        android:background="?attr/toolbarColor"
         android:elevation="0dp"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
-        app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light"
-        app:theme="@style/ThemeOverlay.MaterialComponents.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.MaterialComponents"
+        app:theme="@style/ThemeOverlay.MaterialComponents"
         tools:layout_height="wrap_content">
     </androidx.appcompat.widget.Toolbar>
 
     <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/margin_default"
+        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:layout_alignParentTop="true"
             >
@@ -74,7 +78,7 @@
             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_quarter"
+            android:layout_marginTop="@dimen/margin_default"
             android:layout_width="match_parent"
             android:hint="@string/simperium_hint_password"
             app:endIconMode="password_toggle"
@@ -94,8 +98,8 @@
             android:backgroundTint="@color/button_primary_disabled_selector"
             android:layout_below="@id/input_password"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_default_quarter"
-            android:layout_marginTop="@dimen/margin_default_quarter"
+            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"
@@ -114,7 +118,7 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:minHeight="@dimen/height_footer"
-            android:padding="@dimen/margin_default_quarter"
+            android:padding="@dimen/padding_medium"
             android:textColor="@color/text_footer"
             android:textSize="@dimen/text_footer"
             tools:text="@string/simperium_footer_login">
diff --git a/Simplenote/src/main/res/values-night/colors.xml b/Simplenote/src/main/res/values-night/colors.xml
index cd9cca7a7..400140567 100644
--- a/Simplenote/src/main/res/values-night/colors.xml
+++ b/Simplenote/src/main/res/values-night/colors.xml
@@ -23,4 +23,13 @@
     <color name="style_preview_default_content">@color/text_content_dark</color>
     <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>
+
 </resources>
diff --git a/Simplenote/src/main/res/values-night/styles.xml b/Simplenote/src/main/res/values-night/styles.xml
index d801e6fc3..044541ef2 100755
--- a/Simplenote/src/main/res/values-night/styles.xml
+++ b/Simplenote/src/main/res/values-night/styles.xml
@@ -329,4 +329,10 @@
         <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-v29/arrays.xml b/Simplenote/src/main/res/values-v29/arrays.xml
index 3c9d60c14..75900f832 100644
--- a/Simplenote/src/main/res/values-v29/arrays.xml
+++ b/Simplenote/src/main/res/values-v29/arrays.xml
@@ -24,7 +24,6 @@
     <string-array name="array_theme_names" tools:ignore="InconsistentArrays">
         <item>@string/theme_light</item>
         <item>@string/theme_dark</item>
-        <item>@string/theme_auto</item>
         <item>@string/theme_system</item>
     </string-array>
 
diff --git a/Simplenote/src/main/res/values/arrays.xml b/Simplenote/src/main/res/values/arrays.xml
index aecfc5791..ee971972a 100644
--- a/Simplenote/src/main/res/values/arrays.xml
+++ b/Simplenote/src/main/res/values/arrays.xml
@@ -24,7 +24,7 @@
     <string-array name="array_theme_names" tools:ignore="InconsistentArrays">
         <item>@string/theme_light</item>
         <item>@string/theme_dark</item>
-        <item>@string/theme_auto</item>
+        <item>@string/theme_system</item>
     </string-array>
 
     <string-array name="array_theme_values" translatable="false" tools:ignore="InconsistentArrays">
diff --git a/Simplenote/src/main/res/values/colors.xml b/Simplenote/src/main/res/values/colors.xml
index e46ca47f7..75f13b15f 100644
--- a/Simplenote/src/main/res/values/colors.xml
+++ b/Simplenote/src/main/res/values/colors.xml
@@ -128,6 +128,10 @@
     <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_button_disabled">@color/gray_20</color>
     <color name="background_button_primary">@color/simplenote_blue_50</color>
diff --git a/Simplenote/src/main/res/xml/preferences.xml b/Simplenote/src/main/res/xml/preferences.xml
index 15ae53fde..f07c8f745 100644
--- a/Simplenote/src/main/res/xml/preferences.xml
+++ b/Simplenote/src/main/res/xml/preferences.xml
@@ -43,7 +43,7 @@
 
         <ListPreference
             android:key="pref_key_theme"
-            android:defaultValue="0"
+            android:defaultValue="2"
             android:entries="@array/array_theme_names"
             android:entryValues="@array/array_theme_values"
             android:summary="%s"