diff --git a/PLAYSTORE.txt b/PLAYSTORE.txt
index 54830a57a5..1a04676321 100644
--- a/PLAYSTORE.txt
+++ b/PLAYSTORE.txt
@@ -65,6 +65,7 @@ All pro features are convenience or advanced features.
 
 * Account/identity/folder colors
 * Colored stars
+* Extra themes
 * Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
 * Configurable notification actions
 * Snooze messages
diff --git a/README.md b/README.md
index 865f476d39..cd1e7c9a10 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,7 @@ All pro features are convenience or advanced features.
 
 * Account/identity/folder colors
 * Colored stars ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq107))
+* Extra themes
 * Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
 * Configurable notification actions
 * Snooze messages ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq67))
diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index de85f23061..7e1070f10e 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -86,6 +86,11 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
             int uiMode = getResources().getConfiguration().uiMode;
             Log.i("UI mode=" + uiMode);
 
+            if (!this.getClass().equals(ActivitySetup.class) &&
+                    !ActivityBilling.isPro(this) &&
+                    (theme.contains("yellow") || theme.contains("red")))
+                theme = "blue_orange_light";
+
             switch (theme) {
                 case "light":
                 case "blue_orange_light":
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 9e5b2dd817..e88a02857f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -694,6 +694,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             swDark = dview.findViewById(R.id.swDark);
             swSystem = dview.findViewById(R.id.swSystem);
 
+            Helper.linkPro(dview.findViewById(R.id.tvThemeYellowPurplePro));
+            Helper.linkPro(dview.findViewById(R.id.tvThemeRedGreenPro));
+
             final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
             String theme = prefs.getString("theme", "light");
 
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index a601d584e8..ec8b60bc5f 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -44,6 +44,15 @@
                 android:text="@string/title_setup_theme_yellow_purple"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
+            <TextView
+                android:id="@+id/tvThemeYellowPurplePro"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:text="@string/title_pro_feature"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?android:attr/textColorLink" />
+
             <RadioButton
                 android:id="@+id/rbThemeRedGreen"
                 android:layout_width="wrap_content"
@@ -52,6 +61,15 @@
                 android:text="@string/title_setup_theme_red_green"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
+            <TextView
+                android:id="@+id/tvThemeRedGreenPro"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:text="@string/title_pro_feature"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?android:attr/textColorLink" />
+
             <RadioButton
                 android:id="@+id/rbThemeGrey"
                 android:layout_width="wrap_content"
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
index a731e37e32..ff9739d3df 100644
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@@ -65,6 +65,7 @@ All pro features are convenience or advanced features.
 
 * Account/identity/folder colors
 * Colored stars
+* Extra themes
 * Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
 * Configurable notification actions
 * Snooze messages