Index: trunk/themes/inlink2/new.tpl
===================================================================
diff -u -r29 -r650
--- trunk/themes/inlink2/new.tpl	(.../new.tpl)	(revision 29)
+++ trunk/themes/inlink2/new.tpl	(.../new.tpl)	(revision 650)
@@ -11,6 +11,7 @@
 <TABLE width="760" border="0" cellspacing="1" cellpadding="1" align="center">
   <TR> 
 	<TD class="text"> 
+	<!--
 	  <TABLE width="760" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F7F7FF">
  <TR>
 		  <TD>
@@ -52,6 +53,7 @@
 		  </FORM>
 		</TR>
 	  </TABLE>
+	  -->
 	  <BR>
 	  <UL>
 	  <inp:l_list_links _ItemTemplate="list_feature_links.tpl" _ShortList="0" _ListType="New" />
Index: trunk/themes/inlink2/pop.tpl
===================================================================
diff -u -r29 -r650
--- trunk/themes/inlink2/pop.tpl	(.../pop.tpl)	(revision 29)
+++ trunk/themes/inlink2/pop.tpl	(.../pop.tpl)	(revision 650)
@@ -11,6 +11,7 @@
 <TABLE width="760" border="0" cellspacing="1" cellpadding="1" align="center">
   <TR> 
 	<TD class="text"> 
+	<!--
 	  <TABLE width="760" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F7F7FF">
  <TR>
 		  <TD>
@@ -52,6 +53,7 @@
 		  </FORM>
 		</TR>
 	  </TABLE>
+	  -->
 	  <BR>
 	  <UL>
 	  <inp:l_list_links _ItemTemplate="list_feature_links.tpl" _ShortList="0" _ListType="Pop" />
Index: trunk/themes/inlink2/send_password.tpl
===================================================================
diff -u -r29 -r650
--- trunk/themes/inlink2/send_password.tpl	(.../send_password.tpl)	(revision 29)
+++ trunk/themes/inlink2/send_password.tpl	(.../send_password.tpl)	(revision 650)
@@ -1,58 +1,59 @@
-<%include:header%>
+<inp:include _Template="header" /> 
 
 <TABLE width="760" border="0" cellspacing="1" cellpadding="2" align="center">
   <TR> 
 	<TD class="title"> 
-	<IMG src="images/ticon15.gif" width="24" height="24" border="0" align="absmiddle">
-	   <%language:lu_title_send_password%>
+	<IMG src="images/ticon18.gif" width="24" height="24" border="0" align="absmiddle">
+	  <inp:m_language _Phrase="lu_forgot_password" />
 	</TD>
-	<TD class="title"><SPAN class="error"> 
-		  <%error_send_password%>
-    </SPAN></TD>
   </TR>
 </TABLE>
+<FORM method="POST" NAME="login" ACTION="<inp:m_form_action _form="forgotpw" _Template="send_password_confirm.tpl" />">                                   
+	<TABLE width="760" border="0" cellspacing="0" cellpadding="4" align="center">
+		<tr>
+			<td colspan="2" class="tips">
+				(<span class="error">*</span><inp:m_language _Phrase="lu_required_field" />)</td>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2" class="error"><inp:m_list_form_errors _Form="m_addcat" _ItemTemplate="misc/form_error.tpl" /></td>
+		</tr>
+		<tr>
+			<td colspan="2" class="bgr-updatefill"><img src="img/s.gif" width="300" height="1" alt="" /><br /></td>
+		</tr>
+		<tr>
+			<td colspan="2"><img src="img/s.gif" width="1" height="5" alt="" /><br /></td>
+		</tr>
+		<tr>
+			<td class="field-name"><inp:m_form_prompt _field="username" _Form="forgotpw" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /><span class="error">*</span></td>
+			<td class="field-content-input"><inp:m_form_input type="text" class="input" style="width:135px;" _field="username" _Form="login" _Required="0" /><br /></td>
+		</tr>
+		 <tr>
+			<td class="field-name"><inp:m_language _Phrase="lu_or" /></td>
+            <td>&nbsp;</td>
+        </tr>
+		
+		<tr>
+			<td class="field-name"><inp:m_form_prompt _form="forgotpw" _Field="email" _langtext="lu_pp_email" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" />*</span></td>
+			<td class="field-content-input"><inp:m_form_input type="text" class="input" _field="email" _Form="login" style="width:135px;" /><br /></td>
+		</tr>
+		
+		<tr>
+			<td CLASS="field-name">&nbsp;</td>
+	    <td><img src="img/s.gif" width="300" height="1" alt="" /><br /></td>
+		</tr>
+		<tr>
+			<td class="field-name">&nbsp;</td>
+			<td class="field-content-input">
+				<INPUT type="submit" name="login" value="<inp:m_language _Phrase="lu_button_forgotpw" />" class="button">
+			</td>
+		</tr>
+		<tr><td colspan="2" class="bgr-updatefill"><img src="img/s.gif" width="300" height="1" alt="" /><br /></td></tr>
+		<!-- end buttons -->
+	</table><br /><br />
+</FORM>
 
-<TABLE width="760" border="0" cellspacing="0" cellpadding="4" align="center">
-   <FORM action="<%form_action_send_password%>" method="post">
-	<TR> 
-		<TD valign="top" class="cell1"><SPAN class="text"> 
-		  <%language:lu_user_name%>:
-		  </SPAN></TD>
-		  
-		<TD class="cell1"> 
-		  <INPUT type="text" name="<%form_input_registration_user_name%>" class="text" size="30" value="<%val_user_name%>">
-		  <SPAN class="small">
-		  <%language:lu_atleast_3%>
-		  </SPAN> 
-		</TD>
-		<TD class="cell1"><SPAN class="error"> 
-		  <%error_username%>
-		  </SPAN></TD>
-	</TR>
-	<TR> 	  
-		<TD valign="top" class="cell2">
-		  <%language:lu_email%>:
-		</TD>
-		  
-		<TD class="cell2"> 
-		  <INPUT type="text" name="<%form_input_registration_email%>" class="text" size="30" value="<%val_email%>">
-	  </TD>
-	   <TD class="cell2"><SPAN class="error">
-		  <%error_email%>
-		  </SPAN></TD>
-		</TR>
-	<TR> 	  
-	<TD valign="top" colspan="3" class="cell1"> 
-	  <INPUT type="submit" name="<%val_form_button_registration_submit%>" value="<%language:lu_button_send_password%>" class="button">
-		<INPUT type="reset" name="<%val_form_button_registration_reset%>" value="<%language:lu_button_reset%>" class="button">
-		<INPUT type="button" name="<%val_form_button_registration_cancel%>" value="<%language:lu_button_cancel%>" class="button" onClick="history.back();">
-	  </TD>
-	</TR>
+<inp:include _Template="footer.tpl" />
 
-    </FORM>
-  </TABLE>
-
-<%include:footer%>
-
-</BODY>
-</HTML>
\ No newline at end of file
+</body>
+</html>
\ No newline at end of file
Index: trunk/themes/inlink2/send_password_confirm.tpl
===================================================================
diff -u
--- trunk/themes/inlink2/send_password_confirm.tpl	(revision 0)
+++ trunk/themes/inlink2/send_password_confirm.tpl	(revision 650)
@@ -0,0 +1,33 @@
+<inp:include _Template="header" />
+
+<TABLE width="760" border="0" cellspacing="1" cellpadding="2" align="center">
+  <TR> 
+	<TD class="title"> 
+	<IMG src="images/ticon8.gif" width="24" height="24" border="0" align="absmiddle">
+	   <inp:m_language _Phrase="lu_forgotpw_confirm" />
+	</TD>
+  </TR>
+</TABLE>
+
+<TABLE width="760" border="0" cellspacing="1" cellpadding="1" align="center">
+<FORM method="POST" NAME="login" ACTION="<inp:m_form_action _form="forgotpw_confirm" _Template="login" />">
+  <TR> 
+	<TD align="center" class="cell1">
+	 <BR>
+	 <P align="center">
+	  <SPAN>
+	  	<inp:m_language _Phrase="lu_forgotpw_confirm_text" />
+	   </SPAN>	       
+	 </P>
+	  <BR />
+	  <INPUT type="submit" name="buttons[]" value="<inp:m_language _Phrase="lu_button_ok" />" class="button">
+	
+	    
+	</TD>
+  </TR>
+</TABLE>
+</FORM>
+<inp:include _Template="footer.tpl" />
+
+</body>
+</html>
\ No newline at end of file
Index: trunk/themes/inlink2/top.tpl
===================================================================
diff -u -r29 -r650
--- trunk/themes/inlink2/top.tpl	(.../top.tpl)	(revision 29)
+++ trunk/themes/inlink2/top.tpl	(.../top.tpl)	(revision 650)
@@ -11,6 +11,7 @@
 <TABLE width="760" border="0" cellspacing="1" cellpadding="1" align="center">
   <TR> 
 	<TD class="text"> 
+	<!--
 	  <TABLE width="760" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F7F7FF">
  <TR>
 		  <TD>
@@ -52,6 +53,7 @@
 		  </FORM>
 		</TR>
 	  </TABLE>
+	  -->
 	  <BR>
 	  <UL>
 	  <inp:l_list_links _ItemTemplate="list_feature_links.tpl" _ShortList="0" _ListType="Hot" />
Index: trunk/themes/inlink2/pick.tpl
===================================================================
diff -u -r29 -r650
--- trunk/themes/inlink2/pick.tpl	(.../pick.tpl)	(revision 29)
+++ trunk/themes/inlink2/pick.tpl	(.../pick.tpl)	(revision 650)
@@ -11,6 +11,7 @@
 <TABLE width="760" border="0" cellspacing="1" cellpadding="1" align="center">
   <TR> 
 	<TD class="text"> 
+	<!--
 	  <TABLE width="760" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F7F7FF">
  <TR>
 		  <TD>
@@ -52,6 +53,7 @@
 		  </FORM>
 		</TR>
 	  </TABLE>
+	  -->
 	  <BR>
 	  <UL>
 	  <inp:l_list_links _ItemTemplate="list_feature_links.tpl" _ShortList="0" _ListType="Pick" />