2 files changed, 9 insertions, 13 deletions
diff --git a/themes/xtemplate/xtemplate.css b/themes/xtemplate/xtemplate.css
index 36b09efa4..388090dba 100644
--- a/themes/xtemplate/xtemplate.css
+++ b/themes/xtemplate/xtemplate.css
@@ -142,21 +142,17 @@ table {
   padding-bottom: 0.75em;
   margin-bottom: 1.5em;
 }
-.node {
-  padding: 0 0 2.5em 0;
-}
 .comment {
   border: 1px solid #abc;
-  padding: 1.5em 1.5em 1.5em 1.5em;
+  padding: 0 1.5em 1.5em 1.5em;
   margin: 0.5em 0 0.5em 0;
 }
-.node .title, .block .title, .box .title, .node .title a, .box .title a {
-  padding-bottom: 0.5em;
+.node h2, .node h2 a, .block h2, .box h2 {
   font-weight: bold;
   font-size: 1.3em;
   color: #777;
 }
-.form-item .title {
+.form-item label {
   font-size: 1em;
   color: #222;
 }
@@ -187,7 +183,7 @@ table {
 .path a, .path a:visited {
   color: #777;
 }
-.comment .title {
+.comment h3 {
   font-weight: bold;
   font-size: 1.1em;
   color: #777;
diff --git a/themes/xtemplate/xtemplate.xtmpl b/themes/xtemplate/xtemplate.xtmpl
index cf4107867..e9199c674 100644
--- a/themes/xtemplate/xtemplate.xtmpl
+++ b/themes/xtemplate/xtemplate.xtmpl
@@ -52,7 +52,7 @@
 
 <!-- BEGIN: node -->
   <div class="node">
-    <div class="title"><a href="{link}">{title}</a></div>
+    <h2><a href="{link}">{title}</a></h2>
     <span class="author">Submitted by {author} on {date}.</span>
     <span class="taxonomy">{taxonomy}</span>
     <div class="content">{content}</div>
@@ -62,8 +62,8 @@
 
 <!-- BEGIN: comment_new -->
   <div class="comment">
+    <h3>{title}</h3>
     <span class="new">new</span>
-    <div class="title">{title}</div>
     <div class="author">Posted by {author} on {date}.</div>
     <div class="content">{content}</div>
     <div class="links">&raquo; {links}</div>
@@ -72,7 +72,7 @@
 
 <!-- BEGIN: comment_old -->
   <div class="comment">
-    <div class="title">{title}</div>
+    <h3>{title}</h3>
     <div class="author">Posted by {author} on {date}.</div>
     <div class="content">{content}</div>
     <div class="links">&raquo; {links}</div>
@@ -81,14 +81,14 @@
 
 <!-- BEGIN: box -->
   <div class="box">
-    <div class="title">{subject}</div>
+    <h2>{subject}</h2>
     <div class="content">{content}</div>
  </div>
 <!-- END: box -->
 
 <!-- BEGIN: block -->
   <div class="block block-{module}" id="block-{module}-{delta}">
-    <div class="title">{subject}</div>
+    <h2>{subject}</h2>
     <div class="content">{content}</div>
  </div>
 <!-- END: block -->