diff --git a/theme/XHTML_CSS_UH/styles_color.css b/theme/XHTML_CSS_UH/styles_color.css
index 3eacc48ee09..718cdeb330c 100644
--- a/theme/XHTML_CSS_UH/styles_color.css
+++ b/theme/XHTML_CSS_UH/styles_color.css
@@ -42,6 +42,36 @@ a:hover {
     border-bottom-color:#EC6E0A;
 }
 
+a.autolink:link {
+    background-color:transparent;
+    color:#000000;
+	border-bottom-color:#000000;
+}
+
+a.autolink:visited {
+    background-color:transparent;
+    color:#000000;
+	border-bottom-color:#000000;
+}
+
+a.autolink:hover {
+    background-color:transparent;
+    color:#000000;
+	border-bottom-color:#000000;
+}
+
+a.dimmed:link {
+    color:#AAAAAA;
+}
+
+a.dimmed:visited {
+    color:#AAAAAA;
+}
+
+a.dimmed:hover {
+    color:#990000;
+}
+
 
 /* general styles */
 body {
@@ -55,6 +85,10 @@ body {
     background-color:#C0CAD4;
 }
 
+.dimmed_text {
+    color:#AAAAAA;
+}
+
 
 /* header styles */
 #nav-bar a:link {
@@ -90,16 +124,59 @@ body {
     border-color:#FFFFFF;
 }
 
-.course .course-content {
+
+/* many places */
+.generalbox {
+	background-color:#FFFFFF;
+    border-color:#D1D7DC;
+}
+
+.generalboxcontent {
+    background-color:#FFFFFF;
+    border-color:#D1D7DC;
+}
+
+.noticebox {
+    border-color:#D1D7DC;
+}
+
+
+/* weblib.php table */
+.tabledivider {
+    border-color:#C0CAD4;
+}
+
+
+/* entry page */
+#entry-page {
     background-color:#FFFFFF;
 }
 
-#left-column {
+#entry-page #left-column {
     background-color:#F9FAFA;
 }
 
-#right-column .sideblockheading {
-    background-color:#FFDA9D;
+#entry-page .headingblock,
+#entry-page .forumpostheadertopic {
+    background-color:transparent;
+    border-color:#FFC86C;
+}
+
+
+/* entry-page index.php */ 
+.sitetopic,
+.siteinfo {
+    border-color:#D1D7DC;
+}
+
+.siteinfocontent {
+	 background-color:#EEF0F2;
+}
+
+
+/* summary of a user in a nice little box - weblib.php */
+.userinfobox {
+    border-color:#D1D7DC;
 }
 
 
@@ -108,6 +185,19 @@ body {
 *** Admin
 ***
 ******************************/
+
+
+/*****************************
+***
+*** Course
+***
+******************************/
+.course .course-content {
+    background-color:#FFFFFF;
+}
+
+
+/* course, entry-page, login */
 .headingblock {
 	background-color:#FFFFFF;
     border-color:#D1D7DC;
@@ -115,6 +205,16 @@ body {
     border-left-color:#F68933;
 }
 
+
+/* course */
+#left-column {
+    background-color:#F9FAFA;
+}
+
+#right-column .sideblockheading {
+    background-color:#FFDA9D;
+}
+
 #left-column .sideblocklinks {
     background-color:#F9FAFA;
     border-color:#FFFFFF;
@@ -129,16 +229,22 @@ body {
 	background-color:#FFFFFF;
 }
 
-.forumpost {
-    border-color:#D1D7DC;
+.topicsoutlinecontent,
+.topicsoutlinecontenthighlight {
+    background-color:#FFFFFF;
+    border-color:#FFC86C;
 }
 
-.forumpostpicture {
-	background-color:#FFFFFF;
+.topicsoutlinecontenthidden {
+    background-color:#FFFFFF;
+    border-color:#EEF0F2;
 }
 
-.forumpostside {
-    background-color:#EEF0F2;
+.topicsoutlineside,
+.topicsoutlinesidehighlight,
+.topicsoutlinesidehidden {
+    background-color:#FFFFFF;
+    border-color:#FFFFFF;
 }
 
 .weeklyoutlineside {
@@ -167,79 +273,40 @@ body {
     border-color:#D1D7DC;
 }
 
-.topicsoutlineside {
-    background-color:#FFFFFF;
-    border-color:#1580BD;
-}
-
-.topicsoutlinesidehighlight {
-    background-color:#FFC86C;
-    color:#000000;
-    border-color:#12A316;
-}
-
-.topicsoutlinesidehidden {
-    background-color:#FFFFFF;
-    border-color:#EEF0F2;
-}
-
-.topicsoutlinecontent {
-    background-color:#FFFFFF;
+.categorybox {
     border-color:#D1D7DC;
 }
 
-.topicsoutlinecontenthighlight {
-    background-color:#FFFFFF;
+.courseboxcontent {
     border-color:#D1D7DC;
 }
 
-.topicsoutlinecontenthidden {
-    background-color:transparent;
+
+/*****************************
+***
+*** Activities
+***
+******************************/
+/* assignment, forum, glossary */
+.forumpost {
     border-color:#D1D7DC;
 }
 
-.siteinfo {
-    border-color:#D1D7DC;
-}
-
-.siteinfocontent {
-	 background-color:#EEF0F2;
-}
-
-.generalbox {
+.forumpostpicture {
 	background-color:#FFFFFF;
-    border-color:#D1D7DC;
 }
 
-.generalboxcontent {
+.forumpostside {
+    background-color:#EEF0F2;
+}
+
+
+/* forum */
+.forum {
     background-color:#FFFFFF;
     border-color:#D1D7DC;
 }
 
-.noticebox {
-    border-color:#D1D7DC;
-}
-
-.feedbacktext {
-    color:#C0CAD4;
-}
-
-a.dimmed:link {
-    color:#AAAAAA;
-}
-
-a.dimmed:visited {
-    color:#AAAAAA;
-}
-
-a.dimmed:hover {
-    color:#990000;
-}
-
-.dimmed_text {
-    color:#AAAAAA;
-}
-
 .forumpostheadertopic {
     background-color:#FFC86C}
 
@@ -255,48 +322,99 @@ a.dimmed:hover {
  	background-color:#EEF0F2;
 }
 
-.teacheronly {
-    color:#AE1107;
-}
-
-.categorybox {
-    border-color:#D1D7DC;
-}
-
-.courseboxcontent {
-    border-color:#D1D7DC;
-}
-
-a.autolink:link {
-    background-color:transparent;
-    color:#000000;
-	border-bottom-color:#000000;
-}
-
-a.autolink:visited {
-    background-color:transparent;
-    color:#000000;
-	border-bottom-color:#000000;
-}
-
-a.autolink:hover {
-    background-color:transparent;
-    color:#000000;
-	border-bottom-color:#000000;
-}
-
-.userinfobox {
-    border-color:#D1D7DC;
-}
-
 .forumheaderlist {
     border-color:#D1D7DC;
 }
 
-.tabledivider {
-    border-color:#C0CAD4;
+
+/* glossary */
+.glossary {
+    /*background-color:#FFFFFF;*/
+    background-color:#EEF0F2;
+    border-color:#D1D7DC;
 }
 
+.glossary .forumpost td {
+    background-color:#FFFFFF;
+}
+
+.glossary td,
+.glossary-edit td {
+    background-color:transparent;
+}
+
+.glossary center center td table td,
+.glossary-edit center center td table td {
+    background-color:#FFFFFF;
+}
+
+.glossary center center td,
+.glossary-edit center center td {
+    background-color:#EEF0F2;
+}
+
+.glossary table.generaltabselected td,
+.glossary form table.generaltabselected td  {
+    background-color:#FFC86C;
+}
+
+.glossary form table.forumpost td {
+    background-color:#F9FAFA;
+}
+
+.glossary .generaltab {
+    background-color:#D1D7DC !important;
+}
+
+.glossary .generaltabselected {
+    background-color:#FFD991 !important;
+}
+
+
+/* lang, forum */
+.teacheronly {
+    color:#AE1107;
+}
+
+
+/* quiz */
+.feedbacktext {
+    color:#C0CAD4;
+}
+
+
+/* wiki styles */
+.mwiki {
+    border-color:#D1D7DC;
+}
+
+.mwiki .edit {
+    background-color:#FFFFFF;
+}
+
+.wiki {
+    border-color:#A7B1B7;
+}
+
+.wiki .title {
+	background-color:#EEF0F2;
+	border-color:#C6BDA8;
+}
+
+.mwiki .generaltab {
+    background-color:#D1D7DC !important;
+}
+
+.mwiki .generaltabselected {
+    background-color:#FFD991 !important;
+}
+
+
+/*****************************
+***
+*** Calendar
+***
+******************************/
 TABLE.calendarmini {
     border-color:#C0CAD4;
 }
@@ -387,10 +505,6 @@ TABLE.calendarmonth THEAD TD {
 	background-color:#EEF0F2;
 }
 
-.sideblockmain HR {
-	border-top-color:#999;
-}
-
 .mycalendar HR {
 	border-top-color:#999;
 }
@@ -423,94 +537,6 @@ TD.cal_event_description {
     border-color:#D1D7DC;
 }
 
-#block_course_summary .sideblockmain {
-    background-color:#F9FAFA;
-    color:#000000;
-}
-#block_glossary_random .sideblockmain {
-    /*background-color:#FFDA9D;*/
-}
-
-.sitetopic {
-    border-color:#D1D7DC;
-}
-
-#entry-page #left-column {
-    background-color:#F9FAFA;
-}
-#entry-page .headingblock,
-#entry-page .forumpostheadertopic {
-    background-color:transparent;
-    border-color:#FFC86C;
-}
-#entry-page,
-.course,
-.forum,
-.glossary,
-.mwiki .edit {
-    background-color:#FFFFFF;
-}
-.forum,
-.glossary,
-.mwiki {
-    border-color:#D1D7DC;
-}
-
-
-/*****************************
-***
-*** Activities
-***
-******************************/
-/* glossary */
-.glossary td,
-.glossary-edit td {
-    background-color:transparent;
-}
-.glossary center center td table td,
-.glossary-edit center center td table td {
-    background-color:#FFFFFF;
-}
-.glossary center center td,
-.glossary-edit center center td {
-    background-color:#EEF0F2;
-}
-.glossary .generaltab {
-    background-color:#EEF0F2;
-}
-.glossary .generaltabselected {
-    background-color:#D1D7DC;
-}
-.glossary form table.generaltabselected td {
-    background-color:#FFC86C;
-}
-.glossary form table.forumpost td {
-    background-color:#F9FAFA;
-}
-
-
-/* wiki styles */
-.wiki {
-    border-color:#A7B1B7;
-}
-
-.wiki .title {
-	background-color:#EEF0F2;
-	border-color:#C6BDA8;
-}
-
-
-/* experiments */
-
-.topicsoutlinecontent,
-.topicsoutlinecontenthighlight,
-.topicsoutlinecontenthidden {
-    border-color:#FFC86C;
-}
-.topicsoutlinecontenthidden {
-    border-color:#C0C0C0;
-}
-
 
 /*****************************
 ***
@@ -547,4 +573,22 @@ TD.cal_event_description {
 
 .sideblockmain {
     color:#666666;
-}
\ No newline at end of file
+}
+
+.sideblockmain HR {
+	border-top-color:#999;
+}
+
+
+/* course summary */
+#block_course_summary .sideblockmain {
+    background-color:#F9FAFA;
+    color:#000000;
+}
+
+
+/* glossary random */
+#block_glossary_random .sideblockmain {
+    /*background-color:#FFDA9D;*/
+}
+
diff --git a/theme/XHTML_CSS_UH/styles_font.css b/theme/XHTML_CSS_UH/styles_font.css
index be986d0a903..ee4836ef9c7 100644
--- a/theme/XHTML_CSS_UH/styles_font.css
+++ b/theme/XHTML_CSS_UH/styles_font.css
@@ -165,7 +165,6 @@ h4 {
 }
 
 
-
 /*****************************
 ***
 *** content styles
@@ -189,7 +188,6 @@ h4 {
 }
 
 
-
 /*****************************
 ***
 *** Admin
@@ -210,7 +208,6 @@ h4 {
 }
 
 
-
 /*****************************
 ***
 *** Course
@@ -256,7 +253,6 @@ h4 {
 }
 
 
-
 /*****************************
 ***
 *** Activities
@@ -297,6 +293,11 @@ h4 {
     font-size:0.9em;
 }
 
+.mwiki .generaltab,
+.mwiki .generaltabselected  {
+    font-size:0.9em;
+}
+
 #containerPageActions {
     text-align:left;
 }
@@ -381,7 +382,6 @@ TABLE.cal_controls td {
 }
 
 
-
 /*****************************
 ***
 *** Blocks
@@ -390,7 +390,7 @@ TABLE.cal_controls td {
 /* sideblock */
 .sideblock {
 	font-family:"Lucida Grande", Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
-	font-size:0.75em;
+	font-size:0.80em;
 }
 
 .sideblockheading {
diff --git a/theme/XHTML_CSS_UH/styles_layout.css b/theme/XHTML_CSS_UH/styles_layout.css
index 46927fdb245..2c95fa2fbae 100644
--- a/theme/XHTML_CSS_UH/styles_layout.css
+++ b/theme/XHTML_CSS_UH/styles_layout.css
@@ -144,7 +144,6 @@ input {
 }
 
 
-
 /*****************************
 ***
 *** content styles
@@ -175,6 +174,16 @@ input {
 }
 
 
+/* weblib.php table */
+.tabledivider {
+    border-width:1px;
+    border-style:solid;
+    border-left:0px;
+    border-right:0px;
+    border-top:0px;
+}
+
+
 /* entry page */
 #entry-page #left-column,
 #entry-page #left-column .sideblock
@@ -210,24 +219,6 @@ input {
 }
 
 
-/* summary of a user in a nice little box - weblib.php */
-.userinfobox {
-    margin-bottom:5px;
-    border-width:1px;
-    border-style:solid;
-}
-
-
-/* weblib.php table */
-.tabledivider {
-    border-width:1px;
-    border-style:solid;
-    border-left:0px;
-    border-right:0px;
-    border-top:0px;
-}
-
-
 /* entry-page index.php */ 
 .sitetopic,
 .siteinfo  {
@@ -236,6 +227,14 @@ input {
 }
 
 
+/* summary of a user in a nice little box - weblib.php */
+.userinfobox {
+    margin-bottom:5px;
+    border-width:1px;
+    border-style:solid;
+}
+
+
 /*****************************
 ***
 *** Admin
@@ -267,6 +266,10 @@ table.formtable td {
     border-style:solid;
 }
 
+.generaltableheader {
+    background-image:none;
+}
+
 
 /* course */
 #left-column,
@@ -280,13 +283,10 @@ table.formtable td {
     padding:0px 15px;
 }
 
-.outlineheadingblock {
-    display:none;
-}
-
 .outlineheadingblock {
     background-image:none;
     border:none;
+    display:none;
 }
 
 .topicsoutlineside,
@@ -316,10 +316,6 @@ table.formtable td {
     padding:1em 0em;
 }
 
-.generaltableheader {
-    background-image:none;
-}
-
 .weeklyoutlineside {
     border-width:1px;
     border-style:solid;
@@ -356,40 +352,6 @@ table.formtable td {
     border-style:dashed;
 }
 
-.topicsoutlineside {
-    border-width:1px;
-    border-style:solid;
-}
-
-.topicsoutlinesidehighlight {
-    border-width:1px;
-    border-style:solid;
-}
-
-.topicsoutlinesidehidden {
-    border-width:1px;
-    border-style:solid;
-}
-
-.topicsoutlinecontent {
-    border-width:0px;
-    border-top:1px;
-    border-bottom:1px;
-    border-style:solid;
-}
-
-.topicsoutlinecontenthighlight {
-    border-width:0px;
-    border-top:1px;
-    border-bottom:1px;
-    border-style:solid;
-}
-
-.topicsoutlinecontenthidden {
-    border-width:1px;
-    border-style:solid;
-}
-
 .categorybox {
     border-width:1px;
     border-style:solid;