diff --git a/web/html/account.php b/web/html/account.php
index f17ba48c..5c793be2 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -13,7 +13,7 @@ html_header(__('Accounts'));
 # Main page processing here
 #
 echo "<div class=\"pgbox\">\n";
-echo "  <div class=\"pgboxtitle\"><span class=\"f3\">".__("Accounts")."</span></div>\n";
+echo "  <h2>".__("Accounts")."</h2>\n";
 echo "  <div class=\"pgboxbody\">\n";
 
 $action = in_request("Action");
diff --git a/web/html/addvote.php b/web/html/addvote.php
index 4b6c5b5e..fe0047fa 100644
--- a/web/html/addvote.php
+++ b/web/html/addvote.php
@@ -82,7 +82,7 @@ if ($atype == "Trusted User" || $atype == "Developer") {
 <?php endif; ?>
 
 <div class="pgbox">
-<div class="pgboxtitle"><?php print __("Submit a proposal to vote on.") ?></div>
+<h2><?php print __("Submit a proposal to vote on.") ?></h2>
 <div class="pgboxbody">
 <form action='addvote.php' method='post'>
 <p>
diff --git a/web/html/index.php b/web/html/index.php
index 21de99d6..cf569741 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -17,9 +17,7 @@ $dbh = db_connect();
 ?>
 
 <div class="pgbox">
-<div class="pgboxtitle">
-<span class="f3">AUR <?php print __("Home"); ?></span>
-</div>
+<h2>AUR <?php print __("Home"); ?></h2>
 <div class="frontpgboxbody">
 <p>
 
diff --git a/web/html/passreset.php b/web/html/passreset.php
index 98aa685d..2651c98a 100644
--- a/web/html/passreset.php
+++ b/web/html/passreset.php
@@ -85,9 +85,7 @@ html_header(__("Password Reset"));
 ?>
 
 <div class="pgbox">
-	<div class="pgboxtitle">
-		<span class="f3"><?php print __("Password Reset"); ?></span>
-	</div>
+	<h2><?php print __("Password Reset"); ?></h2>
 	<div class="pgboxbody">
 		<?php
 		if ($error) {
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 566890b9..ce43e2ce 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -434,9 +434,7 @@ html_header("Submit");
 <?php endif; ?>
 
 <div class="pgbox">
-	<div class="pgboxtitle">
-		<span class="f3"><?php print __("Submit"); ?></span>
-	</div>
+	<h2><?php print __("Submit"); ?></h2>
 	<div class="pgboxbody">
 	<p><?php echo __("Upload your source packages here. Create source packages with `makepkg --source`.") ?></p>
 
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 102694cd..6764bbf7 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -70,7 +70,7 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($
 
 ?>
 <div class="pgbox">
-	<div class="pgboxtitle"><span class="f3"><?php echo __("Package Details") ?></span></div>
+	<h2><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></h2>
 	<div class="pgboxbody">
 
 	<p>
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index 53d34fe3..3e291e13 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -2,8 +2,8 @@
 
 <div class='pgbox'>
 <form action='packages.php' method='get'>
-<div class='pgboxtitle'>
-	<span class='f3'><?php print __("Search Criteria"); ?></span>
+<h2><?php print __("Search Criteria"); ?></h2>
+<div>
 	<input type='hidden' name='O' value='0' />
 	<input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' />
 	<input type='submit' style='min-width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' />
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 8ef352b0..209a80d4 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -5,9 +5,7 @@
 <?php } else { ?>
 	<form action='packages.php?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>' method='post'>
 		<div class="pgbox">
-			<div class="pgboxtitle">
-				<span class='f3'><?php print __("Package Listing") ?></span>
-			</div>
+			<h2><?php print __("Package Listing") ?></h2>
 
 
 
diff --git a/web/template/tu_details.php b/web/template/tu_details.php
index 52a86561..45c7f9a9 100644
--- a/web/template/tu_details.php
+++ b/web/template/tu_details.php
@@ -1,5 +1,5 @@
 <div class="pgbox">
-<div class="pgboxtitle"><span class="f3"><?php print __("Proposal Details") ?></span></div>
+<h2><?php print __("Proposal Details") ?></h2>
 <div class="pgboxbody">
 <?php
 if ($isrunning == 1) { ?>
@@ -51,9 +51,7 @@ N/A
 <?php
 if (!$isrunning) { ?>
 <div class="pgbox">
-	<div class="pgboxtitle">
-	<span class="f3"><?php echo __('Voters'); ?></span>
-	</div>
+	<h2><?php echo __('Voters'); ?></h2>
 	<div class="pgboxbody">
 	<?php echo $whovoted; ?>
 	</div>
diff --git a/web/template/tu_list.php b/web/template/tu_list.php
index 16dd6901..7eb6f323 100644
--- a/web/template/tu_list.php
+++ b/web/template/tu_list.php
@@ -1,7 +1,5 @@
 <div class="pgbox">
-		<div class="pgboxtitle" style="text-align:right;">
-			<span class='f3'><?php print $type ?></span>
-		</div>
+	<h2><?php print $type ?></h2>
 			<table class='results'>
 				<tr>
 					<th class='header'><span class='f2'><?php print __("Proposal") ?></span></th>