diff --git a/web/html/index.php b/web/html/index.php
index 77d42b56..09e87ccc 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -98,7 +98,8 @@ if (!isset($_COOKIE["AURSID"])) {
 	print "</tr>\n";
 	print "<tr>\n";
 	print "<td colspan='2' align='right'>&nbsp;<br/>";
-	print "<input type='submit' value='".__("Login")."'></td>";
+	print "<input type='submit' class='button'";
+	print " value='".__("Login")."'></td>";
 	print "</tr>\n";
 	print "</table>\n";
 	print "</form>\n";
diff --git a/web/html/pkgsearch.php b/web/html/pkgsearch.php
index 3911b858..b47ee954 100644
--- a/web/html/pkgsearch.php
+++ b/web/html/pkgsearch.php
@@ -1,5 +1,6 @@
 <?
 include("aur.inc");         # access AUR common functions
+include("pkgs.inc");        # package specific functions
 include("search_po.inc");   # use some form of this for i18n support
 set_lang();                 # this sets up the visitor's language
 check_sid();                # see if they're still logged in
@@ -35,6 +36,7 @@ if ($atype && $_REQUEST["Action"] == "Something") {
 	# do the default thing - give the user a search form that they
 	# can specify: location, category, maintainer, name, 'my pkgs'
 	#
+	pkg_search_page();
 }
 print __("Under construction...")."<br/>\n";
 
diff --git a/web/lang/pkgs_po.inc b/web/lang/pkgs_po.inc
new file mode 100644
index 00000000..432ee283
--- /dev/null
+++ b/web/lang/pkgs_po.inc
@@ -0,0 +1,64 @@
+<?
+# INSTRUCTIONS TO TRANSLATORS
+#
+# This file contains the i18n translations for a subset of the
+# Arch Linux User-community Repository (AUR).  This is a PHP
+# script, and as such, you MUST pay great attention to the syntax.
+# If your text contains any double-quotes ("), you MUST escape
+# them with the backslash character (\).
+#
+
+include_once("translator.inc");
+global $_t;
+
+$_t["en"]["Category"] = "Category";
+# $_t["es"]["Category"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Category"] = "--> Traduction française ici. <--";
+# $_t["de"]["Category"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Maintainer"] = "Maintainer";
+# $_t["es"]["Maintainer"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Maintainer"] = "--> Traduction française ici. <--";
+# $_t["de"]["Maintainer"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Name"] = "Name";
+# $_t["es"]["Name"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Name"] = "--> Traduction française ici. <--";
+# $_t["de"]["Name"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Per page"] = "Per page";
+# $_t["es"]["Per page"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Per page"] = "--> Traduction française ici. <--";
+# $_t["de"]["Per page"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Popularity"] = "Popularity";
+# $_t["es"]["Popularity"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Popularity"] = "--> Traduction française ici. <--";
+# $_t["de"]["Popularity"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Sort by"] = "Sort by";
+# $_t["es"]["Sort by"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Sort by"] = "--> Traduction française ici. <--";
+# $_t["de"]["Sort by"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Search Criteria"] = "Search Criteria";
+# $_t["es"]["Search Criteria"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Search Criteria"] = "--> Traduction française ici. <--";
+# $_t["de"]["Search Criteria"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Location"] = "Location";
+# $_t["es"]["Location"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Location"] = "--> Traduction française ici. <--";
+# $_t["de"]["Location"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Keywords"] = "Keywords";
+# $_t["es"]["Keywords"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Keywords"] = "--> Traduction française ici. <--";
+# $_t["de"]["Keywords"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Any"] = "Any";
+# $_t["es"]["Any"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Any"] = "--> Traduction française ici. <--";
+# $_t["de"]["Any"] = "--> Deutsche Übersetzung hier. <--";
+
+?>
\ No newline at end of file
diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc
index 97b84ba5..a7c6da55 100644
--- a/web/lib/acctfuncs.inc
+++ b/web/lib/acctfuncs.inc
@@ -133,9 +133,11 @@ function display_account_form($UTYPE,$A,$U="",$T="",$S="",
 	print "<td>&nbsp;</td>";
 	print "<td align='left'>";
 	if ($A == "UpdateAccount") {
-		print "<input type='submit' value='".__("Update")."'> &nbsp; ";
+		print "<input type='submit' class='button'";
+	 	print "	value='".__("Update")."'> &nbsp; ";
 	} else {
-		print "<input type='submit' value='".__("Create")."'> &nbsp; ";
+		print "<input type='submit' class='button'";
+		print " value='".__("Create")."'> &nbsp; ";
 	}
 	print "<input type='reset' value='".__("Reset")."'>";
 	print "</td>";
@@ -372,8 +374,10 @@ function search_accounts_form() {
 	print "<tr>";
 	print "<td>&nbsp;</td>";
 	print "<td align='left'>&nbsp;<br/>&nbsp;&nbsp;&nbsp;&nbsp;";
-	print "<input type='submit' value='".__("Search'")."> &nbsp; ";
-	print "<input type='reset' value='".__("Reset")."'></td>";
+	print "<input type='submit' class='button'";
+	print " value='".__("Search'")."> &nbsp; ";
+	print "<input type='reset' class='button'";
+	print "	value='".__("Reset")."'></td>";
 	print "</tr>\n";
 
 	print "</table>\n";
@@ -546,7 +550,8 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="",
 				print "<input type='hidden' name='".$ind."'";
 				print " value='".${$ind}."'>\n";
 			}
-			print "<input type='submit' value='&lt;-- ".__("Less")."'>";
+			print "<input type='submit' class='button'";
+			print " value='&lt;-- ".__("Less")."'>";
 			print "</form>\n";
 			print "</td>";
 			print "<td align='right'>";
@@ -559,7 +564,8 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="",
 				print "<input type='hidden' name='".$ind."'";
 				print " value='".${$ind}."'>\n";
 			}
-			print "<input type='submit' value='".__("More")." --&gt;'>";
+			print "<input type='submit' class='button'";
+			print " value='".__("More")." --&gt;'>";
 			print "</form>\n";
 			print "</td>";
 			print "</tr>\n";
diff --git a/web/lib/pkgs.inc b/web/lib/pkgs.inc
new file mode 100644
index 00000000..e26d455d
--- /dev/null
+++ b/web/lib/pkgs.inc
@@ -0,0 +1,150 @@
+<?
+include_once("pkgs_po.inc");
+
+# grab the current list of PackageCategories
+#
+function pkgCategories() {
+	$cats = array();
+	$dbh = db_connect();
+	$q = "SELECT * FROM PackageCategories ";
+	$q.= "ORDER BY Category ASC";
+	$result = db_query($q, $dbh);
+	if ($result) {
+		while ($row = mysql_fetch_row($result)) {
+			$cats[$row[0]] = $row[1];
+		}
+	}
+	return $cats;
+}
+
+# grab the current list of PackageLocations
+#
+function pkgLocations() {
+	$locs = array();
+	$dbh = db_connect();
+	$q = "SELECT * FROM PackageLocations ";
+	$q.= "ORDER BY Location ASC";
+	$result = db_query($q, $dbh);
+	if ($result) {
+		while ($row = mysql_fetch_row($result)) {
+			$locs[$row[0]] = $row[1];
+		}
+	}
+	return $locs;
+}
+
+# display the search form in a boxSoft style
+#
+function pkg_search_page($L="",$C="",$K="",$SB="",$PP="") {
+	# L: PackageLocations.ID
+	# C: PackageCategories.ID
+	# K: Keywords
+	# SB: Sort by
+	# PP: Per page
+	$locs = pkgLocations();
+	$cats = pkgCategories();
+
+	print "<center>\n";
+	print "<table cellspacing='3' class='boxSoft'>\n";
+	print "<tr>\n";
+	print "  <td class='boxSoftTitle' align='right'>\n";
+	print "    <span class='boxSoftTitle'>".__("Search Criteria")."</span>\n";
+	print "  </td>\n";
+	print "</tr>\n";
+	print "<tr>\n";
+	print "  <td class='boxSoft'>\n";
+	print "<form action='/pkgsearch.php' method='post'>\n";
+	print "<input type='hidden' name='Action' value='SearchPkgs'>\n";
+	print "<table style='width: 100%' align='center'>\n";
+
+	print "<tr>\n";
+	print "<td align='right'>\n";
+	print "  <span class='f5'><span class='blue'>".__("Location");
+	print "</span></span><br>\n";
+	print "  <select name='L'>\n";
+	print "  <option value=0> ".__("Any")."\n";
+	while (list($id, $loc) = each($locs)) {
+		if ($L == $id) {
+			print "  <option value=".$id." selected> ".$loc."\n";
+		} else {
+			print "  <option value=".$id."> ".$loc."\n";
+		}
+	}
+	print "  </select>\n";
+	print "</td>\n";
+
+	print "<td align='right'>\n";
+	print "  <span class='f5'><span class='blue'>".__("Category");
+	print "</span></span><br>\n";
+	print "  <select name='C'>\n";
+	print "  <option value=0> ".__("Any")."\n";
+	while (list($id, $cat) = each($cats)) {
+		if ($C == $id) {
+			print "  <option value=".$id." selected> ".$cat."\n";
+		} else {
+			print "  <option value=".$id."> ".$cat."\n";
+		}
+	}
+	print "  </select>\n";
+	print "</td>\n";
+
+	print "<td align='right'>\n";
+	print "  <span class='f5'><span class='blue'>".__("Keywords");
+	print "</span></span><br>\n";
+	print "  <input type='text' name='K' size='35'";
+	print " value='".$K."' maxlength='35'>\n";
+	print "</td>\n";
+
+	print "<td align='right'>\n";
+	print "  <span class='f5'><span class='blue'>".__("Sort by");
+	print "</span></span><br>\n";
+	print "  <select name='SB'>\n";
+	print "  <option value=c";
+	$SB == "c" ? print "selected> " : print "> ";
+	print __("Category")."\n";
+	print "  <option value=l";
+	$SB == "l" ? print "selected> " : print "> ";
+	print __("Location")."\n";
+	print "  <option value=m";
+	$SB == "m" ? print "selected> " : print "> ";
+	print __("Maintainer")."\n";
+	print "  <option value=n";
+	$SB == "n" ? print "selected> " : print "> ";
+	print __("Name")."\n";
+	print "  <option value=p";
+	$SB == "p" ? print "selected> " : print "> ";
+	print __("Popularity")."\n";
+	print "  </select>\n";
+	print "</td>\n";
+
+	print "<td align='right'>\n";
+	print "  <span class='f5'><span class='blue'>".__("Per page");
+	print "</span></span><br>\n";
+	print "  <select name='PP'>\n";
+	print "  <option value=25";
+	$PP == 25 ? print "selected> 25\n" : print "> 25\n";
+	print "  <option value=50";
+	$PP == 50 ? print "selected> 50\n" : print "> 50\n";
+	print "  <option value=75";
+	$PP == 75 ? print "selected> 75\n" : print "> 75\n";
+	print "  <option value=100";
+	$PP == 100 ? print "selected> 100\n" : print "> 100\n";
+	print "  </select>\n";
+	print "</td>\n";
+
+	print "<td align='right' valign='bottom'>&nbsp;\n";
+	print "  <input type='submit' class='button' value='Go'>\n";
+	print "</td>\n";
+
+	print "</tr>\n";
+	print "</table>\n";
+	print "</form>\n";
+	print "  </td>\n";
+	print "</tr>\n";
+	print "</table>\n";
+	print "</center>\n";
+	return;
+}
+
+# vim: ts=2 sw=2 noet ft=php
+?>