Index: branches/5.0.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r12793 -r12808
--- branches/5.0.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 12793)
+++ branches/5.0.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 12808)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 12793 2009-10-25 21:09:20Z alex $
+* @version	$Id: categories_event_handler.php 12808 2009-10-27 17:03:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1456,8 +1456,20 @@
 		 */
 		function _getDefaultDesign()
 		{
-			$default_design = $this->Application->ConfigValue('cms_DefaultDesign');
-			return '/' . trim($default_design ? $default_design : 'designs/default_design', '/');
+			$default_design = trim($this->Application->ConfigValue('cms_DefaultDesign'), '/');
+
+			if (!$default_design) {
+				// theme-based alias for default design
+				return '#default_design#';
+			}
+
+			if (strpos($default_design, '#') === false) {
+				// real template, not alias, so prefix with "/"
+				return '/' . $default_design;
+			}
+
+			// alias
+			return $default_design;
 		}
 
 		/**
@@ -1483,8 +1495,16 @@
 				$real_t = $this->_getDefaultDesign();
 			}
 
-	//		$this->Application->SetVar('t', $t);
+			// replace alias in form #alias_name# to actual template used in this theme
+			$theme =& $this->Application->recallObject('theme.current');
+			/* @var $theme kDBItem */
 
+			$template = $theme->GetField('TemplateAliases', $real_t);
+
+			if ($template) {
+				return $template;
+			}
+
 			return $real_t;
 		}