diff --git a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
index 00c660aa0..b279175e5 100644
--- a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
@@ -24,7 +24,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceState);
         // Check prefs on every activity starts
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
             setTheme(R.style.DarkAppTheme);
         }else {
             setTheme(R.style.LightAppTheme); // default
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
index c93332bfe..e0e61cbc1 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
@@ -13,7 +13,7 @@ public class BaseActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
             currentTheme = true;
             setTheme(R.style.DarkAppTheme);
         }else {
@@ -26,7 +26,7 @@ public class BaseActivity extends Activity {
     @Override
     protected void onResume() {
         // Restart activity if theme is changed
-        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
+        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
         if(currentTheme!=newTheme){ // is activity theme changed
             Intent intent = getIntent();
             finish();
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
index 606d30347..bd25e6296 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
@@ -12,7 +12,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
             currentTheme = true;
             setTheme(R.style.DarkAppTheme);
         }else {
@@ -25,7 +25,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         // Restart activity if theme is changed
-        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
+        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
         if(currentTheme!=newTheme){ //is activity theme changed
             Intent intent = getIntent();
             finish();
diff --git a/app/src/main/res/layout-land/welcome_do_upload.xml b/app/src/main/res/layout-land/welcome_do_upload.xml
index 3aab6ca70..17db68f8f 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -78,6 +78,8 @@
                 android:layout_gravity="center"
                 android:textAlignment="textStart"
                 android:paddingTop="16dp"
-                android:gravity="start"/>
+                android:gravity="start"
+                android:textColor="@android:color/white"
+            />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/welcome_dont_upload.xml b/app/src/main/res/layout-land/welcome_dont_upload.xml
index bef612905..df7fa1e40 100644
--- a/app/src/main/res/layout-land/welcome_dont_upload.xml
+++ b/app/src/main/res/layout-land/welcome_dont_upload.xml
@@ -60,6 +60,8 @@
             android:layout_gravity="center"
             android:textAlignment="textStart"
             android:paddingTop="16dp"
-            android:gravity="start"/>
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/welcome_image_details.xml b/app/src/main/res/layout-land/welcome_image_details.xml
index bbd0b0392..b5dbe0824 100644
--- a/app/src/main/res/layout-land/welcome_image_details.xml
+++ b/app/src/main/res/layout-land/welcome_image_details.xml
@@ -45,6 +45,8 @@
             android:layout_gravity="center"
             android:textAlignment="textStart"
             android:paddingTop="16dp"
-            android:gravity="start"/>
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/welcome_wikipedia.xml b/app/src/main/res/layout-land/welcome_wikipedia.xml
index 3b52dfd3a..d7c77669d 100644
--- a/app/src/main/res/layout-land/welcome_wikipedia.xml
+++ b/app/src/main/res/layout-land/welcome_wikipedia.xml
@@ -40,6 +40,8 @@
                 android:layout_gravity="center"
                 android:textAlignment="center"
                 android:paddingTop="16dp"
-                android:gravity="center_horizontal"/>
+                android:gravity="center_horizontal"
+                android:textColor="@android:color/white"
+            />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/welcome_do_upload.xml b/app/src/main/res/layout/welcome_do_upload.xml
index d983e5684..74d62ec8a 100644
--- a/app/src/main/res/layout/welcome_do_upload.xml
+++ b/app/src/main/res/layout/welcome_do_upload.xml
@@ -74,5 +74,6 @@
         android:textAlignment="textStart"
         android:paddingTop="16dp"
         android:gravity="start"
+        android:textColor="@android:color/white"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome_dont_upload.xml b/app/src/main/res/layout/welcome_dont_upload.xml
index c2591943d..516b21c90 100644
--- a/app/src/main/res/layout/welcome_dont_upload.xml
+++ b/app/src/main/res/layout/welcome_dont_upload.xml
@@ -53,5 +53,6 @@
         android:textAlignment="textStart"
         android:paddingTop="16dp"
         android:gravity="start"
+        android:textColor="@android:color/white"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome_image_details.xml b/app/src/main/res/layout/welcome_image_details.xml
index 3653733dd..4fed858ea 100644
--- a/app/src/main/res/layout/welcome_image_details.xml
+++ b/app/src/main/res/layout/welcome_image_details.xml
@@ -39,5 +39,6 @@
         android:textAlignment="textStart"
         android:paddingTop="16dp"
         android:gravity="start"
+        android:textColor="@android:color/white"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome_wikipedia.xml b/app/src/main/res/layout/welcome_wikipedia.xml
index e6490d2b5..ad48eb8d9 100644
--- a/app/src/main/res/layout/welcome_wikipedia.xml
+++ b/app/src/main/res/layout/welcome_wikipedia.xml
@@ -37,5 +37,6 @@
         android:textAlignment="center"
         android:paddingTop="16dp"
         android:gravity="center_horizontal"
+        android:textColor="@android:color/white"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b7d8e6974..ddb4c93d6 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -21,7 +21,7 @@
 
     <CheckBoxPreference
         android:title="@string/preference_theme"
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:summary="@string/preference_theme_summary"
         android:key="theme" />