diff --git a/theme/canvas/config.php b/theme/canvas/config.php
index 16ee1a38365a6..ed68086014f8f 100644
--- a/theme/canvas/config.php
+++ b/theme/canvas/config.php
@@ -88,7 +88,7 @@
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css
index 849d37185d6a9..0609f22b2d458 100644
--- a/theme/canvas/style/core.css
+++ b/theme/canvas/style/core.css
@@ -1,11 +1,23 @@
 .sitetopic { border: none; }
 .headingblock { border-bottom: 1px solid #ddd;font-size: 1.3em;color: #333; }
+
+.notifysuccess,
+.notifyproblem,
+.errorbox,
 .continuebutton,
 .singlebutton,
 .buttons,
 .singleselect { text-align: center;margin: 1em 0; }
 .generalbox { border-color:#ddd; }
 
+.buttons .singlebutton input { margin:0; }
+.initialbar { text-align:center; }
+
+.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main { padding-right:0; }
+.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main { padding-left:0; }
+/* Login
+------------------------*/
+
 .loginbox { margin: 15px 25%; }
 .loginbox .loginerrors { color: #f00; }
 .loginbox .loginform { margin: 15px auto 0;width: 175px; }
@@ -18,7 +30,66 @@
 .loginbox.twocolumns { width: 90%;margin-left: 5%; }
 .loginbox .guestsub { border-top: 1px solid #DDDDDD;margin: 5px 20% }
 .loginbox.twocolumns .loginpanel { border-color: #ddd;padding-right: 0.5%; }
-.loginbox.twocolumns .signuppanel { padding-left: 1%;width: 49%; }
+.loginbox.twocolumns .signuppanel { padding-left: 1%;width: 48%; }
+
+#page-login-forgot_password .generalbox { margin:0 auto 1.5em;width:75%;padding:10px; }
+
+#page-login-signup .mform { width:85%;margin:0 auto; }
+#page-login-signup .mform .fitem .fitemtitle { width:20%; }
+#page-login-signup .mform .fitem .felement { margin-left:21%; }
+
+/* Calendar 
+-----------------------*/
+.calendarlayout { width:100%; }
+.calendarlayout .sidecalendar { padding-left:15px; }
+.calendarlayout .sidecalendar .sideblock { width:210px; }
+.calendarlayout .sideblock .minicalendarblock h3 { text-align:center;font-size:1.2em; }
+
+.maincalendar .header .buttons { margin:0; }
+.maincalendar .calendarmonth td,
+.maincalendar .calendarmonth th { border-color: #ddd; border-style: dotted;border-width: 1px; } 
+.maincalendar .calendarmonth th,
+.calendarlayout .sidecalendar .minicalendar th { background:url([[pix:theme|gradient-sb]]) repeat-x 0 0; }
+
+.maincalendar .calendar-controls { padding:10px 5px 0; }
+.maincalendar .calendar-controls .previous,
+.maincalendar .calendar-controls .current,
+.maincalendar .calendar-controls .next { width:5%;float:left; }
+.maincalendar .calendar-controls .current { margin:0 auto;font-size:1.5em;text-align:center;line-height:1;font-weight:bold; }
+.maincalendar .calendar-controls .next { text-align:right; }
+.maincalendar .filters table td { font-size:0.9em; }
+.maincalendar .bottom { margin-top:25px; }
+
+.minicalendar th abbr { border:none; }
+.sidecalendar .filters td,
+.minicalendar td,
+.minicalendar th { padding:2px;font-size:0.85em; }
+
+#page-calendar-view .eventlist { padding-top:1em; }
+#page-calendar-view .eventlist .event { border:none; }
+#page-calendar-view .eventlist .event .topic { border-width:1px 1px 0;border-color:#ddd;border-style:solid;background:#f5f5f5; }
+#page-calendar-view .eventlist .event .topic .name { font-weight:bold; }
+#page-calendar-view .eventlist .event .description { border-width:0 1px 1px;border-style:solid;border-color:#ddd; }
+
+.calendartable .duration ul { border-width:2px 0;border-style:solid;}
+.calendartable .duration_user ul { border-color:#dce7ec; }
+.calendartable .duration_global ul { border-color:#d6f8cd; }
+.calendartable .duration_group ul { border-color:#fee7ae; }
+.calendartable .duration_course ul { border-color:#ffd3bd; }
+.calendartable .duration .events-underway { color:#666; }
+
+.minicalendar { border-collapse:separate;  }
+.minicalendar td,
+.minicalendar th { font-size:0.85em;padding:0 2px;border-width:2px 0;border-color:#fff;}
+
+.minicalendar .calendar_event_user,
+.minicalendar .duration_user { border-color:#dce7ec; }
+.minicalendar .calendar_event_course,
+.minicalendar .duration_course { border-color:#ffd3bd; }
+.minicalendar .calendar_event_global,
+.minicalendar .duration_global { border-color:#d6f8cd; }
+.minicalendar .calendar_event_group,
+.minicalendar .duration_group { border-color:#fee7ae; }
 
 /* User
 -----------------------*/
@@ -30,6 +101,7 @@
 #page-user-view .buttons div { padding: 0 0 10px; }
 
 #page-user-index .controls { width: 100%}
+#page-user-index .controls .singleselect {margin: 0;}
 #page-user-index .rolesform { text-align: center; margin: 1em 0; }
 #page-user-index #participantsform { text-align: center;}
 #page-user-index #longtimenosee { font-style: italic;font-size: 0.95em;}
@@ -37,10 +109,26 @@
 #page-user-index #participants th,
 #page-user-index #participants td { vertical-align: middle; }
 
+/* Tags 
+------------------------*/
+
+#big-tag-cloud-box { padding:10px; }
+#tag-management-box { text-align:center; }
+.tag-management-form { border:none;padding:0 0 1em; }
+#tag-management-list { margin:1em 0 }
+
+#page-tag-index .managelink { text-align:right; }
+#page-tag-index .headingblock { text-align:center;margin-bottom:0;}
+#page-tag-index #tag-management-box { border-bottom:1px solid #ddd;padding:4px 0; }
+#page-tag-index .relatedpages { text-align:center; }
+
+#page-tag-manage .lastinitial { margin-bottom:0.5em; }
+#page-tag-manage .green { text-align:center;padding:0 0 1em; }
+
 /* Embedded Pages
 ------------------------*/
 
-.pagelayout-embedded { text-align:center; }
+.pagelayout-embedded { text-align:center;background-color:#fff;background-image:none; }
 .pagelayout-embedded #content { padding-top:30px; }
 
 /* Forms 
diff --git a/theme/canvas/style/course.css b/theme/canvas/style/course.css
index 23627f4f78ad2..e10fad014f602 100644
--- a/theme/canvas/style/course.css
+++ b/theme/canvas/style/course.css
@@ -8,4 +8,30 @@
 .categorypicker { margin:15px 0 25px; }
 
 #page-course-category .rolelink { text-align:right; }
-#page-course-category .generalbox { margin:25px auto 30px;width:75%;padding:10px; }
\ No newline at end of file
+#page-course-category .generalbox { margin:25px auto 30px;width:75%;padding:10px; }
+
+.path-course-view .section .side { padding:5px 0; }
+.path-course-view .section .content { padding:5px 10px; }
+.path-course-view .section .content .section { margin:0; }
+.path-course-view .section .content .weekdates { font-size:1em;color:#777;font-weight:normal; }
+
+#page-course-report .plugin p,
+#page-course-report .logselectform { text-align:center; }
+#page-course-report .logselectform .select { margin:0 4px 10px; }
+
+#page-course-report-outline-index .loginfo { text-align:center;margin-bottom:1em; }
+
+#page-course-report-participation-index #participationreport { text-align:center; }
+#page-course-report-participation-index #participationreport .reporttable { margin:0 auto 1em; }
+#page-course-report-participation-index #participationreport .selectbuttons input { margin:10px 5px; }
+
+#page-course-report-log-live .info,
+#page-course-report-log-index .logselectform,
+#page-course-report-log-index .info,
+#page-course-report-log-index .paging { text-align:center; }
+#page-course-report-log-index .logselectform select,
+#page-course-report-log-index .logselectform input { margin:2px 4px; }
+#page-course-report-log-live .generaltable,
+#page-course-report-log-index .generaltable { margin:5px auto; }
+
+#page-course-loginas #notice {width: 50%;text-align: center;margin: 10px auto;}
\ No newline at end of file
diff --git a/theme/canvas/style/mods.css b/theme/canvas/style/mods.css
index 7cf462d23afbe..3a9f884f7e412 100644
--- a/theme/canvas/style/mods.css
+++ b/theme/canvas/style/mods.css
@@ -6,4 +6,94 @@
 .path-mod-forum .forumheaderlist { border-color:#ddd;border-collapse:collapse; }
 .path-mod-forum .forumheaderlist td { border-color:#ddd; }
 .path-mod-forum .forumheaderlist th { text-align:left;border-right:1px solid #ddd; }
-.path-mod-forum .forumheaderlist .replies { text-align:center; }
\ No newline at end of file
+.forumnodiscuss,
+.path-mod-forum .forumheaderlist .replies { text-align:center; }
+
+.forumpost { border:none; }
+.forumpost .content .commands,
+.forumpost .content .link { font-size:0.9em; }
+.forumpost .attachments { font-size:0.95em;margin:0.5em 0; }
+.forumpost .attachments .icon { height:14px;width:14px; }
+
+/* Database
+------------------------*/
+
+.path-mod-folder #pageintro { border-color:#ddd;width:75%;margin:0 auto; }
+.path-mod-folder .foldertree { width:60%;margin:1.5em auto;padding:10px; }
+
+/* Assignment
+------------------------*/
+
+.path-mod-assignment #dates { margin:1em auto;border:none; }
+.path-mod-assignment #dates table { margin:0 auto; }
+.path-mod-assignment #dates table td { border:1px solid #ddd; }
+.path-mod-assignment #userfiles { width:50%;margin:0 auto;padding:10px; }
+.path-mod-assignment .nofiles { text-align:center;color:#f00; }
+.path-mod-assignment #notice { padding:10px 10px 0;width:50%;margin:0 auto; }
+.path-mod-assignment #notice .buttons { margin:0; }
+
+#page-mod-assignment-view .uploadbox .mform { margin:1em 22%; }
+#page-mod-assignment-view .uploadbox .mform .ffile { margin-left:27%;width:100%; }
+#page-mod-assignment-view .uploadbox .mform .fitemtitle { width:24%; }
+
+#page-mod-assignment-view .mform .fsubmit { text-align:center; }
+#page-mod-assignment-view h3.main { padding-top: 1em; }
+#page-mod-assignment-view #online { padding:10px;width:90%; }
+#page-mod-assignment-view #onlineenter .mform { margin:0; }
+#page-mod-assignment-view #onlineenter .fgroup { text-align:center;width:90%; }
+
+#page-mod-assignment-submissions .firstinitial { margin-top:1em; }
+#page-mod-assignment-submissions .lastinitial { margin-bottom:0.5em; }
+#page-mod-assignment-submissions #attempts { font-size:0.95em; }
+#page-mod-assignment-submissions #attempts td { vertical-align:middle; }
+#page-mod-assignment-submissions #attempts .status .s0 { background:#ffc; }
+
+#page-mod-assignment-submissions #optiontable .iconhelp { margin-left:3px; }
+#page-mod-assignment-submissions #optiontable #perpage { width:50px; }
+#page-mod-assignment-submissions .feedback .finalgrade { margin:5px 0; }
+#page-mod-assignment-submissions .feedback #edit-submissioncomment_tbl { margin-bottom:5px; }
+#page-mod-assignment-submissions .feedback .buttons input { margin:0 5px 10px; }
+#page-mod-assignment-submissions .feedback .mform { width:75%;margin:10px auto; }
+#page-mod-assignment-submissions .feedback .mform .fitemtitle { width:27%; }
+#page-mod-assignment-submissions .feedback .mform .ffile { margin-left:29%; }
+#page-mod-assignment-submissions .feedback .mform .fsubmit { text-align:center; }
+#page-mod-assignment-submissions .feedback .user,
+#page-mod-assignment-submissions .feedback .topic { border-top:1px solid #ddd; }
+#page-mod-assignment-submissions .feedback .topic .time { font-size:0.9em;font-style:italic;color:#555; }
+#page-mod-assignment-submissions .feedback .topic .singlebutton { margin-top:5px; }
+
+/* Chat
+------------------------*/
+
+#page-mod-chat-view #enterlink { text-align:center;border:none; }
+#page-mod-chat-view #chatcurrentusers { margin:10px auto; }
+
+.path-mod-chat.pagelayout-embedded #content { padding:5px; }
+.path-mod-chat .generaltable,
+.path-mod-chat .generaltable td,
+.path-mod-chat .generaltable th { border:none !important; }
+
+.chat-message .text .title { font-style:italic;color:#444; }
+
+#mod-chat-gui_basic #participants ul { margin:0 0 1em; }
+#mod-chat-gui_basic #participants ul li { list-style:none;padding:5px 0;line-height:1.75; }
+#mod-chat-gui_basic #participants ul li a { float:left;padding-right:10px; }
+#mod-chat-gui_basic #editing { margin-bottom:15px; }
+#mod-chat-gui_basic #editing input { margin:5px 5px 0; }
+#mod-chat-gui_basic #messages dl { margin:0 0 5px 1em; }
+#mod-chat-gui_basic #messages dt { font-weight:normal; }
+
+#page-mod-chat-report .generalbox { padding:10px;width:50%;margin:0 auto 1em; }
+#page-mod-chat-report .generalbox p { margin:0; }
+#page-mod-chat-report #notice { margin-bottom:1em; }
+
+/* Choice
+-------------------------*/
+
+.path-mod-choice #notice { width:50%;margin:1em auto;padding:5px; }
+.path-mod-choice .header { border-top:1px solid;border-color:#ddd; }
+.path-mod-choice .count,
+.path-mod-choice .header,
+.path-mod-choice .data { border-right:1px solid #ddd; }
+.path-mod-choice .col1 { border-left:1px solid #ddd; }
+.path-mod-choice .count { border-top:2px solid #ddd; background:#f5f5f5;border-bottom:1px solid #ddd;}
\ No newline at end of file
diff --git a/theme/canvas/style/tables.css b/theme/canvas/style/tables.css
index da386796a593c..8b9636a9b92bb 100644
--- a/theme/canvas/style/tables.css
+++ b/theme/canvas/style/tables.css
@@ -1,10 +1,14 @@
 .generaltable th.header,
 .generaltable td.cell,
+#attempts th.header,
+#attempts td.cell,
 .plugincompattable th,
 .plugincompattable td,
 .environmenttable th,
 .environmenttable td { border:1px solid #ddd;border-collapse:collapse; }
 
+.results .header,
+#attempts th.header,
 .generaltable th.header,
 .plugincompattable th,
 .environmenttable th { background:#f3f3f3;border-bottom-width:2px; }
diff --git a/theme/canvas/style/text.css b/theme/canvas/style/text.css
index 944e15207b4ad..46614cb67893e 100644
--- a/theme/canvas/style/text.css
+++ b/theme/canvas/style/text.css
@@ -7,7 +7,7 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: Helvetica, Arial
 
 h1,h2,h3,h4,h5,h6 { font-weight: bold;margin:0; }
 
-h2.main,h3.main,h4.main { text-align: center;padding:0 0 1em;margin:0; }
+h2.main,h3.main,h4.main { text-align: center;padding:0.5em 0 1em;margin:0; }
 
 h1 { font-size: 2.25em; line-height: 1; margin-bottom: 0.5em; }
 h2 { font-size: 1.5em; margin-bottom: 0.5em; }
diff --git a/theme/formfactor/config.php b/theme/formfactor/config.php
index 6bcff4d2d89f0..31177a95e6bd3 100644
--- a/theme/formfactor/config.php
+++ b/theme/formfactor/config.php
@@ -21,7 +21,7 @@
 ////////////////////////////////////////////////////
 
 
-$THEME->sheets = array('core', 'course', 'mods', 'blocks', 'selected');
+$THEME->sheets = array('selected', 'core', 'course', 'mods', 'blocks');
 
 ////////////////////////////////////////////////////
 // Name of the stylesheet(s) you've including in 
@@ -98,7 +98,7 @@
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
diff --git a/theme/formfactor/layout/frontpage.php b/theme/formfactor/layout/frontpage.php
index b8002fb2b7e1e..9eb3694665353 100644
--- a/theme/formfactor/layout/frontpage.php
+++ b/theme/formfactor/layout/frontpage.php
@@ -40,10 +40,10 @@
 	    </div>
     </div>
     
-    <ul id="page-navigation" class="clearfix">
-    	<li id="first"><a href="<?php echo $CFG->wwwroot; ?>" title="Home">Home</a></li>
-    	<li><a href="<?php echo $CFG->wwwroot; ?>/course/index.php" title="Courses">Courses</a></li>
-    </ul>
+	    <ul id="page-navigation" class="clearfix">
+    		<li id="first"><a href="<?php echo $CFG->wwwroot; ?>" title="Home">Home</a></li>
+    		<li><a href="<?php echo $CFG->wwwroot; ?>" title="Courses">Courses</a></li>
+	    </ul>
     
 <!-- END OF HEADER -->
 
diff --git a/theme/formfactor/layout/general.php b/theme/formfactor/layout/general.php
index 06318ee1ea13e..a2283f0c247d2 100644
--- a/theme/formfactor/layout/general.php
+++ b/theme/formfactor/layout/general.php
@@ -48,10 +48,12 @@
 	    </div>
     </div>
 
-    <ul id="page-navigation" class="clearfix">
-    	<li id="first"><a href="<?php echo $CFG->wwwroot; ?>" title="Home">Home</a></li>
-    	<li><a href="<?php echo $CFG->wwwroot; ?>" title="Courses">Courses</a></li>
-    </ul>
+    <?php if ($hasheading) { ?>	
+	    <ul id="page-navigation" class="clearfix">
+    		<li id="first"><a href="<?php echo $CFG->wwwroot; ?>" title="Home">Home</a></li>
+    		<li><a href="<?php echo $CFG->wwwroot; ?>" title="Courses">Courses</a></li>
+	    </ul>
+	<?php } ?>
     
     <?php if ($hasnavbar) { ?>
 	    <div class="navbar clearfix">
diff --git a/theme/formfactor/style/course.css b/theme/formfactor/style/course.css
index e69de29bb2d1d..d8879673f6de5 100644
--- a/theme/formfactor/style/course.css
+++ b/theme/formfactor/style/course.css
@@ -0,0 +1 @@
+.path-course-view .course-content .section.main { background: #f5f5f5;border: 1px solid #ddd }
\ No newline at end of file
diff --git a/theme/formfactor/style/mods.css b/theme/formfactor/style/mods.css
index 379b4e77295f4..c7ecd10bd8269 100644
--- a/theme/formfactor/style/mods.css
+++ b/theme/formfactor/style/mods.css
@@ -1,4 +1,5 @@
-#intro { background:#f7f7f7; }
+#intro,
+#pageintro { background:#f7f7f7; }
 
 /* Forum
 ---------------------------*/
@@ -6,10 +7,12 @@
 .path-mod-forum .forumheaderlist th {background: url([[pix:theme|gradient-sb]]) repeat-x 0 0}
 .path-mod-forum .forumheaderlist .r1 td { background:#f5f5f5; }
 
-.forumpost { border:none; }
 .forumpost .topic { background:#eee;border-color:#aaa;border-width:0 0 2px 0;padding-left:7px; }
 .forumpost .topic .subject { font-size:1.25em; }
 .forumpost .topic .author { font-style:italic;color:#444;font-size:0.95em; }
 .forumpost .content { border-bottom:5px solid #aaa;padding:5px 7px 10px 7px; }
-.forumpost .content .commands,
-.forumpost .content .link { font-size:0.9em; }
+
+/* Assignments 
+--------------------------*/
+
+.path-mod-assignment #dates table .c0 { background:#f5f5f5; }
\ No newline at end of file
diff --git a/theme/formfactor/style/selected.css b/theme/formfactor/style/selected.css
index d1aee4567730d..39fc73556e104 100644
--- a/theme/formfactor/style/selected.css
+++ b/theme/formfactor/style/selected.css
@@ -6,10 +6,15 @@ a:active { 	color:#3f5c10; }
 
 #page-header  { background:#333 url([[pix:theme|header]]) 0 0;color:#fff; }
 
-#page-navigation { background:#bf3503; }
+
+.path-course-view .course-content .section.main.current,
+#page-navigation { background:#bf3503 }
 
 #page-navigation a:link,
-#page-navigation a:visited { color:#fff; }
+#page-navigation a:visited,
+.path-course-view .course-content .current .left  { color:#fff; }
 
 #page-navigation a:hover,
 #page-navigation  a:active { background:#922803; }
+
+.path-course-view .section .content { background: #fff; }
\ No newline at end of file