diff --git a/theme/canvas/config.php b/theme/canvas/config.php
index 925a72b0701..d5d7d470d54 100644
--- a/theme/canvas/config.php
+++ b/theme/canvas/config.php
@@ -194,16 +194,13 @@ $THEME->hidefromselector = true;
 // switched on.
 /////////////////////////////////////////////////////
 
-
-
-// $THEME->enable_dock = false;
+$THEME->enable_dock = true;
 
 ////////////////////////////////////////////////////
 // Do you want to use the new navigation dock?
 ////////////////////////////////////////////////////
 
-
-// $THEME->editor_sheets
+$THEME->editor_sheets = array('editor');
 
 ////////////////////////////////////////////////////
 // An array of stylesheets to include within the
@@ -264,6 +261,4 @@ $THEME->hidefromselector = true;
 ////////////////////////////////////////////////////
 // Sets a custom render factory to use with the
 // theme, used when working with custom renderers.
-////////////////////////////////////////////////////
-
-$THEME->editor_sheets = array('editor');
\ No newline at end of file
+////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/theme/canvas/layout/frontpage.php b/theme/canvas/layout/frontpage.php
index a8b573d1f0a..3c3b0f66d9c 100644
--- a/theme/canvas/layout/frontpage.php
+++ b/theme/canvas/layout/frontpage.php
@@ -1,19 +1,24 @@
 <?php
 
-$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);
+$showsidepre = $hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT);
+$showsidepost = $hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT);
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
 $bodyclasses = array();
-if ($hassidepre && !$hassidepost) {
+if ($showsidepre && !$showsidepost) {
     $bodyclasses[] = 'side-pre-only';
-} else if ($hassidepost && !$hassidepre) {
+} else if ($showsidepost && !$showsidepre) {
     $bodyclasses[] = 'side-post-only';
-} else if (!$hassidepost && !$hassidepre) {
+} else if (!$showsidepost && !$showsidepre) {
     $bodyclasses[] = 'content-only';
 }
+if ($hascustommenu) {
+    $bodyclasses[] = 'has_custom_menu';
+}
 
 echo $OUTPUT->doctype() ?>
 <html <?php echo $OUTPUT->htmlattributes() ?>>
@@ -30,20 +35,24 @@ echo $OUTPUT->doctype() ?>
 
 <!-- START OF HEADER -->
 
-	<div id="wrapper" class="clearfix">
+    <div id="wrapper" class="clearfix">
 
-    	<div id="page-header">
-			<div id="page-header-wrapper" class="clearfix">
-	        	<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
-	    	    <div class="headermenu">
-    	    		<?php
-	    	    	    echo $OUTPUT->login_info();
-    	    	    	echo $OUTPUT->lang_menu();
-	        		    echo $PAGE->headingmenu;
-			        ?>
-		    	</div>
-	    	</div>
-	    </div>
+        <div id="page-header">
+            <div id="page-header-wrapper" class="clearfix">
+                <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+                <div class="headermenu">
+                    <?php
+                        echo $OUTPUT->login_info();
+                        echo $OUTPUT->lang_menu();
+                        echo $PAGE->headingmenu;
+                    ?>
+                </div>
+            </div>
+        </div>
+
+        <?php if ($hascustommenu) { ?>
+            <div id="custommenu"><?php echo $custommenu; ?></div>
+        <?php } ?>
 
         <div class="clearer"></div> <!-- temporarily added on 06/25/10 -->
 
@@ -51,57 +60,57 @@ echo $OUTPUT->doctype() ?>
 
 <!-- START OF CONTENT -->
 
-		<div id="page-content-wrapper" class="clearfix">
-    		<div id="page-content">
-	    	    <div id="region-main-box">
-    	    	    <div id="region-post-box">
+        <div id="page-content-wrapper" class="clearfix">
+            <div id="page-content">
+                <div id="region-main-box">
+                    <div id="region-post-box">
 
-        	    	    <div id="region-main-wrap">
-            	    	    <div id="region-main">
-                	    	    <div class="region-content">
-                    	    	    <?php echo $OUTPUT->main_content() ?>
-	                        	</div>
-		                    </div>
-    		            </div>
+                        <div id="region-main-wrap">
+                            <div id="region-main">
+                                <div class="region-content">
+                                    <?php echo $OUTPUT->main_content() ?>
+                                </div>
+                            </div>
+                        </div>
 
-        		        <?php if ($hassidepre) { ?>
-            		    <div id="region-pre">
-                		    <div class="region-content">
-                    		    <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
-		                    </div>
-    		            </div>
-        		        <?php } ?>
+                        <?php if ($hassidepre) { ?>
+                        <div id="region-pre" class="block-region">
+                            <div class="region-content">
+                                <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+                            </div>
+                        </div>
+                        <?php } ?>
 
-	        	        <?php if ($hassidepost) { ?>
-    	        	    <div id="region-post">
-        	        	    <div class="region-content">
-            	        	    <?php echo $OUTPUT->blocks_for_region('side-post') ?>
-	                	    </div>
-		                </div>
-    		            <?php } ?>
+                        <?php if ($hassidepost) { ?>
+                        <div id="region-post" class="block-region">
+                            <div class="region-content">
+                                <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+                            </div>
+                        </div>
+                        <?php } ?>
 
-	        	    </div>
-	    	    </div>
-		    </div>
-		</div>
+                    </div>
+                </div>
+            </div>
+        </div>
 
 <!-- END OF CONTENT -->
 
 <!-- START OF FOOTER -->
 
-	    <div id="page-footer">
-    	    <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
+        <div id="page-footer">
+            <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
 
-	        <?php
-		        echo $OUTPUT->login_info();
-    		    echo $OUTPUT->home_link();
-        		echo $OUTPUT->standard_footer_html();
-	        ?>
-    	</div>
+            <?php
+                echo $OUTPUT->login_info();
+                echo $OUTPUT->home_link();
+                echo $OUTPUT->standard_footer_html();
+            ?>
+        </div>
 
 <!-- END OF FOOTER -->
 
-	</div> <!-- END #wrapper -->
+    </div> <!-- END #wrapper -->
 
 </div><!-- END #page -->
 
diff --git a/theme/canvas/layout/general.php b/theme/canvas/layout/general.php
index cda6005acd4..09261f02e69 100644
--- a/theme/canvas/layout/general.php
+++ b/theme/canvas/layout/general.php
@@ -3,17 +3,27 @@
 $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);
+$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
+$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
+$haslogininfo = (empty($PAGE->layout_options['nologininfo']));
+
+$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
+$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
 $bodyclasses = array();
-if ($hassidepre && !$hassidepost) {
+if ($showsidepre && !$showsidepost) {
     $bodyclasses[] = 'side-pre-only';
-} else if ($hassidepost && !$hassidepre) {
+} else if ($showsidepost && !$showsidepre) {
     $bodyclasses[] = 'side-post-only';
-} else if (!$hassidepost && !$hassidepre) {
+} else if (!$showsidepost && !$showsidepre) {
     $bodyclasses[] = 'content-only';
 }
+if ($hascustommenu) {
+    $bodyclasses[] = 'has_custom_menu';
+}
 
 echo $OUTPUT->doctype() ?>
 <html <?php echo $OUTPUT->htmlattributes() ?>>
@@ -49,6 +59,10 @@ echo $OUTPUT->doctype() ?>
             </div>
         </div>
 
+        <?php if ($hascustommenu) { ?>
+            <div id="custommenu"><?php echo $custommenu; ?></div>
+        <?php } ?>
+
         <?php if ($hasnavbar) { ?>
             <div class="navbar clearfix">
                 <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
@@ -76,7 +90,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
 
                         <?php if ($hassidepre) { ?>
-                        <div id="region-pre">
+                        <div id="region-pre" class="block-region">
                             <div class="region-content">
                                 <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
                             </div>
@@ -84,7 +98,7 @@ echo $OUTPUT->doctype() ?>
                         <?php } ?>
 
                         <?php if ($hassidepost) { ?>
-                        <div id="region-post">
+                        <div id="region-post" class="block-region">
                             <div class="region-content">
                                 <?php echo $OUTPUT->blocks_for_region('side-post') ?>
                             </div>
diff --git a/theme/canvas/layout/report.php b/theme/canvas/layout/report.php
index fce6e89e427..9141174123d 100644
--- a/theme/canvas/layout/report.php
+++ b/theme/canvas/layout/report.php
@@ -3,17 +3,23 @@
 $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);
+$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
+$haslogininfo = (empty($PAGE->layout_options['nologininfo']));
+
+$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
 $bodyclasses = array();
-if ($hassidepre && !$hassidepost) {
+if ($showsidepre ) {
     $bodyclasses[] = 'side-pre-only';
-} else if ($hassidepost && !$hassidepre) {
-    $bodyclasses[] = 'side-post-only';
-} else if (!$hassidepost && !$hassidepre) {
+} else {
     $bodyclasses[] = 'content-only';
 }
+if ($hascustommenu) {
+    $bodyclasses[] = 'has_custom_menu';
+}
 
 echo $OUTPUT->doctype() ?>
 <html <?php echo $OUTPUT->htmlattributes() ?>>
@@ -49,6 +55,10 @@ echo $OUTPUT->doctype() ?>
             </div>
         </div>
 
+        <?php if ($hascustommenu) { ?>
+            <div id="custommenu"><?php echo $custommenu; ?></div>
+        <?php } ?>
+
         <?php if ($hasnavbar) { ?>
             <div class="navbar clearfix">
                 <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>