--- scheduler.css	2011-03-31 18:22:05.000000000 +0100
+++ scheduler.css	2011-07-03 19:12:35.000000000 +0100
@@ -1,17 +1,49 @@
 
 /* This is added until http://drupal.org/node/1015798 gets committed to D7 core css
    or something else gets done about the missing fieldset borders and titles */
-.vertical-tabs fieldset fieldset legend {
+div.vertical-tabs div.vertical-tabs-panes fieldset.vertical-tabs-pane fieldset legend {
   display: inline-block;
 }
 
-/* This is only stictly required for the SEVEN theme. */
-div.vertical-tabs .vertical-tabs-panes fieldset fieldset {
+/* This is required for the SEVEN theme. */
+/* Padding stops the fieldsets overlapping, margin gives space between. */
+div.vertical-tabs.seven div.vertical-tabs-panes fieldset.vertical-tabs-pane fieldset {
   border: 1px solid #ccc;
-  margin: 1em 0;
+  margin: 1em 0 0;
   padding: 2.5em 0 0;
 }
 
-div.vertical-tabs .vertical-tabs-panes fieldset fieldset legend {
-  display: inline-block;
+/* This is required for GARLAND. */
+/* Stop the legend shifting to the right on opening. */ 
+div.vertical-tabs.garland div.vertical-tabs-panes fieldset.vertical-tabs-pane fieldset,
+div.vertical-tabs.stark div.vertical-tabs-panes fieldset.vertical-tabs-pane fieldset {
+  border-width: 1px;
+}
+div.vertical-tabs.garland div.vertical-tabs-panes fieldset.vertical-tabs-pane fieldset.collapsed {
+  border-left-color: transparent;
+  border-right-color: transparent;
+  border-bottom-color: transparent;
+}
+
+/* This is only required for BARTIK. */
+/* Stop the legend shifting on opening and remove empty space at the bottom when closed. */ 
+div.vertical-tabs.bartik div.vertical-tabs-panes fieldset.vertical-tabs-pane {
+  padding-top: 0;
+}
+div.vertical-tabs.bartik div.vertical-tabs-panes fieldset.vertical-tabs-pane fieldset {
+  border-width: 1px;
+  padding-bottom: 0;
+}
+
+/* This is required for STARK. */
+/* Stop the legend shifting to the right on opening. */ 
+div.vertical-tabs.stark div.vertical-tabs-panes fieldset.vertical-tabs-pane fieldset {
+  border-width: 1px;
+}
+
+/* This is only required for the RUBIK theme. */
+/* Add border and top padding the actual content, which is the second nested div having have class=fieldset-content */
+div.vertical-tabs.rubik div.vertical-tabs-panes div.fieldset-content fieldset.titled div.fieldset-content {
+  border: 1px solid #ccc;
+  padding-top:2.5em;
 }