diff --git a/src/webserver.js b/src/webserver.js
index 1794e4453e..a11bfcee91 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -255,7 +255,7 @@ module.exports.server = server;
 
 								// Theme's static directory
 								if (themeData['theme:staticDir']) {
-									app.use('/css/assets', express.static(path.join(__dirname, nconf.get('themes_dir'), themeData['theme:id'], themeData['theme:staticDir']), {
+									app.use('/css/assets', express.static(path.join(nconf.get('themes_dir'), themeData['theme:id'], themeData['theme:staticDir']), {
 										maxAge: app.enabled('cache') ? 5184000000 : 0
 									}));
 									if (process.env.NODE_ENV === 'development') {
@@ -264,7 +264,7 @@ module.exports.server = server;
 								}
 
 								if (themeData['theme:templates']) {
-									app.use('/templates', express.static(path.join(__dirname, nconf.get('themes_dir'), themeData['theme:id'], themeData['theme:templates']), {
+									app.use('/templates', express.static(path.join(nconf.get('themes_dir'), themeData['theme:id'], themeData['theme:templates']), {
 										maxAge: app.enabled('cache') ? 5184000000 : 0
 									}));
 									if (process.env.NODE_ENV === 'development') {
@@ -273,7 +273,7 @@ module.exports.server = server;
 								}
 
 								app.use(require('less-middleware')({
-									src: path.join(__dirname, nconf.get('themes_dir') + themeId),
+									src: path.join(nconf.get('themes_dir') + themeId),
 									dest: path.join(__dirname, '../public/css'),
 									prefix: nconf.get('relative_path') + '/css',
 									yuicompress: app.enabled('minification') ? true : false