From 9289178a2e10551b23634da0c8031ea64c68cbed Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 24 Aug 2015 14:32:27 -0400
Subject: [PATCH 1/4] fixed incorrect label

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index ca272c66ec..bf685eeb0e 100644
--- a/app.js
+++ b/app.js
@@ -348,7 +348,7 @@ function resetThemes(callback) {
 		type: 'local',
 		id: 'nodebb-theme-persona'
 	}, function(err) {
-		winston.info('[reset] Theme reset to Vanilla');
+		winston.info('[reset] Theme reset to Persona');
 		if (typeof callback === 'function') {
 			callback(err);
 		} else {

From 5a90de55d88fa138b362802bbb73c0c96165d3b9 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 24 Aug 2015 15:15:58 -0400
Subject: [PATCH 2/4] removed missing css file

---
 src/views/admin/header.tpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl
index 0eb115e215..7f46d9252d 100644
--- a/src/views/admin/header.tpl
+++ b/src/views/admin/header.tpl
@@ -7,7 +7,6 @@
 	<link rel="stylesheet" href="{relative_path}/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css?{cache-buster}">
 	<link rel="stylesheet" type="text/css" href="{relative_path}/admin.css?{cache-buster}" />
 	<link rel="stylesheet" type="text/css" href="{relative_path}/vendor/mdl/mdl.min.css?{cache-buster}" />
-	<link rel="stylesheet" type="text/css" href="{relative_path}/vendor/snackbar/snackbar.min.css?{cache-buster}" />
 	<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 
 	<script>

From ae318c42869b631799ccd47830e58f698e39cfd8 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 24 Aug 2015 15:29:38 -0400
Subject: [PATCH 3/4] fixed alignment on themes page

---
 public/less/admin/appearance/themes.less | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/less/admin/appearance/themes.less b/public/less/admin/appearance/themes.less
index 041c8a0493..1216c4a9ca 100644
--- a/public/less/admin/appearance/themes.less
+++ b/public/less/admin/appearance/themes.less
@@ -55,6 +55,12 @@
 		}
 	}
 
+	[data-type="local"] {
+		.mdl-card__supporting-text {
+			height: 150px;
+		}
+	}
+
 	textarea[data-field] {
 		min-height: 450px;
 		width: 100%;

From 19a3950928c977271bfb8a7512e8219280cbe6fc Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 24 Aug 2015 16:01:35 -0400
Subject: [PATCH 4/4] don't blow up if no skin was selected

---
 public/src/admin/appearance/skins.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js
index 8a926f674d..b057c740c8 100644
--- a/public/src/admin/appearance/skins.js
+++ b/public/src/admin/appearance/skins.js
@@ -60,11 +60,13 @@ define('admin/appearance/skins', function() {
 		}, function(html) {
 			themeContainer.html(html);
 
-			var skin = config['theme:src']
-				.match(/latest\/(\S+)\/bootstrap.min.css/)[1]
-				.replace(/(^|\s)([a-z])/g , function(m,p1,p2){return p1+p2.toUpperCase();});
+			if (config['theme:src']) {
+				var skin = config['theme:src']
+					.match(/latest\/(\S+)\/bootstrap.min.css/)[1]
+					.replace(/(^|\s)([a-z])/g , function(m,p1,p2){return p1+p2.toUpperCase();});
 
-			highlightSelectedTheme(skin);
+				highlightSelectedTheme(skin);
+			}
 		});
 	};