diff --git a/b2comments.php b/b2comments.php
index 38015310fb..c6d27de703 100644
--- a/b2comments.php
+++ b/b2comments.php
@@ -14,7 +14,7 @@
 
 <!-- you can start editing here -->
 
-<h2 id="comment">Comments</h2>
+<h2>Comments</h2>
 <ol id="comments">
 	<?php /* this line is b2's motor, do not delete it */ $wxcvbn_c=0; while($rowc = mysql_fetch_object($resultc)) { $wxcvbn_c++; $commentdata = get_commentdata($rowc->comment_ID); ?>
 	
@@ -27,7 +27,7 @@
 QQQ;
 } else {
 	echo $commentdata["comment_author"];
-} ?> <?php comment_date() ?> @ <?php comment_time() ?></cite></p>
+} ?> <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
 </li>
 <!-- /comment -->
 	<?php /* end of the loop, don't delete */ } if (!$wxcvbn_c) { ?>
diff --git a/b2commentspopup.php b/b2commentspopup.php
index f2d18f7395..27bf93582c 100644
--- a/b2commentspopup.php
+++ b/b2commentspopup.php
@@ -4,103 +4,82 @@ $blog=1; include ("blog.header.php"); while($row = mysql_fetch_object($result))
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title><?php echo $blogname ?> - comments on '<?php the_title() ?>'</title>
+	<title><?php echo $blogname ?> - Comments on "<?php the_title() ?>"</title>
 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="reply-to" content="you@yourdomain.com" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta content="TRUE" name="MSSmartTagsPreventParsing" />
-
-<style type="text/css" media="screen">
-@import url( layout2b.css );
-</style>
-<link rel="stylesheet" type="text/css" media="print" href="b2-include/print.css" />
-<link rel="alternate" type="text/xml" title="XML" href="<?php echo $siteurl ?>/b2rss.php" />
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<style type="text/css" media="screen">
+		@import url( layout2b.css );
+		body { margin: 3px; }
+	</style>
+	<link rel="stylesheet" type="text/css" media="print" href="b2-include/print.css" />
 
 </head>
 <body>
-<div id="header"><a href="" title="<?php echo $blogname ?>"><?php echo $blogname ?></a></div>
+<h1 id="header"><a href="" title="<?php echo $blogname ?>"><?php echo $blogname ?></a></h1>
 
 <div id="contentcomments">
+<h2>Comments</h2>
+<ol id="comments">
 
-<div class="storyContent">
-
-<?php 
-$comment_author = (empty($HTTP_COOKIE_VARS["comment_author"])) ? "name" : $HTTP_COOKIE_VARS["comment_author"];
-$comment_author_email = (empty($HTTP_COOKIE_VARS["comment_author"])) ? "email" : trim($HTTP_COOKIE_VARS["comment_author_email"]);
-$comment_author_url = (empty($HTTP_COOKIE_VARS["comment_author"])) ? "url" : trim($HTTP_COOKIE_VARS["comment_author_url"]);
-
+<?php /* this line is b2's motor, do not delete it */ 
 $queryc = "SELECT * FROM $tablecomments WHERE comment_post_ID = $id AND comment_content NOT LIKE '%<trackback />%' ORDER BY comment_date";
 $resultc = mysql_query($queryc);
 if ($resultc) {
-?>
-
-
-
-<!-- you can start editing here -->
-
-<a name="comments"></a>
-<p>&nbsp;</p>
-<div><strong><span style="color: #0099CC">::</span> comments</strong></div>
-<p>&nbsp;</p>
-
-<?php // these lines are b2's motor, do not delete
 while($rowc = mysql_fetch_object($resultc)) {
 	$commentdata = get_commentdata($rowc->comment_ID);
-?><a name="c<?php comment_ID() ?>"></a>
+?>
 	
 <!-- comment -->
-<p>
-<b><?php comment_author() ?> <?php comment_author_email_link("email", " - ", "") ?><?php comment_author_url_link("url", " - ", "") ?></b>
-<br />
+<li id="comment-<?php comment_ID() ?>">
 <?php comment_text() ?>
-<br />
-<?php comment_date() ?> @ <?php comment_time() ?>
-</p>
-<p>&nbsp;</p>
+<p><cite>By <?php if ($commentdata["comment_author_url"] && $commentdata["comment_author_url"] != 'http://url') {
+	echo <<<QQQ
+<a href="{$commentdata["comment_author_url"]}">{$commentdata["comment_author"]}</a>
+QQQ;
+} else {
+	echo $commentdata["comment_author"];
+} ?> <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
+</li>
 <!-- /comment -->
 
+	<?php } /* end of the loop, don't delete */ } if (!$resultc) { ?>
 
-<?php //end of the loop, don't delete
-}
-
-?>
-
-<div><strong><span style="color: #0099CC">::</span> leave a comment</strong></div>
-<p>&nbsp;</p>
+<!-- this is displayed if there are no comments so far -->
+	<li>No comments yet.</li>
 
+	<?php /* if you delete this the sky will fall on your head */ } ?>
+</ol>
+<h2>Leave a Comment</h2>
+<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <?php echo htmlentities(str_replace('>', '> ', $comment_allowed_tags)); ?></p>
 
 <!-- form to add a comment -->
 
-<form action="b2comments.post.php" method="post">
+<form action="<?php echo $siteurl; ?>/b2comments.post.php" method="post" id="commentform">
+	<p>
+	  <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
+	   <label for="author">name</label>
 	<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-	<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($HTTP_SERVER_VARS["REQUEST_URI"]); ?>" />
-	
-	<p class="commentfield">
-	name<br />
-	<input type="text" name="author" class="textarea" value="<?php echo $comment_author ?>" size="20" tabindex="1" />
+	<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]); ?>" />
 	</p>
 
-	<p class="commentfield">
-	email<br />
-	<input type="text" name="email" class="textarea" value="<?php echo $comment_author_email ?>" size="20" tabindex="2" />
+	<p>
+	  <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
+	   <label for="email">email</label>
 	</p>
 
-	<p class="commentfield">
-	url<br />
-	<input type="text" name="url" class="textarea" value="<?php echo $comment_author_url ?>" size="20" tabindex="3" />
+	<p>
+	  <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
+	   <label for="url"><acronym title="Uniform Resource Locator">url</acronym></label>
 	</p>
 
-	<p class="commentfield">
-	your comment<br />
-	<textarea cols="40" rows="4" name="comment" tabindex="4" class="textarea">comment</textarea>
+	<p>
+	  <label for="comment">your comment</label>
+	<br />
+	  <textarea name="comment" id="comment" cols="30" rows="4" tabindex="4" style="width: 90%"></textarea>
 	</p>
 
-	<p class="commentfield">
-	<input type="checkbox" name="comment_autobr" value="1" <?php
-	if ($autobr)
-	echo " checked=\"checked\"" ?> tabindex="6" /> Auto-BR (line-breaks become &lt;br> tags)<br />
-	<input type="submit" name="submit" class="buttonarea" value="ok" tabindex="5" />
+	<p>
+	  <input name="submit" type="submit" tabindex="5" value="Say it!" />
 	</p>
 
 </form>
@@ -108,8 +87,8 @@ while($rowc = mysql_fetch_object($resultc)) {
 <!-- /form -->
 
 
-<p>&nbsp;</p>
-<div><b><span style="color: #0099CC">::</span> <a href="javascript:window.close()">close this window</a></b></div>
+
+<div><strong><a href="javascript:window.close()">Close this window</a>.</strong></div>
 
 <?php // if you delete this the sky will fall on your head
 }
@@ -119,14 +98,11 @@ while($rowc = mysql_fetch_object($resultc)) {
 
 
 <!-- // this is just the end of the motor - don't touch that line either :) -->
-	<?php } ?> 
+	<?php //} ?> 
 
 
-</div>
 
-<p class="centerP">
-[powered by <a href="http://cafelog.com" target="_blank"><b>b2</b></a>.]
-</p>
+<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org"><strong>Wordpress</strong></a></cite></p>
 
 
 </body>
diff --git a/b2trackback.php b/b2trackback.php
index 22c17d57f0..fd9275d796 100644
--- a/b2trackback.php
+++ b/b2trackback.php
@@ -6,7 +6,7 @@
 	$resultc = mysql_query($queryc); if ($resultc) {
 	?>
 
-<h2 id="trackback">Trackbacks</h2>
+<h2>Trackbacks</h2>
 
 <p>The URL to TrackBack this entry is:</p>
 <p><em><?php trackback_url() ?></em></p>
diff --git a/b2trackbackpopup.php b/b2trackbackpopup.php
index 33d4b6f907..e160938daa 100644
--- a/b2trackbackpopup.php
+++ b/b2trackbackpopup.php
@@ -4,51 +4,42 @@ $blog=1; include ("blog.header.php"); while($row = mysql_fetch_object($result))
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title><?php echo $blogname ?> - trackbacks on '<?php the_title() ?>'</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="reply-to" content="you@yourdomain.com" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta content="TRUE" name="MSSmartTagsPreventParsing" />
-
-<style type="text/css" media="screen">
-@import url( layout2b.css );
-</style>
-<link rel="stylesheet" type="text/css" media="print" href="b2-include/print.css" />
-<link rel="alternate" type="text/xml" title="XML" href="<?php echo $siteurl ?>/b2rss.php" />
-
+	<title><?php echo $blogname ?> - Trackbacks on "<?php the_title() ?>"</title>
+	
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	
+	<style type="text/css" media="screen">
+		@import url( layout2b.css );
+		body { margin: 3px; }
+	</style>
+	<link rel="stylesheet" type="text/css" media="print" href="b2-include/print.css" />
 </head>
+
 <body>
-<div id="header"><a title="<?php echo $blogname ?>"><?php echo $blogname ?></a></div>
+<h1 id="header"><a title="<?php echo $blogname ?>"><?php echo $blogname ?></a></h1>
 
 <div id="contentcomments">
 
 <div class="storyContent">
 
-<p>
-The URL to TrackBack this entry is:<br />
-&nbsp;&nbsp;<em><?php trackback_url() ?></em>
-</p>
+<p>The URL to TrackBack this entry is:</p>
+<p><em><?php trackback_url() ?></em></p>
+
 
 	<?php /* do not delete this line */ $queryc = "SELECT * FROM $tablecomments WHERE comment_post_ID = $id AND comment_content LIKE '%<trackback />%' ORDER BY comment_date"; $resultc = mysql_query($queryc); if ($resultc) { ?>
 
-<a name="trackbacks"></a>
-<p>&nbsp;</p>
-<div><strong><span style="color: #0099CC">::</span> trackbacks</strong></div>
-<p>&nbsp;</p>
-
+<h2>Trackbacks</h2>
+<ol id="trackbacks">
 	<?php /* this line is b2's motor, do not delete it */ $wxcvbn_tb=0; while($rowc = mysql_fetch_object($resultc)) { $commentdata = get_commentdata($rowc->comment_ID); $wxcvbn_tb++; ?>
 	
 <a name="tb<?php comment_ID() ?>"></a>
 	
 <!-- trackback -->
-<p>
-<?php comment_text() ?>
-<br />
-<strong><span style="color: #0099CC">&middot;</span></strong>
-<em>Tracked on <a href="<?php comment_author_url(); ?>" title="<?php comment_author() ?>"><?php comment_author() ?></a> on <?php comment_date() ?> @ <?php comment_time() ?></em>
-</p>
-<p>&nbsp;</p>
+	<li id="trackback-<?php comment_ID() ?>">
+	<?php comment_text() ?>
+	
+	<p><cite>Tracked on <a href="<?php comment_author_url(); ?>" title="<?php comment_author() ?>"><?php comment_author() ?></a> on <?php comment_date() ?> @ <?php comment_time() ?></cite></p>
+	</li>
 <!-- /trackback -->
 
 
@@ -56,12 +47,13 @@ The URL to TrackBack this entry is:<br />
 	if (!$wxcvbn_tb) { ?>
 
 <!-- this is displayed if there are no trackbacks so far -->
-<p>No Trackback on this post so far.</p>
+	<li>No trackbacks yet.</li>
+
 
 	<?php /* if you delete this the sky will fall on your head */ } ?>
+</ol>
 
-<p>&nbsp;</p>
-<div><b><span style="color: #0099CC">::</span> <a href="javascript:window.close()">close this window</a></b></div>
+<div><strong><a href="javascript:window.close()">close this window</a></strong></div>
 
 	<?php /* if you delete this the sky will fall on your head */ } ?>
 
@@ -71,9 +63,7 @@ The URL to TrackBack this entry is:<br />
 
 </div>
 
-<p class="centerP">
-[powered by <a href="http://cafelog.com" target="_blank"><b>b2</b></a>.]
-</p>
+<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org"><strong>Wordpress</strong></a></cite></p>
 
 
 </body>
diff --git a/layout2b.css b/layout2b.css
index 71b28c5c55..da50fe4e44 100644
--- a/layout2b.css
+++ b/layout2b.css
@@ -25,7 +25,7 @@ h2 {
 	margin-bottom: 2px;
 }
 
-p {
+p, li {
 	line-height: 130%;
 }
 
@@ -116,5 +116,6 @@ p {
 }
 .b2calendaremptycell { }
 .b2calendarlinkpost { 
-    color: #f00; text-decoration: none; 
+    color: #f00;
+	text-decoration: none; 
 }
