diff --git a/theme/formal_white/fw_color.css b/theme/formal_white/fw_color.css
index cb25600bc2d..93f9da6a0d0 100644
--- a/theme/formal_white/fw_color.css
+++ b/theme/formal_white/fw_color.css
@@ -31,6 +31,12 @@ h2 {
   background-color: #E3DFD4;
   border-color:#C6BDA8;
 }
+
+h2.headingblock.header  {
+ background: url(pix/grad/gradient_h.jpg);
+}
+
+
 h3 {
   border-color:#C6BDA8;
 }
@@ -51,8 +57,18 @@ div.header {
 
 }
 
-#layout-table #left-column {
-    /* background-color: yellow; */
+th.header {
+  border-color: #C6BDA8;
+}
+
+#left-column .hidden .header, #right-column .hidden .header {
+  border-color:#C6BDA8;
+}
+
+
+#layout-table #left-column, #layout-table #right-column {
+    background-color: #FEF9F6;
+    border-color:#C6BDA8;
 }
 
 .generalbox {
@@ -66,20 +82,27 @@ div.header {
   /* background-color:#FFFFFF; */
 }
 
-.generaltable .r0 td.cell.c0 {
+/* .generaltable .r0 td.cell.c0 {
  background-color:#C6BDA8; 
+} */
+
+.generaltable .r0 {
+ background-color:#FEF9F6; 
+}
+
+.generaltable .r1 {
+ background-color:#F1EFEB; 
 }
 
 .generaltable .r1 td.cell.c0 {
 border-color:#C6BDA8; 
-background-color:#E3DFD4; 
+/* background-color:#E3DFD4; */
 }
 
-
 .navbar {
   background-color:#C6BDA8;
-  border-color:#666666;
-  /* height: 20px; */
+/*  border-color:#666666;
+  height: 20px; */
   background: url(pix/grad/bg_bread.jpg) repeat-x;
 }
 
@@ -96,7 +119,17 @@ background-color:#E3DFD4;
   color:#C6BDA8; /* highlight missing terms in forum search */
 }
 
+/***
+ *** Roles
+ ***/
 
+.rolecap .inherit.capdefault, .rolecap .allow.capdefault {
+  background-color:#E3DFD4;
+}
+
+#admin-roles-override .capcurrent {
+  background-color:#E3DFD4;
+}
 
 /***
  *** Header
@@ -107,12 +140,18 @@ background-color:#E3DFD4;
   border-color:#C6BDA8;
 }
 
+h1.headermain {
+  background-color: transparent;
+}
+
 /***
  *** Login
  ***/
 
 
-.loginbox .header {
+.loginbox,
+.loginbox.twocolumns .loginpanel,
+.loginbox .subcontent {
   border-color:#C6BDA8;
 }
 
@@ -120,22 +159,17 @@ background-color:#E3DFD4;
   border-color:#C6BDA8;
 }
 
-
 /***
  *** Blocks
  ***/
- 
-.sideblock .header {
-  border-color: #C6BDA8;
-}
-
-.sideblock {
-  border-color:#C6BDA8;
-}
 
 .sideblock .content {
-  border-color:#C6BDA8;
-  background-color:#FEF9F6;
+   background-color:#FEF9F6;
+}
+
+.sideblock .header, .sideblock .header h2 {
+ background: url(pix/grad/gradient_h.jpg) repeat-x;
+ background-color:#E3DFD4; 
 }
 
 .sideblock hr {
@@ -147,14 +181,6 @@ background-color:#E3DFD4;
   border-top-color:#C6BDA8;
 }
 
-.sideblock .header .hide-show img.hide-show-image {
-  background: url('../../pix/t/switch_minus.gif') no-repeat bottom;
-}
-
-.sideblock.hidden .header .hide-show img.hide-show-image {
-  background: url('../../pix/t/switch_plus.gif') no-repeat bottom;
-}
-
 .sideblock .content .post .head .date,
 .sideblock .content .post .head .name {
   color: #000000;
@@ -249,6 +275,15 @@ table.minicalendar tr td.weekend {
   border-color:#C6BDA8;
 }
 
+.coursebox {
+  border-color:#C6BDA8;
+  background: #FEF9F6;
+}
+
+.coursebox .info {
+ background: #EDEAE4;
+}
+
 .categoryboxcontent,
 .courseboxcontent {
   border-color:#C6BDA8;
@@ -371,3 +406,47 @@ table.minicalendar tr td.weekend {
 
 #mod-forum-index .unread {
 }
+
+/***
+ *** Error message
+ ***/
+
+.errorbox {
+/*   color:#ffffff; */
+   border-color:#990000;
+   background-color:#FEF9F6;
+ }
+
+.errorboxcontent {
+   background-color:#FEF9F6;
+}
+ 
+
+/***
+ *** Grade
+ ***/
+
+.grade-report-grader table#user-grades td.cell span.gradepass {
+  background-color: #C2EBBD; 
+}
+
+.grade-report-grader table#user-grades td.cell span.gradefail {
+  background-color: #EBC4BD;
+}
+
+/***
+ *** User
+ ***/
+
+.userinfobox {
+ border-color: #C6BDA8;
+}
+
+.userinfobox .side {
+ background-color: #EDEAE4;
+}
+
+.userinfobox .content {
+ background-color: #FEF9F6;
+}
+
diff --git a/theme/formal_white/fw_layout.css b/theme/formal_white/fw_layout.css
index fbbce8d2887..9fc5d8c76f3 100644
--- a/theme/formal_white/fw_layout.css
+++ b/theme/formal_white/fw_layout.css
@@ -17,10 +17,38 @@ h6.main {
 
 h1, h2, h3, h4 {
   text-align: left;
-  padding-left: 5px;
+}
+
+h1 {
+  padding: 6px;
+}
+
+h2 {
+  padding: 4px;
+
+}
+
+h3 {
+  padding: 3px;
+
+}
+
+#layout-table #left-column, #layout-table #right-column {
+    border: 1px solid;
+    padding: 0px;
+}
+
+#left-column .hidden .header, #right-column .hidden .header {
+border-bottom-style:dashed;
+border-bottom-width:1px;
+}
+
+
+#content {
+clear:both;
 }
   
-h1, h2, h3 {
+h1, h2, h3, th.header {
   border-width: 1px;
   border-style: solid; 
 }
@@ -30,8 +58,17 @@ h4 {
   border-bottom-width:1px; 
 }
 
-input {
-  
+input, select {
+  padding: 0px;
+}
+#layout-table #middle-column{
+  vertical-align:top;
+  padding-left:6px;
+  padding-right:6px;
+}
+.sitetopic {
+  padding:4px;
+  margin: 0px;
 }
 
 .generaltable {
@@ -48,6 +85,25 @@ input {
   border-style:solid;
 }
 
+.clearfix { 
+ min-width: 0; 
+ /* overflow: hidden; */ 
+}
+
+.clearfix:after {
+  /* content: "<!-- -->";  */
+  content: "."; 
+  display: block; 
+  height: 0; 
+  clear: both; 
+  visibility: hidden;
+}
+
+/* Hides from IE-mac \*/
+* html .clearfix {height: 1%;}
+.clearfix {display: block;}
+/* End hide from IE-mac */
+
 /***
  *** Header
  ***/
@@ -57,7 +113,6 @@ input {
   height:100px;
   border-width:1px;
   border-style:solid;
-  
 }
 
 #header {
@@ -66,8 +121,11 @@ input {
   border-style:solid;
 }
 
-.headermain {
- border-width: 0px;
+.headermain, h1.headermain {
+  float:left;
+  margin:0%;
+  padding:0%;
+  border-width: 0px;
 }
 
 .headermenu {
@@ -76,23 +134,51 @@ input {
 }
 
 .navbar {
-  margin-right: 5px;
-  width: 100%; 
-  padding:0px;
-  height: 25px;
-  border-width:1px;
-  border-style:solid;
+  width:100%;
+  padding:3px 0.5em;
+  border-width:0px;
+/*  border-style:solid; */
+}
+
+div.navbar {
+  width: auto;
+}
+
+table.navbar {
+  width: 100%;
+}
+
+.navbar .navbutton form {
+  float: left;
 }
 
-.breadcrumb {
- padding-top: 3px;
- padding-left: 3px;
- }
- 
 .navbar .navbutton {
-  padding-right: 3px;
-  padding-top: 2px;
- }
+  margin-top: 3px;
+}
+
+.navbar .breadcrumb {
+  float:left;
+  margin:0.2em 0em;
+}
+
+.breadcrumb ul {
+  padding:0%;
+  margin:0%;
+  text-indent:0%;
+  list-style:none;
+}
+.breadcrumb li {
+  display:inline;
+}
+
+.navbar .navbutton,
+.navbar .menu {
+  float:right;
+}
+
+#footer .navbar {
+  margin-top: 4em;
+}
 
 
 /***
@@ -101,7 +187,7 @@ input {
 
 TABLE.loginbox {
   margin-top: 40px;
-  }
+}
 
 .loginbox .header {
   border-width:1px;
@@ -126,18 +212,26 @@ TABLE.loginbox {
 
  
 #footer p.helplink {
- margin-bottom: -25px;
+ margin-bottom: 0px;
 }
 
 
-
 /***
  *** Blocks
  ***/
- 
- .sideblock .header h2 {
+.sideblock, .sideblock .header, .sideblock .content  {
   border-width: 0px;
  }
+
+
+.sideblock .header h2 {
+  border-width: 0px;
+  padding-top: 4px;
+ }
+
+.sideblock .header .hide-show-image {
+ padding-top: 4px;
+}
  
 .sideblock .footer {
   border-top-width:1px;
@@ -218,6 +312,28 @@ table.calendarmonth tr td  {
   border-style: dashed;
 }
 
-#content {
-  clear: both;
-}
\ No newline at end of file
+#course-view .section td.content ul.section.img-text {
+	line-height: 22px;
+}
+
+#course-view .section td.content ul.section.img-text li.activity.label {
+	line-height: 16px;
+	margin-bottom: 5px;
+}
+
+.coursebox .info .name {
+  padding-bottom: 5px;
+  }
+
+.tabrow0 { 
+   padding-top: 4px; 
+} 
+
+/***
+ *** Error message
+ ***/
+
+.errorbox {
+/*   color:#ffffff; */
+   border-width: 2px;
+}