diff --git a/theme/oceanblue/styles_color.css b/theme/oceanblue/styles_color.css
index 2934f8e8d7a..2b6af2ec8ed 100644
--- a/theme/oceanblue/styles_color.css
+++ b/theme/oceanblue/styles_color.css
@@ -1,29 +1,47 @@
-/************************************************* 
-***
-*** color
-***
-**************************************************/
+/*******************************************************************
+styles_color.css
+    
+This CSS file contains all color definitions like background-color,
+font-color, border-color etc.
 
-/*************************************************
-***
-*** This CSS file contains all color definitions
-*** like background-color, font-color,
-*** border-color etc.
-***
-*** Shortindex:
-*** basic and general styles
-*** header and footer styles
-*** content styles (alphabetically)
-*** admin, course, activities, calendar, blocks
-*** 
-*** Please sort new styles for existing content
-*** into the appropriate part of this CSS file.
-*** Styles for new Blocks or Activities please
-*** place at the end.
-*** Wouldn't the alphabetical order be better?
-***
-**************************************************/
+Styles are organised into the following sections:
 
+    core
+    header
+    footer
+
+    admin
+    blocks
+    calendar
+    course
+    doc
+    login
+    message
+    tabs
+    user
+
+    modules
+        assignment
+        chat
+        choice
+        forum
+        glossary
+        journal
+        label
+        lesson
+        quiz
+        resource
+        scorm
+        survey
+        wiki
+        workshop
+
+*******************************************************************/
+
+
+/*******************************************************************
+*** Core
+*******************************************************************/
 
 /* basic styles */
 a:link,
@@ -33,7 +51,7 @@ a:visited {
 
 a.dimmed:link,
 a.dimmed:visited {
-    color:#666666; /* hidden */
+    color:#AAAAAA;
 }
 
 a:hover {
@@ -50,21 +68,6 @@ a.autolink.glossary:hover {
     cursor: help;
 }
 
-.tablink a:link,
-.tablink a:visited {
-    color:#000066;
-}
-
-.tablink a:hover {
-    text-decoration: none;
-}
-
-.selected .tablink a:link,
-.selected .tablink a:visited {
-    color:#000000;
-}
-
-
 /* general styles */
 body {
     background-color:#AAAAFF;
@@ -109,18 +112,6 @@ td.header {
     background-color:#DDDDDD;
 }
 
-
-/* header styles */
-
-
-/* footer styles */
-
-
-/*****************************
-***
-*** content styles
-***
-******************************/
 /* many places */
 .generalbox {
     border-color:#9999FF; /* borders */
@@ -129,15 +120,78 @@ td.header {
     border-color:#9999FF; /* borders */
 }
 .feedbackbox {
-    border-color:#9999FF; /* borders */
+    border-color: #888888; /* borders */
 }
 .feedbackby {
     background-color:#BBBBBB;
 }
-.userpicture {
-    background:#EEEEEE; 
+
+.noticebox {
+    border-color:#9999FF; /* borders */
 }
 
+.errorbox {
+    color:#ffffff;
+    border-color:#660000;
+    background-color:#990000;
+}
+
+/* weblib.php table */
+.tabledivider {
+    border-color:#9999FF; /* borders */
+}
+
+/* entry-page index.php */ 
+.sitetopic {
+    background-color:#FFFFFF; /* cellheading */
+    border-color:#9999FF; /* borders */
+}
+
+.dimmed_text {
+    color:#AAAAAA;
+}
+
+.teacheronly {
+    color:#990000;
+}
+
+.unread {
+    background: #FFD991;
+} 
+
+.censoredtext {
+    color:#000000;
+    background:#000000;
+}
+
+
+/* kept for backward compatibility with some non-standard modules
+   which use these classes for various things */
+.generaltab, .generaltabinactive {
+    background-color:#BBBBBB;
+    
+}
+.generaltabselected {
+    background-color:#DDDDDD;
+}
+.generaltabinactive {
+    color:#CCCCCC;
+}
+
+
+
+/*******************************************************************
+*** Header
+*******************************************************************/
+
+/*******************************************************************
+*** Footer
+*******************************************************************/
+
+/*******************************************************************
+*** Admin
+*******************************************************************/
+
 .admin .generalboxcontent {
     background-color:#EEEEEE; 
 }
@@ -150,302 +204,42 @@ td.header {
     background-color:#FFFFFF; 
 }
 
-.noticebox {
-    border-color:#9999FF; /* borders */
+
+/*******************************************************************
+*** Blocks
+*******************************************************************/
+
+.rssclientlink {
+    border-top-color:#DDDDDD;
 }
 
-.errorbox {
-    color:#ffffff;
-    border-color:#660000;
-    background-color:#990000;
-}
-
-.loginbox .content {
-    border-color:#DDDDDD; /* borders */
-}
-
-/* weblib.php table */
-.tabledivider {
-    border-color:#9999FF; /* borders */
-}
-
-
-/* entry-page index.php */ 
-.sitetopic {
-    background-color:#FFFFFF; /* cellheading */
-    border-color:#9999FF; /* borders */
-}
-
-
-/*****************************
-***
-*** Admin
-***
-******************************/
-/* admin, calednder, course */
-.dimmed_text {
-    color:#666666;
-}
-
-
-/*****************************
-***
-*** Course
-***
-******************************/
-/* course, entry-page, login */
-.headingblock {
-    border-color:#9999FF; /* borders */
-}
-
-
-/* course */
-.headingblock .outline {
-    border-color:#9999FF; /* borders */
-}
-
-#course-view .section td {
-    border-color:#DDDDDD;
-}
-
-#course-view .section .content {
-}
-
-#course-view .section .side {
-    background: #EEEEEE;
-}
-
-#course-view .section .left {
-}
-
-#course-view .section .right {
-}
-
-#course-view .current .side{
-    background: #FFD991;
-}
-
-#course-view .topics {
-}
-
-#course-view .weeks {
-}
-
-#course-view .section .spacer {
-}
-
-#course-view .section .weekdates {
-    color:#666666;
-}
-
-.categoryboxcontent,
-.courseboxcontent {
-    border-color:#9999FF; /* borders */
-    background: #FFFFFF;
-}
-
-
-/* user */
-
-.userinfobox {
-    border-color: #DDDDDD;
-    background-color: #F7F7F7;
-}
-
-
-
-/*****************************
-***
-*** Activities
-***
-******************************/
-/* assignment, forum, glossary */
-.forumheaderlist,
-.forumpost {
-    border-color:#9999FF; /* borders */
-}
-
-.forumpost .content {
-    background: #FFFFFF;
-}
-
-.forumpost .left {
-    background:#EEEEEE; 
-}
-
-.forumpost .topic {
-    border-style:solid; /* borders */
-    border-width: 0px;
-    border-bottom-color: #EEEEEE;
-    border-bottom-width: 1px;
-}
-
-.forumpost .starter {
-    background:#DDDDDD; 
-}
-
-.forumheaderlist .discussion .starter {
-    background:#DDDDDD; 
-}
-
-.forumheaderlist td {
-    border-color: #FFFFFF;
-}
-
-
-/* survey */
-#mod-survey-view .r0 {
-    background-color: #EEEEEE;
-}
-#mod-survey-view .r1 {
-    background-color: #DDDDDD;
-}
-
-
-/* assignment */
-.assignmentsubmission {
-}
-
-.assignmentnew .assignmentfeedback{
-    background-color:#DDDDDD; /* cellheading2 */
-}   
-    
-.assignmentold .assignmentfeedback{
-    background-color:#BBBBBB; /* cellheading */
-}
-
-.assignmentheading {
-    background-color:#BBBBBB; /* cellheading */
-}
-
-
-/* workshop */
-
-.workshoppostpicture {
-    background-color:#FEE6B9; /* cellcontent2 */
-}
-
-.workshopassessmentheading {
-    background-color:#DDDDDD; /* cellheading2 */
-}
-
-
-/* glossary, wiki */
-.entryboxheader {
-    border-color: #BBBBBB;
-}
-
-.entrybox {
-    border-color: #BBBBBB;
-}
-
-.entry {
-}
-
-.glossarypost {
-    border-color: #DDDDDD;
-}
-
-.glossarypost .entryheader,
-.glossarypost .entryapproval,
-.glossarypost .picture,
-.glossarypost .entryattachment,
-.glossarypost .left {
-    background-color: #F0F0F0;
-}
-
-.glossarycomment {
-    border-color: #DDDDDD;
-}
-
-.glossarycomment .entryheader,
-.glossarycomment .picture,
-.glossarycomment .left {
-    background-color: #F0F0F0;
-
-}
-
-.generaltab, .generaltabinactive {
-    background-color:#BBBBBB; /* cellheading */
-}
-
-.generaltabselected {
-    background-color:#DDDDDD; /* cellheading2 */
-}
-
-.generaltabinactive {
-    color:#CCCCCC;
-}
-
-
-
-#mod-glossary-report .generalbox .teacher {
-    background: #F0F0F0;
-}
-
-
-
-
-/* lang, forum */
-.teacheronly {
-    color:#990000;
-}
-
-.sideblock .post .head {
+.rssclientdescription {
     color:#555555;
 }
 
-.forumthread .unread {
-    background: #FFD991;
-}
-
-.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 {
-} 
-
-#mod-forum-index .unread {
-}
-
-/* message */
-table.message_search_results td {
+.sideblock {
     border-color:#9999FF; /* borders */
 }
 
-
-/* quiz */
-
-body#mod-quiz-report table#attempts td {
-    border-color: #dddddd;
+.sideblock .header {
 }
-body#mod-quiz-report table#attempts .r1 {
-    background-color: #eeeeee;
+
+.sideblock .content {
+    background-color:#FCFCFC;
+}
+
+.sideblock .content hr {
+    border-top-color:#999999;
+}
+
+.sideblock .list {
 }
 
 
 
-/*****************************
-***
+/*******************************************************************
 *** Calendar
-***
-******************************/
+*******************************************************************/
 
 #calendar .maincalendar,
 #calendar .sidecalendar
@@ -454,15 +248,15 @@ body#mod-quiz-report table#attempts .r1 {
 }
 
 #calendar .maincalendar table.calendarmonth th {
-    border-color: #555555;
+    border-color: #000000;
 }
 
 table.minicalendar {
-    border-color:#DDDDDD;
+    border-color:#9999FF;
 }
 
 #calendar .maincalendar .eventlist .event {
-    border-color:#DDDDDD;
+    border-color:#9999FF;
 }
 
 #calendar .maincalendar .eventlist .event .topic,
@@ -535,7 +329,7 @@ table.minicalendar {
 
 #calendar .today,
 .minicalendar .today {
-    border-color:#555555 !important;
+    border-color:#000000 !important;
 }
 
 .cal_popup_fg {
@@ -543,47 +337,87 @@ table.minicalendar {
 }
 
 .cal_popup_bg {
-    border-color:#555555;
+    border-color:#000000;
     background-color:#FFFFFF;
 }
 
 
-/*****************************
-***
-*** Blocks
-***
-******************************/
-/* block_rss_client.php */
-.rssclientlink {
-    border-top-color:#DDDDDD;
-}
+/*******************************************************************
+*** Course
+*******************************************************************/
 
-.rssclientdescription {
-    color:#555555;
-}
-
-
-/* sideblock */
-/* calendar, weblib.php, wiki */
-.sideblock {
+/* course, entry-page, login */
+.headingblock {
     border-color:#9999FF; /* borders */
 }
-.sideblock .header {
+
+/* course */
+.headingblock .outline {
+    border-color:#9999FF; /* borders */
 }
 
-.sideblock .content {
-    background-color:#FCFCFC;
+#course-view .section td {
+    border-color:#9999FF;
 }
 
-.sideblock .content hr {
-    border-top-color:#999999;
+#course-view .section .content {
 }
 
-.sideblock .list {
+#course-view .section .side {
+    background: #EEEEEE;
+}
+
+#course-view .section .left {
+}
+
+#course-view .section .right {
+}
+
+#course-view .current .side{
+    background: #FFD991;
+}
+
+#course-view .topics {
+}
+
+#course-view .weeks {
+}
+
+#course-view .section .spacer {
+}
+
+#course-view .section .weekdates {
+    color:#AAAAAA;
+}
+
+.categoryboxcontent,
+.courseboxcontent {
+    border-color:#9999FF; /* borders */
+    background: #FFFFFF;
 }
 
 
-/* Messaging */
+/*******************************************************************
+*** Doc
+*******************************************************************/
+
+/*******************************************************************
+*** Login
+*******************************************************************/
+
+.loginbox .content {
+    border-color:#9999FF; /* borders */
+}
+
+
+/*******************************************************************
+*** Message
+*******************************************************************/
+
+table.message_search_results td {
+    border-color:#9999FF; /* borders */
+}
+
 .message .author {
     color: #999999;
 }
@@ -595,7 +429,244 @@ table.minicalendar {
 .message .content {
 }
 
-.censoredtext {
-    color:#000000;
-    background:#000000;
+
+/*******************************************************************
+*** Tabs
+*******************************************************************/
+
+.tablink a:link,
+.tablink a:visited {
+    color:#000066;
 }
+
+.tablink a:hover {
+    text-decoration: none;
+}
+
+.selected .tablink a:link,
+.selected .tablink a:visited {
+    color:#000000;
+}
+
+
+/*******************************************************************
+*** User
+*******************************************************************/
+
+.userpicture {
+    background:#EEEEEE; 
+}
+
+.userinfobox {
+    border-color: #DDDDDD;
+    background-color: #F7F7F7;
+}
+
+
+/*******************************************************************
+*** Modules: Assignment
+*******************************************************************/
+
+.assignmentsubmission {
+}
+
+.assignmentnew .assignmentfeedback{
+    background-color:#DDDDDD; /* cellheading2 */
+}   
+    
+.assignmentold .assignmentfeedback{
+    background-color:#BBBBBB; /* cellheading */
+}
+
+.assignmentheading {
+    background-color:#BBBBBB; /* cellheading */
+}
+
+
+/*******************************************************************
+*** Modules: Chat
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Choice
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Forum
+*******************************************************************/
+
+.forumheaderlist,
+.forumpost {
+    border-color:#9999FF; /* borders */
+}
+
+.forumpost .content {
+    background: #FFFFFF;
+}
+
+.forumpost .left {
+    background:#EEEEEE; 
+}
+
+.forumpost .topic {
+    border-style:solid; /* borders */
+    border-width: 0px;
+    border-bottom-color: #EEEEEE;
+    border-bottom-width: 1px;
+}
+
+.forumpost .starter {
+    background:#DDDDDD; 
+}
+
+.forumheaderlist .discussion .starter {
+    background:#DDDDDD; 
+}
+
+.forumheaderlist td {
+    border-color: #FFFFFF;
+}
+
+.sideblock .post .head {
+    color:#555555;
+}
+
+.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 {
+} 
+
+#mod-forum-index .unread {
+}
+
+
+/*******************************************************************
+*** Modules: Glossary
+*******************************************************************/
+
+.entryboxheader {
+    border-color: #BBBBBB;
+}
+
+.entrybox {
+    border-color: #BBBBBB;
+}
+
+.entry {
+}
+
+.glossarypost {
+    border-color: #DDDDDD;
+}
+
+.glossarypost .entryheader,
+.glossarypost .entryapproval,
+.glossarypost .picture,
+.glossarypost .entryattachment,
+.glossarypost .left {
+    background-color: #F0F0F0;
+}
+
+.glossarycomment {
+    border-color: #DDDDDD;
+}
+
+.glossarycomment .entryheader,
+.glossarycomment .picture,
+.glossarycomment .left {
+    background-color: #F0F0F0;
+
+}
+
+#mod-glossary-report .generalbox .teacher {
+    background: #F0F0F0;
+}
+
+.categoryheader {
+    background-color: #dddddd;
+}
+
+.glossaryformatheader {
+    background-color: #dddddd;
+}
+
+
+/*******************************************************************
+*** Modules: Journal
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Label
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Lesson
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Quiz
+*******************************************************************/
+
+body#mod-quiz-report table#attempts td {
+    border-color: #dddddd;
+}
+body#mod-quiz-report table#attempts .r1 {
+    background-color: #eeeeee;
+}
+
+
+/*******************************************************************
+*** Modules: Resource
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Scorm
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Survey
+*******************************************************************/
+
+#mod-survey-view .r0 {
+    background-color: #EEEEEE;
+}
+#mod-survey-view .r1 {
+    background-color: #DDDDDD;
+}
+
+
+/*******************************************************************
+*** Modules: Wiki
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Workshop
+*******************************************************************/
+
+.workshoppostpicture {
+    background-color:#FEE6B9; /* cellcontent2 */
+}
+
+.workshopassessmentheading {
+    background-color:#DDDDDD; /* cellheading2 */
+}
+
+
+
diff --git a/theme/oceanblue/styles_fonts.css b/theme/oceanblue/styles_fonts.css
index bd16664ded2..dca5b39ccec 100644
--- a/theme/oceanblue/styles_fonts.css
+++ b/theme/oceanblue/styles_fonts.css
@@ -1,39 +1,49 @@
-/************************************************* 
-***
-*** fonts
-***
-**************************************************/
+/*******************************************************************
+styles_color.css
+    
+This CSS file contains all font definitions like family, size,
+weight, text-align, letter-spacing etc.
 
-/*************************************************
-***
-*** This CSS file contains all font definitions
-*** like family, size, weight,
-*** text-align, letter-spacing
-*** etc.
-***
-*** Shortindex:
-*** basic and general styles
-*** header and footer styles
-*** content styles (alphabetically)
-*** admin, course, activities, calendar, blocks
-*** 
-*** Please sort new styles for existing content
-*** into the appropriate part of this CSS file.
-*** Styles for new Blocks or Activities please
-*** place at the end.
-*** Wouldn't the alphabetical order be better?
-***
-**************************************************/
+Styles are organised into the following sections:
+    core
+    header
+    footer
+    admin
+    blocks
+    calendar
+    course
+    doc
+    login
+    message
+    tabs
+    user
+    modules
+        assignment
+        chat
+        choice
+        forum
+        glossary
+        journal
+        label
+        lesson
+        quiz
+        resource
+        scorm
+        survey
+        wiki
+        workshop
+
+*******************************************************************/
 
 
-/* basic styles */
+/*******************************************************************
+*** Core
+*******************************************************************/
 
 .clearer {
     font-size:1px;
 }
 
-
-/* general styles */
 body, td, th, li {
     font-family:"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
     font-size:0.95em;
@@ -86,7 +96,59 @@ h4 {
     font-size:1.0em;
 }
 
-/* header styles */
+.errorbox .title {
+    font-weight: normal;
+    font-size: 1.2em;
+    text-align: center;
+}
+
+/* paging bar */
+.pagingbar .title {
+    font-weight: normal;
+}
+.pagingbar .thispage {
+    font-weight: normal;
+}
+
+
+/* index, admin, course, lang, adodb, quiz */
+.categoryname,
+.categorynumber {
+    font-size:larger;
+    font-weight:normal;
+}
+
+
+
+.helplink {
+    font-size:0.8em;
+}
+
+.headingblock .title {
+    font-weight: normal;
+}
+.headingblock .link {
+    font-size: 0.9em;
+    font-weight: normal;
+}
+
+.files .file {
+    font-size: 0.9em;
+}
+
+.files .folder {
+    font-size: 0.9em;
+}
+
+.files .folder .size {
+    font-weight: normal;
+}
+
+
+/*******************************************************************
+*** Header
+*******************************************************************/
+
 .headermain {
     font-weight:normal;
 }
@@ -109,38 +171,19 @@ h4 {
     font-size:x-small;
 }
 
-/* footer styles */
+
+/*******************************************************************
+*** Footer
+*******************************************************************/
+
 .homelink {
     font-size:x-small;
 }
 
 
-/*****************************
-***
-*** content styles
-***
-******************************/
-/* many places */
-
-.errorbox .title {
-    font-weight: normal;
-    font-size: 1.2em;
-    text-align: center;
-}
-
-/* paging bar */
-.pagingbar .title {
-    font-weight: normal;
-}
-.pagingbar .thispage {
-    font-weight: normal;
-}
-
-/*****************************
-***
+/*******************************************************************
 *** Admin
-***
-******************************/
+*******************************************************************/
 
 table.formtable tbody th {
     font-weight: normal;
@@ -148,165 +191,72 @@ table.formtable tbody th {
 }
 
 
-/*****************************
-***
-*** Course
-***
-******************************/
-/* course */
-.activitydate, .activityhead {
-    font-size:x-small;
-    text-align:center;
-}
+/*******************************************************************
+*** Blocks
+*******************************************************************/
 
-.weeklydatetext {
-    font-size:medium;
-    font-weight:normal;
-}
-
-.courseboxinfo {
-    font-size:medium;
-}
-
-.courseboxteachers,
-.courseboxcost {
-    font-size:smaller;
-}
-
-.courseboxsummary {
-    font-size:small;
-}
-
-
-/* user */
-.userinfobox .username {
-    font-weight: normal;
-}
-
-.userinfobox .links {
-    font-size: 0.7em;
-}
-
-
-
-/*****************************
-***
-*** Activities
-***
-******************************/
-/* index, admin, course, lang, adodb, quiz */
-.categoryname,
-.categorynumber {
-    font-size:larger;
-    font-weight:normal;
-}
-
-
-/* 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;
-}
-
-
-
-/* message */
-.message_summary_link {
-    font-size:small;
-    text-align:right;
-}
-
-.message_link {
-    font-size:x-small;
-}
-
-.message_form {
-    font-size:0.78em;
-}
-
-.message_heading {
-    font-size:medium;
-    font-weight:normal;
-    text-align:center;
-}
-
-.message_date,
-.message_contact,
-.message_summary {
-    font-size:small;
-}
-
-.message_small_note, 
-.message_pix {
-    font-size:x-small;
-}
-
-
-/* quiz */
-.feedbacktext {
-    text-align:right;
-}
-
-.editorhelptext {
-    font-size:x-small;
-}
-
-body#mod-quiz-report table#attempts .header {
+.sideblock .header {
     text-align: left;
 }
-body#mod-quiz-report table#attempts .picture {
-    text-align: center !important;
+
+.sideblock .header .commands {
+    font-size: 0.75em;
 }
-body#mod-quiz-report .controls {
+
+.sideblock .footer {
+    font-size:0.75em;
+    text-align:center;
+}
+
+.sideblock .head,
+.sideblock .info {
+    font-size: 0.85em;
+}
+
+.sideblock .date {
+    font-style: italic;
+}
+
+
+/* block_rss_client.php */
+.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;
+}
 
-/* glossary */
-.glossarypost .commands {
-    font-size: 0.7em;
-}
-.glossarypost .entryheader .author {
-    font-size: 0.7em;
-    font-style: italic;
-}
-.concept {
-    font-weight: normal;
-}
-.glossarycomment .time {
-    font-size: 0.7em;
-    font-style: italic;
+.sideblock.block_calendar_upcoming .event .date {
+    font-size:0.8em;
+    text-align:right;
 }
 
 
-/*****************************
-***
+/*******************************************************************
 *** Calendar
-***
-******************************/
+*******************************************************************/
 
 #calendar .maincalendar .eventlist .event .referer {
     font-weight:normal;
@@ -383,82 +333,80 @@ table.calendar-controls .next {
     font-weight: normal;
 }
 
-/*****************************
-***
-*** Blocks
-***
-******************************/
 
-.sideblock .header {
-    text-align: left;
-}
+/*******************************************************************
+*** Course
+*******************************************************************/
 
-.sideblock .header .commands {
-    font-size: 0.75em;
-}
-
-.sideblock .footer {
-    font-size:0.75em;
+.activitydate, .activityhead {
+    font-size:x-small;
     text-align:center;
 }
 
-.sideblock .head,
-.sideblock .info {
-    font-size: 0.85em;
+.weeklydatetext {
+    font-size:medium;
+    font-weight:normal;
 }
 
-.sideblock .date {
-    font-style: italic;
+.courseboxinfo {
+    font-size:medium;
+}
+
+.courseboxteachers,
+.courseboxcost {
+    font-size:smaller;
+}
+
+.courseboxsummary {
+    font-size:small;
 }
 
 
-/* block_rss_client.php */
-.rssclientlink {
-    font-size:x-small;
-}
 
-.rssclientdescription {
-    font-size:x-small;
-}
 
-.sideblock.block_quiz_results h1 {
-    font-weight: normal;
-    font-size: 1.2em;
-}
+/*******************************************************************
+*** Doc
+*******************************************************************/
 
-.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;
-}
+/*******************************************************************
+*** Login
+*******************************************************************/
 
-.sideblock.block_quiz_results {
-    text-align: center;
-}
 
-.sideblock.block_quiz_results table.grades {
-    text-align: left;
-}
+/*******************************************************************
+*** Message
+*******************************************************************/
 
-.sideblock.block_calendar_upcoming .event .date {
-    font-size:0.8em;
+.message_summary_link {
+    font-size:small;
     text-align:right;
 }
 
-/*****************************
-***
-*** User
-***
-******************************/
+.message_link {
+    font-size:x-small;
+}
 
-body#user-index #longtimenosee {
+.message_form {
+    font-size:0.78em;
+}
+
+.message_heading {
+    font-size:medium;
+    font-weight:normal;
     text-align:center;
 }
 
+.message_date,
+.message_contact,
+.message_summary {
+    font-size:small;
+}
 
-/* Messaging */
+.message_small_note, 
+.message_pix {
+    font-size:x-small;
+}
 
 .message .author {
     font-weight: normal;
@@ -472,26 +420,147 @@ body#user-index #longtimenosee {
 }
 
 
-.helplink {
-    font-size:0.8em;
-}
+/*******************************************************************
+*** Tabs
+*******************************************************************/
 
-.headingblock .title {
-    font-weight: normal;
-}
-.headingblock .link {
-    font-size: 0.9em;
+
+/*******************************************************************
+*** User
+*******************************************************************/
+
+.userinfobox .username {
     font-weight: normal;
 }
 
-.files .file {
-    font-size: 0.9em;
+.userinfobox .links {
+    font-size: 0.7em;
 }
 
-.files .folder {
-    font-size: 0.9em;
+body#user-index #longtimenosee {
+    text-align:center;
 }
 
-.files .folder .size {
+
+/*******************************************************************
+*** Modules: Assignment
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Chat
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Choice
+*******************************************************************/
+    
+/*******************************************************************
+*** 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;
+}
+
+
+/*******************************************************************
+*** Modules: Glossary
+*******************************************************************/
+
+.glossarypost .commands {
+    font-size: 0.7em;
+}
+.glossarypost .entryheader .author {
+    font-size: 0.7em;
+    font-style: italic;
+}
+.concept {
+    font-weight: normal;
+}
+.glossarycomment .time {
+    font-size: 0.7em;
+    font-style: italic;
+}
+
+
+
+/*******************************************************************
+*** Modules: Journal
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Label
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Lesson
+*******************************************************************/
+
+/*******************************************************************
+*** 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
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Scorm
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Survey
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Wiki
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Workshop
+*******************************************************************/
+
+
diff --git a/theme/oceanblue/styles_layout.css b/theme/oceanblue/styles_layout.css
index bb78ede8d7d..a7e0113bd06 100644
--- a/theme/oceanblue/styles_layout.css
+++ b/theme/oceanblue/styles_layout.css
@@ -1,32 +1,58 @@
-/************************************************* 
-***
-*** layout
-***
-**************************************************/
+/*******************************************************************
+styles_layout.css
+    
+This CSS file contains all layout definitions like positioning,
+floats, margins, paddding, borders etc.
 
-/*************************************************
-***
-*** This CSS file contains all layout definitions
-*** like positioning, floats,
-*** margins, paddding,
-*** borders etc.
-***
-*** Shortindex:
-*** basic and general styles
-*** header and footer styles
-*** content styles (alphabetically)
-*** admin, course, activities, calendar, blocks
-*** 
-*** Please sort new styles for existing content
-*** into the appropriate part of this CSS file.
-*** Styles for new Blocks or Activities please
-*** place at the end.
-*** Wouldn't the alphabetical order be better?
-***
-**************************************************/
+Styles are organised into the following sections:
+    core
+    header
+    footer
+    admin
+    blocks
+    calendar
+    course
+    doc
+    login
+    message
+    tabs
+    user
+    modules
+        assignment
+        chat
+        choice
+        forum
+        glossary
+        journal
+        label
+        lesson
+        quiz
+        resource
+        scorm
+        survey
+        wiki
+        workshop
+
+*******************************************************************/
 
 
-/* basic styles */
+/*******************************************************************
+*** Core
+*******************************************************************/
+
+#layout-table {
+    width:100%;
+    border-spacing:5px;
+    border-collapse:separate;
+}
+
+#layout-table #left-column,
+#layout-table #middle-column,
+#layout-table #right-column
+{
+    vertical-align:top;
+}
+
 .clearer {
     clear:both;
     margin:0px;
@@ -40,14 +66,6 @@
     text-align: center;
 }
 
-
-/* general styles */
-th.header {
-    background-image:url(gradient.jpg);
-    background-position:top;
-    background-repeat:repeat-x;
-}
-
 form {
     margin-bottom:0px;
 }
@@ -61,72 +79,6 @@ a img {
     border:none;
 }
 
-/* header styles */
-#header-home {
-    padding:1em 0.5em;
-    height:2em;
-}
-
-#header {
-    padding:0.1em 0.5em;
-}
-
-.headermain {
-    float:left;
-}
-
-#header .headermain {
-    margin:0.2em 0em;
-}
-
-#footer {
-    text-align:center;
-}
-
-.headermenu {
-    float:right;
-    text-align:right;
-}
-
-#nav-bar {
-    padding:3px 0.5em;
-    height:1.3em;
-    background-image:url(gradient.jpg);
-    background-position:top;
-    background-repeat:repeat-x;
-}
-
-#breadcrumb {
-    float:left;
-    margin:0.2em 0em;
-}
-
-#navbutton {
-    float:right;
-}
-
-#layout-table {
-    width:100%;
-    border-spacing:5px;
-    border-collapse:separate;
-}
-
-#layout-table #left-column,
-#layout-table #middle-column,
-#layout-table #right-column
-{
-    vertical-align:top;
-}
-
-/* footer styles */
-
-
-/*****************************
-***
-*** content styles
-***
-******************************/
-/* many places */
 .generalbox {
     border-width:1px;
     border-style:solid;
@@ -165,13 +117,6 @@ a img {
     text-align: center;
 }
 
-/* summary of a user in a nice little box - weblib.php */
-.userinfobox {
-    margin-bottom:5px;
-    border-width:1px;
-    border-style:solid;
-}
-
 /* weblib.php table */
 .tabledivider {
     border-width:1px;
@@ -181,7 +126,6 @@ a img {
     border-top:0px;
 }
 
-
 /* entry-page index.php */ 
 .sitetopic {
     border-width:1px;
@@ -200,11 +144,6 @@ a img {
     padding-left: 10px;
 }
 
-/*****************************
-***
-*** Admin
-***
-******************************/
 /* admin, calendar */
 table.formtable {
     margin: auto;
@@ -221,238 +160,6 @@ table.formtable tbody th
     padding: 5px;
 }
 
-/*****************************
-***
-*** Course
-***
-******************************/
-
-.section .activity img.activityicon {
-    vertical-align:middle;
-    height:16px;
-    width:16px;
-}
-
-.section img.movetarget {
-    height:16px;
-    width:80px;
-}
-
-/* course, entry-page, login */
-.headingblock {
-    background-image:url(gradient.jpg);
-    background-position:top;
-    background-repeat:repeat-x;
-    border-width:1px;
-    border-style:solid;
-    padding:5px;
-}
-
-
-/* course */
-
-#course-view .section td {
-    vertical-align:top;
-}
-
-#course-view .section .content {
-    padding:5px;
-    border-style:solid;
-    border-width:1px;
-    border-left:0px;
-    border-right:0px;
-}
-
-#course-view .section .side {
-    padding:5px;
-    border-style:solid;
-    border-width:1px;
-}
-
-#course-view .section .left {
-    border-right:0px;
-    text-align:center;
-    font-weight:bold;
-    width: 1.5em;
-}
-
-#course-view .section .right {
-    border-left:0px;
-    text-align:center;
-    width: 1.5em;
-}
-
-#course-view .current .side {
-}
-
-#course-view .topics {
-    margin-top: 9px;
-}
-
-#course-view .weeks {
-    margin-top: 9px;
-}
-
-#course-view .section .spacer {
-    height:0.5em;
-}
-
-#course-view .section .weekdates {
-}
-
-
-.categoryboxcontent,
-.courseboxcontent {
-    border-width:1px;
-    border-style:solid;
-}
-
-
-/* user */
-.userinfobox {
-    border-width: 1px;
-    border-style: solid;
-    border-collapse: separate;    
-}
-
-.userinfobox .left {
-    padding: 10px;
-    width: 100px;
-}
-
-.userinfobox .content {
-    padding: 10px;
-    vertical-align: top;
-}
-
-.userinfobox .links {
-    width: 100px;
-    padding: 5px;
-    vertical-align: bottom;
-}
-
-.userinfobox .list td {
-    padding: 3px;
-}
-
-.userinfobox .username {
-    padding-bottom: 20px;
-}    
-
-
-table.userinfobox {
-    width: 80%;
-    margin-left: 10%;
-    margin-right: 10%;
-}
-
-
-
-/*****************************
-***
-*** Activities
-***
-******************************/
-/* assignment, forum, glossary */
-.forumheaderlist,
-.forumpost {
-    border-width:1px;
-    border-style:solid;
-    border-collapse:separate;
-}
-
-.forumpost {
-    margin-top: 15px;
-}
-
-.forumpost .topic {
-    padding: 4px;
-}
-
-
-.forumpost .commands {
-    padding-top: 0.5em;
-    text-align:right;
-}
-
-.forumpost .ratings {
-    padding-top: 1em;
-    text-align:right;
-}
-
-.forumpost .content {
-    padding: 4px;
-}
-
-.forumpost .footer {
-    padding-top: 0.5em;
-    text-align:right;
-}
-
-.forumpost .link {
-    padding-top: 0.5em;
-    text-align:right;
-}
-
-
-.forumpost .left {
-    width: 35px;
-    padding: 4px;
-    text-align: center;
-    vertical-align: top;
-}
-
-.forumpostindent {
-    margin-left: 30px;
-}
-
-body#user-view .forumpost,
-.course .forumpost {
-    width: 100%;
-}
-
-body#mod-forum-search .c0 {
-    text-align: right;
-}
-
-body#mod-forum-search .introcontent {
-    padding: 15px;
-    font-weight:bold;
-}
-
-.forumolddiscuss {
-    text-align: right;
-}
-
-.forumheaderlist {
-    width: 100%;
-}
-
-.forumheaderlist td {
-    border-width:1px 0px 0px 1px;
-    border-style:solid;
-}
-
-.forumheaderlist .replies {
-    text-align: center;
-}
-
-.forumheaderlist .picture {
-    width: 35px;
-}
-
-.forumheaderlist .discussion .starter {
-    vertical-align: middle;
-}
-
-.forumheaderlist .discussion .lastpost {
-    white-space: nowrap;
-}
-
-.forumheaderlist .discussion .author {
-    white-space: nowrap;
-}
-
 .paging {
     text-align: center;
     margin: 10px 0px 10px 0px;
@@ -462,254 +169,226 @@ body#mod-forum-search .introcontent {
     padding-right:2px;
 } 
 
-
-/* calendar, course, weblib,php, attandance
-dialouge, exercise, forum, lesson, quiz */
-table.generaltable td.header,
-table.generaltable th.header,
-.generaltableheader {
-    background-image:url(gradient.jpg);
-    background-position:top;
-    background-repeat:repeat-x;
+.cell {  /* Very generic table cell*/
+    vertical-align: top;
 }
 
 
-/* glossary, wiki */
-.glossarypost .commands {
-    width: 200px;
-    white-space: nowrap;
+/*******************************************************************
+*** Header
+*******************************************************************/
+
+#header-home {
+    padding:1em 0.5em;
+    height:2em;
 }
 
-.entryboxheader {
-    border-width: 1px 1px 0px 1px;
-    border-style: solid;
+#header {
+    padding:0.1em 0.5em;
 }
 
-.entrybox {
-    border-width: 0px 1px 1px 1px;
-    border-style: solid;
+.headermain {
+    float:left;
 }
 
-.glossarypost {
-    width: 95%;
-    border-width:1px;
-    border-style:solid;
-    border-collapse:separate;
-    margin-bottom: 5px;
-    text-align: left;
+#header .headermain {
+    margin:0.2em 0em;
 }
 
-
-.entrylist {
-    border-width:0px;
-}
-
-.entrylowersection {
-    padding-top: 10px;
-}
-.entrylowersection table{
-    width: 100%;
-}
-.entrylowersection .aliases {
-    text-align:center;
-    font-size: 0.8em;
-}
-.entrylowersection .icons,
-.entrylowersection .ratings {
+.headermenu {
+    float:right;
     text-align:right;
-    font-size: 0.8em;
-    padding-right: 5px;
-}
-.entrylowersection .ratings {
-    padding-bottom: 2px;
 }
 
-.glossarypost .entry {
-    padding: 3px;
+#nav-bar {
+    padding:3px 0.5em;
+    height:1.3em;
 }
 
-.glossarypost .picture {
-    width: 35px;
+#breadcrumb {
+    float:left;
+    margin:0.2em 0em;
 }
 
-.glossarycomment {
-    border-width:1px;
-    border-style:solid;
-    border-collapse:separate;
-    margin-bottom: 5px;
-    text-align: left;
+#navbutton {
+    float:right;
 }
 
 
-.glossarycomment .entry {
-    padding: 3px;
-}
+/*******************************************************************
+*** Footer
+*******************************************************************/
 
-.glossarycomment .picture {
-    width: 35px;
-}
-
-.glossarycomment .icons {
-    text-align: right;
-}
-
-/* tabs for glossary */
-
-.generaltab,
-.generaltabselected,
-.generaltabinactive {
-    background:none;
-}
-
-.glossarydisplay {
-    width: 70%;
-}
-
-.glossarydisplay .tabs {
-    width: 100%;
-}
-
-.glossarydisplay .separator {
-    width: 4px;
-}
-
-.glossarydisplay .tabs .selected,
-.glossarydisplay .tabs .inactive,
-.glossarydisplay .tabs .general {
-}
-
-.glossarypopup {
-    width: 95%;
-}
-
-.glossaryapproval {
-    width: 100%;
-}
-
-/******************************************************************/
-/* tabs */
-.tabs {
-    width: auto;
-}
-
-body#mod-quiz-report .tabs .side,
-body#message-index .tabs .side,
-body.course .tabs .side, 
-body.user .tabs .side,
-body#mod-forum-user .tabs .side {
-    border-style: solid;
-    border-width: 0px 0px 1px 0px;
-    border-color: #AAAAAA;
-    width: 50%;
-}
-
-body#mod-quiz-report .tabs,
-body#message-index .tabs,
-body.course .tabs,
-body.user .tabs,
-body#mod-forum-user .tabs {
-    margin-bottom: 15px;
-}
-
-.tabrow {
-    border-collapse:collapse;
-    width:100%;
-    margin:0;
-}
-.tabrow td {
-    height:34px;
-    padding:0 0 0 14px;
-}
-.tabrow th {
-    display:none;
-}
-.tabrow td .tablink {
-    display:block;
-    height:34px;
-    line-height:38px;
-    padding:0 14px 0 0;
+#footer {
     text-align:center;
-    white-space:nowrap;
-    text-decoration:none;
-}
-.tabrow td:hover {
-}
-.tabrow td:hover .tablink {
-    line-height:32px;
 }
 
-.tabrow .last span {
-    display:block;
-    padding:0px 1px 0px 0px;
-}
-.tabrow .selected {
-}
-.tabrow .selected .tablink {
-    line-height:38px;
-}
-.tabrow td.selected:hover {
-}
-.tabrow td.selected:hover .tablink {
+
+/*******************************************************************
+*** Admin
+*******************************************************************/
+
+body#admin-index .c0 {
+    vertical-align: top;
+    background: #FAFAFA;
+} 
+
+body#admin-modules table.generaltable td.cell,
+body#admin-modules .generaltablecell {
+    padding-top: 2px;
+    padding-bottom: 2px;
+} 
+
+body#admin-blocks table.generaltable td.cell,
+body#admin-blocks .generaltablecell {
+    padding-top: 1px;
+    padding-bottom: 1px;
+} 
+
+body#admin-config .confighelp {
+    display: block;
+    padding-bottom: 20px;
 }
 
-/******************************************************************/
 
-/* message */
-.message_link {
-    vertical-align:middle;
+/*******************************************************************
+*** Blocks
+*******************************************************************/
+
+/* block_search_forums.php */
+
+.block_search_forums.sideblock .searchform {
+    text-align: center;
 }
 
-.message_search_results {
-    border-collapse:collapse;
-    border-spacing:0px;
+.block_search_forums.sideblock .searchform img {
+    vertical-align: middle;
 }
 
-table.message_search_results td {
-    padding:5px;
+/* block_rss_client.php */
+.rssclientlink {
+    padding-bottom:5px;
+    border-top:1px solid;
+}
+
+.rssclientdescription {
+    padding-left:10px;
+    padding-bottom:8px;
+}
+
+
+/* sideblock */
+.sideblock {
+    width: 100%;
+    margin-bottom:1em;
+    border-collapse:separate;
     border-width:1px;
     border-style:solid;
 }
 
-
-/* quiz */
-.feedbacktext {
-    display:block;
+.sideblock .header {
+    background-image:url(gradient.jpg);
+    padding:4px;
 }
 
-body#mod-quiz-report table#attempts,
-body#mod-quiz-report table#commands
-{
-    width: 80%;
-    margin: auto;
+.sideblock .header .hide-show {
+    float:right;
 }
-body#mod-quiz-report table#attempts {
-    margin: 20px auto;
+
+.sideblock .header .hide-show img.hide-show-image {
+    height:11px;
+    width:11px;
+    margin-top:0.25em;
 }
-body#mod-quiz-report table#attempts .header,
-body#mod-quiz-report table#attempts .cell
-{
-    padding: 4px;
+
+.sideblock .header .commands {
+    float: right;
+    margin-top: 0.3em;
 }
-body#mod-quiz-report table#attempts .header .commands {
-    display: inline;
+
+.sideblock .header .title {
+    float: left;
 }
-body#mod-quiz-report table#attempts .picture {
-    width: 40px;
+
+.sideblock .header .commands a {
+    margin: 0px 2px;
 }
-body#mod-quiz-report table#attempts td {
-    border-left-width: 1px;
-    border-right-width: 1px;
-    border-left-style: solid;
-    border-right-style: solid;
+
+.sideblock .content {
+    padding:4px;
+}
+
+.sideblock .content hr {
+    height:1px;
+    margin-top:4px;
+    margin-bottom:4px;
+    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;
+}
+
+.sideblock .list {
+    width: 100%;
+}
+
+.sideblock .list .c0{
+    padding: 2px;
+}
+
+.sideblock .footer {
+    margin-top:4px;
+}
+
+.sideblock .header .icon.hide,
+.sideblock .header .icon.edit {
+    margin-right: 6px;
+}
+
+/* sideblock weblib.php */
+.block_course_summary .content {
+    padding:10px;
+}
+
+/* blocklib.php */
+
+.block_adminblock .content {
+    text-align: center;
+    padding: 10px;
+}
+
+/* block_quiz_results.php */
+.block_quiz_results table.grades {
+    width: 100%;
+}
+
+.block_quiz_results table.grades caption {
+    margin: 1em 0px 0px 0px;
+    border-bottom: 1px solid;
+}
+
+.block_quiz_results table.grades .number, .block_quiz_results table.grades .grade {
+    width: 10%;
+}
+
+.block_quiz_results h1 {
+    margin: 4px;
 }
 
 
-/*****************************
-***
+/*******************************************************************
 *** Calendar
-***
-******************************/
-/* calendar */
+*******************************************************************/
 
 #calendar {
     width: 100%;
@@ -758,9 +437,6 @@ table.minicalendar th {
 
 #calendar div.header
 {
-    background-image:url(gradient.jpg);
-    background-position:top;
-    background-repeat:repeat-x;
     padding: 5px;
 }
 
@@ -919,7 +595,6 @@ table.minicalendar th {
 }
 
 .cal_popup_caption {
-    background-image:url(gradient.jpg);
     border-width:0px 0px 1px 0px;
     border-style:solid;
     padding-bottom:2px;
@@ -941,193 +616,80 @@ table.calendar-controls .next
     width: 30%;
 }
 
-/*****************************
-***
-*** Blocks
-***
-******************************/
-/* block_search_forums.php */
 
-.block_search_forums.sideblock .searchform {
-    text-align: center;
+/*******************************************************************
+*** Course
+*******************************************************************/
+
+#course-view .section td {
+    vertical-align:top;
 }
 
-.block_search_forums.sideblock .searchform img {
-    vertical-align: middle;
-}
-
-/* block_rss_client.php */
-.rssclientlink {
-    padding-bottom:5px;
-    border-top:1px solid;
-}
-
-.rssclientdescription {
-    padding-left:10px;
-    padding-bottom:8px;
-}
-
-
-/* sideblock */
-.sideblock {
-    width: 100%;
-    margin-bottom:1em;
-    border-collapse:separate;
-    border-width:1px;
+#course-view .section .content {
+    padding:5px;
     border-style:solid;
+    border-width:1px;
+    border-left:0px;
+    border-right:0px;
 }
 
-.sideblock .header {
-    background-image:url(gradient.jpg);
-    background-position:top;
-    background-repeat:repeat-x;
-    padding:4px;
+#course-view .section .side {
+    padding:5px;
+    border-style:solid;
+    border-width:1px;
 }
 
-.sideblock .header .hide-show {
-    float:right;
+#course-view .section .left {
+    border-right:0px;
+    text-align:center;
+    font-weight:bold;
+    width: 1.5em;
 }
 
-.sideblock .header .hide-show img.hide-show-image {
-    height:11px;
-    width:11px;
-    margin-top:0.25em;
+#course-view .section .right {
+    border-left:0px;
+    text-align:center;
+    width: 1.5em;
 }
 
-.sideblock .header .commands {
-    float: right;
-    margin-top: 0.3em;
+#course-view .current .side {
 }
 
-.sideblock .header .title {
-    float: left;
+#course-view .topics {
+    margin-top: 9px;
 }
 
-.sideblock .header .commands a {
-    margin: 0px 2px;
+#course-view .weeks {
+    margin-top: 9px;
 }
 
-.sideblock .content {
-    padding:4px;
+#course-view .section .spacer {
+    height:0.5em;
 }
 
-.sideblock .content hr {
-    height:1px;
-    margin-top:4px;
-    margin-bottom:4px;
-    border:none;
-    border-top:1px solid;
+#course-view .section .weekdates {
 }
 
-.sideblock .header .hide-show img.hide-show-image {
-    background: url('../../pix/t/switch_minus.gif') no-repeat bottom;
+.section .activity img.activityicon {
+    vertical-align:middle;
+    height:16px;
+    width:16px;
 }
 
-.sideblock.hidden .header .hide-show img.hide-show-image {
-    background: url('../../pix/t/switch_plus.gif') no-repeat bottom;
+.section img.movetarget {
+    height:16px;
+    width:80px;
 }
 
-.sideblock.hidden .content {
-    display: none;
+.headingblock .link {
+    text-align:right;
 }
 
-.sideblock .list {
-    width: 100%;
-}
-
-.sideblock .list .c0{
-    padding: 2px;
-}
-
-.sideblock .footer {
-    margin-top:4px;
-}
-
-.sideblock .header .icon.hide,
-.sideblock .header .icon.edit {
-    margin-right: 6px;
-}
-
-/* sideblock weblib.php */
-.block_course_summary .content {
-    padding:10px;
-}
-
-/* blocklib.php */
-
-.block_adminblock .content {
-    text-align: center;
-    padding: 10px;
-}
-
-/* block_quiz_results.php */
-.block_quiz_results table.grades {
-    width: 100%;
-}
-
-.block_quiz_results table.grades caption {
-    margin: 1em 0px 0px 0px;
-    border-bottom: 1px solid;
-}
-
-.block_quiz_results table.grades .number, .block_quiz_results table.grades .grade {
-    width: 10%;
-}
-
-.block_quiz_results h1 {
-    margin: 4px;
-}
-
-/*****************************
-***
-*** Doc
-***
-******************************/
-
-/* contents.php */
-
-.cell {  /* Very generic table cell*/
-    vertical-align: top;
-}
-
-body#doc-contents h1 {
-    font-size: 1em;
-    margin: 1em 0px 0px 0px;
-}
-
-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 */
-}
 
 body#course-view .unread {
     margin-left: 3em;
 } 
 
-body#admin-index .c0 {
-    vertical-align: top;
-    background: #FAFAFA;
-} 
-
-body#admin-modules table.generaltable td.cell,
-body#admin-modules .generaltablecell {
-    padding-top: 2px;
-    padding-bottom: 2px;
-} 
-
-body#admin-blocks table.generaltable td.cell,
-body#admin-blocks .generaltablecell {
-    padding-top: 1px;
-    padding-bottom: 1px;
-} 
-
-body#admin-config .confighelp {
-    display: block;
-    padding-bottom: 20px;
-}
 body#course-enrol .generalbox {
     margin-top: 20px;
 }
@@ -1135,16 +697,6 @@ body#course-enrol .coursebox {
     margin-top: 20px;
 }
 
-.loginbox .content {
-    border-width:1px;
-    border-style:solid;
-    padding:15px;
-}
-
-.headingblock .link {
-    text-align:right;
-}
-
 body#course-user .graph {
     text-align: center;
 }
@@ -1165,4 +717,483 @@ body#course-user .section {
 
 body#course-user .section h2 {
     margin-top: 0px;
-}
\ No newline at end of file
+}
+
+.headingblock {
+    background-image:url(gradient.jpg);
+    border-width:1px;
+    border-style:solid;
+    padding:5px;
+}
+
+.categoryboxcontent,
+.courseboxcontent {
+    border-width:1px;
+    border-style:solid;
+}
+
+
+
+/*******************************************************************
+*** Doc
+*******************************************************************/
+
+body#doc-contents h1 {
+    font-size: 1em;
+    margin: 1em 0px 0px 0px;
+}
+
+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 */
+}
+
+
+/*******************************************************************
+*** Login
+*******************************************************************/
+
+.loginbox .content {
+    border-width:1px;
+    border-style:solid;
+    padding:15px;
+}
+
+
+/*******************************************************************
+*** Message
+*******************************************************************/
+
+.message_link {
+    vertical-align:middle;
+}
+
+.message_search_results {
+    border-collapse:collapse;
+    border-spacing:0px;
+}
+
+table.message_search_results td {
+    padding:5px;
+    border-width:1px;
+    border-style:solid;
+}
+
+
+/*******************************************************************
+*** Tabs
+*******************************************************************/
+
+.tabs {
+    width: auto;
+    margin-bottom: 15px;
+}
+.tabs .side {
+    border-style: solid;
+    border-width: 0px 0px 1px 0px;
+    border-color: #AAAAAA;
+    width: 50%;
+}
+
+.tabrow {
+    border-collapse:collapse;
+    width:100%;
+    margin:0;
+}
+.tabrow td {
+    height:34px;
+    padding:0 0 0 14px;
+    background:url(pix/tab/left.gif) top left no-repeat;
+}
+.tabrow th {
+    display:none;
+}
+.tabrow td .tablink {
+    display:block;
+    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);
+}
+
+
+/*******************************************************************
+*** User
+*******************************************************************/
+
+.userinfobox {
+    margin-bottom:5px;
+    border-width: 1px;
+    border-style: solid;
+    border-collapse: separate;    
+}
+
+.userinfobox .left {
+    padding: 10px;
+    width: 100px;
+}
+
+.userinfobox .content {
+    padding: 10px;
+    vertical-align: top;
+}
+
+.userinfobox .links {
+    width: 100px;
+    padding: 5px;
+    vertical-align: bottom;
+}
+
+.userinfobox .list td {
+    padding: 3px;
+}
+
+.userinfobox .username {
+    padding-bottom: 20px;
+}    
+
+
+table.userinfobox {
+    width: 80%;
+    margin-left: 10%;
+    margin-right: 10%;
+}
+
+
+/*******************************************************************
+*** Modules: Assignment
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Chat
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Choice
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Forum
+*******************************************************************/
+
+.forumheaderlist,
+.forumpost {
+    border-width:1px;
+    border-style:solid;
+    border-collapse:separate;
+}
+
+.forumpost {
+    margin-top: 15px;
+}
+
+.forumpost .topic {
+    padding: 4px;
+}
+
+.forumpost .commands {
+    padding-top: 0.5em;
+    text-align:right;
+}
+
+.forumpost .ratings {
+    padding-top: 1em;
+    text-align:right;
+}
+
+.forumpost .content {
+    padding: 4px;
+}
+
+.forumpost .footer {
+    padding-top: 0.5em;
+    text-align:right;
+}
+
+.forumpost .link {
+    padding-top: 0.5em;
+    text-align:right;
+}
+
+.forumpost .left {
+    width: 35px;
+    padding: 4px;
+    text-align: center;
+    vertical-align: top;
+}
+
+.mod-forum .indent {
+    margin-left: 30px;
+}
+
+body#user-view .forumpost,
+.course .forumpost {
+    width: 100%;
+}
+
+body#mod-forum-search .c0 {
+    text-align: right;
+}
+
+body#mod-forum-search .introcontent {
+    padding: 15px;
+    font-weight:bold;
+}
+
+.forumolddiscuss {
+    text-align: right;
+}
+
+.forumheaderlist {
+    width: 100%;
+}
+
+.forumheaderlist td {
+    border-width:1px 0px 0px 1px;
+    border-style:solid;
+}
+
+.forumheaderlist .replies {
+    text-align: center;
+}
+
+.forumheaderlist .picture {
+    width: 35px;
+}
+
+.forumheaderlist .discussion .starter {
+    vertical-align: middle;
+}
+
+.forumheaderlist .discussion .lastpost {
+    white-space: nowrap;
+}
+
+.forumheaderlist .discussion .author {
+    white-space: nowrap;
+}
+
+/*******************************************************************
+*** Modules: Glossary
+*******************************************************************/
+
+.glossarypost .commands {
+    width: 200px;
+    white-space: nowrap;
+}
+
+.entryboxheader {
+    border-width: 1px 1px 0px 1px;
+    border-style: solid;
+}
+
+.entrybox {
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+}
+
+.glossarypost {
+    width: 95%;
+    border-width:1px;
+    border-style:solid;
+    border-collapse:separate;
+    margin-bottom: 5px;
+    text-align: left;
+}
+
+
+.entrylist {
+    border-width:0px;
+}
+
+.entrylowersection {
+    padding-top: 10px;
+}
+.entrylowersection table{
+    width: 100%;
+}
+.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 {
+    padding-bottom: 2px;
+}
+.categoryheader {
+    width: 95%;
+}
+.glossaryformatheader {
+    width: 90%;
+}
+
+.glossarypost .entry {
+    padding: 3px;
+}
+
+.glossarypost .picture {
+    width: 35px;
+}
+
+.glossarycomment {
+    border-width:1px;
+    border-style:solid;
+    border-collapse:separate;
+    margin-bottom: 5px;
+    text-align: left;
+}
+
+
+.glossarycomment .entry {
+    padding: 3px;
+}
+
+.glossarycomment .picture {
+    width: 35px;
+}
+
+.glossarycomment .icons {
+    text-align: right;
+}
+
+.glossarydisplay {
+    width: 70%;
+}
+
+.glossarydisplay .tabs {
+    width: 100%;
+}
+
+.glossarydisplay .separator {
+    width: 4px;
+}
+
+.glossarydisplay .tabs .selected,
+.glossarydisplay .tabs .inactive,
+.glossarydisplay .tabs .general {
+}
+
+.glossarypopup {
+    width: 95%;
+}
+
+.glossaryapproval {
+    width: 100%;
+}
+
+/* Override default tab styles */
+.mod-glossary .tabs {
+    margin-bottom: 0px;
+}
+.mod-glossary .tabs .side {
+    border-style: none;
+    border-width: 0px;
+    width: auto;
+}
+
+
+/*******************************************************************
+*** Modules: Journal
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Label
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Lesson
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Quiz
+*******************************************************************/
+
+.feedbacktext {
+    display:block;
+}
+
+body#mod-quiz-report table#attempts,
+body#mod-quiz-report table#commands
+{
+    width: 80%;
+    margin: auto;
+}
+body#mod-quiz-report table#attempts {
+    margin: 20px auto;
+}
+body#mod-quiz-report table#attempts .header,
+body#mod-quiz-report table#attempts .cell
+{
+    padding: 4px;
+}
+body#mod-quiz-report table#attempts .header .commands {
+    display: inline;
+}
+body#mod-quiz-report table#attempts .picture {
+    width: 40px;
+}
+body#mod-quiz-report table#attempts td {
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-left-style: solid;
+    border-right-style: solid;
+}
+
+
+/*******************************************************************
+*** Modules: Resource
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Scorm
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Survey
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Wiki
+*******************************************************************/
+
+/*******************************************************************
+*** Modules: Workshop
+*******************************************************************/
+