diff --git a/addressbook/templates/default/form.tpl b/addressbook/templates/default/form.tpl
index 5e0506a8a1..58d606600a 100755
--- a/addressbook/templates/default/form.tpl
+++ b/addressbook/templates/default/form.tpl
@@ -4,39 +4,39 @@
   <tr bgcolor="{th_bg}">
     <td colspan="5"><font color="{th_text}" face="">{lang_personal}:</font></td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_prefix}:</font></td>
+    <td><font size="-1">{lang_prefix}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="10" name="entry[prefix]" value="{prefix}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_firstname}:</font></td>
+    <td><font size="-1">{lang_firstname}:</font></td>
     <td>
       <font size="-1"><input name="entry[firstname]" value="{firstname}"></font>
     </td>
-    <td><font color="{row_text}" face="" size="-1">{lang_middle}:</font></td>
+    <td><font size="-1">{lang_middle}:</font></td>
     <td>
       <font size="-1"><input name="entry[middle]" value="{middle}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_lastname}:</font></td>
+    <td><font size="-1">{lang_lastname}:</font></td>
     <td colspan="3">
       <font size="-1"><input name="entry[lastname]" value="{lastname}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_suffix}:</font></td>
+    <td><font size="-1">{lang_suffix}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="10" name="entry[suffix]" value="{suffix}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_birthday}:</font></td>
     <td colspan="3"><font size="-1">{birthday}</font></td>
@@ -44,155 +44,155 @@
   <tr bgcolor="{th_bg}">
     <td colspan="5"><font color="{th_text}" face="">{lang_business}:</font></td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
     <td>
-     <font color="{row_text}" face="" size="-1">{lang_title}:</font>
+     <font size="-1">{lang_title}:</font>
     </td>
     <td colspan="3">
       <font size="-1"><input name="entry[title]" value="{title}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
     <td>
-     <font color="{row_text}" face="" size="-1">{lang_company}:</font>
+     <font size="-1">{lang_company}:</font>
     </td>
     <td>
      <font size="-1"><input size="30" name="entry[company]" value="{company}"></font>
     </td>
     <td colspan="2">
-     <font color="{row_text}" face="" size="-1">{lang_url}:</font>
+     <font size="-1">{lang_url}:</font>
      <input size="30" name="entry[url]" value="{url}">
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
 	<td>
-     <font color="{row_text}" face="" size="-1">{lang_email}:
+     <font size="-1">{lang_email}:
     </td>
     <td>
       <font size="-1"><input size="30" name="entry[email]" value="{email}"></font>
     </td>
     <td colspan="2">
-     <font color="{row_text}" face="" size="-1">{lang_email_type}:</font>
+     <font size="-1">{lang_email_type}:</font>
      <font size="-1">{email_type}</font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
      <td>
-     <font color="{row_text}" face="" size="-1">{lang_department}:</font>
+     <font size="-1">{lang_department}:</font>
     </td>
     <td colspan="3">
      <font size="-1"><input name="entry[department]" value="{department}"></font>
     </td>
   </tr> 
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_bstreet}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="30" name="entry[bstreet]" value="{bstreet}"></font>
      </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_address2}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="30" name="entry[address2]" value="{address2}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_address3}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="30" name="entry[address3]" value="{address3}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_bcity}:</font></td>
     <td>
       <font size="-1"><input size="30" name="entry[bcity]" value="{bcity}"></font>
     </td>
-    <td colspan="2"><font color="{row_text}" face="" size="-1">{lang_bstate}:</font>
+    <td colspan="2"><font size="-1">{lang_bstate}:</font>
       <font size="-1"><input name="entry[bstate]" value="{bstate}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_bzip}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="10" name="entry[bzip]" value="{bzip}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_bcountry}:</font></td>
+    <td><font size="-1">{lang_bcountry}:</font></td>
     <td>
       <font size="-1">{bcountry}</font>
     </td>
-    <td colspan="2"><font color="{row_text}" face="" size="-1">{lang_timezone}:</font>
+    <td colspan="2"><font size="-1">{lang_timezone}:</font>
       <font size="-1">{timezone}</font>
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
-	<td><font color="{row_text}" face="" size="-1">{lang_badrtype}:</font></td>
+	<td><font size="-1">{lang_badrtype}:</font></td>
     <td colspan="3">
 	  <font size="-1">{badrtype}</font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_wphone}:</font></td>
+    <td><font size="-1">{lang_wphone}:</font></td>
      <td>
       <font size="-1"><input name="entry[wphone]" value="{wphone}"></font>{pref_work}
     </td>
-    <td><font color="{row_text}" face="" size="-1">{lang_fax}:</font></td>
+    <td><font size="-1">{lang_fax}:</font></td>
     <td>
       <font size="-1"><input name="entry[fax]" value="{fax}"></font>{pref_fax}
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_pager}:</font></td>
+    <td><font size="-1">{lang_pager}:</font></td>
     <td>
       <font size="-1"><input name="entry[pager]" value="{pager}"></font>{pref_pager}
     </td>
-    <td><font color="{row_text}" face="" size="-1">{lang_mphone}:</font></td>
+    <td><font size="-1">{lang_mphone}:</font></td>
     <td>
       <font size="-1"><input name="entry[mphone]" value="{mphone}"></font>{pref_cell}
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_msgphone}:</font></td>
+    <td><font size="-1">{lang_msgphone}:</font></td>
     <td>
       <font size="-1"><input name="entry[msgphone]" value="{msgphone}"></font>{pref_msg}
     </td>
-    <td><font color="{row_text}" face="" size="-1">{lang_isdnphone}:</font></td>
+    <td><font size="-1">{lang_isdnphone}:</font></td>
     <td>
       <font size="-1"><input name="entry[isdnphone]" value="{isdnphone}"></font>{pref_isdn}
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_carphone}:</font></td>
+    <td><font size="-1">{lang_carphone}:</font></td>
     <td>
       <font size="-1"><input name="entry[carphone]" value="{carphone}"></font>{pref_car}
     </td>
-    <td><font color="{row_text}" face="" size="-1">{lang_vidphone}:</font></td>
+    <td><font size="-1">{lang_vidphone}:</font></td>
     <td>
       <font size="-1"><input name="entry[vidphone]" value="{vidphone}"></font>{pref_video}
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
     <td><font size="-1">{lang_label}:</font></td>
     <td colspan="3"><font size="-1">{label}</font></td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
     <td><font size="-1">{lang_pubkey}:</font></td>
     <td colspan="3"><font size="-1">{pubkey}</font></td>
@@ -200,79 +200,79 @@
   <tr bgcolor="{th_bg}">
     <td colspan="5"><font color="{row_text}" face="">{lang_home}:</font></td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
     <td>
-      <font color="{row_text}" face="" size="-1">{lang_hemail}:</font>
+      <font size="-1">{lang_hemail}:</font>
     </td>
     <td><font size="-1"><input size="30" name="entry[hemail]" value="{hemail}"></font></td>
-    <td colspan="2"><font color="{row_text}" face="" size="-1">{lang_hemail_type}:</font>
+    <td colspan="2"><font size="-1">{lang_hemail_type}:</font>
         <font size="-1">{hemail_type}</font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_hstreet}:</font></td>
     <td colspan="3"><font size="-1"><input size="30" name="entry[hstreet]" value="{hstreet}"></font></td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_hcity}:</font></td>
     <td>
       <font size="-1"><input size="30" name="entry[hcity]" value="{hcity}"></font>
     </td>
-    <td><font color="{row_text}" face="" size="-1">{lang_hstate}:</font></td>
+    <td><font size="-1">{lang_hstate}:</font></td>
     <td>
       <font size="-1"><input name="entry[hstate]" value="{hstate}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_hzip}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="10" name="entry[hzip]" value="{hzip}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_hcountry}:</font></td>
+    <td><font size="-1">{lang_hcountry}:</font></td>
     <td colspan="3">
       <font size="-1">{hcountry}</font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td>&nbsp;</td>
-	<td><font color="{row_text}" face="" size="-1">{lang_hadrtype}:</font></td>
+	<td><font size="-1">{lang_hadrtype}:</font></td>
     <td colspan="3">
 	  <font size="-1">{hadrtype}</font>
     </td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td>&nbsp;</td>
-    <td><font color="{row_text}" face="" size="-1">{lang_hphone}:</font></td>
+    <td><font size="-1">{lang_hphone}:</font></td>
     <td>
       <font size="-1"><input name="entry[hphone]" value="{hphone}"></font>{pref_home}
     </td>
-    <td colspan="2"><font color="{row_text}" face="" size="-1">{lang_ophone}:</font>
+    <td colspan="2"><font size="-1">{lang_ophone}:</font>
       <font size="-1"><input name="entry[ophone]" value="{ophone}"></font>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td><font size="-1">{lang_notes}:</font></td>
     <td colspan="4"><font size="-1">{notes}</font></td>
   </tr>
-  <tr bgcolor="{row_on}">
+  <tr class="row_on">
     <td><font size="-1">{lang_private}:</font></td>
     <td colspan="4">
      <input type="checkbox" name="entry[access]" value="True"{access_check}>
     </td>
   </tr>
-  <tr bgcolor="{row_off}">
+  <tr class="row_off">
     <td><font size="-1">{lang_cats}:</font></td>
     <td colspan="4">{cats_link}</td>
   </tr>
   <tr bgcolor="{th_bg}">
-	<td colspan="5"><font color="{row_text}" face="" size="-1">{lang_custom}</font></td>
+	<td colspan="5"><font size="-1">{lang_custom}</font></td>
   </tr>
 {custom}
   <!-- BEGIN creator -->
diff --git a/addressbook/templates/default/preferences.tpl b/addressbook/templates/default/preferences.tpl
index cb61fb7af7..7d43988634 100644
--- a/addressbook/templates/default/preferences.tpl
+++ b/addressbook/templates/default/preferences.tpl
@@ -3,10 +3,10 @@
  <form method="POST" action="{action_url}">
   <table border="0" align="center" cellspacing="1" cellpadding="1" width="98%">
   <tr class="th">
-    <td colspan="6" align="center"><font color="#000000" face="">{lang_fields}:</font></td>
+    <td colspan="6" align="center">{lang_fields}:</font></td>
   </tr>
   <tr class="row_on">
-    <td colspan="6"><font color="#000000" face="">{lang_personal}:</font></td>
+    <td colspan="6">{lang_personal}:</font></td>
   </tr>
   <tr class="row_off">
     <td><input type="checkbox" name="prefs[fn]"{fn_checked}>{fn}</option></td>
@@ -28,7 +28,7 @@
     <td>&nbsp;</td>
   </tr>
   <tr class="row_on">
-    <td colspan="6"><font color="#000000" face="">{lang_business}:</font></td>
+    <td colspan="6">{lang_business}:</font></td>
   </tr>
   <tr class="row_off">
     <td><input type="checkbox" name="prefs[org_name]"{org_name_checked}>{org_name}</option></td>
@@ -57,7 +57,7 @@
     <td>&nbsp;</td>
   </tr>
   <tr class="row_on">
-    <td colspan="6"><font color="#000000" face="">{lang_home}:</font></td>
+    <td colspan="6">{lang_home}:</font></td>
   </tr>
   <tr class="row_off">
     <td><input type="checkbox" name="prefs[adr_two_street]"{adr_two_street_checked}>{adr_two_street}</option></td>
@@ -78,7 +78,7 @@
     <td>&nbsp;</td>
   </tr>
   <tr class="row_on">
-    <td colspan="6"><font color="#000000" face="">{lang_phones}:</font></td>
+    <td colspan="6">{lang_phones}:</font></td>
   </tr>
   <tr class="row_off">
     <td><input type="checkbox" name="prefs[tel_voice]"{tel_voice_checked}>{tel_voice}</option></td>
@@ -100,7 +100,7 @@
     <td>&nbsp;</td>
   </tr>
   <tr class="row_on">
-    <td colspan="6"><font color="#000000" face="">{lang_other}:</font></td>
+    <td colspan="6">{lang_other}:</font></td>
   </tr>
   <tr class="row_off">
     <td><input type="checkbox" name="prefs[geo]"{geo_checked}>{geo}</option></td>
@@ -115,7 +115,7 @@
     <td>&nbsp;</td>
   </tr>
   <tr class="th">
-    <td colspan="6" align="center"><font color="#000000" face="">{lang_otherprefs}:</font></td>
+    <td colspan="6" align="center">{lang_otherprefs}:</font></td>
   </tr>
   <tr class="row_off">
     <td>{lang_default_filter}</td>