Index: branches/5.1.x/core/units/helpers/minifiers/minify_helper.php
===================================================================
diff -u -N -r13564 -r13690
--- branches/5.1.x/core/units/helpers/minifiers/minify_helper.php	(.../minify_helper.php)	(revision 13564)
+++ branches/5.1.x/core/units/helpers/minifiers/minify_helper.php	(.../minify_helper.php)	(revision 13690)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: minify_helper.php 13564 2010-05-15 12:39:25Z alex $
+* @version	$Id: minify_helper.php 13690 2010-06-09 12:48:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -125,6 +125,7 @@
 
 				// replace templates base
 				$templates_base = $this->Application->ProcessParsedTag('m', 'TemplatesBase', Array ());
+				$templates_base = preg_replace('/^' . preg_quote($this->Application->BaseURL(), '/') . '/', BASE_PATH . '/', $templates_base);
 				$string = str_replace('@templates_base@', rtrim($templates_base, '/'), $string);
 
 				// compress collected data
Index: branches/5.1.x/core/units/helpers/skin_helper.php
===================================================================
diff -u -N -r13545 -r13690
--- branches/5.1.x/core/units/helpers/skin_helper.php	(.../skin_helper.php)	(revision 13545)
+++ branches/5.1.x/core/units/helpers/skin_helper.php	(.../skin_helper.php)	(revision 13690)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: skin_helper.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: skin_helper.php 13690 2010-06-09 12:48:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -71,7 +71,7 @@
 			$ret = $object->GetDBField('CSS');
 			$options = $object->GetDBField('Options');
 			$options = unserialize($options);
-			$options['base_url'] = Array ('Value' => rtrim($this->Application->BaseURL(), '/'));
+			$options['base_url'] = Array ('Value' => rtrim(BASE_PATH, '/'));
 
 			foreach ($options as $key => $row) {
 				$ret = str_replace('@@' . $key . '@@', $row['Value'], $ret);
Index: branches/5.1.x/core/install.php
===================================================================
diff -u -N -r13613 -r13690
--- branches/5.1.x/core/install.php	(.../install.php)	(revision 13613)
+++ branches/5.1.x/core/install.php	(.../install.php)	(revision 13690)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 13613 2010-05-24 18:56:24Z alex $
+* @version	$Id: install.php 13690 2010-06-09 12:48:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -816,29 +816,6 @@
 
 					$this->toolkit->rebuildThemes(); // rescan theme to create structure after theme is enabled !!!
 
-					if ($this->Application->isModuleEnabled('In-Portal')) {
-						// 2. compile theme stylesheets (only In-Portal uses them)
-						$css_table = $this->Application->getUnitOption('css', 'TableName');
-						$css_idfield = $this->Application->getUnitOption('css', 'IDField');
-
-						$sql = 'SELECT LOWER(Name) AS Name, ' . $css_idfield . '
-								FROM ' . $css_table;
-						$css_hash = $this->Conn->GetCol($sql, $css_idfield);
-
-						$css_item =& $this->Application->recallObject('css', null, Array('skip_autoload' => true));
-						/* @var $css_item StyleshetsItem */
-
-						foreach ($css_hash as $stylesheet_id => $theme_name) {
-							$css_item->Load($stylesheet_id);
-							$css_item->Compile();
-
-							$sql = 'UPDATE ' . $theme_table . '
-									SET StylesheetId = ' . $stylesheet_id . '
-									WHERE LOWER(Name) = ' .  $this->Conn->qstr($theme_name);
-							$this->Conn->Query($sql);
-						}
-					}
-
 					// install theme dependent demo data
 					if ($this->Application->GetVar('install_demo_data')) {
 						$sql = 'SELECT Name
@@ -918,6 +895,16 @@
 					$this->toolkit->deleteCache();
 					$this->toolkit->rebuildThemes();
 
+					// compile admin skin, so it will be available in 3 frames at once
+					$skin_helper =& $this->Application->recallObject('SkinHelper');
+					/* @var $skin_helper SkinHelper */
+
+					$skin =& $this->Application->recallObject('skin', null, Array ('skip_autoload' => true));
+					/* @var $skin kDBItem */
+
+					$skin->Load(1, 'IsPrimary');
+					$skin_helper->compile($skin);
+
 					// set installation finished mark
 					if ($this->Application->ConfigValue('InstallFinished') === false) {
 						$fields_hash = Array (