10 files changed, 543 insertions, 74 deletions
diff --git a/phpBB/templates/PSO/admin/auth_select_body.tpl b/phpBB/templates/PSO/admin/auth_select_body.tpl
index 5e173d687e..9b9392c33d 100644
--- a/phpBB/templates/PSO/admin/auth_select_body.tpl
+++ b/phpBB/templates/PSO/admin/auth_select_body.tpl
@@ -1,17 +1,14 @@
 
-<br clear="all" />
-
 <h1>{L_AUTH_TITLE}</h1>
 
 <p>{L_AUTH_EXPLAIN}</p>
 
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="post" action="{S_AUTH_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
 	<tr>
-		<td class="cat" align="center"><span class="cattitle"><b>{L_AUTH_SELECT}</b></span></td>
+	
+        <th align="center">{L_AUTH_SELECT}</th>
 	</tr>
-	<tr><form method="get" action="{S_AUTH_ACTION}">
+	<tr>
 		<td class="row1" align="center">{S_AUTH_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}">&nbsp;</td>
-	</form></tr>
-</table>
-
-<br clear="all" />
+	</tr>
+</table></form>
diff --git a/phpBB/templates/PSO/admin/board_config_body.tpl b/phpBB/templates/PSO/admin/board_config_body.tpl
new file mode 100644
index 0000000000..a0978180b3
--- /dev/null
+++ b/phpBB/templates/PSO/admin/board_config_body.tpl
@@ -0,0 +1,170 @@
+<br clear="all" />
+
+<h1>{L_CONFIGURATION_TITLE}</h1>
+
+<p>{L_CONFIGURATION_EXPLAIN}</p>
+
+<form action="{S_CONFIG_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center">
+	<tr>
+		<td class="cat" colspan="2"><span class="cattitle">{L_GENERAL_SETTINGS}</span></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">{L_SITE_NAME}:</span></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">{L_ACCT_ACTIVATION}:</span></td>
+		<td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Flood Interval:</span><br /><span class="gensmall">Number of seconds a user must wait between posts</span></td>
+		<td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Topics Per Page:</span></td>
+		<td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Posts Per Page:</span></td>
+		<td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Hot Threshold:</span></td>
+		<td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Default Style:</span></td>
+		<td class="row2">{STYLE_SELECT}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Override user style:</span><br /><span class="gensmall">Replaces users style with the default</span></td>
+		<td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Default Language:</span></td>
+		<td class="row2">{LANG_SELECT}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Date Format:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
+		<td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">System Timezone:</span></td>
+		<td class="row2">{TIMEZONE_SELECT}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Enable GZip Compression:</span></td>
+		<td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="gzip_compress" value="0" {GZIP_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Enable Forum Pruning:</span></td>
+		<td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="prune_enable" value="0" {PRUNE_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2"><span class="cattitle">User/Forum Ability Settings</span></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Allow HTML:</span></td>
+		<td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Allow BBCode:</span></td>
+		<td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Allow Smilies:</span></td>
+		<td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_smilies" value="0" {SMILE_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Smilies Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td>
+		<td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Allow Signatures:</span></td>
+		<td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_sig" value="0" {SIG_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Maximum signature length:</span><br /><span class="gensmall">Number of characters allowed</span></td>
+		<td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Allow Name Change:</span></td>
+		<td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Inbox limit:</span></td>
+		<td class="row2"><input type="text" size="5" maxlength="5" name="max_inbox_privmsgs" value="{INBOX_PRIVMSGS}"> messages</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Sentbox limit:</span></td>
+		<td class="row2"><input type="text" size="5" maxlength="5" name="max_sentbox_privmsgs" value="{SENTBOX_PRIVMSGS}"> messages</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Savebox limit:</span></td>
+		<td class="row2"><input type="text" size="5" maxlength="5" name="max_savebox_privmsgs" value="{SAVEBOX_PRIVMSGS}"> messages</td>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2"><span class="cattitle">Avatar Settings</span></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Allow local gallery avatars:</span></td>
+		<td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Allow remote avatars:</span><br /><span class="gensmall">Avatars linked from another website</span></td>
+		<td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Allow avatar uploading:</span></td>
+		<td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Max. Avatar File Size:</span><br /><span class="gensmall">For uploaded avatar files</span></td>
+		<td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Max. Avatar Size:</span><br /><span class="gensmall">(height x width)</span>
+		</td>
+		<td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Avatar Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td>
+		<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}"></td>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2"><span class="cattitle">Email Settings</span></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Admin Email Address:</span></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Email Signature:</span><br /><span class="gensmall">This text will be attached to all emails the board sends</span></td>
+		<td class="row2"><textarea name="board_email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Use SMTP for delivery:</span><br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td>
+		<td class="row2"><input type="radio" name="smtp_delivery" value="1" {SMTP_YES}> {L_YES}&nbsp;&nbsp;<input type="radio" name="smtp_delivery" value="0" {SMTP_NO}> {L_NO}</td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">SMTP Server:</span></td>
+		<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50"></td>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2"><span class="cattitle">COPPA Settings</span></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">FAX Number:</span></td>
+		<td class="row2"><input type="text" name="coppa_fax" value="{COPPA_FAX}" size="25" maxlength="50"></td>
+	</tr>
+	<tr>
+		<td class="row1"><span class="gen">Mailing Address:</span><br /><span class="gensmall">Signed COPPA agreements will be mailed here</span></td>
+		<td class="row2"><textarea name="coppa_mail" rows="5" cols="30">{COPPA_MAIL}</textarea></td>
+	</tr>	
+	<tr>
+		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings">
+		</td>
+	</tr>
+</table></form>
+
+<br clear="all">
diff --git a/phpBB/templates/PSO/admin/disallow_body.tpl b/phpBB/templates/PSO/admin/disallow_body.tpl
index e16871e143..5b25933753 100644
--- a/phpBB/templates/PSO/admin/disallow_body.tpl
+++ b/phpBB/templates/PSO/admin/disallow_body.tpl
@@ -11,7 +11,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_USERNAME}:&nbsp;<br /><span class="gensmall">{L_DEL_EXPLAIN}</span></td>
-		<td class="row2">{S_DISALLOW_SELECT} &nbps;<input type="submit" name="mode" value="{L_DELETE}" /></td>
+		<td class="row2">{S_DISALLOW_SELECT} &nbsp;<input type="submit" name="mode" value="{L_DELETE}" /></td>
 	</tr>
 	<tr>
 		<td class="cat" colspan="2" align="center">{L_ADD_DISALLOW}</td>
diff --git a/phpBB/templates/PSO/admin/group_edit_body.tpl b/phpBB/templates/PSO/admin/group_edit_body.tpl
index 40ad1bf86e..0b99c7ab6e 100644
--- a/phpBB/templates/PSO/admin/group_edit_body.tpl
+++ b/phpBB/templates/PSO/admin/group_edit_body.tpl
@@ -1,49 +1,53 @@
 
-<form action="{S_GROUP_ACTION}" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
-	<tr>
-		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
-	</tr>
-</table>
+<h1>{L_GROUP_TITLE}</h1>
 
-<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
+<form action="{S_GROUP_ACTION}" method="post"><table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center">
+	<tr> 
+	  <th class="thHead" colspan="2">{L_GROUP_EDIT_DELETE}</th>
+	</tr>
 	<tr>
-		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
-			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b>{L_GROUP_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td>
-				<td class="row2"><input type="text" name="group_name" size="35" maxlength="40" value="{S_GROUP_NAME}" /></td>
-			</tr>
-			<tr>
-				<td class="row1"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td>
-				<td class="row2"><textarea name="group_description" rows=5 cols=51>{S_GROUP_DESCRIPTION}</textarea></td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
-				<td class="row2">{S_GROUP_MODERATOR}</td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}:</span>
-				<br />
-				<span class="gensmall">{L_DELETE_MODERATOR_EXPLAIN}</span></td>
-				<td class="row2"><input type="checkbox" name="delete_old_moderator" value="1" />&nbsp;&nbsp;{L_YES}</td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
-				<td class="row2"><input type="radio" name="group_type" value="1" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="0" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED}</td>
-			</tr>
-			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
-				<td class="row2"><input type="checkbox" name="deletegroup" value="1">{L_GROUP_DELETE_CHECK}</td>
-			</tr>
-			<tr>
-				<td class="cat" colspan="2" align="center"><span class="cattitle"><input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></span></td>
-			</tr>
-		</table></td>
+	  <td class="row1" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
 	</tr>
-
-<input type="hidden" name="mode" value="{S_GROUP_MODE}" />
-<input type="hidden" name="updategroup" value="update" />
-<input type="hidden" name="group_id" value="{GROUP_ID}" />
-</table></form>
-\ No newline at end of file
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td>
+	  <td class="row2" width="62%"> 
+		<input type="text" name="group_name" size="35" maxlength="40" value="{GROUP_NAME}" />
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td>
+	  <td class="row2" width="62%"> 
+		<textarea name="group_description" rows=5 cols=51>{GROUP_DESCRIPTION}</textarea>
+	  </td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td>
+	  <td class="row2" width="62%">{S_SELECT_MODERATORS}</td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}</span>
+	  <br />
+	  <span class="gensmall">{L_DELETE_MODERATOR_EXPLAIN}</span></td>
+	  <td class="row2" width="62%"> 
+		<input type="checkbox" name="delete_old_moderator" value="1">
+		{L_YES}</td>
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
+	  <td class="row2" width="62%"> 
+		<input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} />	{L_GROUP_CLOSED} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} />	{L_GROUP_HIDDEN}</td> 
+	</tr>
+	<tr> 
+	  <td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td>
+	  <td class="row2" width="62%"> 
+		<input type="checkbox" name="group_delete" value="1">
+		{L_GROUP_DELETE_CHECK}</td>
+	</tr>
+	<tr> 
+	  <td class="catBottom" colspan="2" align="center"><span class="cattitle"> 
+		<input type="submit" name="group_update" value="{L_SUBMIT}" class="mainoption" />
+		&nbsp;&nbsp; 
+		<input type="reset" value="{L_RESET}" name="reset" class="liteoption" />
+		</span></td>
+	</tr>
+</table>{S_HIDDEN_FIELDS}</form>
diff --git a/phpBB/templates/PSO/admin/group_select_body.tpl b/phpBB/templates/PSO/admin/group_select_body.tpl
index 321bdf624f..668779c20d 100644
--- a/phpBB/templates/PSO/admin/group_select_body.tpl
+++ b/phpBB/templates/PSO/admin/group_select_body.tpl
@@ -1,20 +1,17 @@
 
-<br clear="all" />
-
 <h1>{L_GROUP_TITLE}</h1>
 
 <p>{L_GROUP_EXPLAIN}</p>
 
-<table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="post" action="{S_GROUP_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
-		<td class="cat" align="center"><span class="cattitle"><b>{L_GROUP_SELECT}</b></span></td>
+		
+	<th class="thHead" align="center">{L_GROUP_SELECT}</th>
 	</tr>
-	<tr><form method="post" action="{S_GROUP_ACTION}"><input type="hidden" name="mode" value="editgroup">
-		<td class="row1" align="center">{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" value="{L_LOOK_UP}">&nbsp;</td>
-	</form></tr>
 	<tr>
-		<td class="row2" align="center"><a href="admin_groups.php?mode=newgroup">{L_GROUP_NEW}</a></td>
+		<td class="row1" align="center">{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" name="edit" value="{L_LOOK_UP}" class="mainoption" />&nbsp;</td>
 	</tr>
-</table>
-
-<br clear="all" />
+	<tr>
+		<td class="catBottom" align="center"><input type="submit" class="liteoption" name="new" value="{L_CREATE_NEW_GROUP}" /></td>
+	</tr>
+</table></form>
diff --git a/phpBB/templates/PSO/admin/index_navigate.tpl b/phpBB/templates/PSO/admin/index_navigate.tpl
index 9b44c70e4b..1da2382cc7 100644
--- a/phpBB/templates/PSO/admin/index_navigate.tpl
+++ b/phpBB/templates/PSO/admin/index_navigate.tpl
@@ -1,21 +1,27 @@
 
-<!-- a href="{U_BOARD_INDEX}" target="_top"><img src="../images/logo_medium.gif" border="0"/></a -->
-<div align="center"><font face="Impact,sans-serif" size="6"><a href="{U_BOARD_INDEX}" target="_top">phpBB2</a></font></div>
+<!-- a href="{U_FORUM_INDEX}" target="_top"><img src="../images/logo_medium.gif" border="0"/></a -->
+<div align="center"><font face="Impact,sans-serif" size="6"><a href="{U_FORUM_INDEX}" target="_top">phpBB2</a></font></div>
 
 <table width="100%" cellpadding="4" cellspacing="0" border="0" align="center">
 	<tr>
-		<td ><a href="{U_ADMIN_INDEX}" target="main">{L_ADMIN_INDEX}</a></td>
+		<td ><a href="{U_ADMIN_INDEX}" target="main" class="genmed">{L_ADMIN_INDEX}</a></td>
+	</tr>
+        <tr> 
+		<td ><a href="{U_FORUM_INDEX}" target="_top" class="genmed">{L_FORUM_INDEX}</a></td>
+	</tr>
+	<tr> 
+		<td ><a href="{U_FORUM_INDEX}" target="main" class="genmed">{L_PREVIEW_FORUM}</a></td>
 	</tr>
 	<!-- BEGIN catrow -->
 	<tr>
-		<td class="cat" align="center"><span class="cattitle"><b>{catrow.CATNAME}</b></span></td>
+		<td class="cat" align="center"><span class="cattitle"><b>{catrow.ADMIN_CATEGORY}</b></span></td>
 	</tr>
-	<!-- BEGIN actionrow -->
+	<!-- BEGIN modulerow -->
 	<tr>
-		<td><a href="{catrow.actionrow.FILE}"  target="main">{catrow.actionrow.ACTIONNAME}</a></td>
+		<td><a href="{catrow.modulerow.U_ADMIN_MODULE}"  target="main">{catrow.modulerow.ADMIN_MODULE}</a></td>
 	</tr>
-	<!-- END actionrow -->
-	<!-- END catrow -->
+	<!-- END modulerow -->
+        <!-- END catrow -->
 </table>
 
 </body>
diff --git a/phpBB/templates/PSO/admin/styles_addnew_body.tpl b/phpBB/templates/PSO/admin/styles_addnew_body.tpl
new file mode 100644
index 0000000000..6240a7986c
--- /dev/null
+++ b/phpBB/templates/PSO/admin/styles_addnew_body.tpl
@@ -0,0 +1,19 @@
+
+<h1>{L_STYLES_TITLE}</h1>
+
+<P>{L_STYLES_ADD_TEXT}</p>
+
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr>
+		<th class="thCornerL">{L_STYLE}</th>
+		<th class="thTop">{L_TEMPLATE}</th>
+		<th class="thCornerR">{L_ACTION}</th>
+	</tr>
+	<!-- BEGIN styles -->
+	<tr>
+		<td class="{styles.ROW_CLASS}">{styles.STYLE_NAME}</td>
+		<td class="{styles.ROW_CLASS}">{styles.TEMPLATE_NAME}</td>
+		<td class="{styles.ROW_CLASS}"><a href="{styles.U_STYLES_INSTALL}">{L_INSTALL}</a></td>
+	</tr>
+	<!-- END styles -->
+</table></form>
diff --git a/phpBB/templates/PSO/admin/styles_edit_body.tpl b/phpBB/templates/PSO/admin/styles_edit_body.tpl
new file mode 100644
index 0000000000..560b63e331
--- /dev/null
+++ b/phpBB/templates/PSO/admin/styles_edit_body.tpl
@@ -0,0 +1,241 @@
+
+<h1>{L_THEMES_TITLE}</h1>
+
+<p>{L_THEMES_EXPLAIN}</p>
+
+<form action="{S_THEME_ACTION}" method="POST"><table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline">
+	<tr>
+	  <th class="thHead" colspan="3">{L_THEME_SETTINGS}</th>
+	</tr>
+	<tr>
+		<td class="row1">{L_THEME_NAME}:</td>
+		<td class="row2" colspan="2"><input type="text" size="25" maxlength="100" name="style_name" value="{THEME_NAME}"></td>
+	</tr>
+	<tr>
+		<td class="row1">{L_TEMPLATE}:</td>
+		<td class="row2" colspan="2">{S_TEMPLATE_SELECT}</td>
+	</tr>
+	<tr>
+		<td class="cattitle">{L_THEME_ELEMENT}</td>
+		<td class="cattitle">{L_VALUE}</td>
+		<td class="cattitle">{L_SIMPLE_NAME}</td>
+	</tr>
+	<tr>
+		<td class="row1">{L_STYLESHEET}:<br /><span class="gensmall">Filename for CSS stylesheet to use for this theme.</span></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="head_stylesheet" value="{HEAD_STYLESHEET}"></td>
+		<td class="row2">&nbsp;</td>		
+	</tr>
+	<tr>
+		<td class="row1">{L_BACKGROUND_IMAGE}:</td>
+		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_background" value="{BODY_BACKGROUND}"></td>
+		<td class="row2">&nbsp;</td>		
+	</tr>
+	<tr>
+		<td class="row1">{L_BACKGROUND_COLOR}:</td>
+		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_bgcolor" value="{BODY_BGCOLOR}"></td>
+		<td class="row2">&nbsp;</td>
+	</tr>
+	<tr>
+		<td class="row1">{L_BODY_LINK}:</td>
+		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_link" value="{BODY_LINK}"></td>
+		<td class="row2">&nbsp;</td>
+	</tr>
+	<tr>
+		<td class="row1">{L_BODY_VLINK}:</td>
+		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_vlink" value="{BODY_VLINK}"></td>
+		<td class="row2">&nbsp;</td>		
+	</tr>
+	<tr>
+		<td class="row1">{L_BODY_ALINK}:</td>
+		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_alink" value="{BODY_ALINK}"></td>
+		<td class="row2">&nbsp;</td>		
+	</tr>
+	<tr>
+		<td class="row1">{L_BODY_HLINK}:</td>
+		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_hlink" value="{BODY_HLINK}"></td>
+		<td class="row2">&nbsp;</td>		
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TR_COLOR1}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="tr_color1" value="{TR_COLOR1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="tr_color1_name" value="{TR_COLOR1_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TR_COLOR2}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="tr_color2" value="{TR_COLOR2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="tr_color2_name" value="{TR_COLOR2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TR_COLOR3}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="tr_color3" value="{TR_COLOR3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="tr_color3_name" value="{TR_COLOR3_NAME}">
+	</tr>
+	<tr>
+		<td class="row1">{L_TR_CLASS1}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="tr_class1" value="{TR_CLASS1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="tr_class1_name" value="{TR_CLASS1_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TR_CLASS2}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="tr_class2" value="{TR_CLASS2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="tr_class2_name" value="{TR_CLASS2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TR_CLASS3}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="tr_class3" value="{TR_CLASS3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="tr_class3_name" value="{TR_CLASS3_NAME}">
+	</tr>
+	<tr>
+		<td class="row1">{L_TH_COLOR1}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="th_color1" value="{TH_COLOR1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="th_color1_name" value="{TH_COLOR1_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TH_COLOR2}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="th_color2" value="{TH_COLOR2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="th_color2_name" value="{TH_COLOR2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TH_COLOR3}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="th_color3" value="{TH_COLOR3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="th_color3_name" value="{TH_COLOR3_NAME}">
+	</tr>
+	<tr>
+		<td class="row1">{L_TH_CLASS1}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="th_class1" value="{TH_CLASS1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="th_class1_name" value="{TH_CLASS1_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TH_CLASS2}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="th_class2" value="{TH_CLASS2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="th_class2_name" value="{TH_CLASS2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TD_CLASS3}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="th_class3" value="{TD_CLASS3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="th_class3_name" value="{TD_CLASS3_NAME}">
+	</tr>
+	<tr>
+		<td class="row1">{L_TD_COLOR1}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="td_color1" value="{TD_COLOR1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="td_color1_name" value="{TD_COLOR1_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TD_COLOR2}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="td_color2" value="{TD_COLOR2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="td_color2_name" value="{TD_COLOR2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TD_COLOR3}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="td_color3" value="{TD_COLOR3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="td_color3_name" value="{TD_COLOR3_NAME}">
+	</tr>
+	<tr>
+		<td class="row1">{L_TD_CLASS1}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="td_class1" value="{TD_CLASS1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="td_class1_name" value="{TD_CLASS1_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TD_CLASS2}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="td_class2" value="{TD_CLASS2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="td_class2_name" value="{TD_CLASS2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_TD_CLASS3}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="td_class3" value="{TD_CLASS3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="td_class3_name" value="{TD_CLASS3_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTFACE_1}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="50" name="fontface1" value="{FONTFACE1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontface1_name" value="{FONTFACE1_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTFACE_2}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="50" name="fontface2" value="{FONTFACE2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontface2_name" value="{FONTFACE2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTFACE_3}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="50" name="fontface3" value="{FONTFACE3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontface3_name" value="{FONTFACE3_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTSIZE_1}:</td>
+		<td class="row2"><input type="text" size="4" maxlength="4" name="fontsize1" value="{FONTSIZE1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontsize1_name" value="{FONTSIZE1_NAME}">	
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTSIZE_2}:</td>
+		<td class="row2"><input type="text" size="4" maxlength="4" name="fontsize2" value="{FONTSIZE2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontsize2_name" value="{FONTSIZE2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTSIZE_3}:</td>
+		<td class="row2"><input type="text" size="4" maxlength="4" name="fontsize3" value="{FONTSIZE3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontsize3_name" value="{FONTSIZE3_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTCOLOR_1}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="fontcolor1" value="{FONTCOLOR1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontcolor1_name" value="{FONTCOLOR1_NAME}">	
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTCOLOR_2}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="fontcolor2" value="{FONTCOLOR2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontcolor2_name" value="{FONTCOLOR2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_FONTCOLOR_3}:</td>
+		<td class="row2"><input type="text" size="6" maxlength="6" name="fontcolor3" value="{FONTCOLOR3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="fontcolor3_name" value="{FONTCOLOR3_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_SPAN_CLASS_1}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="span_class1" value="{SPAN_CLASS1}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="span_class1_name" value="{SPAN_CLASS1_NAME}">	
+	</tr>
+
+	<tr>
+		<td class="row1">{L_SPAN_CLASS_2}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="span_class2" value="{SPAN_CLASS2}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="span_class2_name" value="{SPAN_CLASS2_NAME}">
+	</tr>
+
+	<tr>
+		<td class="row1">{L_SPAN_CLASS_3}:</td>
+		<td class="row2"><input type="text" size="25" maxlength="25" name="span_class3" value="{SPAN_CLASS3}"></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="span_class3_name" value="{SPAN_CLASS3_NAME}">
+	</tr>
+
+
+	<tr>
+		<td class="catBottom" colspan="3" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings" class="mainoption" />
+		</td>
+	</tr>
+</table></form>
+
+<br clear="all">
diff --git a/phpBB/templates/PSO/admin/styles_exporter.tpl b/phpBB/templates/PSO/admin/styles_exporter.tpl
new file mode 100644
index 0000000000..2056260b7e
--- /dev/null
+++ b/phpBB/templates/PSO/admin/styles_exporter.tpl
@@ -0,0 +1,14 @@
+
+<h1>{L_STYLE_EXPORTER}</h1>
+
+<p>{L_EXPORTER_EXPLAIN}</p>
+
+<form method="post" action="{S_EXPORTER_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr>
+		
+	<th class="thHead" align="center">{L_TEMPLATE_SELECT}</th>
+	</tr>
+	<tr>
+		<td class="row1" align="center">{S_TEMPLATE_SELECT}&nbsp;&nbsp;<input type="submit" name="edit" value="{L_SUBMIT}" class="mainoption" />&nbsp;</td>
+	</tr>
+</table></form>
diff --git a/phpBB/templates/PSO/admin/styles_list_body.tpl b/phpBB/templates/PSO/admin/styles_list_body.tpl
new file mode 100644
index 0000000000..915fe49312
--- /dev/null
+++ b/phpBB/templates/PSO/admin/styles_list_body.tpl
@@ -0,0 +1,21 @@
+
+<h1>{L_STYLES_TITLE}</h1>
+
+<P>{L_STYLES_TEXT}</p>
+
+<table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+	<tr>
+		<th class="thCornerL">{L_STYLE}</th>
+		<th class="thTop">{L_TEMPLATE}</th>
+		<th class="thTop">{L_EDIT}</th>
+		<th colspan="2" class="thCornerR">{L_DELETE}</th>
+	</tr>
+	<!-- BEGIN styles -->
+	<tr>
+		<td class="{styles.ROW_CLASS}">{styles.STYLE_NAME}</td>
+		<td class="{styles.ROW_CLASS}">{styles.TEMPLATE_NAME}</td>
+		<td class="{styles.ROW_CLASS}"><a href="{styles.U_STYLES_EDIT}">{L_EDIT}</a></td>
+		<td class="{styles.ROW_CLASS}"><a href="{styles.U_STYLES_DELETE}">{L_DELETE}</a></td>
+	</tr>
+	<!-- END styles -->
+</table></form>