diff --git a/FAQ.md b/FAQ.md
index 4fdf89dbcd..71bbbb3478 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -56,8 +56,8 @@ For authorizing:
* ~~Compose lists and tables~~ (this requires a rich text editor, see [this FAQ](#user-content-faq99))
* ~~Pinch zoom text size~~
* ~~Display GIFs~~
+* ~~Themes~~ (a grey theme was added because this is what most people seems to want)
* Send as attachment
-* Themes
* Search for settings
* Select any day for time conditions
* Widget for selected account
diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 4c793c9ce0..16f5cadbb8 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -78,6 +78,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
setTheme(R.style.AppThemeDark);
else if ("black".equals(theme))
setTheme(R.style.AppThemeBlack);
+ else if ("grey".equals(theme))
+ setTheme(R.style.AppThemeGrey);
else if ("system".equals(theme)) {
int uiMode = getResources().getConfiguration().uiMode;
Log.i("UI mode=" + uiMode);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 31afec5334..a47805f990 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -392,6 +392,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
case "black":
rgTheme.check(R.id.rbThemeBlack);
break;
+ case "grey":
+ rgTheme.check(R.id.rbThemeGrey);
+ break;
case "system":
rgTheme.check(R.id.rbThemeSystem);
break;
@@ -414,6 +417,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
case R.id.rbThemeBlack:
prefs.edit().putString("theme", "black").apply();
break;
+ case R.id.rbThemeGrey:
+ prefs.edit().putString("theme", "grey").apply();
+ break;
case R.id.rbThemeSystem:
prefs.edit().putString("theme", "system").apply();
break;
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index b82bcb8e97..b5c7a55aaf 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -39,6 +39,15 @@
android:text="@string/title_setup_black_theme"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+
-
+
-
+
#039be5
- #026ca0
+ #006db3
#ffb300
-
- #35afea
- #ffc233
- #b27d00
+ #c68400
#ff0000
-
+
#01579b
- #003c6c
+ #002f6c
+
+
+ #424242
+ #1b1b1b
+ #90a4ae
#fff
#ccc
#fff
- #026ca0
+ #006db3
#fff
#7f000000
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 18ef9f1463..bf937ef053 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,6 +182,7 @@
Light theme
Dark theme
Black theme
+ Grey theme
System theme
Advanced
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b97fa656bd..6133a42086 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -73,6 +73,18 @@
- @android:color/black
+
+