diff --git a/theme/oceanblue/styles_color.css b/theme/oceanblue/styles_color.css
index c719f0e6ee0..7152c57d89e 100644
--- a/theme/oceanblue/styles_color.css
+++ b/theme/oceanblue/styles_color.css
@@ -78,7 +78,9 @@ th.header,
 td.header {
     background-color:#DDDDDD;
 }
-
+table.formtable tbody th {
+    background: none;
+}
 .highlight {
     background-color:#AAFFAA; /* highlight */
 }
@@ -98,14 +100,10 @@ td.header {
 /* notification messages (can be good or bad) */
 .notifyproblem {
     color:#660000;
-    padding: 10px;
-    text-align: center;
 }
 
 .notifysuccess {
     color:#006600;
-    padding: 10px;
-    text-align:center;
 }
 
 .required {
@@ -169,7 +167,6 @@ td.header {
    which use these classes for various things */
 .generaltab, .generaltabinactive {
     background-color:#BBBBBB;
-    
 }
 .generaltabselected {
     background-color:#DDDDDD;
@@ -203,6 +200,10 @@ td.header {
     border-color:#BBBBBB; 
     background-color:#FFFFFF; 
 }
+body#admin-index .c0 {
+    background-color: #FAFAFA;
+}
+
 
 
 /*******************************************************************
@@ -234,6 +235,13 @@ td.header {
 
 .sideblock .list {
 }
+.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;
+}
 
 
 
@@ -340,6 +348,13 @@ table.minicalendar {
     border-color:#000000;
     background-color:#FFFFFF;
 }
+#calendar .maincalendar .filters table,
+#calendar .sidecalendar .filters table,
+.sideblock.block_calendar_month .filters table
+{
+    background-color: #EEEEEE;
+}
+
 
 
 /*******************************************************************
@@ -395,6 +410,10 @@ table.minicalendar {
     border-color:#9999FF; /* borders */
     background: #FFFFFF;
 }
+body#course-user .section {
+    border-color:#AAAAAA;
+}
+
 
 
 /*******************************************************************
@@ -439,14 +458,40 @@ table.message_search_results td {
     color:#000066;
 }
 
-.tablink a:hover {
-    text-decoration: none;
-}
-
 .selected .tablink a:link,
 .selected .tablink a:visited {
     color:#000000;
 }
+.tabs .side {
+    border-color: #AAAAAA;
+}
+.tabrow td {
+    background:url(pix/tab/left.gif) top left no-repeat;
+}
+.tabrow td .tablink {
+    background:url(pix/tab/right.gif) top right no-repeat;
+}
+.tabrow td:hover {
+    background-image:url(pix/tab/left_hover.gif);
+}
+.tabrow td:hover .tablink {
+    background-image:url(pix/tab/right_hover.gif);
+}
+.tabrow .last span {
+    background:url(pix/tab/right_end.gif) top right no-repeat;
+}
+.tabrow .selected {
+    background:url(pix/tab/left_active.gif) top left no-repeat;
+}
+.tabrow .selected .tablink {
+    background:url(pix/tab/right_active.gif) top right no-repeat;
+}
+.tabrow td.selected:hover {
+    background-image:url(pix/tab/left_active_hover.gif);
+}
+.tabrow td.selected:hover .tablink {
+    background-image:url(pix/tab/right_active_hover.gif);
+}
 
 
 /*******************************************************************
@@ -513,10 +558,7 @@ table.message_search_results td {
 }
 
 .forumpost .topic {
-    border-style:solid; /* borders */
-    border-width: 0px;
     border-bottom-color: #EEEEEE;
-    border-bottom-width: 1px;
 }
 
 .forumpost .starter {
@@ -538,20 +580,12 @@ table.message_search_results td {
 .forumthread .unread {
     background: #FFD991;
 }
-
-#mod-forum-view .unread {
-    padding-left: 3px;
-    padding-right: 3px;
-}
-
 #mod-forum-discuss .forumpost {
     background: none;
 }
 
 #mod-forum-discuss .unread .forumpostmessage {
-    border-style: solid; 
     border-color: #FFD991; 
-    border-width: 2px; 
 } 
 
 #mod-forum-discuss .forumthread .unread {
diff --git a/theme/oceanblue/styles_fonts.css b/theme/oceanblue/styles_fonts.css
index dca5b39ccec..16c1b12e735 100644
--- a/theme/oceanblue/styles_fonts.css
+++ b/theme/oceanblue/styles_fonts.css
@@ -8,6 +8,7 @@ Styles are organised into the following sections:
     core
     header
     footer
+
     admin
     blocks
     calendar
@@ -17,6 +18,7 @@ Styles are organised into the following sections:
     message
     tabs
     user
+
     modules
         assignment
         chat
@@ -69,7 +71,6 @@ h4.main,
 h5.main,
 h6.main {
     font-weight:normal;
-    text-align: center;
 }
 
 h1 {
@@ -90,12 +91,6 @@ h4 {
     font-weight:bold;
 }
 
-.sideblock .content h3,
-.sideblock .content h2 {
-    text-align: left;
-    font-size:1.0em;
-}
-
 .errorbox .title {
     font-weight: normal;
     font-size: 1.2em;
@@ -195,17 +190,16 @@ table.formtable tbody th {
 *** Blocks
 *******************************************************************/
 
-.sideblock .header {
-    text-align: left;
+.sideblock .content h3,
+.sideblock .content h2 {
+    font-size:1.0em;
 }
-
 .sideblock .header .commands {
     font-size: 0.75em;
 }
 
 .sideblock .footer {
     font-size:0.75em;
-    text-align:center;
 }
 
 .sideblock .head,
@@ -222,35 +216,23 @@ table.formtable tbody th {
 .rssclientlink {
     font-size:x-small;
 }
-
 .rssclientdescription {
     font-size:x-small;
 }
-
 .sideblock.block_quiz_results h1 {
     font-weight: normal;
     font-size: 1.2em;
 }
-
 .sideblock.block_quiz_results table.grades caption {
     font-weight: normal;
 }
-
-.sideblock.block_quiz_results table.grades .number, .block_quiz_results table.grades .grade {
-    text-align: right;
-}
-
-.sideblock.block_quiz_results {
-    text-align: center;
-}
-
-.sideblock.block_quiz_results table.grades {
-    text-align: left;
-}
-
 .sideblock.block_calendar_upcoming .event .date {
     font-size:0.8em;
-    text-align:right;
+}
+.sideblock.block_calendar_month .cal_popup_caption,
+.sideblock.block_calendar_month .cal_popup_fg div
+{
+    font-size: 0.85em !important;
 }
 
 
@@ -272,7 +254,6 @@ table.formtable tbody th {
 
 #calendar .maincalendar table.calendarmonth td {
     font-size:0.8em;
-    line-height:1.2em;
 }
 
 #calendar div.header
@@ -298,16 +279,6 @@ table.minicalendar {
     font-size:0.85em;
 }
 
-table.minicalendar td {
-    text-align: center;
-}
-
-.sideblock.block_calendar_month .cal_popup_caption,
-.sideblock.block_calendar_month .cal_popup_fg div
-{
-    font-size: 0.85em !important;
-}
-
 .cal_popup_caption {
     font-family:sans-serif;
     font-size:0.8em;
@@ -319,16 +290,6 @@ table.minicalendar td {
     font-size:0.8em;
     font-weight:normal;
 }
-
-table.calendar-controls .previous {
-    text-align: left;
-}
-table.calendar-controls .current {
-    text-align: center;
-}
-table.calendar-controls .next {
-    text-align: right;
-}
 #calendar .maincalendar .calendar-controls .current {
     font-weight: normal;
 }
@@ -340,7 +301,6 @@ table.calendar-controls .next {
 
 .activitydate, .activityhead {
     font-size:x-small;
-    text-align:center;
 }
 
 .weeklydatetext {
@@ -360,6 +320,9 @@ table.calendar-controls .next {
 .courseboxsummary {
     font-size:small;
 }
+#course-view .section .left {
+    font-weight:normal;
+}
 
 
 
@@ -367,6 +330,13 @@ table.calendar-controls .next {
 /*******************************************************************
 *** Doc
 *******************************************************************/
+body#doc-contents h1 {
+    font-size: 1em;
+}
+body#doc-contents ul {
+    font-size: 0.8em;
+}
+
 
 
 /*******************************************************************
@@ -380,7 +350,6 @@ table.calendar-controls .next {
 
 .message_summary_link {
     font-size:small;
-    text-align:right;
 }
 
 .message_link {
@@ -394,7 +363,6 @@ table.calendar-controls .next {
 .message_heading {
     font-size:medium;
     font-weight:normal;
-    text-align:center;
 }
 
 .message_date,
@@ -423,6 +391,9 @@ table.calendar-controls .next {
 /*******************************************************************
 *** Tabs
 *******************************************************************/
+.tablink a:hover {
+    text-decoration: none;
+}
 
 
 /*******************************************************************
@@ -437,10 +408,6 @@ table.calendar-controls .next {
     font-size: 0.7em;
 }
 
-body#user-index #longtimenosee {
-    text-align:center;
-}
-
 
 /*******************************************************************
 *** Modules: Assignment
@@ -458,33 +425,22 @@ body#user-index #longtimenosee {
 *** Modules: Forum
 *******************************************************************/
 
-.forumolddiscuss {
-    text-align:right;
-}
-
-.forumaddnew,
-.forumnodiscuss,
-.noticeboxcontent {
-    text-align:center;
-}
-
 .forumnodiscuss{
     font-weight:normal;
 }
-
-
-
 .forumpost .topic .subject {
     font-weight: normal;
 }
-
 .forumpost .topic .author {
     font-size: 0.8em;
 }
-
 .forumheaderlist .discussion .lastpost {
     font-size: 0.7em;
 }
+body#mod-forum-search .introcontent {
+    font-weight:normal;
+}
+
 
 
 /*******************************************************************
@@ -505,6 +461,13 @@ body#user-index #longtimenosee {
     font-size: 0.7em;
     font-style: italic;
 }
+.entrylowersection .aliases {
+    font-size: 0.8em;
+}
+.entrylowersection .icons,
+.entrylowersection .ratings {
+    font-size: 0.8em;
+}
 
 
 
@@ -524,24 +487,10 @@ body#user-index #longtimenosee {
 *** Modules: Quiz
 *******************************************************************/
 
-.feedbacktext {
-    text-align:right;
-}
-
 .editorhelptext {
     font-size:x-small;
 }
 
-body#mod-quiz-report table#attempts .header {
-    text-align: left;
-}
-body#mod-quiz-report table#attempts .picture {
-    text-align: center !important;
-}
-body#mod-quiz-report .controls {
-    text-align: center;
-}
-
 
 /*******************************************************************
 *** Modules: Resource
diff --git a/theme/oceanblue/styles_layout.css b/theme/oceanblue/styles_layout.css
index f97867c333a..1ee5f665cbb 100644
--- a/theme/oceanblue/styles_layout.css
+++ b/theme/oceanblue/styles_layout.css
@@ -8,6 +8,7 @@ Styles are organised into the following sections:
     core
     header
     footer
+
     admin
     blocks
     calendar
@@ -17,6 +18,7 @@ Styles are organised into the following sections:
     message
     tabs
     user
+
     modules
         assignment
         chat
@@ -40,6 +42,15 @@ Styles are organised into the following sections:
 *** Core
 *******************************************************************/
 
+h1.main,
+h2.main,
+h3.main,
+h4.main,
+h5.main,
+h6.main {
+    text-align: center;
+}
+
 #layout-table {
     width:100%;
     border-spacing:5px;
@@ -78,6 +89,15 @@ table {
 a img {
     border:none;
 }
+.notifyproblem {
+    text-align: center;
+    padding: 10px;
+}
+    
+.notifysuccess {
+    text-align:center;
+    padding: 10px;
+}   
 
 .generalbox {
     border-width:1px;
@@ -150,7 +170,6 @@ table.formtable {
 }
 
 table.formtable tbody th {
-    background: none;
     vertical-align: top;
 }
 
@@ -230,7 +249,6 @@ table.formtable tbody th
 
 body#admin-index .c0 {
     vertical-align: top;
-    background: #FAFAFA;
 } 
 
 body#admin-modules table.generaltable td.cell,
@@ -278,6 +296,11 @@ body#admin-config .confighelp {
 
 
 /* sideblock */
+.sideblock .content h3,
+.sideblock .content h2 {
+    text-align: left;
+}
+
 .sideblock {
     width: 100%;
     margin-bottom:1em;
@@ -288,6 +311,7 @@ body#admin-config .confighelp {
 
 .sideblock .header {
     background-image:url(gradient.jpg);
+    text-align: left;
     padding:4px;
 }
 
@@ -325,15 +349,6 @@ body#admin-config .confighelp {
     border:none;
     border-top:1px solid;
 }
-
-.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.hidden .content {
     display: none;
 }
@@ -348,12 +363,29 @@ body#admin-config .confighelp {
 
 .sideblock .footer {
     margin-top:4px;
+    text-align:center;
 }
-
 .sideblock .header .icon.hide,
 .sideblock .header .icon.edit {
     margin-right: 6px;
 }
+.sideblock.block_quiz_results table.grades .number, .block_quiz_results table.grades .grade {
+    text-align: right;
+}
+
+.sideblock.block_quiz_results {
+    text-align: center;
+}
+
+.sideblock.block_quiz_results table.grades {
+    text-align: left;
+}
+
+.sideblock.block_calendar_upcoming .event .date {
+    text-align:right;
+}
+
+
 
 /* sideblock weblib.php */
 .block_course_summary .content {
@@ -422,6 +454,7 @@ body#admin-config .confighelp {
     height: 5em;
     padding-left: 4px;
     padding-top: 4px;
+    line-height:1.2em;
 }
 
 #calendar .maincalendar table.calendarmonth td,
@@ -430,7 +463,9 @@ table.minicalendar th {
     width:14%;
     vertical-align:top;
 }
-
+table.minicalendar td {
+    text-align: center;
+}
 #calendar .maincalendar table.calendarmonth td table td {
     height: auto;
 }
@@ -450,7 +485,6 @@ table.minicalendar th {
 {
     border-collapse:separate;
     border-spacing: 2px;
-    background-color: #EEEEEE;
     padding: 2px;
     width: 100%;
 }
@@ -609,6 +643,15 @@ table.calendar-controls .next
 {
     width: 12%;
 }
+table.calendar-controls .previous {
+    text-align: left;
+}
+table.calendar-controls .current {
+    text-align: center;
+}
+table.calendar-controls .next {
+    text-align: right;
+}
 
 #calendar .maincalendar .calendar-controls .previous,
 #calendar .maincalendar .calendar-controls .next
@@ -620,6 +663,9 @@ table.calendar-controls .next
 /*******************************************************************
 *** Course
 *******************************************************************/
+.activitydate, .activityhead {
+    text-align:center;
+}
 
 #course-view .section td {
     vertical-align:top;
@@ -642,7 +688,6 @@ table.calendar-controls .next
 #course-view .section .left {
     border-right:0px;
     text-align:center;
-    font-weight:bold;
     width: 1.5em;
 }
 
@@ -711,7 +756,6 @@ body#course-user .section {
     border-width:1px;
     border-style:solid;
     padding:10px;
-    border-color:#AAAAAA;
     margin-bottom: 20px;
 }
 
@@ -719,6 +763,7 @@ body#course-user .section h2 {
     margin-top: 0px;
 }
 
+
 .headingblock {
     background-image:url(gradient.jpg);
     border-width:1px;
@@ -739,7 +784,6 @@ body#course-user .section h2 {
 *******************************************************************/
 
 body#doc-contents h1 {
-    font-size: 1em;
     margin: 1em 0px 0px 0px;
 }
 
@@ -747,7 +791,6 @@ body#doc-contents ul {
     list-style-type: none;
     margin: 0px;
     padding: 0px;
-    font-size: 0.8em;
     width: 90%; /* try it on IE without this and see what happens */
 }
 
@@ -784,6 +827,12 @@ table.message_search_results td {
     border-width:1px;
     border-style:solid;
 }
+.message_summary_link {
+    text-align:right;
+}
+.message_heading {
+    text-align:center;
+}
 
 
 /*******************************************************************
@@ -797,7 +846,6 @@ table.message_search_results td {
 .tabs .side {
     border-style: solid;
     border-width: 0px 0px 1px 0px;
-    border-color: #AAAAAA;
     width: 50%;
 }
 
@@ -809,7 +857,6 @@ table.message_search_results td {
 .tabrow td {
     height:34px;
     padding:0 0 0 14px;
-    background:url(pix/tab/left.gif) top left no-repeat;
 }
 .tabrow th {
     display:none;
@@ -819,37 +866,13 @@ table.message_search_results td {
     height:34px;
     line-height:38px;
     padding:0 14px 0 0;
-    background:url(pix/tab/right.gif) top right no-repeat;
     text-align:center;
     white-space:nowrap;
     text-decoration:none;
 }
-.tabrow td:hover {
-    background-image:url(pix/tab/left_hover.gif);
-}
-.tabrow td:hover .tablink {
-    line-height:32px;
-    background-image:url(pix/tab/right_hover.gif);
-}
-
-.tabrow .last span {
-    display:block;
-    padding:0px 1px 0px 0px;
-    background:url(pix/tab/right_end.gif) top right no-repeat;
-}
-.tabrow .selected {
-    background:url(pix/tab/left_active.gif) top left no-repeat;
-}
 .tabrow .selected .tablink {
-    background:url(pix/tab/right_active.gif) top right no-repeat;
     line-height:38px;
 }
-.tabrow td.selected:hover {
-    background-image:url(pix/tab/left_active_hover.gif);
-}
-.tabrow td.selected:hover .tablink {
-    background-image:url(pix/tab/right_active_hover.gif);
-}
 
 
 /*******************************************************************
@@ -909,6 +932,9 @@ table.groupinfobox {
     width: 100px;
     vertical-align: top;
 }
+body#user-index #longtimenosee {
+    text-align:center;
+}
 
 
 /*******************************************************************
@@ -940,6 +966,9 @@ table.groupinfobox {
 
 .forumpost .topic {
     padding: 4px;
+    border-style:solid; /* borders */
+    border-width: 0px;
+    border-bottom-width: 1px;
 }
 
 .forumpost .commands {
@@ -988,7 +1017,6 @@ body#mod-forum-search .c0 {
 
 body#mod-forum-search .introcontent {
     padding: 15px;
-    font-weight:bold;
 }
 
 .forumolddiscuss {
@@ -1023,6 +1051,23 @@ body#mod-forum-search .introcontent {
 .forumheaderlist .discussion .author {
     white-space: nowrap;
 }
+.forumolddiscuss {
+    text-align:right;
+}
+.forumaddnew,
+.forumnodiscuss,
+.noticeboxcontent {
+    text-align:center;
+}
+#mod-forum-view .unread {
+    padding-left: 3px;
+    padding-right: 3px;
+}
+#mod-forum-discuss .unread .forumpostmessage {
+    border-style: solid;
+    border-width: 2px;
+}
+
 
 /*******************************************************************
 *** Modules: Glossary
@@ -1065,12 +1110,10 @@ body#mod-forum-search .introcontent {
 }
 .entrylowersection .aliases {
     text-align:center;
-    font-size: 0.8em;
 }
 .entrylowersection .icons,
 .entrylowersection .ratings {
     text-align:right;
-    font-size: 0.8em;
     padding-right: 5px;
 }
 .entrylowersection .ratings {
@@ -1194,6 +1237,19 @@ body#mod-quiz-report table#attempts td {
     border-left-style: solid;
     border-right-style: solid;
 }
+.feedbacktext {
+    text-align:right;
+}
+body#mod-quiz-report table#attempts .header {
+    text-align: left;
+}
+body#mod-quiz-report table#attempts .picture {
+    text-align: center !important;
+}
+body#mod-quiz-report .controls {
+    text-align: center;
+}
+
 
 
 /*******************************************************************