3 files changed, 20 insertions, 13 deletions
diff --git a/template/en/default/admin/keywords/confirm-delete.html.tmpl b/template/en/default/admin/keywords/confirm-delete.html.tmpl
index 718a32ec5..9f59cc57f 100644
--- a/template/en/default/admin/keywords/confirm-delete.html.tmpl
+++ b/template/en/default/admin/keywords/confirm-delete.html.tmpl
@@ -12,26 +12,29 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Delete Keyword"
+  style_urls = ['skins/standard/admin.css']
 %]
 
-<p>
+<h2>Confirmation</h2>
+
+<p class="confirmation">
   [% IF keyword.bug_count == 1 %]
-    There is one [% terms.bug %] with this keyword set.
+    There is one [% terms.bug %]
   [% ELSIF keyword.bug_count > 1 %]
-    There are [% keyword.bug_count FILTER html %] [%+ terms.bugs %] with
-    this keyword set.
+    There are [% keyword.bug_count FILTER html %] [%+ terms.bugs %]
   [% END %]
-  
-  Are you <b>sure</b> you want to delete
-  the <code>[% keyword.name FILTER html %]</code> keyword?
+   with the <em>[% keyword.name FILTER html %]</em> keyword set.
+</p>
+
+<p>
+  Do you really want to delete this keyword?
 </p>
 
 <form method="post" action="editkeywords.cgi">
   <input type="hidden" name="id" value="[% keyword.id FILTER html %]">
   <input type="hidden" name="action" value="delete">
   <input type="hidden" name="token" value="[% token FILTER html %]">
-  <input type="submit" id="delete"
-         value="Yes, really delete the keyword">
+  <input type="submit" id="delete" value="Yes, delete">
 </form>
 
 <p><a href="editkeywords.cgi">Edit other keywords</a>.</p>
diff --git a/template/en/default/admin/keywords/create.html.tmpl b/template/en/default/admin/keywords/create.html.tmpl
index 10de960cb..3c310cce0 100644
--- a/template/en/default/admin/keywords/create.html.tmpl
+++ b/template/en/default/admin/keywords/create.html.tmpl
@@ -9,14 +9,15 @@
 [%# INTERFACE:
   # none
   #%]
-  
+
 [% PROCESS global/header.html.tmpl
   title = "Add keyword"
   subheader = "This page allows you to add a new keyword."
+  style_urls = ['skins/standard/admin.css']
 %]
 
 <form method="post" action="editkeywords.cgi">
-  <table border="0" cellpadding="4" cellspacing="0">
+  <table id="admin_table_edit">
     <tr>
       <th>Name:</th>
       <td><input size="64" maxlength="64" name="name" value=""></td>
@@ -33,13 +34,15 @@
       </td>
     </tr>
   </table>
-  <hr>
+
   <input type="hidden" name="id" value="-1">
   <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
   <input type="hidden" name="token" value="[% token FILTER html %]">
 </form>
 
+<hr>
+
 <p><a href="editkeywords.cgi">Edit other keywords</a>.</p>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl
index f8b74ab21..1c3d1c3c5 100644
--- a/template/en/default/admin/keywords/edit.html.tmpl
+++ b/template/en/default/admin/keywords/edit.html.tmpl
@@ -12,10 +12,11 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Edit keyword"
+  style_urls = ['skins/standard/admin.css']
 %]
 
 <form method="post" action="editkeywords.cgi">
-  <table border="0" cellpadding="4" cellspacing="0">
+  <table id="admin_table_edit">
     <tr>
       <th>Name:</th>
       <td><input size="64" maxlength="64" name="name"