diff --git a/admin/blocks.php b/admin/blocks.php
index 66789755edb..a8718a6c58a 100644
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -131,8 +131,7 @@
     $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'delete', 'settings'));
     $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strdelete, $strsettings));
     $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-    $table->set_attribute('id', 'blocks');
-    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+    $table->set_attribute('class', 'compatibleblockstable blockstable generaltable');
     $table->setup();
 
     foreach ($blockbyname as $blockname => $blockid) {
@@ -188,7 +187,7 @@
     $table->print_html();
 
     if(!empty($incompatible)) {
-        echo $OUTPUT->heading(get_string('incompatibleblocks', 'admin'));
+        echo $OUTPUT->heading(get_string('incompatibleblocks', 'blockstable', 'admin'));
 
         $table = new flexible_table('admin-blocks-incompatible');
 
@@ -196,8 +195,7 @@
         $table->define_headers(array($strname, $strdelete));
         $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
 
-        $table->set_attribute('id', 'incompatible');
-        $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+        $table->set_attribute('class', 'incompatibleblockstable generaltable');
 
         $table->setup();
 
diff --git a/admin/enrol.php b/admin/enrol.php
index 91af6759716..63f655aa28c 100644
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -68,7 +68,7 @@
     $table->head = array(get_string('name'), get_string('enable'), get_string('default'), $str->settings);
     $table->align = array('left', 'center', 'center', 'center');
     $table->size = array('60%', '', '', '15%');
-    $table->width = '700';
+    $table->attributes['class'] = 'generaltable enrolplugintable';
     $table->data = array();
 
     $enabledplugins = explode(',', $CFG->enrol_plugins_enabled);
diff --git a/admin/report/capability/index.php b/admin/report/capability/index.php
index c349528ad9e..d9171da82fb 100644
--- a/admin/report/capability/index.php
+++ b/admin/report/capability/index.php
@@ -67,7 +67,7 @@ if (count($cleanedroleids) == count($allroles)) {
 }
 
 // Print the settings form.
-echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter centerpara');
+echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
 echo '<form method="get" action="." id="settingsform"><div>';
 echo $OUTPUT->heading(get_string('reportsettings', 'report_capability'));
 echo '<p id="intro">', get_string('intro', 'report_capability') , '</p>';
diff --git a/blocks/admin_tree/styles.css b/blocks/admin_tree/styles.css
new file mode 100644
index 00000000000..80221ef5060
--- /dev/null
+++ b/blocks/admin_tree/styles.css
@@ -0,0 +1,5 @@
+.block_admin_tree .admintree {text-align:left;}
+.block_admin_tree .admintree .depth1 {padding-left: 16px;}
+.block_admin_tree .admintree .depth2 {padding-left: 32px;}
+.block_admin_tree .admintree .depth3 {padding-left: 48px;}
+.block_admin_tree .admintree .depth4 {padding-left: 64px;}
\ No newline at end of file
diff --git a/blocks/blog_tags/styles.css b/blocks/blog_tags/styles.css
new file mode 100644
index 00000000000..5df71654d46
--- /dev/null
+++ b/blocks/blog_tags/styles.css
@@ -0,0 +1,20 @@
+.block_blog_tags .s20 {font-size: 1.5em;font-weight: bold;}
+.block_blog_tags .s19 {font-size: 1.5em;}
+.block_blog_tags .s18 {font-size: 1.4em;font-weight: bold;}
+.block_blog_tags .s17 {font-size: 1.4em;}
+.block_blog_tags .s16 {font-size: 1.3em;font-weight: bold;}
+.block_blog_tags .s15 {font-size: 1.3em;}
+.block_blog_tags .s14 {font-size: 1.2em;font-weight: bold;}
+.block_blog_tags .s13 {font-size: 1.2em;}
+.block_blog_tags .s12,
+.block_blog_tags .s11 {font-size: 1.1em;font-weight: bold;}
+.block_blog_tags .s10,
+.block_blog_tags .s9 {font-size: 1.1em;}
+.block_blog_tags .s8,
+.block_blog_tags .s7 {font-size: 1em;font-weight: bold;}
+.block_blog_tags .s6,
+.block_blog_tags .s5 {font-size: 1em;}
+.block_blog_tags .s4,
+.block_blog_tags .s3 {font-size: 0.9em;font-weight: bold;}
+.block_blog_tags .s2,
+.block_blog_tags .s1 {font-size: 0.9em;}
\ No newline at end of file
diff --git a/blocks/calendar_month/styles.css b/blocks/calendar_month/styles.css
new file mode 100644
index 00000000000..db2657e7e95
--- /dev/null
+++ b/blocks/calendar_month/styles.css
@@ -0,0 +1,11 @@
+.block_calendar_month .minicalendar {width:100%;margin:10px auto;}
+.block_calendar_month .minicalendar th,
+.block_calendar_month .minicalendar td {padding:2px;font-size:0.8em;}
+.block_calendar_month .minicalendar td.weekend {color:#A00;}
+
+.block_calendar_month .calendar-controls .previous {text-align: left;display: block;float: left;width: 12%;}
+.block_calendar_month .calendar-controls .current {float:left;text-align: center;display: block;width:76%;}
+.block_calendar_month .calendar-controls .next {text-align: right;display: block;float: left;width: 12%;}
+
+.block_calendar_month .filters table {border-collapse:separate;border-spacing: 2px;padding: 2px;width: 100%;}
+.block_calendar_month .content h3.eventskey {margin-top:0.5em;margin-bottom:0;margin-left:0.5em;}
\ No newline at end of file
diff --git a/blocks/calendar_month/styles.php b/blocks/calendar_month/styles.php
deleted file mode 100644
index 9ae6d96e69f..00000000000
--- a/blocks/calendar_month/styles.php
+++ /dev/null
@@ -1,23 +0,0 @@
-.block_calendar_month .cal_popup_caption,
-.block_calendar_month .cal_popup_fg div {
-    font-size: 0.85em !important;
-}
-
-.block_calendar_month .filters {
-    font-size:0.75em;
-    padding: 5px;
-}
-
-.block_calendar_month .filters table {
-    border-collapse:separate;
-    border-spacing: 2px;
-    padding: 2px;
-}
-
-.block_calendar_month .event_global,
-.block_calendar_month .event_course,
-.block_calendar_month .event_group,
-.block_calendar_month .event_user {
-    border-width: 2px;
-    border-style: solid;
-}
diff --git a/blocks/calendar_upcoming/styles.css b/blocks/calendar_upcoming/styles.css
new file mode 100644
index 00000000000..bd104119d87
--- /dev/null
+++ b/blocks/calendar_upcoming/styles.css
@@ -0,0 +1 @@
+.block_calendar_upcoming .event .date {text-align:right;}
\ No newline at end of file
diff --git a/blocks/course_list/styles.css b/blocks/course_list/styles.css
new file mode 100644
index 00000000000..26b2428c080
--- /dev/null
+++ b/blocks/course_list/styles.css
@@ -0,0 +1 @@
+.block_course_list .footer {margin-top: 5px;}
\ No newline at end of file
diff --git a/blocks/course_summary/styles.css b/blocks/course_summary/styles.css
new file mode 100644
index 00000000000..7c58b8d3615
--- /dev/null
+++ b/blocks/course_summary/styles.css
@@ -0,0 +1,2 @@
+.block_course_summary .content {padding:10px;}
+.block_course_summary .editbutton {text-align:right;}
\ No newline at end of file
diff --git a/blocks/course_summary/styles.php b/blocks/course_summary/styles.php
deleted file mode 100644
index 0c71c3d38f8..00000000000
--- a/blocks/course_summary/styles.php
+++ /dev/null
@@ -1,7 +0,0 @@
-.block_course_summary .content {
-    padding:10px;
-}
-
-.block_course_summary .editbutton {
-    text-align:right;
-}
diff --git a/blocks/dock.js b/blocks/dock.js
index 295958d20f4..811c27b99fd 100644
--- a/blocks/dock.js
+++ b/blocks/dock.js
@@ -369,6 +369,12 @@ M.core_dock = {
                 return;
             }
 
+            var blockclass = (function(classes){
+                var r = /(^|\s)(block_[a-zA-Z0-9_]+)(\s|$)/;
+                var m = r.exec(classes);
+                return (m)?m[2]:m;
+            })(node.getAttribute('className').toString());
+
             this.cachedcontentnode = node;
 
             var placeholder = this.Y.Node.create('<div id="content_placeholder_'+this.id+'"></div>');
@@ -391,7 +397,7 @@ M.core_dock = {
             blockcommands.append(moveto);
 
             // Create a new dock item for the block
-            var dockitem = new M.core_dock.item(this.Y, this.id, blocktitle, blockcontent, blockcommands);
+            var dockitem = new M.core_dock.item(this.Y, this.id, blocktitle, blockcontent, blockcommands, blockclass);
             if (spacewidth !== null && M.core_dock.cfg.display.mindisplaywidth == null) {
                 dockitem.cfg.display.mindisplaywidth = spacewidth;
             }
@@ -566,6 +572,7 @@ M.core_dock = {
             this.panel.renderEvent.subscribe(this.resize_panel, this, true);
             this.panel.setBody(this.Y.Node.getDOMNode(this.contents));
             this.panel.render(M.core_dock.node);
+            this.Y.one(this.panel.body).addClass(this.blockclass);
             if (this.cfg.display.mindisplaywidth !== null && this.Y.one(this.panel.body).getStyle('minWidth') == '0px') {
                 this.Y.one(this.panel.body).setStyle('minWidth', this.cfg.display.mindisplaywidth);
                 this.Y.one(this.panel.body).setStyle('minHeight', dockitemtitle.get('offsetHeight')+'px');
@@ -744,7 +751,7 @@ M.core_dock.genericblock.prototype.fix_title_orientation =   M.core_dock.abstrac
  * @param {this.Y.Node} contents
  * @param {this.Y.Node} commands
  */
-M.core_dock.item = function(Y, uid, title, contents, commands){
+M.core_dock.item = function(Y, uid, title, contents, commands, blockclass){
     this.Y = Y;
     if (uid && this.id==null) {
         this.id = uid;
@@ -758,6 +765,9 @@ M.core_dock.item = function(Y, uid, title, contents, commands){
     if (commands && this.commands==null) {
         this.commands = commands;
     }
+    if (blockclass && this.blockclass==null) {
+        this.blockclass = blockclass
+    }
     this.init_events();
 }
 /** Properties */
@@ -770,6 +780,7 @@ M.core_dock.item.prototype.active =             M.core_dock.abstract_item_class.
 M.core_dock.item.prototype.panel =              M.core_dock.abstract_item_class.panel;
 M.core_dock.item.prototype.preventhide =        M.core_dock.abstract_item_class.preventhide;
 M.core_dock.item.prototype.cfg =                M.core_dock.cfg;
+M.core_dock.item.prototype.blockclass =         null;
 M.core_dock.item.prototype.delayhiderunning =   false;
 M.core_dock.item.prototype.delayhidetimeout =   1000; // 1 Second
 /** Methods **/
diff --git a/blocks/global_navigation_tree/styles.css b/blocks/global_navigation_tree/styles.css
new file mode 100644
index 00000000000..066e25f6ee1
--- /dev/null
+++ b/blocks/global_navigation_tree/styles.css
@@ -0,0 +1,22 @@
+/** JavaScript state rules **/
+.jsenabled .block_global_navigation_tree.dock_on_load,
+.block_global_navigation_tree .block_tree_box .requiresjs {display:none;}
+.jsenabled .block_global_navigation_tree .block_tree_box .requiresjs {display:inline;}
+
+/** General display rules **/
+.block_global_navigation_tree .block_tree {margin:5px;padding-left:0px;overflow-x:auto;overflow-y:visible;}
+.block_global_navigation_tree .block_tree li {margin:0;list-style: none;}
+.block_global_navigation_tree .block_tree li ul {padding-left:16px;margin:0;}
+.block_global_navigation_tree .block_tree .tree_item {white-space:nowrap;margin:2px 0px;padding-left: 16px;margin:3px 0px;white-space:nowrap;text-align:left;}
+.block_global_navigation_tree .block_tree .tree_item.branch {background-image: url([[pix:t/expanded]]);background-position: center left;background-repeat: no-repeat;}
+.block_global_navigation_tree .block_tree .root_node.leaf {padding-left:0px;}
+.block_global_navigation_tree .block_tree .current_branch {font-weight:bold;}
+.jsenabled .block_global_navigation_tree .block_tree .tree_item.branch {cursor:pointer;}
+.jsenabled .block_global_navigation_tree .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty]]);background-position: center left;background-repeat: no-repeat;}
+.jsenabled .block_global_navigation_tree .block_tree .collapsed ul {display: none;}
+.jsenabled .block_global_navigation_tree .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed]]);}
+
+/** Internet explorer specific rules **/
+.ie6 .block_global_navigation_tree .block_tree,
+.ie7 .block_global_navigation_tree .block_tree {overflow-x:scroll;}
+.ie6 .block_global_navigation_tree .block_tree .tree_item {width:100%;}
\ No newline at end of file
diff --git a/blocks/messages/styles.css b/blocks/messages/styles.css
new file mode 100644
index 00000000000..da66e10ff9c
--- /dev/null
+++ b/blocks/messages/styles.css
@@ -0,0 +1,4 @@
+.block_messages .content {text-align:left;font-size:0.75em;padding-top:5px;}
+.block_messages .content .list li.listentry {clear:both;}
+.block_messages .content .list li.listentry div.user {float:left;}
+.block_messages .content .list li.listentry div.message {float:right;}
\ No newline at end of file
diff --git a/blocks/online_users/styles.css b/blocks/online_users/styles.css
new file mode 100644
index 00000000000..26640042994
--- /dev/null
+++ b/blocks/online_users/styles.css
@@ -0,0 +1,3 @@
+.block_online_users .content .list li.listentry {clear:both;}
+.block_online_users .content .list li.listentry div.user {float:left;}
+.block_online_users .content .list li.listentry div.message {float:right;}
\ No newline at end of file
diff --git a/blocks/quiz_results/styles.css b/blocks/quiz_results/styles.css
new file mode 100644
index 00000000000..1a3fabc0cb7
--- /dev/null
+++ b/blocks/quiz_results/styles.css
@@ -0,0 +1,6 @@
+.block_quiz_results {text-align: center;}
+.block_quiz_results h1 {margin: 4px;font-size: 1.1em;}
+.block_quiz_results table.grades {text-align: left;width: 100%;}
+.block_quiz_results table.grades .number,
+.block_quiz_results table.grades .grade {text-align: right;width: 10%;}
+.block_quiz_results table.grades caption {margin: 1em 0px 0px 0px;border-bottom-width: 1px;border-bottom-style: solid;font-weight: bold;}
\ No newline at end of file
diff --git a/blocks/recent_activity/styles.css b/blocks/recent_activity/styles.css
new file mode 100644
index 00000000000..93625406be7
--- /dev/null
+++ b/blocks/recent_activity/styles.css
@@ -0,0 +1,2 @@
+.block_recent_activity .activitydate,
+.block_recent_activity .activityhead {text-align:center;}
\ No newline at end of file
diff --git a/blocks/rss_client/styles.php b/blocks/rss_client/styles.php
deleted file mode 100644
index 35298cfd207..00000000000
--- a/blocks/rss_client/styles.php
+++ /dev/null
@@ -1,54 +0,0 @@
-.block_rss_client .link {
-  border-top:1px solid;
-  border-top-color:#DDDDDD;
-  padding-bottom:5px;
-  font-size:0.82em;
-}
-
-.block_rss_client .description {
-  color:#555555;
-  font-size:0.78em;
-  padding-left:10px;
-  padding-bottom:8px;
-}
-
-.block_rss_client .title {
-  font-size:1.0em;
-}
-
-.block_rss_client .image {
-}
-
-.blockconfigtable #rssfeeds {
-    margin-left: auto;
-    margin-right: auto;
-    background-color: blue;
-}
-
-.blockconfigtable #rssfeeds td.actions {
-    text-align: center;
-    vertical-align: middle;
-    padding: 10px;
-}
-
-.blockconfigtable #rssfeeds td.feed {
-    vertical-align: middle;
-    padding: 5px;
-}
-
-.blockconfigtable #rssfeeds .title {
-    font-weight: bold;
-    margin-bottom: 2px;
-}
-
-.blockconfigtable #rssfeeds .url, .blockconfigtable #rssfeeds .description {
-    font-size: 0.8em;
-}
-
-.blockconfigtable #rssfeeds tr.r0 {
-  background-color: #ffffff;
-}
-
-.blockconfigtable #rssfeeds tr.r1 {
-  background-color: #f0f0f0;
-}
diff --git a/blocks/search_forums/styles.css b/blocks/search_forums/styles.css
new file mode 100644
index 00000000000..f424ebf641d
--- /dev/null
+++ b/blocks/search_forums/styles.css
@@ -0,0 +1,4 @@
+.block_search_forums .searchform {text-align: center;}
+.block_search_forums .searchform img {vertical-align: middle;}
+.block_search_forums .searchform img.resize {width: 1em;height: 1.1em;}
+.block_search_forums .invisiblefieldset {display: block;}
\ No newline at end of file
diff --git a/blocks/settings_navigation_tree/styles.css b/blocks/settings_navigation_tree/styles.css
new file mode 100644
index 00000000000..ab56a3b1e42
--- /dev/null
+++ b/blocks/settings_navigation_tree/styles.css
@@ -0,0 +1,22 @@
+/** JavaScript state rules **/
+.jsenabled .block_settings_navigation_tree.dock_on_load,
+.block_settings_navigation_tree .block_tree_box .requiresjs {display:none;}
+.jsenabled .block_settings_navigation_tree .block_tree_box .requiresjs {display:inline;}
+
+/** General display rules **/
+.block_settings_navigation_tree .block_tree {margin:5px;padding-left:0px;overflow-x:auto;overflow-y:visible;}
+.block_settings_navigation_tree .block_tree li {margin:0;list-style: none;}
+.block_settings_navigation_tree .block_tree li ul {padding-left:16px;margin:0;}
+.block_settings_navigation_tree .block_tree .tree_item {white-space:nowrap;margin:2px 0px;padding-left: 16px;margin:3px 0px;white-space:nowrap;text-align:left;}
+.block_settings_navigation_tree .block_tree .tree_item.branch {background-image: url([[pix:t/expanded]]);background-position: center left;background-repeat: no-repeat;}
+.block_settings_navigation_tree .block_tree .root_node.leaf {padding-left:0px;}
+.block_settings_navigation_tree .block_tree .current_branch {font-weight:bold;}
+.jsenabled .block_settings_navigation_tree .block_tree .tree_item.branch {cursor:pointer;}
+.jsenabled .block_settings_navigation_tree .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty]]);background-position: center left;background-repeat: no-repeat;}
+.jsenabled .block_settings_navigation_tree .block_tree .collapsed ul {display: none;}
+.jsenabled .block_settings_navigation_tree .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed]]);}
+
+/** Internet explorer specific rules **/
+.ie6 .block_settings_navigation_tree .block_tree,
+.ie7 .block_settings_navigation_tree .block_tree {overflow-x:scroll;}
+.ie6 .block_settings_navigation_tree .block_tree .tree_item {width:100%;}
\ No newline at end of file
diff --git a/blocks/tag_flickr/styles.css b/blocks/tag_flickr/styles.css
new file mode 100644
index 00000000000..7351ce80eb4
--- /dev/null
+++ b/blocks/tag_flickr/styles.css
@@ -0,0 +1 @@
+.block_tag_flickr .flickr-photos {padding:3px;}
\ No newline at end of file
diff --git a/blocks/tag_youtube/styles.css b/blocks/tag_youtube/styles.css
new file mode 100644
index 00000000000..1def4e3d0f7
--- /dev/null
+++ b/blocks/tag_youtube/styles.css
@@ -0,0 +1,2 @@
+.block_tag_youtube .youtube-thumb {padding: 3px;padding-bottom: 0.5em;display: block;float: left;}
+.block_tag_youtube .yt-video-entry li {clear: left;}
\ No newline at end of file
diff --git a/blocks/tags/styles.css b/blocks/tags/styles.css
new file mode 100644
index 00000000000..59b1afcca48
--- /dev/null
+++ b/blocks/tags/styles.css
@@ -0,0 +1,11 @@
+.block_tags {}
+.block_tags #coursetag {}
+.block_tags #coursetag .coursetag_form_wrapper {}
+.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner {position: relative;}
+.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input1 {position: relative;top: 0;left: 0;z-index: 1;width:100%;}
+.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input2 {position: absolute;top: 0;left: 0;z-index: 2;width:100%;}
+.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input3 {position: absolute;top: 3px;left: 12.8em;display: none;}
+.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input1a {background-color: white; border: 1px solid #999;width: 12em;padding: 2px;}
+.block_tags #coursetag .coursetag_form_wrapper .coursetag_form_positioner .coursetag_form_input2a {background-color: transparent; border: 1px solid #999;width: 12em;color: #669954;padding: 2px;}
+.block_tags .coursetag_morelink {}
+.block_tags .coursetag_list {}
\ No newline at end of file
diff --git a/blocks/tags/styles.php b/blocks/tags/styles.php
deleted file mode 100644
index e7344b18445..00000000000
--- a/blocks/tags/styles.php
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * CSS for course tags
- * @author j.beedell@open.ac.uk July07
- *
- * Styles for block_tags.php
- */
-
-.coursetag_form_wrapper {
-    margin: auto;
-    width: 13em;
-}
-
-.coursetag_form_positioner {
-    position: relative;
-    margin: 5px 0 0 0;
-    height: 25px;
-}
-
-.coursetag_form_input1 {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 1;
-}
-
-.coursetag_form_input2 {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 2;
-}
-
-.coursetag_form_input3 {
-    position: absolute;
-    top: 3px;
-    left: 12.8em;
-    display: none;
-}
-
-.coursetag_form_input1a {
-    background-color: white;
-    border: 1px solid #999;
-    width: 12em;
-    padding: 2px;
-}
-
-.coursetag_form_input2a {
-    background: transparent;
-    color: #669954;
-    border: 1px solid #999;
-    width: 12em;
-    padding: 2px;
-}
-
-.coursetag_morelink {
-    float: right;
-    font-size: 0.8em;
-    margin: -5px 5px 5px 0;
-}
-
-.coursetag_list {
-    padding-top: 4px;
-}
-
-/* Styles for coursetag_edit.php */
-
-.coursetag_edit_centered {
-    position: relative;
-    width: 600px;
-    margin: 20px auto;
-}
-
-.coursetag_edit_row {
-    margin: 5px 0 5px 0;
-    height: 30px;
-}
-
-.coursetag_edit_left {
-    position: relative;
-    float: left;
-    padding: 3px 5px;
-}
-
-.coursetag_edit_right {
-    position: relative;
-    float: left;
-    padding: 3px 0px;
-}
-
-.coursetag_edit_input3 {
-    position: relative;
-    left: 10.5em;
-    display: none;
-}
-
-/* Styles for coursetag_more.php */
-
-.coursetag_more_title {
-    margin: 30px 30px -25px 30px;
-}
-
-.coursetag_more_tags {
-    margin: 30px;
-}
-
-.coursetag_more_large {
-    font-size: 120%
-}
-
-.coursetag_more_small {
-    font-size: 80%
-}
-
-.coursetag_more_link {
-    font-size: 80%;
-}
diff --git a/calendar/event.php b/calendar/event.php
index f484c223bd0..e59819b59d7 100644
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -208,7 +208,7 @@ $PAGE->set_heading($strcalendar);
 echo $OUTPUT->header();
 
 
-echo '<table id="calendar">';
+echo '<table class="calendarlayout">';
 echo '<tr><td class="maincalendar">';
 echo $OUTPUT->heading($title);
 $mform->display();
diff --git a/calendar/export.php b/calendar/export.php
index e4aeca27b70..0fb11f8579d 100644
--- a/calendar/export.php
+++ b/calendar/export.php
@@ -139,7 +139,7 @@ $PAGE->set_focuscontrol('eventform.name');
 echo $OUTPUT->header();
 
 // Layout the whole page as three big columns.
-echo '<table id="calendar">';
+echo '<table class="calendarlayout">';
 echo '<tr>';
 
 // START: Main column
diff --git a/calendar/lib.php b/calendar/lib.php
index 8aebe110ae8..8392b892985 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -194,7 +194,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
 
     $summary = get_string('calendarheading', 'calendar', userdate(make_timestamp($y, $m), get_string('strftimemonthyear')));
     $summary = get_string('tabledata', 'access', $summary);
-    $content .= '<table class="minicalendar" summary="'.$summary.'">'; // Begin table
+    $content .= '<table class="minicalendar calendartable" summary="'.$summary.'">'; // Begin table
     $content .= '<tr class="weekdays">'; // Header row: day names
 
     // Print out the names of the weekdays
@@ -229,14 +229,14 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
         if(CALENDAR_WEEKEND & (1 << ($dayweek % 7))) {
             // Weekend. This is true no matter what the exact range is.
             $class = 'weekend day';
-        }
-        else {
+        } else {
             // Normal working day.
             $class = 'day';
         }
 
         // Special visual fx if an event is defined
         if(isset($eventsbyday[$day])) {
+            $class .= ' hasevent';
             $dayhref = calendar_get_link_href(CALENDAR_URL.'view.php?view=day'.$morehref.'&amp;', $day, $m, $y);
 
             // OverLib popup
@@ -275,34 +275,31 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
 
             // Class and cell content
             if(isset($typesbyday[$day]['startglobal'])) {
-                $class .= ' event_global';
-            }
-            else if(isset($typesbyday[$day]['startcourse'])) {
-                $class .= ' event_course';
-            }
-            else if(isset($typesbyday[$day]['startgroup'])) {
-                $class .= ' event_group';
-            }
-            else if(isset($typesbyday[$day]['startuser'])) {
-                $class .= ' event_user';
+                $class .= ' calendar_event_global';
+            } else if(isset($typesbyday[$day]['startcourse'])) {
+                $class .= ' calendar_event_course';
+            } else if(isset($typesbyday[$day]['startgroup'])) {
+                $class .= ' calendar_event_group';
+            } else if(isset($typesbyday[$day]['startuser'])) {
+                $class .= ' calendar_event_user';
             }
             $cell = '<a href="'.$dayhref.'" '.$popup.'>'.$day.'</a>';
-        }
-        else {
+        } else {
             $cell = $day;
         }
 
-        if(isset($typesbyday[$day]['durationglobal'])) {
-            $class .= ' duration_global';
+        $durationclass = false;
+        if (isset($typesbyday[$day]['durationglobal'])) {
+            $durationclass = ' duration_global';
+        } else if(isset($typesbyday[$day]['durationcourse'])) {
+            $durationclass = ' duration_course';
+        } else if(isset($typesbyday[$day]['durationgroup'])) {
+            $durationclass = ' duration_group';
+        } else if(isset($typesbyday[$day]['durationuser'])) {
+            $durationclass = ' duration_user';
         }
-        else if(isset($typesbyday[$day]['durationcourse'])) {
-            $class .= ' duration_course';
-        }
-        else if(isset($typesbyday[$day]['durationgroup'])) {
-            $class .= ' duration_group';
-        }
-        else if(isset($typesbyday[$day]['durationuser'])) {
-            $class .= ' duration_user';
+        if ($durationclass) {
+            $class .= ' duration '.$durationclass;
         }
 
         // If event has a class set then add it to the table day <td> tag
@@ -515,18 +512,18 @@ function calendar_add_event_metadata($event) {
 
     } else if($event->courseid == SITEID) {                              // Site event
         $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/site') . '" alt="'.get_string('globalevent', 'calendar').'" style="vertical-align: middle;" />';
-        $event->cssclass = 'event_global';
+        $event->cssclass = 'calendar_event_global';
     } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) {          // Course event
         calendar_get_course_cached($coursecache, $event->courseid);
         $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/course') . '" alt="'.get_string('courseevent', 'calendar').'" style="vertical-align: middle;" />';
         $event->courselink = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$event->courseid.'">'.$coursecache[$event->courseid]->fullname.'</a>';
-        $event->cssclass = 'event_course';
+        $event->cssclass = 'calendar_event_course';
     } else if ($event->groupid) {                                    // Group event
         $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/group') . '" alt="'.get_string('groupevent', 'calendar').'" style="vertical-align: middle;" />';
-        $event->cssclass = 'event_group';
+        $event->cssclass = 'calendar_event_group';
     } else if($event->userid) {                                      // User event
         $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/user') . '" alt="'.get_string('userevent', 'calendar').'" style="vertical-align: middle;" />';
-        $event->cssclass = 'event_user';
+        $event->cssclass = 'calendar_event_user';
     }
     return $event;
 }
@@ -845,14 +842,14 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
 
     $content .= '<tr>';
     if($SESSION->cal_show_global) {
-        $content .= '<td class="eventskey event_global" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
+        $content .= '<td class="eventskey calendar_event_global" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
         $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showglobal'.$getvars.'" title="'.get_string('tt_hideglobal', 'calendar').'">'.get_string('global', 'calendar').'</a></td>'."\n";
     } else {
         $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
         $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showglobal'.$getvars.'" title="'.get_string('tt_showglobal', 'calendar').'">'.get_string('global', 'calendar').'</a></td>'."\n";
     }
     if($SESSION->cal_show_course) {
-        $content .= '<td class="eventskey event_course" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidecourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
+        $content .= '<td class="eventskey calendar_event_course" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidecourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
         $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showcourses'.$getvars.'" title="'.get_string('tt_hidecourse', 'calendar').'">'.get_string('course', 'calendar').'</a></td>'."\n";
     } else {
         $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_showcourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
@@ -867,7 +864,7 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
         if($groupevents) {
             // This course MIGHT have group events defined, so show the filter
             if($SESSION->cal_show_groups) {
-                $content .= '<td class="eventskey event_group" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidegroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
+                $content .= '<td class="eventskey calendar_event_group" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidegroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
                 $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showgroups'.$getvars.'" title="'.get_string('tt_hidegroups', 'calendar').'">'.get_string('group', 'calendar').'</a></td>'."\n";
             } else {
                 $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showgroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
@@ -878,7 +875,7 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
             $content .= '<td style="width: 11px;"></td><td>&nbsp;</td>'."\n";
         }
         if($SESSION->cal_show_user) {
-            $content .= '<td class="eventskey event_user" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
+            $content .= '<td class="eventskey calendar_event_user" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
             $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showuser'.$getvars.'" title="'.get_string('tt_hideuser', 'calendar').'">'.get_string('user', 'calendar').'</a></td>'."\n";
         } else {
             $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
@@ -1092,22 +1089,22 @@ function calendar_events_by_day($events, $month, $year, &$eventsbyday, &$duratio
             if($event->courseid == SITEID && $event->groupid == 0) {
                 $typesbyday[$eventdaystart]['startglobal'] = true;
                 // Set event class for global event
-                $events[$event->id]->class = 'event_global';
+                $events[$event->id]->class = 'calendar_event_global';
             }
             else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) {
                 $typesbyday[$eventdaystart]['startcourse'] = true;
                 // Set event class for course event
-                $events[$event->id]->class = 'event_course';
+                $events[$event->id]->class = 'calendar_event_course';
             }
             else if($event->groupid) {
                 $typesbyday[$eventdaystart]['startgroup'] = true;
                 // Set event class for group event
-                $events[$event->id]->class = 'event_group';
+                $events[$event->id]->class = 'calendar_event_group';
             }
             else if($event->userid) {
                 $typesbyday[$eventdaystart]['startuser'] = true;
                 // Set event class for user event
-                $events[$event->id]->class = 'event_user';
+                $events[$event->id]->class = 'calendar_event_user';
             }
         }
 
diff --git a/calendar/view.php b/calendar/view.php
index edd5cd10878..dce28d88ef5 100644
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -157,7 +157,7 @@ $PAGE->set_button($prefsbutton);
 echo $OUTPUT->header();
 
 // Layout the whole page as three big columns.
-echo '<table id="calendar" style="height:100%;">';
+echo '<table class="calendarlayout">';
 echo '<tr>';
 
 // START: Main column
@@ -423,7 +423,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
     echo '</div>';
 
     // Start calendar display
-    echo '<table class="calendarmonth"><tr class="weekdays">'; // Begin table. First row: day names
+    echo '<table class="calendarmonth calendartable"><tr class="weekdays">'; // Begin table. First row: day names
 
     // Print out the names of the weekdays
     for($i = $display->minwday; $i <= $display->maxwday; ++$i) {
@@ -480,17 +480,18 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
         }
 
         // Special visual fx if an event spans many days
-        if(isset($typesbyday[$day]['durationglobal'])) {
-            $class .= ' duration_global';
+        $durationclass = false;
+        if (isset($typesbyday[$day]['durationglobal'])) {
+            $durationclass = ' duration_global';
+        } else if(isset($typesbyday[$day]['durationcourse'])) {
+            $durationclass = ' duration_course';
+        } else if(isset($typesbyday[$day]['durationgroup'])) {
+            $durationclass = ' duration_group';
+        } else if(isset($typesbyday[$day]['durationuser'])) {
+            $durationclass = ' duration_user';
         }
-        else if(isset($typesbyday[$day]['durationcourse'])) {
-            $class .= ' duration_course';
-        }
-        else if(isset($typesbyday[$day]['durationgroup'])) {
-            $class .= ' duration_group';
-        }
-        else if(isset($typesbyday[$day]['durationuser'])) {
-            $class .= ' duration_user';
+        if ($durationclass) {
+            $class .= ' duration '.$durationclass;
         }
 
         // Special visual fx for today
@@ -543,7 +544,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
 
     // Global events
     if($SESSION->cal_show_global) {
-        echo '<td class="event_global" style="width: 8px;"></td><td><strong>'.get_string('globalevents', 'calendar').':</strong> ';
+        echo '<td class="calendar_event_global" style="width: 8px;"></td><td><strong>'.get_string('globalevents', 'calendar').':</strong> ';
         echo get_string('shown', 'calendar').' (<a href="'.CALENDAR_URL.'set.php?var=showglobal&amp;'.$getvars.'">'.get_string('clickhide', 'calendar').'</a>)</td>'."\n";
     } else {
         echo '<td style="width: 8px;"></td><td><strong>'.get_string('globalevents', 'calendar').':</strong> ';
@@ -552,7 +553,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
 
     // Course events
     if(!empty($SESSION->cal_show_course)) {
-        echo '<td class="event_course" style="width: 8px;"></td><td><strong>'.get_string('courseevents', 'calendar').':</strong> ';
+        echo '<td class="calendar_event_course" style="width: 8px;"></td><td><strong>'.get_string('courseevents', 'calendar').':</strong> ';
         echo get_string('shown', 'calendar').' (<a href="'.CALENDAR_URL.'set.php?var=showcourses&amp;'.$getvars.'">'.get_string('clickhide', 'calendar').'</a>)</td>'."\n";
     } else {
         echo '<td style="width: 8px;"></td><td><strong>'.get_string('courseevents', 'calendar').':</strong> ';
@@ -565,7 +566,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
         echo '<tr>';
         // Group events
         if($SESSION->cal_show_groups) {
-            echo '<td class="event_group" style="width: 8px;"></td><td><strong>'.get_string('groupevents', 'calendar').':</strong> ';
+            echo '<td class="calendar_event_group" style="width: 8px;"></td><td><strong>'.get_string('groupevents', 'calendar').':</strong> ';
             echo get_string('shown', 'calendar').' (<a href="'.CALENDAR_URL.'set.php?var=showgroups&amp;'.$getvars.'">'.get_string('clickhide', 'calendar').'</a>)</td>'."\n";
         } else {
             echo '<td style="width: 8px;"></td><td><strong>'.get_string('groupevents', 'calendar').':</strong> ';
@@ -573,7 +574,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
         }
         // User events
         if($SESSION->cal_show_user) {
-            echo '<td class="event_user" style="width: 8px;"></td><td><strong>'.get_string('userevents', 'calendar').':</strong> ';
+            echo '<td class="calendar_event_user" style="width: 8px;"></td><td><strong>'.get_string('userevents', 'calendar').':</strong> ';
             echo get_string('shown', 'calendar').' (<a href="'.CALENDAR_URL.'set.php?var=showuser&amp;'.$getvars.'">'.get_string('clickhide', 'calendar').'</a>)</td>'."\n";
         } else {
             echo '<td style="width: 8px;"></td><td><strong>'.get_string('userevents', 'calendar').':</strong> ';
diff --git a/course/format/topics/styles.css b/course/format/topics/styles.css
new file mode 100644
index 00000000000..5342d30e2af
--- /dev/null
+++ b/course/format/topics/styles.css
@@ -0,0 +1,6 @@
+.course-content ul.topics {margin:0;}
+.course-content ul.topics li.section {list-style: none;margin:5px 0 0 0;padding:0;}
+.course-content ul.topics li.section .content {margin:0 40px;}
+.course-content ul.topics li.section .left {width:40px;float:left;text-align:center;}
+.course-content ul.topics li.section .right {width:40px;float:right;text-align:center;}
+.jumpmenu {text-align:center;}
\ No newline at end of file
diff --git a/course/format/weeks/styles.css b/course/format/weeks/styles.css
new file mode 100644
index 00000000000..a4c802a8b11
--- /dev/null
+++ b/course/format/weeks/styles.css
@@ -0,0 +1,6 @@
+.course-content ul.weeks {margin:0;}
+.course-content ul.weeks li.section {list-style: none;margin:5px 0 0 0;padding:0;}
+.course-content ul.weeks li.section .content {margin:0 40px;}
+.course-content ul.weeks li.section .left {width:40px;float:left;text-align:center;}
+.course-content ul.weeks li.section .right {width:40px;float:right;text-align:center;}
+.jumpmenu {text-align:center;}
\ No newline at end of file
diff --git a/course/lib.php b/course/lib.php
index 7322f7a0644..d3f6b0c720e 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -346,7 +346,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
     echo $OUTPUT->paging_bar($totalcount, $page, $perpage, "$url&perpage=$perpage");
 
     $table = new html_table();
-    $table->classes = array('logtable','generalbox','boxaligncenter');
+    $table->classes = array('logtable','generalbox');
     $table->align = array('right', 'left', 'left');
     $table->head = array(
         get_string('time'),
@@ -2164,9 +2164,9 @@ function print_course($course, $highlightterms = '') {
 
     echo '<div class="coursebox clearfix">';
     echo '<div class="info">';
-    echo '<div class="name"><a title="'.get_string('entercourse').'"'.
+    echo '<h3 class="name"><a title="'.get_string('entercourse').'"'.
          $linkcss.' href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'.
-         highlight($highlightterms, format_string($course->fullname)).'</a></div>';
+         highlight($highlightterms, format_string($course->fullname)).'</a></h3>';
 
     /// first find all roles that are supposed to be displayed
 
diff --git a/grade/edit/outcome/import.php b/grade/edit/outcome/import.php
index d73214370b4..8b49ac7e17f 100644
--- a/grade/edit/outcome/import.php
+++ b/grade/edit/outcome/import.php
@@ -133,7 +133,7 @@ if ($handle = fopen($imported_file['userfile']['tmp_name'], 'r')) {
                 }
             }
             if ($error) {
-                echo $OUTPUT->box_start('generalbox importoutcomenofile');
+                echo $OUTPUT->box_start('generalbox importoutcomenofile buttons');
                 echo get_string('importoutcomenofile', 'grades', $line);
                 echo $OUTPUT->single_button(new moodle_url('/grade/edit/outcome/index.php', array('id'=> $courseid)), get_string('back'), 'get');
                 echo $OUTPUT->box_end();
diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
index 4ce042cdfd5..2e033060b1a 100644
--- a/grade/edit/tree/index.php
+++ b/grade/edit/tree/index.php
@@ -336,7 +336,7 @@ echo '</div></form>';
 echo $OUTPUT->box_end();
 
 // Print action buttons
-echo $OUTPUT->container_start('buttons');
+echo $OUTPUT->container_start('buttons mdl-align');
 
 if ($moving) {
     echo $OUTPUT->single_button(new moodle_url('index.php', array('id'=>$course->id)), get_string('cancel'), 'get');
diff --git a/grade/report/user/styles.css b/grade/report/user/styles.css
new file mode 100644
index 00000000000..3a44289ff67
--- /dev/null
+++ b/grade/report/user/styles.css
@@ -0,0 +1,36 @@
+.path-grade-report-user table.user-grade .datesubmitted {font-size: 0.7em;}
+.path-grade-report-user table.user-grade .courseitem,
+.path-grade-report-user table.user-grade .categoryitem {font-weight: bold;}
+.path-grade-report-user table.user-grade td.cell {padding-left: 5px;padding-right: 5px;}
+#graded_users_selector {float: right;text-align: right;}
+
+/* this must be last if we want to override other category and course item colors */
+.path-grade-report-user table.user-grade .hidden,
+.path-grade-report-user table.user-grade .hidden a {color:#aaaaaa;}
+table.user-grade {border: 1px solid black;margin: auto;padding: 0.25em;font-size: 0.8em;}
+table.user-grade td {margin: 1px;padding: 0.25em;}
+table.user-grade thead {border-bottom: 3px double black;}
+table.user-grade thead th {padding: 0.25em 0.75em;}
+table.user-grade td.oddd1 {background-color: #f3dfd0;}
+table.user-grade td.oddd2 {background-color: #d0dbf3;}
+table.user-grade td.oddd3 {background-color: #d0f3d6;}
+table.user-grade td.oddd4 {background-color: #f0f0aa;}
+table.user-grade td.evend2 {background-color: #b0bbd3;}
+table.user-grade td.evend3 {background-color: #b0dfb6;}
+table.user-grade td.evend4 {background-color: #cac8be;}
+table.user-grade td.b1t,
+table.user-grade td.b2t {border-top: 2px solid black;}
+table.user-grade td.b1r,
+table.user-grade td.b2r {border-right: 2px solid black;}
+table.user-grade td.b1b,
+table.user-grade td.b2b {border-bottom: 2px solid black;}
+table.user-grade td.b1l,
+table.user-grade td.b2l {border-left: 2px solid black;}
+table.user-grade td.baggt,
+table.user-grade td.baggb {font-style: italic;font-weight: bold;}
+table.user-grade td.baggt {border-top: 3px double black;}
+table.user-grade td.baggb {border-bottom: 3px double black;}
+table.user-grade td.item {border-left: 1px solid gray;border-right: 1px solid gray;}
+table.user-grade td.excluded {background-color: #666;}
+table.user-grade td.hidden {color: #aaa;}
+table.user-grade td {min-width: 0.5em;vertical-align: top;}
\ No newline at end of file
diff --git a/grade/report/user/styles.php b/grade/report/user/styles.php
deleted file mode 100644
index 87786c32ef1..00000000000
--- a/grade/report/user/styles.php
+++ /dev/null
@@ -1,121 +0,0 @@
-.grade-report-user table.user-grade .datesubmitted {
-  font-size: 0.7em;
-}
-
-.grade-report-user table.user-grade .courseitem,
-.grade-report-user table.user-grade .categoryitem {
-  font-weight: bold;
-}
-
-.grade-report-user table.user-grade td.cell {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-#graded_users_selector {
-  float: right;
-  text-align: right;
-}
-
-/* this must be last if we want to override other category and course item colors */
-.grade-report-user table.user-grade .hidden,
-.grade-report-user table.user-grade .hidden a {
-  color:#aaaaaa;
-}
-
-table.user-grade {
-   border: 1px solid black;
-   margin: auto;
-   padding: 0.25em;
-   font-size: 0.8em;
-}
-table.user-grade td {
-   margin: 1px;
-   padding: 0.25em;
-}
-table.user-grade thead {
-   border-bottom: 3px double black;
-}
-table.user-grade thead th {
-   padding: 0.25em 0.75em 0.25em 0.75em;
-}
-
-table.user-grade td.oddd1 {
-   background-color: #f3dfd0;
-}
-table.user-grade td.oddd2 {
-   background-color: #d0dbf3;
-}
-table.user-grade td.oddd3 {
-   background-color: #d0f3d6;
-}
-table.user-grade td.oddd4 {
-   background-color: #f0f0aa;
-}
-
-table.user-grade td.evend2 {
-   background-color: #b0bbd3;
-}
-table.user-grade td.evend3 {
-   background-color: #b0dfb6;
-}
-table.user-grade td.evend4 {
-   background-color: #cac8be;
-}
-
-table.user-grade td.b1t {
-   border-top: 1px solid black;
-}
-table.user-grade td.b1r {
-   border-right: 1px solid black;
-}
-table.user-grade td.b1b {
-   border-bottom: 1px solid black;
-}
-table.user-grade td.b1l {
-   border-left: 1px solid black;
-}
-
-table.user-grade td.b2t {
-   border-top: 2px solid black;
-}
-table.user-grade td.b2r {
-   border-right: 2px solid black;
-}
-table.user-grade td.b2b {
-   border-bottom: 2px solid black;
-}
-table.user-grade td.b2l {
-   border-left: 2px solid black;
-}
-
-table.user-grade td.baggt,
-table.user-grade td.baggb {
-   font-style: italic;
-   font-weight: bold;
-}
-table.user-grade td.baggt {
-   border-top: 3px double black;
-}
-table.user-grade td.baggb {
-   border-bottom: 3px double black;
-}
-
-table.user-grade td.item {
-   border-left: 1px solid gray;
-   border-right: 1px solid gray;
-}
-table.user-grade td.excluded {
-   /*text-decoration: line-through;*/
-   background-color: #666;
-}
-table.user-grade td.hidden {
-   color: #aaa;
-}
-
-table.user-grade td {
-   min-width: 0.5em;
-   vertical-align: top;
-}
-
-
diff --git a/lib/adminlib.php b/lib/adminlib.php
index a5c5d72e887..178e84c73df 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4769,8 +4769,8 @@ class admin_setting_manageauths extends admin_setting {
         $table = new html_table();
         $table->head  = array($txt->name, $txt->enable, $txt->updown, $txt->settings);
         $table->align = array('left', 'center', 'center', 'center');
-        $table->width = '90%';
         $table->data  = array();
+        $table->attributes['class'] = 'manageauthtable generaltable';
 
         //add always enabled plugins first
         $displayname = "<span>".$displayauths['manual']."</span>";
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 409291b3208..50ab40abc47 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3097,6 +3097,22 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         unset_config('regenloginsession');
         upgrade_main_savepoint($result, 2010031900);
     }
+
+    if ($result && $oldversion < 2010032400) {
+        // Upgrade all of those using the standardold theme to the use the standard
+        // theme instead
+        if ($CFG->theme == 'standardold') {
+            // The config setting that affects the whole site
+            set_config('theme', 'standard');
+        }
+        // Course Categories
+        $DB->execute('UPDATE {course_categories} SET theme=? WHERE theme=?', array('standard', 'standardold'));
+        // Course
+        $DB->execute('UPDATE {course} SET theme=? WHERE theme=?', array('standard', 'standardold'));
+        // User
+        $DB->execute('UPDATE {user} SET theme=? WHERE theme=?', array('standard', 'standardold'));
+        upgrade_main_savepoint($result, 2010032400);
+    }
     
     return $result;
 }
diff --git a/lib/installlib.php b/lib/installlib.php
index c28ec18ee91..0e095641335 100644
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -281,14 +281,14 @@ function install_print_header($config, $stagename, $heading, $stagetext) {
           <head>
           <link rel="shortcut icon" href="theme/standard/pix/favicon.ico" />';
 
-    $sheets = array('styles_layout', 'styles_fonts', 'styles_color', 'styles_moz');
+    $sheets = array('pagelayout','core');
     $csss = array();
     foreach ($sheets as $sheet) {
-        $csss[] = $CFG->wwwroot.'/theme/standard/'.$sheet.'.css';
+        $csss[] = $CFG->wwwroot.'/theme/base/style/'.$sheet.'.css';
     }
-    $sheets = array('gradients');
+    $sheets = array('core', 'css3');
     foreach ($sheets as $sheet) {
-        $csss[] = $CFG->wwwroot.'/theme/standardwhite/'.$sheet.'.css';
+        $csss[] = $CFG->wwwroot.'/theme/standard/style/'.$sheet.'.css';
     }
     foreach ($csss as $css) {
         echo '<link rel="stylesheet" type="text/css" href="'.$css.'" />'."\n";
@@ -302,12 +302,17 @@ function install_print_header($config, $stagename, $heading, $stagetext) {
 
     echo '</head><body class="notloggedin">
             <div id="page" class="stage'.$config->stage.'">
-                <div id="header" class=" clearfix"><h1 class="headermain">'.get_string('installation','install').'</h1>
-                    <div class="headermenu">&nbsp;</div></div><div class="navbar clearfix">
-                    <div class="breadcrumb">
-                        <ul><li class="first">'.$stagename.'</li></ul>
+                <div id="page-header">
+                    <div id="header" class=" clearfix">
+                        <h1 class="headermain">'.get_string('installation','install').'</h1>
+                        <div class="headermenu">&nbsp;</div>
+                    </div>
+                    <div class="navbar clearfix">
+                        <div class="breadcrumb">
+                            <ul><li class="first">'.$stagename.'</li></ul>
+                        </div>
+                        <div class="navbutton">&nbsp;</div>
                     </div>
-                    <div class="navbutton">&nbsp;</div>
                 </div>
           <!-- END OF HEADER -->
           <div id="installdiv">';
diff --git a/lib/outputlib.php b/lib/outputlib.php
index 885d064baf1..1f6b16c11dc 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -96,9 +96,8 @@ function theme_get_revision() {
 class theme_config {
     /**
      * @var string default theme, used when requested theme not found
-     *      TODO: MDL-21149 replace with some new default theme when implemented
      */
-    const DEFAULT_THEME = 'standardold';
+    const DEFAULT_THEME = 'standard';
 
     /**
      * You can base your theme on other themes by linking to the other theme as
diff --git a/lib/pagelib.php b/lib/pagelib.php
index 8f2b30519df..95e57e2ed13 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -149,6 +149,7 @@ class moodle_page {
 
     protected $_docspath = null;
 
+    /** @var string|null A legacy class that will be added to the body tag */
     protected $_legacyclass = null;
 
     protected $_url = null;
@@ -318,7 +319,7 @@ class moodle_page {
 
     /**
      * Please do not call this method directly, use the ->pagetype syntax. {@link __get()}.
-     * @return string e.g. 'my-index' or 'mod-quiz-attempt'. Same as the id attribute on <body>.
+     * @return string e.g. 'my-index' or 'mod-quiz-attempt'.
      */
     protected function magic_get_pagetype() {
         if (is_null($this->_pagetype) || isset($CFG->pagepath)) {
@@ -327,6 +328,14 @@ class moodle_page {
         return $this->_pagetype;
     }
 
+    /**
+     * Please do not call this method directly, use the ->pagetype syntax. {@link __get()}.
+     * @return string The id to use on the body tag, uses {@link magic_get_pagetype()}.
+     */
+    protected function magic_get_bodyid() {
+        return 'page-'.$this->pagetype;
+    }
+
     /**
      * Please do not call this method directly, use the ->pagelayout syntax. {@link __get()}.
      * @return string the general type of page this is. For example 'standard', 'popup', 'home'.
@@ -1211,11 +1220,14 @@ class moodle_page {
             $this->_legacyclass = 'course';
         } else if (substr($pagetype, 0, 6) == 'admin-') {
             $this->_legacyclass = 'admin';
-        } else {
-            $this->_legacyclass = substr($pagetype, 0, strrpos($pagetype, '-'));
         }
         $this->add_body_class($this->_legacyclass);
 
+        $pathbits = explode('-', trim($pagetype));
+        for ($i=1;$i<count($pathbits);$i++) {
+            $this->add_body_class('path-'.join('-',array_slice($pathbits, 0, $i)));
+        }
+
         $this->add_body_classes(get_browser_version_classes());
         $this->add_body_class('dir-' . get_string('thisdirection'));
         $this->add_body_class('lang-' . current_language());
diff --git a/mod/assignment/styles.css b/mod/assignment/styles.css
new file mode 100644
index 00000000000..9a9b74aa9cc
--- /dev/null
+++ b/mod/assignment/styles.css
@@ -0,0 +1,30 @@
+/** General Styles **/
+.path-mod-assignment .userpicture,
+.path-mod-assignment .picture.user,
+.path-mod-assignment .picture.teacher {width:35px;height: 35px;vertical-align:top;}
+.path-mod-assignment .feedback .files,
+.path-mod-assignment .feedback .grade,
+.path-mod-assignment .feedback .outcome,
+.path-mod-assignment .feedback .finalgrade {float: right;}
+.path-mod-assignment .feedback .disabledfeedback {width: 500px;height: 250px;}
+.path-mod-assignment .feedback .from {float: left;}
+.path-mod-assignment .files img {margin-right: 4px;}
+.path-mod-assignment .files a {white-space:nowrap;}
+
+/** Styles for submissions.php **/
+#page-mod-assignment-submissions form#options div {text-align:right;margin-left:auto;margin-right:20px;}
+#page-mod-assignment-submissions .header .commands {display: inline;}
+#page-mod-assignment-submissions .picture {width: 35px;}
+#page-mod-assignment-submissions .fullname,
+#page-mod-assignment-submissions .timemodified,
+#page-mod-assignment-submissions .timemarked {text-align: left;}
+#page-mod-assignment-submissions .submissions .grade,
+#page-mod-assignment-submissions .submissions .outcome,
+#page-mod-assignment-submissions .submissions .finalgrade {text-align: right;}
+#page-mod-assignment-submissions .qgprefs #optiontable {text-align:right;margin-left:auto;}
+
+/** Styles for view.php **/
+#page-mod-assignment-view .feedback {margin:10px auto;}
+#page-mod-assignment-view .feedback .grade {text-align: right;}
+#page-mod-assignment-view #online .singlebutton {text-align: center;}
+#page-mod-assignment-view #dates .c0 {text-align:right;font-weight:bold;}
\ No newline at end of file
diff --git a/mod/chat/styles.css b/mod/chat/styles.css
new file mode 100644
index 00000000000..4c6cc499979
--- /dev/null
+++ b/mod/chat/styles.css
@@ -0,0 +1,32 @@
+/** General Styles **/
+.path-mod-chat .chat-event .picture,
+.path-mod-chat .chat-message .picture {width:40px;vertical-align:top;}
+.path-mod-chat .chat-event .text,
+.path-mod-chat .chat-message .text {text-align: left;}
+.path-mod-chat #messages-list,
+.path-mod-chat #users-list {list-style-type:none;padding:0;margin:0}
+.path-mod-chat #chat-header {overflow: hidden;}
+
+/** styles for view.php **/
+#page-mod-chat-view #chatcurrentusers .chatuserdetails {vertical-align: middle;}
+
+/** Styles for basic chat **/
+#page-mod-chat-gui_basic #participants ul {margin:0;padding:0;list-style-type:none;}
+#page-mod-chat-gui_basic #participants ul li {display:inline;margin-right:10px;}
+#page-mod-chat-gui_basic #participants ul li .userinfo {display:inline;}
+#page-mod-chat-gui_basic #messages dl {padding:0;margin:1px;}
+#page-mod-chat-gui_basic #messages dd,
+#page-mod-chat-gui_basic #messages dt {margin-left:0;margin-right:5px;padding:0;display:inline;}
+
+/** Styles for header **/
+#page-mod-chat-gui_header_js-jsupdate .chat-event,
+#page-mod-chat-gui_header_js-jsupdate .chat-message {width:100%;}
+
+/** YUI Overrides **/
+.path-mod-chat .yui-layout-unit-top {background: #FFE39D;}
+.path-mod-chat .yui-layout-unit-right {border-top: 5px solid white;background: #FFD46B;}
+.path-mod-chat .yui-layout-unit-bottom {border-top: 5px solid white;background: #FFCB44;}
+.path-mod-chat .yui-layout .yui-layout-hd {border:0;}
+.path-mod-chat .yui-layout .yui-layout-unit div.yui-layout-bd {border:0;background: transparent;}
+.path-mod-chat .yui-layout .yui-layout-unit div.yui-layout-unit-right {background: white;}
+.path-mod-chat .yui-layout-doc .yui-layout-unit .yui-layout-wrap .yui-layout-hd h2 {font-size:100%;padding:0px;font-weight:normal;}
\ No newline at end of file
diff --git a/mod/choice/styles.css b/mod/choice/styles.css
new file mode 100644
index 00000000000..5cf1ef789d7
--- /dev/null
+++ b/mod/choice/styles.css
@@ -0,0 +1,10 @@
+.path-mod-choice .results {border-collapse: separate;}
+.path-mod-choice .results .data {vertical-align:top;white-space: nowrap;}
+.path-mod-choice .button {text-align:center;}
+.path-mod-choice .attemptcell {width:5px;white-space: nowrap;}
+.path-mod-choice .anonymous,
+.path-mod-choice .names {margin-left:auto;margin-right:auto;}
+.path-mod-choice .downloadreport {border-width:0;margin-left:auto;margin-right:auto;}
+.path-mod-choice .choiceresponse {width:100%;}
+.path-mod-choice .choiceresponse .picture {width:10px;white-space: nowrap;}
+.path-mod-choice .choiceresponse .fullname {width:100%;white-space: nowrap;}
\ No newline at end of file
diff --git a/mod/data/styles.css b/mod/data/styles.css
new file mode 100644
index 00000000000..33c672065d5
--- /dev/null
+++ b/mod/data/styles.css
@@ -0,0 +1,22 @@
+.path-mod-data .fieldadd,
+.path-mod-data .sortdefault,
+.path-mod-data .defaulttemplate,
+#page-mod-data-view .datapreferences,
+#page-mod-data-preset .presetmapping{text-align:center;}
+
+.path-mod-data-field .c0,
+#page-mod-data-view #sortsearch .c0 {text-align: right;}
+#page-mod-data-view .approve img.icon {width:34px;height:34px;}
+
+/** Styles for preset.php **/
+#page-mod-data-preset .presetmapping table {text-align: left;margin-left: auto;margin-right: auto;}
+#page-mod-data-preset .overwritesettings {margin-bottom: 1em;}
+#page-mod-data-preset table.presets {margin-left: auto;margin-right: auto;}
+
+/** Styles for field.php **/
+.path-mod-data-field .fieldadd,
+.path-mod-data-field .sortdefault {margin:1em 0;}
+.path-mod-data-field .fieldadd select,
+.path-mod-data-field .sortdefault select {margin-left: 1em;}
+.path-mod-data-field .fieldname,
+.path-mod-data-field .fielddescription {width:300px;}
\ No newline at end of file
diff --git a/mod/data/styles.php b/mod/data/styles.php
deleted file mode 100644
index 2772b4f98b3..00000000000
--- a/mod/data/styles.php
+++ /dev/null
@@ -1,49 +0,0 @@
-#mod-data-view #sortsearch .c0 {
-  text-align: right;
-}
-
-#mod-data-view .approve img.icon {
-  width:34px;
-  height:34px;
-}
-
-#mod-data-preset .presetmapping {
-  text-align: center;
-}
-
-#mod-data-preset .presetmapping table {
-  text-align: left;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-#mod-data-preset .overwritesettings {
-  margin-bottom: 1em;
-}
-
-.mod-data-field .c0 {
-  text-align: right;
-}
-
-.mod-data-field .fieldadd,
-.mod-data-field .sortdefault {
-  margin-bottom: 1em;
-  margin-top: 1em;
-}
-
-.mod-data-field .fieldadd select,
-.mod-data-field .sortdefault select {
-  margin-left: 1em;
-}
-
-.mod-data-field .fieldname {
-  width:300px;
-}
-
-.mod-data-field .fielddescription {
-  width:300px;
-}
-
-.presetcontrols form {
-  display: inline;
-}
diff --git a/mod/feedback/styles.php b/mod/feedback/styles.php
deleted file mode 100644
index 2cfc1968d8b..00000000000
--- a/mod/feedback/styles.php
+++ /dev/null
@@ -1,9 +0,0 @@
-/* styles using by feedback */
-.feedback_required_mark {
-    color: #FF0000;
-}
-
-.feedback_switchrequired img{
-}
-
-
diff --git a/mod/forum/styles.css b/mod/forum/styles.css
new file mode 100644
index 00000000000..4e50e1980bb
--- /dev/null
+++ b/mod/forum/styles.css
@@ -0,0 +1,48 @@
+/** General Styles **/
+.forumpost {border-width:1px;border-style:solid;border-collapse:separate;margin-top: 10px;}
+.forumpost .topic {padding: 4px;border-style:solid;border-width: 0px;border-bottom-width: 1px;}
+.forumpost .commands,
+.forumpost .ratings,
+.forumpost .attachments,
+.forumpost .footer,
+.forumpost .link,
+.path-mod-forum .forumolddiscuss,
+#page-mod-forum-search .c0 {text-align:right;}
+.forumpost .left {width: 35px;vertical-align: top;}
+.path-mod-forum .indent {margin-left: 30px;}
+.path-mod-forum .forumheaderlist {width: 100%;border-width:1px;border-style:solid;border-collapse:separate;margin-top: 10px;}
+.path-mod-forum .forumheaderlist td {border-width:1px 0px 0px 1px;border-style:solid;}
+.path-mod-forum .forumheaderlist .picture {width: 35px;}
+.path-mod-forum .forumheaderlist .discussion .starter {vertical-align: middle;}
+.path-mod-forum .forumheaderlist .discussion .lastpost {white-space: nowrap;text-align: right;}
+.path-mod-forum .forumheaderlist .replies,
+.path-mod-forum .forumheaderlist .discussion .author {white-space: nowrap;}
+
+/** Styles for subscribers.php */
+#page-mod-forum-subscribers .subscriberdiv,
+#page-mod-forum-subscribers .subscribertable {width:100%;vertical-align:top;}
+#page-mod-forum-subscribers .subscribertable tr td {vertical-align:top;}
+#page-mod-forum-subscribers .subscribertable tr td.actions {width:16%;padding-top:3em;}
+#page-mod-forum-subscribers .subscribertable tr td.actions .actionbutton {margin:0.3em 0;padding:0.5em 0;width:100%;}
+#page-mod-forum-subscribers .subscribertable tr td.existing,
+#page-mod-forum-subscribers .subscribertable tr td.potential {width:42%;}
+
+/** Styles for discuss.php **/
+#page-mod-forum-discuss .discussioncontrols td {width: 33%;text-align:center;}
+
+/** Styles for view.php **/
+#page-mod-forum-view .forumaddnew {margin-bottom: 20px;}
+#page-mod-forum-view .groupmenu {float: left;text-align:left;white-space: nowrap;}
+#page-mod-forum-index .subscription,
+#page-mod-forum-view .subscription {float: right;text-align:right;white-space: nowrap;margin: 5px 0;}
+
+/** Styles for search.php */
+#page-mod-forum-search .introcontent {padding: 15px;font-weight:bold;}
+
+#page-mod-forum-index .unread img,
+#page-mod-forum-view .unread img {margin-left: 5px;}
+
+/** Unknown Styles ??? */
+#user-view .forumpost,
+.course .forumpost {width: 100%;}
+#email .unsubscribelink {margin-top:20px;}
\ No newline at end of file
diff --git a/mod/glossary/styles.css b/mod/glossary/styles.css
new file mode 100644
index 00000000000..a66c50ccba5
--- /dev/null
+++ b/mod/glossary/styles.css
@@ -0,0 +1,24 @@
+/** General Styles **/
+.path-mod-glossary .glossarypost {border-collapse:separate;margin:5px auto;text-align: left;}
+.path-mod-glossary .glossarypost.entrylist {border-width:0px;}
+.path-mod-glossary .glossarypost.continuous .concept {display: inline;}
+.path-mod-glossary .glossarypost .commands {width: 200px;white-space: nowrap;}
+.path-mod-glossary .glossarypost .picture {width: 35px;}
+.path-mod-glossary .glossarypost .entrylowersection .aliases {text-align:center;}
+.path-mod-glossary .glossarypost .entrylowersection .icons {text-align:right;padding-right: 5px;}
+.path-mod-glossary .glossarypost .entrylowersection .ratings {text-align:right;padding-right: 5px;padding-bottom: 2px;}
+
+.path-mod-glossary .glossarydisplay {margin-left:auto;margin-right:auto;}
+.path-mod-glossary .glossarydisplay .tabs {width: 100%;margin-bottom: 0px;}
+.path-mod-glossary .glossarydisplay .tabs .side {border-style: none;border-width: 0px;width: auto;}
+.path-mod-glossary .glossarydisplay .separator {width: 4px;}
+
+.path-mod-glossary table.glossarypopup {width: 95%;}
+.path-mod-glossary .entrybox, /** Used in tabs.php **/
+.path-mod-glossary table.glossaryapproval,
+.path-mod-glossary .glossarypost .entrylowersection table{width: 100%;}
+
+/** Page specific styles **/
+#page-mod-glossary-view .glossarycontrol {float: right;text-align:right;white-space: nowrap;margin: 5px 0;}
+#page-mod-glossary-view table.glossarycategoryheader,
+#page-mod-glossary-import table.glossaryimportexport {margin-left:auto;margin-right:auto;}
\ No newline at end of file
diff --git a/mod/lesson/styles.css b/mod/lesson/styles.css
new file mode 100644
index 00000000000..00fc038fc4a
--- /dev/null
+++ b/mod/lesson/styles.css
@@ -0,0 +1,29 @@
+/** General styles (scope: all of lesson) **/
+.path-mod-lesson .contents,
+.path-mod-lesson .standardtable,
+.path-mod-lesson .mform .box.contents,
+.path-mod-lesson .invisiblefieldset.fieldsetfix tr {text-align: left;}
+.path-mod-lesson #layout-table {width: 100%;}
+.path-mod-lesson .edit_buttons form,
+.path-mod-lesson .edit_buttons input {display: inline;}
+.path-mod-lesson .userinfotable .cell,
+.path-mod-lesson .userinfotable .userpicture {vertical-align: middle;}
+.path-mod-lesson .invisiblefieldset.fieldsetfix {display: block;}
+.path-mod-lesson .slideshow {overflow: auto;padding: 15px;}
+.path-mod-lesson .menu .menuwrapper {max-height: 400px;overflow: auto;vertical-align: top;margin-bottom: 10px;}
+.path-mod-lesson .menu ul {list-style: none;padding: 5px 0px 0px 5px;margin: 0px;}
+.path-mod-lesson .menu ul li {padding-bottom: 5px;}
+.path-mod-lesson .skip {position: absolute;left: -1000em;width: 20em;}
+.path-mod-lesson .branchbuttoncontainer.horizontal div,
+.path-mod-lesson .branchbuttoncontainer.horizontal form {display: inline;}
+.path-mod-lesson .firstpageoptions {width:30%;margin-left:35%;margin-top:1em;}
+.path-mod-lesson .progress_bar_table,
+.path-mod-lesson .progress_bar_completed,
+.path-mod-lesson .progress_bar_todo {padding: 0;margin: 0;}
+.path-mod-lesson .progress_bar_token {height: 20px;width: 5px;padding: 0;margin: 0;}
+.path-mod-lesson .edit_pages_box .addlinks {margin:0;margin-bottom:1em;}
+
+/**
+ * Style for view.php
+ **/
+#page-mod-lesson-view .password-form .submitbutton {display: inline;}
\ No newline at end of file
diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
new file mode 100644
index 00000000000..5832958b11b
--- /dev/null
+++ b/mod/quiz/styles.css
@@ -0,0 +1,338 @@
+#page-mod-quiz-comment #manualgradingform,
+#page-mod-quiz-report #manualgradingform {width: 100%;}
+
+/** Mixed **/
+#page-mod-quiz-attempt .submitbtns,
+#page-mod-quiz-review .submitbtns,
+#page-mod-quiz-summary .submitbtns {text-align: left;margin-top: 1.5em;}
+
+#page-mod-quiz-attempt #page .controls,
+#page-mod-quiz-summary #page .controls,
+#page-mod-quiz-review #page .controls {text-align: center;margin: 8px auto;}
+
+#page-mod-quiz-edit div.question div.content .questiontext,
+#categoryquestions .questiontext {-o-text-overflow:ellipsis;text-overflow:ellipsis;position:relative;zoom:1;padding-left:0.3em;max-width:40%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;}
+
+#page-mod-quiz-edit div.question div.content .questionname,
+#categoryquestions .questionname {white-space:nowrap;overflow:hidden;zoom:1;position:relative;max-width:20%;}
+
+#page-mod-quiz-edit div.editq div.question div.content .singlequestion a .questionname,
+div.editq div.question div.content .singlequestion a .questiontext{text-decoration:underline;}
+
+#page-mod-quiz-edit.ie6 div.question div.content .questiontext,
+#categoryquestions .questiontext {width:50%;}
+#page-mod-quiz-edit.ie6 div.question div.content .questionname,
+#categoryquestions .questionname {width:20%;}
+
+#page-mod-quiz-mod #reviewoptionshdr .fitem,
+#adminquizreviewoptions .group {float: left;width: 33%;clear: none;}
+
+#page-mod-quiz-mod #reviewoptionshdr .fitemtitle,
+#adminquizreviewoptions .fitemtitle {width: 100%;font-weight: bold;text-align: left;height: 2.5em;margin-left: 0;}
+
+#page-mod-quiz-mod #reviewoptionshdr fieldset.fgroup span,
+#adminquizreviewoptions span {float: left;clear: left;}
+
+table#categoryquestions td,
+#page-mod-quiz-edit table#categoryquestions th{overflow:hidden;white-space:nowrap;}
+
+/** mod quiz mod **/
+#page-mod-quiz-mod #reviewoptionshdr .fitem {width: 30%;margin-left: 10px;}
+#page-mod-quiz-mod #reviewoptionshdr fieldset.fgroup {width: 100%;text-align: left;margin-left: 0;}
+
+/** Mod quiz view **/
+#page-mod-quiz-view .quizinfo,
+#page-mod-quiz-view #page .quizgradefeedback,
+#page-mod-quiz-view #page .quizattempt {text-align: center;}
+#page-mod-quiz-view #page .quizattemptsummary td p {margin-top: 0;}
+#page-mod-quiz-view .generalbox#feedback {width:70%;margin-left:auto;margin-right:auto;padding-bottom:15px;}
+#page-mod-quiz-view .generalbox#feedback h2 {margin: 0;}
+#page-mod-quiz-view .generalbox#feedback h3 {text-align: left;}
+#page-mod-quiz-view .generalbox#feedback .overriddennotice {text-align: center;font-size: 0.7em;}
+
+/** Mod quiz summary **/
+#page-mod-quiz-summary #content {text-align: center;}
+#page-mod-quiz-summary .questionflag {width: 16px;height: 16px;vertical-align: middle;}
+#page-mod-quiz-summary #quiz-timer {margin-top: 1em;display: none; /* Revealed by JavaScript if applicable */}
+
+/** Mod quiz review **/
+#page-mod-quiz-review .pagingbar {margin: 1.5em auto;}
+
+/** Mod quiz report **/
+#page-mod-quiz-report h2.main {clear: both;}
+#page-mod-quiz-report div#commands,
+#page-mod-quiz-report .controls {text-align: center;}
+#page-mod-quiz-report .dubious{background-color: #fcc;}
+#page-mod-quiz-report .highlight{border :medium solid yellow;background-color:lightYellow;}
+#page-mod-quiz-report .negcovar{border :medium solid pink;}
+#page-mod-quiz-report #manualgradingform .que {margin-bottom: 0.7em;}
+#page-mod-quiz-report table.titlesleft td.c0{font-weight: bold;}
+#page-mod-quiz-report table .numcol {text-align: center;vertical-align : middle !important;}
+#page-mod-quiz-report table#attempts {clear: both;width: 80%;margin: 20px auto;}
+#page-mod-quiz-report table#attempts .header,
+#page-mod-quiz-report table#attempts .cell{padding: 4px;}
+#page-mod-quiz-report table#attempts .header .commands {display: inline;}
+#page-mod-quiz-report table#attempts .picture {width: 40px;}
+#page-mod-quiz-report table#attempts td {border-left-width: 1px;border-right-width: 1px;border-left-style: solid;border-right-style: solid;vertical-align: middle;}
+#page-mod-quiz-report table#attempts .header {text-align: left;}
+#page-mod-quiz-report table#attempts .picture {text-align: center !important;}
+#page-mod-quiz-report table#itemanalysis {width: 80%;margin: 20px auto;}
+#page-mod-quiz-report table#itemanalysis td {border-width: 1px;border-style: solid;}
+#page-mod-quiz-report table#itemanalysis .header {text-align: left;padding: 4px;}
+#page-mod-quiz-report table#itemanalysis .header .commands {display: inline;}
+#page-mod-quiz-report table#itemanalysis .uncorrect {color: red;}
+#page-mod-quiz-report table#itemanalysis .correct {color: blue;font-weight : bold;}
+#page-mod-quiz-report table#itemanalysis .partialcorrect {color: green !important;}
+#page-mod-quiz-report table#itemanalysis .cell{padding: 4px;}
+#page-mod-quiz-report table#itemanalysis .qname {color: green !important;}
+
+/** Mod quiz grading **/
+#page-mod-quiz-grading table#grading {width: 80%;margin: 20px auto;}
+#page-mod-quiz-grading table#grading .header,
+#page-mod-quiz-grading table#grading .cell {padding: 4px;}
+#page-mod-quiz-grading table#grading .header .commands{display: inline;}
+#page-mod-quiz-grading table#grading .picture{width: 40px;}
+#page-mod-quiz-grading table#grading td {border-left-width: 1px;border-right-width: 1px;border-left-style: solid;border-right-style: solid;vertical-align: bottom;}
+
+/** Mod quiz attempt **/
+#page-mod-quiz-attempt #quiz-timer {display: none; /* Revealed by JavaScript if applicable */}
+#page-mod-quiz-attempt #quiz-time-left {font-weight: bold;}
+#page-mod-quiz-attempt #quiz-timer-outer {border-color: #dddddd;background: white;}
+
+#categoryquestions .r1 {background: #e4e4e4;}
+#categoryquestions .header {text-align: center;padding: 0 2px;border: 0 none;}
+#categoryquestions th.modifiername .sorters,
+#categoryquestions th.creatorname .sorters {font-weight: normal;font-size: 0.8em;}
+table#categoryquestions {width: 100%;overflow: hidden;table-layout: fixed;}
+#categoryquestions .iconcol {width: 15px;text-align: center;padding: 0;}
+#categoryquestions .checkbox {width: 19px;text-align: center;padding: 0;}
+#categoryquestions .qtype {text-align: center;}
+#categoryquestions .qtype {width: 24px;padding: 0;}
+#categoryquestions .questiontext p {margin: 0;}
+
+table.quizattemptsummary .bestrow td {background-color: #e8e8e8;}
+table.quizattemptsummary .noreviewmessage {color: gray;}
+
+table.quizreviewsummary {width: 100%;}
+table.quizreviewsummary th.cell {padding: 1px 0.5em 1px 1em;font-weight: bold;text-align: right;width: 10em;background: #f0f0f0;}
+table.quizreviewsummary td.cell {padding: 1px 1em 1px 0.5em;text-align: left;background: #fafafa;}
+
+#quiznavigation #user-picture {margin: 0.5em 0;}
+#quiznavigation #user-picture img {width: auto;height: auto;float: left;}
+#quiznavigation .othernav {clear: both;}
+#quiznavigation .othernav a,
+#quiznavigation .othernav input {display: block;margin: 0.5em 0;}
+#quiznavigation .qnbutton {display: block;float: left;width: 1.5em;height: 1.5em;overflow: hidden;margin: 0.3em 0.3em 0.3em 0;padding: 0;border: 1px solid #bbb;background: #eee no-repeat top right;text-align: center;vertical-align: middle;cursor: pointer;white-space: normal;font: inherit;line-height: 1.5em;font-weight: bold;color: #00f;border-color: #bbb;background-color: #ddd;}
+#quiznavigation .qnbutton:hover {text-decoration: underline;color: #f00;}
+#quiznavigation .qnbutton.flagged {background-image: url([[pix:i/ne_red_mark]]);}
+#quiznavigation .qnbutton.thispage {border-color: black;}
+#quiznavigation .qnbutton.open {background-color: white;}
+#quiznavigation .qnbutton.correct {background-color: #cfc;}
+#quiznavigation .qnbutton.partiallycorrect {background-color: #ffa;}
+#quiznavigation .qnbutton.incorrect {background-color: #fcc;}
+
+#quiznojswarning {color: red;}
+#quiznojswarning {font-size: 0.7em;line-height: 1.1;}
+.jsenabled #quiznojswarning {display: none;}
+
+body #quizcontentsblock #repaginatedialog{display: none;}
+body.jsenabled #quizcontentsblock #repaginatedialog{display: block;}
+body.jsenabled #quizcontentsblock #repaginatedialog .hd{display:block;}
+body.jsenabled #quizcontentsblock #repaginatedialog .bd{padding:1em;}
+body.jsenabled #quizcontentsblock  .repaginatecommand #repaginatecommand{display:block;}
+
+body#question-preview .quemodname,
+body#question-preview .controls{text-align: center;}
+
+.quizattemptcounts {clear : left;text-align: center;margin: 6px 0;}
+.generalbox#passwordbox { /* Should probably match .generalbox#intro above */width:70%;margin-left:auto;margin-right:auto;}
+#passwordform {margin: 1em 0;}
+
+.questionbankwindow .choosecategory,
+.questionbankwindow .createnewquestion {padding: 0.3em;}
+.questionbankwindow .createnewquestion .singlebutton {display: inline;}
+.questionbankwindow #catmenu_jump {display: block;}
+.questionbank div.categoryquestionscontainer,
+.questionbank .categorysortopotionscontainer,
+.questionbank .categorypagingbarcontainer,
+.questionbank .categoryselectallcontainer{padding-left:0.3em;padding-right:0.3em;}
+
+.noquestionsincategory{clear:both;padding-top:1em;padding-bottom:1em;}
+.modulespecificbuttonscontainer{padding-left:0.3em;padding-right:0.3em;}
+
+#adminquizreviewoptions {margin-bottom: 0.5em;}
+.quizquestionlistcontrols {text-align: center;}
+
+#randomquestiondialog_c select{width:100%;}
+
+.categoryinfo {padding: 0.3em;}
+
+.path-mod-quiz .gradingdetails {font-size: small;}
+.path-mod-quiz .highlightgraded {background:yellow;}
+.path-mod-quiz div.tabtree a span img.iconsmall {vertical-align: baseline;}
+.ie6.path-mod-quiz div.tabtree a span img.iconsmall {margin: 0;vertical-align: baseline;position: relative;top: 1px;}
+.ie7.path-mod-quiz div.tabtree a span img.iconsmall {margin: 0;vertical-align: baseline;position: relative;top: 2px;}
+
+/** Mod quiz edit **/
+#page-mod-quiz-edit h2.main{display:inline;padding-right:1em;clear:left;}
+
+#page-mod-quiz-edit div.sideblock {float:right;width:30%;right:0.3em;padding-bottom:0.5em;display:block;border-width:0;}
+#page-mod-quiz-edit div.sideblock .content {padding:0;}
+#page-mod-quiz-edit div.quizcontents {float:left;width:70%;display:block;clear:left;}
+#page-mod-quiz-edit div.quizwhenbankcollapsed {width:100%;}
+#page-mod-quiz-edit div.quizpage {display:block;clear:both;width:100%;}
+#page-mod-quiz-edit div.quizpage span.pagetitle {margin-top:0.3em;float:left;display:block;color:#006;}
+#page-mod-quiz-edit div.quizpage .pagecontent {margin-top:0.3em;display:block;float:left;position:relative;margin-left:0.3em;margin-bottom:0.2em;border-left:solid #777 thin;line-height:1.3em;-webkit-border-radius:0.6em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.6em;border-radius-bottomleft:0;border-radius-topleft:0;width:88%;padding:0.15em 0 0.3em;background-color:#d6d6d6;}
+#page-mod-quiz-edit div.quizpage .pagecontent .pagestatus {-webkit-border-radius-bottomright:0.3em;-webkit-border-radius-topright:0.3em;border-radius-bottomright:0.3em;border-radius-topright:0.3em;margin:0.3em;padding:0.1em 0.1em 0.1em 0.3em;background-color:#eee;font-weight:bold;}
+#page-mod-quiz-edit div.quizpage .pagecontent form#addquestion{background-color:#fff;}
+#page-mod-quiz-edit div.quizpage .pagecontent form.randomquestionform div {/* it is a mystery why this has to be inline-table but otherwise the layout gets screwed, even if it is "inline" */display: inline-table;}
+#page-mod-quiz-edit div.quizpage .pagecontent form.randomquestionform div input {display: inline;}
+
+#page-mod-quiz-edit .addpage{clear:both;padding-top:0.3em;float:right;margin-right:2em;}
+#page-mod-quiz-edit .statusdisplay {background-color: #ffc;clear: both;margin: 0.3em 1em 0.3em 0;padding: 1px ; /* Stop margin collapse. */}
+#page-mod-quiz-edit .statusdisplay p {margin: 0.4em;}
+
+#page-mod-quiz-edit div.reorder .reordercontrols{clear:both;padding-right:1em;margin-top:0.5em;padding-top:0.5em;padding-bottom:0.5em}
+#page-mod-quiz-edit div.reorder .reordercontrols .moveselectedonpage{clear:right;float:right;padding:0.5em 0.3em;text-align:right;}
+#page-mod-quiz-edit div.reorder .reordercontrols .addnewpagesafterselected,
+#page-mod-quiz-edit .repaginatecommand {float:right;clear:right;padding-right:1em;}
+#page-mod-quiz-edit div.reorder .reordercontrols .deleteselected{float:right;margin-right:1em;}
+#page-mod-quiz-edit div.reorder div.question{padding-top:0.2em;}
+#page-mod-quiz-edit div.reorder div.question div.qnum {width:2.9em;padding-top:0.1em;}
+#page-mod-quiz-edit .reorder div.question div.content {width:87%;float:left;position:relative;-webkit-border-radius:0.3em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.3em;border-radius-bottomleft:0;border-radius-topleft:0;line-height:1.2em;padding:0.1em;background-color:#F9F9F9;}
+#page-mod-quiz-edit .reorder .questioncontentcontainer .quiz_randomquestion {position:relative;}
+#page-mod-quiz-edit .reorder div.question div.content div.quiz_randomquestion {line-height:1em;}
+
+#page-mod-quiz-edit .reorder .questioncontentcontainer {position:relative;overflow:hidden;white-space:nowrap;}
+#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory {overflow:hidden;white-space:nowrap;display:inline;float:none;}
+#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label {max-width: 25%;overflow:hidden;padding-left:0.3em;white-space:nowrap;display:inline-block;}
+#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestionfromcategory label {overflow:hidden;white-space:nowrap;display:inline-block;}
+#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestionfromcategory,
+#page-mod-quiz-edit .reorder div.question div.content .questionpreview {display:inline;float:none;}
+
+#page-mod-quiz-edit .reorder fieldset{display:inline;}
+#page-mod-quiz-edit div.reorder div.question div.qnum{text-align:right;font-size:1em;}
+
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist {padding-left:0.2em;padding-right:0.2em;clear:both;margin:0.5em;margin-top:0.8em;}
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist .totalquestionsinrandomqcategory{overflow:auto;white-space:normal;}
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul{list-style-type:none;margin:0;padding:0;}
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul li {clear:left;width:100%;overflow:hidden;white-space:nowrap;}
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul li img{padding-right:0.3em;}
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul li span{display:inline;}
+#page-mod-quiz-edit .questioncontentcontainer a {text-decoration:underline;}
+#page-mod-quiz-edit .questioncontentcontainer div.singlequestion a{text-decoration:underline;}
+#page-mod-quiz-edit .questioncontentcontainer .randomquestioncategory{font-weight:bold;}
+
+#page-mod-quiz-edit div.question {clear:left;width:100%;}
+#page-mod-quiz-edit div.question div.qnum {display:block;float:left;width:1.4em;padding-right:0.3em;padding-left:0;z-index:99;text-align:right;color:#333;}
+#page-mod-quiz-edit div.question div.questioncontainer{background-color:#ffc;}
+#page-mod-quiz-edit div.editq div.question div.content{width:87%;float:left;position:relative;-webkit-border-radius:0.6em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.6em;border-radius-bottomleft:0;border-radius-topleft:0;line-height:1.4em;padding:0.5em;}
+#page-mod-quiz-edit div.question div.content div.points{top:0.5em;border-left:#FFF solid 0.4em;width:8.5em;padding:0.2em;line-height:1em;max-width:30%;position:absolute;right:50px;-webkit-border-radius:0.2em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.2em;border-radius-bottomleft:0;border-radius-topleft:0;z-index:900;display:block;margin:0;background-color:#ddf;}
+#page-mod-quiz-edit div.question div.content div.points input{width:2em;padding:0;}
+#page-mod-quiz-edit div.question div.content div.points input.pointssubmitbutton{width:auto;}
+#page-mod-quiz-edit div.question div.content div.qorder {line-height:1em;max-width:30%;position:absolute;right:50px;-webkit-border-radius:0.2em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.2em;border-radius-bottomleft:0;border-radius-topleft:0;z-index:900;display:block;margin:0;background-color:#ddf;}
+#page-mod-quiz-edit div.question div.content .editicon {width:15px;}
+#page-mod-quiz-edit div.question div.content .singlequestion .questionname,
+#page-mod-quiz-edit div.question div.content .singlequestion .questiontext{display:inline-block;}
+#page-mod-quiz-edit div.question div.content .singlequestion .questionpreview{background-color:#eee;}
+#page-mod-quiz-edit div.question div.content .questiontype{display:block;clear:left;float:left;}
+#page-mod-quiz-edit div.question div.content .questionpreview {display:block;float:left;margin-left:0.3em;padding-left:0.2em;padding-right:0.2em;}
+#page-mod-quiz-edit div.question div.content .questionpreview a{background-color:#eee;}
+#page-mod-quiz-edit div.question div.content div.quiz_randomquestion .questionpreview{display:inline;float:none;}
+#page-mod-quiz-edit div.question div.content div.questioncontrols{float:right;width:45px;position:absolute;right:0.3em;top:0;z-index:900;display:block;padding:0.2em;background-color:#F9F9F9;text-align:right;}
+#page-mod-quiz-edit div.question div.content div.questioncontrols img.upwithoutdown{padding-right:12px;display:inline;}
+#page-mod-quiz-edit div.question div.content .questiontext {font-weight:bold;}
+#page-mod-quiz-edit div.question div.content .questiontype{font-style:italic;}
+
+#page-mod-quiz-edit .editq div.question div.qnum {padding-top:0.2em;}
+#page-mod-quiz-edit .editq div.question {padding-top:0.3em;}
+#page-mod-quiz-edit .editq div.questioncontentcontainer  div.singlequestion img {float:left;padding-top:0.3em;padding-right:0.3em;}
+#page-mod-quiz-edit .editq div.question div.content {background-color:#F9F9F9;}
+#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory{margin-top:0.4em;position:relative;display:inline-block;}
+#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory a{display:block;max-width:15em;overflow: hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;white-space: nowrap;float:left;position:relative;}
+#page-mod-quiz-edit .editq div.question div.content .questionpreview {float:left;}
+#page-mod-quiz-edit .editq div.question div.content .questionpreview a{font-weight:normal;margin-left:0em;display:inline;float:none;}
+#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory .questionpreview img{padding-right:0.3em;}
+#page-mod-quiz-edit .editq div.question div.content .singlequestion a .questionname,
+#page-mod-quiz-edit .editq div.question div.content .singlequestion a .questiontext{float:left;}
+#page-mod-quiz-edit .editq div.question div.description div.content .questiontext {max-width: 75%;}
+#page-mod-quiz-edit .editq div.question div.qnum{font-size:1.5em;}
+
+#page-mod-quiz-edit .questionbankwindow select#catmenu_jump{
+/* In Opera9, IE6 the width of the
+select obeys the width of its content
+by default. This prevents that. */width:100%;}
+
+/*this color might need to be theme-specific,
+but in terms of usability, as testing showed,
+http://docs.moodle.org/en/Development:Quiz_UI_redesign/usability_testing_of_August_2008/Issues#Question_bank_.2F_question_adding_controls_visibility
+it must be ensured that the question
+bank window's title is prominent enough*/
+#page-mod-quiz-edit .questionbankwindow div.header {background-color:#009;color:#fff;background-image:none;padding-top:0.2em;font-weight:bold;}
+#page-mod-quiz-edit .questionbankwindow div.header a{text-decoration:underline;color:#FFF;}
+#page-mod-quiz-edit .collapsed .container{display: none;}
+#page-mod-quiz-edit .questionbankwindow #showbankcmd{display:none;}
+#page-mod-quiz-edit .collapsed #showbankcmd{display:inline;}
+#page-mod-quiz-edit .questionbankwindow #hidebankcmd{display:inline;}
+#page-mod-quiz-edit .collapsed #hidebankcmd{display:none;}
+
+#page-mod-quiz-edit .quizquestionlistcontrols {display:inline;}
+
+#page-mod-quiz-edit .quizpagedelete{position:absolute;top:0.2em;right:0.2em;display:inline;z-index:900;}
+#page-mod-quiz-edit .quizpagedelete img {background-color:#d6d6d6;padding:0.6em;}
+#page-mod-quiz-edit .pagecontrols {clear:both;margin-left:0.5em;padding-top:0.5em;}
+#page-mod-quiz-edit .pagecontrols .singlebutton {float:left;margin-left: 1em;}
+#page-mod-quiz-edit .pagecontrols .helplink {float:left;}
+
+#page-mod-quiz-edit div#randomquestiondialog_c{width:90%;}
+#page-mod-quiz-edit div#randomquestiondialog_c .mform,
+#page-mod-quiz-edit div#repaginatedialog .mform{margin-left:auto;margin-right:auto;}
+#page-mod-quiz-edit div.container div.generalbox{position:relative;display:block;border:0 none;margin:0;padding:0;}
+
+#page-mod-quiz-edit .questionbankwindow .createnewquestion select,
+#page-mod-quiz-edit .questionbankwindow #catmenu select,
+#page-mod-quiz-edit .questionbankwindow #menucategory {width: 100%;}
+
+#page-mod-quiz-edit .paging {margin-top:0;margin-bottom:0;display:block;background-color:#ddd;}
+#page-mod-quiz-edit .pagingbottom {padding-bottom:0.3em;}
+#page-mod-quiz-edit .paging a:hover{background-color:#eef;}
+
+#page-mod-quiz-edit #page-footer {clear:both;padding-top:1em;}
+
+.ie6#page-mod-quiz-edit div.question div.content .questiontext,
+.ie6#page-mod-quiz-edit #categoryquestions .questionname{/*ie6 shows this as an arrow if this is not specified*/cursor: pointer;}
+.ie6#page-mod-quiz-edit div.question div.content .questionname,
+.ie6#page-mod-quiz-edit #categoryquestions .questiontext{/*ie6 shows this as an arrow if this is not specified*/cursor: pointer;}
+.ie6#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label{width: 35%;}
+.ie6#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory a{width:40%;}
+
+#page-mod-quiz-edit #categoryquestions .questiontext {font-weight:bold;}
+#page-mod-quiz-edit .categoryinfofield{font-style:italic;}
+#page-mod-quiz-edit .categorynamefield{font-weight:bold;}
+#page-mod-quiz-edit a.configurerandomquestion{font-size:small;text-decoration:underline;}
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist{background-color:#eee;}
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul{color:#555;}
+#page-mod-quiz-edit .questioncontentcontainer div.randomquestionqlist .totalquestionsinrandomqcategory{color:#000;}
+#page-mod-quiz-edit .categoryinfo {background-color:#eee;border-bottom:1px solid #bbb;}
+#page-mod-quiz-edit .questionsortoptions {background-color:#ddd;}
+
+#page-mod-quiz-edit div.questionbank{background-color:#e6e6ff;}
+#page-mod-quiz-edit div.questionbank form .invisiblefieldset{clear:both;}
+#page-mod-quiz-edit div.questionbank .categorysortopotionscontainer{padding-top:0.5em;margin-top:0.3em;}
+#page-mod-quiz-edit div.questionbank .categoryquestionscontainer,
+.questionbank .categorysortopotionscontainer,
+.questionbank .categorypagingbarcontainer,
+.questionbank .categoryselectallcontainer{background-color:#FFF;}
+
+#categoryquestions .questiontext {width:50%;}
+#categoryquestions .questionname {width:20%;}
+
+.ie6#page-mod-quiz-edit div.question div.content .questiontext,
+.ie6#page-mod-quiz-edit #categoryquestions .questionname{/*ie6 shows this as an arrow if this is not specified*/cursor: pointer;}
+.ie6#page-mod-quiz-edit div.question div.content .questionname,
+.ie6#page-mod-quiz-edit #categoryquestions .questiontext{/*ie6 shows this as an arrow if this is not specified*/cursor: pointer;}
+.ie6.path-mod-quiz div.tabtree a span img.iconsmall {margin: 0;vertical-align: baseline;position: relative;top: 1px;}
+.ie6#page-mod-quiz-edit div.question div.content .questiontext {width:50%;}
+.ie6#page-mod-quiz-edit div.question div.content .questionname {width:20%;}
+.ie6#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory a{width:40%;}
+.ie6#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label{width: 35%;}
\ No newline at end of file
diff --git a/mod/resource/styles.css b/mod/resource/styles.css
new file mode 100644
index 00000000000..8990c811a70
--- /dev/null
+++ b/mod/resource/styles.css
@@ -0,0 +1,5 @@
+#page-mod-resource-view .resourcecontent.resourcepdf {width: 100%;}
+.path-mod-resource .popupnotice {text-align:center;margin:40px;}
+
+.resourcecontent object {height:480px;width:600px;}
+.resourcecontent.resourcepdf object{height: 800px;width: 800px;}
diff --git a/mod/scorm/styles.css b/mod/scorm/styles.css
new file mode 100644
index 00000000000..ebdf20ca1f7
--- /dev/null
+++ b/mod/scorm/styles.css
@@ -0,0 +1,24 @@
+.path-mod-scorm .top {vertical-align: top;}
+.path-mod-scorm .scorm-left {text-align: left;}
+.path-mod-scorm .scorm-center {text-align: center;}
+.path-mod-scorm .scorm-right {text-align: right;}
+.path-mod-scorm .scoframe {position: relative;width: 100%;height: 100%;}
+
+#page-mod-scorm-player #scormobject {height: 400px;}
+#page-mod-scorm-player #scormtop {position: relative;width: 100%;height: 30px;}
+#page-mod-scorm-player #scormbrowse {position: absolute;left: 5px;top: 0px;}
+#page-mod-scorm-player #scormnav {position: absolute;right: 5px;top: 0px;text-align: center;top: 3px;width: 100%;}
+#page-mod-scorm-player #scormbox {width: 74%;position: absolute;right: 0px;top: 0px;}
+#page-mod-scorm-player #scormpage {position: relative;width: 100%;}
+#page-mod-scorm-player #scormpage #toctree {position:relative;width:100%;overflow-x: auto;overflow-y: auto;}
+#page-mod-scorm-player #tocbox {position: relative;left: 0px;width: 24%;font-size: 0.8em;}
+#page-mod-scorm-player #tochead {position: relative;text-align: center;top: 3px;height: 30px;}
+
+#page-mod-scorm-player .toc,
+#page-mod-scorm-player .no-toc {width: 100%;}
+#page-mod-scorm-player .structlist  {list-style-type: none;white-space: nowrap;}
+#page-mod-scorm-player .structurelist {position: relative;list-style-type: none;width: 96%;margin:0;padding:0;}
+#page-mod-scorm-player .structurelist ul {padding-left: 0.5em;margin-left: 0.5em;}
+
+#page-mod-scorm-view .structurelist  {list-style-type: none;white-space: nowrap;}
+#page-mod-scorm-view .structurelist  {list-style-type: none;white-space: nowrap;}
\ No newline at end of file
diff --git a/mod/scorm/styles.php b/mod/scorm/styles.php
deleted file mode 100644
index 0efa2aa21f1..00000000000
--- a/mod/scorm/styles.php
+++ /dev/null
@@ -1,296 +0,0 @@
-.structlist  {
-
-  list-style-type: none;
-
-  white-space: nowrap;
-
-  font-size: small;
-
-}
-
-.orgtitle {
-
-  font-weight: bold;
-
-  font-size: small;
-
-}
-
-.mod-scorm .top {
-
-  vertical-align: top;
-
-}
-
-.mod-scorm .scorm-left {
-
-  text-align: left;
-
-}
-
-.mod-scorm .scorm-center {
-
-  text-align: center;
-
-}
-
-.mod-scorm .scorm-right {
-
-  text-align: right;
-
-}
-
-.mod-scorm .scoframe {
-
-   position: relative;
-
-   width: 100%;
-
-   height: 100%;
-
-
-
-}
-
-
-
-#mod-scorm-player #scormpage {
-
-  position: relative;
-
-  width: 100%;
-
-
-
-
-}
-
-#mod-scorm-player #tochead {
-
-  position: relative;
-
-  text-align: center;
-
-  top: 3px;
-
-  height: 30px;
-
-
-
-}
-
-#mod-scorm-player .toc {
-
-  width: 80%;
-
-  margin-left: 20%;
-
-
-
-
-}
-
-#mod-scorm-player .no-toc {
-
-  width: 100%;
-
-
-
-}
-
-#mod-scorm-player #scormobject {
-
-  height: 400px;
-
-
-
-
-}
-
-#mod-scorm-player #scormtop {
-
-  position: relative;
-
-  width: 100%;
-
-  height: 30px;
-
-
-
-}
-
-#mod-scorm-player #scormbrowse {
-
-  position: absolute;
-
-  left: 5px;
-
-  top: 0px;
-
-
-
-
-}
-
-#mod-scorm-player #scormnav {
-
-  position: absolute;
-
-  right: 5px;
-
-  top: 0px;
-
-  text-align: center;
-
-  top: 3px;
-
-  width: 100%;
-
-
-
-
-}
-
-
-
-#mod-scorm-view .structurehead {
-
-  text-align: center;
-
-
-
-}
-
-
-
-#mod-scorm-view .structurelist  {
-
-  list-style-type: none;
-
-  white-space: nowrap;
-
-
-
-}
-
-
-
-#mod-scorm-player #scormbox {
-
-  width: 74%;
-
-  position: absolute;
-
-  right: 0px;
-
-  top: 0px;
-
-
-
-}
-
-
-
-#mod-scorm-player #tocbox {
-
-  position: relative;
-
-  left: 0px;
-
-  width: 24%;
-
-  font-size: 0.8em;
-
-
-
-}
-
-
-
-#mod-scorm-player #tochead {
-
-  position: relative;
-
-  text-align: center;
-
-  top: 3px;
-
-  height: 30px;
-
-
-
-}
-
-
-
-#toctree {
-
-  position:relative;
-
-  width:100%;
-
-  overflow-x: auto;
-
-  overflow-y: auto;
-
-
-
-}
-
-.structurelist  {
-
-  list-style-type: none;
-
-}
-
-#mod-scorm-player .structurelist {
-
-  position: relative;
-
-  list-style-type: none;
-
-  width: 96%;
-
-  margin-left:0;
-
-  padding-left: 0;
-
-  margin-right:0;
-
-  padding-right: 0;
-
-  padding-top: 0;
-
-  padding-bottom: 0;
-
-  margin-top:0;
-
-  margin-bottom:0;
-
-
-
-
-}
-
-
-
-#mod-scorm-player .structurelist ul{
-
-  padding-left: 0.5em;
-
-  margin-left: 0.5em;
-
-}
-
-#mod-scorm-view .structurelist  {
-
-  list-style-type: none;
-
-  white-space: nowrap;
-
-}
-
-a#mod-scorm-log-toggle {
-    font-size: 0.7em;
-    font-weight: bold;
-}
diff --git a/mod/survey/lib.php b/mod/survey/lib.php
index dc8b8c7bd7d..b045ce6dab9 100644
--- a/mod/survey/lib.php
+++ b/mod/survey/lib.php
@@ -528,7 +528,7 @@ function survey_print_multi($question) {
     $strresponses  = get_string('responses', 'survey');
 
     echo $OUTPUT->heading($question->text, 3, 'questiontext');
-    echo "\n<table width=\"90%\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\">";
+    echo "\n<table width=\"90%\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"surveytable\">";
 
     $options = explode( ",", $question->options);
     $numoptions = count($options);
diff --git a/mod/survey/styles.css b/mod/survey/styles.css
new file mode 100644
index 00000000000..cdd3ea52389
--- /dev/null
+++ b/mod/survey/styles.css
@@ -0,0 +1,14 @@
+.path-mod-survey .smalltext {font-size: 0.75em;}
+
+.path-mod-survey .surveytable .rblock label {display: block;}
+.path-mod-survey .surveytable .foundthat,
+.path-mod-survey .surveytable .preferthat {white-space: nowrap;}
+.path-mod-survey .surveytable .buttoncell {width:5%;}
+.path-mod-survey .surveytable .optioncell,
+.path-mod-survey .surveytable .questioncell {width:50%;vertical-align:top;}
+.path-mod-survey .surveytable .whitecell {background-color:white;}
+
+.path-mod-survey #surveyform th {font-weight: normal;text-align: left;}
+.path-mod-survey #surveyform th.hresponse {text-align: center;width: 9%;}
+
+#page-mod-survey-report .fullnamecell {width:10%;vertical-align:top;white-space: nowrap;}
\ No newline at end of file
diff --git a/mod/wiki/styles.css b/mod/wiki/styles.css
new file mode 100644
index 00000000000..b29bc4c178d
--- /dev/null
+++ b/mod/wiki/styles.css
@@ -0,0 +1,7 @@
+.path-mod-wiki .sideblockheading,
+.path-mod-wiki .howtowiki {text-align:right;}
+.path-mod-wiki .wikisearchform,
+.path-mod-wiki .wikilinksblock,
+.path-mod-wiki .wikiadminactions {text-align:center;}
+.path-mod-wiki .wikilinkright {text-align:right;padding-bottom: 0.5em;}
+.path-mod-wiki .wikiexportbox {margin-left:auto;margin-right:auto;}
\ No newline at end of file
diff --git a/mod/wiki/wiki_styles.php b/mod/wiki/wiki_styles.php
deleted file mode 100644
index 2b656bf7ccc..00000000000
--- a/mod/wiki/wiki_styles.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
-    This file contains the class definitions used by the wiki module.
-    Include these in your theme file, and modify them to your tastes.
-*/
-
-?>
-<!-- <div> that surrounds entire wiki output -->
-.wiki {
-    background-color: #FFFFFF;
-    padding: 6px;
-}
-
-<!-- action classes that work with the wiki <div> -->
-.view {
-}
-
-.edit {
-}
-
-.info {
-}
-
-.links {
-}
-
-<!-- Defines the <div> tag surrounding the backlinks feature. -->
-.wiki_backlinks {
-    border-top: 2px #EEEEEE solid;
-}
-
-.indent {
-}
-
-<!-- defines the h2 class for the title -->
-h2.page.title {
-    border-bottom: 2px #EEEEEE solid;
-}
-
-<!-- Defines the table used for the version information -->
-.version-info {
-}
-
-<!-- Defines the table cell used for the various version actions -->
-.action-links {
-}
-
-<!-- Defines the table cell used for the various version actions -->
-.control-links {
-}
-
-<!-- Defines the table row used for the version version row -->
-.page-version {
-}
-
-<!-- Defines the table row used for the version author row -->
-.page-author {
-}
-
-<!-- Defines the table row used for the version created row -->
-.page-created {
-}
-
-<!-- Defines the table row used for the version lastmodified row -->
-.page-lastmodified {
-}
-
-<!-- Defines the table row used for the version refs row -->
-.page-refs {
-}
-
-<!-- Defines the table row used for the version flags row -->
-.page-flags {
-}
-
-<!-- Defines the table row used for the version meta row -->
-.page-meta {
-}
-
-<!-- Defines the <div> used for the chunked results -->
-.chunked-result {
-}
-
-<!-- Defines the <div> used for the edit box -->
-.edit-box {
-  text-align:center;
-}
-
-<!-- Defines the <div> used for the image upload form -->
-.image-upload {
-}
-
-<!-- Defines the <div> used for the preview page -->
-.preview {
-}
-
-<!-- Defines the <span> used for the search not found -->
-.NotFound {
-}
-
-<!-- Defines the <div> used for the todo list -->
-.ewiki_page_todolist {
-}
-
-<!-- Defines the <table> used for the diff function -->
-.diff {
-}
diff --git a/pix/t/block_to_dock.png b/pix/t/block_to_dock.png
index d72690c8701..c982c867053 100644
Binary files a/pix/t/block_to_dock.png and b/pix/t/block_to_dock.png differ
diff --git a/pix/t/dock_to_block.png b/pix/t/dock_to_block.png
index 5ace5af1c62..380f4acd80e 100644
Binary files a/pix/t/dock_to_block.png and b/pix/t/dock_to_block.png differ
diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php
index 01d58964c0a..c70d94a2a05 100644
--- a/tag/coursetags_edit.php
+++ b/tag/coursetags_edit.php
@@ -75,7 +75,7 @@ echo $OUTPUT->header();
 
     // Print personal tags for all courses
     $title = get_string('edittitle', $tagslang);
-    echo $OUTPUT->heading($title, 2, 'center');
+    echo $OUTPUT->heading($title, 2, 'mdl-align');
 
     $mytags = coursetag_print_cloud(coursetag_get_tags(0, $USER->id, 'default'), true);
     $outstr = '
@@ -99,7 +99,7 @@ echo $OUTPUT->header();
     // Personal tag editing
     if ($canedit) {
         $title = get_string('editmytagsfor', $tagslang, '"'.$coursefullname.' ('.$courseshortname.')"');
-        echo $OUTPUT->heading($title);
+        echo $OUTPUT->heading($title, 2, 'main mdl-align');
 
         // Deletion here is open to the users own tags for this course only
         $selectoptions = '<option value="0">'.get_string('select', $tagslang).'</option>';
diff --git a/tag/index.php b/tag/index.php
index 763a516b886..a9a85112204 100644
--- a/tag/index.php
+++ b/tag/index.php
@@ -69,7 +69,7 @@ echo $OUTPUT->heading($tagname, 2, 'headingblock header tag-heading');
 tag_print_management_box($tag);
 tag_print_description_box($tag);
 
-echo '<div style="text-align: center "><p><a href="#course">'.get_string('courses').
+echo '<div class="relatedpages"><p><a href="#course">'.get_string('courses').
  '</a> | <a href="#blog">'.get_string('relatedblogs', 'tag').
  '</a> | <a href="#user">'.get_string('users').'</a></p></div>';
 
diff --git a/tag/manage.php b/tag/manage.php
index 492622ea0bd..f87e2ed4ff4 100644
--- a/tag/manage.php
+++ b/tag/manage.php
@@ -137,8 +137,6 @@ switch($action) {
         break;
 }
 
-echo '<br/>';
-
 if ($err_notice) {
     echo $OUTPUT->notification($err_notice, 'red');
 }
diff --git a/theme/anomaly/layout/general.php b/theme/anomaly/layout/general.php
index b4c1ed39e4d..8d6ad58b024 100644
--- a/theme/anomaly/layout/general.php
+++ b/theme/anomaly/layout/general.php
@@ -13,7 +13,7 @@ if ($properties->sidepre && !$properties->sidepost) {
 }
 
 if (!$properties->sidepost && !$properties->sidepre) {
-    $bodyclasses[] = 'noblocks';
+    $bodyclasses[] = 'content-only';
 }
 if (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()) {
     $bodyclasses[] = 'hasnavbar';
@@ -30,8 +30,7 @@ echo $OUTPUT->doctype() ?>
 <body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html(); ?>
 <div id="page">
-
-    <div class="page-header">
+    <div id="page-header">
         <div class="rounded-corner top-left"></div>
         <div class="rounded-corner top-right"></div>
         <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -49,29 +48,27 @@ echo $OUTPUT->doctype() ?>
         </div>
         <?php } ?>
     </div>
-    <div class="page-middle">
-        <div class="column-container">
-            <div class="column-mask">
-                <div class="column-centre">
-                    <div class="column-wrap">
-                        <div class="column-pad">
-                            <div class="column-content">
-                                <!-- MAIN CONTENT START -->
-                                <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
-                                <!-- MAIN CONTENT END -->
-                            </div>
+    <div id="page-content">
+        <div id="regions">
+            <div id="regions-mask">
+                <div id="region-main">
+                    <div id="region-main-mask">
+                        <div class="region-content">
+                            <!-- MAIN CONTENT START -->
+                            <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+                            <!-- MAIN CONTENT END -->
                         </div>
                     </div>
                 </div>
-                <div class="column-left">
-                    <div class="column-content  block-region side-pre"><?php
+                <div id="region-pre">
+                    <div class="region-content side-pre"><?php
                         if ($properties->sidepre) {
                             echo $OUTPUT->blocks_for_region('side-pre');
                         } ?>
                     </div>
                 </div>
-                <div class="column-right">
-                    <div class="column-content block-region side-post"><?php
+                <div id="region-post">
+                    <div class="region-content side-post"><?php
                         if ($properties->sidepost) {
                             echo $OUTPUT->blocks_for_region('side-post');
                         } ?>
@@ -82,7 +79,7 @@ echo $OUTPUT->doctype() ?>
         </div>
     </div>
     <?php if (empty($PAGE->layout_options['nofooter'])) { ?>
-    <div class="page-footer">
+    <div id="page-footer">
         <p class="helplink">
             <?php echo page_doc_link(get_string('moodledocslink')) ?>
         </p>
diff --git a/theme/anomaly/style/base.css b/theme/anomaly/style/base.css
index 953fb779fb2..35f677e2668 100644
--- a/theme/anomaly/style/base.css
+++ b/theme/anomaly/style/base.css
@@ -6,46 +6,11 @@ h1.main, h2.main, h3.main, h4.main, h5.main, h6.main {text-align:center;}
 .generalbox {padding:10px;margin-bottom:15px;}
 .generaltable, .userinfobox {margin-left:auto;margin-right:auto;}
 #notice.generalbox {margin-left: auto;margin-right: auto;width: 60%;}
-.notifytiny {font-size:0.7em;color:#333;}
-.notifytiny li, .notifytiny td {font-size:100%;}
-.notifyproblem {text-align:center;}
-.notifysuccess {text-align:center;}
-
-.sideblock .list,
-.unlist, .inline-list,
-.sideblock .list li,
-.unlist li, .inline-list li,
-.sitetopic .section li,
-.course-content .section,
-.course-content .section li,
-.tabtree li {list-style: none;margin:0px;padding:0px;}
-
-.jsenabled .collapsibleregion {overflow:hidden;}
+.notifyproblem {padding:10px;color:#660000;text-align:center;}
+.notifysuccess {padding:10px;color:#006600;text-align:center;}
 
 .paging {text-align:center;}
 
-/** 
- * Mforms
- */
-.mform {margin:0px auto;width:80%;}
-.mform fieldset {width:100%;border:1px solid #000;}
-.mform fieldset fieldset {border-width:0px;}
-.mform fieldset legend {font-weight:bold;margin-left:0.5em;}
-.mform fieldset div {margin:0px 10px 10px 10px;}
-.mform fieldset div div {margin:0px;}
-.mform fieldset .advancedbutton {text-align:right;}
-.mform fieldset.hidden {border-width:0px;}
-.mform .fitem {width:100%;overflow:hidden;margin-top:5px;margin-bottom:1px;clear:right;}
-.mform .fitem .fitemtitle {width:30%;text-align:right;float:left;}
-.mform .fitem .felement {width:60%;margin-left:31%;}
-.mform .fitem fieldset.felement {margin-left:0px;padding-left:1%;} /** Fix fieldset margin issue **/
-.mform .required label {color:#A00;}
-.mform .fdescription.required {color:#A00;text-align:right;}
-.mform .fpassword .unmask {display:inline;margin-left:0.5em;}
-
-.ie .mform .fitem .felement {margin-left:0px;text-align:left;float:left;} /** Fix IE double margin + float bugs **/
-.ie .mform .fitem .fitemtitle {padding-right:1em;}
-
 /**
  * Tabs
  */
@@ -65,14 +30,6 @@ h1.main, h2.main, h3.main, h4.main, h5.main, h6.main {text-align:center;}
 .tabtree .tabrow1 li a span,
 .tabtree .tabrow1 li a:hover span {background-image:none !important;}
 
-/** phpinfo styles **/
-.phpinfo .center {text-align: center;}
-.phpinfo .center table {margin-left: auto;margin-right: auto;text-align: left;border-collapse: collapse;}
-.phpinfo .center th {text-align: center;}
-.phpinfo .e,.phpinfo .v,.phpinfo .h {border: 1px solid #000000;font-size: 0.8em;vertical-align: baseline;color: #000000;background-color: #cccccc;}
-.phpinfo .e {background-color: #ccccff;font-weight: bold;}
-.phpinfo .h {background-color: #9999cc;font-weight: bold;}
-
 .groupmanagementtable {width:90%;}
 .groupmanagementtable td {vertical-align:top;border-width:0px;}
 .groupmanagementtable td p {margin:0px;}
\ No newline at end of file
diff --git a/theme/anomaly/style/browser.css b/theme/anomaly/style/browser.css
index 69cffb334cb..33a11c90133 100644
--- a/theme/anomaly/style/browser.css
+++ b/theme/anomaly/style/browser.css
@@ -5,20 +5,20 @@
  */
 .rounded-corner {display:block;width:11px;height:11px;font-size:1pt;margin:0px;padding:0px;}
 
-.page-header .rounded-corner {background-image:url([[pix:theme|corners_header]]);clear:both;}
-.page-header .rounded-corner.top-left {background-position:0px 0px;float:left;}
-.page-header .rounded-corner.top-right {background-position:11px 0px;float:right;}
+#page-header .rounded-corner {background-image:url([[pix:theme|corners_header]]);clear:both;}
+#page-header .rounded-corner.top-left {background-position:0px 0px;float:left;}
+#page-header .rounded-corner.top-right {background-position:11px 0px;float:right;}
 
 /** Fix IE8 + Opera positioning issue **/
-.ie8 .page-header .rounded-corner.top-right,
-.opera .page-header .rounded-corner.top-right {position:relative;top:-11px;}
+.ie8 #page-header .rounded-corner.top-right,
+.opera #page-header .rounded-corner.top-right {position:relative;top:-11px;}
 
-.page-footer {position:relative;}
-.page-footer .rounded-corner {position:absolute;background-image:url([[pix:theme|corners_header]]);clear:both;}
-.page-footer .rounded-corner.bottom-left {background-position:0px 11px;bottom:0px;left:0px;float:left;}
-.page-footer .rounded-corner.bottom-right {background-position:11px 11px;bottom:0px;right:-1px;float:right;}
+#page-footer {position:relative;}
+#page-footer .rounded-corner {position:absolute;background-image:url([[pix:theme|corners_header]]);clear:both;}
+#page-footer .rounded-corner.bottom-left {background-position:0px 11px;bottom:0px;left:0px;float:left;}
+#page-footer .rounded-corner.bottom-right {background-position:11px 11px;bottom:0px;right:-1px;float:right;}
 
-.block-region .sideblock {border-width:0px;background-color:white;}
+.sideblock {border-width:0px;background-color:white;}
 .sideblock .corner-box {border:1px solid #C8C9C7;margin-bottom:10px;padding-bottom:10px;background-color:#E3E3E3;}
 .sideblock .corner-box .rounded-corner {background-image:url([[pix:theme|corners_sideblock]]);position:relative;}
 .sideblock .corner-box .rounded-corner.top-left {background-position:0px 0px;float:left;top:-1px;left:-1px;}
@@ -50,12 +50,12 @@
 .gecko .sideblock .corner-box {-webkit-border-radius: 10px;-moz-border-radius: 10px;}
 
 .safari .sideblock .corner-box .header,
-.safari .page-header,
+.safari #page-header,
 .gecko .sideblock .corner-box .header,
-.gecko .page-header {-moz-border-radius: 10px 10px 0px 0px;-webkit-border-top-left-radius:10px;-webkit-border-top-right-radius:10px;}
+.gecko #page-header {-moz-border-radius: 10px 10px 0px 0px;-webkit-border-top-left-radius:10px;-webkit-border-top-right-radius:10px;}
 
-.safari .page-footer,
-.gecko .page-footer {-moz-border-radius: 0px 0px 10px 10px;-webkit-border-bottom-left-radius:10px;-webkit-border-bottom-right-radius:10px;}
+.safari #page-footer,
+.gecko #page-footer {-moz-border-radius: 0px 0px 10px 10px;-webkit-border-bottom-left-radius:10px;-webkit-border-bottom-right-radius:10px;}
 
 .gecko .forumpost,
 .gecko .forumpost .side {-moz-border-radius-bottomleft:20px}
diff --git a/theme/anomaly/style/general.css b/theme/anomaly/style/general.css
index 3c064b85c4e..ad38d31873d 100644
--- a/theme/anomaly/style/general.css
+++ b/theme/anomaly/style/general.css
@@ -6,18 +6,18 @@ img.icon,
 img.iconhelp {vertical-align:middle;}
 
 html, body {background-color:#C8C9C7;}
-#page .page-middle {background-color:#FFF;}
-.page-header {background-color: #222; color:#FFF;border-bottom:5px solid #697F55;}
-.hasnavbar .page-header {border-bottom-width:0px;}
-.page-footer {background-color: #222; color:#FFF;}
-.page-header .headermain span {color:#C8C9C7;}
+#page #page-content {background-color:#FFF;}
+#page-header {background-color: #222; color:#FFF;border-bottom:5px solid #697F55;}
+.hasnavbar #page-header {border-bottom-width:0px;}
+#page-footer {background-color: #222; color:#FFF;}
+#page-header .headermain span {color:#C8C9C7;}
 
-.page-header .navbar {background-color:#697F55;width:100%;}
-.page-header .navbar {color:#000;}
-.page-header .navbar a:link {color:#fff;}
-.page-header .navbar a:visited {color:#fff;}
-.page-header .navbar .breadcrumb {margin:5px 1em;float:left;}
-.page-header .navbar .navbutton {float:right;margin:5px 1em;}
+#page-header .navbar {background-color:#697F55;width:100%;}
+#page-header .navbar {color:#000;}
+#page-header .navbar a:link {color:#fff;}
+#page-header .navbar a:visited {color:#fff;}
+#page-header .navbar .breadcrumb {margin:5px 1em;float:left;}
+#page-header .navbar .navbutton {float:right;margin:5px 1em;}
 
 /** General **/
 .generalbox {border: 1px solid #DDDDDD;}
@@ -65,13 +65,13 @@ html, body {background-color:#C8C9C7;}
 .loginbox .guestsub {margin-left:10%;margin-right:10%;padding:10px;margin-bottom:5px;border-top:1px solid #DDD;}
 
 /** Blocks **/
-.block-region .sideblock {border:1px solid #C8C9C7;background-color: #E3E3E3;margin-bottom:10px;overflow:hidden;}
-.block-region .sideblock h1,
-.block-region .sideblock h2,
-.block-region .sideblock h3,
-.block-region .sideblock h4 {margin:0px;}
-.block-region .sideblock .header {margin:10px 6px 3px 6px;}
-.block-region .sideblock .content {margin:10px 6px 3px 6px;}
+.sideblock {border:1px solid #C8C9C7;background-color: #E3E3E3;margin-bottom:10px;overflow:hidden;}
+.sideblock h1,
+.sideblock h2,
+.sideblock h3,
+.sideblock h4 {margin:0px;}
+.sideblock .header {margin:10px 6px 3px 6px;}
+.sideblock .content {margin:10px 6px 3px 6px;}
 
 /** Admin **/
 .box.adminwarning {text-align:center;border:1px solid #C8C9C7;background-color:#E3E3E3;margin-bottom:1em;padding:10px 10%;}
@@ -191,10 +191,10 @@ html, body {background-color:#C8C9C7;}
 #calendar .filters table {padding:2px;background-color: #EEE;border:1px solid #DDD;border-spacing:2px;border-collapse: separate;}
 #calendar .filters table td {font-size:100%;width:auto;}
 #calendar .filters .eventskey {border:1px solid #444;overflow:hidden;}
-#calendar .event_global {background-color: #D6F8CD;}
-#calendar .event_course {background-color: #FFD3BD;}
-#calendar .event_group {background-color: #FEE7AE;}
-#calendar .event_user {background-color: #DCE7EC;}
+#calendar .calendar_event_global {background-color: #D6F8CD;}
+#calendar .calendar_event_course {background-color: #FFD3BD;}
+#calendar .calendar_event_group {background-color: #FEE7AE;}
+#calendar .calendar_event_user {background-color: #DCE7EC;}
 #calendar .maincalendar .calendarmonth {border-collapse: separate;}
 #calendar .maincalendar .calendarmonth th {font-size:0.9em;border-bottom:2px solid #444;}
 #calendar .maincalendar .calendarmonth td {border:1px solid #EEE;border-bottom-color:#CCC;border-right-color:#CCC;height:6em;}
diff --git a/theme/anomaly/style/layout.css b/theme/anomaly/style/layout.css
index 0f8669d7f06..272afe073fe 100644
--- a/theme/anomaly/style/layout.css
+++ b/theme/anomaly/style/layout.css
@@ -1,41 +1,3 @@
 /** Main Page Layout - Both side have blocks**/
 body {margin:25px 3%;}
-#page {width:100%;min-width:600px;overflow:hidden;}
-.page-header {float:left;margin:0;padding:0;width:100%;}
-.page-header .headermain {float:left;margin:15px;font-size:2.3em;line-height:0.7;clear:left;}
-.page-header .headermenu {float:right;margin:15px;font-size:0.8em;clear:right;}
-.page-header .navbar {clear:both;}
-.page-middle {clear:both;float:left;overflow:hidden;position:relative;width:100%;}
-.page-middle .column-container {float:left;left:220px;position:relative;width:200%;}
-.page-middle .column-container .column-mask {float:left;left:50%;margin-left:-440px;position:relative;width:100%;}
-.page-middle .column-container .column-mask .column-centre {float:right;position:relative;right:100%;width:50%;}
-.page-middle .column-container .column-mask .column-centre .column-wrap {margin:0 10px 0 430px;overflow:hidden;}
-.page-middle .column-container .column-mask .column-left {float:left;left:220px;margin-left:-50%;overflow:hidden;position:relative;width:200px;}
-.page-middle .column-container .column-mask .column-right {float:left;left:15px;overflow:hidden;position:relative;width:200px;}
-.page-middle .column-container .column-content {overflow:hidden;margin:10px;}
-.page-footer {clear:both;float:left;margin:0;padding:0;width:100%;}
-.page-footer .logininfo {float:right;margin:0px 10px;}
-.page-footer .sitelink {float:left;margin:0px 10px;}
-.page-footer .helplink {float:left;margin:0px 10px;}
-.page-footer .performanceinfo {text-align:center;margin:10px 20%;}
-.page-footer .performanceinfo span {display:block;}
-
-/** Only side pre **/
-.side-pre-only .page-middle .column-container .column-mask {margin-left:-220px;}
-.side-pre-only .page-middle .column-container .column-mask .column-centre .column-wrap {margin:0 10px 0 210px;}
-.side-pre-only .page-middle .column-container .column-mask .column-left {left:10px;}
-.side-pre-only .page-middle .column-container .column-mask .column-right {width:0px;}
-
-/** Only side post **/
-.side-post-only .page-middle .column-container {left:0px;}
-.side-post-only .page-middle .column-container .column-mask {margin-left:-220px;}
-.side-post-only .page-middle .column-container .column-mask .column-centre .column-wrap {margin:0 10px 0 210px;}
-.side-post-only .page-middle .column-container .column-mask .column-left {width:0px;}
-.has_dock.side-post-only .page-middle .column-container .column-mask .column-centre .column-wrap {margin-left:240px;}
-
-/** No blocks whatsoever **/
-.noblocks .page-middle .column-container {left:20px;}
-.noblocks .page-middle .column-container .column-mask {margin-left:-30px;}
-.noblocks .page-middle .column-container .column-mask .column-centre .column-wrap {margin:0 10px 0 30px;}
-.noblocks .page-middle .column-container .column-mask .column-left {left:20px;width:0px;}
-.noblocks .page-middle .column-container .column-mask .column-right {width:0px;}
\ No newline at end of file
+#page {min-width:600px;}
\ No newline at end of file
diff --git a/theme/base/config.php b/theme/base/config.php
index 03070d7e5ba..48afe4b755a 100644
--- a/theme/base/config.php
+++ b/theme/base/config.php
@@ -15,7 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-
 /**
  * Configuration for Moodle's standard theme.
  *
@@ -33,15 +32,21 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$THEME->name = 'base';
 
 $THEME->parents = array();
 
 $THEME->sheets = array(
-    'pagelayout',
-    'core',
+    'pagelayout',   /** Must come first: Page layout **/
+    'core',         /** Must come second: General styles **/
+    'admin',
     'blocks',
+    'calendar',
     'course',
-    'block_calendar_month',
+    'grade',
+    'message',
+    'question',
+    'user'
 );
 
 $THEME->editor_sheets = array();
@@ -151,4 +156,4 @@ $THEME->layouts = array(
 
 /** List of javascript files that need to included on each page */
 $THEME->javascripts = array();
-$THEME->javascripts_footer = array('navigation');
\ No newline at end of file
+$THEME->javascripts_footer = array();
\ No newline at end of file
diff --git a/theme/base/javascript/navigation.js b/theme/base/javascript/navigation.js
deleted file mode 100644
index 9bd934d2172..00000000000
--- a/theme/base/javascript/navigation.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * So you want to override the navigation huh ??
- * Make it look like your own and totally customise it to be way cool !!
- *
- * Well now you can by following the instructions in this file.
- *
- * It will be essential to have a clear idea about what it is you want to acheive,
- * whilst it is possible to override nearly all of the navbar settings/methods it's
- * not nesecarily going to be an easy task.
- *
- * To begin you must understand the structure of the blocks and particually the navbar
- * object. The following outlines the basic structure:
- *
- *      - Namespace: blocks
- *          - Func: setup_generic_block         Creates a new generic block instance
- *          - Class: genericblock                   Generic block class
- *          - Namespace: navbar
- *              - Var: count                        The # of items that have EVER existed on the navbar
- *              - Var: exists                       True if the navbar exists
- *              - Var: items                        An array of items on the navbar
- *              - Var: node                         The node that is the navbar
- *              - Var: strings                      An object containing strings for the navbar
- *              - Namespace: cfg
- *                  - Var: buffer                   The space buffer around panels
- *                  - Var: position                 The position of the navbar
- *                  - Var: orientation              The orientation of the navbar
- *                  - Namespace: display
- *                      ............                A series of display parameters
- *                  - Namespace: css
- *                      ............                A series of CSS class names
- *                  - Namespace: panel
- *                      ............                A series of conf options for YUI panels
- *              - Func: add                         Adds an item to the navbar
- *              - Func: draw                        Creates the navbar and adds it to the page
- *              - Func: remove                      Removes an item from the navbar
- *              - Func: remove_all                  Removes all items from the navbar
- *              - Func: resize                      Calls the navbar to resize its active item
- *              - Func: hide_all                    Calls the navbar to hide all active items
- *              - Class: item                       A navbar item class
- *              - Namespace: abstract_block_class   A namespace containing all of the properties
- *                      .............               and methods that will be used as the default
- *                      .............               methods for the generic block class.
- *              - Namespace: abstract_item_class    A namespace containing all of the properties
- *                      .............               and methods for the navbar item class
- *              
- * From the structure above you are able to immediatly override any of the vars
- * that are associated with the navigation by simply assigning them a value as
- * shown below:
- * 
- *      blocks.navbar.cfg.buffer = 20; // or
- *
- * You are also able to override all of the properties and methods of the two
- * abstract classes that manage all of the interaction for the blocks and navbar
- * items thanks to the prototyping method that is being used to build the classes.
- *
- * To override a method simply copy the following style of coding:
- *
- *      blocks.genericblock.prototype.init = function(uid) {
- *          // The code for the new init method which will be executed in the
- *          // objects scope and override the old init method.
- *      }
- *
- *      // OR if the following is easier for you to understand
- *
- *      function new_init_method(uid) {
- *          // The code for the new init method which will be executed in the
- *          // objects scope and override the old init method.
- *      }
- *      blocks.genericblock.prototype.init = new_init_method()
- *
- * Alternativily for the navbar items class the there are a series of actions that
- * get fired that you may want to listen to. The events defined are as follows:
- *
- *      navbaritem:drawstart        draw is called
- *      navbaritem:drawcomplete     draw is complete
- *      navbaritem:showstart        show is called
- *      navbaritem:showcomplete     show is complete
- *      navbaritem:hidestart        hide is called
- *      navbaritem:hidecomplete     hide is complete
- *      navbaritem:resizestart      resize is called
- *      navbaritem:resizecomplete   resize is complete
- *      navbaritem:itemremoved      item is removed from the navbar
- *
- * You can listen to any of these events by first finding the appropriate item within
- * the navbar.items array and then calling the following on it:
- *
- *      var uid = x;
- *      blocks.navbar.items[uid].on('navbaritem:showstart', callback, scope);
- *      function callback(navbaritem) {
- *          // What ever you want to do can go here
- *      }
- *
- */
-
-// If this isn't set we don't need an override at all
-if (typeof(blocks)=='object' && blocks.genericblock) {
-
-    /**
-     * Override the default resize_block_space method so that we can ensure
-     * it works for this template
-     * @param {Y.Node} blocknode
-     */
-    blocks.genericblock.prototype.resize_block_space = function(blocknode) {
-        var blockregion = blocknode.ancestor('#block-region');
-        if (blockregion) {
-            if (blockregion.all('.sideblock').size() === 0 && this.blockspacewidth === null) {
-                // Some spiffy code to reduce the template sideblock to 0 width
-                this.blockspacewidth = blockregion.getStyle('width');
-            } else if (this.blockspacewidth !== null) {
-                // Some spiffy code to set the sideblock width back to the original width
-                this.blockspacewidth = null;
-            }
-        }
-    }
-    
-}
\ No newline at end of file
diff --git a/theme/base/layout/embedded.php b/theme/base/layout/embedded.php
index c305cfb428a..5d222025429 100644
--- a/theme/base/layout/embedded.php
+++ b/theme/base/layout/embedded.php
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/base/layout/frontpage.php b/theme/base/layout/frontpage.php
index fb827d9ada7..4734fd63d0d 100644
--- a/theme/base/layout/frontpage.php
+++ b/theme/base/layout/frontpage.php
@@ -1,11 +1,15 @@
 <?php
 
-$regionsinfo = 'pagelayout';
-if ($PAGE->blocks->region_has_content('side-pre', $OUTPUT)) {
-    $regionsinfo .= '-pre';
-}
-if ($PAGE->blocks->region_has_content('side-post', $OUTPUT)) {
-    $regionsinfo .= '-post';
+$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT);
+$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
+
+$bodyclasses = array();
+if ($hassidepre && !$hassidepost) {
+    $bodyclasses[] = 'side-pre-only';
+} else if ($hassidepost && !$hassidepre) {
+    $bodyclasses[] = 'side-post-only';
+} else if (!$hassidepost && !$hassidepre) {
+    $bodyclasses[] = 'content-only';
 }
 
 echo $OUTPUT->doctype() ?>
@@ -16,12 +20,12 @@ echo $OUTPUT->doctype() ?>
     <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
-<div id="page" class="<?php echo $regionsinfo ?>">
+<div id="page">
 
-    <div id="header-home" class="clearfix">
+    <div id="page-header" class="clearfix">
         <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
         <div class="headermenu"><?php
             echo $OUTPUT->login_info();
@@ -31,22 +35,28 @@ echo $OUTPUT->doctype() ?>
     </div>
 <!-- END OF HEADER -->
 
-    <div class="regions-outer clearfix">
+    <div id="page-content">
         <div id="regions">
-            <div class="regions-inner">
-                <div class="contentwrap">
-                    <div id="content">
-                        <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+            <div id="regions-mask">
+                <div id="region-main">
+                    <div id="region-main-mask">
+                        <div class="region-content">
+                            <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+                        </div>
                     </div>
                 </div>
-                <?php if ($PAGE->blocks->region_has_content('side-pre', $OUTPUT)) { ?>
-                <div id="region-side-pre" class="block-region">
-                    <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+                <?php if ($hassidepre) { ?>
+                <div id="region-pre">
+                    <div class="region-content">
+                        <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+                    </div>
                 </div>
                 <?php } ?>
-                <?php if ($PAGE->blocks->region_has_content('side-post', $OUTPUT)) { ?>
-                <div id="region-side-post" class="block-region">
-                    <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+                <?php if ($hassidepost) { ?>
+                <div id="region-post">
+                    <div class="region-content">
+                        <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+                    </div>
                 </div>
                 <?php } ?>
             </div>
@@ -54,7 +64,7 @@ echo $OUTPUT->doctype() ?>
     </div>
 
 <!-- START OF FOOTER -->
-    <div id="footer" class="clearfix">
+    <div id="page-footer">
         <p class="helplink">
         <?php echo page_doc_link(get_string('moodledocslink')) ?>
         </p>
diff --git a/theme/base/layout/general.php b/theme/base/layout/general.php
index a2f3f6935fb..95989a039c8 100644
--- a/theme/base/layout/general.php
+++ b/theme/base/layout/general.php
@@ -1,11 +1,18 @@
 <?php
 
-$regionsinfo = 'pagelayout';
-if ($PAGE->blocks->region_has_content('side-pre', $OUTPUT)) {
-    $regionsinfo .= '-pre';
-}
-if ($PAGE->blocks->region_has_content('side-post', $OUTPUT)) {
-    $regionsinfo .= '-post';
+$hasheading = ($PAGE->heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT);
+$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
+
+$bodyclasses = array();
+if ($hassidepre && !$hassidepost) {
+    $bodyclasses[] = 'side-pre-only';
+} else if ($hassidepost && !$hassidepre) {
+    $bodyclasses[] = 'side-post-only';
+} else if (!$hassidepost && !$hassidepre) {
+    $bodyclasses[] = 'content-only';
 }
 
 echo $OUTPUT->doctype() ?>
@@ -15,13 +22,13 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
-<div id="page"  class="<?php echo $regionsinfo ?>">
-
-<?php if ($PAGE->heading) { ?>
-    <div id="header" class="clearfix">
+<div id="page">
+<?php if ($hasheading || $hasnavbar) { ?>
+    <div id="page-header">
+        <?php if ($hasheading) { ?>
         <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
         <div class="headermenu"><?php
             echo $OUTPUT->login_info();
@@ -29,34 +36,38 @@ echo $OUTPUT->doctype() ?>
                 echo $OUTPUT->lang_menu();
             }
             echo $PAGE->headingmenu
-         ?></div>
-    </div>
-<?php } ?>
-
-<?php if (empty($PAGE->layout_options['nonavbar']) and $PAGE->has_navbar()) { // This is the navigation bar with breadcrumbs  ?>
-    <div class="navbar clearfix">
-        <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
-        <div class="navbutton"><?php echo $PAGE->button; ?></div>
+        ?></div><?php } ?>
+        <?php if ($hasnavbar) { ?>
+            <div class="navbar clearfix">
+                <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
+                <div class="navbutton"> <?php echo $PAGE->button; ?></div>
+            </div>
+        <?php } ?>
     </div>
 <?php } ?>
 <!-- END OF HEADER -->
-
-    <div class="regions-outer clearfix">
+    <div id="page-content">
         <div id="regions">
-            <div class="regions-inner">
-                <div class="contentwrap">
-                    <div id="content">
-                        <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+            <div id="regions-mask">
+                <div id="region-main">
+                    <div id="region-main-mask">
+                        <div class="region-content">
+                            <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+                        </div>
                     </div>
                 </div>
-                <?php if ($PAGE->blocks->region_has_content('side-pre', $OUTPUT)) { ?>
-                <div id="region-side-pre" class="block-region">
-                    <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+                <?php if ($hassidepre) { ?>
+                <div id="region-pre">
+                    <div class="region-content">
+                        <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+                    </div>
                 </div>
                 <?php } ?>
-                <?php if ($PAGE->blocks->region_has_content('side-post', $OUTPUT)) { ?>
-                <div id="region-side-post" class="block-region">
-                    <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+                <?php if ($hassidepost) { ?>
+                <div id="region-post">
+                    <div class="region-content">
+                        <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+                    </div>
                 </div>
                 <?php } ?>
             </div>
@@ -64,12 +75,9 @@ echo $OUTPUT->doctype() ?>
     </div>
 
 <!-- START OF FOOTER -->
-    <?php if (empty($PAGE->layout_options['nofooter'])) { ?>
-    <div id="footer" class="clearfix">
-        <p class="helplink">
-        <?php echo page_doc_link(get_string('moodledocslink')) ?>
-        </p>
-
+    <?php if ($hasfooter) { ?>
+    <div id="page-footer" class="clearfix">
+        <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
         <?php
         echo $OUTPUT->login_info();
         echo $OUTPUT->home_link();
diff --git a/theme/base/style/admin.css b/theme/base/style/admin.css
new file mode 100644
index 00000000000..3e491912229
--- /dev/null
+++ b/theme/base/style/admin.css
@@ -0,0 +1,151 @@
+/**
+ * Admin
+ **/
+.formtable tbody th {font-weight: normal;text-align: right;}
+
+.plugincompattable td.nonstandard,
+.plugincompattable td.missingplugin {font-weight: bold;}
+.plugincompattable td.standard,
+.plugincompattable td.warning {font-style: normal;}
+
+.path-admin .manageauthtable {width:100%;}
+
+#page-admin-index .c0 {vertical-align: top;}
+#page-admin-index .c1 {vertical-align: middle;}
+
+#page-admin-blocks table.generaltable th,
+#page-admin-filters table.generaltable th,
+#page-admin-auth table.generaltable th,
+#page-admin-modules table.generaltable th,
+#page-admin-modules table.generaltable td.c0 {white-space: nowrap;padding: 4px;}
+
+#page-admin-blocks table.generaltable td.cell,
+#page-admin-filters table.generaltable td.cell,
+#page-admin-modules table.generaltable td.cell,
+#page-admin-auth table.generaltable td.cell{padding: 4px;}
+
+.path-admin .incompatibleblockstable td.c0 {font-weight: bold;}
+
+#page-admin-course-category .addcategory {padding: 10px;}
+#page-admin-course-index .buttons,
+#page-admin-course-category .buttons {margin-bottom: 15px;}
+#page-admin-course-index .editcourse {margin:20px auto;}
+#page-admin-course-index .editcourse th,
+#page-admin-course-index .editcourse td {padding-left:10px;padding-right:10px;}
+#page-admin-course-index .editcourse .count {text-align:right;}
+
+#page-admin-report-unittest-index .exception pre {padding: 8px;}
+#page-admin-report-unittest-index .unittestsummary {padding: 8px;margin-top: 1em;}
+#page-admin-report-security-index .timewarninghidden {display:none;}
+#page-admin-report-security-index .statuswarning {background-color: #f0e000;}
+#page-admin-report-security-index .statusserious {background-color: #f07000;}
+#page-admin-report-security-index .statuscritical {background-color: #f00000;}
+#page-admin-report-capability-index .rolecaps th {text-align: left;}
+#page-admin-report-capability-index #settingsform #capabilitysearch {width: 30em;}
+
+#page-admin-qtypes .disabled {color: gray;}
+#page-admin-qtypes th {white-space: normal;}
+#page-admin-qtypes .cell.c1,
+#page-admin-qtypes .cell.c2 {text-align: right;}
+#page-admin-qtypes #qtypes div,
+#page-admin-qtypes #qtypes form {display: inline;}
+#page-admin-qtypes #qtypes img.spacer {width: 16px;}
+
+.path-admin-roles .buttons .singlebutton,
+#page-admin-course-index .buttons .singlebutton,
+#page-admin-course-category .buttons .singlebutton {display: inline;padding: 5px;}
+
+.path-admin-roles .capabilitysearchui {text-align: left;margin-left: auto;margin-right: auto;}
+#page-admin-roles-define .topfields {margin: 1em 0 2em;}
+#page-admin-roles-define .mform {width: 100%;}
+#page-filter-manage .backlink,
+.path-admin-roles .backlink {margin-top: 1em}
+#page-admin-roles-explain #chooseuser h3,
+#page-admin-roles-usersroles .contextname {margin-top: 0;}
+#page-admin-roles-explain #chooseusersubmit {margin-top:0;text-align: center;}
+#page-admin-roles-usersroles p {margin: 0;}
+#page-admin-roles-override .cell.c1,
+#page-admin-roles-assign .cell.c3,
+#page-admin-roles-assign .cell.c1 {padding-top: 0.75em;}
+#page-admin-roles-override .overridenotice,
+#page-admin-roles-define .definenotice {margin: 1em 10% 2em 10%;text-align: left;}
+
+#page-admin-langimport .generalbox table {margin:auto;width:100%;}
+
+#page-admin-index .adminerror .singlebutton,
+#page-admin-index .adminwarning .singlebutton,
+#page-admin-index #layout-table .singlebutton {margin:20px;}
+
+#page-admin-user-user_bulk #users .fgroup {white-space: nowrap;}
+#page-admin-report-stats-index .graph {text-align: center;margin-bottom: 1em;}
+#page-admin-report-courseoverview-index .graph {text-align: center;margin-bottom: 1em;}
+#page-admin-lang .translator {border-width: 1px;border-style: solid;}
+
+#page-admin-uploaduser table#uuresults {margin-bottom: 2em;}
+#page-admin-uploaduser table#uupreview,
+#page-admin-uploaduser table#uuresults td.cell {padding:3px;}
+
+/** This is the CSS for the role assignment control **/
+.path-admin .roleassigntable {width: 100%;}
+.path-admin .roleassigntable td {vertical-align: top;padding: 0.2em 0.3em}
+.path-admin .roleassigntable p {text-align: left;margin: 0.2em 0;}
+.path-admin .roleassigntable #existingcell,
+.path-admin .roleassigntable #potentialcell {width: 42%;}
+.path-admin .roleassigntable #existingcell label,
+.path-admin .roleassigntable #potentialcell label {font-weight: bold;}
+.path-admin .roleassigntable #buttonscell {width: 16%;}
+.path-admin .roleassigntable #buttonscell #add,
+.path-admin .roleassigntable #buttonscell #remove {width: 100%;margin: 0.3em 0;padding: 0.5em 0;}
+.path-admin .roleassigntable #buttonscell p {margin: 0.3em 0;}
+.path-admin .roleassigntable #buttonscell #assignoptions {font-size: 0.75em;}
+.path-admin .roleassigntable #buttonscell #assignoptions .collapsibleregioncaption {font-weight: bold;}
+.path-admin .roleassigntable #buttonscell #addcontrols {margin-top: 3em;height: 13em;}
+.path-admin .roleassigntable #removeselect_wrapper,
+.path-admin .roleassigntable #addselect_wrapper {width: 100%;}
+.path-admin .roleassigntable #removeselect_wrapper label,
+.path-admin .roleassigntable #addselect_wrapper label {font-weight: normal;}
+
+.path-admin table.rolecap {margin-left: auto;margin-right: auto;}
+.path-admin table.rolecap tr.rolecap th {text-align: left;font-weight: normal;}
+.path-admin .rolecap .hiddenrow {display: none;}
+.path-admin .rolecap .inherit,
+.path-admin .rolecap .allow,
+.path-admin .rolecap .prevent,
+.path-admin .rolecap .prohibit {text-align:center;}
+.path-admin .rolecap .cap-name,
+.path-admin .rolecap .note {display: block;padding: 0 0.5em;}
+.path-admin .rolecap label {display: block;width: 100%;min-height: 2.5em;}
+
+#page-admin-enrol .enrolplugintable {width:100%;}
+
+.plugincheckwrapper {width: 100%;}
+.adminsearchform {padding-top:10px;}
+.environmentbox {margin-top: 1em;}
+#mnetconfig table,
+.environmenttable {margin-left:auto;margin-right:auto;}
+.environmenttable .cell {padding: 0.15em 0.5em;}
+#trustedhosts .generaltable {margin-left: auto;margin-right: auto;width: 500px;}
+#trustedhosts .standard {width: auto;}
+.form-buttons {margin: 10px 0 0 13em;}
+
+#adminsettings fieldset {margin-top: 1em;padding: 1em 0.5em;}
+#adminsettings legend {display: none;}
+#adminsettings fieldset.error {margin: 0.2em 0 0.5em 0;padding: 0.5em 0 0 0;}
+#adminsettings fieldset.error legend {display: block;}
+#adminsettings .form-item {clear: both;margin: 1em 0 2em 0;}
+#adminsettings .form-item .form-label {display: block;float: left;width: 12.5em;text-align: right;}
+#adminsettings .form-item .form-label .form-shortname {display:block;}
+#adminsettings .form-item .form-setting {display: block;margin-left: 13em;text-align: left;}
+#adminsettings .form-item .form-setting .form-htmlarea {width:  640px;display:inline;}
+#adminsettings .form-item .form-setting .form-htmlarea .htmlarea {width:  640px;display:block;}
+#adminsettings .form-item .form-setting .form-multicheckbox li {list-style: none;}
+#adminsettings .form-item .form-setting .form-multicheckbox ul {padding:0;margin:0;}
+#adminsettings .form-item .form-setting .defaultsnext {margin-right: 0.5em;display: inline;}
+#adminsettings .form-item .form-setting .form-password .unmask,
+#adminsettings .form-item .form-setting .form-defaultinfo {display: inline;}
+#adminsettings .form-item .form-description {display: block;margin: 0.5em 0 0em 13em;text-align: left;}
+#adminsettings .form-item .pathok,
+#adminsettings .form-item .patherror {margin-left: 0.5em;}
+
+#adminthemeselector .selectedtheme td.c0 {border:1px solid;border-right-width:0;}
+#adminthemeselector .selectedtheme td.c1 {border:1px solid;border-left-width:0;}
\ No newline at end of file
diff --git a/theme/base/style/block_calendar_month.css b/theme/base/style/block_calendar_month.css
deleted file mode 100644
index ab9b05f92bc..00000000000
--- a/theme/base/style/block_calendar_month.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.block_calendar_month table.minicalendar {
- width: 100%;
-}
-
-.block_calendar_month table.minicalendar td {
-  text-align: center;
-}
-
-/*Accessibility: controls now div and span, 20:60:20% or 12:76:12% */
-.block_calendar_month .calendar-controls .previous,
-.block_calendar_month .calendar-controls .next,
-.block_calendar_month .calendar-controls .current {
-  display: block;
-  float: left;
-  width: 12%;
-}
-
-.block_calendar_month .calendar-controls .previous {
-  text-align: left;
-}
-
-.block_calendar_month .calendar-controls .current {
-  text-align: center;
-  width: 76%;
-}
-
-.block_calendar_month .calendar-controls .next {
-  text-align: right;
-}
diff --git a/theme/base/style/blocks.css b/theme/base/style/blocks.css
index b74b4ba20cd..5e4d971af25 100644
--- a/theme/base/style/blocks.css
+++ b/theme/base/style/blocks.css
@@ -1,134 +1,27 @@
+.sideblock.hidden .header {border-bottom-width:0;}
+.sideblock.hidden .content {display: none;}
 
-/** General **/
+.sideblock {border-style: solid;border-width:1px;margin-bottom:1em;}
+.sideblock .header h2 {margin:4px;}
+.sideblock .header .block_action {float:right;margin:0 4px;vertical-align:top;}
+.sideblock .header .block_action input {margin-right:2px;}
+.sideblock .content {margin:4px;}
+.sideblock .footer {margin-bottom: 4px;}
 
-.block-region .hidden .content {
-  display: none;
-}
+.sideblock img.userpicture {width:16px;height:16px;margin-right:4px;}
+.sideblock.beingmoved {border-width: 2px;border-style: dashed;}
 
-.sideblock .header .block_action {
-  float:right;
-}
+.block-region .hidden .header {border-bottom: 1px solid;}
+.block-region .hidden .content {display: none;}
+.block-region .invisible {opacity: 0.5;filter: alpha(opacity=0.5);}
 
-.sideblock div.column {
-  margin:0px;
-  margin-right:4px;
-  padding:0px;
-}
+.blockmovetarget {display: block;height: 1em;margin-bottom: 1em;border-width: 2px;border-style: dashed;}
 
-.sideblock div.column.c0 {
-  float: left;
-}
+.sideblock .blockannotation {font-size:0.75em;margin: -1em 0 1em;}
+.sideblock.beingmoved {border-width: 2px;border-style: dashed;}
+.sideblock .content ul.list li.listentry {clear:both;}
+.sideblock .content div.info {text-align:center;}
 
-.sideblock div.column.c1 {
-  display: inline;
-}
-
-.sideblock .content .c0 img.icon {
-  margin:0px;
-}
-
-.sideblock .content .list, .unlist, .inline-list {
-  list-style:none;
-  padding:0;
-  margin:0;
-}
-
-.sideblock .content .list {
-  width: 100%;
-}
-
-.sideblock .content .list li {
-  clear: left;
-}
-
-.sideblock .content .inline-list li, .inline-list li {
-  display: inline;
-}
-
-.sideblock .content ul.list li.listentry {
-  clear:both;
-}
-
-.sideblock .content div.info {
-  text-align:center;
-}
-
-.sideblock .footer {
-  margin-bottom: 4px;
-  text-align:center;
-  clear:both;
-}
-
-.sideblock img.userpicture {
-  width:16px;
-  height:16px;
-  margin-right:4px;
-}
-
-.sideblock.beingmoved {
-  border-width: 2px;
-  border-style: dashed;
-}
-
-/** Navigation and settings block **/
-.ie6 .sideblock .block_tree,
-.ie7 .sideblock .block_tree {
-  overflow-x:scroll;
-}
-.block_tree {
-  list-style: none;
-  padding-left:0px;
-}
-.block_tree ul {
-  margin-left: 0px;
-  padding-left:16px;
-  list-style: none;
-}
-.sideblock .block_tree {
-  overflow-x:auto;
-  overflow-y:visible;
-}
-.block_tree .tree_item {
-  white-space:nowrap;
-  margin:2px 0px;
-  padding-left: 16px;
-  margin:3px 0px;
-  white-space:nowrap;
-  text-align:left;
-}
-.ie6 .block_tree .tree_item {
-  width:100%;
-}
-.block_tree .tree_item.branch {
-  background-image: url([[pix:t/expanded]]);
-  background-position: center left;
-  background-repeat: no-repeat;
-}
-.block_tree .root_node.leaf {
-  padding-left:0px;
-}
-.block_tree .current_branch {
-  font-weight:bold;
-}
-
-.jsenabled .dock_on_load,
-.jsenabled .block_tree .collapsed ul {
-  display: none;
-}
-.jsenabled .block_tree .tree_item.branch {
-  cursor:pointer;
-}
-.jsenabled .block_tree .collapsed .tree_item.branch {
-  background-image: url([[pix:t/collapsed]]);
-}
-.jsenabled .block_tree .tree_item.emptybranch {
-  background-image: url([[pix:t/collapsed_empty]]);
-  background-position: center left;
-  background-repeat: no-repeat;
-}
-.block_tree_box .requiresjs {
-  display:none;
-}
-.jsenabled .block_tree_box .requiresjs {
-  display:inline;
-}
+/** List block contents **/
+.sideblock .list .c0 {display:inline;}
+.sideblock .list .c1 {margin-left:5px;display:inline;}
\ No newline at end of file
diff --git a/theme/base/style/calendar.css b/theme/base/style/calendar.css
new file mode 100644
index 00000000000..c6365546595
--- /dev/null
+++ b/theme/base/style/calendar.css
@@ -0,0 +1,39 @@
+/** Calendar **/
+.calendartable {width: 100%;}
+.calendartable th,
+.calendartable td {width:14%;vertical-align:top;text-align: center;border-width:1px;}
+
+.calendar_event_course {background-color:#FFD3BD;}
+.calendar_event_global {background-color:#D6F8CD;}
+.calendar_event_group {background-color:#FEE7AE;}
+.calendar_event_user {background-color:#DCE7EC;}
+
+.calendar .calendar-controls .previous,
+.calendar .calendar-controls .next,
+.calendar .calendar-controls .current {display: block;float: left;width: 12%;}
+.calendar .calendar-controls .previous {text-align: left;}
+.calendar .calendar-controls .current {text-align: center;width: 76%;}
+.calendar .calendar-controls .next {text-align: right;}
+
+.path-calendar {width: 100%;height:100%;border-spacing: 5px;border-collapse: separate;}
+.path-calendar .sidecalendar {vertical-align: top;padding: 0;width: 25%;}
+.path-calendar .maincalendar {vertical-align: top;padding: 0;height: 100%;}
+.path-calendar .maincalendar .bottom {text-align: center;padding:5px 0 0 0;}
+.path-calendar .maincalendar .heightcontainer {height: 100%;position: relative;}
+.path-calendar .maincalendar .calendarmonth {width:98%;margin:10px auto;}
+.path-calendar .maincalendar .calendarmonth ul {margin:0;}
+.path-calendar .maincalendar .calendarmonth ul li {list-style-type:none;margin-top: 4px;}
+.path-calendar .maincalendar .calendarmonth td {height: 5em;}
+.path-calendar .maincalendar .calendar-controls .previous,
+.path-calendar .maincalendar .calendar-controls .next{width: 30%;}
+.path-calendar .maincalendar .calendar-controls .current {width: 39.95%;}
+.path-calendar .maincalendar .controls {width:98%;margin:10px auto;}
+.path-calendar .maincalendar .eventlist .event {width:100%;margin-bottom:10px;border-spacing:0px;border-collapse:separate;border-width:1px;border-style:solid;}
+.path-calendar .maincalendar .eventlist .event .topic .name {float:left;}
+.path-calendar .maincalendar .eventlist .event .topic .date {float:right;}
+.path-calendar .maincalendar .eventlist .event .course {float:left;clear:left;}
+.path-calendar .maincalendar .eventlist .event .side {width:32px;}
+.path-calendar .maincalendar .header {overflow:hidden;}
+.path-calendar .maincalendar .header .buttons {float: right;}
+.path-calendar .filters table {border-collapse:separate;border-spacing: 2px;width: 100%;}
+#page-calendar-export .indent {padding-left: 20px;}
\ No newline at end of file
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 48217c05192..554bfb363a9 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -1,167 +1,510 @@
+/**
+ * General
+ */
+th,
+td,
+a img {border-width:0;}
+acronym,
+abbr {cursor: help;}
+.dir-ltr,
+.mdl-left {text-align: left;}
+.dir-rtl,
+.mdl-right {text-align: right;}
+#add,
+#remove,
+.centerpara,
+.mdl-align {text-align: center;}
+a.dimmed,
+a.dimmed_text,
+.dimmed_text a {color:#AAAAAA;}
+.unlist,
+.unlist li,
+.inline-list,
+.inline-list li,
+.sideblock .list,
+.sideblock .list li,
+.sitetopic .section li,
+.course-content .section li,
+.tabtree li {list-style: none;margin:0;padding:0;}
+.inline-list li {display: inline;}
+.notifytiny {font-size:0.7em;}
+.notifytiny li,
+.notifytiny td {font-size:100%;}
+.red,
+.notifyproblem {color:#660000;}
+.green,
+.notifysuccess {color:#006600;}
+.reportlink {text-align:right;}
+a.autolink.glossary:hover {cursor: help;}
+/* Block which is hidden if javascript enabled, prevents fickering visible when JS from footer used! */
+.collapsibleregioncaption {white-space: nowrap;}
+.collapsibleregioncaption img {vertical-align: middle;}
+.jsenabled .hiddenifjs {display: none;}
+.jsenabled .collapsibleregion {overflow:hidden;}
+.jsenabled .collapsed .collapsibleregioninner {visibility: hidden;}
+.yui-overlay .yui-widget-bd {background-color:#FFEE69;border:1px solid #A6982B;border-top-color: #D4C237;color:#000000;left:0;padding:2px 5px;position:relative;top:0;z-index:1;}
+.clearer {background:transparent;border-width:0;clear:both;display:block;height:1px;margin:0;padding:0;}
+.clearfix:after {clear: both;content: ".";display: block;height: 0;min-width: 0;visibility: hidden;}
+.bold,
+.warning,
+.errorbox .title,
+.pagingbar .title,
+.pagingbar .thispage,
+.headingblock {font-weight: bold;}
+img.resize {height: 1em;width: 1em;}
+.sideblock img.resize,
+.breadcrumb img.resize {height: 0.9em;width: 0.8em;}
+img.icon {height:16px;vertical-align:middle;width:16px;}
+img.iconsmall {height:11px;margin-right:1px;vertical-align:middle;width:11px;}
+img.iconhelp {height:17px;margin-right:4px;vertical-align:middle;width:17px;}
+img.icontoggle {height:17px;vertical-align:middle;width:50px;}
+img.iconkbhelp {height:17px;width:49px;}
+.categorybox .category {font-size:1.2em;font-weight:bold;}
+.generalbox {border:1px solid;}
+.boxaligncenter {margin-left:auto;margin-right:auto;}
+.boxalignright {margin-left:auto;margin-right:0;}
+.boxalignleft {margin-left:0;margin-right:auto;}
+.boxwidthnarrow {width: 30%;}
+.boxwidthnormal {width: 50%;}
+.boxwidthwide {width: 80%;}
+.buttons .singlebutton,
+.buttons .singlebutton form,
+.buttons .singlebutton div {display: inline;}
+.buttons .singlebutton input {margin:20px 5px;}
+.blink {text-decoration: blink;}
+.headermain {font-weight:bold;}
+#maincontent {display: block;height: 1px;overflow: hidden;}
+img.uihint {cursor: help;}
+#addmembersform table {margin-left: auto;margin-right: auto;}
+.formtable tbody th,
+.generaltable th.header {vertical-align: top;}
+.flexible th {white-space: nowrap;}
+.cell {vertical-align: top;}
+.helplink img {height: 17px;vertical-align: middle;width: 17px;}
+img.emoticon {vertical-align: middle;width: 15px;height: 15px;}
+form.popupform,
+form.popupform div {display: inline;}
+.arrow_button input {overflow:hidden;}
+/** IE6 float + background bug solution **/
+.ie6 li.section {line-height:1.2em;width:100%;}
 
-/* custom moodle style resets, differencies from the YUI reset */
-
-.dir-ltr {
-  text-align: left;
-}
-
-.dir-rtl {
-  text-align: right;
-}
-
-
-/***
+/**
  * Accessibility features
- **/
-
+ */
 /*Accessibility: text 'seen' by screen readers but not visual users. */
-.accesshide {
-  position:absolute;
-  top:-100000px;
-  left:10px;
-  font-weight:normal;
-  font-size:1em;
-}
+.accesshide {position:absolute;top:-100000px;left:10px;font-weight:normal;font-size:1em;}
 span.hide,
 div.hide,
-.jsenabled .advancedbutton .showadvancedbtn {
-  display:none;
-}
-
+.jsenabled .advancedbutton .showadvancedbtn {display:none;}
+.invisiblefieldset {display:inline;border-width:0;padding:0;margin:0;}
 /*Accessibility: Skip block link, for keyboard-only users. */
-a.skip-block, a.skip {
-  position: absolute;
-  top: -1000em;
-  font-size: 0.85em;
-}
-a.skip-block:focus, a.skip-block:active,
-a.skip:focus, a.skip:active {
-  position: static;
-  display: block;
-}
-.skip-block-to {
-  display: block;
-  height: 1px;
-  overflow: hidden;
-}
+a.skip-block,
+a.skip {position: absolute;top: -1000em;font-size: 0.85em;text-decoration:none;}
+a.skip-block:focus,
+a.skip-block:active,
+a.skip:focus,
+a.skip:active {position: static;display: block;}
+.skip-block-to {display: block;height: 1px;overflow: hidden;}
+/* Accessibility: only certain fonts support Unicode chars like &#x25BA; in IE6 */
+.arrow,
+.arrow_button input {font-family: Arial,Helvetica,Courier,sans-serif;}
 
-a.skip-block {
-  text-decoration:none;
-}
-
-/***
- * General
- **/
-
-/* Block which is hidden if javascript enabled, prevents fickering visible when JS from footer used! */
-.jsenabled .hiddenifjs {
-  display: none;
-}
-
-.yui-overlay .yui-widget-bd {
-    background-color:#FFEE69;
-    border-color:#D4C237 #A6982B #A6982B;
-    border-style:solid;
-    border-width:1px;
-    color:#000000;
-    left:0;
-    padding:2px 5px;
-    position:relative;
-    top:0;
-    z-index:1;
-}
-
-.clearer {
-  clear:both;
-  margin:0;
-  padding:0;
-  height:1px;
-  border:none;
-  background:transparent;
-  display:block;
-}
-
-.clearfix:after {
-  min-width: 0;
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
-
-.generalbox {
-  border-width: 1px;
-  border-style: solid;
-}
-
-.boxaligncenter {
-  margin-left:auto;
-  margin-right:auto;
-}
-
-.boxalignright {
-  margin-left:auto;
-  margin-right:0;
-}
-
-.boxalignleft {
-  margin-left:0;
-  margin-right:auto;
-}
-
-.boxwidthnarrow {
-  width: 30%
-}
-
-.boxwidthnormal {
-  width: 50%
-}
-
-.boxwidthwide {
-  width: 80%
-}
-
-.mdl-align {
-  text-align: center;
-}
-.mdl-left {
-  text-align: left;
-}
-.mdl-right {
-  text-align: right;
-}
-
-/***
+/**
  * Header
- **/
+ */
+#page-header .headermain {float:left;margin:15px;font-size:2.3em;}
+#page-header .headermenu {float:right;margin:15px;font-size:0.8em;text-align:right;}
+#page-header .navbar {clear:both;overflow:hidden;}
+#page-header .navbar .breadcrumb {float:left;}
+#page-header .navbar .navbutton {text-align:right;}
+#page-header .navbar .breadcrumb ul {padding:0;margin:0;text-indent:0;list-style:none;}
+#page-header .navbar .breadcrumb li,
+#page-header .navbar .navbutton div,
+#page-header .navbar .navbutton form {display:inline;}
+.ie6 #page-header .navbar {overflow:hidden;height:100%;}
 
-.breadcrumb ul {
-  padding:0;
-  margin:0;
-  text-indent:0;
-  list-style:none;
-}
-.breadcrumb li {
-  display:inline;
-}
+/**
+ * Footer
+ */
+#page-footer {text-align:center;font-size:0.9em;}
+#page-footer .homelink {margin: 1em 0;}
+#page-footer .homelink a {padding-left:1em;padding-right:1em;}
+#page-footer .logininfo,
+#page-footer .sitelink,
+#page-footer .helplink {margin:0px 10px;}
+#page-footer .performanceinfo {text-align:center;margin:10px 20%;}
+#page-footer .performanceinfo span {display:block;}
+#page-footer .validators {margin-top:40px;padding-top:5px;border-top: 1px dotted gray;}
+#page-footer .validators ul {margin:0px;padding:0px;list-style-type:none;}
+#page-footer .validators ul li {display:inline;margin-right:10px;margin-left:10px;}
 
-.navbar .navbutton div,
-.navbar .navbutton form {
-  display:inline;
-}
+/**
+ * Tabs
+ */
+.tabtree {position:relative;margin-bottom:3.5em;}
+.tabtree li {display:inline;}
+.tabtree ul {margin:5px;}
+.tabtree ul li.here ul {position:absolute;top:100%;width:100%;}
+.tabtree ul li.here .empty {display:none;}
 
-/***
- ** Course stuff
- **/
+/**
+ * Mforms
+ */
+.mform fieldset {border:1px solid;}
+.mform fieldset fieldset {border-width:0px;}
+.mform fieldset legend {font-weight:bold;margin-left:0.5em;}
+.mform fieldset div {margin:10px;margin-top:0;}
+.mform fieldset div div {margin:0;}
+.mform fieldset .advancedbutton {text-align:right;}
+.mform fieldset.hidden {border-width:0;}
+.mform fieldset.error {border: 1px solid #A00;}
+.mform .fitem {width:100%;overflow:hidden;margin-top:5px;margin-bottom:1px;clear:right;}
+.mform .fitem .fitemtitle {width:30%;text-align:right;float:left;}
+.mform .fitem .fitemtitle div {display: inline;}
+.mform .fitem .felement {border-width: 0;width:60%;margin-left:31%;}
+.mform .fitem fieldset.felement {margin-left:0;padding-left:1%;}
+.mform .error,
+.mform .required {color:#A00;}
+.mform .required .fgroup span label {color:#000;}
+.mform .fdescription.required {color:#A00;text-align:right;}
+.mform .fpassword .unmask {display:inline;margin-left:0.5em;}
+.mform .ftextarea #id_alltext {width: 100%;}
+.mform ul.file-list {padding:0;margin:0;list-style:none;}
+.mform label .req,
+.mform label .adv {cursor: help;}
+.mform .fcheckbox input {margin-left: 0;}
+.mform .fitem fieldset.fgroup label,
+.mform .fradio label,
+.mform .fcheckbox label,
+.mform fieldset.fdate_selector label {display:inline;float: none;width: auto;}
+.mform .ftags label.accesshide {display: block;position: static;}
+.mform .ftags select {margin-bottom: 0.7em;min-width: 22em;}
+/** Browser corrections for mforms **/
+.ie .mform .fitem .felement {margin-left:0;text-align:left;float:left;}
+/** Fix IE double margin + float bugs **/
+.ie .mform .fitem .fitemtitle {padding-right:1em;}
+#date_selector_calendar_panel .bd {padding: 0;}
+#date_selector_calendar_panel .yui-calcontainer {border: none;float: none;}
+/* Prevent border-collapse:collapse from bleeding through in IE6, IE7 */
+#date_selector_calendar_panel.yui-overlay-hidden table {*display:none;}
+#date_selector_calendar_panel th.calhead {padding-right: 2em;}
+#date_selector_calendar_panel a.container-close {top: 10px;}
+#portfolio-add-button {display:inline;}
 
-.section_add_menus .horizontal div,
-.section_add_menus .horizontal form {
-  display:inline;
-}
+/**
+ * phpinfo styles
+ */
+.phpinfo .center {text-align: center;}
+.phpinfo .center table {margin-left: auto;margin-right: auto;text-align: left;border-collapse: collapse;}
+.phpinfo .center th {text-align: center;}
+.phpinfo .e,
+.phpinfo .v,
+.phpinfo .h {border: 1px solid #000000;font-size: 0.8em;vertical-align: baseline;color: #000000;background-color: #cccccc;}
+.phpinfo .e {background-color: #ccccff;font-weight: bold;}
+.phpinfo .h {background-color: #9999cc;font-weight: bold;}
 
-.course-content .section .activity img.activityicon {
-  vertical-align:middle;
-  height:16px;
-  width:16px;
-}
\ No newline at end of file
+/**
+ * Navigation
+ */
+.block_js_expansion .block_tree {overflow-x:scroll;}
+.block_js_expansion.mouseover .content {width:200%;z-index:1000;position:relative;}
+.block_js_expansion.mouseover .content .block_tree {width:100%;background-color:#fcfcfc;padding-bottom:0;}
+.ie6 .block_js_expansion.mouseover .content,
+.ie7 .block_js_expansion.mouseover .content {padding-bottom:2px;}
+
+/**
+ * Blogs
+ */
+.addbloglink {text-align: center;}
+.blog_entry .audience {text-align: right;}
+.blog_entry .tags {margin-top: 15px;}
+
+/**
+ * Group
+ */
+#page-group-index #groupeditform {text-align: center;}
+#doc-contents h1 {margin: 1em 0 0 0;}
+#doc-contents ul {margin: 0;padding: 0;width: 90%;}
+#doc-contents ul li {list-style-type: none;}
+.groupmanagementtable td {vertical-align: top;}
+.groupmanagementtable #existingcell,
+.groupmanagementtable #potentialcell {width: 42%;}
+.groupmanagementtable #buttonscell {width: 16%;}
+.groupmanagementtable #buttonscell input {width: 80%;}
+.groupmanagementtable #removeselect_wrapper,
+.groupmanagementtable #addselect_wrapper {width: 100%;}
+.groupmanagementtable #removeselect_wrapper label,
+.groupmanagementtable #addselect_wrapper label {font-weight: normal;}
+#group-usersummary {width: 14em;}
+div.groupselector {float: left;margin-top: 3px;margin-bottom: 3px;}
+
+/**
+ * Login
+ */
+.loginbox {margin:15px;overflow:hidden;}
+.loginbox.twocolumns {margin:15px;}
+.loginbox h2,
+.loginbox .subcontent {margin:5px;padding:10px;text-align:center;}
+.loginbox .loginpanel .desc {margin:0;padding:0;margin-bottom:5px;}
+.loginbox .signuppanel .subcontent {text-align:left;}
+.loginbox .loginsub {margin-left:0;margin-right:0;}
+.loginbox .guestsub,
+.loginbox .forgotsub,
+.loginbox .potentialidps {margin:5px 12%;}
+.loginbox .potentialidps .potentialidplist {margin-left:40%;}
+.loginbox .potentialidps .potentialidplist div {text-align:left;}
+.loginbox .loginform {margin-top:1em;text-align:left;}
+.loginbox .loginform .form-label {float:left;text-align:right;width:40%;}
+.loginbox .loginform .form-input {float:right;width:59%;}
+.loginbox .loginform .form-input input {width: 6em;}
+.loginbox .signupform {margin-top:1em;text-align:center;}
+.loginbox.twocolumns .loginpanel {float:left;width:49.5%;border-right: 1px solid;margin-bottom:-2000px;padding-bottom:2000px;}
+.loginbox.twocolumns .signuppanel {float:right;width:50%;margin-bottom:-2000px;padding-bottom:2000px;}
+
+/**
+ * Notes
+ */
+.notepost {margin-bottom: 1em;}
+.notepost .userpicture {float: left;margin-right: 5px;}
+.notepost .content,
+.notepost .footer {clear: both;}
+.notesgroup {margin-left:20px;}
+
+/**
+ * My Moodle
+ */
+.my .coursebox .overview .info {margin-left:20px;}
+.my .coursebox .overview {margin-bottom:10px;}
+#page-my-index .coursebox .info {float: none;}
+#page-my-index .name {margin-left: 5px;}
+
+/**
+ * Logs
+ */
+.logtable th {text-align:left;}
+
+/**
+ * Modules
+ */
+.mod_introbox {border:1px solid;padding:10px;}
+table.mod_index {width:100%;}
+
+/**
+ * Help
+ */
+#help_icon_tooltip div.bd {width: 35em;}
+#help hr {border: none;height: 1px;background: #ccc;}
+#help .center {text-align: center;}
+#help .moreinfo {text-align: right;}
+#help .indent {margin-left: 40px;}
+#help .indent-big {margin-left: 160px;margin-right: 160px;}
+#help #emoticons{text-align: center;clear:both;width: 300px;margin-right: auto;margin-left:auto;}
+#help #emoticons ul{list-style-type: none;}
+#help #emoticons li{margin-bottom: 3px;width: 120px;border-left: 3px solid gray;padding-left: 7px;float: left;}
+
+/**
+ * Comments
+ */
+.comment-ctrl {max-width: 200px;font-size: 12px;display: none;margin:0;padding:0;}
+.comment-ctrl h5 {margin:0;padding: 5px;}
+.comment-area {padding: 5px;}
+.comment-area textarea {width:100%;overflow:auto;}
+.comment-area .fd {text-align:right;}
+.comment-meta span {color:gray;}
+.comment-list {font-size: 11px;overflow:auto;list-style:none;padding:0;margin:0;}
+.comment-list li {margin: 2px;margin-bottom:5px;clear:both;}
+.comment-paging{text-align:center;}
+.comment-paging .pageno{padding: 2px;}
+.comment-userpicture {width: 20px;float:left;}
+.comment-content {margin-left: 22px;}
+.comment-content div {margin:0;padding:0;}
+.comment-content p {padding:0;margin:0 18px 0 0;}
+.comment-delete {float:right;text-align:right;}
+.comment-container {float:left;width: 305px;margin: 4px;}
+
+/**
+ * Completion progress report
+ */
+.completion-expired {background:#FFDDDD;}
+.completion-expected {font-size:0.75em;}
+.completion-sortchoice {font-size:0.75em;vertical-align:bottom;}
+.completion-progresscell {text-align:right;}
+.completion-expired .completion-expected {font-weight:bold;}
+#page-course-report-progress-index th,
+#page-course-report-progress-index td {padding:2px 4px;font-weight:normal;border-right: 1px solid #EEE;}
+#page-course-report-progress-index .progress-actions {text-align:center;}
+#page-course-report-progress-index .completion_pagingbar {margin:1em 0;text-align:center;}
+#page-course-report-progress-index .completion_prev {display:inline;margin-right:2em;}
+#page-course-report-progress-index .completion_pagingbar p {display:inline;margin:0;}
+#page-course-report-progress-index .completion_next {display:inline;margin-left:2em;}
+
+/**
+ * Tags
+ */
+#page-tag-coursetags_edit .coursetag_edit_centered {position: relative;width: 600px;margin: 20px auto;}
+#page-tag-coursetags_edit .coursetag_edit_row {clear:both;}
+#page-tag-coursetags_edit .coursetag_edit_row .coursetag_edit_left {float:left;width:50%;text-align:right;}
+#page-tag-coursetags_edit .coursetag_edit_row .coursetag_edit_right {margin-left:50%;}
+#page-tag-coursetags_edit .coursetag_edit_input3 {display: none;}
+#page-tag-coursetags_more .coursetag_more_large {font-size: 120%;}
+#page-tag-coursetags_more .coursetag_more_small {font-size: 80%;}
+#page-tag-coursetags_more .coursetag_more_link {font-size: 80%;}
+#tag-description,
+#tag-blogs {width:100%;}
+#tag-management-box {margin-bottom:10px;line-height:20px;}
+#tag-user-table {padding:3px;clear: both;width:100%;}
+#tag-user-table:after {content:".";display:block;clear:both;visibility:hidden;height:0;overflow:hidden;}
+img.user-image {height:100px;width:100px;}
+#small-tag-cloud-box {width:300px;margin:0 auto;}
+#big-tag-cloud-box {width:600px;margin:0 auto;float:none;}
+ul#tag-cloud-list {list-style:none;padding:5px;margin:0;}
+ul#tag-cloud-list li {margin:0;display:inline;list-style-type:none;}
+#tag-search-box {text-align:center;margin:10px auto;}
+#tag-search-results-container {padding:0;width:100%;}
+#tag-search-results {padding:0;margin: 15px 20% 0 20%;float:left;width:60%;display:block;}
+#tag-search-results li {width:30%;float:left;padding-left:1%;text-align:left;line-height:20px;padding-right:1%;list-style:none;}
+span.flagged-tag,
+span.flagged-tag a {color:#FF0000;}
+table#tag-management-list {text-align:left;width:100%;}
+table#tag-management-list td,
+table#tag-management-list th {vertical-align: middle;text-align: left;padding: 4px;}
+.tag-management-form {text-align:center;}
+#relatedtags-autocomplete-container {margin-left:auto;margin-right:auto;min-height:4.6em;width:100%;}
+#relatedtags-autocomplete {position:relative;display:block;width:60%;margin-left:auto;margin-right:auto;}
+#relatedtags-autocomplete .yui-ac-content {position:absolute;width:420px;left:20%;border:1px solid #404040;background:#fff;overflow:hidden;z-index:9050;}
+#relatedtags-autocomplete .ysearchquery {position:absolute;right:10px;color:#808080;z-index:10;}
+#relatedtags-autocomplete .yui-ac-shadow {position:absolute;margin:.3em;width:100%;background:#a0a0a0;z-index:9049;}
+#relatedtags-autocomplete ul {padding:0;width:100%;margin:0;list-style-type:none;}
+#relatedtags-autocomplete li {padding:0 5px;cursor:default;white-space:nowrap;}
+#relatedtags-autocomplete li.yui-ac-highlight{background:#FFFFCC;}
+h2.tag-heading,
+div#tag-description,
+div#tag-blogs,
+body.tag .managelink {padding: 5px;}
+.tag_cloud .s20 {font-size: 1.5em;font-weight: bold;}
+.tag_cloud .s19 {font-size: 1.5em;}
+.tag_cloud .s18 {font-size: 1.4em;font-weight: bold;}
+.tag_cloud .s17 {font-size: 1.4em;}
+.tag_cloud .s16 {font-size: 1.3em;font-weight: bold;}
+.tag_cloud .s15 {font-size: 1.3em;}
+.tag_cloud .s14 {font-size: 1.2em;font-weight: bold;}
+.tag_cloud .s13 {font-size: 1.2em;}
+.tag_cloud .s12,
+.tag_cloud .s11 {font-size: 1.1em;font-weight: bold;}
+.tag_cloud .s10,
+.tag_cloud .s9 {font-size: 1.1em;}
+.tag_cloud .s8,
+.tag_cloud .s7 {font-size: 1em;font-weight: bold;}
+.tag_cloud .s6,
+.tag_cloud .s5 {font-size: 1em;}
+.tag_cloud .s4,
+.tag_cloud .s3 {font-size: 0.9em;font-weight: bold;}
+.tag_cloud .s2,
+.tag_cloud .s1 {font-size: 0.9em;}
+.tag_cloud .s0 {font-size: 0.8em;}
+
+/**
+ * File picker
+ * Copyright (c) 2006 Yahoo! Inc. All rights reserved.
+ * copy from yui/examples/treeview/assets/css/folders/tree.css
+ * first or middle sibling, no children
+ */
+/* first or middle sibling, no children */
+.file-picker .ygtvtn {background: url(../pix/y/tn.gif) 0 0 no-repeat;width:17px;height:22px;}
+/* first or middle sibling, collapsable */
+.file-picker .ygtvtm {background: url(../pix/y/tm.gif) 0 0 no-repeat;width:34px;height:22px;cursor:pointer;}
+/* first or middle sibling, collapsable, hover */
+.file-picker .ygtvtmh {background: url(../pix/y/tmh.gif) 0 0 no-repeat;width:34px;height:22px;cursor:pointer;}
+/* first or middle sibling, expandable */
+.file-picker .ygtvtp {background: url(../pix/y/tp.gif) 0 0 no-repeat;width:34px;height:22px;cursor:pointer;}
+/* first or middle sibling, expandable, hover */
+.file-picker .ygtvtph {background: url(../pix/y/tph.gif) 0 0 no-repeat;width:34px;height:22px;cursor:pointer;}
+/* last sibling, no children */
+.file-picker .ygtvln {background: url(../pix/y/ln.gif) 0 0 no-repeat;width:17px;height:22px;}
+/* Last sibling, collapsable */
+.file-picker .ygtvlm {background: url(../pix/y/lm.gif) 0 0 no-repeat;width:34px;height:22px;cursor:pointer;}
+/* Last sibling, collapsable, hover */
+.file-picker .ygtvlmh {background: url(../pix/y/lmh.gif) 0 0 no-repeat;width:34px;height:22px;cursor:pointer;}
+/* Last sibling, expandable */
+.file-picker .ygtvlp {background: url(../pix/y/lp.gif) 0 0 no-repeat;width:34px;height:22px;cursor:pointer;}
+/* Last sibling, expandable, hover */
+.file-picker .ygtvlph {background: url(../pix/y/lph.gif) 0 0 no-repeat;width:34px;height:22px;cursor:pointer;}
+/* Loading icon */
+.file-picker .ygtvloading {background: url(../pix/y/loading.gif) 0 0 no-repeat;width:16px;height:22px;}
+/* the style for the empty cells that are used for rendering the depth* of the node */
+.file-picker .ygtvdepthcell {background: url(../pix/y/vline.gif) 0 0 no-repeat;width:17px;height:22px;}
+.file-picker .ygtvblankdepthcell {width:17px;height:22px;}
+/* the style of the div around each node */
+.file-picker .ygtvitem  table{margin-bottom:0;}
+.file-picker .ygtvitem  td {border:none;padding:0;}
+/* the style of the div around each node's collection of children */
+* html .file-picker .ygtvchildren {height:1%;}
+/* the style of the text label in ygTextNode */
+.file-picker .ygtvlabel,
+.file-picker .ygtvlabel:link,
+.file-picker .ygtvlabel:visited,
+.file-picker .ygtvlabel:hover {margin-left:2px;text-decoration: none;}
+.file-picker {font-size:12px;}
+.file-picker strong {background:#FFFFCC;}
+.file-picker a {color: #336699;}
+.file-picker a:hover {background:#003366;color:white;}
+.file-picker .fp-panel {padding:0;margin:0;text-align:left;}
+.file-picker .fp-login-form {text-align:center;}
+.file-picker .fp-searchbar {float:right;}
+.file-picker .fp-viewbar {width:300px;float:left;}
+.file-picker .fp-toolbar {padding: .8em;background: #FFFFCC;text-align:center;margin: 3px;}
+.file-picker .fp-toolbar a {padding: 0 .5em;}
+.file-picker .fp-list {list-style-type:none;padding:0;float:left;width:100%;margin:0;}
+.file-picker .fp-list li {border-bottom:1px dotted gray;margin-bottom: 1em;}
+.file-picker .fp-repo-name {display:block;padding: .5em;margin-bottom: .5em;}
+.file-picker .fp-pathbar {margin: .4em;border-bottom: 1px dotted gray;}
+.file-picker .fp-pathbar a {padding: .4em;}
+.file-picker .fp-rename-form {text-align:center;}
+.file-picker .fp-rename-form p {margin: 1em;}
+.file-picker .fp-upload-form {margin: 2em 0;text-align:center;}
+.file-picker .fp-upload-btn {clear:both;margin-top: 2em;}
+.file-picker .fp-upload-btn a {cursor: default;background: white;border:1px solid gray;color:black;padding: .5em;}
+.file-picker .fp-upload-btn a:hover {background: gray;color:white;}
+.file-picker .fp-paging {margin:1em .5em;clear:both;text-align:center;line-height: 2.5em;}
+.file-picker .fp-paging a {padding: .5em;border: 1px solid #CCC;}
+.file-picker .fp-paging a.cur_page {border: 1px solid blue;}
+.file-picker .fp-popup {text-align:center;}
+.file-picker .fp-grid {float:left;text-align:center;}
+.file-picker .fp-grid div {overflow: hidden;}
+.file-picker .fp-grid p {margin:0;padding:0;background: #FFFFCC;}
+.file-picker .fp-grid .label {height:48px;text-align:center;}
+.file-picker .fp-grid span {color:gray;}
+.file-picker .fp-error {padding: 2em 0;margin: 3em 5px;text-align:center;background: #FFBBBB;}
+.file-picker .fp-msg {padding: 2em 0;margin: 3em 5px;text-align:center;background: green;}
+/* file picker search dialog */
+.file-picker div.bd {text-align:left;}
+
+/**
+ * File Manager
+ */
+.filemanager-toolbar {margin: 5px 0;}
+.filemanager-toolbar a:link,
+.filemanager-toolbar a:visited {border: 1px solid gray;background: #ccc;color: black;padding: 3px;}
+.filemanager-toolbar a:hover {background: white;text-decoration: none;}
+.fm-breadcrumb {margin:0;}
+.filemanager-container {padding: 5px;margin: 6px 0;}
+.filemanager-container ul{margin:0;padding:0;list-style-type:none;}
+.filemanager-container li{clear:both;}
+#fm-move-div {margin: 6px;}
+#fm-move-div strong{color:red;}
+.fm-file-menu {width:18px;height:18px;float:left;}
+.fm-file-menu img {width: 16px;}
+.fm-file-name {float:left;}
+.fm-file-entry{border: 1px solid red;}
+.fm-operation {font-weight: bold;}
+
+/**
+ * Backup and restore
+ */
+.backup-form-instances,
+.restore-form-instances {margin:0 20px;}
+
+/**
+ * Web Service
+ */
+#webservice-doc-generator td {text-align: left;border: 0px solid black;}
\ No newline at end of file
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
new file mode 100644
index 00000000000..c7e9b4aabbd
--- /dev/null
+++ b/theme/base/style/course.css
@@ -0,0 +1,88 @@
+/**
+ * CSS for displaying courses and everything in them
+ */
+.section_add_menus {text-align:right;}
+.section_add_menus .horizontal div,
+.section_add_menus .horizontal form {display:inline;}
+.section_add_menus optgroup {font-weight:normal;font-style: italic;}
+
+.course-content .section .activity img.activityicon {vertical-align:middle;height:16px;width:16px;}
+
+#page-site-index .subscribelink {text-align:right;}
+#page-site-index .headingblock {margin-bottom: 9px;}
+
+.path-course-view .headingblock {margin-bottom: 9px;}
+.path-course-view .subscribelink {text-align:right;}
+.path-course-view .unread {margin-left: 3em;}
+.path-course-view .sideblock.drag .header {cursor: move;}
+.path-course-view .completionprogress {float:right;}
+.path-course-view .completionprogress img.iconhelp {vertical-align:top;}
+
+.path-course-view li.activity {margin-right:20px; position:relative;}
+.path-course-view li.activity span.autocompletion,
+.path-course-view li.activity form.togglecompletion {display:inline;position:absolute;right:-20px;top:0;z-index:10;padding:0.2em 0;}
+.path-course-view li.activity form.togglecompletion div {display:inline;}
+.path-course-view li.activity form.togglecompletion .ajaxworking {position:absolute;top:0; left:20px;width: 20px; height: 20px;background: url([[pix:i/ajaxloader]]) no-repeat;}
+.dir-rtl.path-course-view li.activity {margin-right:0px;margin-left:20px;}
+.dir-rtl.path-course-view li.activity form.togglecompletion,
+.dir-rtl.path-course-view li.activity span.autocompletion {right:auto;left:-20px;}
+
+.section img.movetarget {height:16px;width:80px;}
+
+#page-course-enrol .generalbox,
+#page-course-enrol .coursebox {margin-top: 20px;}
+
+#page-course-user .content {margin-left: 30px;margin-right: 30px;}
+#page-course-user .section {margin-left: 30px;margin-right: 30px;margin-bottom: 20px;}
+#page-course-user .section h2 {margin-top: 0;}
+#page-course-user .info {margin:10px;}
+
+#page-course-pending .singlebutton,
+#page-course-category #renameform,
+#page-course-category #themeform,
+#page-course-category #coursesearch,
+#page-course-category .singlebutton,
+#page-course-editsection .singlebutton {text-align:center;}
+
+#coursesearch,
+#coursesearch2 {margin-top: 1em;text-align:center;}
+
+#page-course-info .generalbox.icons {text-align: center;}
+#page-course-info .generalbox.info {margin-left:auto;margin-right:auto;}
+
+#page-course-pending .pendingcourserequests {margin-bottom: 1em;}
+#page-course-pending .pendingcourserequests .singlebutton {display: inline;}
+#page-course-pending .pendingcourserequests .cell {padding: 0 5px;}
+#page-course-pending .pendingcourserequests .cell.c6 {white-space: nowrap;}
+
+#page-course-report-log-index .info,
+#page-course-report-log-indexlive .info {margin:10px;}
+#page-course-report-stats-index .graph {margin-bottom: 1em;}
+
+#page-course-report .logselectform,
+#page-course-report .participationselectform,
+#page-course-report-log-index .logselectform,
+#page-course-report-participation-index .participationselectform {margin:10px auto;}
+#page-course-report .participationselectform label,
+#page-course-report-participation-index .participationselectform label {margin-left:15px;margin-right:5px;}
+
+.coursebox {width: 100%;margin-bottom: 15px;}
+.coursebox .info {float: left;text-align:left;width: 48%;}
+.coursebox .summary {float: right;text-align:left;width: 48%;}
+.coursebox .summary .category {text-align:right;}
+.coursebox .teachers li {list-style-type:none;padding:0;margin:0;}
+
+.categorylist {width: 100%;}
+.categorylist .category.image {width: 20px;}
+.categorylist .category.number {text-align: right;}
+.categorylist .category.indentation {width: 1px;}
+
+.path-course-report-outline td.numviews {text-align:right;}
+.path-course-report-outline tr.section {text-align: center;}
+
+.course ul.section {margin:5px;padding:0;}
+
+.weeks-format, /* Window-width: 800 pixels.IE doesn't support, see inline IE conditional comment. */
+.topics-format {margin-top: 8px;min-width: 763px;}
+#page-course-user .section {border-width:1px;border-style:solid;padding:10px;}
+.categoryboxcontent {border-width:1px;border-style:solid;}
\ No newline at end of file
diff --git a/theme/base/style/grade.css b/theme/base/style/grade.css
new file mode 100644
index 00000000000..6c7d7fe67ff
--- /dev/null
+++ b/theme/base/style/grade.css
@@ -0,0 +1,31 @@
+/*** Grades ***/
+.allcoursegrades {width: 100%;text-align: right;padding: 4px 0px 5px 0px;}
+
+.path-grade-edit .buttons {text-align:center;}
+.path-grade-edit-tree .idnumber {margin-left: 15px;}
+.path-grade-edit-tree .movetarget {position: relative;width: 80px;height: 16px;}
+.path-grade-edit-tree ul#grade_tree {width: auto;}
+.path-grade-edit-tree ul#grade_tree li {list-style: none;}
+.path-grade-edit-tree ul#grade_tree li.category {margin-bottom: 6px;}
+.path-grade-edit-tree .iconsmall {margin-left: 4px;}
+
+#grade-report-toggles {text-align: center;}
+#grade-aggregation-help dt {margin-top: 15px;}
+#grade-aggregation-help dd.example {margin-top: 7px;}
+#grade-aggregation-help code {display: block;margin-top: 7px;}
+.gradeexportlink {padding: 2em;text-align: center;}
+
+.gradetreebox {margin-top:10px;}
+.gradetreebox table {font-size: 0.8em;width: 100%;}
+.gradetreebox td.colspan,
+.gradetreebox tr.category .cell {background-color: #DDD;}
+.gradetreebox th.actions {white-space: nowrap;width: 80px;}
+.gradetreebox td.name {white-space: nowrap;}
+.gradetreebox td.name h4 {display: inline;}
+.gradetreebox td.range {white-space: nowrap;}
+.gradetreebox span.actionlink {color: blue;}
+.gradetreebox span.actionlink:hover {text-decoration: underline;cursor: pointer;}
+.gradetreebox img.iconsmall {margin-left: 4px;}
+.gradetreebox img.icon {margin-right: 5px;}
+.gradetreebox #gradetreesubmit {margin-bottom:1em;text-align: center;}
+.gradetreebox .hidden {display: none;}
\ No newline at end of file
diff --git a/theme/base/style/message.css b/theme/base/style/message.css
new file mode 100644
index 00000000000..3f3731a3d29
--- /dev/null
+++ b/theme/base/style/message.css
@@ -0,0 +1,32 @@
+/* Message */
+.message .messagejsmanualrefresh,
+.jsenabled .messagejsautorefresh {display:block;}
+
+.message .messagejsautorefresh,
+.jsenabled .messagejsmanualrefresh {display:none;}
+
+#page-message-user .userpicture,
+#page-message-history .userpicture {width: 100px;height: 100px;}
+
+.message .summary .link {text-align:right;}
+.message .heading,
+.message .note {text-align:center;}
+.message .noframesjslink {margin-top:20px;}
+.message .link {vertical-align:middle;}
+.message .searchresults td {border-width:1px;border-style:solid;border-collapse:collapse;border-spacing:0px;}
+
+.message-discussion-noframes #userinfo .userpicture {float:left;}
+.message-discussion-noframes #userinfo .name {text-align:center;margin-left:60px;}
+.message-discussion-noframes #send h1,
+.message-discussion-noframes #userinfo .name h1 {margin:0;}
+.message-discussion-noframes #userinfo .commands {text-align:left;margin-left:60px;}
+.message-discussion-noframes #userinfo .commands ul {margin:0;padding:0;list-style-type:none;}
+.message-discussion-noframes #userinfo .commands ul li {display:inline;padding-right:16px;}
+.message-discussion-noframes #send {padding-top:10px;clear:both;}
+.message-discussion-noframes #messages {padding-top:10px;}
+.message-discussion-noframes #messages ul.messagelist {margin:0;padding:0;}
+
+#page-message-user .commands span {margin-left:10px;margin-right:10px;white-space:nowrap;}
+
+#page-message-edit fieldset {padding: 20px;}
+#page-message-edit th {padding-top: 10px;padding-left: 20px;}
\ No newline at end of file
diff --git a/theme/base/style/pagelayout.css b/theme/base/style/pagelayout.css
index 1a0caffdd74..44ff60c59c2 100644
--- a/theme/base/style/pagelayout.css
+++ b/theme/base/style/pagelayout.css
@@ -1,162 +1,61 @@
+/****
+ * Three column floating div layout with 2,1,3 column order
+ * Based on: http://matthewjamestaylor.com/blog/holy-grail-no-quirks-mode.htm
+ * And:  http://matthewjamestaylor.com/blog/ultimate-3-column-holy-grail-pixels.htm
+ *
+ * #page
+ *   #page-header
+ *   #page-content
+ *   |  #regions
+ *   |    #regions-mask
+ *   |      #region-main
+ *   |      |  #region-main-mask
+ *   |      |    .region-content
+ *   |      #region-pre
+ *   |      |  .region-content
+ *   |      #region-post
+ *   |      |  .region-content
+ *   #page-footer
+ *
+ * The body tag may also contain one of three layout specific classes that describe
+ * the regions of the page and allow us to theme more easily.
+ *
+ *   default (no class) = Content + side pre + side post
+ *   side-pre-only      = Content + side pre
+ *   side-post-only     = Content + side post
+ *   content-only       = Content
+ *
+ ****/
 
-#page {
- /* 100% page width */
- margin: auto 0px;
- width: auto;
-}
+body {margin:auto 0px;width:auto;}
+#page {width:100%;overflow:hidden;}
+#page-header {float:left;width:100%;}
+#page-content {clear:both;float:left;overflow:hidden;position:relative;width:100%;}
+#page-content #regions {float:left;left:200px;position:relative;width:200%;}
+#page-content #regions #regions-mask {float:left;left:50%;margin-left:-400px;position:relative;width:100%;}
+#page-content #regions #regions-mask #region-main {float:right;position:relative;right:100%;width:50%;}
+#page-content #regions #regions-mask #region-main #region-main-mask {margin-right:0px;margin-left:400px;overflow:hidden;}
+#page-content #regions #regions-mask #region-pre {float:left;left:200px;margin-left:-50%;overflow:hidden;position:relative;width:200px;}
+#page-content #regions #regions-mask #region-post {float:left;left:0px;overflow:hidden;position:relative;width:200px;}
+#page-content #regions .region-content {overflow:hidden;padding:10px;}
+#page-footer {clear:both;float:left;width:100%;}
 
-/***
- * Three column layout
- * based on: http://matthewjamestaylor.com/blog/ultimate-3-column-holy-grail-pixels.htm
- ***/
+/** Only side pre **/
+.side-pre-only #page-content #regions #regions-mask {margin-left:-200px;}
+.side-pre-only #page-content #regions #regions-mask #region-main #region-main-mask {margin-left:200px;}
+.side-pre-only #page-content #regions #regions-mask #region-pre {left:0px;}
+.side-pre-only #page-content #regions #regions-mask #region-post {width:0px;}
 
-.pagelayout-pre-post .regions-outer {
-    position:relative;      /* This fixes the IE7 overflow hidden bug and stops the layout jumping out of place */
-    clear:both;
-    float:left;
-    width:100%;             /* width of whole page */
-    overflow:hidden;        /* This chops off any overhanging divs */
-}
+/** Only side post **/
+.side-post-only #page-content #regions {left:0px;}
+.side-post-only #page-content #regions #regions-mask {margin-left:-200px;}
+.side-post-only #page-content #regions #regions-mask #region-main #region-main-mask {margin-left:200px;}
+.side-post-only #page-content #regions #regions-mask #region-pre {width:0px;}
+.has_dock.side-post-only .page-middle #regions #regions-mask #region-main #region-main-mask {margin-left:200px;}
 
-.pagelayout-pre-post #regions {
-    float:left;
-    width:200%;
-    margin-left:-200px;     /* Width of right column */
-    position:relative;
-    right:100%;
-    /* content background colour goes here */
-}
-.pagelayout-pre-post .regions-inner {
-    float:left;
-    width:100%;
-    margin-left:-50%;
-    position:relative;
-    left:400px;             /* Left column width + right column width */
-    /* side-pre background colour goes here */
-}
-.pagelayout-pre-post .contentwrap {
-    float:left;
-    width:50%;
-    position:relative;
-    right:200px;            /* Width of left column */
-    padding-bottom:1em;     /* Centre column bottom padding. Leave it out if it's zero */
-}
-.pagelayout-pre-post #content {
-    margin:0 205px;         /* Centre column side padding:
-                            Left padding = left column width + centre column left padding width
-                            Right padding = right column width + centre column right padding width */
-    position:relative;
-    left:200%;
-    overflow:hidden;
-}
-.pagelayout-pre-post #region-side-pre {
-    float:left;
-    float:right;            /* This overrides the float:left above */
-    width:190px;            /* Width of left column content (left column width minus left and right padding) */
-    position:relative;
-    right:5px;             /* Width of the left-had side padding on the left column */
-}
-.pagelayout-pre-post #region-side-post {
-    float:left;
-    float:right;            /* This overrides the float:left above */
-    width:190px;            /* Width of right column content (right column width minus left and right padding) */
-    margin-right:15px;      /* Width of right column right-hand padding + left column left and right padding */
-    position:relative;
-    left:50%;
-    /* side-post background colour goes here */
-}
-
-/***
- * Two column layout (blocks left)
- * based on: http://matthewjamestaylor.com/blog/ultimate-2-column-left-menu-pixels.htm
- ***/
-
-.pagelayout-pre .regions-outer {
-    width: 100%;
-}
-.pagelayout-pre #regions {
-    position:relative;      /* This fixes the IE7 overflow hidden bug and stops the layout jumping out of place */
-    clear:both;
-    float:left;
-    width:100%;         /* width of whole page */
-    overflow:hidden;    /* This chops off any overhanging divs */
-}
-.pagelayout-pre .regions-inner {
-    float:left;
-    width:200%;
-    position:relative;
-    left:200px;
-    /* content background colour goes here */
-}
-.pagelayout-pre .contentwrap {
-    float:right;
-    width:50%;
-    position:relative;
-    right:200px;
-    padding-bottom:1em;
-}
-.pagelayout-pre #content {
-    margin:0 5px 0 205px;
-    position:relative;
-    right:100%;
-    overflow:hidden;
-}
-.pagelayout-pre #region-side-pre {
-    float:left;
-    width:190px;
-    position:relative;
-    right:195px;
-    /* side-pre background colour goes here */
-}
-
-/***
- * Two column layout (blocks right)
- * based on: http://matthewjamestaylor.com/blog/ultimate-2-column-right-menu-pixels.htm
- ***/
-
-.pagelayout-pre .regions-outer {
-    width: 100%;
-}
-.pagelayout-post #regions {
-    position:relative;      /* This fixes the IE7 overflow hidden bug and stops the layout jumping out of place */
-    clear:both;
-    float:left;
-    width:100%;         /* width of whole page */
-    overflow:hidden;    /* This chops off any overhanging divs */
-}
-.pagelayout-post .regions-inner {
-    float:left;
-    width:200%;
-    margin-left:-200px;
-    position:relative;
-    right:100%;
-    background:#fff;
-}
-.pagelayout-post .contentwrap {
-    float:left;
-    width:50%;
-    position:relative;
-    left:50%;
-    padding-bottom:1em;
-}
-.pagelayout-post #content {
-    margin:0 5px 0 205px;
-    overflow:hidden;
-}
-.pagelayout-post #region-side-post {
-    float:right;
-    width:190px;
-    position:relative;
-    left:195px;
-}
-
-/***
- * One columns layout - no blocks
- ***/
-
-.pagelayout .regions-outer {
-    width: 100%;
-}
-.pagelayout #content {
-    margin: 0 5px 0 5px;
-}
+/** No blocks whatsoever **/
+.content-only #page-content #regions {left:0px;}
+.content-only #page-content #regions #regions-mask {margin-left:0px;}
+.content-only #page-content #regions #regions-mask #region-main #region-main-mask {margin-left:0px;}
+.content-only #page-content #regions #regions-mask #region-pre {left:0;width:0px;}
+.content-only #page-content #regions #regions-mask #region-post {width:0;}
\ No newline at end of file
diff --git a/theme/base/style/question.css b/theme/base/style/question.css
new file mode 100644
index 00000000000..1e3e14f8f1f
--- /dev/null
+++ b/theme/base/style/question.css
@@ -0,0 +1,76 @@
+/* Question */
+.questionbank h2 {margin-top: 0;}
+.questioncategories h3 {margin-top: 0;}
+
+#chooseqtypebox {margin-top: 1em;}
+#chooseqtype h3 {margin: 0 0 0.3em;}
+#chooseqtype .instruction {display: none;}
+#chooseqtype .fakeqtypes {border-top: 1px solid silver;}
+#chooseqtype .qtypeoption {margin-bottom: 0.5em;}
+#chooseqtype label {display: block;}
+#chooseqtype .qtypename img {padding: 0 0.3em;}
+#chooseqtype .qtypesummary {display: block;margin: 0 2em;}
+#chooseqtype .submitbuttons {margin: 0.7em 0;text-align: center;}
+
+#qtypechoicecontainer {display: none;}
+body.jsenabled #qtypechoicecontainer {display: block;}
+
+#qtypechoicecontainer #chooseqtype {width: 30em;}
+#qtypechoicecontainer #chooseqtypehead h3 {margin: 0;}
+#qtypechoicecontainer #chooseqtype .qtypes {position: relative;border-bottom: 1px solid grey;padding: 0.24em 0;}
+#qtypechoicecontainer #chooseqtype .qtypeoption {margin-bottom: 0;}
+#qtypechoicecontainer #chooseqtype .instruction,
+#qtypechoicecontainer #chooseqtype .qtypesummary {display: none;position: absolute;top: 0px;right: 0px;bottom: 0px;left: 60%;margin: 0;border-left: 1px solid grey;padding: 0.3em 0.5em;}
+#qtypechoicecontainer #chooseqtype .instruction,
+#qtypechoicecontainer #chooseqtype .selected .qtypesummary {display: block;}
+
+.que {text-align: left;margin: 0 auto 1.8em auto;border: 1px solid;}
+.que .info {float: left;margin: 0.5em 0;width: 11.9%;}
+.que .info h2 {margin: 0 0 0 0.64em;}
+.que .info div {margin-left: 1em;}
+.que .info .questionflag {margin-top: 1em;margin-right: 1em;text-align: center;}
+
+.que .ablock {margin: 0.7em 0 0.3em 0;}
+.que .answer {float: left;width: 83%;margin-bottom: 0.5em;}
+.que .content {float: left;margin: 0.5em 0;width: 88%;}
+.que .control {width: 5%;}
+.que .feedback {clear: both;padding: 0 0 0.3em 0.3em;margin-bottom: 0.5em;border: 1px solid;}
+.que .prompt {float: left;width: 15%;height: 2em;padding-top: 0.3em;}
+.que .qtext {margin-bottom: 1.5em;}
+.que .submit {position: relative;clear: both;float: left;}
+
+.que .grading,
+.que .comment,
+.que .commentlink,
+.que .generalfeedback,
+.que .history {margin-top: 0.5em;}
+.que .grade {margin-top: 0.5em;}
+
+.que.description .info {margin: 0.5em 0 0.5em 0.2em;width: 1em;}
+.que.description .content,
+.que.description .generalfeedback {margin-left: 1.2em;margin-bottom: 0.5em;float: none;width: auto;}
+.que.description .qtext {margin-bottom: 0;}
+
+.multianswer .submit {margin-top: 1em;}
+
+.multichoice td.feedback {width: auto;vertical-align: top;padding-top: 0.3em;border-style: none;}
+.multichoice .text {width: auto;}
+
+.calculated .answer,
+.numerical .answer,
+.shortanswer .answer {padding: 0.3em;width: auto;}
+
+.calculated .answer input,
+.numerical .answer input,
+.shortanswer .answer input {width: 99%;}
+
+.truefalse .answer span {float: left;clear: left;padding: 0.3em;width: 100%;}
+
+.importerror {margin-top: 10px;border-bottom: 1px solid #555;}
+.mform .que.comment .fitemtitle {width: 20%;}
+
+.essay .feedback {border-style: none;}
+
+/**** GRRRRR ***/
+/* MSIE Hack */
+* html .que .submit {float: none;}
\ No newline at end of file
diff --git a/theme/base/style/user.css b/theme/base/style/user.css
new file mode 100644
index 00000000000..d1500152214
--- /dev/null
+++ b/theme/base/style/user.css
@@ -0,0 +1,43 @@
+/*$$$$$$$$$$$$$$$$$ User $$$$$$$$$$$$$$$$$$$$*/
+.user-box {margin:8px;width:115px;height:160px;text-align:center;float:left;clear: none;}
+
+.userinfobox {width:100%;border:1px solid;border-collapse: separate;padding:10px;}
+.userinfobox .left,
+.userinfobox .side {width: 100px;vertical-align: top;}
+.userinfobox .userpicture {width: 100px;height: 100px;}
+.userinfobox .content {vertical-align: top;}
+.userinfobox .links {width: 100px;padding: 5px;vertical-align: bottom;}
+.userinfobox .list td {padding: 3px;}
+.userinfobox .username {padding-bottom: 20px;font-weight: bold;}
+.userinfobox td.label {text-align:right;white-space: nowrap;vertical-align: top;font-weight:bold;}
+
+.groupinfobox {border:1px solid;}
+.groupinfobox .left {padding: 10px;width: 100px;vertical-align: top;}
+
+.iplookup #note,
+#course-participation h2,
+#user-index .rolesform,
+#user-view .buttons,
+#user-index .buttons {text-align: center;}
+#user-view .buttons form,
+#user-view .buttons form div {display:inline;}
+
+#user-index #showall {margin: 10px 0px;}
+#user-index table#participants,
+#user-index table#participants td,
+#user-index table#participants th {vertical-align: middle;text-align: left;padding: 4px;}
+#user-index table.controls {width: 100%;}
+#user-index table.controls tr {vertical-align: top;}
+#user-index table.controls td.right,
+#user-index table.controls td.left {padding: 4px;}
+#user-index table.controls .right {text-align: right;}
+#course-participation #showall {text-align:center;margin: 10px 0px;}
+#user-policy .noticebox {text-align:center;margin-left:auto;margin-right:auto;margin-bottom:10px;width:80%;height:250px;}
+#user-policy #policyframe {width:100%;height:100%;}
+.iplookup #map {margin:auto;}
+
+.userselector select {width: 100%;}
+.userselector div {margin-top: 0.2em;}
+.userselector div label {margin-right: 0.3em;}
+#userselector_options .collapsibleregioncaption {font-weight: bold;}
+#userselector_options p {margin:0.2em 0;text-align:left;}
\ No newline at end of file
diff --git a/theme/standard/config.php b/theme/standard/config.php
new file mode 100644
index 00000000000..18f3a81e413
--- /dev/null
+++ b/theme/standard/config.php
@@ -0,0 +1,19 @@
+<?php
+
+$THEME->name = 'standard';
+$THEME->parents = array('base');
+$THEME->sheets = array(
+    'core',     /** Must come first**/
+    'admin',
+    'blocks',
+    'calendar',
+    'course',
+    'dock',
+    'grade',
+    'message',
+    'modules',
+    'question',
+    'css3'      /** Sets up CSS 3 + browser specific styles **/
+);
+$THEME->enable_dock = true;
+$THEME->javascripts_footer = array('navigation');
\ No newline at end of file
diff --git a/theme/standard/javascript/navigation.js b/theme/standard/javascript/navigation.js
new file mode 100644
index 00000000000..56d30ce5878
--- /dev/null
+++ b/theme/standard/javascript/navigation.js
@@ -0,0 +1,43 @@
+
+function customise_dock_for_theme() {
+    if (!M.core_dock) {
+        return false;
+    }
+    // Throw a lightbox for the navigation boxes
+    M.core_dock.cfg.panel.modal = true;
+    M.core_dock.genericblock.prototype.fix_title_orientation = function(node) {
+        if (YAHOO.env.ua.ie > 0) {
+            if (YAHOO.env.ua.ie > 7) {
+                // IE8 can flip the text via CSS
+                node.setAttribute('style', 'writing-mode: tb-rl; filter: flipV flipH;');
+            } else {
+                // IE < 7 can't do anything cool, just settle to stacked letters
+                node.innerHTML = node.innerHTML.replace(/(.)/g, "$1<br />");
+            }
+            return node;
+        }
+        // Cool, we can use SVG!
+        var test = M.core_dock.Y.Node.create('<div><span>'+node.firstChild.nodeValue+'</span></div>');
+        M.core_dock.Y.one(document.body).append(test);
+        var height = test.one('span').get('offsetWidth');
+        test.remove();
+
+        var txt = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+        txt.setAttribute('x', '0');
+        txt.setAttribute('y', '0');
+        txt.setAttribute('transform','rotate(90, 5, 5)');
+        txt.appendChild(document.createTextNode(node.firstChild.nodeValue));
+
+        var svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+        svg.setAttribute('version', '1.1');
+        svg.setAttribute('height', height);
+        svg.setAttribute('width', 30);
+        svg.appendChild(txt);
+
+        var div = document.createElement(node.nodeName);
+        div.appendChild(svg);
+
+        return div;
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/theme/standard/pix/favicon.ico b/theme/standard/pix/favicon.ico
new file mode 100644
index 00000000000..5a7a36a68e6
Binary files /dev/null and b/theme/standard/pix/favicon.ico differ
diff --git a/theme/standard/pix/hgradient.jpg b/theme/standard/pix/hgradient.jpg
new file mode 100644
index 00000000000..96825ddc1ca
Binary files /dev/null and b/theme/standard/pix/hgradient.jpg differ
diff --git a/theme/standard/pix/tab/left.gif b/theme/standard/pix/tab/left.gif
new file mode 100644
index 00000000000..48b66288913
Binary files /dev/null and b/theme/standard/pix/tab/left.gif differ
diff --git a/theme/standard/pix/tab/left_active.gif b/theme/standard/pix/tab/left_active.gif
new file mode 100644
index 00000000000..bd72d635568
Binary files /dev/null and b/theme/standard/pix/tab/left_active.gif differ
diff --git a/theme/standard/pix/tab/left_active_hover.gif b/theme/standard/pix/tab/left_active_hover.gif
new file mode 100644
index 00000000000..f1af440a15f
Binary files /dev/null and b/theme/standard/pix/tab/left_active_hover.gif differ
diff --git a/theme/standard/pix/tab/left_hover.gif b/theme/standard/pix/tab/left_hover.gif
new file mode 100644
index 00000000000..ea8c9705ed1
Binary files /dev/null and b/theme/standard/pix/tab/left_hover.gif differ
diff --git a/theme/standard/pix/tab/right.gif b/theme/standard/pix/tab/right.gif
new file mode 100644
index 00000000000..feddbb73d55
Binary files /dev/null and b/theme/standard/pix/tab/right.gif differ
diff --git a/theme/standard/pix/tab/right_active.gif b/theme/standard/pix/tab/right_active.gif
new file mode 100644
index 00000000000..ad87b27a4ee
Binary files /dev/null and b/theme/standard/pix/tab/right_active.gif differ
diff --git a/theme/standard/pix/tab/right_active_hover.gif b/theme/standard/pix/tab/right_active_hover.gif
new file mode 100644
index 00000000000..c8b2883d538
Binary files /dev/null and b/theme/standard/pix/tab/right_active_hover.gif differ
diff --git a/theme/standard/pix/tab/right_end.gif b/theme/standard/pix/tab/right_end.gif
new file mode 100644
index 00000000000..2cb44de6c57
Binary files /dev/null and b/theme/standard/pix/tab/right_end.gif differ
diff --git a/theme/standard/pix/tab/right_hover.gif b/theme/standard/pix/tab/right_hover.gif
new file mode 100644
index 00000000000..301b3f67086
Binary files /dev/null and b/theme/standard/pix/tab/right_hover.gif differ
diff --git a/theme/standard/pix/tab/right_last.gif b/theme/standard/pix/tab/right_last.gif
new file mode 100755
index 00000000000..dd346f6c526
Binary files /dev/null and b/theme/standard/pix/tab/right_last.gif differ
diff --git a/theme/standard/pix/tab/rtlbg.gif b/theme/standard/pix/tab/rtlbg.gif
new file mode 100755
index 00000000000..ba7831333af
Binary files /dev/null and b/theme/standard/pix/tab/rtlbg.gif differ
diff --git a/theme/standard/pix/tab/tabrow1.gif b/theme/standard/pix/tab/tabrow1.gif
new file mode 100755
index 00000000000..db1ffa66c47
Binary files /dev/null and b/theme/standard/pix/tab/tabrow1.gif differ
diff --git a/theme/standard/pix/vgradient.jpg b/theme/standard/pix/vgradient.jpg
new file mode 100644
index 00000000000..85849e5dae3
Binary files /dev/null and b/theme/standard/pix/vgradient.jpg differ
diff --git a/theme/standard/style/admin.css b/theme/standard/style/admin.css
new file mode 100644
index 00000000000..f30a9a07797
--- /dev/null
+++ b/theme/standard/style/admin.css
@@ -0,0 +1,145 @@
+/** Admin **/
+
+#page-admin-course-category .rolelink {text-align:right;padding:10px;}
+
+#page-admin-lang .generalbox,
+#page-admin-langimport .generalbox,
+#page-admin-langimport .generalbox table,
+#page-admin-course-index .singlebutton,
+#page-admin-course-index .addcategory,
+#page-admin-course-category .addcategory,
+#page-admin-stickyblocks .generalbox,
+#page-admin-maintenance .buttons,
+#page-admin-course-index .buttons,
+#page-admin-course-category .buttons,
+#page-admin-index .copyright,
+#page-admin-index .copyrightnotice,
+#page-admin-index .adminerror,
+#page-admin-index .adminwarning,
+#page-admin-index .adminerror .singlebutton,
+#page-admin-index .adminwarning .singlebutton,
+#page-admin-index #layout-table .singlebutton {text-align: center;}
+
+#page-admin-index .adminerror,
+#page-admin-index .adminwarning {margin:20px;}
+
+#page-admin-enrol .enrolplugintable {width:700px;margin:1em auto;}
+
+#page-admin-report-capability-index #settingsform h2,
+#page-admin-report-capability-index #settingsform p,
+#page-admin-report-capability-index #settingsform #menucapability,
+#page-admin-report-capability-index #settingsform #menuroles,
+#page-admin-report-capability-index #settingsform #capabilitysearchui {margin:0.5em 1em 0.2em 1em;}
+#page-admin-report-questioninstances-index #settingsform h2 {margin-top: 0;}
+#page-admin-report-questioninstances-index #settingsform p {margin-bottom: 0;}
+#page-admin-report-questioninstances-index #settingsform p {margin-bottom: 0;}
+
+.plugincheckwrapper {text-align: center;}
+.plugincompattable {font-size: 70%;text-align: left;}
+.plugincompattable caption {text-align: center;width: 100%;font-weight: bold;font-size: 130%;}
+.plugincompattable td.ok {color: #008000;}
+.plugincompattable td.warning {color: #DF7800;}
+.plugincompattable td.error {color: #DF0000;}
+
+#page-admin-index .explanation,
+.path-admin-roles .cell.c1,
+.path-admin-roles .cell.c3 {font-size: 0.7em;}
+#adminsettings .form-shortname,
+#admin-lang .translator .strkey {font-size: 0.75em;}
+#page-admin-index .copyright,
+.environmenttable,
+#adminsettings .form-defaultinfo,
+#page-admin-uploaduser table#uupreview,
+#adminsettings .form-warning,
+#adminsettings .form-overridden,
+.course-report-outline td.lastaccess {font-size: 0.8em;}
+#page-admin-uploaduser table#uuresults {font-size: 0.9em;}
+#page-admin-auth_config .required {background-color:#DDDDDD;}
+#page-admin-report-unittest-index .sep {color:#AAAAAA;}
+
+.path-admin .rolecap .cap-name,
+.path-admin .rolecap .note {color: #888;font-size: 0.75em;}
+
+#page-admin-blocks table.generaltable th,
+#page-admin-blocks table.generaltable td.cell,
+#page-admin-filters table.generaltable th,
+#page-admin-filters table.generaltable td.cell,
+#page-admin-modules table.generaltable th,
+#page-admin-modules table.generaltable td.cell,
+#page-admin-auth table.generaltable th,
+#page-admin-auth table.generaltable td.cell{text-align: center;vertical-align: middle;}
+#page-admin-blocks table.generaltable th.c0,
+#page-admin-blocks table.generaltable td.c0,
+#page-admin-filters table.generaltable th.c0,
+#page-admin-filters table.generaltable td.c0,
+#page-admin-modules table.generaltable th.c0,
+#page-admin-modules table.generaltable td.c0,
+#page-admin-auth table.generaltable th.c0,
+#page-admin-auth table.generaltable td.c0 {text-align: left;}
+
+#page-filter-manage .buttons,
+.path-admin-roles .buttons {margin: 20px;text-align:center;}
+
+#filter-manage .backlink,
+.path-admin-roles .backlink {text-align: right;width: 90%;margin: 2em auto 1em auto;}
+
+.admin .generalboxcontent {background-color:#EEEEEE;}
+.admin .generalbox {border-color:#BBBBBB;background-color:#EEEEEE;}
+.admin .informationbox {border-color:#BBBBBB;background-color:#FFFFFF;}
+#page-admin-index .adminerror {background-color:#FF6666;}
+#page-admin-index .c0 {background-color: #FAFAFA;}
+.path-admin .blockstable .r0 {background-color: #F0F0F0;}
+.path-admin .blockstable .r1 {background-color: #FAFAFA;}
+.path-admin .incompatibleblockstable td.c0 {color: #ff0000;}
+table.flexible  .r0 {background-color: #F0F0F0;}
+table.flexible .r1 {background-color: #FAFAFA;}
+#page-admin-report-unittest-index span.notice {color: teal;}
+#page-admin-report-unittest-index b.pass {color: green;}
+#page-admin-report-unittest-index b.fail, b.exception {color: red;}
+#page-admin-report-unittest-index .exception, .exception pre {background-color: #FDD;}
+#page-admin-report-unittest-index .unittestsummary {color: white;}
+#page-admin-report-unittest-index .unittestsummary.failed {background-color: red;}
+#page-admin-report-unittest-index .unittestsummary.passed {background-color: green;}
+#page-admin-report-security-index #timewarning {text-align:center;}
+
+#adminsettings fieldset {background-color: #EEE;border:1px solid #BBB;color: #000;}
+#adminsettings fieldset.error {border: 1px solid red;}
+#adminsettings fieldset.error legend {color: red;}
+#adminsettings .form-shortname {color: #888;}
+#adminsettings .form-overridden {background-color: #ff6;}
+#adminsettings .form-warning {background-color: #f88;}
+#adminsettings .form-defaultinfo {color: #888;}
+#adminsettings .form-item .pathok {color: green;}
+#adminsettings .form-item .patherror {color: red;}
+
+#page-admin-qtypes .cell.c1,
+#page-admin-qtypes .cell.c2 {text-align: center;}
+#page-admin-qtypes .cell.c3 {font-size: 0.7em;}
+
+#page-admin-lang .translator {border-color: #DDDDDD;}
+#page-admin-lang .translator tr.r0 {background-color: #F0F0F0;}
+#page-admin-lang .translator tr.r1 {background-color: #FAFAFA;}
+#page-admin-lang .translator .strkey {color: #666666;}
+#page-admin-lang .translator .bothmissing {background-color: #EF6868;}
+#page-admin-lang .translator .mastermissing {background-color: #FEFF7F;}
+#page-admin-lang .translator .localdifferent {background-color: #AAFFAA;}
+.environmenttable .error {background-color : red;color : inherit;}
+.environmenttable .warn {background-color : yellow;}
+.environmenttable .ok {background-color : lime;}
+#page-admin-uploaduser .uuinfo {background-color: #8e8;}
+#page-admin-uploaduser .uuwarning {background-color: #ee8;}
+#page-admin-uploaduser .uuerror {background-color: #e99;}
+#page-admin-xmldb-index .button,
+#page-admin-xmldb-index .buttons {color: gray;}
+#adminthemeselector .selectedtheme td.c0 {border-width:2px;}
+#adminthemeselector .selectedtheme td.c1 {border-width:2px;}
+#page-admin-roles-override .capcurrent {background-color:#FFFFFF;border: 1px solid #CECECE;}
+
+#page-admin-roles-define .capdefault {background-color:#DDDDDD;border: 1px solid #CECECE;}
+#page-admin-roles-manage .rolecap,
+#page-admin-roles-override .rolecap {border:none;border-bottom:1px solid #CECECE;}
+
+.path-admin .manageauthtable {width:90%;margin:0 auto;}
+
+#explaincaps .rolecap.yes {background-color: #DDFFDD;}
+#explaincaps .rolecap.no {background-color: #FFDDDD;}
\ No newline at end of file
diff --git a/theme/standard/style/blocks.css b/theme/standard/style/blocks.css
new file mode 100644
index 00000000000..035e0a96af4
--- /dev/null
+++ b/theme/standard/style/blocks.css
@@ -0,0 +1,84 @@
+/** General **/
+.sideblock {border:1px solid #DDD;}
+.sideblock .header {border-bottom:1px solid #DDD;border-color: #dddddd;}
+.sideblock .header h2 {margin-top:2px;font-size:1em;}
+.sideblock .header .block_action {margin:0 4px;}
+.sideblock .header .block_action img {width:11px; height:11px;}
+.sideblock .content {border-color: #dddddd;background-color:#FCFCFC;}
+.sideblock .content hr {border-top-color:#999999;}
+.sideblock .header .commands {font-size:0.9em;clear:both;}
+.sideblock .footer {font-size:0.9em;text-align:center;clear:both;}
+.sideblock.beingmoved {border-color: #f88;}
+
+.sideblock .header,
+.sideblock h2.header {text-align: left;margin:0;padding:4px;padding-top:0;border-bottom-width: 0;}
+.sideblock .content h2 {text-align: left;margin:1.5em 0 0;padding:0;}
+.sideblock .content h3 {text-align: left;}
+.sideblock .content hr {height:1px;margin-top:4px;margin-bottom:4px;border:none;border-top:1px solid;}
+.sideblock .content .head {margin-top: 10px;}
+.sideblock .header .icon.hide,
+.sideblock .header .icon.edit {margin-right: 6px;}
+
+.block-region .hidden .header {border-bottom-color: #dddddd;}
+.blockannotation {color:#aaa;}
+.blockmovetarget {background-color: #fcc;border-color: #f88;}
+.blockmovetarget:hover {background-color: #f88;border-color: #c00;}
+
+/** Admin tree **/
+.block_admin_tree .link.current {background-color:#EEEEEE;}
+.block_admin_tree .link.criticalnotification {background-color:#FF6666;}
+.block_admin_tree .link.hidden {color:#999999;}
+
+/** Blog Tags **/
+.block_blog_tags .official {color: #0000cc;}
+.block_blog_tags .personal {color: #666699;}
+
+/** Calendar Month **/
+.block_calendar_month abbr {border-width:0;}
+.block_calendar_month .eventnone a {text-decoration:none;color:black;cursor:text;}
+.block_calendar_month .filters table {background-color: #EEEEEE;}
+.block_calendar_month .filters table td {font-size:1.1em;}
+.calendar_event_global {border-color: #D6F8CD; background-color:#D6F8CD;}
+.calendar_event_course {border-color: #FFD3BD; background-color:#FFD3BD;}
+.calendar_event_user {border-color: #DCE7EC; background-color:#DCE7EC;}
+.calendar_event_group {border-color: #FEE7AE; background-color:#FEE7AE;}
+
+/** Login Block **/
+.block_login .loginform .c1 {margin:0.3em 0.8em;text-align:right;}
+.block_login .loginform .c1.fld input {width:5em;}
+.block_login .loginform .c1.fld label {padding-right: 4px;}
+.block_login .loginform .c1.btn {text-align:center;}
+
+/** Latest News Block **/
+.block_news_items .newlink {text-align: center;}
+.block_news_items .post .head {margin-top:10px;}
+.block_news_items .post .head .date {font-style: italic;}
+.block_news_items .post .info {text-align:center;}
+
+/** Messages **/
+.block_messages .content .list li.listentry {font-size:0.75em;}
+
+/** Online Users **/
+.block_online_users .content .list li.listentry {font-size:0.75em;}
+.block_online_users .content .list li.listentry img {border:#888}
+
+/** Quiz Results **/
+.block_quiz_results {text-align: center;}
+.block_quiz_results h1 {margin: 4px;font-size: 1.1em;}
+.block_quiz_results table.grades {text-align: left;width: 100%;}
+.block_quiz_results table.grades .number,
+.block_quiz_results table.grades .grade {text-align: right;width: 10%;}
+.block_quiz_results table.grades caption {margin: 1em 0px 0px 0px;border-bottom-width: 1px;border-bottom-style: solid;font-weight: bold;}
+
+/** Recent Activity **/
+.block_recent_activity .activitydate,
+.block_recent_activity .activityhead {font-size:0.9em;}
+
+/** RSS Client **/
+.block_rss_client .image {text-align:center;}
+.block_rss_client .list li {padding:5px;font-size:0.85em;border-top:1px solid #DDD;}
+.block_rss_client .list li:first-child {border-top-width: 0px;}
+.block_rss_client .list li .description {color:#555555;font-size:0.8em;padding-left:1em;}
+
+/** Site main menu **/
+.block_site_main_menu .footer select {font-size: 0.8em;}
\ No newline at end of file
diff --git a/theme/standard/style/calendar.css b/theme/standard/style/calendar.css
new file mode 100644
index 00000000000..3b12ea313f7
--- /dev/null
+++ b/theme/standard/style/calendar.css
@@ -0,0 +1,60 @@
+/** Calendar **/
+.path-calendar h1 {font-size:1.0em;margin:0;}
+.path-calendar h2,
+.path-calendar h3 {text-align: center;}
+.path-calendar .maincalendar div.header {font-weight:bold;padding:2px 4px 6px;}
+
+.path-calendar .sidecalendar {border-color: #DDDDDD;}
+.path-calendar .sidecalendar .filters {font-size:0.8em;}
+.path-calendar .sidecalendar abbr {border-width:0;}
+.path-calendar .sidecalendar .filters {padding: 5px;}
+.path-calendar .sidecalendar .filters table {background-color: #EEEEEE;}
+.path-calendar .sidecalendar .minicalendartop {padding-top:10px;}
+.path-calendar .sidecalendar .minicalendarblock {padding: 0px 4px;}
+.path-calendar .sidecalendar .calendartable td {border-width:0;}
+
+.path-calendar .maincalendar {border:1px solid #DDDDDD;}
+.path-calendar .maincalendar .filters {width:98%;margin:10px auto;}
+.path-calendar .maincalendar .filters table {background-color: #EEEEEE;}
+.path-calendar .maincalendar .eventlist {padding: 10px;}
+.path-calendar .maincalendar .eventlist .event {border-color:#DDDDDD;}
+.path-calendar .maincalendar .eventlist .event .referer {font-weight:bold;}
+.path-calendar .maincalendar .eventlist .event .course {font-size:0.8em;}
+.path-calendar .maincalendar .eventlist .event .description {padding:5px;}
+.path-calendar .maincalendar .eventlist .event .description .commands {text-align: right;}
+.path-calendar .maincalendar .eventlist .event .topic {background-color:#EEEEEE;padding: 5px;border:0px solid #EEEEEE;border-bottom-width: 1px;}
+.path-calendar .maincalendar .eventlist .event .picture {background-color:#EEEEEE;padding:8px;}
+.path-calendar .maincalendar .eventlist .event .side {background-color:#EEEEEE;}
+.path-calendar .maincalendar .calendarmonth th {border-color: #000000;}
+.path-calendar .maincalendar .calendarmonth td {font-size:0.8em;}
+.path-calendar .maincalendar .calendarmonth ul.events-underway {color:#999999;}
+.path-calendar .maincalendar .controls {font-size:1.2em;}
+.path-calendar .maincalendar .day {font-weight: bold;}
+.path-calendar .maincalendar .cal_courses_flt {text-align:center;margin:5px;}
+.path-calendar .maincalendar .calendar-controls .current {font-weight: bold;}
+.path-calendar .minicalendarblock h3 {font-size:1.0em;margin:0;font-weight:normal;text-align:center;}
+
+.calendartable a {color:#000077;}
+.calendartable th,
+.calendartable td {border-width:0;}
+
+.calendartable .hasevent {border:2px solid;}
+.calendar_event_course {border-color: #FFD3BD;}
+.calendar_event_global {border-color: #D6F8CD;}
+.calendar_event_group {border-color: #FEE7AE;}
+.calendar_event_user {border-color: #DCE7EC;}
+
+.calendartable .duration.duration_global {border-top-color:#66D14D; border-bottom-color:#66D14D;}
+.calendartable .duration.duration_course {border-top-color:#FF9966; border-bottom-color:#FF9966;}
+.calendartable .duration.duration_course0 {border-top-color:#FF9966; border-bottom-color:#FF9966;}
+.calendartable .duration.duration_course1 {border-top-color:#0099FF; border-bottom-color:#0099FF;}
+.calendartable .duration.duration_course2 {border-top-color:#FFFF00; border-bottom-color:#FFFF00;}
+.calendartable .duration.duration_group {border-top-color:#FBBB23; border-bottom-color:#FBBB23;}
+.calendartable .duration.duration_user {border-top-color:#A1BECB; border-bottom-color:#A1BECB;}
+
+.calendartable .weekend {color:#990000;}
+.calendartable .today {border:2px solid #444444;}
+.calendartable .nottoday {border-color:#EEEEEE;}
+.calendartable .eventnone a {text-decoration:none;color:black;cursor:text;}
+
+.calendartable.minicalendar {font-size:0.85em;border:1px solid #DDDDDD;margin: 10px 0;border-collapse:separate;border-spacing:1px;}
\ No newline at end of file
diff --git a/theme/standard/style/core.css b/theme/standard/style/core.css
new file mode 100644
index 00000000000..151b8db0653
--- /dev/null
+++ b/theme/standard/style/core.css
@@ -0,0 +1,355 @@
+html, body#tinymce {background-color:#FAFAFA;}
+body {font-family:Arial, Verdana, Helvetica, sans-serif;padding: 4px;}
+body.lang-vi_utf8 {font-family:Arial, Verdana, Helvetica, sans-serif !important;}
+
+/** 
+ * Links
+ */
+a {text-decoration:none;color:#0000FF;}
+a.autolink {color:#000000;background: #DDDDDD;}
+a:hover {text-decoration:underline;color:#FF0000;}
+
+.img-text a:hover {text-decoration: none;}
+.img-text a:hover span {text-decoration: underline;}
+
+.homelink a {color: #000;text-decoration: none;border-top: 1px solid #cecece;border-bottom: 2px solid #4a4a4a;border-left: 1px solid #cecece;border-right: 2px solid #4a4a4a;}
+.homelink a:hover {text-decoration: none;border-bottom: 1px solid #cecece;border-top: 2px solid #4a4a4a;border-right: 1px solid #cecece;border-left: 2px solid #4a4a4a;}
+
+/** 
+ * Headings
+ */
+h1.main,
+h2.main,
+h3.main,
+h4.main,
+h5.main,
+h6.main {text-align:center;font-weight:bold;}
+
+th.header,
+td.header,
+div.header,
+.navbar {border-color:#DDDDDD;}
+
+/**
+ * Boxes
+ */
+.generalbox,
+.informationbox,
+.noticebox,
+.tabledivider {border-color:#DDD;}
+.headingblock {border:1px solid #DDD;padding:5px;margin-top:0;}
+h2.headingblock {font-size:1.1em;}
+.headingblock .outline {border-color:#DDDDDD;}
+.header,
+.navbar {background-image:url([[pix:theme|hgradient]]);background-repeat: repeat-x;background-color:#e1e1df;}
+
+.sitetopic {margin-bottom:1em;}
+.sitetopiccontent {border-color:#DDDDDD;background-color:#FFFFFF;}
+
+.notifytiny {padding:10px;color:#000044;text-align:center;}
+
+.warning  {font-style: italic;}
+.error {color:#ff0000;}
+.errorbox {color:#ffffff;border-color:#660000;background-color:#990000;font-style: italic;}
+.errorbox .title {font-size: 1.2em;text-align: center;background-color:#FFBBBB;}
+.errorboxcontent {text-align: center;}
+.errorcode {font-size: 0.7em;}
+
+.generaltable {border:1px solid #DDD;border-collapse: collapse;background-color:#FFF;border-color:#EEEEEE;}
+.generaltable td {border:1px solid #DDD;vertical-align:top;}
+.generaltable .cell {background-color:#FFFFFF;border-color:#EEEEEE;}
+
+#page-site-index .subscribelink,
+.path-course-view .subscribelink {font-size: 0.8em;}
+
+.files .file,
+.files .folder {font-size: 0.9em;}
+.files .folder .size {font-weight: bold;}
+
+a.useredit,
+a:hover.useredit,
+.blink {color: black;cursor: help;}
+
+.navigation button {font-size: 80%;}
+
+img.userpicture,
+img.grouppicture {border:0px solid #000}
+
+table.formtable tbody th {background-color: transparent;background-image: none;}
+
+.highlight {background-color:#AAFFAA;}
+
+.unread {background: #FFD991;}
+
+.censoredtext {color:#000000;background:#000000;}
+
+.navigation select {background-color:#FFFFFF;}
+.navigation optgroup {background-color:#EEEEEE;}
+.navigation optgroup option {background-color:#FFFFFF;}
+
+.mod_introbox {border-color:#DDDDDD;}
+
+/** 
+ * Docs
+ */
+#doc-contents h1 {font-size: 0.9em;}
+#doc-contents ul {font-size: 0.8em;}
+
+/** 
+ * Login
+ */
+#page-login-index #content {font-size: 0.85em;}
+.loginbox {margin:15px 25%;}
+.loginbox.twocolumns {width:90%;margin-left:5%;}
+.loginbox,
+.loginbox.twocolumns .loginpanel,
+.loginbox .subcontent {border-color:#DDDDDD;}
+
+/**
+ * Logs
+ */
+.logtable {margin-left:auto;margin-right:auto;}
+.logtable td {font-size: 0.8em;}
+.logtable th {font-size: 0.9em;}
+.logtable .r1 {background-color:#EEEEEE;}
+
+/**
+ * Blog
+ */
+.blog_entry .audience,
+.blog_entry .tags {font-size: 0.85em;}
+.blog_entry.blogdraft .content {background-color:#EEEEEE;}
+
+/**
+ * My Moodle
+ */
+.my .courseboxcontent .overview .info {font-size:0.7em;}
+
+/**
+ * Tiny MCS
+ */
+.mceContentBody  {background-color:#FAFAFA;color:#000;}
+
+/**
+ * General
+ */
+#layout-table {margin-top: 8px;}
+#layout-table #content {padding-left:12px;padding-right:12px;}
+#redirect {text-align: center;margin-top:10%;}
+.continuebutton {text-align: center;}
+#grouppicture {text-align: center;}
+.notifyproblem {text-align: center;padding: 10px;}
+.notifysuccess {text-align:center;padding: 10px;}
+.notifytiny {text-align:left;padding: 0;}
+.collapsibleregion .collapsibleregioncaption a {color: inherit;text-decoration: none;}
+.noticebox {border-width:1px;border-style:solid;padding:10px;}
+#notice.generalbox {width: 60%;margin-left:auto;margin-right:auto;}
+#notice .buttons {text-align:center}
+#notice .buttons div,
+#notice .buttons form {display:inline;}
+#notice .singlebutton {text-align:center;padding: 5px;margin: 0px;}
+.generalbox {border-width:1px;border-style:solid;margin-bottom: 15px;padding:10px;}
+.generalbox#intro {width:70%;margin-left:auto;margin-right:auto;padding-bottom:15px;}
+.errorbox {border-width:1px;border-style:solid;margin: 1em 15%;width: 70%;padding:10px;}
+.errorbox .title {padding: 5px;}
+.informationbox {border-width:1px;border-style:solid;padding: 10px;}
+.feedbackbox {border-width:1px;border-style:solid;}
+.rsslink {padding:  0 0 0 0.3em;}
+.printicon {padding:  0 0 0 0.3em;}
+.generaltable {border-width: 1px;border-style: solid;}
+.generaltable .cell {border-width: 1px;border-style: solid;}
+.paging {text-align: center;margin: 10px 0 10px 0;}
+.pagingbar {text-align:center;}
+.pagingbar a {padding-left: 10px;}
+.pagingbar .thispage {padding-left: 10px;}
+table.rotateheaders th.header {vertical-align: bottom;}
+#participationreport .reporttable {text-align: center;margin-left:auto;margin-right:auto;}
+#participationreport {text-align: center;}
+#participationreport .modulename {font-weight: bold;}
+#participationreportselector {text-align: center;}
+#participationreportactions {text-align: center;}
+.initialbar {text-align: center;}
+.helplink img {margin: 0 2px;}
+.closewindow,
+.tabledivider {border-width:1px;border-style:solid;border-left:0;border-right:0;border-top:0;}
+.sitetopic {margin-bottom:20px;}
+.sitetopiccontent {border-width:1px;border-style:solid;}
+table.formtable {margin: auto;}
+table.formtable tbody td,
+table.formtable tbody th{padding: 5px;}
+table.formtable tbody .htmlarea td,
+table.formtable tbody .htmlarea th{padding: 0;}
+.unread {padding-right:2px;}
+.heading-with-help {text-align:center;margin:0.83em 0;}
+.heading-with-help h2 {margin:0;}
+form.popupform label {margin-right: 0.5em;}
+.arrow_button {margin-top:3em;}
+.arrow_button input {padding:0.3em;}
+
+/** 
+ * User
+ **/
+#userselector_options {font-size: 0.75em;}
+.userinfobox {border-color: #DDDDDD;}
+.userinfobox .links {font-size: 0.7em;}
+#page-user-index #longtimenosee {font-size: 0.8em;}
+.iplookup #header h1.headermain {font-size:1em;}
+.iplookup #note {font-size:0.8em;font-style: italic;}
+.groupinfobox {border-color: #DDDDDD;width: 60%;margin-left: 20%;margin-right: 20%;}
+.userinfobox {width:80%;margin:10px auto;}
+#page-user-index h2 {text-align: center;}
+#page-user-index #longtimenosee,
+#page-user-index #showall {text-align: center;}
+
+/**
+ * Moodle Forms
+ */
+.mform {margin: 0 auto;width: 80%;}
+.mform fieldset {border: 1px solid #DDDDDD;padding: 10px 0;margin: 0.7em 0;width:100%;}
+.mform .fitem fieldset.felement {margin-top:0;padding-top:0;margin-bottom:0;padding-bottom:0;}
+.mform .fpassword .unmask input {margin-left:5px;margin-right:3px;}
+.mform .fitem .fstatic {border:1px dashed #D3D3D3;}
+#page-admin-register .mform .fsubmit {padding:20px;text-align:center;}
+
+/**
+ * Filters
+ */
+.mediaplugin {display:block;clear:both;margin-top:5px;margin-bottom:5px;}
+.mediaplugin_mp3,
+.mediaplugin_swf,
+.mediaplugin_flv {display:inline;clear:none;margin:0px;margin-left:0.5em;}
+.texrender {border:0px;vertical-align:middle;}
+
+/**
+ * Groups
+ */
+.groupmanagementtable {width: 90%;}
+.groupmanagementtable p {text-align: left;margin-bottom: 0.2em;}
+.groupmanagementtable #existingcell label,
+.groupmanagementtable #potentialcell label {font-weight: bold;}
+.groupmanagementtable #buttonscell p {text-align: center;}
+.groupmanagementtable #buttonscell input {padding: 1em 0;}
+.groupmanagementtable #buttonscell #remove {margin: 7em 0;}
+.groupmanagementtable #backcell {padding-top: 2em;text-align: center;}
+#page-group-groupings .buttons {margin: 20px;text-align:center;}
+#page-group-groupings .buttons .singlebutton {display: inline;padding: 5px;}
+
+/**
+ * Login
+ */
+.loginbox {border:1px solid;}
+.loginbox .guestsub,
+.loginbox .forgotsub,
+.loginbox .potentialidps {border-top:1px solid;}
+
+/**
+ * Notes
+ */
+.notepost {background-color: #EEE;}
+.notepost .header {background: #DDD;padding: 5px;}
+.notepost .user {font-weight: bolder;}
+.notepost .info {font-size: smaller;}
+.path-notes .generalbox {margin-left:auto;margin-right:auto;width:90%;}
+
+/**
+ * Logs
+ */
+.logtable td,
+.logtable th {padding-left: 10px;padding-right: 10px;}
+
+/**
+ * Help
+ */
+#help .indent {margin-left:3em;}
+#help .helpindex {text-align: center;}
+#help_icon_tooltip {font-size: 0.7em;}
+#help_icon_tooltip h1 {font-size: 1.1em;font-weight: bold;}
+#help_icon_tooltip .readmore {display: block;font-style: italic;margin-top:10px;}
+#help .example1 {color: #a00;}
+#help .success {color: #080;}
+#help pre,
+#help code {background: #eee;border: 1px dashed #ddd;padding: 3px;}
+
+/**
+ * Tags
+ */
+h2.tag-heading {text-align:center;margin-left:auto;margin-right:auto;width:95%;}
+#tag-user-table,
+#tag-description,
+#tag-blogs {width:95%;margin-left:auto;margin-right:auto;}
+#page-tag-index .moreblogs,
+#tag-management-box,
+.tag .relatedpages,
+#page-tag-index .moreblogs {text-align:center;}
+#tags-management-links,
+.tag .managelink {text-align:right;}
+table#tag-management-list {margin: 10px auto;width: 80%;}
+
+/** 
+ * Overriding base
+ */
+#page-header .headermain {font-size:1.5em;}
+.pagelayout-frontpage #page-header {border-bottom:2px groove #999;margin:0 0.5%;width:99%;}
+
+.navbar {margin:5px 10px;border:1px solid #DDD;}
+.navbar .breadcrumb {margin:5px;}
+.navbar .navbutton {margin:5px;}
+.mform fieldset {border-color:#DDD;}
+
+/**
+ * Tabs
+ */
+.tabtree ul {text-align:center;}
+.tabtree .tabrow0 {width:100%;margin:1em 0px;}
+.tabtree .tabrow0 li {margin-right:-4px;}
+.tabtree .tabrow0 li.here {font-weight: bold;}
+.tabtree .tabrow0 li.here a {position:relative;z-index:102;}
+.tabtree .tabrow0 li a {background-image:url([[pix:theme|tab/left]]);padding-left:14px;padding-top:10px;background-repeat:no-repeat;padding-bottom:3px;margin-bottom:-1px;}
+.tabtree .tabrow0 li a:hover {background-image:url([[pix:theme|tab/left_hover]]);}
+.tabtree .tabrow0 li a span { background-image:url([[pix:theme|tab/right]]);background-repeat:no-repeat;background-position:100% 0%;padding-right:14px;padding-top:10px;padding-bottom:3px;}
+.tabtree .tabrow0 li a:hover span {background-image:url([[pix:theme|tab/right_hover]]);}
+.tabtree .tabrow0 ul,
+.tabtree .tabrow0 div {font-weight: normal;background-image:url([[pix:theme|tab/tabrow1]]);background-position:0% 50%;border-top:1px solid #aaa;padding:0.25em 0px;margin:0px;}
+.tabtree .tabrow0 li.here .empty {display:block;height:1px;overflow:hidden;padding:0px;position:absolute;width:100%;bottom:-4px;}
+.tabtree .tabrow1 li a,
+.tabtree .tabrow1 li a:hover,
+.tabtree .tabrow1 li a span,
+.tabtree .tabrow1 li a:hover span {background-image:none !important;}
+
+.tabtree a.nolink,
+.tabtree .here ul a.nolink,
+.tabtree a.nolink:hover,
+.tabtree .here ul a.nolink:hover {color: #888;text-decoration: none;}
+.tabtree .here a.nolink,
+.tabtree .here ul .here a.nolink,
+.tabtree .here a.nolink:hover,
+.tabtree .here ul .here a.nolink:hover {color: black;text-decoration: none;}
+
+.ie7 .tabtree .tabrow0 li {margin-left: 0;}
+.ie7 .tabtree .tabrow0 li.first {margin-right: -4px;}
+.ie7 .tabtree .tabrow0 li.onerow {margin-right: 0;}
+.ie7 .tabtree .tabrow0 a {display: inline-block;padding: 8px 0 0.35em 13px;line-height: 1.5em;}
+.ie7 .tabtree .tabrow0 a span {padding: 10px 1em 10px 0;}
+.ie7 .tabtree .tabrow0 div {top: 2.6em;padding: 0.2em 0;}
+.ie7 .tabtree .tabrow0 div.empty {margin-right: 0;}
+.ie7.mod-quiz div.tabtree a span img.iconsmall {margin: 0;vertical-align: baseline;position: relative;top: 2px;}
+
+.ie6 .tabtree {height: 100%;}
+.ie6 .tabtree .tabrow0 {padding-top: 10px;}
+.ie6 .tabtree .tabrow0 li {margin-left: 0;}
+.ie6 .tabtree .tabrow0 li.first {margin-left: -4px;margin-right: -4px;}
+.ie6 .tabtree .tabrow0 li.last a {margin-right: 0;}
+.ie6 .tabtree .tabrow0 li.onerow {margin-right: 0;}
+.ie6 .tabtree .tabrow0 a {padding: 0 0 0 13px;}
+.ie6 .tabtree .tabrow0 a span {padding: 12px 1em 4px 0;}
+.ie6 .tabtree .tabrow0 div {top: 3.5em;padding: 0.2em 0;}
+
+/**
+ * Comment
+ */
+.comment-area textarea {border: 1px solid gray;}
+
+.ie6 .que .info {display: inline;}
+.ie6.course-view li.activity {height:0;}
+.ie6 #help_icon_tooltip .yui-tt-shadow-visible {background-color: transparent;}
+
diff --git a/theme/standard/style/course.css b/theme/standard/style/course.css
new file mode 100644
index 00000000000..99327f0b6e2
--- /dev/null
+++ b/theme/standard/style/course.css
@@ -0,0 +1,87 @@
+/** Course formats **/
+.course-content ul.weeks li.section {border:1px solid #DDD;background-color:#FFF;}
+.course-content ul.weeks li.section .content {background-color:#FAFAFA;padding:5px 10px;}
+.course-content ul.weeks li.section .content h3 {margin:0;color:#777;font-weight: normal;}
+.course-content ul.weeks li.section .left {padding:5px 0;}
+.course-content ul.weeks li.section .right {padding:5px 0;}
+
+/** Course **/
+.coursebox {border:1px solid #DDD;border-color:#DDDDDD;}
+.coursebox .info {margin:5px;font-size:1em;}
+.coursebox .info .name {margin:3px 0;}
+.coursebox .info .teachers {margin:0 1em;font-size:0.9em;}
+.coursebox .cost {font-size:0.9em;padding-top: 20px;}
+.coursebox .summary {margin:5px 5px 5px 51%;font-size:0.9em;}
+
+#page-course-recent h2.main {font-size:1.1em;}
+#page-course-recent .user {font-size:0.75em;}
+#page-course-recent .grade {font-style: italic;font-size:0.9em;}
+#page-course-recent .forum-recent .reply .title {font-style: italic;font-size:0.9em;}
+#page-course-recent .forum-recent .discussion .title {font-weight:bold;font-style: italic;font-size:0.9em;}
+
+.path-course-view .availabilityinfo {font-size:0.85em;color:#aaa;}
+.path-course-view .availabilityinfo strong {font-weight:normal;color:black;}
+.path-course-view .dimmed_text img {opacity:0.3;filter: alpha(opacity='30');}
+.path-course-view .section {font-size:0.95em;line-height:1.2em;}
+.path-course-view .section .activity {padding:0.2em 0;}
+.path-course-view .section .activity a {line-height:1em;}
+.path-course-view .section .weekdates {margin: 0;font-weight: normal;font-size: 1em;}
+.path-course-view .section .groupinglabel {color: #666666;}
+.path-course-view .section .left {font-weight:bold;}
+
+.path-course-view .weeks .section,
+.path-course-view .topics .section,
+.path-course-view .section td {border-color:#DDDDDD;}
+.path-course-view .weeks .content ,
+.path-course-view .topics .content,
+.path-course-view .weeks .section,
+.path-course-view .topics .section {background: #FAFAFA;}
+.path-course-view .section td.side {background: #FFFFFF;}
+.path-course-view .weeks .current,
+.path-course-view .topics .current,
+.path-course-view .current td.side {background: #FFD991;}
+.path-course-view .weeks .hidden,
+.path-course-view .topics .hidden,
+.path-course-view .hidden td.side {background: #DDDDDD;}
+.path-course-view .section .weekdates {color: #777777;}
+.path-course-view .weeks .weekdates ,
+.path-course-view .topics .weekdates {color: #333333;}
+
+.weeks li.section ,
+.topics li.section {border-style:solid;border-width:1px;}
+
+.weeks .content,
+.topics .content {padding: 5px;}
+
+.categoryboxcontent {border-color:#DDDDDD;}
+
+#page-course-user .graph {text-align: center;}
+#page-course-user .section {border-color:#AAAAAA;}
+#page-course-user .info {text-align:center;}
+
+#page-admin-report .plugin,
+#page-course-report .plugin,
+#page-course-import .plugin {margin-bottom: 20px;margin-left:10%;margin-right:10%;border: 1px solid #cecece;background-color: #fdfdfd;}
+
+.path-course-view .unread {background: #9EBEFF;}
+.path-course-view .completionprogress {font-size:0.80em; padding:8px 26px 5px 5px;}
+
+#page-course-category .courseboxes,
+#page-course-index .courseboxes {padding:20px;}
+
+#page-course-report #content {padding-top:15px;padding-bottom:15px;}
+
+#page-course-report p,
+#page-course-report-log-index .info,
+#page-course-report-log-indexlive .info,
+#page-course-report-stats-index .graph {text-align: center;}
+
+#page-course-report .logselectform,
+#page-course-report .participationselectform,
+#page-course-report-log-index .logselectform,
+#page-course-report-participation-index .participationselectform {text-align:center;}
+
+.addcoursebutton {text-align:center;}
+.categorypicker {text-align:center;margin-bottom:10px;}
+.path-course-report-outline .loginfo {text-align:center;margin: 1em;}
+.categorylist {width: 90%;margin:0 auto;text-align: left;}
\ No newline at end of file
diff --git a/theme/standard/style/css3.css b/theme/standard/style/css3.css
new file mode 100644
index 00000000000..672ae70354b
--- /dev/null
+++ b/theme/standard/style/css3.css
@@ -0,0 +1,239 @@
+/**
+ * Rounded Corner Syntax Guide
+ *
+ * The following are CSS means for getting rounded corners. Sorry no IE yet, and
+ * please note that each uses a slightly different style of syntax for specific
+ * definition (top, bottom, left, right).
+ *
+ * CSS3 rounded corners
+ *   border-radius
+ *   border-top-left-radius
+ *   border-top-right-radius
+ *   border-bottom-left-radius
+ *   border-bottom-right-radius
+ *
+ * Mozilla rounded corners
+ *   -moz-border-radius
+ *   -moz-border-radius-topleft
+ *   -moz-border-radius-topright
+ *   -moz-border-radius-bottomleft
+ *   -moz-border-radius-bottomright
+ *
+ * Webkit rounded corners
+ *   -webkit-border-radius
+ *   -webkit-border-top-left-radius
+ *   -webkit-border-top-right-radius
+ *   -webkit-border-bottom-left-radius
+ *   -webkit-border-bottom-right-radius
+ */
+
+.sideblock.hidden {
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
+}
+
+.headingblock,
+table.minicalendar td,
+.path-calendar .maincalendar .filters table,
+.path-calendar .sidecalendar .filters table,
+.sideblock.block_calendar_month .filters table,
+.path-calendar .maincalendar li.calendar_event_course,
+.path-calendar .maincalendar li.calendar_event_global,
+.path-calendar .maincalendar li.calendar_event_user,
+.path-calendar .maincalendar li.calendar_event_group,
+.path-calendar .filters td.calendar_event_course,
+.path-calendar .filters td.calendar_event_global,
+.path-calendar .filters td.calendar_event_user,
+.path-calendar .filters td.calendar_event_group {
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
+
+.noticebox {
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+}
+
+.categorybox,
+.categoryboxcontent,
+.coursebox,
+.notifyproblem,
+.notifysuccess,
+table.minicalendar {
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+  border-radius: 10px;
+}
+
+.sitetopiccontent {
+  -moz-border-radius: 15px;
+  -webkit-border-radius: 15px;
+  border-radius: 15px;
+}
+
+.block_course_summary,
+.block_course_summary .content,
+#page-course-user .section {
+  -moz-border-radius:20px;
+  -webkit-border-radius: 20px;
+  border-radius: 20px;
+}
+
+.generalbox,
+.generalboxcontent,
+.informationbox,
+.informationboxcontent {
+  -moz-border-radius-topleft: 3px;
+  -moz-border-radius-topright: 3px;
+  -moz-border-radius-bottomleft: 15px;
+  -moz-border-radius-bottomright: 15px;
+  -webkit-border-top-left-radius: 3px;
+  -webkit-border-top-right-radius: 3px;
+  -webkit-border-bottom-left-radius: 15px;
+  -webkit-border-bottom-right-radius: 15px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  border-bottom-left-radius: 15px;
+  border-bottom-right-radius: 15px;
+}
+
+.editing .block_course_summary .content {
+  -moz-border-radius-topleft:0;
+  -moz-border-radius-topright:0;
+  -webkit-border-top-left-radius: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
+
+.entryboxheader {
+  -moz-border-radius-topleft:10px;
+  -moz-border-radius-topright:10px;
+  -webkit-border-top-left-radius: 10px;
+  -webkit-border-top-right-radius: 10px;
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+
+.generaltabselected,
+.generaltab, .generaltabinactive,
+.glossarycategoryheader,
+.glossaryformatheader {
+  -moz-border-radius-topleft:15px;
+  -moz-border-radius-topright:15px;
+  -webkit-border-top-left-radius: 15px;
+  -webkit-border-top-right-radius: 15px;
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
+}
+
+.entrybox {
+  -moz-border-radius-bottomleft:10px;
+  -moz-border-radius-bottomright:10px;
+  -webkit-border-bottom-left-radius: 10px;
+  -webkit-border-bottom-right-radius: 10px;
+  border-bottom-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+}
+
+.path-calendar .eventlist .event,
+.glossarypost,
+#page-mod-journal-view .feedbackbox{
+  -moz-border-radius-bottomleft:15px;
+  -moz-border-radius-bottomright:15px;
+  -webkit-border-bottom-left-radius: 15px;
+  -webkit-border-bottom-right-radius: 15px;
+  border-bottom-left-radius: 15px;
+  border-bottom-right-radius: 15px;
+}
+
+.path-calendar .eventlist .event .side,
+.glossarypost .side,
+#page-mod-journal-view .feedbackbox .side {
+  -moz-border-radius-bottomleft:15px;
+  -webkit-border-bottom-left-radius: 15px;
+  border-bottom-left-radius: 15px;
+}
+
+.path-calendar .eventlist .event .description,
+.encyclopedia .entrylowersection,
+#page-mod-journal-view .feedbackbox .entrycontent {
+  -moz-border-radius-bottomright:15px;
+  -webkit-border-bottom-right-radius: 15px;
+  border-bottom-right-radius: 15px;
+}
+
+.path-calendar .maincalendar,
+.path-calendar .sidecalendar,
+.path-calendar td.sidecalendar .sideblock,
+.loginbox,
+.userinfobox,
+.groupinfobox,
+.forumpost,
+.sideblock .content,
+.glossarycomment {
+  -moz-border-radius-bottomright:20px;
+  -moz-border-radius-bottomleft:20px;
+  -webkit-border-bottom-left-radius: 20px;
+  -webkit-border-bottom-right-radius: 20px;
+  border-bottom-left-radius: 20px;
+  border-bottom-right-radius: 20px;
+}
+
+.loginbox .content.left.
+#page-user-view .left,
+.forumpost .side,
+.glossarycomment .side {
+  -moz-border-radius-bottomleft:20px;
+  -webkit-border-bottom-left-radius: 20px;
+  border-bottom-left-radius: 20px;
+}
+
+.loginbox .content.right,
+.forumpost .content,
+.forumpost .message,
+.glossarycomment .entry {
+  -moz-border-radius-bottomright:20px;
+  -webkit-border-bottom-right-radius: 20px;
+  border-bottom-right-radius: 20px;
+}
+
+#quiznavigation .qnbutton {
+  -moz-box-sizing: content-box;
+}
+
+#page-mod-quiz-edit div.editq div.question div.content,
+#page-mod-quiz-edit div.quizpage .pagecontent {
+  -moz-border-radius-topright: 0.6em;
+  -moz-border-radius-bottomright: 0.6em;
+  -webkit-border-top-right-radius: 0.6em;
+  -webkit-border-bottom-right-radius: 0.6em;
+  border-top-right-radius: 0.6em;
+  border-bottom-right-radius: 0.6em;
+}
+#page-mod-quiz-edit div.quizpage .pagecontent .pagestatus,
+#page-mod-quiz-edit .reorder div.question div.content{
+  -moz-border-radius-topright: 0.3em;
+  -moz-border-radius-bottomright: 0.3em;
+  -webkit-border-top-right-radius: 0.3em;
+  -webkit-border-bottom-right-radius: 0.3em;
+  border-top-right-radius: 0.3em;
+  border-bottom-right-radius: 0.3em;
+}
+#page-mod-quiz-edit div.question div.content div.points,
+#page-mod-quiz-edit div.question div.content div.qorder {
+  -moz-border-radius-topright: 0.2em;
+  -moz-border-radius-bottomright: 0.2em;
+  -webkit-border-top-right-radius: 0.2em;
+  -webkit-border-bottom-right-radius: 0.2em;
+  border-top-right-radius: 0.2em;
+  border-bottom-right-radius: 0.2em;
+}
+#page-mod-quiz-edit div.quizpage .pagecontent form#addquestion{
+    -moz-border-radius:0.2em;
+    -webkit-border-radius: 0.2em;
+    border-radius: 0.2em;
+}
\ No newline at end of file
diff --git a/theme/standard/style/dock.css b/theme/standard/style/dock.css
new file mode 100644
index 00000000000..8da99f31bd3
--- /dev/null
+++ b/theme/standard/style/dock.css
@@ -0,0 +1,50 @@
+/** Core overrides **/
+body.has_dock {margin-left:30px;margin-right:30px;}
+
+/* This CSS is for the dock */
+.dock {width:30px;position:fixed;top:0px;left:0px;height:100%;background-image:url([[pix:theme|vgradient]]);background-repeat: repeat-y;background-position:100% 0;background-color:#DDD;border-right:1px solid #AAA;z-index:2002;}
+.dock .dockeditem {background-color:#DDD;}
+.dock .dockeditem .firstdockitem {margin-top:1em;}
+.dock .dockeditem .dockedtitle {border-bottom:1px solid #AAA;border-top:1px solid #CCC;cursor:pointer;background-image:url([[pix:theme|vgradient]]);background-position:90% 0;background-repeat: repeat-y;}
+.dock .dockeditem .dockedtitle.activeitem {background-position:80% 0;}
+.dock .dockeditem .dockedtitle h2 {font-size:0.8em;line-height:100%;text-transform:uppercase;text-align:center;margin:12px 0px;}
+.dock .block_tree .current_branch {}
+.dock .controls {position:absolute;bottom:1em;text-align:center;width:100%;}
+.dock .controls img {cursor:pointer;}
+.dock .bd.oversized_content {overflow-y:auto;overflow-x:visible;height:inherit;}
+.dock .bd.oversized_content .content {margin:6px 6px 6px 0px;padding-bottom:6px;}
+/** YUI overrides **/
+.yui-skin-sam .dock .yui-panel {border-width:1px 2px 1px 1px;border-color:#AAA;min-width:150px;}
+.yui-skin-sam .dock .yui-panel .bd {border-width:0;background-color:#FAFAFA;}
+/** Override the above if the dock is on the right **/
+.dock.dock_right_vertical {left:auto;right:0px;border-width:0px 0px 1px 5px;}
+.dock.dock_right_vertical .commands {text-align:right;}
+.yui-skin-sam .dock.dock_right_vertical .yui-panel {border-width:1px 0 1px 5px;}
+
+/* Sideblock expansion code */
+.block_js_expansion .block_tree {overflow-x:scroll;}
+.block_js_expansion.mouseover .content {width:200%;z-index:1000;position:relative;}
+.block_js_expansion.mouseover .content .block_tree {width:100%; background-color:#FAFAFA; padding-bottom:0px;}
+
+/* CSS for shadows */
+.divshadow div {position:absolute;width:3px;height:3px;background-color:#333;}
+.divshadow .shadow_top {top:-3px;right:0px;width:100%;}
+.divshadow .shadow_bottom {bottom:-3px;right:0px;width:100%;}
+.divshadow .shadow_left {top:0px;left:-3px;height:100%;}
+.divshadow .shadow_right {bottom:0px;right:-3px;height:100%;}
+.divshadow .shadow_top_right {top:-3px;right:-3px;}
+.divshadow .shadow_bottom_right {bottom:-3px;right:-3px;}
+.divshadow .shadow_top_left {top:-3px;left:-3px;}
+.divshadow .shadow_bottom_left {bottom:-3px;left:-3px;}
+
+/** IE stylings */
+.ie6 .sideblock .block_tree {width:160px;overflow-x:scroll;}
+.ie7 .sideblock .block_tree {overflow-x:scroll;}
+.ie6 .block_tree .tree_item {width:100%;}
+.ie6 .dock {position:absolute;}
+.ie6 .dock hr {display:none;margin:0px;height:0px;padding:0px;}
+.ie6 .dock li p {background-color:inherit;}
+.ie6 .dock .bd.oversized_content .content, .ie7 .dock .bd.oversized_content .content {padding-bottom:0px;}
+.ie6 .block_js_expansion.mouseover .content, .ie7 .block_js_expansion.mouseover .content{ padding-bottom:2px;}
+.ie6 .dock .bd.oversized_content {width:100%;}
+.ie7 .dock .bd.oversized_content {width:400px;}
\ No newline at end of file
diff --git a/theme/standard/style/grade.css b/theme/standard/style/grade.css
new file mode 100644
index 00000000000..4f014ebf277
--- /dev/null
+++ b/theme/standard/style/grade.css
@@ -0,0 +1,34 @@
+/** Grades **/
+#page-grade-index .grades .header {font-weight: bold; font-size: 0.7em;}
+
+#grade-aggregation-help dt {font-weight: bold;}
+#grade-aggregation-help dd.example {font-style: italic;}
+#grade-aggregation-help code {font-style: normal;}
+
+#page-grade-index .grades {border-color:#000;}
+#page-grade-index .grades td {border-color:#E0E0E0;}
+#page-grade-index .grades .r0 {background-color: #FFF;}
+#page-grade-index .grades .r1 {background-color: #F0F0F0;}
+
+td.grade div.overridden {background-color: #DDDDDD;}
+
+.path-grade-report-grader table#user-grades td.cell span.gradepass {background-color: #C2EBBD;}
+.path-grade-report-grader table#user-grades td.cell span.gradefail {background-color: #EBC4BD;}
+
+.path-grade-edit-tree .moving {background-color: #E8EEF7;}
+.path-grade-edit-tree .gradetreebox {width:70%;padding-bottom:15px;}
+
+.path-grade-edit-scale .scale_options,
+#page-admin-grade-edit-scale-index .scale_options {font-size: 0.8em;}
+
+.gradetreebox {margin:10px auto;width:90%;}
+.gradetreebox table {font-size: 0.8em;border: 1px solid #AAA;}
+.gradetreebox tr.category th.cell.rowspan {border-width:0; border-left:1px solid #AAA;}
+.gradetreebox tr.category th.cell.rowspan:hover {background-color: #EEE;}
+.gradetreebox td.name {border-left: 0px;}
+.gradetreebox td.colspan {border-left: 1px solid #AAA;border-bottom: 1px solid #AAA;border-top: none;background-color: #DDD;}
+.gradetreebox tr .cell.level1 {background-color: #F3DFD0; width: 10px;}
+.gradetreebox tr .cell.level2 {background-color: #D0DBD3; width: 10px;}
+.gradetreebox tr .cell.level3 {background-color: #D0F3D6; width: 10px;}
+.gradetreebox tr .cell.level4 {background-color: #F0F0AA; width: 10px;}
+.gradetreebox tr .cell.level5 {background-color: #EBDEF6; width: 10px;}
\ No newline at end of file
diff --git a/theme/standard/style/message.css b/theme/standard/style/message.css
new file mode 100644
index 00000000000..52c3a7028d0
--- /dev/null
+++ b/theme/standard/style/message.css
@@ -0,0 +1,31 @@
+/** Message **/
+.message-discussion-noframes h1 {font-size:1em;}
+.message-discussion-noframes #userinfo .commands {font-size:0.8em;}
+
+.message .noframesjslink {font-size:0.8em;}
+.message .link {font-size:0.8em;}
+.message_form {font-size:0.8em;}
+.message .heading {font-size:1.0em;font-weight:bold;}
+.message .date,
+.message .contact,
+.message .summary {font-size:0.9em;}
+.message .note,
+.message .pix {font-size:0.8em;}
+.message .author {font-weight: bold;font-size:0.8em;}
+.message .time {font-style: italic;font-size:0.8em;}
+.message .content {font-size:0.8em;}
+
+#page-message-user .commands span {font-size:0.7em;}
+#page-message-user .name {font-weight: bold;font-size:1.1em;}
+table.message_search_results td {border-color:#DDDDDD;}
+
+.message .time {color: #999999;}
+.message.me .author {color: #999999;}
+.message.other .author {color: #8888CC;}
+
+#page-message-messages {padding:10px;}
+#page-message-send .notifysuccess {padding:1px;}
+#page-message-send td.fixeditor {text-align:center;}
+
+.message .note {padding:10px;}
+table.message .searchresults td {padding:5px;}
\ No newline at end of file
diff --git a/theme/standard/style/modules.css b/theme/standard/style/modules.css
new file mode 100644
index 00000000000..c27964109c5
--- /dev/null
+++ b/theme/standard/style/modules.css
@@ -0,0 +1,193 @@
+/**********************************************************
+ * This file contains style information for the modules   *
+ * for this particular theme.                             *
+ **********************************************************/
+
+/** General **/
+#page-mod-assignment-index .cell,
+#page-mod-chat-index .cell,
+#page-mod-choice-index .cell,
+#page-mod-forum-index .generalbox .cell,
+#page-mod-glossary-index .cell,
+#page-mod-resource-index .cell,
+#page-mod-scorm-index .cell,
+#page-mod-survey-index .cell,
+#page-mod-wiki-index .cell {font-size:0.8em;}
+.mod_introbox {width:90%;margin:1em auto;}
+table.mod_index {width:90%;margin:1em auto;}
+
+/** Assignment **/
+.path-mod-assignment .feedback .files {background-color: #EFEFEF;padding:5px;}
+.path-mod-assignment .feedback .time,
+#page-mod-assignment-view .feedback .date {font-size: 0.8em;}
+.path-mod-assignment .late {color: red;}
+.path-mod-assignment #wordcount {font-size: 0.8em;text-align: right;}
+#page-mod-assignment-submissions .feedback .content,
+#page-mod-assignment-submissions .feedback .topic,
+#page-mod-assignment-submissions .feedback .picture {padding: 10px;border:1px solid #DDD;}
+#page-mod-assignment-submissions .generaltable .r1 {background-color: #FFFFFF;}
+#page-mod-assignment-submissions .s0 {background: #FFD991;}
+#page-mod-assignment-submissions table.submissions td,
+#page-mod-assignment-submissions table.submissions th{border:1px solid #DDD;vertical-align: middle;padding-left: 5px;padding-right: 5px;}
+#page-mod-assignment-submissions .timemodified,
+#page-mod-assignment-submissions .timemarked {font-size: 0.9em;}
+#page-mod-assignment-submissions .fgcontrols {margin-top: 1em;text-align:center;}
+#page-mod-assignment-submissions .fgcontrols .fastgbutton{margin-top: 0.5em;}
+#page-mod-assignment-view #dates {font-size: 0.8em;margin:30px auto;}
+#page-mod-assignment-view #dates .c0 {text-align:right;font-weight:bold;}
+#page-mod-assignment-view .feedback {border:1px solid #DDD;}
+#page-mod-assignment-view .feedback .topic {padding: 4px;border:0px solid #DDD;border-bottom-width: 1px;}
+#page-mod-assignment-view .feedback .content {padding: 4px;}
+#page-mod-assignment-view .feedback .left {width: 35px;padding: 4px;text-align: center;vertical-align: top;}
+#page-mod-assignment-view #dates {font-size: 0.8em;margin:30px auto;}
+#page-mod-assignment-submissions .status,
+#page-mod-assignment-view #online .singlebutton {text-align: center;}
+#page-mod-assignment-submissions .submissions .grade,
+#page-mod-assignment-view .feedback .fullname,
+#page-mod-assignment-view .feedback .grade {font-weight:bold;}
+
+/** Chat **/
+.path-mod-chat .time {font-weight: bold;}
+.path-mod-chat .user {color:blue;}
+.path-mod-chat .chat-event {text-align:center;color:gray;}
+.path-mod-chat .chat-event .event,
+.path-mod-chat .chat-message .title {color:#888}
+.path-mod-chat .chat-event .text,
+.path-mod-chat .chat-message .text {text-align: left;color:#000;}
+.path-mod-chat #chat-header {background: transparent;font-size: 200%;}
+.path-mod-chat #chat-header p {font-size: 50%;color: gray;}
+#page-mod-chat-gui_basic h1 {font-size:1.4em;}
+#page-mod-chat-gui_header_js-chatinput .wait {background: #dddddd;}
+#page-mod-chat-gui_header_js-jsupdate {margin:10px}
+#page-mod-chat-gui_header_js-jsupdate .chat-event,
+#page-mod-chat-gui_header_js-jsupdate .chat-message {padding:0;margin-top:7px;}
+#page-mod-chat-view .nextchatsession {text-align:center;}
+#page-mod-chat-view #enterlink {text-align: center;margin-left: auto;margin-right: auto;width: 50%;}
+#page-mod-chat-view #chatcurrentusers .idletime {color: #888888;}
+#page-mod-chat-gui_basic #participants .idle,
+#page-mod-chat-view #chatcurrentusers .chatuserdetails {font-size: 0.6em;}
+
+/** Choice **/
+.path-mod-choice .results .data {border:1px solid #999;}
+
+/** Feedback **/
+.feedback_required_mark {color: #FF0000;}
+
+/** Folder **/
+#page-mod-folder-view .foldertree {width: 90%;margin:0 auto;}
+
+/** Forum **/
+.forumpost {border-color:#DDDDDD;} /** header of reply posts and lower corners of all posts in */
+.forumpost .starter {background-color:#DDDDDD;} /** header of the first post in */
+.forumpost .topic {border-bottom-color: #EEEEEE;} /** line between header and post body in */
+.forumpost .topic .author {font-size: 0.8em;}
+.forumpost .topic .subject {font-weight: bold;}
+.forumpost .ratings {padding-top: 1em;}
+.forumpost .attachments {padding: 7px;}
+.forumpost .content {padding: 4px;background-color: #FFFFFF;}
+.forumpost .commands,
+.forumpost .footer,
+.forumpost .link {padding-top: 0.5em;font-size: 0.9em;}
+.forumpost .left {padding: 4px;text-align: center;background-color:#EEEEEE;}
+.forumpost .edited {font-style: italic;}
+.forumpost.unread {background: #9EBEFF;}
+#page-mod-forum-view .forummode,
+.path-mod-forum .forumheaderlist .replies {text-align: center;}
+.path-mod-forum .forumheaderlist .discussion .lastpost {font-size: 0.7em;}
+.path-mod-forum .forumnodiscuss {font-weight:bold;text-align:center;}
+#page-mod-forum-subscribers .subscriberdiv,
+#page-mod-forum-subscribers .subscribertable {background-color:#EEEEEE;border:1px solid #BBBBBB;}
+#page-mod-forum-subscribers .subscriberdiv,
+#page-mod-forum-subscribers .subscribertable tr td {padding:0.2em 0.3em;}
+#page-mod-forum-discuss .ratingsubmit {text-align:center;padding:10px;}
+#page-mod-forum-discuss .forumpost.unread .content {border:2px solid #0046C7;} /** inside border of unread posts in nested format in */
+#page-mod-forum-view .forumheaderlist .discussion .starter, /** Discussion column background in */
+#page-mod-forum-view .forumaddnew {margin-bottom: 20px;text-align:center;}
+#page-mod-forum-view .forumheaderlist td {border-color: #FFFFFF;} /** wire frame around cells in */
+#page-mod-forum-view .unread {padding: 0 3px;} /** unread column background on */
+#page-mod-forum-view .forumheaderlist  {border-color:#DDDDDD;} /** border around posts in */
+#email .unsubscribelink {border-width: 0px 1px 0px 0px;border-style: solid;text-align:center;}
+#page-mod-forum-view .highlight2 {color:#AA0000;}
+
+/** Glossary **/
+.path-mod-glossary .glossarypost {width: 95%;border:1px solid #DDD;}
+.path-mod-glossary .glossarypost .entry {padding: 3px;}
+.path-mod-glossary .glossarypost .concept h3 {font-size: 1em;margin: 0;font-weight: normal;text-align: left;}
+.path-mod-glossary .glossarypost .entryheader {font-weight: normal;text-align: left;}
+.path-mod-glossary .glossarypost .entryheader,
+.path-mod-glossary .glossarypost .entryapproval,
+.path-mod-glossary .glossarypost .picture,
+.path-mod-glossary .glossarypost .entryattachment,
+.path-mod-glossary .glossarypost .left {background-color: #F0F0F0;}
+.path-mod-glossary .glossarypost .entrylowersection {padding-top: 10px;}
+.path-mod-glossary .glossarypost .commands,
+.path-mod-glossary .glossarypost .author,
+.path-mod-glossary .glossarypost .time,
+.path-mod-glossary .glossarypost .entrylowersection .icons,
+.path-mod-glossary .glossarypost .entrylowersection .ratings,
+.path-mod-glossary .glossarypost .entrylowersection .aliases {font-size: 0.8em;}
+.path-mod-glossary .glossaryexplain,
+#page-mod-glossary-view .glossaryaddentry,
+#page-mod-glossary-import table.glossaryimportexport {text-align: center;}
+.path-mod-glossary .glossarydisplay {width: 90%;text-align:center;}
+.path-mod-glossary .entrybox {border-width: 0px 1px 1px 1px;border-style: solid;border-color: #BBB;}
+.path-mod-glossary .entrybox hr {border-left:none;border-right:none;}
+#page-mod-glossary-report table tr.teacher {background: #F0F0F0;}
+#page-mod-glossary-view table.glossarycategoryheader {width: 95%;background-color: #DDD;}
+#page-mod-glossary-view table.glossarycategoryheader h2 {font-size: 1em;margin: 0;}
+
+/** Lesson **/
+.path-mod-lesson .compacttable,
+.path-mod-lesson .standardtable,
+.path-mod-lesson .mform .box.contents {margin:1em auto;width:80%;}
+.path-mod-lesson .addlinks {font-size: 0.8em;margin:5px auto;}
+.path-mod-lesson .response {padding-top: 10px;}
+.path-mod-lesson .menu .content {padding: 0;}
+.path-mod-lesson .edit_pages_box {width:80%;margin-left:10%;}
+.path-mod-lesson .lessonbutton a {padding-left:1em;padding-right:1em;color: #000;text-decoration: none;border-top: 1px solid #cecece;border-bottom: 2px solid #4a4a4a;border-left: 1px solid #cecece;border-right: 2px solid #4a4a4a;}
+.path-mod-lesson .lessonbutton a:hover {border-bottom: 1px solid #cecece;border-top: 2px solid #4a4a4a;border-right: 1px solid #cecece;border-left: 2px solid #4a4a4a;}
+.path-mod-lesson .progress_bar {padding: 20px;}
+.path-mod-lesson .progress_bar_table {width: 80%;}
+.path-mod-lesson .progress_bar_completed {background-color: green;}
+.path-mod-lesson .progress_bar_todo {background-color: red;text-align: left;}
+.path-mod-lesson .progress_bar_token {background-color: #000000;}
+#page-mod-lesson-view .password-form {margin-top: 20px;}
+#page-mod-lesson-essay .graded {color:#DF041E;}
+#page-mod-lesson-essay .sent {color:#006600;}
+#page-mod-lesson-essay .ungraded {color:#999999;}
+#page-mod-lesson-essay .gradetable {margin-bottom: 20px;}
+.path-mod-lesson .branchbuttoncontainer.vertical .lessonbutton,
+.path-mod-lesson .centerpadded {padding:5px;}
+#page-mod-lesson-essay .buttons,
+.path-mod-lesson .center,
+.path-mod-lesson .firstpageoptions,
+.path-mod-lesson .clock .content,
+.path-mod-lesson .centerpadded,
+#page-mod-lesson-view .password-form,
+.path-mod-lesson .edit_pages_box .addlinks {text-align:center;}
+
+/** Page **/
+.path-mod-page .modified {font-size:0.6em;}
+
+/** Resource **/
+#page-mod-resource-view .resourcecontent {text-align:center;margin:20px;}
+#page-mod-resource-view .resourcecontent.resourcepdf {padding-top: 15px;text-align: center;}
+.path-mod-resource .modified {text-align:center;font-size:0.6em;}
+
+/** Scorm **/
+.path-mod-scorm .orgtitle {font-weight: bold;font-size: small;}
+#page-mod-scorm-player .toc {width: 80%;margin-left: 20%;}
+#page-mod-scorm-player .structlist  {font-size: small;}
+#page-mod-scorm-view .structurehead {text-align: center;}
+a#mod-scorm-log-toggle {font-size: 0.7em;font-weight: bold;}
+
+/** Survey **/
+.path-mod-survey .resultgraph {text-align:center;border-width:1px;border-style: solid;}
+.path-mod-survey .questiontext {font-size:1em;}
+.path-mod-survey .surveytable .rblock label {text-align: center;}
+#page-mod-survey-view .r0 {background-color: #EEEEEE;}
+#page-mod-survey-view .r1 {background-color: #DDDDDD;}
+#page-mod-survey-report .reportsummary,
+#page-mod-survey-report .studentreport,
+#page-mod-survey-report .reportbuttons,
+#page-mod-survey-report .centerpara {text-align:center;}
\ No newline at end of file
diff --git a/theme/standard/style/question.css b/theme/standard/style/question.css
new file mode 100644
index 00000000000..4a12aa82b99
--- /dev/null
+++ b/theme/standard/style/question.css
@@ -0,0 +1,31 @@
+/** Question **/
+
+.que {border-color: #DDD;}
+.que .correct {background-color: #afa;}
+.que .info h2 {font-size: 1.25em;font-weight: bold;}
+.que .grade {font-size: 0.8em;}
+.que .feedback {border-color: #DDD;}
+.que .history {font-size:75%;}
+.que .incorrect {background-color: #faa;}
+.que.multianswer .incorrect {background-color: #faa;}
+.que .partiallycorrect {background-color: #ff9;}
+.que .r0 {background-color: #F5F5F5;}
+.que .r1 {background-color: #EEE;}
+
+#chooseqtype .qtypename {font-weight: bold;}
+
+#qtypechoicecontainer #chooseqtype .qtypename {font-weight: normal;}
+#qtypechoicecontainer #chooseqtype .qtypes {border-bottom-color: gray;}
+#qtypechoicecontainer #chooseqtype .selected {background: #dddddd;}
+#qtypechoicecontainer #chooseqtype .instruction,
+#qtypechoicecontainer #chooseqtype .qtypesummary {border-left-color: gray;background-color: white;}
+
+
+.calculated .answer,
+.numerical .answer,
+.shortanswer .answer {background-color: #EEE;}
+
+.essay .answerreview {background-color: #EEE;}
+
+
+
diff --git a/user/view.php b/user/view.php
index 121d16c1eb8..d5e1f20ac7b 100644
--- a/user/view.php
+++ b/user/view.php
@@ -233,7 +233,7 @@ if (is_mnet_remote_user($user)) {
     }
 }
 
-echo '<table width="80%" class="userinfobox" summary="">';
+echo '<table class="userinfobox" summary="">';
 echo '<tr>';
 echo '<td class="side">';
 echo $OUTPUT->user_picture($user, array('courseid'=>$course->id, 'size'=>100));
diff --git a/version.php b/version.php
index 25f7647af18..c4fbe1c195d 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2010031900;  // YYYYMMDD   = date of the last version bump
+    $version = 2010032400;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20100325)';  // Human-friendly version name