diff --git a/theme/canvas/style/admin.css b/theme/canvas/style/admin.css
index faf88b8c62cac..ce8b6fc031b94 100644
--- a/theme/canvas/style/admin.css
+++ b/theme/canvas/style/admin.css
@@ -1,23 +1,105 @@
-#page-admin-index #notice { text-align:center;width:50%;margin:15px auto;padding:10px 10px; }
-#page-admin-index #notice strong { background:#ffc; }
-#page-admin-index .notifysuccess { text-align:center;font-weight:bold;padding:10px; }
-#page-admin-index h2.main { padding:1em 0; }
+#page-admin-index #notice {
+	text-align: center;
+	width: 50%;
+	margin: 15px auto;
+	padding: 10px 10px;
+}
 
-#page-admin-index .adminwarning { border:1px solid #a35f1d;background:#ffeeba;padding:10px;margin:10px auto;width:75%; }
-#page-admin-index .copyright { text-align:center;margin:20px auto; }
+#page-admin-index #notice strong {
+	background: #ffc;
+}
 
-#adminsettings .form-buttons { width:100%;text-align:center;margin:10px 0; }
+#page-admin-index .notifysuccess {
+	text-align: center;
+	font-weight: bold;
+	padding: 10px;
+}
+
+#page-admin-index h2.main {
+	padding: 1em 0;
+}
+
+#page-admin-index .adminwarning {
+	border: 1px solid #a35f1d;
+	background: #ffeeba;
+	padding: 10px;
+	margin: 10px auto;
+	width: 75%;
+}
+
+#page-admin-index .copyright {
+	text-align: center;
+	margin: 20px auto;
+}
+
+#adminsettings .form-buttons {
+	width: 100%;
+	text-align: center;
+	margin: 10px 0;
+}
 
 #authmenu .generalbox {
 	border: none;
 }
 
 #page-admin-cohort-index .generaltable,
-#page-admin-user .generaltable {width:100%; }
+#page-admin-user .generaltable {
+	width: 100%;
+}
+
+#page-admin-roles-manage .generaltable {
+	width: 95%;
+	margin: 1em auto;
+}
+
+#page-admin-roles-allow .generalbox {
+	margin: 0 auto 1em;
+	width: 65%;
+	padding: 10px;
+}
+
+.editcourse .singleselect {
+	margin: 0;
+}
+
+#page-admin-course-category .generalbox {
+	margin-bottom: 0;
+}
 
-#page-admin-roles-manage .generaltable {width: 95%;margin: 1em auto;}
-#page-admin-roles-allow .generalbox {margin:0 auto 1em;width:65%;padding: 10px;}
+/* Themes
+----------------------------*/
 
-.editcourse .singleselect {margin: 0;}
+#page-admin-theme-index .generalbox {
+	border: none;
+}
+
+.theme_screenshot {
+	float: left;
+	width: 300px;
+}
+
+.theme_screenshot img {
+	width: 275px;
+}
+
+.theme_screenshot h2 {
+	font-size: 2em;
+}
+
+.theme_screenshot h3 {
+	font-size: 0.9em;
+	margin: 1em 0 0;
+}
+
+.theme_screenshot p {
+	font-size: 0.9em;
+	margin: 0 0 1em;
+}
+
+.theme_description {
+	margin-left: 300px;
+}
 
-#page-admin-course-category .generalbox {margin-bottom:0;}
\ No newline at end of file
+.theme_description h2 {
+	padding-top: 0.5em;
+}
\ No newline at end of file
diff --git a/theme/canvas/style/blocks.css b/theme/canvas/style/blocks.css
index a3566c711530c..0a8453744f49d 100644
--- a/theme/canvas/style/blocks.css
+++ b/theme/canvas/style/blocks.css
@@ -1,22 +1,73 @@
-.block {padding: 0}
-.block .footer {margin-top: 10px;margin-bottom: 0;text-align: center;}
+.block {
+	padding: 0
+}
 
-.block_action .reloadnavigation { margin-right: 3px; }
+.block .footer {
+	margin-top: 10px;
+	margin-bottom: 0;
+	text-align: center;
+}
 
-.block_news_items .newlink {text-align: center;margin-bottom: 5px;}
-.block_news_items .post .head { font-style: italic;font-size: 0.9em;margin-top: 10px;}
-.block_news_items .post .date {float: right;text-align: right;}
-.block_news_items .post .name {float: left;color: #555;}
+.block_action .reloadnavigation {
+	margin-right: 3px;
+}
 
-.block_calendar_upcoming .event { font-weight: bold;}
-.block_calendar_upcoming .date {font-weight: normal;font-size: 0.85em;font-style: italic;margin-left: 20px;}
+.block_news_items .newlink {
+	text-align: center;
+	margin-bottom: 5px;
+}
 
-.block_recent_activity .activitydate {font-size: 0.9em;color: #444;margin-bottom: 5px;}
-.block_recent_activity .activityhead {font-size: 0.95em;margin: 0.5em 0;}
+.block_news_items .post .head {
+	font-style: italic;
+	font-size: 0.9em;
+	margin-top: 10px;
+}
 
-.block_loancalc table td {padding: 0;}
+.block_news_items .post .date {
+	float: right;
+	text-align: right;
+}
+
+.block_news_items .post .name {
+	float: left;
+	color: #555;
+}
+
+.block_calendar_upcoming .event {
+	font-weight: bold;
+}
+
+.block_calendar_upcoming .date {
+	font-weight: normal;
+	font-size: 0.85em;
+	font-style: italic;
+	margin-left: 20px;
+}
+
+.block_recent_activity .activitydate {
+	font-size: 0.9em;
+	color: #444;
+	margin-bottom: 5px;
+}
+
+.block_recent_activity .activityhead {
+	font-size: 0.95em;
+	margin: 0.5em 0;
+}
+
+.block_loancalc table td {
+	padding: 0;
+}
 
 .block_messages .info,
-.block_online_users .info {text-align: center;font-size: 0.85em;color: #444;margin-bottom: 7px;}
+.block_online_users .info {
+	text-align: center;
+	font-size: 0.85em;
+	color: #444;
+	margin-bottom: 7px;
+}
 
-.block_blog_menu .list li {font-size: 0.9em;margin: 0.25em 0;}
\ No newline at end of file
+.block_blog_menu .list li {
+	font-size: 0.9em;
+	margin: 0.25em 0;
+}
\ No newline at end of file
diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css
index a3b73e2aa7cd0..3fe04512f3a32 100644
--- a/theme/canvas/style/core.css
+++ b/theme/canvas/style/core.css
@@ -1,3 +1,13 @@
+html {
+	height: 100%;
+}
+
+body {
+	min-height: 100%;
+	margin: 0;
+	padding: 0;
+}
+
 .sitetopic {
 	border: none;
 }
@@ -21,6 +31,10 @@
 	margin: 1em 0;
 }
 
+.navbutton .singlebutton {
+	margin: 0;
+}
+
 .generalbox {
 	border-color: #ddd;
 }
@@ -311,28 +325,28 @@
 }
 
 .path-user .descriptionbox {
-    margin-left: 110px;
+	margin-left: 110px;
 	border: 1px solid #ddd;
 	padding: 10px;
 }
 
 .path-user .description {
-    padding-bottom: 15px;
-    border-bottom: 1px solid #eee;
+	padding-bottom: 15px;
+	border-bottom: 1px solid #eee;
 }
 
 .userprofile .list {
-    margin-top: 10px;
+	margin-top: 10px;
 }
 
 .userprofile .list td {
-    padding-top: 3px;
-    padding-bottom: 3px;
+	padding-top: 3px;
+	padding-bottom: 3px;
 }
 
 .userprofile .list .c0 {
-    padding-left: 0;
-    font-weight: bold;
+	padding-left: 0;
+	font-weight: bold;
 }
 
 #page-user-view .buttons {
@@ -385,14 +399,13 @@
 }
 
 .path-admin-roles .generaltable th {
-  vertical-align: middle;
+	vertical-align: middle;
 }
 
 .path-admin-roles .generaltable .lastcol {
-  width:15%;
+	width: 15%;
 }
 
-
 .path-admin-roles .backlink {
 	text-align: center;
 }
@@ -403,7 +416,7 @@
 .blog_entry .audience {
 	color: #444;
 	margin: 0 0 0.5em;
-    font-size: 0.9em;
+	font-size: 0.9em;
 }
 
 .blog_entry .tags {
@@ -440,7 +453,7 @@
 }
 
 #tag-user-table {
-	width:95%;
+	width: 95%;
 	margin: 0 auto;
 }
 
@@ -506,6 +519,15 @@
 /* Footer
 -----------------------*/
 
+#page-footer .logininfo {
+	padding: 1em 0;
+}
+
+#page-footer .homelink,
+#page-footer .sitelink {
+	padding: 1em 0;
+}
+
 .homelink a {
 	text-decoration: none;
 	border-top: 1px solid #cecece;
@@ -520,4 +542,4 @@
 	border-top: 2px solid #8a8a8a;
 	border-right: 1px solid #cecece;
 	border-left: 2px solid #8a8a8a;
-}
+}
\ No newline at end of file
diff --git a/theme/canvas/style/course.css b/theme/canvas/style/course.css
index c1c63f637a66d..0718543287201 100644
--- a/theme/canvas/style/course.css
+++ b/theme/canvas/style/course.css
@@ -1,40 +1,120 @@
-.coursebox { border-color:#ddd;border-width:0 0 1px;border-style:solid; }
-.coursebox .name { font-size:1.1em; }
-.coursebox .teachers { margin:0 0 0 0.75em; }
+.coursebox {
+	border-color: #ddd;
+	border-width: 0 0 1px;
+	border-style: solid;
+}
 
-.categorybox { border:none; }
-.categorybox .categorylist td { padding:2px; }
+.coursebox .name {
+	font-size: 1.1em;
+}
 
-.categorypicker { margin:15px 0 25px; }
+.coursebox .teachers {
+	margin: 0 0 0 0.75em;
+}
 
-#page-course-category .rolelink { text-align:right; }
-#page-course-category .generalbox { margin:25px auto 30px;width:75%;padding:10px; }
+.categorybox {
+	border: none;
+}
 
-.path-course-view .section .side { padding:5px 0; }
-.path-course-view .section .content { padding:10px; }
-.path-course-view .section .content .section { margin:0; }
-.path-course-view .section .content .weekdates { font-size:1em;color:#777;font-weight:normal; }
-.path-course-view .section_add_menus {margin-top: 1em;}
+.categorybox .categorylist td {
+	padding: 2px;
+}
+
+.categorypicker {
+	margin: 15px 0 25px;
+}
+
+.course_category_tree .controls {
+	color: #888;
+	font-size: 0.9em;
+	margin-top: 10px;
+}
+
+.course_category_tree .controls div {
+	margin: 0 5px 0 0;
+}
+
+#page-course-category .rolelink {
+	text-align: right;
+}
+
+#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: 10px;
+}
+
+.path-course-view .section .content .section {
+	margin: 0;
+}
+
+.path-course-view .section .content .weekdates {
+	font-size: 1em;
+	color: #777;
+	font-weight: normal;
+}
+
+.path-course-view .section_add_menus {
+	margin-top: 1em;
+}
 
 #page-course-report .plugin p,
-#page-course-report .logselectform { text-align:center; }
-#page-course-report .logselectform .select { margin:0 4px 10px; }
+#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-outline-index .loginfo { text-align:center;margin-bottom:1em; }
+#page-course-report-participation-index #participationreport {
+	text-align: center;
+}
 
-#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-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 .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-index .logselectform input {
+	margin: 2px 4px;
+}
+
 #page-course-report-log-live .generaltable,
-#page-course-report-log-index .generaltable { margin:5px auto; }
+#page-course-report-log-index .generaltable {
+	margin: 5px auto;
+}
 
-#page-course-loginas #notice {width: 50%;text-align: center;margin: 10px auto;}
+#page-course-loginas #notice {
+	width: 50%;
+	text-align: center;
+	margin: 10px auto;
+}
 
-#page-course-reset .generalbox {margin-bottom: 1em;}
\ No newline at end of file
+#page-course-reset .generalbox {
+	margin-bottom: 1em;
+}
\ No newline at end of file
diff --git a/theme/canvas/style/mods.css b/theme/canvas/style/mods.css
index 9245ca9002ca3..52de00621d868 100644
--- a/theme/canvas/style/mods.css
+++ b/theme/canvas/style/mods.css
@@ -1,121 +1,382 @@
-#intro { border-color:#ddd;margin:2% 10%;padding:10px; }
+#intro {
+	border-color: #ddd;
+	margin: 2% 10%;
+	padding: 10px;
+}
 
 /* Forums 
 -------------------------*/
 
-.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 {
+	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;
+}
+
 .forumnodiscuss,
-.path-mod-forum .forumheaderlist .replies { text-align:center; }
+.path-mod-forum .forumheaderlist .replies {
+	text-align: center;
+}
+
+.forumpost {
+	border: none;
+}
 
-.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; }
+.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; }
+.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; }
+.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; }
+#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; }
+#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.pagelayout-embedded #content { padding:5px; }
 .path-mod-chat .generaltable,
 .path-mod-chat .generaltable td,
-.path-mod-chat .generaltable th { border:none !important; }
+.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;
+}
 
-.chat-message .text .title { font-style:italic;color:#444; }
+#page-mod-chat-report .generalbox {
+	padding: 10px;
+	width: 50%;
+	margin: 0 auto 1em;
+}
 
-#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 p {
+	margin: 0;
+}
 
-#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; }
+#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 #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;}
+.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;
+}
 
 /* Lesson 
 --------------------------*/
 
-.path-mod-lesson .firstpageoptions { padding:10px; }
-.path-mod-lesson .centerpadded { text-align:center;display:block;padding:10px; }
-.path-mod-lesson .edit_pages_box .addlinks { text-align:center; }
-.path-mod-lesson .feedback { text-align:center;font-weight:bold; }
-.path-mod-lesson .password-form .generalbox { padding:10px;width:50%;text-align:center; }
-.path-mod-lesson .center { text-align:center; }
-.path-mod-lesson .ongoing { color:#00f;margin:0 0 1em; }
-.path-mod-lesson .clock .content { font-size:1.2em;padding-left:15px; }
-.path-mod-lesson .leftduring .generalbox { padding:10px;width:50%;margin:0 auto; }
-.path-mod-lesson .correctanswer { margin:1em auto;width:50%;padding:10px; }
-.path-mod-lesson .correctanswer .correct { color:#0fb337; }
+.path-mod-lesson .firstpageoptions {
+	padding: 10px;
+}
+
+.path-mod-lesson .centerpadded {
+	text-align: center;
+	display: block;
+	padding: 10px;
+}
+
+.path-mod-lesson .edit_pages_box .addlinks {
+	text-align: center;
+}
+
+.path-mod-lesson .feedback {
+	text-align: center;
+	font-weight: bold;
+}
+
+.path-mod-lesson .password-form .generalbox {
+	padding: 10px;
+	width: 50%;
+	text-align: center;
+}
+
+.path-mod-lesson .center {
+	text-align: center;
+}
+
+.path-mod-lesson .ongoing {
+	color: #00f;
+	margin: 0 0 1em;
+}
+
+.path-mod-lesson .clock .content {
+	font-size: 1.2em;
+	padding-left: 15px;
+}
+
+.path-mod-lesson .leftduring .generalbox {
+	padding: 10px;
+	width: 50%;
+	margin: 0 auto;
+}
+
+.path-mod-lesson .correctanswer {
+	margin: 1em auto;
+	width: 50%;
+	padding: 10px;
+}
+
+.path-mod-lesson .correctanswer .correct {
+	color: #0fb337;
+}
 
 #page-mod-lesson-view #pageheader,
-#page-mod-lesson-view #pageheader legend { border:none; }
-#page-mod-lesson-continue .generalbox { padding:10px; }
+#page-mod-lesson-view #pageheader legend {
+	border: none;
+}
+
+#page-mod-lesson-continue .generalbox {
+	padding: 10px;
+}
+
+.branchbuttoncontainer {
+	text-align: center;
+}
 
-.branchbuttoncontainer { text-align:center; }
-.branchbuttoncontainer input { margin:10px; }
+.branchbuttoncontainer input {
+	margin: 10px;
+}
\ No newline at end of file
diff --git a/theme/canvas/style/pagelayout.css b/theme/canvas/style/pagelayout.css
index a49e92fa8f4e4..46a69ee42680a 100644
--- a/theme/canvas/style/pagelayout.css
+++ b/theme/canvas/style/pagelayout.css
@@ -1,52 +1,71 @@
-
 #page-content #region-main-box {
-  left: 210px; /* Width of left sideblock */
+	left: 210px;
+/
+
+* Width of left sideblock */
 }
 
 #page-content #region-main-box #region-post-box {
-  margin-left: -420px; /* Twice width of left sideblock */
+	margin-left: -420px;
+	
+
+/* Twice width of left sideblock */
   padding-top: 5px;
 }
 
 #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
-  margin-left: 420px; /* Twice width of left sideblock */
-  padding: 0 15px; /* Padding around middle column */
+	margin-left: 420px;
+	
+
+/* Twice width of left sideblock */
+  padding: 0 15px;
+
+
+/* Padding around middle column */
 }
 
 #page-content #region-main-box #region-post-box #region-pre {
-  left: 210px; /* Width of left sideblock */
-  width: 210px; /* Width of left sideblock */
+	left: 210px;
+	
+
+/* Width of left sideblock */
+  width: 210px;
+
+
+/* Width of left sideblock */
 }
 
 #page-content #region-main-box #region-post-box #region-post {
-  width: 210px; /* Width of right sideblock */
+	width: 210px;
+/
+
+* Width of right sideblock */
 }
 
 #page-content #region-main-box .region-content {
-  padding: 0;
+	padding: 0;
 }
 
 /** Only side pre **/
 
 .side-pre-only #page-content #region-main-box #region-post-box {
-  margin-left: -210px; 
+	margin-left: -210px;
 }
 
 .side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
-  margin-left: 210px;
+	margin-left: 210px;
 }
 
 /** Only side post **/
 
 .side-post-only #page-content #region-main-box #region-post-box {
-  margin-left: -210px;
+	margin-left: -210px;
 }
 
 .side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
-  margin-left: 210px;
+	margin-left: 210px;
 }
 
-
 .has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
-  margin-left: 210px;
-}	
\ No newline at end of file
+	margin-left: 210px;
+}
\ No newline at end of file
diff --git a/theme/canvas/style/tables.css b/theme/canvas/style/tables.css
index 35505fdd0ec80..064747aceee26 100644
--- a/theme/canvas/style/tables.css
+++ b/theme/canvas/style/tables.css
@@ -9,7 +9,10 @@
 .plugincompattable th,
 .plugincompattable td,
 .environmenttable th,
-.environmenttable td { border:1px solid #ddd;border-collapse:collapse; }
+.environmenttable td {
+	border: 1px solid #ddd;
+	border-collapse: collapse;
+}
 
 #page-admin-course-category .generalbox th,
 .editcourse .header,
@@ -17,4 +20,7 @@
 #attempts .header,
 .generaltable .header,
 .plugincompattable th,
-.environmenttable th { background:#f3f3f3;border-bottom-width:2px; }
+.environmenttable th {
+	background: #f3f3f3;
+	border-bottom-width: 2px;
+}
\ No newline at end of file
diff --git a/theme/canvas/style/tabs.css b/theme/canvas/style/tabs.css
index 7ad48fc5d7fdf..81c06b066abb5 100644
--- a/theme/canvas/style/tabs.css
+++ b/theme/canvas/style/tabs.css
@@ -21,26 +21,26 @@
 }
 
 .tabtree .tabrow0 li a {
-	background:#f7f7f7;
+	background: #f7f7f7;
 	padding: 8px 10px 5px;
 	border-width: 2px 2px 0;
 	border-style: solid;
 	border-color: #ddd;
-	margin:0 2px;
+	margin: 0 2px;
 }
 
 .tabtree .tabrow0 .here a {
-  background: #fff;
+	background: #fff;
 }
 
 .tabtree .tabrow0 li a:hover {
-	background:#fff;
+	background: #fff;
 }
 
 .tabtree .tabrow0 ul,
 .tabtree .tabrow0 div {
 	font-weight: normal;
-	border-top: 2px solid #ddd	;
+	border-top: 2px solid #ddd;
 	padding: 0.25em 0px;
 	margin: 0px;
 }
@@ -56,9 +56,10 @@
 }
 
 .tabtree .tabrow0 .tabrow1 {
-	padding:5px 0 2px;
+	padding: 5px 0 2px;
 	margin-top: 1px;
 }
+
 .tabtree .tabrow1 li a,
 .tabtree .tabrow1 li a:hover,
 .tabtree .tabrow1 li a span,
diff --git a/theme/canvas/style/text.css b/theme/canvas/style/text.css
index 46614cb67893e..16ef62acf6a9d 100644
--- a/theme/canvas/style/text.css
+++ b/theme/canvas/style/text.css
@@ -1,52 +1,165 @@
 /* Text Elements 
 --------------------------*/
 
-body { font-size: 85%; line-height:1.4;}
+body {
+	font-size: 85%;
+	line-height: 1.4;
+}
 
-body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: Helvetica, Arial, sans-serif; }
+body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
+	font-family: Helvetica, Arial, sans-serif;
+}
 
-h1,h2,h3,h4,h5,h6 { font-weight: bold;margin:0; }
+h1,h2,h3,h4,h5,h6 {
+	font-weight: bold;
+	margin: 0;
+}
 
-h2.main,h3.main,h4.main { text-align: center;padding:0.5em 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; }
-h3 { font-size: 1.25em; line-height: 1; margin-bottom: 0.5em; }
-h4 { font-size: 1.1em; line-height: 1.25; margin-bottom: 0.75em; }
-h5 { font-size: 1em; margin-bottom: 1em; }
-h6 { font-size: 1em; }
+h1 {
+	font-size: 2.25em;
+	line-height: 1;
+	margin-bottom: 0.5em;
+}
 
-p { margin: 0 0 1em; }
+h2 {
+	font-size: 1.5em;
+	margin-bottom: 0.5em;
+}
 
-ul, ol { margin: 0 1.5em 1.5em 1.5em; }
-ul { list-style-type: circle; }
-ol { list-style-type: decimal; }
+h3 {
+	font-size: 1.25em;
+	line-height: 1;
+	margin-bottom: 0.5em;
+}
 
-dl { margin: 0 0 1.5em 0; }
-dl dt { font-weight: bold; }
-dl dd { margin-left: 1.5em; }
+h4 {
+	font-size: 1.1em;
+	line-height: 1.25;
+	margin-bottom: 0.75em;
+}
 
-abbr, acronym { border-bottom: 1px dotted #000; }
-address { margin-top: 1.5em; font-style: italic; }
-del { color: #000; }
+h5 {
+	font-size: 1em;
+	margin-bottom: 1em;
+}
 
-a { text-decoration: none; }
+h6 {
+	font-size: 1em;
+}
 
-blockquote { margin: 1.5em; }
-strong { font-weight: bold; }
-em, dfn { font-style: italic; }
-dfn { font-weight: bold; }
-pre, code { margin: 1.5em 0; white-space: pre; }
-pre, code, tt { font: 1.2em monospace; line-height: 1.5; } 
-tt { display: block; margin: 1.5em 0; line-height: 1.5; }
+p {
+	margin: 0 0 1em;
+}
 
-.small { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; }
-.large { font-size: 1.25em; line-height:1.5em; margin-bottom: 1em; }
-.quiet { color: #999; }
+ul, ol {
+	margin: 0 1.5em 1.5em 1.5em;
+}
 
-.hide { display: none; }
-.highlight { background: #ffc; }
+ul {
+	list-style-type: circle;
+}
 
-.top { margin-top: 0; padding-top: 0; }
-.bottom { margin-bottom: 0; padding-bottom: 0; }
+ol {
+	list-style-type: decimal;
+}
 
+dl {
+	margin: 0 0 1.5em 0;
+}
+
+dl dt {
+	font-weight: bold;
+}
+
+dl dd {
+	margin-left: 1.5em;
+}
+
+abbr, acronym {
+	border-bottom: 1px dotted #000;
+}
+
+address {
+	margin-top: 1.5em;
+	font-style: italic;
+}
+
+del {
+	color: #000;
+}
+
+a {
+	text-decoration: none;
+}
+
+blockquote {
+	margin: 1.5em;
+}
+
+strong {
+	font-weight: bold;
+}
+
+em, dfn {
+	font-style: italic;
+}
+
+dfn {
+	font-weight: bold;
+}
+
+pre, code {
+	margin: 1.5em 0;
+	white-space: pre;
+}
+
+pre, code, tt {
+	font: 1.2em monospace;
+	line-height: 1.5;
+}
+
+tt {
+	display: block;
+	margin: 1.5em 0;
+	line-height: 1.5;
+}
+
+.small {
+	font-size: .8em;
+	margin-bottom: 1.875em;
+	line-height: 1.875em;
+}
+
+.large {
+	font-size: 1.25em;
+	line-height: 1.5em;
+	margin-bottom: 1em;
+}
+
+.quiet {
+	color: #999;
+}
+
+.hide {
+	display: none;
+}
+
+.highlight {
+	background: #ffc;
+}
+
+.top {
+	margin-top: 0;
+	padding-top: 0;
+}
+
+.bottom {
+	margin-bottom: 0;
+	padding-bottom: 0;
+}
\ No newline at end of file