diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index de6636e116..075bd28a11 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/* TODO: Consider unifying with general input styles in _dharma.scss */
+/* TODO: Consider unifying with general input styles in _light.scss */
 
 .mx_Field {
     position: relative;
diff --git a/res/themes/dark/css/dark.scss b/res/themes/dark/css/dark.scss
index a869dc39e3..e7ae7c8cf8 100644
--- a/res/themes/dark/css/dark.scss
+++ b/res/themes/dark/css/dark.scss
@@ -1,5 +1,5 @@
-@import "../../dharma/css/_paths.scss";
-@import "../../dharma/css/_fonts.scss";
-@import "../../dharma/css/_dharma.scss";
+@import "../../light/css/_paths.scss";
+@import "../../light/css/_fonts.scss";
+@import "../../light/css/_light.scss";
 @import "_dark.scss";
 @import "../../../../res/css/_components.scss";
diff --git a/res/themes/dharma/css/_fonts.scss b/res/themes/light/css/_fonts.scss
similarity index 100%
rename from res/themes/dharma/css/_fonts.scss
rename to res/themes/light/css/_fonts.scss
diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/light/css/_light.scss
similarity index 100%
rename from res/themes/dharma/css/_dharma.scss
rename to res/themes/light/css/_light.scss
diff --git a/res/themes/dharma/css/_paths.scss b/res/themes/light/css/_paths.scss
similarity index 100%
rename from res/themes/dharma/css/_paths.scss
rename to res/themes/light/css/_paths.scss
diff --git a/res/themes/dharma/css/dharma.scss b/res/themes/light/css/light.scss
similarity index 79%
rename from res/themes/dharma/css/dharma.scss
rename to res/themes/light/css/light.scss
index 032154f999..6acb2d9d94 100644
--- a/res/themes/dharma/css/dharma.scss
+++ b/res/themes/light/css/light.scss
@@ -1,4 +1,4 @@
 @import "_paths.scss";
 @import "_fonts.scss";
-@import "_dharma.scss";
+@import "_light.scss";
 @import "../../../../res/css/_components.scss";
diff --git a/src/components/views/settings/tabs/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
index 6109f74f35..378a54a51a 100644
--- a/src/components/views/settings/tabs/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
@@ -145,7 +145,7 @@ export default class GeneralUserSettingsTab extends React.Component {
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
                 <Field id="theme" label={_t("Theme")} element="select"
                        value={this.state.theme} onChange={this._onThemeChange}>
-                    <option value="dharma">{_t("Default theme")}</option>
+                    <option value="light">{_t("Default theme")}</option>
                     <option value="dark">{_t("Dark theme")}</option>
                 </Field>
                 <SettingsFlag name="useCompactLayout" level={SettingLevel.ACCOUNT} />
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 6ab3cab80c..bd9d81996d 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -233,7 +233,7 @@ export const SETTINGS = {
     },
     "theme": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: "dharma",
+        default: "light",
         controller: new ThemeController(),
     },
     "webRtcForcePeerToPeer": {
diff --git a/src/settings/controllers/ThemeController.js b/src/settings/controllers/ThemeController.js
index 7feff9b7ae..615fc4c192 100644
--- a/src/settings/controllers/ThemeController.js
+++ b/src/settings/controllers/ThemeController.js
@@ -17,7 +17,7 @@ limitations under the License.
 import SettingController from "./SettingController";
 
 const SUPPORTED_THEMES = [
-    "dharma",
+    "light",
     "dark",
 ];
 
@@ -25,7 +25,7 @@ export default class ThemeController extends SettingController {
     getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
         // Override in case some no longer supported theme is stored here
         if (!SUPPORTED_THEMES.includes(calculatedValue)) {
-            return "dharma";
+            return "light";
         }
 
         return null; // no override