diff --git a/application/themehandler.class.inc.php b/application/themehandler.class.inc.php
index d409ebe65..ef3c4d24e 100644
--- a/application/themehandler.class.inc.php
+++ b/application/themehandler.class.inc.php
@@ -46,11 +46,10 @@ class ThemeHandler
 			'name' => 'fullmoon',
 			'parameters' => [
 				'variables' => [],
-				'imports' => [
-				],
+				'imports' => [],
 				'stylesheets' => [
 					'main' => '../css/backoffice/main.scss',
-				],
+				]
 			],
 		];
 	}
@@ -216,7 +215,7 @@ class ThemeHandler
 	 * @param boolean $bSetup
 	 * @param string $sSetupCompilationTimestamp : setup compilation timestamp in micro secunds
 	 * @param array|null $aThemeParameters Parameters (variables, imports, stylesheets) for the theme, if not passed, will be retrieved from compiled DM
-	 * @param array|null $aImportsPaths Paths where imports can be found. Must end with '/'
+	 * @param array|null $aImportsPaths Folder paths where imports can be found. Must end with '/'
 	 * @param string|null $sWorkingPath Path of the folder used during compilation. Must end with a '/'
 	 *
 	 * @throws \CoreException
@@ -261,15 +260,21 @@ class ThemeHandler
 			}
 		}
 
-		$aThemeParametersWithVersion = self::CloneThemeParameterAndIncludeVersion($aThemeParameters, $sSetupCompilationTimestampInSecunds);
+		$aThemeParametersWithVersion = self::CloneThemeParameterAndIncludeVersion($aThemeParameters, $sSetupCompilationTimestampInSecunds, $aImportsPaths);
 
 		clearstatcache();
 
 		// Loading files to import and stylesheet to compile, also getting most recent modification time on overall files
 		$sTmpThemeScssContent = '';
 		$oFindStylesheetObject = new FindStylesheetObject();
-		if (isset($aThemeParameters['imports_utility'])) {
-			foreach ($aThemeParameters['imports_utility'] as $sImport) {
+		if (isset($aThemeParameters['variable_imports'])) {
+			foreach ($aThemeParameters['variable_imports'] as $sImport) {
+				static::FindStylesheetFile($sImport, $aImportsPaths, $oFindStylesheetObject);
+			}
+		}
+
+		if (isset($aThemeParameters['utility_imports'])) {
+			foreach ($aThemeParameters['utility_imports'] as $sImport) {
 				static::FindStylesheetFile($sImport, $aImportsPaths, $oFindStylesheetObject);
 			}
 		}
@@ -343,11 +348,12 @@ CSS;
 					static::$oCompileCSSService = new CompileCSSService();
 				}
 				//store it again to change $version with latest compiled time
+				SetupLog::Info("Compiling theme $sThemeId...");
 				$sTmpThemeCssContent = static::$oCompileCSSService->CompileCSSFromSASS($sTmpThemeScssContent, $aImportsPaths,
 					$aThemeParametersWithVersion);
+				SetupLog::Info("$sThemeId theme compilation done.");
 				file_put_contents($sThemeFolderPath.'/theme-parameters.json', json_encode($aThemeParameters));
 				file_put_contents($sThemeCssPath, $sSignatureComment.$sTmpThemeCssContent);
-				SetupLog::Info("Theme $sThemeId file compiled.");
 				return true;
 			}
 		}
@@ -373,27 +379,29 @@ CSS;
 		$aSignature = [
 			'variables' => md5(json_encode($aThemeParameters['variables'])),
 			'stylesheets' => [],
-			'imports' => [],
-			'images' => []
+			'variable_imports' => [],
+			'images' => [],
+			'utility_imports' => []
 		];
 
 		$oFindStylesheetObject = new FindStylesheetObject();
 
-		if (isset($aThemeParameters['imports_variable'])) {
-			foreach ($aThemeParameters['imports_variable'] as $key => $sImport) {
+		if (isset($aThemeParameters['variable_imports'])) {
+			foreach ($aThemeParameters['variable_imports'] as $key => $sImport) {
 				static::FindStylesheetFile($sImport, $aImportsPaths, $oFindStylesheetObject);
 				$sFile = $oFindStylesheetObject->GetLastStylesheetFile();
 				if (!empty($sFile)) {
-					$aSignature['stylesheets'][$key] = md5_file($sFile);
+					$aSignature['variable_imports'][$key] = md5_file($sFile);
 				}
 			}
 		}
-		if (isset($aThemeParameters['imports_utility'])) {
-			foreach ($aThemeParameters['imports_utility'] as $key => $sImport) {
+
+		if (isset($aThemeParameters['utility_imports'])) {
+			foreach ($aThemeParameters['utility_imports'] as $key => $sImport) {
 				static::FindStylesheetFile($sImport, $aImportsPaths, $oFindStylesheetObject);
 				$sFile = $oFindStylesheetObject->GetLastStylesheetFile();
 				if (!empty($sFile)) {
-					$aSignature['stylesheets'][$key] = md5_file($sFile);
+					$aSignature['utility_imports'][$key] = md5_file($sFile);
 				}
 			}
 		}
@@ -411,7 +419,7 @@ CSS;
 		$aFiles = $oFindStylesheetObject->GetImportPaths();
 		if (count($aFiles) !== 0) {
 			foreach ($aFiles as $sFileURI => $sFilePath) {
-				$aSignature['imports_utility'][$sFileURI] = md5_file($sFilePath);
+				$aSignature['utility_imports'][$sFileURI] = md5_file($sFilePath);
 			}
 		}
 
@@ -928,10 +936,11 @@ CSS;
 	 * Clone variable array and include $version with bSetupCompilationTimestamp value
 	 * @param $aThemeParameters
 	 * @param $bSetupCompilationTimestamp
+	 * @param $aImportsPaths
 	 *
 	 * @return array
 	 */
-	public static function CloneThemeParameterAndIncludeVersion($aThemeParameters, $bSetupCompilationTimestamp)
+	public static function CloneThemeParameterAndIncludeVersion($aThemeParameters, $bSetupCompilationTimestamp, $aImportsPaths)
 	{
 		$aThemeParametersVariable = [];
 		if (array_key_exists('variables', $aThemeParameters))
@@ -940,12 +949,13 @@ CSS;
 			{
 				$aThemeParametersVariable = array_merge([], $aThemeParameters['variables']);
 			}
-		}		
-		if (array_key_exists('imports_variable', $aThemeParameters))
+		}
+
+		if (array_key_exists('variable_imports', $aThemeParameters))
 		{
-			if (is_array($aThemeParameters['imports_variable']))
+			if (is_array($aThemeParameters['variable_imports']))
 			{
-				$aThemeParametersVariable = array_merge($aThemeParametersVariable, static::GetVariablesFromFile($aThemeParameters['imports_variable']));
+				$aThemeParametersVariable = array_merge($aThemeParametersVariable, static::GetVariablesFromFile($aThemeParameters['variable_imports'], $aImportsPaths));
 			}
 		}
 
@@ -955,20 +965,30 @@ CSS;
 
 	/**
 	 * @param $aVariableFiles
+	 * @param $aImportsPaths
 	 *
 	 * @return array
 	 * @since 3.0.0 N°3593
 	 */
-	public static function GetVariablesFromFile($aVariableFiles){
+	public static function GetVariablesFromFile($aVariableFiles, $aImportsPaths){
 		$aVariablesResults = [];
 		foreach ($aVariableFiles as $sVariableFile)
 		{
-			$sFileContent = file_get_contents(APPROOT.'env-'.utils::GetCurrentEnvironment().'/'.$sVariableFile);
-			$aVariableMatches = [];
-			
-			preg_match_all( '/\$(.*?):(.*?);/', $sFileContent,$aVariableMatches);
-			$aVariableMatches =  array_combine( $aVariableMatches[1], array_map( function($sVariableValue) { return ltrim($sVariableValue); }, $aVariableMatches[2] ) );
-			$aVariablesResults = array_merge($aVariablesResults, $aVariableMatches);
+			foreach($aImportsPaths as $sPath) {
+				$sFilePath = $sPath.'/'.$sVariableFile;
+				$sImportedFile = realpath($sFilePath);
+				if ($sImportedFile !== false) {
+					$sFileContent = file_get_contents($sImportedFile);
+					$aVariableMatches = [];
+
+					preg_match_all('/\s*\$(.*?)\s*:\s*[\"\']{0,1}(.*?)[\"\']{0,1}\s*[;!]/', $sFileContent, $aVariableMatches);
+					$aVariableMatches = array_combine($aVariableMatches[1], array_map(function ($sVariableValue) {
+						return $sVariableValue;
+					}, $aVariableMatches[2]));
+					$aVariablesResults = array_merge($aVariablesResults, $aVariableMatches);
+					break;
+				}
+			}
 		}
 		array_map( function($sVariableValue) { return ltrim($sVariableValue); }, $aVariablesResults );
 		return $aVariablesResults;
diff --git a/application/themehandlerservice.class.inc.php b/application/themehandlerservice.class.inc.php
new file mode 100644
index 000000000..4e29d3b6f
--- /dev/null
+++ b/application/themehandlerservice.class.inc.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+/**
+ * Class ThemeHandlerService : used to ease testing MFCompiler::CompileThemes class via mocks
+ *
+ * @author Olivier DAIN <olivier.dain@combodo.com>
+ * @since 3.0.0 N°2982
+ */
+class ThemeHandlerService
+{
+	public function __construct()
+	{
+	}
+
+	public function CompileTheme($sThemeId, $bSetup = false, $sSetupCompilationTimestamp="", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null){
+		return ThemeHandler::CompileTheme($sThemeId, $bSetup, $sSetupCompilationTimestamp="", $aThemeParameters, $aImportsPaths, $sWorkingPath);
+	}
+}
\ No newline at end of file
diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index d2e3e6545..4806e5800 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -1399,6 +1399,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		],
+		'theme.enable_precompilation' => [
+			'type' => 'bool',
+			'description' => 'If false, theme compilation will not use any precompiled file setup optimization.)',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 	];
 
 	public function IsProperty($sPropCode)
diff --git a/datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css b/datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
index bf37af7fd..2e4b9a139 100644
--- a/datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
+++ b/datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
@@ -1,6 +1,10 @@
 /*
 === SIGNATURE BEGIN ===
+<<<<<<< HEAD
 {"variables":"d751713988987e9331980363e24189ce","stylesheets":{"fullmoon":"1abf3f443691f601e8deaf66e57fb557"},"imports":[],"images":{"images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/tv-folder.gif":"9f41e1454905fd7416f89aa4380a65e1","images\/tv-file.gif":"9ab0e28d85d8ab5eb954fc28f6ac1e80"},"imports_utility":{"..\/css\/backoffice\/utils\/_all.scss":"fd24aa07b40c91fdee1bbef15d8eacdd","..\/css\/backoffice\/utils\/variables\/_all.scss":"3fa4eaf4a6ae0fc3b3e383cdfc337339","..\/css\/backoffice\/utils\/variables\/colors\/_all.scss":"0c9222dc5e4c46d897ba28e95946ad1b","..\/css\/backoffice\/utils\/variables\/colors\/_base-palette.scss":"2fbf92439664a9606ab84ae6c3a766f0","..\/css\/backoffice\/utils\/variables\/colors\/_semantic-palette.scss":"b0f9d89847d2ee9807fe143bdea5a6cd","..\/css\/backoffice\/utils\/variables\/colors\/_lifecycle-palette.scss":"ea06e857c5d9d442d0b3bdd66db10a7f","..\/css\/backoffice\/utils\/variables\/_border-radius.scss":"334102609a32eb78af0be65efddbe644","..\/css\/backoffice\/utils\/variables\/_depression.scss":"8870a4b14e08d8dbbc98ce833cc92faa","..\/css\/backoffice\/utils\/variables\/_elevation.scss":"09b58442b46fd3722ae9f9b9941504fb","..\/css\/backoffice\/utils\/variables\/_path.scss":"5127683357ba3375fadd33b0e5722908","..\/css\/backoffice\/utils\/variables\/_typography.scss":"4df6a684b909cba8dc44bfc71ac7bc1f","..\/css\/backoffice\/utils\/mixins\/_all.scss":"afefab135bcf21daffa3022ce4529a08","..\/css\/backoffice\/utils\/helpers\/_all.scss":"f7d426dd51c135fe339b583087d7d42c","..\/css\/backoffice\/utils\/helpers\/_border-radius.scss":"4e39edeb6ee7c4ea71f3abdda49256f3","..\/css\/backoffice\/utils\/helpers\/_color.scss":"36008fe20050d3cbb0c7d4502efa9c9b","..\/css\/backoffice\/utils\/helpers\/_depression.scss":"c2a55de471513d368b9ff1c1ca6a1f62","..\/css\/backoffice\/utils\/helpers\/_elevation.scss":"797cdb5c457e83f8e4109f69bda71626","..\/css\/backoffice\/utils\/helpers\/_font-icon.scss":"139adb6b6c29d5532891665adeec5de0","..\/css\/backoffice\/utils\/helpers\/_typography.scss":"cc571d38be1ae67ea53cca26245fb2eb","..\/css\/backoffice\/utils\/helpers\/_misc.scss":"866069015c051206382a9b0094ebc199","..\/css\/backoffice\/vendors\/_all.scss":"392b58d5b87b484d8eaca8bb168f0992","..\/css\/backoffice\/vendors\/_bulma-variables-overload.scss":"27ef02fce9072a3beea71ee34b10ad31","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/bulma.scss":"ac6337c71901f71b197a6628404a70fa","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_all.scss":"e374bc4ffb043b458d29e319b37fec03","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_initial-variables.scss":"527552844220a961a10b9af7b75add8b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_functions.scss":"b39215085d7b424be74e05ae0c9a096b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_animations.scss":"9eeec504cab94a45a597592020b7f0e7","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_mixins.scss":"6201fa9f37198a13291708785bed8c9c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_controls.scss":"d2fd10c6dc0750b99b1f40952e8a4562","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_all.scss":"22cda0b152315361269f768c4a0e08d0","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_minireset.scss":"53ee547c0bff77ba3e6353def2f8729b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_generic.scss":"c6a82d37120ed7d2dc7a64dccac78efd","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_all.scss":"c97722cd26e014967f6bff6133d43b44","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_box.scss":"d951bc383ad44b7497e9e9b1ab0dbe9c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_button.scss":"7ab91729f48c3e49d0f6efafda6cbf6f","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_container.scss":"e4cbd75d93c57a919fd4c183ef80e4ba","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_content.scss":"4123c3d4d782cfbaaa8d4726f3a0425a","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_icon.scss":"b9900e2949eaa5a81a56ec382120cf39","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_image.scss":"4a1e324a1b4accad3e777f1bf0117089","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_notification.scss":"5573e46f01e45b1943a574ec1bdbe83c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_progress.scss":"3700aa5f4e7b0f58b932e242b3bca415","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_table.scss":"4926ed56e8c53fd01543a66c009e0812","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_tag.scss":"b09d520b88f166e2847aed34f1f391e9","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_title.scss":"ecf774ebb3ddaa9097ea7fc66f416a0c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_other.scss":"0e3571082a9629565dddb46712695756","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_all.scss":"414c51848e9f554070f97df2fe347a78","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_shared.scss":"73134a972f286fb24dc44e01ef0cf679","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_input-textarea.scss":"73e1d5c1673fdcd4c70d4a3125a3cdb5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_checkbox-radio.scss":"c7430dbb855100ff193641bf31904ccb","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_select.scss":"c16a527986de7020f25e263943729937","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_file.scss":"c7a1351cfd94269350029a92dc7db83e","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_tools.scss":"c2bf0379d43ef365c981b38ef6bfff6c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_all.scss":"398290ce7b00255b62e0b0c3ad6e6001","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_breadcrumb.scss":"7d90b4a6fae954f3e0c5e42e8c0c452d","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_card.scss":"16ea78a5288bd6ef6f665f1617b56702","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_dropdown.scss":"1a104de77315d37b7bdbd63eb3713be3","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_level.scss":"ce9549ec67ec27e93525de339d5bca87","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_media.scss":"ce5a90fcd100550bb754911ded93b055","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_menu.scss":"95b9cf3ffaec3122b790d86b0e27d299","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_message.scss":"0eff66899482f72804bf97b54e2a1e43","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_modal.scss":"b028228728cd5d50024ec4df9a8ecad3","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_navbar.scss":"8fb55c78c7bceee235db0ce27b344ada","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_pagination.scss":"6f4118ee0348e59cb1e4352d07a913bb","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_panel.scss":"c02cac8901cd7355b3e17ff832fcc59e","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_tabs.scss":"7b1d3b07dad7d06c9845bf244bceb985","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_all.scss":"dff17fcb0a743bc82e2f130ae638baaa","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_columns.scss":"52a2c66125f03f8dd707837b2ae67be5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_tiles.scss":"c3cbb200243be1702bf3f20fc003a133","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_all.scss":"cc385355f8f6ac3947c46ac83ffb9621","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_color.scss":"acbcbb2198ae9d0ee36a471d18b6d003","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_float.scss":"1e1656cbd9628e4889ed0c669ff8d552","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_other.scss":"8ea9052a4dff7ce651cb480ae76c3537","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_overflow.scss":"724297f6af3b8ca69fd8532d36992b1f","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_position.scss":"41d70d52c4d9078622e374f96f2266c5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_spacing.scss":"d54ad9ee813ef6a96aeb2b6b39295909","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_typography.scss":"017c280d5e0d4fe90aa54067d483c965","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_visibility.scss":"4fa33c151d85b0dd99ed1bab93185461","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_all.scss":"cd3a2d35edc7b6d00bc65585b2b35961","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_hero.scss":"44f9f81a58020b964b856c914c327430","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_section.scss":"eacc632700c2257f51bdcabe7dc13d04","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_footer.scss":"fb4c389411fcff6aacabf5e4de0c403e","..\/css\/backoffice\/vendors\/_ckeditor.scss":"35e296a14a5ff8866721b9d90fb84c25","..\/css\/backoffice\/vendors\/_jqueryui.scss":"d939c626b989afa15d068107f97caaee","..\/css\/backoffice\/vendors\/_jquery-multiselect.scss":"9e07f3c7417a9b939303ba83d564737e","..\/css\/backoffice\/vendors\/_datatables.scss":"9afd18098bf4ea37af696c3f0d2f1f6b","..\/css\/backoffice\/vendors\/_jquery-treeview.scss":"d962e8db308512292d1ea04d777d3761","..\/css\/backoffice\/base\/_all.scss":"5a90fbde32f512506f5822ae9f5e05df","..\/css\/backoffice\/base\/_base.scss":"de2605ea6cb59fe350ee33d9714acd09","..\/css\/backoffice\/base\/_typography.scss":"6eb47d257105bd09af2c4ef2355c6dda","..\/css\/backoffice\/components\/_all.scss":"3a838df1f0e1542d78cb92a0fb296c66","..\/css\/backoffice\/components\/_alert.scss":"81cc21c278295b369f82e32348d9a602","..\/css\/backoffice\/components\/_button.scss":"3c40a0ce008cebaf48b2946f7d6b62a7","..\/css\/backoffice\/components\/_button-group.scss":"358f1096ffeb30e1d86a2df6c9cca347","..\/css\/backoffice\/components\/_breadcrumbs.scss":"4df4bc057791ad985ec7b3e25d605d65","..\/css\/backoffice\/components\/_collapsible-section.scss":"16efa2362d8e0aa383185565f76abc9c","..\/css\/backoffice\/components\/_quick-create.scss":"124861a5d6bff49dd92706517e8518ac","..\/css\/backoffice\/components\/_global-search.scss":"65f8925591801724b8fef0f110892508","..\/css\/backoffice\/components\/popover-menu\/_popover-menu.scss":"7bf9c17f1879407cb89fd618fece15ab","..\/css\/backoffice\/components\/popover-menu\/_popover-menu-item.scss":"fbd6a59276715245240eea0c7b28d7db","..\/css\/backoffice\/components\/_newsroom-menu.scss":"ff947d9c69be99e4129dbfbe4189ad43","..\/css\/backoffice\/components\/_panel.scss":"e1e74b2f27da0322e73f1a3cd01cb5d1","..\/css\/backoffice\/components\/_modal.scss":"d41d8cd98f00b204e9800998ecf8427e","..\/css\/backoffice\/components\/dashlet\/_all.scss":"c9dd70be9f33b53701c6afc7a4749190","..\/css\/backoffice\/components\/dashlet\/_dashlet.scss":"6556cb93e2c0fc8cdb14ba0a91a414a2","..\/css\/backoffice\/components\/dashlet\/_dashlet-badge.scss":"d8043a579d9350413838e5d82925cccc","..\/css\/backoffice\/components\/dashlet\/_dashlet-header-static.scss":"df944fbcf00717cb7bb373e5f57c1b12","..\/css\/backoffice\/components\/dashlet\/_dashlet-header-dynamic.scss":"3dedc214612dde1f4ecd19e59986c4ee","..\/css\/backoffice\/components\/input\/_all.scss":"c8bceeb98cc73d95740ae86aaf504fcb","..\/css\/backoffice\/components\/input\/_input.scss":"8bb63d30efdeceb16360a1db16f13986","..\/css\/backoffice\/components\/input\/_input-checkbox.scss":"ad1644e915cffbee9b94012a8a17949c","..\/css\/backoffice\/components\/input\/_input-date.scss":"9322d73459bd5e9ddc9e830eb92a6c1b","..\/css\/backoffice\/components\/input\/_input-datetime.scss":"ee3f15ab1dde584bf65457bbed3668cc","..\/css\/backoffice\/components\/input\/_input-duration.scss":"6d12508069ff3ca94bfa142c4228f2cb","..\/css\/backoffice\/components\/input\/_input-image.scss":"fae0b98d530e4929f22e16bd5c7adaf1","..\/css\/backoffice\/components\/input\/_input-select.scss":"be918e7a48d88f35ad405d8e881292eb","..\/css\/backoffice\/components\/input\/_input-select-icon.scss":"7356bd623ae91ac9c3df1bc2c52061ef","..\/css\/backoffice\/components\/input\/_input-string.scss":"d41d8cd98f00b204e9800998ecf8427e","..\/css\/backoffice\/components\/input\/_input-set.scss":"1b17f6ca73bf1ebaa0e0d8c7ddc7e270","..\/css\/backoffice\/components\/input\/_input-text.scss":"b5a43875b1d9a4af9a2d3f610905b517","..\/css\/backoffice\/components\/_pill.scss":"870d9184ca8f3325531b96cfa292df03","..\/css\/backoffice\/components\/_prop.scss":"2c29ce740e9301491df004baa7da78af","..\/css\/backoffice\/components\/_title.scss":"6c8e1a58272bc31a8fa8279f881741dc","..\/css\/backoffice\/components\/_datatable.scss":"241eeb462f302cb7b50371eddc46c81e","..\/css\/backoffice\/components\/_form.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_fieldset.scss":"85ce5bce4306e927de99d77b6029cf25","..\/css\/backoffice\/components\/_field.scss":"3dbb8632ad1435f557ab699725611e89","..\/css\/backoffice\/components\/toolbar\/_all.scss":"12e9e9094b4f7d0ccbb4428383b6e728","..\/css\/backoffice\/components\/toolbar\/_toolbar.scss":"e7078bb37ef355ba217c1a8a9f587e1a","..\/css\/backoffice\/components\/toolbar\/_toolbar-spacer.scss":"1fcdd603b20e5848235e930014887d73","..\/css\/backoffice\/components\/toolbar\/_separator.scss":"8ca10dcc3f1d469623d0538748acd4d5","..\/css\/backoffice\/components\/_richtext.scss":"361c5ded07c8e835619bf45e10f7a602","..\/css\/backoffice\/components\/_formtable.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_formtablerow.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_search-form.scss":"edff6421aef1d5bdfec04d788405327d","..\/css\/backoffice\/components\/_field-badge.scss":"628c1d504f86bde8a2bf497edf7541a5","..\/css\/backoffice\/components\/_file-select.scss":"d63bda867799a8f4a1b2adc376024931","..\/css\/backoffice\/components\/_medallion-icon.scss":"ccff061880095b8f9f40412293ac9f76","..\/css\/backoffice\/layout\/_all.scss":"e2eacaef476c057f64d5e28af3262db5","..\/css\/backoffice\/layout\/_navigation-menu.scss":"ad7ea09411e2475a1071fb45d1e442f9","..\/css\/backoffice\/layout\/_top-bar.scss":"1127d54e2a9f821512f3936288b303bf","..\/css\/backoffice\/layout\/_content.scss":"0fc4b9c60d4cb12faf5eaeb8290185d7","..\/css\/backoffice\/layout\/tab-container\/_tab-container.scss":"14b4871f1ec26637a9e1491470ad969e","..\/css\/backoffice\/layout\/tab-container\/_tab.scss":"742392bfd94a5a115bc144ea9aa4ff3f","..\/css\/backoffice\/layout\/multi-column\/_multi-column.scss":"e99d4afb40886d6d942c5020b288b1b8","..\/css\/backoffice\/layout\/multi-column\/_column.scss":"0561df371796667551c8f8cfb0676470","..\/css\/backoffice\/layout\/dashboard\/_all.scss":"0caa6d19d2a52396cbe3752d5bfcd6da","..\/css\/backoffice\/layout\/dashboard\/_dashboard.scss":"07d543ee725e338a79fb9e18eeb8094b","..\/css\/backoffice\/layout\/dashboard\/_dashboard-editor.scss":"54f9a19e48114c02ffd49f8fa3b8c0d9","..\/css\/backoffice\/layout\/wizard-container\/_wizard-container.scss":"6397850c8975248830a1abf177e13023","..\/css\/backoffice\/layout\/object\/_object-details.scss":"0ea429c0dbdff5360855ff6cb625fc4f","..\/css\/backoffice\/layout\/activity-panel\/_all.scss":"e9a1eae6d8be777f838919d22e5e3e45","..\/css\/backoffice\/layout\/activity-panel\/_activity-panel.scss":"dd44ff120b23d4e5cd0100d83451a040","..\/css\/backoffice\/layout\/activity-panel\/_caselog-entry-form.scss":"bb6d49f017e9cf73b3e4ec3f7e5f1637","..\/css\/backoffice\/layout\/activity-panel\/_activity-entry.scss":"e0e8232a4bf6a3b99eb4e41163f25257","..\/css\/backoffice\/layout\/activity-panel\/_caselog-entry.scss":"8b6fb224c4a598bd8987e5f8e32e6405","..\/css\/backoffice\/layout\/activity-panel\/_transition-entry.scss":"054a4415337e48a907cd9682e2f1ca05","..\/css\/backoffice\/layout\/activity-panel\/_edits-entry.scss":"9463d0a303d9be3a28b5feacca662b9c","..\/css\/backoffice\/layout\/activity-panel\/_notification-entry.scss":"76b7431c8953ff7db5c1a2c4218e00d1","..\/css\/backoffice\/layout\/blocks-integrations\/_all.scss":"628553bd54067b84ba1d17656df94c45","..\/css\/backoffice\/layout\/blocks-integrations\/_dashlet-within-dashboard.scss":"b9c1693a941732c66a9fb92e51609fc7","..\/css\/backoffice\/layout\/blocks-integrations\/_add-to-dashboard.scss":"3ecdea8473b6014dd4e73f98e6eaa5b1","..\/css\/backoffice\/layout\/blocks-integrations\/_caselog-entry-form-within-activity-panel.scss":"0ad42544e79da33693facb23eae57b9e","..\/css\/backoffice\/layout\/blocks-integrations\/_panel-with-tab-container.scss":"1f9073afc9c18d5df23f1866298bc3e4","..\/css\/backoffice\/layout\/blocks-integrations\/_panel-with-datatable.scss":"a96f57fa925f87f0c17eacec6ba98fb9","..\/css\/backoffice\/layout\/blocks-integrations\/_object-details-with-tab-container.scss":"e75862e46d156fbedc074ac7055813de","..\/css\/backoffice\/layout\/blocks-integrations\/_medallion-with-blocklist.scss":"878ff11609268b57b09ab44c87e164a8","..\/css\/backoffice\/pages\/_all.scss":"84b5f499283c2d0ad35999d77d2d24ac","..\/css\/backoffice\/pages\/_base.scss":"f17903f37251c03e8ee4ff6a9a1d20df","..\/css\/backoffice\/pages\/_preferences.scss":"4b94210a910e9c1df1fcd93c02916f36","..\/css\/backoffice\/pages\/_attachments.scss":"3c1a03b53ed9edbdd1bf94b215536d3a","..\/css\/backoffice\/pages\/_impact-analysis.scss":"6ce563252f413877876431f6a067c6ba","..\/css\/backoffice\/pages\/_audit.scss":"100f725cb6f0b801fda8243cf9342f26","..\/css\/backoffice\/pages\/_data-synchro.scss":"0c0cc941c901d5ffa4dc0845e6f11d6c","..\/css\/backoffice\/pages\/_datamodel-viewer.scss":"e11bb77c712cbbaa22a11ed24949b239","..\/css\/backoffice\/pages\/_csv-import.scss":"c32a07561c1a90ff754b7da2181b7020","..\/css\/backoffice\/pages\/_global-search.scss":"da4695e624d3a95e3b1c9035b4529a20","..\/css\/backoffice\/pages\/_welcome-popup.scss":"bd2b7cb8e148fc5e469e553e596001e4","..\/css\/backoffice\/application\/_all.scss":"c195d8a4e036571ec39869febd886bab","..\/css\/backoffice\/application\/display-block\/_all.scss":"b0b2c8b0064b5f29d8be3d20fd3302ec","..\/css\/backoffice\/application\/display-block\/_block-csv.scss":"8698dfb104cb8986453fec80e4ef64c9","..\/css\/backoffice\/application\/display-block\/_block-indirect-links.scss":"6262d1640f98dbff9e50ea66efed9161","..\/css\/backoffice\/application\/tabular-fields\/_all.scss":"4f6a05c7f41b0bfd60dd91b442ff95a9","..\/css\/backoffice\/application\/tabular-fields\/_tabular-fields-selector.scss":"bd7d531d18c69e714c3d0ac499bbcf56","..\/css\/backoffice\/themes\/_all.scss":"afefab135bcf21daffa3022ce4529a08","..\/css\/backoffice\/_shame.scss":"25a808c59f06c09c8bdee9179cf5a3e9"}}
+=======
+{"variables":"d751713988987e9331980363e24189ce","stylesheets":{"fullmoon":"1abf3f443691f601e8deaf66e57fb557"},"variable_imports":[],"images":{"images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/tv-folder.gif":"9f41e1454905fd7416f89aa4380a65e1","images\/tv-file.gif":"9ab0e28d85d8ab5eb954fc28f6ac1e80"},"utility_imports":{"..\/css\/backoffice\/utils\/_all.scss":"fd24aa07b40c91fdee1bbef15d8eacdd","..\/css\/backoffice\/utils\/variables\/_all.scss":"3fa4eaf4a6ae0fc3b3e383cdfc337339","..\/css\/backoffice\/utils\/variables\/colors\/_all.scss":"0c9222dc5e4c46d897ba28e95946ad1b","..\/css\/backoffice\/utils\/variables\/colors\/_base-palette.scss":"2fbf92439664a9606ab84ae6c3a766f0","..\/css\/backoffice\/utils\/variables\/colors\/_semantic-palette.scss":"b0f9d89847d2ee9807fe143bdea5a6cd","..\/css\/backoffice\/utils\/variables\/colors\/_lifecycle-palette.scss":"ea06e857c5d9d442d0b3bdd66db10a7f","..\/css\/backoffice\/utils\/variables\/_border-radius.scss":"334102609a32eb78af0be65efddbe644","..\/css\/backoffice\/utils\/variables\/_depression.scss":"8870a4b14e08d8dbbc98ce833cc92faa","..\/css\/backoffice\/utils\/variables\/_elevation.scss":"09b58442b46fd3722ae9f9b9941504fb","..\/css\/backoffice\/utils\/variables\/_path.scss":"5127683357ba3375fadd33b0e5722908","..\/css\/backoffice\/utils\/variables\/_typography.scss":"4df6a684b909cba8dc44bfc71ac7bc1f","..\/css\/backoffice\/utils\/mixins\/_all.scss":"afefab135bcf21daffa3022ce4529a08","..\/css\/backoffice\/utils\/helpers\/_all.scss":"f7d426dd51c135fe339b583087d7d42c","..\/css\/backoffice\/utils\/helpers\/_border-radius.scss":"4e39edeb6ee7c4ea71f3abdda49256f3","..\/css\/backoffice\/utils\/helpers\/_color.scss":"36008fe20050d3cbb0c7d4502efa9c9b","..\/css\/backoffice\/utils\/helpers\/_depression.scss":"c2a55de471513d368b9ff1c1ca6a1f62","..\/css\/backoffice\/utils\/helpers\/_elevation.scss":"797cdb5c457e83f8e4109f69bda71626","..\/css\/backoffice\/utils\/helpers\/_font-icon.scss":"139adb6b6c29d5532891665adeec5de0","..\/css\/backoffice\/utils\/helpers\/_typography.scss":"cc571d38be1ae67ea53cca26245fb2eb","..\/css\/backoffice\/utils\/helpers\/_misc.scss":"866069015c051206382a9b0094ebc199","..\/css\/backoffice\/vendors\/_all.scss":"392b58d5b87b484d8eaca8bb168f0992","..\/css\/backoffice\/vendors\/_bulma-variables-overload.scss":"27ef02fce9072a3beea71ee34b10ad31","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/bulma.scss":"ac6337c71901f71b197a6628404a70fa","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_all.scss":"e374bc4ffb043b458d29e319b37fec03","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_initial-variables.scss":"527552844220a961a10b9af7b75add8b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_functions.scss":"b39215085d7b424be74e05ae0c9a096b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_animations.scss":"9eeec504cab94a45a597592020b7f0e7","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_mixins.scss":"6201fa9f37198a13291708785bed8c9c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_controls.scss":"d2fd10c6dc0750b99b1f40952e8a4562","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_all.scss":"22cda0b152315361269f768c4a0e08d0","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_minireset.scss":"53ee547c0bff77ba3e6353def2f8729b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_generic.scss":"c6a82d37120ed7d2dc7a64dccac78efd","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_all.scss":"c97722cd26e014967f6bff6133d43b44","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_box.scss":"d951bc383ad44b7497e9e9b1ab0dbe9c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_button.scss":"7ab91729f48c3e49d0f6efafda6cbf6f","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_container.scss":"e4cbd75d93c57a919fd4c183ef80e4ba","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_content.scss":"4123c3d4d782cfbaaa8d4726f3a0425a","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_icon.scss":"b9900e2949eaa5a81a56ec382120cf39","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_image.scss":"4a1e324a1b4accad3e777f1bf0117089","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_notification.scss":"5573e46f01e45b1943a574ec1bdbe83c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_progress.scss":"3700aa5f4e7b0f58b932e242b3bca415","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_table.scss":"4926ed56e8c53fd01543a66c009e0812","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_tag.scss":"b09d520b88f166e2847aed34f1f391e9","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_title.scss":"ecf774ebb3ddaa9097ea7fc66f416a0c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_other.scss":"0e3571082a9629565dddb46712695756","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_all.scss":"414c51848e9f554070f97df2fe347a78","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_shared.scss":"73134a972f286fb24dc44e01ef0cf679","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_input-textarea.scss":"73e1d5c1673fdcd4c70d4a3125a3cdb5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_checkbox-radio.scss":"c7430dbb855100ff193641bf31904ccb","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_select.scss":"c16a527986de7020f25e263943729937","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_file.scss":"c7a1351cfd94269350029a92dc7db83e","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_tools.scss":"c2bf0379d43ef365c981b38ef6bfff6c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_all.scss":"398290ce7b00255b62e0b0c3ad6e6001","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_breadcrumb.scss":"7d90b4a6fae954f3e0c5e42e8c0c452d","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_card.scss":"16ea78a5288bd6ef6f665f1617b56702","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_dropdown.scss":"1a104de77315d37b7bdbd63eb3713be3","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_level.scss":"ce9549ec67ec27e93525de339d5bca87","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_media.scss":"ce5a90fcd100550bb754911ded93b055","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_menu.scss":"95b9cf3ffaec3122b790d86b0e27d299","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_message.scss":"0eff66899482f72804bf97b54e2a1e43","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_modal.scss":"b028228728cd5d50024ec4df9a8ecad3","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_navbar.scss":"8fb55c78c7bceee235db0ce27b344ada","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_pagination.scss":"6f4118ee0348e59cb1e4352d07a913bb","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_panel.scss":"c02cac8901cd7355b3e17ff832fcc59e","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_tabs.scss":"7b1d3b07dad7d06c9845bf244bceb985","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_all.scss":"dff17fcb0a743bc82e2f130ae638baaa","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_columns.scss":"52a2c66125f03f8dd707837b2ae67be5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_tiles.scss":"c3cbb200243be1702bf3f20fc003a133","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_all.scss":"cc385355f8f6ac3947c46ac83ffb9621","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_color.scss":"acbcbb2198ae9d0ee36a471d18b6d003","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_float.scss":"1e1656cbd9628e4889ed0c669ff8d552","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_other.scss":"8ea9052a4dff7ce651cb480ae76c3537","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_overflow.scss":"724297f6af3b8ca69fd8532d36992b1f","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_position.scss":"41d70d52c4d9078622e374f96f2266c5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_spacing.scss":"d54ad9ee813ef6a96aeb2b6b39295909","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_typography.scss":"017c280d5e0d4fe90aa54067d483c965","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_visibility.scss":"4fa33c151d85b0dd99ed1bab93185461","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_all.scss":"cd3a2d35edc7b6d00bc65585b2b35961","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_hero.scss":"44f9f81a58020b964b856c914c327430","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_section.scss":"eacc632700c2257f51bdcabe7dc13d04","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_footer.scss":"fb4c389411fcff6aacabf5e4de0c403e","..\/css\/backoffice\/vendors\/_ckeditor.scss":"35e296a14a5ff8866721b9d90fb84c25","..\/css\/backoffice\/vendors\/_jqueryui.scss":"d939c626b989afa15d068107f97caaee","..\/css\/backoffice\/vendors\/_jquery-multiselect.scss":"9e07f3c7417a9b939303ba83d564737e","..\/css\/backoffice\/vendors\/_datatables.scss":"9afd18098bf4ea37af696c3f0d2f1f6b","..\/css\/backoffice\/vendors\/_jquery-treeview.scss":"d962e8db308512292d1ea04d777d3761","..\/css\/backoffice\/base\/_all.scss":"5a90fbde32f512506f5822ae9f5e05df","..\/css\/backoffice\/base\/_base.scss":"de2605ea6cb59fe350ee33d9714acd09","..\/css\/backoffice\/base\/_typography.scss":"6eb47d257105bd09af2c4ef2355c6dda","..\/css\/backoffice\/components\/_all.scss":"3a838df1f0e1542d78cb92a0fb296c66","..\/css\/backoffice\/components\/_alert.scss":"81cc21c278295b369f82e32348d9a602","..\/css\/backoffice\/components\/_button.scss":"3c40a0ce008cebaf48b2946f7d6b62a7","..\/css\/backoffice\/components\/_button-group.scss":"358f1096ffeb30e1d86a2df6c9cca347","..\/css\/backoffice\/components\/_breadcrumbs.scss":"4df4bc057791ad985ec7b3e25d605d65","..\/css\/backoffice\/components\/_collapsible-section.scss":"16efa2362d8e0aa383185565f76abc9c","..\/css\/backoffice\/components\/_quick-create.scss":"124861a5d6bff49dd92706517e8518ac","..\/css\/backoffice\/components\/_global-search.scss":"65f8925591801724b8fef0f110892508","..\/css\/backoffice\/components\/popover-menu\/_popover-menu.scss":"7bf9c17f1879407cb89fd618fece15ab","..\/css\/backoffice\/components\/popover-menu\/_popover-menu-item.scss":"fbd6a59276715245240eea0c7b28d7db","..\/css\/backoffice\/components\/_newsroom-menu.scss":"ff947d9c69be99e4129dbfbe4189ad43","..\/css\/backoffice\/components\/_panel.scss":"e1e74b2f27da0322e73f1a3cd01cb5d1","..\/css\/backoffice\/components\/_modal.scss":"d41d8cd98f00b204e9800998ecf8427e","..\/css\/backoffice\/components\/dashlet\/_all.scss":"c9dd70be9f33b53701c6afc7a4749190","..\/css\/backoffice\/components\/dashlet\/_dashlet.scss":"6556cb93e2c0fc8cdb14ba0a91a414a2","..\/css\/backoffice\/components\/dashlet\/_dashlet-badge.scss":"d8043a579d9350413838e5d82925cccc","..\/css\/backoffice\/components\/dashlet\/_dashlet-header-static.scss":"df944fbcf00717cb7bb373e5f57c1b12","..\/css\/backoffice\/components\/dashlet\/_dashlet-header-dynamic.scss":"3dedc214612dde1f4ecd19e59986c4ee","..\/css\/backoffice\/components\/input\/_all.scss":"c8bceeb98cc73d95740ae86aaf504fcb","..\/css\/backoffice\/components\/input\/_input.scss":"8bb63d30efdeceb16360a1db16f13986","..\/css\/backoffice\/components\/input\/_input-checkbox.scss":"ad1644e915cffbee9b94012a8a17949c","..\/css\/backoffice\/components\/input\/_input-date.scss":"9322d73459bd5e9ddc9e830eb92a6c1b","..\/css\/backoffice\/components\/input\/_input-datetime.scss":"ee3f15ab1dde584bf65457bbed3668cc","..\/css\/backoffice\/components\/input\/_input-duration.scss":"6d12508069ff3ca94bfa142c4228f2cb","..\/css\/backoffice\/components\/input\/_input-image.scss":"fae0b98d530e4929f22e16bd5c7adaf1","..\/css\/backoffice\/components\/input\/_input-select.scss":"be918e7a48d88f35ad405d8e881292eb","..\/css\/backoffice\/components\/input\/_input-select-icon.scss":"7356bd623ae91ac9c3df1bc2c52061ef","..\/css\/backoffice\/components\/input\/_input-string.scss":"d41d8cd98f00b204e9800998ecf8427e","..\/css\/backoffice\/components\/input\/_input-set.scss":"1b17f6ca73bf1ebaa0e0d8c7ddc7e270","..\/css\/backoffice\/components\/input\/_input-text.scss":"b5a43875b1d9a4af9a2d3f610905b517","..\/css\/backoffice\/components\/_pill.scss":"870d9184ca8f3325531b96cfa292df03","..\/css\/backoffice\/components\/_prop.scss":"2c29ce740e9301491df004baa7da78af","..\/css\/backoffice\/components\/_title.scss":"6c8e1a58272bc31a8fa8279f881741dc","..\/css\/backoffice\/components\/_datatable.scss":"241eeb462f302cb7b50371eddc46c81e","..\/css\/backoffice\/components\/_form.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_fieldset.scss":"85ce5bce4306e927de99d77b6029cf25","..\/css\/backoffice\/components\/_field.scss":"3dbb8632ad1435f557ab699725611e89","..\/css\/backoffice\/components\/toolbar\/_all.scss":"12e9e9094b4f7d0ccbb4428383b6e728","..\/css\/backoffice\/components\/toolbar\/_toolbar.scss":"e7078bb37ef355ba217c1a8a9f587e1a","..\/css\/backoffice\/components\/toolbar\/_toolbar-spacer.scss":"1fcdd603b20e5848235e930014887d73","..\/css\/backoffice\/components\/toolbar\/_separator.scss":"8ca10dcc3f1d469623d0538748acd4d5","..\/css\/backoffice\/components\/_richtext.scss":"361c5ded07c8e835619bf45e10f7a602","..\/css\/backoffice\/components\/_formtable.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_formtablerow.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_search-form.scss":"edff6421aef1d5bdfec04d788405327d","..\/css\/backoffice\/components\/_field-badge.scss":"628c1d504f86bde8a2bf497edf7541a5","..\/css\/backoffice\/components\/_file-select.scss":"d63bda867799a8f4a1b2adc376024931","..\/css\/backoffice\/components\/_medallion-icon.scss":"ccff061880095b8f9f40412293ac9f76","..\/css\/backoffice\/layout\/_all.scss":"e2eacaef476c057f64d5e28af3262db5","..\/css\/backoffice\/layout\/_navigation-menu.scss":"163581a19a13214fd67a90d020baf451","..\/css\/backoffice\/layout\/_top-bar.scss":"1127d54e2a9f821512f3936288b303bf","..\/css\/backoffice\/layout\/_content.scss":"0fc4b9c60d4cb12faf5eaeb8290185d7","..\/css\/backoffice\/layout\/tab-container\/_tab-container.scss":"046e39b568c76b01f5dab84c3c0e7a79","..\/css\/backoffice\/layout\/tab-container\/_tab.scss":"742392bfd94a5a115bc144ea9aa4ff3f","..\/css\/backoffice\/layout\/multi-column\/_multi-column.scss":"e99d4afb40886d6d942c5020b288b1b8","..\/css\/backoffice\/layout\/multi-column\/_column.scss":"0561df371796667551c8f8cfb0676470","..\/css\/backoffice\/layout\/dashboard\/_all.scss":"0caa6d19d2a52396cbe3752d5bfcd6da","..\/css\/backoffice\/layout\/dashboard\/_dashboard.scss":"07d543ee725e338a79fb9e18eeb8094b","..\/css\/backoffice\/layout\/dashboard\/_dashboard-editor.scss":"54f9a19e48114c02ffd49f8fa3b8c0d9","..\/css\/backoffice\/layout\/wizard-container\/_wizard-container.scss":"6397850c8975248830a1abf177e13023","..\/css\/backoffice\/layout\/object\/_object-details.scss":"0ea429c0dbdff5360855ff6cb625fc4f","..\/css\/backoffice\/layout\/activity-panel\/_all.scss":"e9a1eae6d8be777f838919d22e5e3e45","..\/css\/backoffice\/layout\/activity-panel\/_activity-panel.scss":"dd44ff120b23d4e5cd0100d83451a040","..\/css\/backoffice\/layout\/activity-panel\/_caselog-entry-form.scss":"bb6d49f017e9cf73b3e4ec3f7e5f1637","..\/css\/backoffice\/layout\/activity-panel\/_activity-entry.scss":"e0e8232a4bf6a3b99eb4e41163f25257","..\/css\/backoffice\/layout\/activity-panel\/_caselog-entry.scss":"8b6fb224c4a598bd8987e5f8e32e6405","..\/css\/backoffice\/layout\/activity-panel\/_transition-entry.scss":"054a4415337e48a907cd9682e2f1ca05","..\/css\/backoffice\/layout\/activity-panel\/_edits-entry.scss":"9463d0a303d9be3a28b5feacca662b9c","..\/css\/backoffice\/layout\/activity-panel\/_notification-entry.scss":"76b7431c8953ff7db5c1a2c4218e00d1","..\/css\/backoffice\/layout\/blocks-integrations\/_all.scss":"628553bd54067b84ba1d17656df94c45","..\/css\/backoffice\/layout\/blocks-integrations\/_dashlet-within-dashboard.scss":"b9c1693a941732c66a9fb92e51609fc7","..\/css\/backoffice\/layout\/blocks-integrations\/_add-to-dashboard.scss":"3ecdea8473b6014dd4e73f98e6eaa5b1","..\/css\/backoffice\/layout\/blocks-integrations\/_caselog-entry-form-within-activity-panel.scss":"0ad42544e79da33693facb23eae57b9e","..\/css\/backoffice\/layout\/blocks-integrations\/_panel-with-tab-container.scss":"1f9073afc9c18d5df23f1866298bc3e4","..\/css\/backoffice\/layout\/blocks-integrations\/_panel-with-datatable.scss":"a96f57fa925f87f0c17eacec6ba98fb9","..\/css\/backoffice\/layout\/blocks-integrations\/_object-details-with-tab-container.scss":"cbe8501a15816de7365564ef4f7877fd","..\/css\/backoffice\/layout\/blocks-integrations\/_medallion-with-blocklist.scss":"878ff11609268b57b09ab44c87e164a8","..\/css\/backoffice\/pages\/_all.scss":"84b5f499283c2d0ad35999d77d2d24ac","..\/css\/backoffice\/pages\/_base.scss":"f17903f37251c03e8ee4ff6a9a1d20df","..\/css\/backoffice\/pages\/_preferences.scss":"4b94210a910e9c1df1fcd93c02916f36","..\/css\/backoffice\/pages\/_attachments.scss":"3c1a03b53ed9edbdd1bf94b215536d3a","..\/css\/backoffice\/pages\/_impact-analysis.scss":"6ce563252f413877876431f6a067c6ba","..\/css\/backoffice\/pages\/_audit.scss":"100f725cb6f0b801fda8243cf9342f26","..\/css\/backoffice\/pages\/_data-synchro.scss":"0c0cc941c901d5ffa4dc0845e6f11d6c","..\/css\/backoffice\/pages\/_datamodel-viewer.scss":"e11bb77c712cbbaa22a11ed24949b239","..\/css\/backoffice\/pages\/_csv-import.scss":"c32a07561c1a90ff754b7da2181b7020","..\/css\/backoffice\/pages\/_global-search.scss":"da4695e624d3a95e3b1c9035b4529a20","..\/css\/backoffice\/pages\/_welcome-popup.scss":"bd2b7cb8e148fc5e469e553e596001e4","..\/css\/backoffice\/application\/_all.scss":"c195d8a4e036571ec39869febd886bab","..\/css\/backoffice\/application\/display-block\/_all.scss":"b0b2c8b0064b5f29d8be3d20fd3302ec","..\/css\/backoffice\/application\/display-block\/_block-csv.scss":"8698dfb104cb8986453fec80e4ef64c9","..\/css\/backoffice\/application\/display-block\/_block-indirect-links.scss":"6262d1640f98dbff9e50ea66efed9161","..\/css\/backoffice\/application\/tabular-fields\/_all.scss":"4f6a05c7f41b0bfd60dd91b442ff95a9","..\/css\/backoffice\/application\/tabular-fields\/_tabular-fields-selector.scss":"bd7d531d18c69e714c3d0ac499bbcf56","..\/css\/backoffice\/themes\/_all.scss":"afefab135bcf21daffa3022ce4529a08","..\/css\/backoffice\/_shame.scss":"25a808c59f06c09c8bdee9179cf5a3e9"}}
+>>>>>>> feature/2982-finalize
 === SIGNATURE END ===
 */
 /*!
diff --git a/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css b/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
index a8d72bbeb..8c23b9b7d 100644
--- a/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
+++ b/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
@@ -1,6 +1,10 @@
 /*
 === SIGNATURE BEGIN ===
+<<<<<<< HEAD
 {"variables":"2a94bae92147ed399031bbb5adccb219","stylesheets":{"fullmoon":"1abf3f443691f601e8deaf66e57fb557","environment-banner":"40e55ac55b4810827a8f500f428a982c"},"imports":[],"images":{"images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/tv-folder.gif":"9f41e1454905fd7416f89aa4380a65e1","images\/tv-file.gif":"9ab0e28d85d8ab5eb954fc28f6ac1e80"},"imports_utility":{"..\/css\/backoffice\/utils\/_all.scss":"fd24aa07b40c91fdee1bbef15d8eacdd","..\/css\/backoffice\/utils\/variables\/_all.scss":"3fa4eaf4a6ae0fc3b3e383cdfc337339","..\/css\/backoffice\/utils\/variables\/colors\/_all.scss":"0c9222dc5e4c46d897ba28e95946ad1b","..\/css\/backoffice\/utils\/variables\/colors\/_base-palette.scss":"2fbf92439664a9606ab84ae6c3a766f0","..\/css\/backoffice\/utils\/variables\/colors\/_semantic-palette.scss":"b0f9d89847d2ee9807fe143bdea5a6cd","..\/css\/backoffice\/utils\/variables\/colors\/_lifecycle-palette.scss":"ea06e857c5d9d442d0b3bdd66db10a7f","..\/css\/backoffice\/utils\/variables\/_border-radius.scss":"334102609a32eb78af0be65efddbe644","..\/css\/backoffice\/utils\/variables\/_depression.scss":"8870a4b14e08d8dbbc98ce833cc92faa","..\/css\/backoffice\/utils\/variables\/_elevation.scss":"09b58442b46fd3722ae9f9b9941504fb","..\/css\/backoffice\/utils\/variables\/_path.scss":"5127683357ba3375fadd33b0e5722908","..\/css\/backoffice\/utils\/variables\/_typography.scss":"4df6a684b909cba8dc44bfc71ac7bc1f","..\/css\/backoffice\/utils\/mixins\/_all.scss":"afefab135bcf21daffa3022ce4529a08","..\/css\/backoffice\/utils\/helpers\/_all.scss":"f7d426dd51c135fe339b583087d7d42c","..\/css\/backoffice\/utils\/helpers\/_border-radius.scss":"4e39edeb6ee7c4ea71f3abdda49256f3","..\/css\/backoffice\/utils\/helpers\/_color.scss":"36008fe20050d3cbb0c7d4502efa9c9b","..\/css\/backoffice\/utils\/helpers\/_depression.scss":"c2a55de471513d368b9ff1c1ca6a1f62","..\/css\/backoffice\/utils\/helpers\/_elevation.scss":"797cdb5c457e83f8e4109f69bda71626","..\/css\/backoffice\/utils\/helpers\/_font-icon.scss":"139adb6b6c29d5532891665adeec5de0","..\/css\/backoffice\/utils\/helpers\/_typography.scss":"cc571d38be1ae67ea53cca26245fb2eb","..\/css\/backoffice\/utils\/helpers\/_misc.scss":"866069015c051206382a9b0094ebc199","..\/css\/backoffice\/vendors\/_all.scss":"392b58d5b87b484d8eaca8bb168f0992","..\/css\/backoffice\/vendors\/_bulma-variables-overload.scss":"27ef02fce9072a3beea71ee34b10ad31","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/bulma.scss":"ac6337c71901f71b197a6628404a70fa","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_all.scss":"e374bc4ffb043b458d29e319b37fec03","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_initial-variables.scss":"527552844220a961a10b9af7b75add8b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_functions.scss":"b39215085d7b424be74e05ae0c9a096b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_animations.scss":"9eeec504cab94a45a597592020b7f0e7","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_mixins.scss":"6201fa9f37198a13291708785bed8c9c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_controls.scss":"d2fd10c6dc0750b99b1f40952e8a4562","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_all.scss":"22cda0b152315361269f768c4a0e08d0","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_minireset.scss":"53ee547c0bff77ba3e6353def2f8729b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_generic.scss":"c6a82d37120ed7d2dc7a64dccac78efd","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_all.scss":"c97722cd26e014967f6bff6133d43b44","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_box.scss":"d951bc383ad44b7497e9e9b1ab0dbe9c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_button.scss":"7ab91729f48c3e49d0f6efafda6cbf6f","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_container.scss":"e4cbd75d93c57a919fd4c183ef80e4ba","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_content.scss":"4123c3d4d782cfbaaa8d4726f3a0425a","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_icon.scss":"b9900e2949eaa5a81a56ec382120cf39","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_image.scss":"4a1e324a1b4accad3e777f1bf0117089","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_notification.scss":"5573e46f01e45b1943a574ec1bdbe83c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_progress.scss":"3700aa5f4e7b0f58b932e242b3bca415","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_table.scss":"4926ed56e8c53fd01543a66c009e0812","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_tag.scss":"b09d520b88f166e2847aed34f1f391e9","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_title.scss":"ecf774ebb3ddaa9097ea7fc66f416a0c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_other.scss":"0e3571082a9629565dddb46712695756","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_all.scss":"414c51848e9f554070f97df2fe347a78","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_shared.scss":"73134a972f286fb24dc44e01ef0cf679","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_input-textarea.scss":"73e1d5c1673fdcd4c70d4a3125a3cdb5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_checkbox-radio.scss":"c7430dbb855100ff193641bf31904ccb","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_select.scss":"c16a527986de7020f25e263943729937","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_file.scss":"c7a1351cfd94269350029a92dc7db83e","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_tools.scss":"c2bf0379d43ef365c981b38ef6bfff6c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_all.scss":"398290ce7b00255b62e0b0c3ad6e6001","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_breadcrumb.scss":"7d90b4a6fae954f3e0c5e42e8c0c452d","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_card.scss":"16ea78a5288bd6ef6f665f1617b56702","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_dropdown.scss":"1a104de77315d37b7bdbd63eb3713be3","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_level.scss":"ce9549ec67ec27e93525de339d5bca87","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_media.scss":"ce5a90fcd100550bb754911ded93b055","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_menu.scss":"95b9cf3ffaec3122b790d86b0e27d299","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_message.scss":"0eff66899482f72804bf97b54e2a1e43","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_modal.scss":"b028228728cd5d50024ec4df9a8ecad3","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_navbar.scss":"8fb55c78c7bceee235db0ce27b344ada","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_pagination.scss":"6f4118ee0348e59cb1e4352d07a913bb","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_panel.scss":"c02cac8901cd7355b3e17ff832fcc59e","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_tabs.scss":"7b1d3b07dad7d06c9845bf244bceb985","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_all.scss":"dff17fcb0a743bc82e2f130ae638baaa","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_columns.scss":"52a2c66125f03f8dd707837b2ae67be5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_tiles.scss":"c3cbb200243be1702bf3f20fc003a133","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_all.scss":"cc385355f8f6ac3947c46ac83ffb9621","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_color.scss":"acbcbb2198ae9d0ee36a471d18b6d003","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_float.scss":"1e1656cbd9628e4889ed0c669ff8d552","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_other.scss":"8ea9052a4dff7ce651cb480ae76c3537","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_overflow.scss":"724297f6af3b8ca69fd8532d36992b1f","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_position.scss":"41d70d52c4d9078622e374f96f2266c5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_spacing.scss":"d54ad9ee813ef6a96aeb2b6b39295909","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_typography.scss":"017c280d5e0d4fe90aa54067d483c965","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_visibility.scss":"4fa33c151d85b0dd99ed1bab93185461","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_all.scss":"cd3a2d35edc7b6d00bc65585b2b35961","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_hero.scss":"44f9f81a58020b964b856c914c327430","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_section.scss":"eacc632700c2257f51bdcabe7dc13d04","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_footer.scss":"fb4c389411fcff6aacabf5e4de0c403e","..\/css\/backoffice\/vendors\/_ckeditor.scss":"35e296a14a5ff8866721b9d90fb84c25","..\/css\/backoffice\/vendors\/_jqueryui.scss":"d939c626b989afa15d068107f97caaee","..\/css\/backoffice\/vendors\/_jquery-multiselect.scss":"9e07f3c7417a9b939303ba83d564737e","..\/css\/backoffice\/vendors\/_datatables.scss":"9afd18098bf4ea37af696c3f0d2f1f6b","..\/css\/backoffice\/vendors\/_jquery-treeview.scss":"d962e8db308512292d1ea04d777d3761","..\/css\/backoffice\/base\/_all.scss":"5a90fbde32f512506f5822ae9f5e05df","..\/css\/backoffice\/base\/_base.scss":"de2605ea6cb59fe350ee33d9714acd09","..\/css\/backoffice\/base\/_typography.scss":"6eb47d257105bd09af2c4ef2355c6dda","..\/css\/backoffice\/components\/_all.scss":"3a838df1f0e1542d78cb92a0fb296c66","..\/css\/backoffice\/components\/_alert.scss":"81cc21c278295b369f82e32348d9a602","..\/css\/backoffice\/components\/_button.scss":"3c40a0ce008cebaf48b2946f7d6b62a7","..\/css\/backoffice\/components\/_button-group.scss":"358f1096ffeb30e1d86a2df6c9cca347","..\/css\/backoffice\/components\/_breadcrumbs.scss":"4df4bc057791ad985ec7b3e25d605d65","..\/css\/backoffice\/components\/_collapsible-section.scss":"16efa2362d8e0aa383185565f76abc9c","..\/css\/backoffice\/components\/_quick-create.scss":"124861a5d6bff49dd92706517e8518ac","..\/css\/backoffice\/components\/_global-search.scss":"65f8925591801724b8fef0f110892508","..\/css\/backoffice\/components\/popover-menu\/_popover-menu.scss":"7bf9c17f1879407cb89fd618fece15ab","..\/css\/backoffice\/components\/popover-menu\/_popover-menu-item.scss":"fbd6a59276715245240eea0c7b28d7db","..\/css\/backoffice\/components\/_newsroom-menu.scss":"ff947d9c69be99e4129dbfbe4189ad43","..\/css\/backoffice\/components\/_panel.scss":"e1e74b2f27da0322e73f1a3cd01cb5d1","..\/css\/backoffice\/components\/_modal.scss":"d41d8cd98f00b204e9800998ecf8427e","..\/css\/backoffice\/components\/dashlet\/_all.scss":"c9dd70be9f33b53701c6afc7a4749190","..\/css\/backoffice\/components\/dashlet\/_dashlet.scss":"6556cb93e2c0fc8cdb14ba0a91a414a2","..\/css\/backoffice\/components\/dashlet\/_dashlet-badge.scss":"d8043a579d9350413838e5d82925cccc","..\/css\/backoffice\/components\/dashlet\/_dashlet-header-static.scss":"df944fbcf00717cb7bb373e5f57c1b12","..\/css\/backoffice\/components\/dashlet\/_dashlet-header-dynamic.scss":"3dedc214612dde1f4ecd19e59986c4ee","..\/css\/backoffice\/components\/input\/_all.scss":"c8bceeb98cc73d95740ae86aaf504fcb","..\/css\/backoffice\/components\/input\/_input.scss":"8bb63d30efdeceb16360a1db16f13986","..\/css\/backoffice\/components\/input\/_input-checkbox.scss":"ad1644e915cffbee9b94012a8a17949c","..\/css\/backoffice\/components\/input\/_input-date.scss":"9322d73459bd5e9ddc9e830eb92a6c1b","..\/css\/backoffice\/components\/input\/_input-datetime.scss":"ee3f15ab1dde584bf65457bbed3668cc","..\/css\/backoffice\/components\/input\/_input-duration.scss":"6d12508069ff3ca94bfa142c4228f2cb","..\/css\/backoffice\/components\/input\/_input-image.scss":"fae0b98d530e4929f22e16bd5c7adaf1","..\/css\/backoffice\/components\/input\/_input-select.scss":"be918e7a48d88f35ad405d8e881292eb","..\/css\/backoffice\/components\/input\/_input-select-icon.scss":"7356bd623ae91ac9c3df1bc2c52061ef","..\/css\/backoffice\/components\/input\/_input-string.scss":"d41d8cd98f00b204e9800998ecf8427e","..\/css\/backoffice\/components\/input\/_input-set.scss":"1b17f6ca73bf1ebaa0e0d8c7ddc7e270","..\/css\/backoffice\/components\/input\/_input-text.scss":"b5a43875b1d9a4af9a2d3f610905b517","..\/css\/backoffice\/components\/_pill.scss":"870d9184ca8f3325531b96cfa292df03","..\/css\/backoffice\/components\/_prop.scss":"2c29ce740e9301491df004baa7da78af","..\/css\/backoffice\/components\/_title.scss":"6c8e1a58272bc31a8fa8279f881741dc","..\/css\/backoffice\/components\/_datatable.scss":"241eeb462f302cb7b50371eddc46c81e","..\/css\/backoffice\/components\/_form.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_fieldset.scss":"85ce5bce4306e927de99d77b6029cf25","..\/css\/backoffice\/components\/_field.scss":"3dbb8632ad1435f557ab699725611e89","..\/css\/backoffice\/components\/toolbar\/_all.scss":"12e9e9094b4f7d0ccbb4428383b6e728","..\/css\/backoffice\/components\/toolbar\/_toolbar.scss":"e7078bb37ef355ba217c1a8a9f587e1a","..\/css\/backoffice\/components\/toolbar\/_toolbar-spacer.scss":"1fcdd603b20e5848235e930014887d73","..\/css\/backoffice\/components\/toolbar\/_separator.scss":"8ca10dcc3f1d469623d0538748acd4d5","..\/css\/backoffice\/components\/_richtext.scss":"361c5ded07c8e835619bf45e10f7a602","..\/css\/backoffice\/components\/_formtable.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_formtablerow.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_search-form.scss":"edff6421aef1d5bdfec04d788405327d","..\/css\/backoffice\/components\/_field-badge.scss":"628c1d504f86bde8a2bf497edf7541a5","..\/css\/backoffice\/components\/_file-select.scss":"d63bda867799a8f4a1b2adc376024931","..\/css\/backoffice\/components\/_medallion-icon.scss":"ccff061880095b8f9f40412293ac9f76","..\/css\/backoffice\/layout\/_all.scss":"e2eacaef476c057f64d5e28af3262db5","..\/css\/backoffice\/layout\/_navigation-menu.scss":"ad7ea09411e2475a1071fb45d1e442f9","..\/css\/backoffice\/layout\/_top-bar.scss":"1127d54e2a9f821512f3936288b303bf","..\/css\/backoffice\/layout\/_content.scss":"0fc4b9c60d4cb12faf5eaeb8290185d7","..\/css\/backoffice\/layout\/tab-container\/_tab-container.scss":"14b4871f1ec26637a9e1491470ad969e","..\/css\/backoffice\/layout\/tab-container\/_tab.scss":"742392bfd94a5a115bc144ea9aa4ff3f","..\/css\/backoffice\/layout\/multi-column\/_multi-column.scss":"e99d4afb40886d6d942c5020b288b1b8","..\/css\/backoffice\/layout\/multi-column\/_column.scss":"0561df371796667551c8f8cfb0676470","..\/css\/backoffice\/layout\/dashboard\/_all.scss":"0caa6d19d2a52396cbe3752d5bfcd6da","..\/css\/backoffice\/layout\/dashboard\/_dashboard.scss":"07d543ee725e338a79fb9e18eeb8094b","..\/css\/backoffice\/layout\/dashboard\/_dashboard-editor.scss":"54f9a19e48114c02ffd49f8fa3b8c0d9","..\/css\/backoffice\/layout\/wizard-container\/_wizard-container.scss":"6397850c8975248830a1abf177e13023","..\/css\/backoffice\/layout\/object\/_object-details.scss":"0ea429c0dbdff5360855ff6cb625fc4f","..\/css\/backoffice\/layout\/activity-panel\/_all.scss":"e9a1eae6d8be777f838919d22e5e3e45","..\/css\/backoffice\/layout\/activity-panel\/_activity-panel.scss":"dd44ff120b23d4e5cd0100d83451a040","..\/css\/backoffice\/layout\/activity-panel\/_caselog-entry-form.scss":"bb6d49f017e9cf73b3e4ec3f7e5f1637","..\/css\/backoffice\/layout\/activity-panel\/_activity-entry.scss":"e0e8232a4bf6a3b99eb4e41163f25257","..\/css\/backoffice\/layout\/activity-panel\/_caselog-entry.scss":"8b6fb224c4a598bd8987e5f8e32e6405","..\/css\/backoffice\/layout\/activity-panel\/_transition-entry.scss":"054a4415337e48a907cd9682e2f1ca05","..\/css\/backoffice\/layout\/activity-panel\/_edits-entry.scss":"9463d0a303d9be3a28b5feacca662b9c","..\/css\/backoffice\/layout\/activity-panel\/_notification-entry.scss":"76b7431c8953ff7db5c1a2c4218e00d1","..\/css\/backoffice\/layout\/blocks-integrations\/_all.scss":"628553bd54067b84ba1d17656df94c45","..\/css\/backoffice\/layout\/blocks-integrations\/_dashlet-within-dashboard.scss":"b9c1693a941732c66a9fb92e51609fc7","..\/css\/backoffice\/layout\/blocks-integrations\/_add-to-dashboard.scss":"3ecdea8473b6014dd4e73f98e6eaa5b1","..\/css\/backoffice\/layout\/blocks-integrations\/_caselog-entry-form-within-activity-panel.scss":"0ad42544e79da33693facb23eae57b9e","..\/css\/backoffice\/layout\/blocks-integrations\/_panel-with-tab-container.scss":"1f9073afc9c18d5df23f1866298bc3e4","..\/css\/backoffice\/layout\/blocks-integrations\/_panel-with-datatable.scss":"a96f57fa925f87f0c17eacec6ba98fb9","..\/css\/backoffice\/layout\/blocks-integrations\/_object-details-with-tab-container.scss":"e75862e46d156fbedc074ac7055813de","..\/css\/backoffice\/layout\/blocks-integrations\/_medallion-with-blocklist.scss":"878ff11609268b57b09ab44c87e164a8","..\/css\/backoffice\/pages\/_all.scss":"84b5f499283c2d0ad35999d77d2d24ac","..\/css\/backoffice\/pages\/_base.scss":"f17903f37251c03e8ee4ff6a9a1d20df","..\/css\/backoffice\/pages\/_preferences.scss":"4b94210a910e9c1df1fcd93c02916f36","..\/css\/backoffice\/pages\/_attachments.scss":"3c1a03b53ed9edbdd1bf94b215536d3a","..\/css\/backoffice\/pages\/_impact-analysis.scss":"6ce563252f413877876431f6a067c6ba","..\/css\/backoffice\/pages\/_audit.scss":"100f725cb6f0b801fda8243cf9342f26","..\/css\/backoffice\/pages\/_data-synchro.scss":"0c0cc941c901d5ffa4dc0845e6f11d6c","..\/css\/backoffice\/pages\/_datamodel-viewer.scss":"e11bb77c712cbbaa22a11ed24949b239","..\/css\/backoffice\/pages\/_csv-import.scss":"c32a07561c1a90ff754b7da2181b7020","..\/css\/backoffice\/pages\/_global-search.scss":"da4695e624d3a95e3b1c9035b4529a20","..\/css\/backoffice\/pages\/_welcome-popup.scss":"bd2b7cb8e148fc5e469e553e596001e4","..\/css\/backoffice\/application\/_all.scss":"c195d8a4e036571ec39869febd886bab","..\/css\/backoffice\/application\/display-block\/_all.scss":"b0b2c8b0064b5f29d8be3d20fd3302ec","..\/css\/backoffice\/application\/display-block\/_block-csv.scss":"8698dfb104cb8986453fec80e4ef64c9","..\/css\/backoffice\/application\/display-block\/_block-indirect-links.scss":"6262d1640f98dbff9e50ea66efed9161","..\/css\/backoffice\/application\/tabular-fields\/_all.scss":"4f6a05c7f41b0bfd60dd91b442ff95a9","..\/css\/backoffice\/application\/tabular-fields\/_tabular-fields-selector.scss":"bd7d531d18c69e714c3d0ac499bbcf56","..\/css\/backoffice\/themes\/_all.scss":"afefab135bcf21daffa3022ce4529a08","..\/css\/backoffice\/_shame.scss":"25a808c59f06c09c8bdee9179cf5a3e9"}}
+=======
+{"variables":"2a94bae92147ed399031bbb5adccb219","stylesheets":{"fullmoon":"1abf3f443691f601e8deaf66e57fb557","environment-banner":"40e55ac55b4810827a8f500f428a982c"},"variable_imports":[],"images":{"images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/tv-folder.gif":"9f41e1454905fd7416f89aa4380a65e1","images\/tv-file.gif":"9ab0e28d85d8ab5eb954fc28f6ac1e80"},"utility_imports":{"..\/css\/backoffice\/utils\/_all.scss":"fd24aa07b40c91fdee1bbef15d8eacdd","..\/css\/backoffice\/utils\/variables\/_all.scss":"3fa4eaf4a6ae0fc3b3e383cdfc337339","..\/css\/backoffice\/utils\/variables\/colors\/_all.scss":"0c9222dc5e4c46d897ba28e95946ad1b","..\/css\/backoffice\/utils\/variables\/colors\/_base-palette.scss":"2fbf92439664a9606ab84ae6c3a766f0","..\/css\/backoffice\/utils\/variables\/colors\/_semantic-palette.scss":"b0f9d89847d2ee9807fe143bdea5a6cd","..\/css\/backoffice\/utils\/variables\/colors\/_lifecycle-palette.scss":"ea06e857c5d9d442d0b3bdd66db10a7f","..\/css\/backoffice\/utils\/variables\/_border-radius.scss":"334102609a32eb78af0be65efddbe644","..\/css\/backoffice\/utils\/variables\/_depression.scss":"8870a4b14e08d8dbbc98ce833cc92faa","..\/css\/backoffice\/utils\/variables\/_elevation.scss":"09b58442b46fd3722ae9f9b9941504fb","..\/css\/backoffice\/utils\/variables\/_path.scss":"5127683357ba3375fadd33b0e5722908","..\/css\/backoffice\/utils\/variables\/_typography.scss":"4df6a684b909cba8dc44bfc71ac7bc1f","..\/css\/backoffice\/utils\/mixins\/_all.scss":"afefab135bcf21daffa3022ce4529a08","..\/css\/backoffice\/utils\/helpers\/_all.scss":"f7d426dd51c135fe339b583087d7d42c","..\/css\/backoffice\/utils\/helpers\/_border-radius.scss":"4e39edeb6ee7c4ea71f3abdda49256f3","..\/css\/backoffice\/utils\/helpers\/_color.scss":"36008fe20050d3cbb0c7d4502efa9c9b","..\/css\/backoffice\/utils\/helpers\/_depression.scss":"c2a55de471513d368b9ff1c1ca6a1f62","..\/css\/backoffice\/utils\/helpers\/_elevation.scss":"797cdb5c457e83f8e4109f69bda71626","..\/css\/backoffice\/utils\/helpers\/_font-icon.scss":"139adb6b6c29d5532891665adeec5de0","..\/css\/backoffice\/utils\/helpers\/_typography.scss":"cc571d38be1ae67ea53cca26245fb2eb","..\/css\/backoffice\/utils\/helpers\/_misc.scss":"866069015c051206382a9b0094ebc199","..\/css\/backoffice\/vendors\/_all.scss":"392b58d5b87b484d8eaca8bb168f0992","..\/css\/backoffice\/vendors\/_bulma-variables-overload.scss":"27ef02fce9072a3beea71ee34b10ad31","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/bulma.scss":"ac6337c71901f71b197a6628404a70fa","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_all.scss":"e374bc4ffb043b458d29e319b37fec03","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_initial-variables.scss":"527552844220a961a10b9af7b75add8b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_functions.scss":"b39215085d7b424be74e05ae0c9a096b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_animations.scss":"9eeec504cab94a45a597592020b7f0e7","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_mixins.scss":"6201fa9f37198a13291708785bed8c9c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/utilities\/_controls.scss":"d2fd10c6dc0750b99b1f40952e8a4562","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_all.scss":"22cda0b152315361269f768c4a0e08d0","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_minireset.scss":"53ee547c0bff77ba3e6353def2f8729b","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/base\/_generic.scss":"c6a82d37120ed7d2dc7a64dccac78efd","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_all.scss":"c97722cd26e014967f6bff6133d43b44","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_box.scss":"d951bc383ad44b7497e9e9b1ab0dbe9c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_button.scss":"7ab91729f48c3e49d0f6efafda6cbf6f","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_container.scss":"e4cbd75d93c57a919fd4c183ef80e4ba","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_content.scss":"4123c3d4d782cfbaaa8d4726f3a0425a","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_icon.scss":"b9900e2949eaa5a81a56ec382120cf39","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_image.scss":"4a1e324a1b4accad3e777f1bf0117089","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_notification.scss":"5573e46f01e45b1943a574ec1bdbe83c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_progress.scss":"3700aa5f4e7b0f58b932e242b3bca415","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_table.scss":"4926ed56e8c53fd01543a66c009e0812","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_tag.scss":"b09d520b88f166e2847aed34f1f391e9","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_title.scss":"ecf774ebb3ddaa9097ea7fc66f416a0c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/elements\/_other.scss":"0e3571082a9629565dddb46712695756","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_all.scss":"414c51848e9f554070f97df2fe347a78","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_shared.scss":"73134a972f286fb24dc44e01ef0cf679","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_input-textarea.scss":"73e1d5c1673fdcd4c70d4a3125a3cdb5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_checkbox-radio.scss":"c7430dbb855100ff193641bf31904ccb","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_select.scss":"c16a527986de7020f25e263943729937","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_file.scss":"c7a1351cfd94269350029a92dc7db83e","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/form\/_tools.scss":"c2bf0379d43ef365c981b38ef6bfff6c","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_all.scss":"398290ce7b00255b62e0b0c3ad6e6001","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_breadcrumb.scss":"7d90b4a6fae954f3e0c5e42e8c0c452d","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_card.scss":"16ea78a5288bd6ef6f665f1617b56702","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_dropdown.scss":"1a104de77315d37b7bdbd63eb3713be3","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_level.scss":"ce9549ec67ec27e93525de339d5bca87","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_media.scss":"ce5a90fcd100550bb754911ded93b055","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_menu.scss":"95b9cf3ffaec3122b790d86b0e27d299","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_message.scss":"0eff66899482f72804bf97b54e2a1e43","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_modal.scss":"b028228728cd5d50024ec4df9a8ecad3","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_navbar.scss":"8fb55c78c7bceee235db0ce27b344ada","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_pagination.scss":"6f4118ee0348e59cb1e4352d07a913bb","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_panel.scss":"c02cac8901cd7355b3e17ff832fcc59e","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/components\/_tabs.scss":"7b1d3b07dad7d06c9845bf244bceb985","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_all.scss":"dff17fcb0a743bc82e2f130ae638baaa","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_columns.scss":"52a2c66125f03f8dd707837b2ae67be5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/grid\/_tiles.scss":"c3cbb200243be1702bf3f20fc003a133","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_all.scss":"cc385355f8f6ac3947c46ac83ffb9621","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_color.scss":"acbcbb2198ae9d0ee36a471d18b6d003","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_float.scss":"1e1656cbd9628e4889ed0c669ff8d552","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_other.scss":"8ea9052a4dff7ce651cb480ae76c3537","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_overflow.scss":"724297f6af3b8ca69fd8532d36992b1f","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_position.scss":"41d70d52c4d9078622e374f96f2266c5","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_spacing.scss":"d54ad9ee813ef6a96aeb2b6b39295909","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_typography.scss":"017c280d5e0d4fe90aa54067d483c965","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/helpers\/_visibility.scss":"4fa33c151d85b0dd99ed1bab93185461","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_all.scss":"cd3a2d35edc7b6d00bc65585b2b35961","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_hero.scss":"44f9f81a58020b964b856c914c327430","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_section.scss":"eacc632700c2257f51bdcabe7dc13d04","..\/css\/backoffice\/vendors\/..\/..\/..\/node_modules\/bulma-scss\/layout\/_footer.scss":"fb4c389411fcff6aacabf5e4de0c403e","..\/css\/backoffice\/vendors\/_ckeditor.scss":"35e296a14a5ff8866721b9d90fb84c25","..\/css\/backoffice\/vendors\/_jqueryui.scss":"d939c626b989afa15d068107f97caaee","..\/css\/backoffice\/vendors\/_jquery-multiselect.scss":"9e07f3c7417a9b939303ba83d564737e","..\/css\/backoffice\/vendors\/_datatables.scss":"9afd18098bf4ea37af696c3f0d2f1f6b","..\/css\/backoffice\/vendors\/_jquery-treeview.scss":"d962e8db308512292d1ea04d777d3761","..\/css\/backoffice\/base\/_all.scss":"5a90fbde32f512506f5822ae9f5e05df","..\/css\/backoffice\/base\/_base.scss":"de2605ea6cb59fe350ee33d9714acd09","..\/css\/backoffice\/base\/_typography.scss":"6eb47d257105bd09af2c4ef2355c6dda","..\/css\/backoffice\/components\/_all.scss":"3a838df1f0e1542d78cb92a0fb296c66","..\/css\/backoffice\/components\/_alert.scss":"81cc21c278295b369f82e32348d9a602","..\/css\/backoffice\/components\/_button.scss":"3c40a0ce008cebaf48b2946f7d6b62a7","..\/css\/backoffice\/components\/_button-group.scss":"358f1096ffeb30e1d86a2df6c9cca347","..\/css\/backoffice\/components\/_breadcrumbs.scss":"4df4bc057791ad985ec7b3e25d605d65","..\/css\/backoffice\/components\/_collapsible-section.scss":"16efa2362d8e0aa383185565f76abc9c","..\/css\/backoffice\/components\/_quick-create.scss":"124861a5d6bff49dd92706517e8518ac","..\/css\/backoffice\/components\/_global-search.scss":"65f8925591801724b8fef0f110892508","..\/css\/backoffice\/components\/popover-menu\/_popover-menu.scss":"7bf9c17f1879407cb89fd618fece15ab","..\/css\/backoffice\/components\/popover-menu\/_popover-menu-item.scss":"fbd6a59276715245240eea0c7b28d7db","..\/css\/backoffice\/components\/_newsroom-menu.scss":"ff947d9c69be99e4129dbfbe4189ad43","..\/css\/backoffice\/components\/_panel.scss":"e1e74b2f27da0322e73f1a3cd01cb5d1","..\/css\/backoffice\/components\/_modal.scss":"d41d8cd98f00b204e9800998ecf8427e","..\/css\/backoffice\/components\/dashlet\/_all.scss":"c9dd70be9f33b53701c6afc7a4749190","..\/css\/backoffice\/components\/dashlet\/_dashlet.scss":"6556cb93e2c0fc8cdb14ba0a91a414a2","..\/css\/backoffice\/components\/dashlet\/_dashlet-badge.scss":"d8043a579d9350413838e5d82925cccc","..\/css\/backoffice\/components\/dashlet\/_dashlet-header-static.scss":"df944fbcf00717cb7bb373e5f57c1b12","..\/css\/backoffice\/components\/dashlet\/_dashlet-header-dynamic.scss":"3dedc214612dde1f4ecd19e59986c4ee","..\/css\/backoffice\/components\/input\/_all.scss":"c8bceeb98cc73d95740ae86aaf504fcb","..\/css\/backoffice\/components\/input\/_input.scss":"8bb63d30efdeceb16360a1db16f13986","..\/css\/backoffice\/components\/input\/_input-checkbox.scss":"ad1644e915cffbee9b94012a8a17949c","..\/css\/backoffice\/components\/input\/_input-date.scss":"9322d73459bd5e9ddc9e830eb92a6c1b","..\/css\/backoffice\/components\/input\/_input-datetime.scss":"ee3f15ab1dde584bf65457bbed3668cc","..\/css\/backoffice\/components\/input\/_input-duration.scss":"6d12508069ff3ca94bfa142c4228f2cb","..\/css\/backoffice\/components\/input\/_input-image.scss":"fae0b98d530e4929f22e16bd5c7adaf1","..\/css\/backoffice\/components\/input\/_input-select.scss":"be918e7a48d88f35ad405d8e881292eb","..\/css\/backoffice\/components\/input\/_input-select-icon.scss":"7356bd623ae91ac9c3df1bc2c52061ef","..\/css\/backoffice\/components\/input\/_input-string.scss":"d41d8cd98f00b204e9800998ecf8427e","..\/css\/backoffice\/components\/input\/_input-set.scss":"1b17f6ca73bf1ebaa0e0d8c7ddc7e270","..\/css\/backoffice\/components\/input\/_input-text.scss":"b5a43875b1d9a4af9a2d3f610905b517","..\/css\/backoffice\/components\/_pill.scss":"870d9184ca8f3325531b96cfa292df03","..\/css\/backoffice\/components\/_prop.scss":"2c29ce740e9301491df004baa7da78af","..\/css\/backoffice\/components\/_title.scss":"6c8e1a58272bc31a8fa8279f881741dc","..\/css\/backoffice\/components\/_datatable.scss":"241eeb462f302cb7b50371eddc46c81e","..\/css\/backoffice\/components\/_form.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_fieldset.scss":"85ce5bce4306e927de99d77b6029cf25","..\/css\/backoffice\/components\/_field.scss":"3dbb8632ad1435f557ab699725611e89","..\/css\/backoffice\/components\/toolbar\/_all.scss":"12e9e9094b4f7d0ccbb4428383b6e728","..\/css\/backoffice\/components\/toolbar\/_toolbar.scss":"e7078bb37ef355ba217c1a8a9f587e1a","..\/css\/backoffice\/components\/toolbar\/_toolbar-spacer.scss":"1fcdd603b20e5848235e930014887d73","..\/css\/backoffice\/components\/toolbar\/_separator.scss":"8ca10dcc3f1d469623d0538748acd4d5","..\/css\/backoffice\/components\/_richtext.scss":"361c5ded07c8e835619bf45e10f7a602","..\/css\/backoffice\/components\/_formtable.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_formtablerow.scss":"94dc266452aeb26f6525a24f84e5e383","..\/css\/backoffice\/components\/_search-form.scss":"edff6421aef1d5bdfec04d788405327d","..\/css\/backoffice\/components\/_field-badge.scss":"628c1d504f86bde8a2bf497edf7541a5","..\/css\/backoffice\/components\/_file-select.scss":"d63bda867799a8f4a1b2adc376024931","..\/css\/backoffice\/components\/_medallion-icon.scss":"ccff061880095b8f9f40412293ac9f76","..\/css\/backoffice\/layout\/_all.scss":"e2eacaef476c057f64d5e28af3262db5","..\/css\/backoffice\/layout\/_navigation-menu.scss":"163581a19a13214fd67a90d020baf451","..\/css\/backoffice\/layout\/_top-bar.scss":"1127d54e2a9f821512f3936288b303bf","..\/css\/backoffice\/layout\/_content.scss":"0fc4b9c60d4cb12faf5eaeb8290185d7","..\/css\/backoffice\/layout\/tab-container\/_tab-container.scss":"046e39b568c76b01f5dab84c3c0e7a79","..\/css\/backoffice\/layout\/tab-container\/_tab.scss":"742392bfd94a5a115bc144ea9aa4ff3f","..\/css\/backoffice\/layout\/multi-column\/_multi-column.scss":"e99d4afb40886d6d942c5020b288b1b8","..\/css\/backoffice\/layout\/multi-column\/_column.scss":"0561df371796667551c8f8cfb0676470","..\/css\/backoffice\/layout\/dashboard\/_all.scss":"0caa6d19d2a52396cbe3752d5bfcd6da","..\/css\/backoffice\/layout\/dashboard\/_dashboard.scss":"07d543ee725e338a79fb9e18eeb8094b","..\/css\/backoffice\/layout\/dashboard\/_dashboard-editor.scss":"54f9a19e48114c02ffd49f8fa3b8c0d9","..\/css\/backoffice\/layout\/wizard-container\/_wizard-container.scss":"6397850c8975248830a1abf177e13023","..\/css\/backoffice\/layout\/object\/_object-details.scss":"0ea429c0dbdff5360855ff6cb625fc4f","..\/css\/backoffice\/layout\/activity-panel\/_all.scss":"e9a1eae6d8be777f838919d22e5e3e45","..\/css\/backoffice\/layout\/activity-panel\/_activity-panel.scss":"dd44ff120b23d4e5cd0100d83451a040","..\/css\/backoffice\/layout\/activity-panel\/_caselog-entry-form.scss":"bb6d49f017e9cf73b3e4ec3f7e5f1637","..\/css\/backoffice\/layout\/activity-panel\/_activity-entry.scss":"e0e8232a4bf6a3b99eb4e41163f25257","..\/css\/backoffice\/layout\/activity-panel\/_caselog-entry.scss":"8b6fb224c4a598bd8987e5f8e32e6405","..\/css\/backoffice\/layout\/activity-panel\/_transition-entry.scss":"054a4415337e48a907cd9682e2f1ca05","..\/css\/backoffice\/layout\/activity-panel\/_edits-entry.scss":"9463d0a303d9be3a28b5feacca662b9c","..\/css\/backoffice\/layout\/activity-panel\/_notification-entry.scss":"76b7431c8953ff7db5c1a2c4218e00d1","..\/css\/backoffice\/layout\/blocks-integrations\/_all.scss":"628553bd54067b84ba1d17656df94c45","..\/css\/backoffice\/layout\/blocks-integrations\/_dashlet-within-dashboard.scss":"b9c1693a941732c66a9fb92e51609fc7","..\/css\/backoffice\/layout\/blocks-integrations\/_add-to-dashboard.scss":"3ecdea8473b6014dd4e73f98e6eaa5b1","..\/css\/backoffice\/layout\/blocks-integrations\/_caselog-entry-form-within-activity-panel.scss":"0ad42544e79da33693facb23eae57b9e","..\/css\/backoffice\/layout\/blocks-integrations\/_panel-with-tab-container.scss":"1f9073afc9c18d5df23f1866298bc3e4","..\/css\/backoffice\/layout\/blocks-integrations\/_panel-with-datatable.scss":"a96f57fa925f87f0c17eacec6ba98fb9","..\/css\/backoffice\/layout\/blocks-integrations\/_object-details-with-tab-container.scss":"cbe8501a15816de7365564ef4f7877fd","..\/css\/backoffice\/layout\/blocks-integrations\/_medallion-with-blocklist.scss":"878ff11609268b57b09ab44c87e164a8","..\/css\/backoffice\/pages\/_all.scss":"84b5f499283c2d0ad35999d77d2d24ac","..\/css\/backoffice\/pages\/_base.scss":"f17903f37251c03e8ee4ff6a9a1d20df","..\/css\/backoffice\/pages\/_preferences.scss":"4b94210a910e9c1df1fcd93c02916f36","..\/css\/backoffice\/pages\/_attachments.scss":"3c1a03b53ed9edbdd1bf94b215536d3a","..\/css\/backoffice\/pages\/_impact-analysis.scss":"6ce563252f413877876431f6a067c6ba","..\/css\/backoffice\/pages\/_audit.scss":"100f725cb6f0b801fda8243cf9342f26","..\/css\/backoffice\/pages\/_data-synchro.scss":"0c0cc941c901d5ffa4dc0845e6f11d6c","..\/css\/backoffice\/pages\/_datamodel-viewer.scss":"e11bb77c712cbbaa22a11ed24949b239","..\/css\/backoffice\/pages\/_csv-import.scss":"c32a07561c1a90ff754b7da2181b7020","..\/css\/backoffice\/pages\/_global-search.scss":"da4695e624d3a95e3b1c9035b4529a20","..\/css\/backoffice\/pages\/_welcome-popup.scss":"bd2b7cb8e148fc5e469e553e596001e4","..\/css\/backoffice\/application\/_all.scss":"c195d8a4e036571ec39869febd886bab","..\/css\/backoffice\/application\/display-block\/_all.scss":"b0b2c8b0064b5f29d8be3d20fd3302ec","..\/css\/backoffice\/application\/display-block\/_block-csv.scss":"8698dfb104cb8986453fec80e4ef64c9","..\/css\/backoffice\/application\/display-block\/_block-indirect-links.scss":"6262d1640f98dbff9e50ea66efed9161","..\/css\/backoffice\/application\/tabular-fields\/_all.scss":"4f6a05c7f41b0bfd60dd91b442ff95a9","..\/css\/backoffice\/application\/tabular-fields\/_tabular-fields-selector.scss":"bd7d531d18c69e714c3d0ac499bbcf56","..\/css\/backoffice\/themes\/_all.scss":"afefab135bcf21daffa3022ce4529a08","..\/css\/backoffice\/_shame.scss":"25a808c59f06c09c8bdee9179cf5a3e9"}}
+>>>>>>> feature/2982-finalize
 === SIGNATURE END ===
 */
 /*!
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index ee1be2f96..17f324fcb 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -1917,6 +1917,7 @@ return array(
     'TemplateString' => $baseDir . '/core/templatestring.class.inc.php',
     'TemplateStringPlaceholder' => $baseDir . '/core/templatestring.class.inc.php',
     'ThemeHandler' => $baseDir . '/application/themehandler.class.inc.php',
+	'ThemeHandlerService' => $baseDir . '/application/themehandlerservice.class.inc.php',
     'ToolsLog' => $baseDir . '/core/log.class.inc.php',
     'Trigger' => $baseDir . '/core/trigger.class.inc.php',
     'TriggerOnObject' => $baseDir . '/core/trigger.class.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index df1cd996b..19bfa546c 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -2147,6 +2147,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'TemplateString' => __DIR__ . '/../..' . '/core/templatestring.class.inc.php',
         'TemplateStringPlaceholder' => __DIR__ . '/../..' . '/core/templatestring.class.inc.php',
         'ThemeHandler' => __DIR__ . '/../..' . '/application/themehandler.class.inc.php',
+        'ThemeHandlerService' => __DIR__ . '/../..' . '/application/themehandlerservice.class.inc.php',
         'ToolsLog' => __DIR__ . '/../..' . '/core/log.class.inc.php',
         'Trigger' => __DIR__ . '/../..' . '/core/trigger.class.inc.php',
         'TriggerOnObject' => __DIR__ . '/../..' . '/core/trigger.class.inc.php',
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index eda698d45..9188a75a0 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -53,6 +53,8 @@ class MFCompiler
 {
 	const DATA_PRECOMPILED_FOLDER = 'data' . DIRECTORY_SEPARATOR . 'precompiled_styles' . DIRECTORY_SEPARATOR;
 
+	private static $oThemeHandlerService;
+
 	/** @var \ModelFactory */
 	protected $oFactory;
 
@@ -2792,11 +2794,10 @@ EOF;
 	/**
 	 * @param \MFElement $oBrandingNode
 	 * @param string $sTempTargetDir
-	 * @param string $sFinalTargetDir
 	 *
 	 * @throws \Exception
 	 */
-	protected function CompileThemes($oBrandingNode, $sTempTargetDir, $sFinalTargetDir)
+	protected function CompileThemes($oBrandingNode, $sTempTargetDir)
 	{
 		// Make sure temp. target dir. ends with a '/'
 		$sTempTargetDir .= '/';
@@ -2827,10 +2828,9 @@ EOF;
 			$sThemeId = $oTheme->getAttribute('id');
 			$aThemeParameters = array(
 				'variables' => array(),
-				'imports_variable' => array(),
-				'imports_utility' => array(),
+				'variable_imports' => array(),
+				'utility_imports' => array(),
 				'stylesheets' => array(),
-				'precompiled_stylesheet' => '',
 			);
 
 			/** @var \DOMNodeList $oVariables */
@@ -2846,13 +2846,13 @@ EOF;
 			foreach($oImports as $oImport)
 			{
 				$sImportId = $oImport->getAttribute('id');
-				if($oImport->getAttribute('xsi:type') === 'variable')
+				if($oImport->getAttribute('xsi:type') === 'variables')
 				{
-					$aThemeParameters['imports_variable'][$sImportId] = $oImport->GetText();
+					$aThemeParameters['variable_imports'][$sImportId] = $oImport->GetText();
 				}
-				else if($oImport->getAttribute('xsi:type') === 'utility')
+				else
 				{
-					$aThemeParameters['imports_utility'][$sImportId] = $oImport->GetText();
+					$aThemeParameters['utility_imports'][$sImportId] = $oImport->GetText();
 				}
 			}
 
@@ -2863,8 +2863,11 @@ EOF;
 				$sStylesheetId = $oStylesheet->getAttribute('id');
 				$aThemeParameters['stylesheets'][$sStylesheetId] = $oStylesheet->GetText();
 			}
-			$aThemeParameters['precompiled_stylesheet'] = $oTheme->GetChildText('precompiled_stylesheet', '');
-			$aThemes[$sThemeId] = $aThemeParameters;
+
+			$aThemes[$sThemeId] = [
+				'theme_parameters' => $aThemeParameters,
+				'precompiled_stylesheet' => $oTheme->GetChildText('precompiled_stylesheet', '')
+			];
 		}
 
 		// Force to have a default theme if none in the DM
@@ -2881,8 +2884,11 @@ EOF;
 
 		// Compile themes
 		$fStart = microtime(true);
-		foreach($aThemes as $sThemeId => $aThemeParameters)
+		foreach($aThemes as $sThemeId => $aThemeInfos)
 		{
+			$aThemeParameters = $aThemeInfos['theme_parameters'];
+			$sPrecompiledStylesheet = $aThemeInfos['precompiled_stylesheet'];
+
 			$sThemeDir = $sThemesDir.$sThemeId;
 			if(!is_dir($sThemeDir))
 			{
@@ -2892,25 +2898,54 @@ EOF;
 			// Check if a precompiled version of the theme is supplied
 			$sPostCompilationLatestPrecompiledFile = $sPostCompilationPrecompiledThemeFolder . $sThemeId . ".css";
 
-			$sPrecompiledFileToUse = $this->UseLatestPrecompiledFile($sTempTargetDir, $aThemeParameters['precompiled_stylesheet'], $sPostCompilationLatestPrecompiledFile, $sThemeId);
+			$sPrecompiledFileToUse = $this->UseLatestPrecompiledFile($sTempTargetDir, $sPrecompiledStylesheet, $sPostCompilationLatestPrecompiledFile, $sThemeId);
 			if ($sPrecompiledFileToUse != null){
 				copy($sPrecompiledFileToUse, $sThemeDir.'/main.css');
 				// Make sure that the copy of the precompiled file is older than any other files to force a validation of the signature
 				touch($sThemeDir.'/main.css', 1577836800 /* 2020-01-01 00:00:00 */);
 			}
 
-			$bHasCompiled = ThemeHandler::CompileTheme($sThemeId, true, $this->sCompilationTimeStamp, $aThemeParameters, $aImportsPaths, $sTempTargetDir);
-			if ($bHasCompiled)
-			{
-				SetupLog::Info("Replacing theme '$sThemeId' precompiled file in file $sPostCompilationLatestPrecompiledFile for next setup.");
-				copy($sThemeDir.'/main.css', $sPostCompilationLatestPrecompiledFile);
-			}else {
+			if (!static::$oThemeHandlerService) {
+				static::$oThemeHandlerService = new ThemeHandlerService();
+			}
+			$bHasCompiled = static::$oThemeHandlerService->CompileTheme($sThemeId, true, $this->sCompilationTimeStamp, $aThemeParameters, $aImportsPaths, $sTempTargetDir);
+
+			if ($bHasCompiled) {
+				if (utils::GetConfig()->Get('theme.enable_precompilation')){
+					if (utils::IsDevelopmentEnvironment() && ! empty(trim($sPrecompiledStylesheet)))
+					{ //help developers to detect & push theme precompilation changes
+						$sInitialPrecompiledFilePath = null;
+						$aRootDirs = $this->oFactory->GetRootDirs();
+						if (is_array($aRootDirs) && count($aRootDirs) !== 0) {
+							foreach ($this->oFactory->GetRootDirs() as $sRootDir) {
+								$sCurrentFile = $sRootDir. DIRECTORY_SEPARATOR . $sPrecompiledStylesheet;
+								if (is_file($sCurrentFile) && is_writable($sCurrentFile)) {
+									$sInitialPrecompiledFilePath = $sCurrentFile;
+									break;
+								}
+							}
+						}
+
+						if ($sInitialPrecompiledFilePath != null){
+							SetupLog::Info("Replacing theme '$sThemeId' precompiled file in file $sInitialPrecompiledFilePath for next setup.");
+							copy($sThemeDir.'/main.css', $sInitialPrecompiledFilePath);
+						}
+					}
+
+					SetupLog::Info("Replacing theme '$sThemeId' precompiled file in file $sPostCompilationLatestPrecompiledFile for next setup.");
+					copy($sThemeDir.'/main.css', $sPostCompilationLatestPrecompiledFile);
+				}
+			} else {
 				SetupLog::Info("No theme '$sThemeId' compilation was required during setup.");
 			}
 		}
 		$this->Log(sprintf('Themes compilation took: %.3f ms for %d themes.', (microtime(true) - $fStart)*1000.0, count($aThemes)));
 	}
 
+	public static function SetThemeHandlerService(ThemeHandlerService $oThemeHandlerService): void {
+		self::$oThemeHandlerService = $oThemeHandlerService;
+	}
+
 	/**
 	 * Choose between precompiled files declared in datamodel XMLs or latest precompiled files generated after latest setup.
 	 *
@@ -2922,6 +2957,10 @@ EOF;
 	 * @return string : file path of latest precompiled file to use for setup
 	 */
 	public function UseLatestPrecompiledFile(string $sTempTargetDir, string $sPrecompiledFileUri, $sPostCompilationLatestPrecompiledFile, $sThemeId) : ?string {
+		if (! utils::GetConfig()->Get('theme.enable_precompilation')) {
+			return null;
+		}
+
 		$bDataXmlPrecompiledFileExists = false;
 		clearstatcache();
 		if (!empty($sPrecompiledFileUri)){
@@ -3003,7 +3042,7 @@ EOF;
 			}
 			
 			// Compile themes 
-			$this->CompileThemes($oBrandingNode, $sTempTargetDir, $sFinalTargetDir);
+			$this->CompileThemes($oBrandingNode, $sTempTargetDir);
 		}
 	}
 
diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php
index 8c7089780..1708632fb 100644
--- a/setup/itopdesignformat.class.inc.php
+++ b/setup/itopdesignformat.class.inc.php
@@ -843,7 +843,7 @@ class iTopDesignFormat
 		// Add new attribute to theme import nodes
 		$oNodeList = $oXPath->query('/itop_design/branding/themes/theme/imports/import');
 		foreach ($oNodeList as $oNode) {
-			$oNode->setAttribute('xsi:type', 'utility');
+			$oNode->setAttribute('xsi:type', 'utilities');
 		}
 
 		// Add Class Style
diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index e5c9f1310..f391571f3 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -1838,6 +1838,13 @@ EOF;
 	{
 		return $this->oDOMDocument->GetNodes($sXPath, $oContextNode, $bSafe);
 	}
+
+	/**
+	 * @return mixed
+	 */
+	public function GetRootDirs() {
+		return $this->aRootDirs;
+	}
 }
 
 /**
diff --git a/test/ItopTestCase.php b/test/ItopTestCase.php
index 63aa17462..12275ebe2 100644
--- a/test/ItopTestCase.php
+++ b/test/ItopTestCase.php
@@ -119,4 +119,75 @@ class ItopTestCase extends TestCase
 
 		return $method->invokeArgs($oObject, $aArgs);
 	}
+
+	public function RecurseRmdir($dir) {
+		if (is_dir($dir)) {
+			$objects = scandir($dir);
+			foreach ($objects as $object) {
+				if ($object != "." && $object != "..") {
+					if (is_dir($dir.DIRECTORY_SEPARATOR.$object))
+						$this->RecurseRmdir($dir.DIRECTORY_SEPARATOR.$object);
+					else
+						unlink($dir.DIRECTORY_SEPARATOR.$object);
+				}
+			}
+			rmdir($dir);
+		}
+	}
+
+	public function CreateTmpdir() {
+		$sTmpDir=tempnam(sys_get_temp_dir(),'');
+		if (file_exists($sTmpDir))
+		{
+			unlink($sTmpDir);
+		}
+		mkdir($sTmpDir);
+		if (is_dir($sTmpDir))
+		{
+			return $sTmpDir;
+		}
+
+		return sys_get_temp_dir();
+	}
+
+	public function RecurseMkdir($sDir){
+		if (strpos($sDir, DIRECTORY_SEPARATOR) === 0){
+			$sPath = DIRECTORY_SEPARATOR;
+		} else {
+			$sPath = "";
+		}
+
+		foreach (explode(DIRECTORY_SEPARATOR, $sDir) as $sSubDir){
+			if (($sSubDir === '..')) {
+				break;
+			}
+
+			if (( trim($sSubDir) === '' ) || ( $sSubDir === '.' )) {
+				continue;
+			}
+
+			$sPath .= $sSubDir . DIRECTORY_SEPARATOR;
+			if (!is_dir($sPath)) {
+				var_dump($sPath);
+				@mkdir($sPath);
+			}
+		}
+
+	}
+
+	public function RecurseCopy($src,$dst) {
+		$dir = opendir($src);
+		@mkdir($dst);
+		while(false !== ( $file = readdir($dir)) ) {
+			if (( $file != '.' ) && ( $file != '..' )) {
+				if ( is_dir($src . '/' . $file) ) {
+					$this->RecurseCopy($src . DIRECTORY_SEPARATOR . $file,$dst . DIRECTORY_SEPARATOR . $file);
+				}
+				else {
+					copy($src . DIRECTORY_SEPARATOR . $file,$dst . DIRECTORY_SEPARATOR . $file);
+				}
+			}
+		}
+		closedir($dir);
+	}
 }
\ No newline at end of file
diff --git a/test/application/ThemeHandlerTest.php b/test/application/ThemeHandlerTest.php
index d8b15b7f9..43e188959 100644
--- a/test/application/ThemeHandlerTest.php
+++ b/test/application/ThemeHandlerTest.php
@@ -27,13 +27,13 @@ class ThemeHandlerTest extends ItopTestCase
 		$this->oCompileCSSServiceMock = $this->createMock('CompileCSSService');
 		ThemeHandler::mockCompileCSSService($this->oCompileCSSServiceMock);
 
-		$this->sTmpDir = $this->tmpdir();
+		$this->sTmpDir = $this->CreateTmpdir();
 		$this->aDirsToCleanup[] = $this->sTmpDir;
 
 		$this->recurseMkdir($this->sTmpDir."/branding/themes/basque-red");
 		$this->sCssPath = $this->sTmpDir.'/branding/themes/basque-red/main.css';
 		$this->sJsonThemeParamFile = $this->sTmpDir.'/branding/themes/basque-red/theme-parameters.json';
-		$this->recurse_copy(APPROOT."/test/application/theme-handler/expected/css", $this->sTmpDir."/branding/css");
+		$this->RecurseCopy(APPROOT."/test/application/theme-handler/expected/css", $this->sTmpDir."/branding/css");
 	}
 
 	public function tearDown()
@@ -43,56 +43,10 @@ class ThemeHandlerTest extends ItopTestCase
 		foreach ($this->aDirsToCleanup as $sDir)
 		{
 			echo $sDir;
-			$this->rrmdir($sDir);
+			$this->RecurseRmdir($sDir);
 		}
 	}
 
-	function rrmdir($dir) {
-		if (is_dir($dir)) {
-			$objects = scandir($dir);
-			foreach ($objects as $object) {
-				if ($object != "." && $object != "..") {
-					if (is_dir($dir."/".$object))
-						$this->rrmdir($dir."/".$object);
-					else
-						unlink($dir."/".$object);
-				}
-			}
-			rmdir($dir);
-		}
-	}
-
-	function tmpdir() {
-		$sTmpfile=tempnam(sys_get_temp_dir(),'');
-		if (file_exists($sTmpfile))
-		{
-			unlink($sTmpfile);
-		}
-		mkdir($sTmpfile);
-		if (is_dir($sTmpfile))
-		{
-			return $sTmpfile;
-		}
-
-		return sys_get_temp_dir();
-	}
-
-	public function recurse_copy($src,$dst) {
-		$dir = opendir($src);
-		@mkdir($dst);
-		while(false !== ( $file = readdir($dir)) ) {
-			if (( $file != '.' ) && ( $file != '..' )) {
-				if ( is_dir($src . '/' . $file) ) {
-					$this->recurse_copy($src . '/' . $file,$dst . '/' . $file);
-				}
-				else {
-					copy($src . '/' . $file,$dst . '/' . $file);
-				}
-			}
-		}
-		closedir($dir);
-	}
-
 	/**
 	 * Test used to be notified by CI when precompiled styles are not up to date anymore in code repository.
 	 *
@@ -107,7 +61,7 @@ class ThemeHandlerTest extends ItopTestCase
 	public function testValidatePrecompiledStyles()
 	{
 		$aErrors = [];
-		$aDataModelFiles=glob(dirname(__FILE__)."/../../datamodels/2.x/**/datamodel*.xml");
+		$aDataModelFiles=glob(APPROOT . utils::GetConfig()->Get('source_dir'). "/**/datamodel*.xml");
 		$aImportsPaths = [APPROOT.'datamodels'];
 
 		foreach ($aDataModelFiles as $sXmlDataCustoFilePath)
@@ -135,7 +89,7 @@ class ThemeHandlerTest extends ItopTestCase
 						$sThemeId = $oTheme->getAttribute('id');
 
 						//echo "===  theme: $sThemeId ===\n";
-						$sPrecompiledFilePath = dirname(__FILE__)."/../../datamodels/2.x/".$sPrecompiledStylesheetUri;
+						$sPrecompiledFilePath = $sSourceDir = APPROOT . utils::GetConfig()->Get('source_dir') . $sPrecompiledStylesheetUri;
 						$sPreCompiledSig = ThemeHandler::GetSignature($sPrecompiledFilePath);
 						if (empty(trim($sPreCompiledSig))){
 							var_dump("$sThemeId: $sPrecompiledFilePath => " . realpath($sPrecompiledFilePath));
@@ -148,12 +102,12 @@ class ThemeHandlerTest extends ItopTestCase
 							continue;
 						}
 
-						$aThemeParameters = [
-							'variables' => [],
-							'imports_utility' => [],
-							'stylesheets' => [],
-							'precompiled_stylesheet' => $sPrecompiledStylesheetUri,
-						];
+						$aThemeParameters = array(
+							'variables' => array(),
+							'variable_imports' => array(),
+							'utility_imports' => array(),
+							'stylesheets' => array(),
+						);
 
 						/** @var \DOMNodeList $oVariables */
 						$oVariables = $oTheme->GetNodes('variables/variable');
@@ -170,8 +124,13 @@ class ThemeHandlerTest extends ItopTestCase
 						foreach ($oImports as $oImport)
 						{
 							$sImportId = $oImport->getAttribute('id');
-							$aThemeParameters['imports_utility'][$sImportId] = $oImport->GetText();
-							ThemeHandler::FindStylesheetFile($oImport->GetText(), $aImportsPaths, $oFindStylesheetObject);
+
+							if($oImport->getAttribute('xsi:type') === 'variables'){
+								$aThemeParameters['variable_imports'][$sImportId] = $oImport->GetText();
+							} else {
+								$aThemeParameters['utility_imports'][$sImportId] = $oImport->GetText();
+								ThemeHandler::FindStylesheetFile($oImport->GetText(), $aImportsPaths, $oFindStylesheetObject);
+							}
 						}
 
 						/** @var \DOMNodeList $oStylesheets */
@@ -238,7 +197,7 @@ class ThemeHandlerTest extends ItopTestCase
 	{
 		$sSig = ThemeHandler::GetSignature(APPROOT.'test/application/theme-handler/expected/themes/basque-red/main.css');
 		$sExpectedSig=<<<JSON
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"3c3f5adf98b9dbf893658314436c4b93","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":{"css-variables":"3c3f5adf98b9dbf893658314436c4b93"},"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5"},"utility_imports":[]}
 JSON;
 
 		$this->assertEquals($sExpectedSig,  $sSig);
@@ -247,7 +206,7 @@ JSON;
 	public function testGetVarSignature()
 	{
 		$sSignature=<<<JSON
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"934888ebb4991d4c76555be6b6d1d5cc","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[]}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"934888ebb4991d4c76555be6b6d1d5cc","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":[],"utility_imports":[]}
 JSON;
 		$var_sig = ThemeHandler::GetVarSignature($sSignature);
 
@@ -322,9 +281,9 @@ JSON;
 
 	public function CompileThemesProviderEmptyArray()
 	{
-		$aEmptyImports = '{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"imports_utility":[],"imports_variable":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}';
-		$aEmptyStyleSheets='{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"imports_utility":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"imports_variable":[],"stylesheets":[]}';
-		$aEmptyVars='{"variables":[],"imports_utility":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"imports_variable":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}';
+		$aEmptyImports = '{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"utility_imports":[],"variable_imports":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}';
+		$aEmptyStyleSheets='{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"utility_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"variable_imports":[],"stylesheets":[]}';
+		$aEmptyVars='{"variables":[],"utility_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"variable_imports":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}';
 		return [
 			"empty imports" => [$aEmptyImports],
 			"empty styles" => [$aEmptyStyleSheets],
@@ -337,8 +296,8 @@ JSON;
 	 */
 	public function CompileThemesProvider()
 	{
-		$sModifiedVariableThemeParameterJson='{"variables":{"brand-primary1":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"imports_utility":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"imports_variable":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}';
-		$sInitialThemeParamJson='{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"imports_utility":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"imports_variable":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}';
+		$sModifiedVariableThemeParameterJson='{"variables":{"brand-primary1":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"variable_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"},"utility_imports":[]}';
+		$sInitialThemeParamJson='{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"variable_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"},"utility_imports":[]}';
 		$sImportFilePath = '/branding/css/DO_NOT_CHANGE.css-variables.scss';
 		$sVarChangedMainCssPath="test/application/theme-handler/expected/themes/basque-red/main_varchanged.css";
 		$sStylesheetMainCssPath="test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css";
@@ -393,7 +352,7 @@ JSON;
 		$sAbsoluteImagePath = APPROOT.'test/application/theme-handler/copied/testimages/';
 		$this->recurseMkdir($sAbsoluteImagePath);
 		$this->aDirsToCleanup[] = dirname($sAbsoluteImagePath);
-		$this->recurse_copy(APPROOT.'test/application/theme-handler/expected/testimages/', $sAbsoluteImagePath);
+		$this->RecurseCopy(APPROOT.'test/application/theme-handler/expected/testimages/', $sAbsoluteImagePath);
 
 		//change approot-relative in css-variable to use absolute path
 		$sCssVarPath = $this->sTmpDir."/branding/css/DO_NOT_CHANGE.css-variables.scss";
@@ -453,7 +412,7 @@ JSON;
 			->willReturn("====CSSCOMPILEDCONTENT====");
 
 		$aThemeParameters = json_decode($ThemeParametersJson, true);
-		$this->assertEquals($iCompileCSSFromSASSCount!=0,ThemeHandler::CompileTheme('basque-red', $bSetup, "COMPILATIONTIMESTAMP", $aThemeParameters, [$this->sTmpDir.'/branding/themes/'], $this->sTmpDir));
+		$this->assertEquals($iCompileCSSFromSASSCount!=0, ThemeHandler::CompileTheme('basque-red', $bSetup, "COMPILATIONTIMESTAMP", $aThemeParameters, [$this->sTmpDir.'/branding/themes/'], $this->sTmpDir));
 
 		if ($iCompileCSSFromSASSCount==1)
 		{
@@ -566,6 +525,46 @@ SCSS;
 		$this->assertEquals(['gray-darker', 'brand-primary', 'brand-primary-lightest'], $aMissingVariables);
 	}
 
+	public function testGetVariablesFromFile(){
+		$sContent = <<< 'SCSS'
+$approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
+$approot-relative2: "../../" !default; // relative to env-***/branding/themes/***/main.css
+$approot-relative3: '../../' ; // relative to env-***/branding/themes/***/main.css
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$brand-primary: 	$combodo-orange !default;
+$brand-primary-lightest:	lighten($brand-primary, 15%) !default;
+$content-color: #eeeeee !default; 
+$default-font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !default;
+$icons-filter: hue-rotate(0deg) !default;
+$toto : titi;
+SCSS;
+
+		file_put_contents($this->sTmpDir . DIRECTORY_SEPARATOR . 'css-variable.scss', $sContent);
+		$aVariables = ThemeHandler::GetVariablesFromFile(
+			[ 'css-variable.scss' ],
+			[ $this->sTmpDir ]
+		);
+
+		$aExpectedVariables = [
+			'approot-relative' => '../../../../../',
+			'approot-relative2' => '../../',
+			'approot-relative3' => '../../',
+			'gray-base' => '#000',
+			'gray-darker' => 'lighten($gray-base, 13.5%)',
+			'brand-primary' => '$combodo-orange',
+			'brand-primary-lightest' => 'lighten($brand-primary, 15%)',
+			'content-color' => '#eeeeee',
+			'default-font-family' => 'Trebuchet MS,Tahoma,Verdana,Arial,sans-serif',
+			'icons-filter' => 'hue-rotate(0deg)',
+			'toto' => 'titi',
+		];
+
+		$this->assertEquals(
+			$aExpectedVariables,
+			$aVariables);
+	}
+
 	/**
 	 * @param $sUrlTemplate
 	 * @param $aFoundVariables
diff --git a/test/application/theme-handler/expected/themes/basque-red/main.css b/test/application/theme-handler/expected/themes/basque-red/main.css
index d3a4be37a..fa2b917fb 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"3c3f5adf98b9dbf893658314436c4b93","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":{"css-variables":"3c3f5adf98b9dbf893658314436c4b93"},"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5"},"utility_imports":[]}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_imagemodified.css b/test/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
index bf1c2a216..32aa3d61c 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"06886d405efe86b85023ef64c4349095","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":{"css-variables":"MD5SUM"},"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"06886d405efe86b85023ef64c4349095","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"},"utility_imports":[]}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_importmodified.css b/test/application/theme-handler/expected/themes/basque-red/main_importmodified.css
index e8fc3dbc0..3d4a4addb 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_importmodified.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_importmodified.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":{"css-variables":"MD5SUM"},"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"},"utility_imports":[]}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css b/test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
index 932099d44..fdf5492c1 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"63ba7dfe2a2eba40c2596ebb2a405f0b"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"63ba7dfe2a2eba40c2596ebb2a405f0b"},"variable_imports":{"css-variables":"MD5SUM"},"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"},"utility_imports":[]}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css b/test/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css
index e8fc3dbc0..3d4a4addb 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":{"css-variables":"MD5SUM"},"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"},"utility_imports":[]}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_varchanged.css b/test/application/theme-handler/expected/themes/basque-red/main_varchanged.css
index 0c0873c60..79eea8ef1 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_varchanged.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_varchanged.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"8100523d2e76a70266f3e7110e2fe5fb","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"8100523d2e76a70266f3e7110e2fe5fb","stylesheets":{"jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"variable_imports":{"css-variables":"MD5SUM"},"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"},"utility_imports":[]}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/theme-parameters.json b/test/application/theme-handler/expected/themes/basque-red/theme-parameters.json
index 33d3afb1e..931851039 100644
--- a/test/application/theme-handler/expected/themes/basque-red/theme-parameters.json
+++ b/test/application/theme-handler/expected/themes/basque-red/theme-parameters.json
@@ -1 +1 @@
-{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"imports_utility":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"imports_variable":[],"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}
\ No newline at end of file
+{"variables":{"brand-primary":"#C53030","hover-background-color":"#F6F6F6","icons-filter":"grayscale(1)","search-form-container-bg-color":"#4A5568"},"utility_imports":[],"variable_imports":{"css-variables":"..\/css\/DO_NOT_CHANGE.css-variables.scss"},"stylesheets":{"jqueryui":"..\/css\/ui-lightness\/DO_NOT_CHANGE.jqueryui.scss","main":"..\/css\/DO_NOT_CHANGE.light-grey.scss"}}
\ No newline at end of file
diff --git a/test/setup/MFCompilerTest.php b/test/setup/MFCompilerTest.php
index e6f1ad5a2..98faae630 100644
--- a/test/setup/MFCompilerTest.php
+++ b/test/setup/MFCompilerTest.php
@@ -18,12 +18,21 @@ class MFCompilerTest extends ItopTestCase {
 	/** @var \MFCompiler  */
 	private $oMFCompiler;
 
-	public function setUp()
-	{
+	private $sTmpDir;
+
+	public function setUp() {
 		parent::setUp();
 		require_once(APPROOT.'setup/compiler.class.inc.php');
+		require_once(APPROOT.'setup/modelfactory.class.inc.php');
+		require_once(__DIR__.'/SubMFCompiler.php');
 
-		$this->oMFCompiler = new MFCompiler($this->createMock(\ModelFactory::class), '');
+		$this->sTmpDir = $this->CreateTmpdir();
+		$this->oMFCompiler = new SubMFCompiler($this->createMock(\ModelFactory::class), '');
+	}
+
+	public function tearDown() {
+		parent::tearDown();
+		$this->RecurseRmdir($this->sTmpDir);
 	}
 
 	public static function Init(){
@@ -104,7 +113,10 @@ class MFCompilerTest extends ItopTestCase {
 	 * @param string $sThemeDir
 	 * @param ?string $sExpectedReturn
 	 */
-	public function testUseLatestPrecompiledFile(string $sTempTargetDir, string $sPrecompiledFileUri, string $sPostCompilationLatestPrecompiledFile, string $sThemeDir, ?string $sExpectedReturn){
+	public function testUseLatestPrecompiledFile(string $sTempTargetDir, string $sPrecompiledFileUri, string $sPostCompilationLatestPrecompiledFile, string $sThemeDir, ?string $sExpectedReturn, bool $bDisableThemePrecompilationViaConf = false){
+		if ($bDisableThemePrecompilationViaConf){
+			utils::GetConfig()->Set('theme.enable_precompilation', false);
+		}
 		$sRes = $this->oMFCompiler->UseLatestPrecompiledFile($sTempTargetDir, $sPrecompiledFileUri, $sPostCompilationLatestPrecompiledFile, $sThemeDir);
 		$this->assertEquals($sExpectedReturn, $sRes);
 	}
@@ -113,6 +125,7 @@ class MFCompilerTest extends ItopTestCase {
 		self::init();
 		return [
 			'no precompiled file at all' => $this->BuildProviderUseCaseArray('', self::$aRessources['sMissingFile'], null),
+			'deactivate precompilation via conf' => $this->BuildProviderUseCaseArray('', self::$aRessources['sPostCompilation1'], null, true),
 			'no precompiled file configured in precompiled_stylesheet XM section' => $this->BuildProviderUseCaseArray('', self::$aRessources['sPostCompilation1'], self::$aRessources['sPostCompilation1']),
 			'missing precompiled file in precompiled_stylesheet section' => $this->BuildProviderUseCaseArray(self::$aRessources['sMissingFile'], self::$aRessources['sPostCompilation1'], self::$aRessources['sPostCompilation1'] ),
 			'no precompiled file generated in previous setup in /data/precompiled_styles' => $this->BuildProviderUseCaseArray(self::$aRessources['sPrecompiledInExtensionFileUri1'], self::$aRessources['sMissingFile'], self::$aRessources['sCopiedExtensionFile1'] ),
@@ -123,15 +136,57 @@ class MFCompilerTest extends ItopTestCase {
 		];
 	}
 
-	private function BuildProviderUseCaseArray(string $sPrecompiledFileUri, string $sPostCompilationLatestPrecompiledFile, $sExpectedReturn) : array{
+	private function BuildProviderUseCaseArray(string $sPrecompiledFileUri, string $sPostCompilationLatestPrecompiledFile, $sExpectedReturn, $bDisableThemePrecompilationViaConf = false) : array{
 		return [
 			"sTempTargetDir" => sys_get_temp_dir(),
 			"sPrecompiledFileUri" => $sPrecompiledFileUri,
 			"sPostCompilationLatestPrecompiledFile" => $sPostCompilationLatestPrecompiledFile,
 			"sThemeDir" => "test",
-			"sExpectedReturn" => $sExpectedReturn
+			"sExpectedReturn" => $sExpectedReturn,
+			"bDisableThemePrecompilationViaConf" => $bDisableThemePrecompilationViaConf
 		];
 	}
 
+	public function testCompileThemes(){
+		$sXmlDataCustoFilePath = realpath(__DIR__ . '/ressources/datamodels/datamodel-branding.xml');
+		$oDom = new MFDocument();
+		$oDom->load($sXmlDataCustoFilePath);
 
+		/** @var \MFElement $oBrandingNode */
+		$oBrandingNode = $oDom->GetNodes('branding')->item(0);
+
+		$this->RecurseMkdir($this->sTmpDir.'/branding/themes/fullmoon/');
+		file_put_contents($this->sTmpDir.'/branding/themes/fullmoon/main.css', "");
+
+		$aImportsPaths = array(
+			APPROOT.'css/',
+			APPROOT.'css/backoffice/main.scss',
+			$this->sTmpDir.'//',
+		);
+
+
+		$aThemeParameters = [
+			'variables' => [
+				'ibo-page-banner--background-color' => '$ibo-color-red-600',
+				'ibo-page-banner--text-color' => '$ibo-color-red-100',
+				'ibo-page-banner--text-content' => '"THIS IS A TEST INSTANCE"',
+			],
+			'variable_imports' => [ 'style2' => 'style2.scss'],
+			'utility_imports' => [ 'style1' => 'style1.scss', 'style3' => 'style3.scss'],
+			'stylesheets' => [
+				"fullmoon" => '../css/backoffice/main.scss',
+                "environment-banner" => '../css/backoffice/themes/page-banner.scss'
+			],
+		];
+
+		$oThemeHandlerService = $this->createMock(\ThemeHandlerService::class);
+		$oThemeHandlerService->expects($this->exactly(1))
+			->method("CompileTheme")
+			->with("fullmoon", true, $this->oMFCompiler->GetCompilationTimeStamp(), $aThemeParameters, $aImportsPaths, $this->sTmpDir . '/');
+
+
+		//CompileTheme($sThemeId, $bSetup = false, $sSetupCompilationTimestamp="", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null)
+		MFCompiler::SetThemeHandlerService($oThemeHandlerService);
+		$this->oMFCompiler->CompileThemes($oBrandingNode, $this->sTmpDir);
+	}
 }
diff --git a/test/setup/SubMFCompiler.php b/test/setup/SubMFCompiler.php
new file mode 100644
index 000000000..cdce728e8
--- /dev/null
+++ b/test/setup/SubMFCompiler.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Class SubMFCompiler: used to call a protected method for testing purpose
+ */
+class SubMFCompiler extends MFCompiler {
+	public function CompileThemes($oBrandingNode, $sTempTargetDir) {
+		return parent::CompileThemes($oBrandingNode, $sTempTargetDir);
+	}
+
+	public function GetCompilationTimeStamp(){
+		return $this->sCompilationTimeStamp;
+	}
+}
\ No newline at end of file
diff --git a/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml b/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml
index dbd8af7ee..436b9377b 100644
--- a/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml
+++ b/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml
@@ -8,7 +8,7 @@
           <variable id="var1">#C53030</variable>
         </variables>
         <imports>
-          <import id="scss-variables" xsi:type="utility">../css/scss-variables.scss</import>
+          <import id="scss-variables" xsi:type="utilities">../css/scss-variables.scss</import>
         </imports>
         <stylesheets>
           <stylesheet id="custom">../css/custom.scss</stylesheet>
diff --git a/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml b/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml
index c4a9b427a..56bc62c19 100644
--- a/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml
+++ b/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml
@@ -8,7 +8,7 @@
           <variable id="var1">#C53030</variable>
         </variables>
         <imports>
-          <import id="scss-variables" xsi:type="utility">../css/scss-variables.scss</import>
+          <import id="scss-variables" xsi:type="utilities">../css/scss-variables.scss</import>
         </imports>
         <stylesheets>
           <stylesheet id="custom">../css/custom.scss</stylesheet>
diff --git a/test/setup/ressources/datamodels/datamodel-branding.xml b/test/setup/ressources/datamodels/datamodel-branding.xml
new file mode 100644
index 000000000..210165e14
--- /dev/null
+++ b/test/setup/ressources/datamodels/datamodel-branding.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
+  <branding>
+    <themes>
+      <theme id="fullmoon" _delta="define">
+        <variables>
+          <variable id="ibo-page-banner--background-color">$ibo-color-red-600</variable>
+          <variable id="ibo-page-banner--text-color">$ibo-color-red-100</variable>
+          <variable id="ibo-page-banner--text-content">"THIS IS A TEST INSTANCE"</variable>
+        </variables>
+        <imports>
+          <import id="style1">style1.scss</import>
+          <import id="style2" xsi:type="variables">style2.scss</import>
+          <import id="style3" xsi:type="utilities">style3.scss</import>
+        </imports>
+        <stylesheets>
+          <stylesheet id="fullmoon">../css/backoffice/main.scss</stylesheet>
+          <stylesheet id="environment-banner">../css/backoffice/themes/page-banner.scss</stylesheet>
+        </stylesheets>
+        <precompiled_stylesheet>itop-structure/precompiled-themes/test-red/main.css</precompiled_stylesheet>
+      </theme>
+    </themes>
+  </branding>
+</itop_design>
\ No newline at end of file