diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index 502088f168813512cb394d4eba671185ae464a0f..800b6b18bacfb8a1f8dd3ea8226cb86547587879 100755
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -72,10 +72,10 @@ class SCSSCacher {
 		$this->rootCssLoc = implode('/', $this->rootCssLoc);
 
 		try {
-			$this->folder = $this->appData->getFolder('css');
+			$this->folder = $this->appData->getFolder('core');
 		} catch(NotFoundException $e) {
 			// creating css appdata folder
-			$this->folder = $this->appData->newFolder('css');
+			$this->folder = $this->appData->newFolder('core');
 		}
 	}
 
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 96f612c313c8e8e2df396376e22207c4bce14276..9711b0ff2f80175f5d0eb79c241dac7fe6f402d7 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -189,7 +189,9 @@ class TemplateLayout extends \OC_Template {
 			$theme,
 			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
 			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			\OC::$server->getAppDataDir('server'));
+			\OC::$server->getAppDataDir('css'),
+			\OC::$server->getURLGenerator(),
+			\OC::$server->getSystemConfig());
 		$locator->find($styles);
 		return $locator->getResources();
 	}