diff --git a/browse.php b/browse.php
index ff09fa7..7b9b16a 100755
--- a/browse.php
+++ b/browse.php
@@ -26,10 +26,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Brad Shuttleworth <brad@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  */
 
 // main library routines and defaults
diff --git a/dashboard.php b/dashboard.php
index dfe307a..1360297 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -30,10 +30,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  */
 
 // main library routines and defaults
diff --git a/lib/ktentity.inc b/lib/ktentity.inc
index 3b5e284..c7708c9 100644
--- a/lib/ktentity.inc
+++ b/lib/ktentity.inc
@@ -28,11 +28,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Neil Blakey-Milner, Jam Warehouse (Pty) Ltd, South Africa
- * @package lib
  */
 
 $_LCASECACHE = array();
diff --git a/lib/sanitize.inc b/lib/sanitize.inc
index a3fdf20..e042003 100644
--- a/lib/sanitize.inc
+++ b/lib/sanitize.inc
@@ -28,10 +28,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Andrew Glen-Young <andrew@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  */
 
 /**
diff --git a/plugins/ktcore/KTDocumentActions.php b/plugins/ktcore/KTDocumentActions.php
index 8efcce1..1e66f94 100644
--- a/plugins/ktcore/KTDocumentActions.php
+++ b/plugins/ktcore/KTDocumentActions.php
@@ -1,6 +1,6 @@
 <?php
-
 /**
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
diff --git a/plugins/ktcore/admin/roleManagement.php b/plugins/ktcore/admin/roleManagement.php
index 328dfb5..8bfd182 100644
--- a/plugins/ktcore/admin/roleManagement.php
+++ b/plugins/ktcore/admin/roleManagement.php
@@ -1,5 +1,7 @@
 <?php
 /*
+ * $Id$
+ *
  * Document Link Type management
  *
  * The contents of this file are subject to the KnowledgeTree Public
@@ -26,11 +28,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Brad Shuttleworth <brad@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package documentmanagement
  */
 
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css
index 013cc4a..972879a 100644
--- a/resources/css/kt-framing.css
+++ b/resources/css/kt-framing.css
@@ -806,31 +806,31 @@ a.main_nav_item {
     margin: 20px auto;
 }
 
-.ktErrorMessage {
-	background-color: #ffdd80;
-    border: 1px solid #FFC21E;
-    margin: 20px auto;
-}
-
-.ktErrorMessage p {
+.ktError p {
     margin-left: 20px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
 }
 
-.ktErrorMessage span {
+.ktError span {
     margin-left: 20px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
 }
 
-.ktError p {
+.ktErrorMessage {
+	background-color: #ffdd80;
+    border: 1px solid #FFC21E;
+    margin: 20px auto;
+}
+
+.ktErrorMessage p {
     margin-left: 20px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
 }
 
-.ktError span {
+.ktErrorMessage span {
     margin-left: 20px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
diff --git a/resources/css/kt-login.css b/resources/css/kt-login.css
index fc7c0f6..11ea7f3 100644
--- a/resources/css/kt-login.css
+++ b/resources/css/kt-login.css
@@ -128,20 +128,14 @@
 }
 
 /* block level. */
-.ktError {
-	background: #ffdd80 url(../../resources/graphics/error_toprepeat.png) top left repeat-x;
+.ktErrorMessage {
+	background-color: #ffdd80;
     border: 1px solid #FFC21E;
     margin: 20px auto;
 }
 
-.ktError p {
-    margin-left: 20px;
-    padding-left: 25px;
-    background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
-}
-
-.ktError span {
-    margin-left: 20px;
+.ktErrorMessage span {
+    margin-left: 0px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
 }
diff --git a/templates/kt3/fieldsets/conditional_editable_values.smarty b/templates/kt3/fieldsets/conditional_editable_values.smarty
index 61bfb44..ea2b91a 100644
--- a/templates/kt3/fieldsets/conditional_editable_values.smarty
+++ b/templates/kt3/fieldsets/conditional_editable_values.smarty
@@ -2,12 +2,12 @@
     <legend>{$title}</legend>
     <input type="hidden" class="fixed" name="fieldset" value="{$fieldset_id}" />
     {if $context->aError}
-    <div class="ktError">
-    <p>
+    <div class="ktErrorMessage">
+    <span>
 	{i18n}The data for this conditional metadata fieldset was not
 completely provided.  Provide the extra information, and save your
 changes afterwards.{/i18n}
-    </p>
+    </span>
     </div>
     {/if}
     <p class="descriptiveText">
diff --git a/templates/ktcore/document/admin/force_checkin_confirm.smarty b/templates/ktcore/document/admin/force_checkin_confirm.smarty
index 92242c5..fdd9553 100644
--- a/templates/ktcore/document/admin/force_checkin_confirm.smarty
+++ b/templates/ktcore/document/admin/force_checkin_confirm.smarty
@@ -16,7 +16,7 @@
       {$checkout_user->getName()}
    </dd>
    {else}
-   <dd class="ktError">
+   <dd class="ktErrorMessage">
       {i18n}The user who checked this document out is no longer valid.{/i18n}
    </dd>
    {/if}
diff --git a/templates/ktcore/document/cleanup.smarty b/templates/ktcore/document/cleanup.smarty
index 7829556..3f95fab 100644
--- a/templates/ktcore/document/cleanup.smarty
+++ b/templates/ktcore/document/cleanup.smarty
@@ -9,7 +9,7 @@ which you should investigate.{/i18n}</p>
 <p class="descriptiveText">{i18n}All paths are relative to your Documents directory.{/i18n}</p>
 
 {if $aFilesToRemove or $aRepoDocumentProblems}
-<div class="ktError"><p>{i18n}Warning:  Database is inconsistent with the contents of the repository.{/i18n}</p></div>
+<div class="ktErrorMessage"><span>{i18n}Warning:  Database is inconsistent with the contents of the repository.{/i18n}</span></div>
 
 
 {if $aRepoDocumentProblems}
diff --git a/templates/ktcore/help_with_edit.smarty b/templates/ktcore/help_with_edit.smarty
index bc7b976..3f2516b 100644
--- a/templates/ktcore/help_with_edit.smarty
+++ b/templates/ktcore/help_with_edit.smarty
@@ -1,5 +1,5 @@
 {if (!$help_body)}
-<div class="ktError"><p>{i18n}No content specified for this help file yet. <strong>Edit it first.</strong>{/i18n}</p></div>
+<div class="ktErrorMessage"><span>{i18n}No content specified for this help file yet. <strong>Edit it first.</strong>{/i18n}</span></div>
 {else}
 
 {$context->oPage->requireJSResource("resources/js/help.js")}
diff --git a/templates/ktcore/login.smarty b/templates/ktcore/login.smarty
index 3300ea4..d5f9199 100644
--- a/templates/ktcore/login.smarty
+++ b/templates/ktcore/login.smarty
@@ -30,7 +30,7 @@
 			        {if ($errorMessage == null)}
 					    <p class="descriptiveText">{i18n}Please enter your details below to login.{/i18n}</p>
 					{else}
-					    <div class="ktError"><p>{$errorMessage}</p></div>
+					    <div class="ktErrorMessage"><span>{$errorMessage}</span></div>
 					{/if}
 		        	<label for="username">{i18n}Username{/i18n}</label>
 					<input type="text" id="username" name="username"/>
diff --git a/templates/ktcore/metadata/conditional/manageConditional.smarty b/templates/ktcore/metadata/conditional/manageConditional.smarty
index 89af21d..4318ea4 100644
--- a/templates/ktcore/metadata/conditional/manageConditional.smarty
+++ b/templates/ktcore/metadata/conditional/manageConditional.smarty
@@ -25,9 +25,9 @@ the issues identified below.{/i18n}</span>
 {/if}
 
 {if $sIncomplete}
-<div class="ktError">
-<p>{i18n}This error prevents this fieldset from being set
-to complete{/i18n}: {$sIncomplete|escape}</p>
+<div class="ktErrorMessage">
+<span>{i18n}This error prevents this fieldset from being set
+to complete{/i18n}: {$sIncomplete|escape}</span>
 </div>
 {/if}
 {/if}
diff --git a/templates/ktcore/metadata/editFieldset.smarty b/templates/ktcore/metadata/editFieldset.smarty
index 7bc2ee5..b838a54 100644
--- a/templates/ktcore/metadata/editFieldset.smarty
+++ b/templates/ktcore/metadata/editFieldset.smarty
@@ -1,9 +1,9 @@
 <h2>{i18n}Fieldset{/i18n}: {$oFieldset->getName()|escape}</h2>
 
 {if $sIncomplete}
-<div class="ktError">
-<p><strong>{i18n}Incomplete{/i18n}: </strong>{i18n}This conditional fieldset cannot be used{/i18n}: <br />
-{$sIncomplete|escape}</p>
+<div class="ktErrorMessage">
+<span><strong>{i18n}Incomplete{/i18n}: </strong>{i18n}This conditional fieldset cannot be used{/i18n}: <br />
+{$sIncomplete|escape}</span>
 </div>
 {/if}
 
diff --git a/templates/ktcore/principals/groupadmin.smarty b/templates/ktcore/principals/groupadmin.smarty
index b4bea8b..dfac0a9 100644
--- a/templates/ktcore/principals/groupadmin.smarty
+++ b/templates/ktcore/principals/groupadmin.smarty
@@ -72,7 +72,7 @@ href="{addQS}action=manageSubgroups&group_id={$oGroup->getId()}&old_search={$old
 </table>
 
 {else}
-<div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>
+<div class="ktErrorMessage"><span>{i18n}No results for your search.{/i18n}</span></div>
 
 {/if}
 {/if}
diff --git a/templates/ktcore/principals/useradmin.smarty b/templates/ktcore/principals/useradmin.smarty
index dc367c6..c9f6f8a 100644
--- a/templates/ktcore/principals/useradmin.smarty
+++ b/templates/ktcore/principals/useradmin.smarty
@@ -122,7 +122,7 @@ very slow if you have many users).{/i18n}</p>
 </div>
 </form>
 {else}
-<div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>
+<div class="ktErrorMessage"><span>{i18n}No results for your search.{/i18n}</span></div>
 
 {/if}
 {/if}
diff --git a/templates/ktstandard/subscriptions/manage.smarty b/templates/ktstandard/subscriptions/manage.smarty
index 1909b8e..31e6148 100644
--- a/templates/ktstandard/subscriptions/manage.smarty
+++ b/templates/ktstandard/subscriptions/manage.smarty
@@ -1,6 +1,6 @@
 {if !$aFolderSubscriptions && !$aDocumentSubscriptions}
-<div class="ktError">
-<p>{i18n}You have no subscriptions{/i18n}</p>
+<div class="ktErrorMessage">
+<span>{i18n}You have no subscriptions{/i18n}</span>
 </div>
 {else}