diff --git a/theme/orangewhite/styles_color.css b/theme/orangewhite/styles_color.css
index e0b1f3481f6..81f4f1ba13d 100644
--- a/theme/orangewhite/styles_color.css
+++ b/theme/orangewhite/styles_color.css
@@ -556,29 +556,21 @@ TD.event_description {
 }
 
 .sideblock,
-.sideblockmain,
-.sideblocklinks {
+.sideblock .content,
+.sideblock .list {
     background-color:#F9FAFA;
 }
 
-.sideblockheading {
+.sideblock .heading {
     background-color:#EEF0F2;
-}
-
-.sideblock,
-.sideblockheading {
-    border-color:#D1D7DC;
-}
-
-.sideblockheading {
     color:#666666;
 }
 
-.sideblockmain {
+.sideblock .content {
     color:#666666;
 }
 
-.sideblockmain HR {
+.sideblock .content hr {
 	border-top-color:#999;
 }
 
diff --git a/theme/orangewhite/styles_layout.css b/theme/orangewhite/styles_layout.css
index b030ba2e023..fdceef2634f 100644
--- a/theme/orangewhite/styles_layout.css
+++ b/theme/orangewhite/styles_layout.css
@@ -722,37 +722,26 @@ table.calendar-controls .next
 /* sideblock */
 .sideblock {
     width:100%;
-    border-width:1px 1px 1px 1px;
-    border-style:solid;
+    border:0 none;
 }
 
-.sideblockheading {
+.sideblock .heading {
     background-image:none;
     padding:0px 5px;
-    border-width:1px 0px 0px 1px;
-    border-style:solid;
+    border:0 none;
 }
 
-.sideblockheading a {
-    cursor:pointer;
-    border-bottom:none;
-}
-
-.sideblockheading a img {
-    padding-top:0.5em;
-}
-
-.sideblockheading .hide-show {
+.sideblock .heading .hide-show {
     float:right;
 }
 
-.sideblockheading  .hide-show img.hide-show-image {
+.sideblock .heading  .hide-show img.hide-show-image {
     height:11px;
     width:11px;
     padding-top:0.35em;
 }
 
-.sideblock .sideblockheading .hide-show img.hide-show-image {
+.sideblock .heading .hide-show img.hide-show-image {
     background:url('../../pix/t/switch_minus.gif') no-repeat bottom;
 }
 
@@ -760,10 +749,28 @@ table.calendar-controls .next
     background:url('../../pix/t/switch_plus.gif') no-repeat bottom;
 }
 
-.sideblock.hidden .sideblockmain {
+.sideblock.hidden .content {
     display:none;
 }
 
+.sideblock .heading .commands {
+    float: right;
+    padding-left:0.2em;
+}
+
+.sideblock .heading .commands a {
+    cursor:pointer;
+    border-bottom:none;
+}
+
+.sideblock .heading .commands a img {
+    padding-top:0.5em;
+}
+
+.sideblock .list {
+    width: 100%;
+}
+
 .sideblockmain HR {
 	height:1px;
 	border:none;
@@ -780,12 +787,12 @@ table.calendar-controls .next
     padding:1px 0px;
 }
 
-#left-column .sideblockheading,
+#left-column .sideblock .heading,
 #left-column .sideblock {
     border-width:0px 0px 0px 1px;
 }
 
-#left-column .sideblocklist {
+#left-column .sideblock .list {
     padding-left:5px;
 }