diff --git a/src/components/views/settings/tabs/GeneralSettingsTab.js b/src/components/views/settings/tabs/GeneralSettingsTab.js
index c8816325c0..c248ba23dd 100644
--- a/src/components/views/settings/tabs/GeneralSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralSettingsTab.js
@@ -73,6 +73,7 @@ export default class GeneralSettingsTab extends React.Component {
                                   disabled={!this.state.enableProfileSave}>
                     {_t("Save")}
                 </AccessibleButton>
+                <div>FLAIR</div>
             </form>
         );
 
@@ -84,11 +85,51 @@ export default class GeneralSettingsTab extends React.Component {
         );
     }
 
+    _renderAccountSection() {
+        return (
+            <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Account")}</span>
+                <p>ACCOUNT SECTION</p>
+            </div>
+        );
+    }
+
+    _renderLanguageSection() {
+        return (
+            <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Language and region")}</span>
+                <p>LANGUAGE SECTION</p>
+            </div>
+        );
+    }
+
+    _renderThemeSection() {
+        return (
+            <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
+                <p>THEME SECTION</p>
+            </div>
+        );
+    }
+
+    _renderManagementSection() {
+        return (
+            <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Account management")}</span>
+                <p>MANAGEMENT SECTION</p>
+            </div>
+        );
+    }
+
     render() {
         return (
             <div className="mx_SettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("General")}</div>
                 {this._renderProfileSection()}
+                {this._renderAccountSection()}
+                {this._renderLanguageSection()}
+                {this._renderThemeSection()}
+                {this._renderManagementSection()}
             </div>
         );
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6bf857be07..5a85f8c4f3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -405,6 +405,10 @@
     "Display Name": "Display Name",
     "Save": "Save",
     "Profile": "Profile",
+    "Account": "Account",
+    "Language and region": "Language and region",
+    "Theme": "Theme",
+    "Account management": "Account management",
     "General": "General",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
@@ -431,6 +435,7 @@
     "Encrypted by an unverified device": "Encrypted by an unverified device",
     "Unencrypted message": "Unencrypted message",
     "Please select the destination room for this message": "Please select the destination room for this message",
+    "Scroll to bottom of page": "Scroll to bottom of page",
     "Blacklisted": "Blacklisted",
     "Verified": "Verified",
     "Unverified": "Unverified",
@@ -1065,6 +1070,8 @@
     "Set status": "Set status",
     "Set a new status...": "Set a new status...",
     "View Community": "View Community",
+    "Login": "Login",
+    "powered by Matrix": "powered by Matrix",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
     "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
     "Custom Server Options": "Custom Server Options",
@@ -1082,7 +1089,6 @@
     "Please enter the code it contains:": "Please enter the code it contains:",
     "Code": "Code",
     "Start authentication": "Start authentication",
-    "powered by Matrix": "powered by Matrix",
     "The email field must not be blank.": "The email field must not be blank.",
     "The user name field must not be blank.": "The user name field must not be blank.",
     "The phone number field must not be blank.": "The phone number field must not be blank.",
@@ -1155,7 +1161,6 @@
     "Couldn't load home page": "Couldn't load home page",
     "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
     "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
-    "Login": "Login",
     "Invalid configuration: Cannot supply a default homeserver URL and a default server name": "Invalid configuration: Cannot supply a default homeserver URL and a default server name",
     "Failed to reject invitation": "Failed to reject invitation",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
@@ -1197,7 +1202,6 @@
     "Directory": "Directory",
     "Search for a room": "Search for a room",
     "#example": "#example",
-    "Scroll to bottom of page": "Scroll to bottom of page",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.",
@@ -1209,8 +1213,6 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Resend message</resendText> or <cancelText>cancel message</cancelText> now.",
     "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
-    "%(count)s new messages|other": "%(count)s new messages",
-    "%(count)s new messages|one": "%(count)s new message",
     "Active call": "Active call",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
@@ -1294,7 +1296,6 @@
     "Email": "Email",
     "Add email address": "Add email address",
     "Display name": "Display name",
-    "Account": "Account",
     "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
     "Logged in as:": "Logged in as:",
     "Access Token:": "Access Token:",