diff --git a/theme/formfactor/config.php b/theme/formfactor/config.php
index 2b026d0..01e7e56 100644
--- a/theme/formfactor/config.php
+++ b/theme/formfactor/config.php
@@ -58,7 +58,7 @@ $THEME->sheets = array('selected', 'core', 'course', 'mods', 'blocks');
 ////////////////////////////////////////////////////
 
 
-$THEME->enable_dock = false;
+$THEME->enable_dock = true;
 
 ////////////////////////////////////////////////////
 // Do you want to use the new navigation dock?
diff --git a/theme/formfactor/layout/frontpage.php b/theme/formfactor/layout/frontpage.php
index b416319..4dbe147 100644
--- a/theme/formfactor/layout/frontpage.php
+++ b/theme/formfactor/layout/frontpage.php
@@ -69,7 +69,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>
@@ -77,7 +77,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/formfactor/layout/general.php b/theme/formfactor/layout/general.php
index 57c57ba..9cc45da 100644
--- a/theme/formfactor/layout/general.php
+++ b/theme/formfactor/layout/general.php
@@ -85,7 +85,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>
@@ -93,7 +93,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/formfactor/style/core.css b/theme/formfactor/style/core.css
index 69128eb..e104e51 100644
--- a/theme/formfactor/style/core.css
+++ b/theme/formfactor/style/core.css
@@ -89,4 +89,40 @@ div.yui3-menu-content .yui3-menu-content .yui3-menu-content {
 div.yui3-menu-content .yui3-menu-content .yui3-menuitem-content, div.yui3-menu-content .yui3-menu-content .yui3-menu-label{
 	padding-top: 5px !important;
 	
+}
+
+/* Dock
+---------------------------*/
+#dock {
+    border-right: 1px solid #ccc;
+}
+#dock .dockedtitle {
+    border-color: #ccc;
+}
+
+#dock .dockeditempanel_content {
+    background: #fff url([[pix:theme|gradient-sb]]) repeat-x 0 0;
+    border-width: 1px;
+    border-color: #ccc;
+    border-style: solid;
+}
+
+#dock .dockeditempanel_content .dockeditempanel_hd {
+    border: none;
+}
+
+#dock .dockeditempanel_hd {
+    text-align: left;
+}
+#dock .dockeditempanel_hd h2 {
+    color: #333;
+    font-size: 1.2em;
+    padding-left: 1em;
+    padding-right: 0;
+}
+#dockeditempanel .dockeditempanel_hd .commands {
+    display: inline;
+    float: right;
+    margin: 0 14px;
+    vertical-align: top;
 }
\ No newline at end of file