1 files changed, 6 insertions, 5 deletions
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index c9f2ada39..b5326e426 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -22,12 +22,13 @@ function chameleon_settings() {
 
   $fd = opendir('themes/chameleon');
   while ($file = readdir($fd)) {
-    if (strstr($file, 'css') && $file != 'default.css') {
-      $files["themes/chameleon/$file"] = "themes/chameleon/$file";
+    if (is_dir("themes/chameleon/$file") && !in_array($file, array('.', '..', 'CVS'))) {
+      $files["themes/chameleon/$file/chameleon.css"] = "themes/chameleon/$file/chameleon.css";
     }
   }
+  closedir($fd);
 
-  $output = form_select(t('CSS stylesheet'), 'chameleon_stylesheet', variable_get('chameleon_stylesheet', 'themes/chameleon/default.css'), $files, t('Selecting a different stylesheet will change the look and feel of your site.'));
+  $output = form_select(t('CSS stylesheet'), 'chameleon_stylesheet', variable_get('chameleon_stylesheet', 'themes/chameleon/pure/chameleon.css'), $files, t('Selecting a different stylesheet will change the look and feel of your site.'));
 
   return $output;
 }
@@ -45,8 +46,8 @@ function chameleon_page($content, $title = NULL, $breadcrumb = NULL) {
   $output .= "<head>\n";
   $output .= " <title>". ($title ? $title ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n";
   $output .= drupal_get_html_head();
-  $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/default.css\" />\n";
-  $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"". variable_get("chameleon_stylesheet", "themes/chameleon/pure.css") ."\" />\n";
+  $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/common.css\" />\n";
+  $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"". variable_get("chameleon_stylesheet", "themes/chameleon/pure/chameleon.css") ."\" />\n";
   $output .= "</head>";
   $output .= "<body ". theme_onload_attribute() .">\n";
   $output .= " <div id=\"header\">";