Index: API.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/API.txt,v
retrieving revision 1.1.2.12
diff -u -r1.1.2.12 API.txt
--- API.txt	8 Oct 2010 08:58:42 -0000	1.1.2.12
+++ API.txt	18 Oct 2010 12:46:16 -0000
@@ -331,7 +331,6 @@
 
 There are several css classes which you can use which will do all kinds of stuff
 
-- display-none: hides an element
 - popup-link: put this on a link and this will trigger a sweaver popup
 - sweaver-switch-to-style: adds a brush icon
 - container: lets a div float
Index: sweaver_plugin.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/Attic/sweaver_plugin.js,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 sweaver_plugin.js
--- sweaver_plugin.js	30 Sep 2010 15:26:08 -0000	1.1.2.3
+++ sweaver_plugin.js	18 Oct 2010 14:39:37 -0000
@@ -9,7 +9,7 @@
 Drupal.Sweaver.writeCss = function(context) {
 
   var fullCss = '';
-
+  var css = '';
   $.each(Drupal.settings.sweaver['invokes'], function(index, module) {
     var invoke_function = module +'_updateCss';
     css = window[invoke_function].apply(this);
Index: plugins/sweaver_plugin_editor/sweaver_plugin_editor.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/plugins/sweaver_plugin_editor/sweaver_plugin_editor.js,v
retrieving revision 1.1.2.55
diff -u -r1.1.2.55 sweaver_plugin_editor.js
--- plugins/sweaver_plugin_editor/sweaver_plugin_editor.js	14 Oct 2010 15:29:56 -0000	1.1.2.55
+++ plugins/sweaver_plugin_editor/sweaver_plugin_editor.js	18 Oct 2010 15:21:09 -0000
@@ -119,7 +119,7 @@
   Drupal.Sweaver.excludeClasses = Drupal.settings.sweaver['exclude_classes'];
 
   // Add a link popup to be able to follow links.
-  $('body').append('<a href="" id="follow-link">' + Drupal.t('Click here to follow this link') + '</div>');
+  $('body').append('<a href="#" id="follow-link">' + Drupal.t('Click here to follow this link') + '</a>');
 }
 
 /**
Index: plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc,v
retrieving revision 1.1.2.61
diff -u -r1.1.2.61 sweaver_plugin_styles.inc
--- plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc	14 Oct 2010 15:29:56 -0000	1.1.2.61
+++ plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc	19 Oct 2010 07:19:07 -0000
@@ -87,7 +87,7 @@
     if ($existing_styles) {
 
       // Hide new style name by default.
-      $form['save_style_popup']['save_style']['#attributes'] = array('class' => 'display-none');
+      $form['save_style_popup']['save_style']['#attributes'] = array('style' => 'display:none');
 
       $form['save_style_popup']['save_type'] = array(
         '#type' => 'select',
@@ -131,8 +131,8 @@
       '#weight' => 5,
     );
     $form['save_style_popup']['save']['#weight'] = 10;
-    $form['save_style_popup']['save']['#prefix'] = '<div class="clear-block"></div><div class="save-publish-buttons">';
-    $form['save_style_popup']['save']['#suffix'] = '</div><div class="clear-block"></div>';
+    $form['save_style_popup']['save']['#prefix'] = '<div class="save-publish-buttons clear-block">';
+    $form['save_style_popup']['save']['#suffix'] = '</div>';
 
     // Load popup.
     if ($existing_styles) {
@@ -200,7 +200,7 @@
         '#type' => 'button',
         '#value' => t('Cancel'),
       );
-      $form['delete_style_popup']['warning']['#prefix'] = '<div class="delete-style-question display-none clear-block">';
+      $form['delete_style_popup']['warning']['#prefix'] = '<div class="delete-style-question clear-block" style="display:none">';
       $form['delete_style_popup']['warning']['#suffix'] = '</div>';
     }
 
@@ -230,7 +230,7 @@
         ++$i;
         $form['#popups'][] = $key;
         $form['#popups_links'] .= '<div class="style-actions-link"><a href="#" id="style-actions-link-'. $i .'">'. $action['title'] .'</a></div>';
-        $form[$key]['#prefix'] = '<div class="display-none '. str_replace('_', '-', $key) .'" id="style-actions-data-'. $i .'"><h2>'. t('@action style', array('@action' => $action['title'])) .'</h2><p>'. $action['description'] .'</p>';
+        $form[$key]['#prefix'] = '<div style="display: none;" class="'. str_replace('_', '-', $key) .'" id="style-actions-data-'. $i .'"><h2>'. t('@action style', array('@action' => $action['title'])) .'</h2><p>'. $action['description'] .'</p>';
         $form[$key]['#suffix'] = '</div>';
       }
     }
Index: plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc,v
retrieving revision 1.1.2.28
diff -u -r1.1.2.28 sweaver_plugin_themesettings.inc
--- plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc	14 Oct 2010 15:29:56 -0000	1.1.2.28
+++ plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc	18 Oct 2010 12:48:02 -0000
@@ -68,10 +68,10 @@
         );
 
         if (isset($form[$key]['#prefix'])) {
-          $form[$key]['#prefix'] .= '<div class="display-none" id="theme-settings-data-'. $i .'">';
+          $form[$key]['#prefix'] .= '<div style="display:none" id="theme-settings-data-'. $i .'">';
         }
         else {
-          $form[$key]['#prefix'] = '<div class="display-none" id="theme-settings-data-'. $i .'">';
+          $form[$key]['#prefix'] = '<div style="display:none"id="theme-settings-data-'. $i .'">';
         }
 
         if (isset($form[$key]['#suffix'])) {
Index: skins/default/default.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/skins/default/Attic/default.css,v
retrieving revision 1.1.2.21
diff -u -r1.1.2.21 default.css
--- skins/default/default.css	14 Oct 2010 08:03:38 -0000	1.1.2.21
+++ skins/default/default.css	19 Oct 2010 07:19:03 -0000
@@ -54,6 +54,7 @@
   position: relative !important;
   height: 180px;
   overflow: hidden;
+   z-index: 1;  
 }
 
 /* header region */
@@ -62,6 +63,8 @@
    padding: 7px !important;
    clear: both !important;
    margin: 0 7px 0 !important;
+   position: relative;
+   z-index: 2;
 }
 
 #sweaver #sweaver-header a.button {
@@ -141,7 +144,7 @@
   -moz-border-radius: 7px !important;
   -webkit-border-radius: 7px !important;
   border-radius: 7px !important;
-  background: rgb(51,51,51) !important;
+  background: rgb(65,65,65) !important;
   background: rgba(51,51,51,0.9) !important;
   color: #fff !important;
   display: none;
@@ -170,6 +173,7 @@
   overflow: hidden;
   width: 16px;
   height: 15px;
+  line-height: 15px;
   position: absolute;
   top: 5px;
   right: 5px;
@@ -184,6 +188,7 @@
   color: #fff !important;
   font-size: 16px !important;
   margin-bottom: 5px !important;
+  font-family: "trebuchet MS", Helvetica, Arial !important;  
 }
 
 #sweaver-popup a {
@@ -202,6 +207,7 @@
   font-size: 16px !important;
   line-height:19px !important;
   margin:0 0 10px !important;
+  color: #fff;
 }
 
 #sweaver-popup fieldset fieldset legend {
@@ -297,6 +303,10 @@
   margin-right: 15px !important;
 }
 
+#sweaver-popup #edit-save-style {
+	width: 140px !important;
+}
+
 #sweaver-popup #edit-save-keep-draft-wrapper {
   clear: both !important;
 }
@@ -310,6 +320,10 @@
   margin-top: 15px;
 }
 
+#sweaver-popup .save-publish-buttons {
+	clear: both;
+}
+
 #sweaver-popup .delete-style-question input,
 #sweaver-popup .save-publish-buttons input {
   float: left !important;
@@ -317,6 +331,10 @@
   clear: none !important;
 }
 
+#sweaver-popup .delete-style-question input {
+  background-color: #333 !important;
+}
+
 /* general theming */
 
 #sweaver a {
@@ -428,15 +446,18 @@
   text-decoration: none !important;
 }
 
-#sweaver-frontend .form-submit {
+#sweaver-frontend .form-submit,
+#sweaver-popup .form-submit {
   clear: left;
   display: block !important;
   margin: 1em 0 0 0 !important;
-  background-color: #333 !important;
+  background-color: #666 !important;
   color: #fff !important;
   border: 0 none !important;
   width: auto !important;
   padding: 5px !important;
+  cursor: pointer;
+  zoom: 1;
 }
 
 #sweaver-frontend label.option {
@@ -458,10 +479,6 @@
   color: #fff !important;
 }
 
-#sweaver-frontend .display-none {
-  display: none;
-}
-
 /* containers */
 
 #sweaver .container {
Index: skins/grey/grey.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/sweaver/skins/grey/Attic/grey.css,v
retrieving revision 1.1.2.21
diff -u -r1.1.2.21 grey.css
--- skins/grey/grey.css	14 Oct 2010 08:03:38 -0000	1.1.2.21
+++ skins/grey/grey.css	18 Oct 2010 15:22:05 -0000
@@ -54,6 +54,7 @@
   position: relative !important;
   height: 180px;
   overflow: hidden;
+  z-index: 1;  
 }
 
 /* header region */
@@ -63,6 +64,8 @@
    clear: both !important;
    margin: 0 !important;
    background: transparent url(images/header-bg.png) repeat-x bottom left;
+   position: relative;
+   z-index: 2;   
 }
 
 #sweaver #sweaver-header a.button {
@@ -176,6 +179,7 @@
   overflow: hidden;
   width: 16px;
   height: 15px;
+  line-height: 15px;
   position: absolute;
   top: 5px;
   right: 5px;
@@ -190,6 +194,7 @@
   color: #fff !important;
   font-size: 16px !important;
   margin-bottom: 5px !important;
+  font-family: "Lucida Grande",Lucida,Verdana,sans-serif !important;  
 }
 
 #sweaver-popup a {
@@ -325,6 +330,10 @@
   margin-top: 15px;
 }
 
+#sweaver-popup .save-publish-buttons {
+  clear: both;
+}
+
 #sweaver-popup .delete-style-question input,
 #sweaver-popup .save-publish-buttons input {
   float: left !important;
@@ -443,7 +452,8 @@
   text-decoration: none !important;
 }
 
-#sweaver-frontend input.form-submit {
+#sweaver-frontend .form-submit,
+#sweaver-popup .form-submit {
   clear: left;
   display: block !important;
   margin: 1em 0 0 0 !important;
@@ -456,6 +466,7 @@
   -webkit-border-radius: 15px !important;
   border-radius: 15px !important;
   font-weight: normal !important;
+  cursor: pointer;  
 }
 
 #sweaver-frontend label.option {
@@ -477,10 +488,6 @@
   color: #fff !important;
 }
 
-#sweaver-frontend .display-none {
-  display: none;
-}
-
 /* containers */
 
 #sweaver .container {