diff --git a/scheduler.css b/scheduler.css
old mode 100644
new mode 100755
index 97447c0..28b6e77
--- a/scheduler.css
+++ b/scheduler.css
@@ -1,17 +1,42 @@
 
 /* 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;
+}
\ No newline at end of file
diff --git a/scheduler_vertical_tabs.js b/scheduler_vertical_tabs.js
index beae0d5..d8286e7 100644
--- a/scheduler_vertical_tabs.js
+++ b/scheduler_vertical_tabs.js
@@ -6,6 +6,13 @@
  */
 Drupal.behaviors.scheduler_settings = {
   attach: function (context) {
+
+  // Add the theme name as an additional class to the vertical-tabs div. This can then be used
+  // in scheduler.css to rectify the style for collapsible fieldsets where different themes
+  // need slightly different fixes. The theme is available in ajaxPageState.
+  var theme = Drupal.settings.ajaxPageState['theme'];
+  $("div.vertical-tabs").addClass(theme);
+  
 	// Provide summary when editting a node.
 	$('fieldset#edit-scheduler-settings', context).drupalSetSummary(function(context) {
       var vals = [];