diff --git a/src/controllers/accounts/settings.js b/src/controllers/accounts/settings.js
index 824e12af4f..2ff02cc599 100644
--- a/src/controllers/accounts/settings.js
+++ b/src/controllers/accounts/settings.js
@@ -56,26 +56,12 @@ settingsController.get = async function (req, res, next) {
 		{ value: 'biweek', name: '[[user:digest_biweekly]]', selected: userData.settings.dailyDigestFreq === 'biweek' },
 		{ value: 'month', name: '[[user:digest_monthly]]', selected: userData.settings.dailyDigestFreq === 'month' },
 	];
-
 	userData.bootswatchSkinOptions = [
 		{ name: 'Default', value: '' },
-		{ name: 'Cerulean', value: 'cerulean' },
-		{ name: 'Cosmo', value: 'cosmo' },
-		{ name: 'Cyborg', value: 'cyborg' },
-		{ name: 'Darkly', value: 'darkly' },
-		{ name: 'Flatly', value: 'flatly' },
-		{ name: 'Journal', value: 'journal' },
-		{ name: 'Lumen', value: 'lumen' },
-		{ name: 'Paper', value: 'paper' },
-		{ name: 'Readable', value: 'readable' },
-		{ name: 'Sandstone', value: 'sandstone' },
-		{ name: 'Simplex', value: 'simplex' },
-		{ name: 'Slate', value: 'slate' },
-		{ name: 'Spacelab', value: 'spacelab' },
-		{ name: 'Superhero', value: 'superhero' },
-		{ name: 'United', value: 'united' },
-		{ name: 'Yeti', value: 'yeti' },
 	];
+	userData.bootswatchSkinOptions.push(
+		...meta.css.supportedSkins.map(skin => ({ name: _.capitalize(skin), value: skin}))
+	);
 
 	userData.bootswatchSkinOptions.forEach((skin) => {
 		skin.selected = skin.value === userData.settings.bootswatchSkin;
diff --git a/src/meta/css.js b/src/meta/css.js
index 147f20eed1..e6456b9468 100644
--- a/src/meta/css.js
+++ b/src/meta/css.js
@@ -17,9 +17,10 @@ const minifier = require('./minifier');
 const CSS = module.exports;
 
 CSS.supportedSkins = [
-	'cerulean', 'cyborg', 'flatly', 'journal', 'lumen', 'paper', 'simplex',
-	'spacelab', 'united', 'cosmo', 'darkly', 'readable', 'sandstone',
-	'slate', 'superhero', 'yeti',
+	'cerulean', 'cosmo', 'cyborg', 'darkly', 'flatly', 'journal', 'litera',
+	'lumen', 'lux', 'materia', 'minty', 'morph', 'pulse', 'quartz', 'sandstone',
+	'simplex', 'sketchy', 'slate', 'solar', 'spacelab', 'superhero', 'united',
+	'vapor', 'yeti', 'zephyr',
 ];
 
 const buildImports = {