Index: trunk/admin/install/inportal_schema.sql
===================================================================
diff -u -N -r4052 -r4108
--- trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 4052)
+++ trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 4108)
@@ -39,6 +39,10 @@
   PopItem int(11) NOT NULL default '2',
   Modified int(11) NOT NULL default '0',
   ModifiedById int(11) NOT NULL default '0',
+  CategoryTemplate varchar(255) NOT NULL default '',
+  ItemTemplate varchar(255) NOT NULL default '',
+  CachedCategoryTemplate varchar(255) NOT NULL default '',
+  CachedItemTemplate varchar(255) NOT NULL default '',
   PRIMARY KEY  (CategoryId),
   KEY ParentId (ParentId),
   UNIQUE KEY ResourceId (ResourceId),
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -N -r4077 -r4108
--- trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4077)
+++ trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4108)
@@ -82,6 +82,10 @@
 									            'PopItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
 									            'Modified' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'ModifiedById' => Array('type' => 'int','not_null' => '1','default' => '0'),
+									            'CategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
+									            'ItemTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
+									            'CachedCategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
+									            'CachedItemTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
 									        ),
 
 					'VirtualFields'		=>	Array(
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -N -r4077 -r4108
--- trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4077)
+++ trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4108)
@@ -82,6 +82,10 @@
 									            'PopItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
 									            'Modified' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'ModifiedById' => Array('type' => 'int','not_null' => '1','default' => '0'),
+									            'CategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
+									            'ItemTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
+									            'CachedCategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
+									            'CachedItemTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
 									        ),
 
 					'VirtualFields'		=>	Array(
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.8.sql
===================================================================
diff -u -N -r4052 -r4108
--- trunk/admin/install/upgrades/inportal_upgrade_v1.1.8.sql	(.../inportal_upgrade_v1.1.8.sql)	(revision 4052)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.8.sql	(.../inportal_upgrade_v1.1.8.sql)	(revision 4108)
@@ -12,4 +12,6 @@
 CREATE TABLE PortalUserCustomData (CustomDataId int(11) NOT NULL auto_increment, ResourceId int(10) unsigned NOT NULL default '0', UNIQUE KEY ResourceId (ResourceId), PRIMARY KEY  (CustomDataId));
 CREATE TABLE CategoryCustomData (CustomDataId int(11) NOT NULL auto_increment, ResourceId int(10) unsigned NOT NULL default '0', UNIQUE KEY ResourceId (ResourceId), PRIMARY KEY  (CustomDataId));
 
+ALTER TABLE Category ADD CategoryTemplate VARCHAR(255) NOT NULL, ADD ItemTemplate VARCHAR(255) NOT NULL, ADD CachedCategoryTemplate VARCHAR(255) NOT NULL, ADD CachedItemTemplate VARCHAR(255) NOT NULL;
+
 UPDATE Modules SET Version = '1.1.8' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/admin/category/addcategory.php
===================================================================
diff -u -N -r4107 -r4108
--- trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 4107)
+++ trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 4108)
@@ -207,14 +207,14 @@
 	</tr>
   
 	<tr <?php int_table_color(); ?>>
-		<td valign="top"><span ID="prompt_category_template" class="text"><?php echo prompt_language('la_fld_DefaultCategoryTemplate'); ?></span></td>
+		<td valign="top"><span ID="prompt_category_template" class="text"><?php echo prompt_language('la_fld_CategoryTemplate'); ?></span></td>
 		<td>
 			<input type="text" name="category_template" tabindex="5" class="text" size="40" value="<?php echo $c->Get('CategoryTemplate'); ?>">
 		</td>
 		<td>&nbsp;</td>
 	</tr>
 		<tr <?php int_table_color(); ?>>
-		<td valign="top"><span ID="prompt_item_template" class="text"><?php echo prompt_language('la_fld_DefaultItemTemplate'); ?></span></td>
+		<td valign="top"><span ID="prompt_item_template" class="text"><?php echo prompt_language('la_fld_ItemTemplate'); ?></span></td>
 		<td>
 			<input type="text" name="item_template" tabindex="6" class="text" size="40" value="<?php echo $c->Get('ItemTemplate'); ?>">
 		</td>