Index: editors/tinymce.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/tinymce.inc,v
retrieving revision 1.29
diff -u -r1.29 tinymce.inc
--- editors/tinymce.inc	20 Mar 2009 23:55:51 -0000	1.29
+++ editors/tinymce.inc	18 Apr 2009 04:42:30 -0000
@@ -158,6 +158,13 @@
   if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
       $init['content_css'] = implode(',', wysiwyg_get_css());
+    } 
+    else if ($config['css_setting'] == 'theme_mod') {
+      $files = wysiwyg_get_css();
+      if (isset($config['css_path'])) {
+        $files[] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+      }
+      $init['content_css'] = implode(',', $files);
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
       $init['content_css'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
Index: wysiwyg.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg.admin.inc,v
retrieving revision 1.10
diff -u -r1.10 wysiwyg.admin.inc
--- wysiwyg.admin.inc	28 Mar 2009 23:19:02 -0000	1.10
+++ wysiwyg.admin.inc	18 Apr 2009 04:46:58 -0000
@@ -285,8 +285,8 @@
     '#type' => 'select',
     '#title' => t('Editor CSS'),
     '#default_value' => $profile->settings['css_setting'],
-    '#options' => array('theme' => t('Use theme CSS'), 'self' => t('Define CSS'), 'none' => t('Editor default CSS')),
-    '#description' => t('Defines the CSS to be used in the editor area.<br />Use theme CSS - loads stylesheets from current site theme.<br/>Define CSS - enter path for stylesheet files below.<br />Editor default CSS - uses default stylesheets from editor.'),
+    '#options' => array('theme' => t('Original theme CSS'), 'theme_mod' => t('Modified theme CSS'), 'self' => t('Define CSS'), 'none' => t('Editor default CSS')),
+    '#description' => t('Defines the CSS to be used in the editor area.<br />Original theme CSS - loads stylesheets from current site theme "as is".<br/>Modified theme CSS - loads stylesheets from the theme and then appends stylesheet from the path below.<br/>Define CSS - enter path for stylesheet files below.<br />Editor default CSS - uses default stylesheets from editor.'),
   );
 
   $form['css']['css_path'] = array(