Index: branches/5.3.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r15677 -r15698
--- branches/5.3.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 15677)
+++ branches/5.3.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: install_toolkit.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -494,12 +494,13 @@
 				$this->rebuildThemes();
 			}
 
-			$id_field = $this->Application->getUnitOption('theme', 'IDField');
-			$table_name = $this->Application->getUnitOption('theme', 'TableName');
+			$theme_config = $this->Application->getUnitConfig('theme');
+			$id_field = $theme_config->getIDField();
 
 			$sql = 'SELECT Name, ' . $id_field . '
-					FROM ' . $table_name . '
+					FROM ' . $theme_config->getTableName() . '
 					ORDER BY Name ASC';
+
 			return $this->Conn->GetCol($sql, $id_field);
 		}
 
@@ -853,7 +854,7 @@
 
 			$sql = 'SELECT FieldName, CustomFieldId
 					FROM ' . TABLE_PREFIX . 'CustomFields
-					WHERE Type = ' . $item_type . ' AND IsSystem = 0'; // config is not read here yet :( $this->Application->getUnitOption('p', 'ItemType');
+					WHERE Type = ' . $item_type . ' AND IsSystem = 0'; // config is not read here yet :( $this->Application->getUnitConfig('p')->getItemType();
 			$custom_fields = $db->GetCol($sql, 'CustomFieldId');
 
 			foreach ($custom_fields as $cf_id => $cf_name) {