diff --git a/b2pingbacks.php b/b2pingbacks.php
index efed31b90e..175268eac2 100644
--- a/b2pingbacks.php
+++ b/b2pingbacks.php
@@ -9,10 +9,9 @@
 
 <!-- you can START editing here -->
 
-<a name="pingbacks"></a>
-<div><strong><span style="color: #0099CC">::</span> pingbacks</strong></div>
-
+<h2>Pingbacks</h2>
 
+<ol id="pingbacks">
 	<?php /* this line is b2's motor, do not delete it */ $wxcvbn_pb=0; while($rowc = mysql_fetch_object($resultc)) { $wxcvbn_pb++; $commentdata = get_commentdata($rowc->comment_ID); ?>
 	
 
@@ -20,13 +19,11 @@
 	
 
 <!-- pingback -->
-<p>
+<li>
 <?php comment_text() ?>
-<br />
-<strong><span style="color: #0099CC">&middot;</span></strong>
-<em>Pingback from <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>
+
+<div><cite>Pingback from <a href="<?php comment_author_url(); ?>" title="<?php comment_author() ?>"><?php comment_author() ?></a> on <?php comment_date() ?> @ <a href="#pb<?php comment_ID(); ?>"></a><?php comment_time() ?></a></cite></div>
+</li>
 <!-- /pingback -->
 
 
@@ -34,13 +31,13 @@
 	if (!$wxcvbn_pb) { ?>
 
 <!-- this is displayed if there are no pingbacks so far -->
-<p>No Pingback on this post so far.</p>
+<li>No pingbacks on this post so far.</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:history.go(-1)">return to the blog</a></b></div>
+<h3><a href="javascript:history.go(-1)">Go back.</a></h3>
 
 
 	<?php /* if you delete this the sky will fall on your head */ } ?>
diff --git a/b2pingbackspopup.php b/b2pingbackspopup.php
index 94767190ee..5bd68229c7 100644
--- a/b2pingbackspopup.php
+++ b/b2pingbackspopup.php
@@ -4,46 +4,39 @@ $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 ?> - pingbacks 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 ?> - pingbacks 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>
 
 </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">
 
 	<?php /* do not delete this line */ $queryc = "SELECT * FROM $tablecomments WHERE comment_post_ID = $id AND comment_content LIKE '%<pingback />%' ORDER BY comment_date"; $resultc = mysql_query($queryc); if ($resultc) { ?>
 
-<a name="pingbacks"></a>
-<p>&nbsp;</p>
-<div><strong><span style="color: #0099CC">::</span> pingbacks</strong></div>
-<p>&nbsp;</p>
+<h2>Pingbacks</h2>
 
+<ol id="pingbacks">
 	<?php /* this line is b2's motor, do not delete it */ $wxcvbn_pb=0; while($rowc = mysql_fetch_object($resultc)) { $commentdata = get_commentdata($rowc->comment_ID); $wxcvbn_pb++; ?>
 	
-<a name="pb<?php comment_ID() ?>"></a>
+<li id="pb<?php comment_ID() ?>">
 	
 <!-- pingback -->
-<p>
 <?php comment_text() ?>
-<br />
-<strong><span style="color: #0099CC">&middot;</span></strong>
-<em>Pingback from <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>
+
+<div><cite>Pingback from <a href="<?php comment_author_url(); ?>" title="<?php comment_author() ?>"><?php comment_author() ?></a> on <?php comment_date() ?> @ <a href="pb<?php comment_ID() ?>"><?php comment_time() ?></a></cite>
+</div>
+
 <!-- /pingback -->
 
 
@@ -51,12 +44,12 @@ $blog=1; include ("blog.header.php"); while($row = mysql_fetch_object($result))
 	if (!$wxcvbn_pb) { ?>
 
 <!-- this is displayed if there are no pingbacks so far -->
-<p>No Pingback on this post so far.</p>
+<li>No Pingbacks on this post so far.</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>
+<h3> <a href="javascript:window.close()">Close this window</a>.</h3>
 
 	<?php /* if you delete this the sky will fall on your head */ } ?>
 
@@ -66,9 +59,8 @@ $blog=1; include ("blog.header.php"); while($row = mysql_fetch_object($result))
 
 </div>
 
-<p class="centerP">
-<cite>Powered by <a href="http://wordpress.org"><strong>Wordpress</strong></a></cite>
-</p>
+
+<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org"><strong>Wordpress</strong></a></cite></p>
 
 
 </body>
