diff --git a/examples/mouse_events/css/example.css b/examples/mouse_events/css/example.css
index c9360a31..9ba8cc00 100644
--- a/examples/mouse_events/css/example.css
+++ b/examples/mouse_events/css/example.css
@@ -4,7 +4,6 @@
     right: 0px;
     height: 14px;
     padding: 2px 0 0 2px;
-    background: rgb(240, 240, 240);
     cursor: pointer;
 }
 #log {
@@ -14,8 +13,6 @@
     right: 0;
     bottom: 0;
     border-width: 0;
-    border-top: 1px solid rgb(208, 208, 208);
-    background: rgb(255, 255, 255);
     overflow-y: auto;
 }
 #target {
@@ -26,8 +23,30 @@
     width: 253px;
     padding: 2px 0 0 2px;
     border-width: 0;
-    border-right: 1px solid rgb(208, 208, 208);
-    background: rgb(224, 224, 224);
     font-weight: bold;
     cursor: crosshair;
+}
+
+.OxThemeClassic #clear {
+    background: rgb(240, 240, 240);
+}
+.OxThemeClassic #log {
+    border-top: 1px solid rgb(208, 208, 208);
+    background: rgb(255, 255, 255);
+}
+.OxThemeClassic #target {
+    border-right: 1px solid rgb(208, 208, 208);
+    background: rgb(224, 224, 224);
+}
+
+.OxThemeModern #clear {
+    background: rgb(16, 16, 16);
+}
+.OxThemeModern #log {
+    border-top: 1px solid rgb(48, 48, 48);
+    background: rgb(0, 0, 0)
+}
+.OxThemeModern #target {
+    border-right: 1px solid rgb(48, 48, 48);
+    background: rgb(32, 32, 32);
 }
\ No newline at end of file
diff --git a/examples/mouse_events/js/example.js b/examples/mouse_events/js/example.js
index 6e14b03b..928f609b 100644
--- a/examples/mouse_events/js/example.js
+++ b/examples/mouse_events/js/example.js
@@ -2,7 +2,7 @@
 This example demonstrates the mouse events that any Ox.Element fires.
 */
 
-Ox.load({UI: {theme: 'classic'}}, function() {
+Ox.load('UI', function() {
 
     var $target = Ox.Element()
             .addClass('OxMonospace')
diff --git a/index.css b/index.css
index 3e41ea35..635f429f 100644
--- a/index.css
+++ b/index.css
@@ -131,7 +131,9 @@ body.OxThemeModern,
 .OxThemeClassic .readme .OxSyntaxHighlighter {
     box-shadow: 0 0 1px rgb(160, 160, 160)
 }
-.OxThemeModern .OxComment .doclink,
+.OxThemeModern .OxComment .doclink {
+    box-shadow: 0 0 1px rgb(255, 255, 255)
+}
 .OxThemeModern .logo,
 .OxThemeModern .page,
 .OxThemeModern .readme .OxSyntaxHighlighter {
diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css
index 9c12a14f..dad49733 100644
--- a/source/Ox.UI/css/Ox.UI.css
+++ b/source/Ox.UI/css/Ox.UI.css
@@ -1967,10 +1967,8 @@ SourceViewer
 .OxSourceViewer .OxComment code {
     padding: 1px 3px 1px 3px;
     border-radius: 2px;
-    background: rgb(255, 255, 255);
     font-family: Menlo, Monaco, DejaVu Sans Mono, Bitstream Vera Sans Mono, Consolas, Lucida Console, monospace;
     font-size: 11px;
-    box-shadow: 0 0 1px rgb(160, 160, 160);
 }
 .OxSourceViewer .OxComment pre {
     line-height: 16px;
diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css
index aa777766..a7b6e6f4 100644
--- a/source/Ox.UI/themes/classic/css/classic.css
+++ b/source/Ox.UI/themes/classic/css/classic.css
@@ -667,6 +667,10 @@ SourceViewer
 .OxThemeClassic .OxSourceViewer .OxComment {
     border-color: rgb(208, 208, 208);
 }
+.OxThemeClassic .OxSourceViewer .OxComment code {
+    background-color: rgb(255, 255, 255);
+    box-shadow: 0 0 1px rgb(160, 160, 160);
+}
 .OxThemeClassic .OxSourceViewer .OxCode {
     background-color: rgb(255, 255, 255);
 }
diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css
index 6d372038..04722f05 100644
--- a/source/Ox.UI/themes/modern/css/modern.css
+++ b/source/Ox.UI/themes/modern/css/modern.css
@@ -651,6 +651,10 @@ SourceViewer
 .OxThemeModern .OxSourceViewer .OxComment {
     border-color: rgb(48, 48, 48);
 }
+.OxThemeModern .OxSourceViewer .OxComment code {
+    background-color: rgb(0, 0, 0);
+    box-shadow: 0 0 1px rgb(255, 255, 255);
+}
 .OxThemeModern .OxSourceViewer .OxCode {
     background-color: rgb(0, 0, 0);
 }