diff --git a/admin/templates/default/app_data.xsl b/admin/templates/default/app_data.xsl
index d8560ec952..4e3e7bb48b 100644
--- a/admin/templates/default/app_data.xsl
+++ b/admin/templates/default/app_data.xsl
@@ -6,10 +6,16 @@
 				<xsl:apply-templates select="list"/>
 			</xsl:when>
 			<xsl:when test="cat_list">
-				<xsl:apply-templates select="cat_list"/>
+				<xsl:call-template name="cats"/>
 			</xsl:when>
 			<xsl:when test="cat_edit">
-				<xsl:apply-templates select="cat_edit"/>
+				<xsl:call-template name="cats"/>
+			</xsl:when>
+			<xsl:when test="group_list">
+				<xsl:call-template name="groups"/>
+			</xsl:when>
+			<xsl:when test="group_edit">
+				<xsl:call-template name="groups"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:apply-templates select="list"/>
@@ -75,222 +81,3 @@
 			<td colspan="2">&nbsp;&#8226;&nbsp;<a href="{$pref_link}"><xsl:value-of select="pref_text"/></a></td>
 		</tr>
 	</xsl:template>
-
-<!-- BEGIN cat_list -->
-
-	<xsl:template match="cat_list">
-		<center>
-		<table border="0" cellspacing="2" cellpadding="2">
-			<tr>
-				<td colspan="5" width="100%">
-					<xsl:call-template name="nextmatchs"/>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="5" width="100%" align="right">
-					<xsl:call-template name="search_field"/>
-				</td>
-			</tr>
-				<xsl:apply-templates select="cat_header"/>
-				<xsl:apply-templates select="cat_data"/>
-				<xsl:apply-templates select="cat_add"/>
-		</table>
-		</center>
-	</xsl:template>
-
-<!-- BEGIN cat_header -->
-
-	<xsl:template match="cat_header">
-		<xsl:variable name="sort_name" select="sort_name"/>
-		<xsl:variable name="sort_descr" select="sort_descr"/>
-		<xsl:variable name="lang_sort_statustext" select="lang_sort_statustext"/>
-		<tr class="th">
-			<td width="20%"><a href="{$sort_name}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_name"/></a></td>
-			<td width="32%"><a href="{$sort_descr}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_descr"/></a></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_add_sub"/></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_edit"/></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_delete"/></td>
-		</tr>
-	</xsl:template>
-
-<!-- BEGIN cat_data -->
-
-	<xsl:template match="cat_data">
-		<xsl:variable name="lang_add_sub_statustext"><xsl:value-of select="lang_add_sub_statustext"/></xsl:variable>
-		<xsl:variable name="lang_edit_statustext"><xsl:value-of select="lang_edit_statustext"/></xsl:variable>
-		<xsl:variable name="lang_delete_statustext"><xsl:value-of select="lang_delete_statustext"/></xsl:variable>
-		<tr>
-			<xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="@class">
-						<xsl:value-of select="@class"/>
-					</xsl:when>
-					<xsl:when test="position() mod 2 = 0">
-						<xsl:text>row_off</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>row_on</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<xsl:choose>
-				<xsl:when test="main != ''">
-					<td class="alarm"><b><xsl:value-of disable-output-escaping="yes" select="name"/></b></td>
-					<td class="alarm"><b><xsl:value-of select="descr"/></b></td>
-				</xsl:when>
-				<xsl:otherwise>
-					<td><xsl:value-of disable-output-escaping="yes" select="name"/></td>
-					<td><xsl:value-of select="descr"/></td>
-				</xsl:otherwise>
-			</xsl:choose>
-			<td align="center">
-				<xsl:variable name="add_sub_url" select="add_sub_url"/>
-				<a href="{$add_sub_url}" onMouseover="window.status='{$lang_add_sub_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_add_sub"/></a>
-			</td>
-			<td align="center">
-				<xsl:variable name="edit_url" select="edit_url"/>
-				<a href="{$edit_url}" onMouseover="window.status='{$lang_edit_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_edit"/></a>
-			</td>
-			<td align="center">
-				<xsl:variable name="delete_url" select="delete_url"/>
-				<a href="{$delete_url}" onMouseover="window.status='{$lang_delete_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_delete"/></a>
-			</td>
-		</tr>
-	</xsl:template>
-
-	<xsl:template match="cat_add">
-			<tr>
-				<td height="50" valign="bottom">
-					<xsl:variable name="add_url"><xsl:value-of select="add_url"/></xsl:variable>
-					<xsl:variable name="lang_add"><xsl:value-of select="lang_add"/></xsl:variable>
-					<form method="post" action="{$add_url}">
-						<input type="submit" name="add" value="{$lang_add}" onMouseout="window.status='';return true;">
-							<xsl:attribute name="onMouseover">
-								<xsl:text>window.status='</xsl:text>
-									<xsl:value-of select="lang_add_statustext"/>
-								<xsl:text>'; return true;</xsl:text>
-							</xsl:attribute>
-						</input>
-					</form>
-				</td>
-			</tr>
-			<tr>
-				<td height="50" valign="bottom">
-					<xsl:variable name="done_url"><xsl:value-of select="done_url"/></xsl:variable>
-					<xsl:variable name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
-					<form method="post" action="{$done_url}">
-						<input type="submit" name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
-							<xsl:attribute name="onMouseover">
-								<xsl:text>window.status='</xsl:text>
-									<xsl:value-of select="lang_done_statustext"/>
-								<xsl:text>'; return true;</xsl:text>
-							</xsl:attribute>
-						</input>
-					</form>
-				</td>
-			</tr>
-	</xsl:template>
-
-<!-- BEGIN cat_edit -->
-
-	<xsl:template match="cat_edit">
-		<table cellpadding="2" cellspacing="2" width="100%" align="center">
-			<tr>
-				<td colspan="2" align="center">
-					<xsl:value-of select="message"/>
-				</td>
-			</tr>
-			<xsl:variable name="edit_url" select="edit_url"/>
-			<form method="post" action="{$edit_url}">
-			<tr>
-				<td>
-					<xsl:value-of select="lang_parent"/>
-				</td>
-				<td>
-					<xsl:call-template name="cat_select"/>
-				</td>
-			</tr>
-			<tr>
-				<td><xsl:value-of select="lang_name"/>:</td>
-				<td><input name="values[name]" size="50" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_name_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-						<xsl:attribute name="value">
-							<xsl:value-of select="value_name"/>
-						</xsl:attribute>
-					</input>
-				</td>
-			</tr>
-			<tr>
-				<td valign="top"><xsl:value-of select="lang_descr"/>:</td>
-				<td><textarea cols="60" rows="10" name="values[descr]" wrap="virtual" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_descr_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-						<xsl:value-of select="value_descr"/>		
-					</textarea>
-				</td>
-			</tr>
-
-			<tr height="50">
-				<td>
-					<xsl:variable name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-					<xsl:variable name="old_parent"><xsl:value-of select="old_parent"/></xsl:variable>
-					<input type="hidden" name="values[old_parent]" value="{$old_parent}"/>
-					<input type="submit" name="values[save]" value="{$lang_save}" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_save_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-					</input>
-				</td>
-				<td>
-					<xsl:choose>
-						<xsl:when test="action = 'add'">
-							<xsl:variable name="lang_reset" select="lang_reset"/>
-							<input type="reset" name="reset" value="{$lang_reset}"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>&nbsp;</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</td>
-			</tr>
-			</form>
-			<tr>
-				<td>
-					<xsl:variable name="done_url"><xsl:value-of select="done_url"/></xsl:variable>
-					<xsl:variable name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
-					<form method="post" action="{$done_url}">
-						<input type="submit" name="values[done]" value="{$lang_done}" onMouseout="window.status='';return true;">
-							<xsl:attribute name="onMouseover">
-								<xsl:text>window.status='</xsl:text>
-									<xsl:value-of select="lang_done_statustext"/>
-								<xsl:text>'; return true;</xsl:text>
-							</xsl:attribute>
-						</input>
-					</form>
-				</td>
-				<td>
-					<xsl:choose>
-						<xsl:when test="action = 'edit'">
-							<xsl:variable name="delete_url"><xsl:value-of select="delete_url"/></xsl:variable>
-							<xsl:variable name="lang_delete"><xsl:value-of select="lang_delete"/></xsl:variable>
-							<form method="POST" action="{$delete_url}">
-								<input type="submit" name="values[delete]" value="{$lang_delete}"/>
-							</form>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>&nbsp;</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose>
-				</td>
-			</tr>
-		</table>
-	</xsl:template>
diff --git a/admin/templates/default/cats.xsl b/admin/templates/default/cats.xsl
new file mode 100644
index 0000000000..4d8343ee76
--- /dev/null
+++ b/admin/templates/default/cats.xsl
@@ -0,0 +1,235 @@
+<!-- $Id$ -->
+
+	<xsl:template name="cats">
+		<xsl:choose>
+			<xsl:when test="cat_list">
+				<xsl:apply-templates select="cat_list"/>
+			</xsl:when>
+			<xsl:when test="cat_edit">
+				<xsl:apply-templates select="cat_edit"/>
+			</xsl:when>
+		</xsl:choose>
+	</xsl:template>
+
+<!-- BEGIN cat_list -->
+
+	<xsl:template match="cat_list">
+		<center>
+		<table border="0" cellspacing="2" cellpadding="2">
+			<tr>
+				<td colspan="5" width="100%">
+					<xsl:call-template name="nextmatchs"/>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="5" width="100%" align="right">
+					<xsl:call-template name="search_field"/>
+				</td>
+			</tr>
+				<xsl:apply-templates select="cat_header"/>
+				<xsl:apply-templates select="cat_data"/>
+				<xsl:apply-templates select="cat_add"/>
+		</table>
+		</center>
+	</xsl:template>
+
+<!-- BEGIN cat_header -->
+
+	<xsl:template match="cat_header">
+		<xsl:variable name="sort_name" select="sort_name"/>
+		<xsl:variable name="sort_descr" select="sort_descr"/>
+		<xsl:variable name="lang_sort_statustext" select="lang_sort_statustext"/>
+		<tr class="th">
+			<td width="20%"><a href="{$sort_name}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_name"/></a></td>
+			<td width="32%"><a href="{$sort_descr}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_descr"/></a></td>
+			<td width="8%" align="center"><xsl:value-of select="lang_add_sub"/></td>
+			<td width="8%" align="center"><xsl:value-of select="lang_edit"/></td>
+			<td width="8%" align="center"><xsl:value-of select="lang_delete"/></td>
+		</tr>
+	</xsl:template>
+
+<!-- BEGIN cat_data -->
+
+	<xsl:template match="cat_data">
+		<xsl:variable name="lang_add_sub_statustext"><xsl:value-of select="lang_add_sub_statustext"/></xsl:variable>
+		<xsl:variable name="lang_edit_statustext"><xsl:value-of select="lang_edit_statustext"/></xsl:variable>
+		<xsl:variable name="lang_delete_statustext"><xsl:value-of select="lang_delete_statustext"/></xsl:variable>
+		<tr>
+			<xsl:attribute name="class">
+				<xsl:choose>
+					<xsl:when test="@class">
+						<xsl:value-of select="@class"/>
+					</xsl:when>
+					<xsl:when test="position() mod 2 = 0">
+						<xsl:text>row_off</xsl:text>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text>row_on</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:choose>
+				<xsl:when test="main = 'yes'">
+					<td class="alarm"><b><xsl:value-of disable-output-escaping="yes" select="name"/></b></td>
+					<td class="alarm"><b><xsl:value-of select="descr"/></b></td>
+				</xsl:when>
+				<xsl:otherwise>
+					<td><xsl:value-of disable-output-escaping="yes" select="name"/></td>
+					<td><xsl:value-of select="descr"/></td>
+				</xsl:otherwise>
+			</xsl:choose>
+			<td align="center">
+				<xsl:variable name="add_sub_url" select="add_sub_url"/>
+				<a href="{$add_sub_url}" onMouseover="window.status='{$lang_add_sub_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_add_sub"/></a>
+			</td>
+			<td align="center">
+				<xsl:variable name="edit_url" select="edit_url"/>
+				<a href="{$edit_url}" onMouseover="window.status='{$lang_edit_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_edit"/></a>
+			</td>
+			<td align="center">
+				<xsl:variable name="delete_url" select="delete_url"/>
+				<a href="{$delete_url}" onMouseover="window.status='{$lang_delete_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_delete"/></a>
+			</td>
+		</tr>
+	</xsl:template>
+
+<!-- BEGIN cat_add -->
+
+	<xsl:template match="cat_add">
+			<tr>
+				<td height="50" valign="bottom">
+					<xsl:variable name="add_url"><xsl:value-of select="add_url"/></xsl:variable>
+					<xsl:variable name="lang_add"><xsl:value-of select="lang_add"/></xsl:variable>
+					<form method="post" action="{$add_url}">
+						<input type="submit" name="add" value="{$lang_add}" onMouseout="window.status='';return true;">
+							<xsl:attribute name="onMouseover">
+								<xsl:text>window.status='</xsl:text>
+									<xsl:value-of select="lang_add_statustext"/>
+								<xsl:text>'; return true;</xsl:text>
+							</xsl:attribute>
+						</input>
+					</form>
+				</td>
+			</tr>
+			<tr>
+				<td height="50" valign="bottom">
+					<xsl:variable name="done_url"><xsl:value-of select="done_url"/></xsl:variable>
+					<xsl:variable name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
+					<form method="post" action="{$done_url}">
+						<input type="submit" name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
+							<xsl:attribute name="onMouseover">
+								<xsl:text>window.status='</xsl:text>
+									<xsl:value-of select="lang_done_statustext"/>
+								<xsl:text>'; return true;</xsl:text>
+							</xsl:attribute>
+						</input>
+					</form>
+				</td>
+			</tr>
+	</xsl:template>
+
+<!-- END cat_list -->
+
+<!-- BEGIN cat_edit -->
+
+	<xsl:template match="cat_edit">
+		<table cellpadding="2" cellspacing="2" align="center">
+			<tr>
+				<td colspan="2" align="center">
+					<xsl:value-of select="message"/>
+				</td>
+			</tr>
+			<xsl:variable name="edit_url" select="edit_url"/>
+			<form method="post" action="{$edit_url}">
+			<tr>
+				<td width="23%">
+					<xsl:value-of select="lang_parent"/>
+				</td>
+				<td width="77%">
+					<xsl:call-template name="cat_select"/>
+				</td>
+			</tr>
+			<tr>
+				<td><xsl:value-of select="lang_name"/>:</td>
+				<td><input name="values[name]" size="50" onMouseout="window.status='';return true;">
+						<xsl:attribute name="onMouseover">
+							<xsl:text>window.status='</xsl:text>
+								<xsl:value-of select="lang_name_statustext"/>
+							<xsl:text>'; return true;</xsl:text>
+						</xsl:attribute>
+						<xsl:attribute name="value">
+							<xsl:value-of select="value_name"/>
+						</xsl:attribute>
+					</input>
+				</td>
+			</tr>
+			<tr>
+				<td valign="top"><xsl:value-of select="lang_descr"/>:</td>
+				<td><textarea cols="60" rows="10" name="values[descr]" wrap="virtual" onMouseout="window.status='';return true;">
+						<xsl:attribute name="onMouseover">
+							<xsl:text>window.status='</xsl:text>
+								<xsl:value-of select="lang_descr_statustext"/>
+							<xsl:text>'; return true;</xsl:text>
+						</xsl:attribute>
+						<xsl:value-of select="value_descr"/>		
+					</textarea>
+				</td>
+			</tr>
+
+			<tr height="50">
+				<td>
+					<xsl:variable name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+					<xsl:variable name="old_parent"><xsl:value-of select="old_parent"/></xsl:variable>
+					<input type="hidden" name="values[old_parent]" value="{$old_parent}"/>
+					<input type="submit" name="values[save]" value="{$lang_save}" onMouseout="window.status='';return true;">
+						<xsl:attribute name="onMouseover">
+							<xsl:text>window.status='</xsl:text>
+								<xsl:value-of select="lang_save_statustext"/>
+							<xsl:text>'; return true;</xsl:text>
+						</xsl:attribute>
+					</input>
+				</td>
+				<td>
+					<xsl:choose>
+						<xsl:when test="action = 'add'">
+							<xsl:variable name="lang_reset" select="lang_reset"/>
+							<input type="reset" name="reset" value="{$lang_reset}"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>&nbsp;</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</td>
+			</tr>
+			</form>
+			<tr>
+				<td>
+					<xsl:variable name="done_url"><xsl:value-of select="done_url"/></xsl:variable>
+					<xsl:variable name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
+					<form method="post" action="{$done_url}">
+						<input type="submit" name="values[done]" value="{$lang_done}" onMouseout="window.status='';return true;">
+							<xsl:attribute name="onMouseover">
+								<xsl:text>window.status='</xsl:text>
+									<xsl:value-of select="lang_done_statustext"/>
+								<xsl:text>'; return true;</xsl:text>
+							</xsl:attribute>
+						</input>
+					</form>
+				</td>
+				<td>
+					<xsl:choose>
+						<xsl:when test="action = 'edit'">
+							<xsl:variable name="delete_url"><xsl:value-of select="delete_url"/></xsl:variable>
+							<xsl:variable name="lang_delete"><xsl:value-of select="lang_delete"/></xsl:variable>
+							<form method="POST" action="{$delete_url}">
+								<input type="submit" name="values[delete]" value="{$lang_delete}"/>
+							</form>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>&nbsp;</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</td>
+			</tr>
+		</table>
+	</xsl:template>
diff --git a/admin/templates/default/groups.xsl b/admin/templates/default/groups.xsl
new file mode 100644
index 0000000000..35830ba3f1
--- /dev/null
+++ b/admin/templates/default/groups.xsl
@@ -0,0 +1,188 @@
+<!-- $Id$ -->
+
+	<xsl:template name="groups">
+		<xsl:choose>
+			<xsl:when test="group_list">
+				<xsl:apply-templates select="group_list"/>
+			</xsl:when>
+			<xsl:when test="group_edit">
+				<xsl:apply-templates select="group_edit"/>
+			</xsl:when>
+		</xsl:choose>
+	</xsl:template>
+
+<!-- BEGIN group_list -->
+
+	<xsl:template match="group_list">
+		<center>
+		<table border="0" cellspacing="2" cellpadding="2">
+			<tr>
+				<td colspan="3" width="100%">
+					<xsl:call-template name="nextmatchs"/>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="3" width="100%" align="right">
+					<xsl:choose>
+						<xsl:when test="search_access = 'yes'">
+							<xsl:call-template name="search_field"/>
+						</xsl:when>
+					</xsl:choose>
+				</td>
+			</tr>
+				<xsl:apply-templates select="group_header"/>
+				<xsl:apply-templates select="group_data"/>
+				<xsl:apply-templates select="group_add"/>
+		</table>
+		</center>
+	</xsl:template>
+
+<!-- BEGIN group_header -->
+
+	<xsl:template match="group_header">
+		<xsl:variable name="sort_name" select="sort_name"/>
+		<xsl:variable name="lang_sort_statustext" select="lang_sort_statustext"/>
+		<tr class="th">
+			<td width="20%"><a href="{$sort_name}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_name"/></a></td>
+			<td width="8%" align="center"><xsl:value-of select="lang_edit"/></td>
+			<td width="8%" align="center"><xsl:value-of select="lang_delete"/></td>
+		</tr>
+	</xsl:template>
+
+<!-- BEGIN group_data -->
+
+	<xsl:template match="group_data">
+		<xsl:variable name="lang_edit_statustext"><xsl:value-of select="lang_edit_statustext"/></xsl:variable>
+		<xsl:variable name="lang_delete_statustext"><xsl:value-of select="lang_delete_statustext"/></xsl:variable>
+		<tr>
+			<xsl:attribute name="class">
+				<xsl:choose>
+					<xsl:when test="@class">
+						<xsl:value-of select="@class"/>
+					</xsl:when>
+					<xsl:when test="position() mod 2 = 0">
+						<xsl:text>row_off</xsl:text>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text>row_on</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+			<td><xsl:value-of select="group_name"/></td>
+			<td align="center">
+				<xsl:variable name="edit_url" select="edit_url"/>
+				<a href="{$edit_url}" onMouseover="window.status='{$lang_edit_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_edit"/></a>
+			</td>
+			<td align="center">
+				<xsl:variable name="delete_url" select="delete_url"/>
+				<a href="{$delete_url}" onMouseover="window.status='{$lang_delete_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_delete"/></a>
+			</td>
+		</tr>
+	</xsl:template>
+
+<!-- BEGIN group_add -->
+
+	<xsl:template match="group_add">
+			<tr>
+				<td height="50" valign="bottom">
+					<xsl:choose>
+						<xsl:when test="add_access = 'yes'">
+							<xsl:variable name="add_url"><xsl:value-of select="add_url"/></xsl:variable>
+							<xsl:variable name="lang_add"><xsl:value-of select="lang_add"/></xsl:variable>
+							<form method="post" action="{$add_url}">
+								<input type="submit" name="add" value="{$lang_add}" onMouseout="window.status='';return true;">
+									<xsl:attribute name="onMouseover">
+										<xsl:text>window.status='</xsl:text>
+										<xsl:value-of select="lang_add_statustext"/>
+										<xsl:text>'; return true;</xsl:text>
+									</xsl:attribute>
+								</input>
+							</form>
+						</xsl:when>
+					</xsl:choose>
+				</td>
+			</tr>
+			<tr>
+				<td height="50" valign="bottom">
+					<xsl:variable name="done_url"><xsl:value-of select="done_url"/></xsl:variable>
+					<xsl:variable name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
+					<form method="post" action="{$done_url}">
+						<input type="submit" name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
+							<xsl:attribute name="onMouseover">
+								<xsl:text>window.status='</xsl:text>
+									<xsl:value-of select="lang_done_statustext"/>
+								<xsl:text>'; return true;</xsl:text>
+							</xsl:attribute>
+						</input>
+					</form>
+				</td>
+			</tr>
+	</xsl:template>
+
+<!-- END group_list -->
+
+<!-- BEGIN group_edit -->
+
+	<xsl:template match="group_edit">
+		<table border="0" cellpadding="2" cellspacing="2" align="center">
+			<tr>
+				<td valign="top">
+     {rows}
+				</td>
+				<td valign="top">
+					<table border="0" width="100%">
+						<xsl:variable name="edit_url"><xsl:value-of select="edit_url"/></xsl:variable>
+						<form action="{$edit_url}" method="POST">
+       {hidden_vars}
+						<tr>
+							<td><xsl:value-of select="lang_account_name"/></td>
+							<td><input name="account_name">
+								<xsl:attribute name="onMouseover">
+									<xsl:value-of select="value_account_name"/>
+								</xsl:attribute>
+								</input>
+							</td>
+						</tr>
+						<tr>
+							<td><xsl:value-of select="lang_include_user"/></td>
+							<td>
+								<select name="account_user[]" multiple="multiple" size="{select_size}">
+             {user_list}
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<td><xsl:value-of select="lang_file_space"/></td>
+							<td>
+           {account_file_space}{account_file_space_select}
+							</td>
+						</tr>
+						<tr>
+							<td><xsl:value-of select="lang_permissions"/></td>
+							<td>
+								<table width="100%" border="0" cols="6">
+         {permissions_list}
+								</table>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2" align="left">
+							<xsl:variable name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+								<input type="submit" name="submit" value="{$lang_save}"/>
+							</td>
+						</tr>
+ 						</form>
+						<tr>
+						<xsl:variable name="done_url"><xsl:value-of select="done_url"/></xsl:variable>
+						<xsl:variable name="langdone"><xsl:value-of select="lang_done"/></xsl:variable>
+						<form method="POST" action="{$done_url}">
+							<td align="left">
+								<input type="submit" name="done" value="{$lang_done}"/>
+							</td>
+						</form>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</xsl:template>
diff --git a/phpgwapi/templates/idsociety/css/idsociety.css b/phpgwapi/templates/idsociety/css/idsociety.css
index 6983806922..652df96a65 100644
--- a/phpgwapi/templates/idsociety/css/idsociety.css
+++ b/phpgwapi/templates/idsociety/css/idsociety.css
@@ -13,9 +13,9 @@ a:visited
 	color: #333366;
 }
 
-a:hover
+a:hover,a:hover.info
 {
-	color: #cc0000;
+	color: #000066;
 }
 
 .login,.portal,.about
@@ -47,6 +47,7 @@ a:hover
 .th,.app_header
 {
 	background-color: #ADADAD;
+	color: #FFFFFF;
 }
 
 .cal_today
diff --git a/phpgwapi/templates/idsociety/css/phpgw.css b/phpgwapi/templates/idsociety/css/phpgw.css
index 6f8251cc00..cfd870a104 100644
--- a/phpgwapi/templates/idsociety/css/phpgw.css
+++ b/phpgwapi/templates/idsociety/css/phpgw.css
@@ -51,10 +51,9 @@ a.th,a.th_text
 	height: 15;
 }
 
-.info
+.info,a:link.info,a:active.info,a:visited.info
 {
 	color: #FFFFFF;
-	font-size: 85%;
 }
 
 .left
@@ -106,7 +105,7 @@ table.login
 
 .small_text
 {
-	font-size: 80%;
+	font-size: 85%;
 }
 
 .header_text
@@ -122,6 +121,5 @@ table.login
 
 .app_header
 {
-	padding: 5px;
-	padding-bottom:0px;
+	padding: 4px;
 }
diff --git a/phpgwapi/templates/idsociety/phpgw.xsl b/phpgwapi/templates/idsociety/phpgw.xsl
index b8867d3241..f9e60b7f20 100644
--- a/phpgwapi/templates/idsociety/phpgw.xsl
+++ b/phpgwapi/templates/idsociety/phpgw.xsl
@@ -73,7 +73,7 @@
 												<xsl:choose>
 													<xsl:when test="current_users">
 													<xsl:variable name="url_current_users"><xsl:value-of select="url_current_users"/></xsl:variable>
-														<td width="33%" class="info"><a href="{$url_current_users}"><xsl:value-of select="current_users"/></a></td>
+														<td width="33%" class="info"><a href="{$url_current_users}" class="info"><xsl:value-of select="current_users"/></a></td>
 													</xsl:when>
 													<xsl:otherwise>
 														<td></td>