diff --git a/src/components/views/settings/tabs/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
index bfcc7b945c..f368ce93f0 100644
--- a/src/components/views/settings/tabs/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
@@ -138,17 +138,14 @@ export default class GeneralUserSettingsTab extends React.Component {
     }
 
     _renderThemeSection() {
-        // TODO: Re-enable theme selection once the themes actually work
         const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
         return (
             <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
                 <Field id="theme" label={_t("Theme")} element="select" disabled={true}
                        value={this.state.theme} onChange={this._onThemeChange}>
-                    <option value="light">{_t("Light theme")}</option>
+                    <option value="dharma">{_t("Default theme")}</option>
                     <option value="dark">{_t("Dark theme")}</option>
-                    <option value="dharma">{_t("2018 theme")}</option>
-                    <option value="status">{_t("Status.im theme")}</option>
                 </Field>
                 <SettingsFlag name="useCompactLayout" level={SettingLevel.ACCOUNT} />
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7376b35fe5..74c32e2b30 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -522,10 +522,8 @@
     "Phone numbers": "Phone numbers",
     "Language and region": "Language and region",
     "Theme": "Theme",
-    "Light theme": "Light theme",
+    "Default theme": "Default theme",
     "Dark theme": "Dark theme",
-    "2018 theme": "2018 theme",
-    "Status.im theme": "Status.im theme",
     "Account management": "Account management",
     "Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
     "Close Account": "Close Account",