diff --git a/wp-admin/b2bookmarklet.php b/wp-admin/b2bookmarklet.php
index 208dba17b..fe6a58127 100644
--- a/wp-admin/b2bookmarklet.php
+++ b/wp-admin/b2bookmarklet.php
@@ -76,9 +76,9 @@ function launchupload() {
 body {
 	background-image: url('<?php
 if ($is_gecko || $is_IE) {
-?>b2-img/bgbookmarklet1.gif<?php
+?>../b2-img/bgbookmarklet1.gif<?php
 } else {
-?>b2-img/bgbookmarklet3.gif<?php
+?>../b2-img/bgbookmarklet3.gif<?php
 }
 ?>');
 	background-repeat: no-repeat;
@@ -89,7 +89,7 @@ if (!$is_NS4) {
 textarea,input,select {
 	background-color: transparent;
 <?php if ($is_gecko || $is_macIE) { ?>
-	background-image: url('b2-img/bgbookmarklet.png');
+	background-image: url('../b2-img/bgbookmarklet.png');
 <?php } elseif ($is_winIE) { ?>
 	background-color: #cccccc;
 	filter: alpha(opacity:80);
@@ -157,8 +157,8 @@ if (($is_gecko) && (!isset($Gecko_bookmarklet_fix))) {
 <td width="40">&nbsp;</td>
 <td align="left" width="415">
 <table cellspacing="0" cellpadding="0">
-<td height="50" width="250" align="left" valign="bottom"><b>Title</b><br />
-<input type="text" name="post_title" size="20" tabindex="1" style="width: 215px;" value="<?php echo stripslashes($popuptitle) ?>" /></td>
+<td height="50" width="250" align="left" valign="bottom"><label>Title<br />
+<input type="text" name="post_title" size="20" tabindex="1" style="width: 215px;" value="<?php echo stripslashes($popuptitle) ?>" /></label></td>
 <td width="165" align="left" valign="bottom"><b>Category</b><br /><?php dropdown_categories(); ?></td>
 </table>
 </td>
@@ -168,7 +168,7 @@ if (($is_gecko) && (!isset($Gecko_bookmarklet_fix))) {
 <td width="415" align="left" height="40">
 <table width="415" cellpadding="0" cellspacing="0">
 <td align="left" valign="bottom"><b>Post</b></td>
-<td align="right" valign="bottom"><?php if ($use_quicktags) include($b2inc."/b2quicktags.php"); ?></td>
+<td align="right" valign="bottom"><?php if ($use_quicktags) include("b2quicktags.php"); ?></td>
 </table>
 <?php
 if ((preg_match("/Nav/",$HTTP_USER_AGENT)) || (preg_match("/Mozilla\/4\.7/",$HTTP_USER_AGENT))) {
@@ -191,7 +191,6 @@ preg_match("/\%u[1-9A-F][1-9A-F][1-9A-F][1-9A-F]/is", $text, $stufftofix);
 
 <table cellpadding="0" cellspacing="0">
 <td align="left" width="90">
-<input type="checkbox" name="post_autobr" value="1" <?php if ($autobr) echo " checked" ?> tabindex="4" class="checkbox" id="autobr" /><label for="autobr"> Auto-BR</label>
 </td>
 <?php if ($pingback) { ?>
 <td align="left">
@@ -201,22 +200,17 @@ preg_match("/\%u[1-9A-F][1-9A-F][1-9A-F][1-9A-F]/is", $text, $stufftofix);
 </table>
 
 <?php if ($use_preview) { ?>
-<input type="button" value="preview" onclick="preview(this.form);" class="search" tabindex="8" />
+<input type="button" value="preview" onClick="preview(this.form);" class="search" tabindex="8" />
 <?php } ?>
 
 <input type="submit" name="submit" value="Blog this !" class="search" tabindex="3" /> 
 
-<?php if ($use_spellchecker) { ?>
-<!--<input type = "button" value = "Spell Check" onclick="var f=document.forms[0]; doSpell( 'en', f.post_content, '<?php echo $spellchecker_url ?>/sproxy.cgi', true);" class="search" tabindex="5" />-->
-<input type="button" value="Spellcheck" onclick="DoSpell
-('post','content','');" class="search" />
-<?php } ?>
 
 <?php if ( ($use_fileupload) && ($user_level >= $fileupload_minlevel) && ((ereg(" ".$user_login." ", $fileupload_allowedusers)) || (trim($fileupload_allowedusers)=="")) ) { ?>
-<input type="button" value="upload a file" onclick="launchupload();" class="search" />
+<input type="button" value="upload a file" onClick="launchupload();" class="search" />
 <?php } ?>
 
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
 <!--
 window.focus();
 //				document.blog.post_content.focus();
@@ -228,8 +222,8 @@ window.focus();
 <tr>
 <td width="40">&nbsp;</td>
 <td width="415" align="left" height="40">
-<b>TrackBack</b> an URL:<br />
-<input type="text" name="trackback_url" style="width: 415px" />
+<label for="trackback"><strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym>:</label> (Seperate multiple URLs with commas.)<br />
+<input type="text" name="trackback" style="width: 415px" />
 </td>
 </tr>
 <?php } ?>
@@ -238,16 +232,7 @@ window.focus();
 
 </form>
 
-<!-- this is for the spellchecker -->
-<form name="SPELLDATA"><div>
-<input name="formname" type="hidden" value="">
-<input name="messagebodyname" type="hidden" value="">
-<input name="subjectname" type="hidden" value="">
-<input name="companyID" type="hidden" value="">
-<input name="language" type="hidden" value="">
-<input name="opener" type="hidden" value="">
-<input name="formaction" type="hidden" value="">
-</div></form>
+</div>
 
 </body>
 </html><?php
diff --git a/wp-admin/b2sidebar.php b/wp-admin/b2sidebar.php
index 49b06904f..fef260752 100644
--- a/wp-admin/b2sidebar.php
+++ b/wp-admin/b2sidebar.php
@@ -30,7 +30,7 @@ if ($a=="b") {
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="stylesheet" href="<?php echo $b2inc; ?>/b2.css" type="text/css" />
+<link rel="stylesheet" href="b2.css" type="text/css" />
 </head>
 <body>
 <br />
@@ -47,8 +47,8 @@ if ($a=="b") {
 
 ?><html>
 <head>
-<title>b2 > sidebar</title>
-<link rel="stylesheet" href="<?php echo $b2inc; ?>/b2.css" type="text/css">
+<title>WordPress > sidebar</title>
+<link rel="stylesheet" href="b2.css" type="text/css">
 <?php
 if ($use_spellchecker) {
 ?><script type="text/javascript" language="javascript">
@@ -73,7 +73,7 @@ window.open("<?php echo $siteurl ?>/b2spell.php","Spell",
 <style type="text/css">
 <!--
 body {
-	background-image: url('b2-img/b2minilogo.png');
+	background-image: url('../b2-img/b2minilogo.png');
 	background-repeat: no-repeat;
 	background-position: 50px 90px;
 	padding: 3px;
@@ -83,7 +83,7 @@ textarea,input,select {
 	font-size: 12px;
 	background-color: transparent;
 <?php if ($is_gecko || $is_macIE) { ?>
-	background-image: url('b2-img/bgbookmarklet.png');
+	background-image: url('../b2-img/bgbookmarklet.png');
 <?php } elseif ($is_winIE) { ?>
 	background-color: #dddddd;
 	filter: alpha(opacity:80);
@@ -106,10 +106,7 @@ textarea,input,select {
 </style>
 </head>
 <body>
-<!--<table width="100%" cellpadding="0" cellspacing="0">
-<td><img src="b2-img/b2minilogo.png"></td>
-</table>
--->
+
 <form name="post" action="b2edit.php" method="POST" accept-charset="iso-8859-1">
 <input type="hidden" name="action" value="post" />
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
diff --git a/wp-admin/b2team.php b/wp-admin/b2team.php
index e56861d9b..25f196995 100644
--- a/wp-admin/b2team.php
+++ b/wp-admin/b2team.php
@@ -109,15 +109,15 @@ default:
 		echo "<tr>\n<!--".$user_data["user_login"]."-->\n";
 		$email = $user_data["user_email"];
 		$url = $user_data["user_url"];
-		$bg1 = ($user_data["user_login"] == $user_login) ? "style=\"background-image: url('b2-img/b2button.gif');\"" : "bgcolor=\"#dddddd\"";
-		$bg2 = ($user_data["user_login"] == $user_login) ? "style=\"background-image: url('b2-img/b2button.gif');\"" : "bgcolor=\"#eeeeee\"";
+		$bg1 = ($user_data["user_login"] == $user_login) ? "style=\"background-image: url('../b2-img/b2button.gif');\"" : "bgcolor=\"#dddddd\"";
+		$bg2 = ($user_data["user_login"] == $user_login) ? "style=\"background-image: url('../b2-img/b2button.gif');\"" : "bgcolor=\"#eeeeee\"";
 		echo "<td $bg1>".$user_data["ID"]."</td>\n";
 		echo "<td $bg2><b><a href=\"javascript:profile(".$user_data["ID"].")\">".$user_data["user_nickname"]."</a></b></td>\n";
 		echo "<td $bg1>".$user_data["user_firstname"]."&nbsp;".$user_data["user_lastname"]."</td>\n";
-		echo "<td $bg2>&nbsp;<a href=\"mailto:$email\" title=\"e-mail: $email\"><img src=\"b2-img/email.gif\" border=\"0\" alt=\"e-mail: $email\" /></a>&nbsp;</td>";
+		echo "<td $bg2>&nbsp;<a href=\"mailto:$email\" title=\"e-mail: $email\"><img src='../b2-img/email.gif' border=\"0\" alt=\"e-mail: $email\" /></a>&nbsp;</td>";
 		echo "<td $bg1>&nbsp;";
 		if (($user_data["user_url"] != "http://") and ($user_data["user_url"] != ""))
-			echo "<a href=\"$url\" target=\"_blank\" title=\"website: $url\"><img src=\"b2-img/url.gif\" border=\"0\" alt=\"website: $url\" /></a>&nbsp;";
+			echo "<a href=\"$url\" target=\"_blank\" title=\"website: $url\"><img src=\"../b2-img/url.gif\" border=\"0\" alt=\"website: $url\" /></a>&nbsp;";
 		echo "</td>\n";
 		echo "<td $bg2>".$user_data["user_level"];
 		if (($user_level >= 2) and ($user_level > ($user_data["user_level"] + 1)))
@@ -162,15 +162,15 @@ default:
 		echo "<tr>\n<!--".$user_data["user_login"]."-->\n";
 		$email = $user_data["user_email"];
 		$url = $user_data["user_url"];
-		$bg1 = ($user_data["user_login"] == $user_login) ? "style=\"background-image: url('b2-img/b2button.gif');\"" : "bgcolor=\"#dddddd\"";
-		$bg2 = ($user_data["user_login"] == $user_login) ? "style=\"background-image: url('b2-img/b2button.gif');\"" : "bgcolor=\"#eeeeee\"";
+		$bg1 = ($user_data["user_login"] == $user_login) ? "style=\"background-image: url('../b2-img/b2button.gif');\"" : "bgcolor=\"#dddddd\"";
+		$bg2 = ($user_data["user_login"] == $user_login) ? "style=\"background-image: url('../b2-img/b2button.gif');\"" : "bgcolor=\"#eeeeee\"";
 		echo "<td $bg1>".$user_data["ID"]."</td>\n";
 		echo "<td $bg2><b><a href=\"javascript:profile(".$user_data["ID"].")\">".$user_data["user_nickname"]."</a></b></td>\n";
 		echo "<td $bg1>".$user_data["user_firstname"]."&nbsp;".$user_data["user_lastname"]."</td>\n";
-		echo "<td $bg1>&nbsp;<a href=\"mailto:".antispambot($email)."\" title=\"e-mail: ".antispambot($email)."\"><img src=\"b2-img/email.gif\" border=\"0\" alt=\"e-mail: ".antispambot($email)."\" /></a>&nbsp;</td>";
+		echo "<td $bg1>&nbsp;<a href=\"mailto:".antispambot($email)."\" title=\"e-mail: ".antispambot($email)."\"><img src=\"../b2-img/email.gif\" border=\"0\" alt=\"e-mail: ".antispambot($email)."\" /></a>&nbsp;</td>";
 		echo "<td $bg2>&nbsp;";
 		if (($user_data["user_url"] != "http://") and ($user_data["user_url"] != ""))
-			echo "<a href=\"$url\" target=\"_blank\" title=\"website: $url\"><img src=\"b2-img/url.gif\" border=\"0\" alt=\"website: $url\" /></a>&nbsp;";
+			echo "<a href=\"$url\" target=\"_blank\" title=\"website: $url\"><img src=\"../b2-img/url.gif\" border=\"0\" alt=\"website: $url\" /></a>&nbsp;";
 		echo "</td>\n";
 		echo "<td $bg1>".$user_data["user_level"];
 		if ($user_level >= 2)