diff --git a/course/lib.php b/course/lib.php
index f583fc036de..f019bb04981 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -634,7 +634,6 @@ function print_admin_links ($siteid, $width=180) {
 function print_course_admin_links($course, $width=180) {
     global $THEME, $CFG;
 
-    echo "<BR>";
     $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
     if (isediting($course->id)) {
         $admindata[]="<A HREF=\"view.php?id=$course->id&edit=off\">".get_string("turneditingoff")."</A>";
diff --git a/course/weeks.php b/course/weeks.php
index d8186b5f457..fed91259880 100644
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -209,7 +209,7 @@
             forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "DESC", false);
             echo "</FONT>";
             print_simple_box_end();
-            echo "<BR>";
+            echo "<BR \>";
         }
         
         // Print all the recent activity
@@ -220,7 +220,7 @@
             print_simple_box_end();
         }
     
-        echo "<BR><IMG SRC=\"../pix/spacer.gif\" WIDTH=210 HEIGHT=1>";
+        echo "<BR \><IMG SRC=\"../pix/spacer.gif\" WIDTH=210 HEIGHT=1>";
     }
 
     echo "</TD></TR></TABLE>\n";
diff --git a/index.php b/index.php
index 4874402b653..323ddbaa8e7 100644
--- a/index.php
+++ b/index.php
@@ -26,7 +26,7 @@
                  "<META NAME=\"Description\" CONTENT=\"".stripslashes(strip_tags($site->summary))."\">",
                  true, "", $headerbutton);
 
-    $side = 165;
+    $side = 175;
 
 ?>
 
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index fee36b81b1d..c261e770771 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -21,10 +21,10 @@ function print_header ($title="", $heading="", $navigation="", $focus="", $meta=
 // $menu - HTML code for a popup menu 
     global $USER, $CFG, $THEME;
 
-    if (file_exists("$CFG->dirroot/theme/$CFG->theme/styles.css")) {
-        $styles = "$CFG->wwwroot/theme/$CFG->theme/styles.css";
+    if (file_exists($CFG->stylesheet)) {
+        $styles = $CFG->stylesheet;
     } else {
-        $styles = "$CFG->wwwroot/theme/standard/styles.css";
+        $styles = "$CFG->wwwroot/theme/standard/styles.php";
     }
 
     if ($navigation == "home") {
@@ -299,12 +299,12 @@ function print_table($table) {
 
     print_simple_box_start("CENTER", "$table->width", "#FFFFFF", 0);
     echo "<TABLE WIDTH=100% BORDER=0 valign=top align=center ";
-    echo " cellpadding=\"$table->cellpadding\" cellspacing=\"$table->cellspacing\">\n";
+    echo " cellpadding=\"$table->cellpadding\" cellspacing=\"$table->cellspacing\" class=\"generaltable\">\n";
 
     if ($table->head) {
         echo "<TR>";
         foreach ($table->head as $key => $heading) {
-            echo "<TH VALIGN=top ".$align[$key].$size[$key]." NOWRAP>$heading</TH>";
+            echo "<TH VALIGN=top ".$align[$key].$size[$key]." NOWRAP class=\"generaltableheader\">$heading</TH>";
         }
         echo "</TR>\n";
     }
@@ -312,7 +312,7 @@ function print_table($table) {
     foreach ($table->data as $row) {
         echo "<TR VALIGN=TOP>";
         foreach ($row as $key => $item) {
-            echo "<TD ".$align[$key].$size[$key].">$item</TD>";
+            echo "<TD ".$align[$key].$size[$key]." class=\"generaltablecell\">$item</TD>";
         }
         echo "</TR>\n";
     }
diff --git a/lib/setup.php b/lib/setup.php
index ab9c5db0c5e..0e04b3b8f4a 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -53,7 +53,7 @@
 
     $CFG->wordlist    = "$CFG->libdir/wordlist.txt";
     $CFG->javascript  = "$CFG->libdir/javascript.php";
-    $CFG->stylesheet  = "$CFG->wwwroot/theme/$CFG->theme/styles.css";
+    $CFG->stylesheet  = "$CFG->wwwroot/theme/$CFG->theme/styles.php";
     $CFG->header      = "$CFG->dirroot/theme/$CFG->theme/header.html";
     $CFG->footer      = "$CFG->dirroot/theme/$CFG->theme/footer.html";
     $CFG->moddata     = "moddata";
diff --git a/login/index_form.html b/login/index_form.html
index 91d174e92c2..41ff81378ec 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -3,16 +3,16 @@
 <TABLE WIDTH="90%" BORDER="0" CELLSPACING="10" CELLPADDING="5" ALIGN="CENTER">
   <TR>
     <? if ($show_instructions) { ?>
-        <TD WIDTH="50%" bgcolor=<?=$THEME->cellheading2?>>
+        <TD WIDTH="50%" bgcolor=<?=$THEME->cellheading2?> class="generaltableheader">
           <P ALIGN="CENTER"><B><FONT SIZE=3><? print_string("returningtosite") ?></FONT></B></P>
         </TD>
-        <TD WIDTH="50%" bgcolor=<?=$THEME->cellheading2?>>
+        <TD WIDTH="50%" bgcolor=<?=$THEME->cellheading2?> class="generaltableheader">
           <P ALIGN="CENTER"><B><FONT SIZE=3><? print_string("firsttime") ?></FONT></B></P>
         </TD>
     <? } ?>
   </TR>
   <TR>
-    <TD WIDTH="50%" VALIGN="TOP" bgcolor="<?=$THEME->cellheading?>"> <FONT SIZE=2> 
+    <TD WIDTH="50%" VALIGN="TOP" bgcolor="<?=$THEME->cellcontent2?>"> <FONT SIZE=2> 
       <P ALIGN="CENTER"><? print_string("loginusing") ?>:<BR>
       (<? print_string("cookiesenabled") ?>)<BR>
 	  <? formerr($errormsg) ?>
@@ -74,7 +74,7 @@
         </BLOCKQUOTE>
       </FONT> </TD>
     <? if ($show_instructions) { ?>
-        <TD WIDTH="50%" VALIGN="TOP" bgcolor="<?=$THEME->cellheading?>">
+        <TD WIDTH="50%" VALIGN="TOP" bgcolor="<?=$THEME->cellcontent2?>">
           <FONT SIZE=2>
           <? switch ($CFG->auth) {
                case "email":             ?>
diff --git a/login/signup_form.php b/login/signup_form.php
index ec82a6a0db4..ac50411200e 100644
--- a/login/signup_form.php
+++ b/login/signup_form.php
@@ -1,5 +1,5 @@
 <CENTER>
-<table cellpadding=20> <tr> <td bgcolor="<?=$THEME->cellheading ?>">
+<table cellpadding=20> <tr> <td bgcolor="<?=$THEME->cellcontent2 ?>">
 
 <form name="form" method="post" action="signup.php">
 <table>