diff --git a/misc/drupal.css b/misc/drupal.css
index 0316f628b2ab666da6e8ce2184df2028d4fdca84..b65cb315fee7d469cb4d504b99dd8718b296f9ad 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -18,6 +18,10 @@ hr {
 img {
   border: 0;
 }
+p {
+  margin-top: 0.5em;
+  margin-bottom: 0.9em;
+}
 pre, code {
   font-size: 11px;
 }
@@ -129,8 +133,14 @@ td.menu-disabled {
   list-style: disc;
 }
 .form-item {
+  margin-top: 1em;
   margin-bottom: 1em;
 }
+tr.light .form-item, tr.dark .form-item {
+  margin-top: 0em;
+  margin-bottom: 0em;
+  white-space: nowrap;
+}
 .form-item input.error {
   border: 2px solid red;
 }
@@ -359,29 +369,35 @@ td.menu-disabled {
 .user-login-block {
   text-align: center;
 }
-td.watchdog-user {
-  background: #fea;
-  border: 1px solid #dc8;
+tr td.watchdog-user {
+  background: #ffd;
+}
+tr td.watchdog-user.active {
+  background: #eed;
+}
+tr td.watchdog-special {
+  background: #ddf;
+}
+tr td.watchdog-special.active {
+  background: #cce;
+}
+tr td.watchdog-warning {
+  background: #fda;
 }
-td.watchdog-message {
-  background: #fff;
-  border: 1px solid #ddd;
+tr td.watchdog-warning.active {
+  background: #ec9;
 }
-td.watchdog-special {
-  background: #ccf;
-  border: 1px solid #99c;
+tr td.watchdog-httpd {
+  background: #dfd;
 }
-td.watchdog-warning {
-  background: #fa2;
-  border: 1px solid #d80;
+tr td.watchdog-httpd.active {
+  background: #cec;
 }
-td.watchdog-httpd {
-  background: #9d9;
-  border: 1px solid #7b7;
+tr td.watchdog-error {
+  background: #ffc9c9;
 }
-td.watchdog-error {
-  background: #e44;
-  border: 1px solid #c22;
+tr td.watchdog-error.active {
+  background: #eeb9b9;
 }
 
 /* Tab navigation */
diff --git a/themes/xtemplate/default/xtemplate.css b/themes/xtemplate/default/xtemplate.css
index 8828323a48cea5d4eb1214a2d171b708e2c35aa8..48f9e330a67b756db3489fcbb3bf518a4533f4ef 100644
--- a/themes/xtemplate/default/xtemplate.css
+++ b/themes/xtemplate/default/xtemplate.css
@@ -52,9 +52,6 @@ table {
   /* make <td> sizes relative to body size! */
   font-size: 1em;
 }
-.form-item {
-  margin-top: 1em;
-}
 .form-item label {
   font-size: 1em;
   color: #222;
@@ -63,6 +60,9 @@ table {
   font-size: 1em;
   color: #222;
 }
+.links {
+  margin-bottom: 2em;
+}
 
 /*
 ** Page layout blocks / IDs
@@ -209,7 +209,7 @@ table {
   border: solid 1px #ddd;
 }
 .node .content, .comment .content {
-  padding: .5em 0 .75em 0;
+  margin: .5em 0 .5em 0;
 }
 .node .taxonomy {
   color: #999;
diff --git a/themes/xtemplate/pushbutton/xtemplate.css b/themes/xtemplate/pushbutton/xtemplate.css
index cdf464eec54e075df235dbecd2adab9b787eb344..f1f5b85681bbe1b744296e1232aac8d7d754ed1c 100644
--- a/themes/xtemplate/pushbutton/xtemplate.css
+++ b/themes/xtemplate/pushbutton/xtemplate.css
@@ -318,7 +318,7 @@ table#footer-menu {
   margin: .5em 0 2.5em 0;
 }
 .node .content, .comment .content {
-  padding: .5em 0 .75em 0;
+  margin: .5em 0 .5em 0;
 }
 .node .taxonomy {
   color: #999;