From 281c4415cbe1ea3579f54a28a20c0514c91302a7 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 17 Sep 2015 17:17:46 -0400
Subject: [PATCH 1/3] --activate fix

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

diff --git a/app.js b/app.js
index bd2c08fd5f..37959d51ef 100644
--- a/app.js
+++ b/app.js
@@ -291,7 +291,7 @@ function activate() {
 
 		winston.info('Activating plugin %s', plugin);
 
-		db.sortedSetAdd('plugins:active', plugin, 1, start);
+		db.sortedSetAdd('plugins:active', 0, plugin, start);
 	});
 }
 

From 4dcba62e959856d4d24fdb304d4740f97df65a25 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 17 Sep 2015 17:31:11 -0400
Subject: [PATCH 2/3] cleanup

---
 src/socket.io/admin.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index fcdc61a0ae..bd2abf01fe 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -89,9 +89,7 @@ SocketAdmin.themes.set = function(socket, data, callback) {
 	}
 
 	var wrappedCallback = function(err) {
-		meta.themes.set(data, function() {
-			callback();
-		});
+		meta.themes.set(data, callback);
 	};
 	if (data.type === 'bootswatch') {
 		wrappedCallback();

From 8403b010a55929abf72d8458eda762dbd27e971d Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 17 Sep 2015 17:49:08 -0400
Subject: [PATCH 3/3] fixes theme screenshots in acp

---
 src/controllers/admin/themes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/admin/themes.js b/src/controllers/admin/themes.js
index 00cb65f29f..0f87ecc83c 100644
--- a/src/controllers/admin/themes.js
+++ b/src/controllers/admin/themes.js
@@ -6,7 +6,7 @@ var fs = require('fs');
 var themesController = {};
 
 themesController.get = function(req, res, next) {
-	var themeDir = path.join(__dirname, '../../node_modules/' + req.params.theme);
+	var themeDir = path.join(__dirname, '../../../node_modules/' + req.params.theme);
 	fs.exists(themeDir, function(exists) {
 		if (exists) {
 			var themeConfig = require(path.join(themeDir, 'theme.json')),
@@ -14,7 +14,7 @@ themesController.get = function(req, res, next) {
 			if (themeConfig.screenshot && fs.existsSync(screenshotPath)) {
 				res.sendFile(screenshotPath);
 			} else {
-				res.sendFile(path.join(__dirname, '../../public/images/themes/default.png'));
+				res.sendFile(path.join(__dirname, '../../../public/images/themes/default.png'));
 			}
 		} else {
 			return next();