--- includes/ckeditor.admin.inc 
+++ includes/ckeditor.admin.inc 
@@ -177,7 +177,7 @@
   }
 
   module_load_include('inc', 'ckeditor', 'includes/ckeditor.lib');
-    
+
   $toolbar_options = ckeditor_load_toolbar_options();
   $skin_options = ckeditor_load_skin_options();
   $lang_options = ckeditor_load_lang_options();
@@ -852,23 +852,16 @@
       't' => t('Yes')
     ),
   );
-    
-  //BOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-  //Moving next lines to the global configuration
-
-  //$form['advanced']['theme_config_js'] = array(
-  //  '#type' => 'radios',
-  //  '#title' => t('Load ckeditor.config.js from theme path'),
-  //  '#default_value' => !empty($profile->settings['theme_config_js']) ? $profile->settings['theme_config_js'] : 'f',
-  //  '#options' => array(
-  //    't' => t('Yes'),
-  //    'f' => t('No')
-  //  ),
-  //  '#description' => t('When set to "true" the editor will try to load the ckeditor.config.js file from theme directory.'),
-  //);
-
-  //EOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-  
+  $form['advanced']['theme_config_js'] = array(
+    '#type' => 'radios',
+    '#title' => t('Load ckeditor.config.js from theme path'),
+    '#default_value' => !empty($profile->settings['theme_config_js']) ? $profile->settings['theme_config_js'] : 'f',
+    '#options' => array(
+      't' => t('Yes'),
+      'f' => t('No')
+    ),
+    '#description' => t('When set to "true" the editor will try to load the ckeditor.config.js file from theme directory.'),
+  );
   $form['advanced']['js_conf'] = array(
     '#type' => 'textarea',
     '#title' => t('Custom javascript configuration'),
@@ -1143,21 +1136,7 @@
     '#maxlength' => 128,
     '#description' => t('The path to the local directory (on the server) which points to the path defined above. Enter either an absolute server path or path relative to "index.php". If empty, CKEditor module will try to find the right path.<br />Current path: !path', array('!path' => ckeditor_path(TRUE))),
   );
-  
-  //BOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-  //Moved here from the profile config.
-  $form['ckeditor_advanced_settings']['theme_config_js'] = array(
-    '#type' => 'radios',
-    '#title' => t('Load ckeditor.config.js from theme path'),
-    '#default_value' => !empty($profile->settings['theme_config_js']) ? $profile->settings['theme_config_js'] : 'f',
-    '#options' => array(
-      't' => t('Yes'),
-      'f' => t('No')
-    ),
-    '#description' => t('When set to "true" the editor will try to load the ckeditor.config.js file from theme directory.'),
-  );
-  //EOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-  
+
   $form['ckeditor_advanced_settings']['show_fieldnamehint'] = array(
     '#type' => 'radios',
     '#title' => t('Show field name hint below each rich text editor'),

===================================================================

--- includes/ckeditor.lib.inc 
+++ includes/ckeditor.lib.inc 
@@ -100,26 +100,11 @@
 }
 
 function ckeditor_load_toolbar_options() {
-  
-  //BOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-  //Load global profile so we now where to load the config file from.
-  $global_config = ckeditor_profile_load('CKEditor Global Profile');  
-  $themepath = drupal_get_path('theme', variable_get('theme_default', NULL));  
-  //EOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-  
   $arr = array('Basic' => 'Basic', 'Full' => 'Full');
   $module_drupal_path = drupal_get_path('module', 'ckeditor');
   $editor_local_path  = ckeditor_path(TRUE);
   $ckconfig_js = $editor_local_path .'/config.js';
-  
-  //BOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-  if (isset($global_config->settings['theme_config_js']) && $global_config->settings['theme_config_js'] == 't' && file_exists($themepath .'/ckeditor.config.js')) {
-    $ckeditor_config_js = $themepath .'/ckeditor.config.js';
-  } else {
-    $ckeditor_config_js = $module_drupal_path .'/ckeditor.config.js';
-  }
-  //EOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-  
+  $ckeditor_config_js = $module_drupal_path .'/ckeditor.config.js';
   if (file_exists($ckconfig_js) && is_readable($ckconfig_js)) {
     $fp = @fopen($ckconfig_js, "r");
     if ($fp) {

===================================================================

--- ckeditor.module 
+++ ckeditor.module 
@@ -607,26 +607,15 @@
     }
     if ($force_simple_toolbar) {
       $toolbar = CKEDITOR_FORCE_SIMPLE_TOOLBAR_NAME;
-    }
+    }    
     
-    //BOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-    //Load from default themepath if options is checked.
-    $default_themepath = drupal_get_path('theme', variable_get('theme_default', NULL));  
-    if (!empty($global_conf['theme_config_js']) && $global_conf['theme_config_js'] == 't' && file_exists($default_themepath .'/ckeditor.config.js')) {
-      $ckeditor_config_path = $host . $default_themepath .'/ckeditor.config.js?'. @filemtime($default_themepath .'/ckeditor.config.js');
+    if (!empty($conf['theme_config_js']) && $conf['theme_config_js'] == 't' && file_exists($themepath .'ckeditor.config.js')) {
+      $ckeditor_config_path = $host . $themepath .'ckeditor.config.js?'. @filemtime($themepath .'ckeditor.config.js');
     }
     else {
       $ckeditor_config_path = $module_full_path ."/ckeditor.config.js?". @filemtime($module_drupal_path ."/ckeditor.config.js");
     }
-    //if (!empty($conf['theme_config_js']) && $conf['theme_config_js'] == 't' && file_exists($themepath .'ckeditor.config.js')) {
-    //  $ckeditor_config_path = $host . $themepath .'ckeditor.config.js?'. @filemtime($themepath .'ckeditor.config.js');
-    //}
-    //else {
-    //  $ckeditor_config_path = $module_full_path ."/ckeditor.config.js?". @filemtime($module_drupal_path ."/ckeditor.config.js");
-    //}
-    //EOF PATCH "CKEDITOR_CONFIG_JS_THEMEPATH" BY "JORG VLOET, COMPUBASE.NL"
-    
-    
+
     $settings[$textarea_id]['customConfig'] = $ckeditor_config_path;
     $settings[$textarea_id]['defaultLanguage'] = $conf['lang'];
     $settings[$textarea_id]['toolbar'] = $toolbar;