2 files changed, 10 insertions, 14 deletions
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 0ce679a27..5b03f0130 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -1130,12 +1130,6 @@
   "user.settings.advance.sendDesc": "If enabled 'Enter' inserts a new line and 'Ctrl + Enter' submits the message.",
   "user.settings.advance.preReleaseDesc": "Check any pre-released features you'd like to preview.  You may also need to refresh the page before the setting will take effect.",
   "user.settings.advance.title": "Advanced Settings",
-  "user.settings.appearance.themeColors": "Theme Colors",
-  "user.settings.appearance.customTheme": "Custom Theme",
-  "user.settings.appearance.save": "Save",
-  "user.settings.appearance.cancel": "Cancel",
-  "user.settings.appearance.title": "Appearance Settings",
-  "user.settings.appearance.import": "Import theme colors from Slack",
   "user.settings.developer.applicationsPreview": "Applications (Preview)",
   "user.settings.developer.thirdParty": "Open to register a new third-party application",
   "user.settings.developer.register": "Register New Application",
@@ -1153,6 +1147,11 @@
   "user.settings.display.nameOptsDesc": "Set how to display other user's names in posts and the Direct Messages list.",
   "user.settings.display.fontDesc": "Select the font displayed in the Mattermost user interface.",
   "user.settings.display.title": "Display Settings",
+  "user.settings.display.theme.themeColors": "Theme Colors",
+  "user.settings.display.theme.customTheme": "Custom Theme",
+  "user.settings.display.theme.import": "Import theme colors from Slack",
+  "user.settings.display.theme.title": "Theme",
+  "user.settings.display.theme.describe": "Open to manage your theme",
   "user.settings.general.usernameReserved": "This username is reserved, please choose a new one.",
   "user.settings.general.usernameRestrictions": "'Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'.",
   "user.settings.general.validEmail": "Please enter a valid email address",
@@ -1254,7 +1253,7 @@
   "intro_messages.teammate": "This is the start of your direct message history with this teammate. Direct messages and files shared here are not shown to people outside this area.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Beginning of {display_name}</h4><p class=\"channel-intro__content\">This is the start of {display_name}, a channel for non-work-related conversations.<br/></p>",
   "intro_messages.inviteOthers": "Invite others to this team",
-  "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!'</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>",
+  "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>",
   "intro_messages.group": "private group",
   "intro_messages.onlyInvited": " Only invited members can see this private group.",
   "intro_messages.channel": "channel",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index faac529b4..25515ca86 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -1057,12 +1057,6 @@
   "user.settings.advance.sendDesc": "Si está habilitado 'Retorno' inserta una nueva linea y 'Ctrl + Retorno' envía el mensaje.",
   "user.settings.advance.sendTitle": "Enviar mensajes con Ctrl + Retorno",
   "user.settings.advance.title": "Configuración Avanzada",
-  "user.settings.appearance.cancel": "Cancelar",
-  "user.settings.appearance.customTheme": "Tema personalizado",
-  "user.settings.appearance.import": "Importar los colores de tema de Slack",
-  "user.settings.appearance.save": "Guardar",
-  "user.settings.appearance.themeColors": "Selecciona un Tema",
-  "user.settings.appearance.title": "Configuraciones de Apariencia",
   "user.settings.cmds.add": "Agregar",
   "user.settings.cmds.add_desc": "Crea comandos que permitan enviar eventos a integraciones externas. Por favor revisa <a href=\"http://mattermost.org/commands\">http://mattermost.org/commands</a>  para aprender más.",
   "user.settings.cmds.add_display_name.placeholder": "Nombre a mostrar",
@@ -1136,6 +1130,9 @@
   "user.settings.display.showUsername": "Mostrar el nombre de usuario (predeterminado)",
   "user.settings.display.teammateDisplay": "Visualización del nombre de los integrantes",
   "user.settings.display.title": "Configuración de Visualización",
+  "user.settings.display.theme.customTheme": "Tema personalizado",
+  "user.settings.display.theme.import": "Importar los colores de tema de Slack",
+  "user.settings.display.theme.themeColors": "Selecciona un Tema",
   "user.settings.general.checkEmail": "Revisa tu correo electrónico {email} para verificar la dirección.",
   "user.settings.general.checkEmailNoAddress": "Revisa tu correo electrónico para verificar la dirección",
   "user.settings.general.close": "Cerrar",
@@ -1262,4 +1259,4 @@
   "view_image_popover.download": "Descargar",
   "view_image_popover.file": "Archivo {count} de {total}",
   "view_image_popover.publicLink": "Obtener Enlace Público"
-}
-\ No newline at end of file
+}