diff --git a/color/color.inc b/color/color.inc
index 586b8de..572bbfd 100644
--- a/color/color.inc
+++ b/color/color.inc
@@ -1,7 +1,7 @@
 <?php
 
 // Put the logo path into JavaScript for the live preview.
-drupal_add_js(array('color' => array('logo' => theme_get_setting('logo', 'corporateclean'))), 'setting');
+drupal_add_js(array('color' => array('logo' => theme_get_setting('logo'))), 'setting');
 
 $info = array(
   // Available colors and color labels used in theme.
diff --git a/template.php b/template.php
index 63e294c..6dc4157 100644
--- a/template.php
+++ b/template.php
@@ -9,13 +9,13 @@
  */
 function corporateclean_breadcrumb($variables){
   $breadcrumb = $variables['breadcrumb'];
-  $breadcrumb_separator=theme_get_setting('breadcrumb_separator','corporateclean');
-  
+  $breadcrumb_separator=theme_get_setting('breadcrumb_separator');
+
   $show_breadcrumb_home = theme_get_setting('breadcrumb_home');
   if (!$show_breadcrumb_home) {
   array_shift($breadcrumb);
   }
-  
+
   if (!empty($breadcrumb)) {
     $breadcrumb[] = drupal_get_title();
     return '<div class="breadcrumb">' . implode(' <span class="breadcrumb-separator">' . $breadcrumb_separator . '</span>', $breadcrumb) . '</div>';
@@ -40,14 +40,14 @@ function corporateclean_process_page(&$variables) {
   if (module_exists('color')) {
     _color_page_alter($variables);
   }
- 
+
 }
 
 function corporateclean_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'search_block_form') {
-  
+
     unset($form['search_block_form']['#title']);
-	
+
     $form['search_block_form']['#title_display'] = 'invisible';
 	$form_default = t('Search');
     $form['search_block_form']['#default_value'] = $form_default;
@@ -60,21 +60,21 @@ function corporateclean_form_alter(&$form, &$form_state, $form_id) {
 /**
  * Add javascript files for jquery slideshow.
  */
-if (theme_get_setting('slideshow_js','corporateclean')):
+if (theme_get_setting('slideshow_js')):
 
 	drupal_add_js(drupal_get_path('theme', 'corporateclean') . '/js/jquery.cycle.all.js');
-	
+
 	//Initialize slideshow using theme settings
-	$effect=theme_get_setting('slideshow_effect','corporateclean');
-	$effect_time=theme_get_setting('slideshow_effect_time','corporateclean')*1000;
-	$slideshow_randomize=theme_get_setting('slideshow_randomize','corporateclean');
-	$slideshow_wrap=theme_get_setting('slideshow_wrap','corporateclean');
-	$slideshow_pause=theme_get_setting('slideshow_pause','corporateclean');
-	
-	drupal_add_js('jQuery(document).ready(function($) { 
+	$effect=theme_get_setting('slideshow_effect');
+	$effect_time=theme_get_setting('slideshow_effect_time')*1000;
+	$slideshow_randomize=theme_get_setting('slideshow_randomize');
+	$slideshow_wrap=theme_get_setting('slideshow_wrap');
+	$slideshow_pause=theme_get_setting('slideshow_pause');
+
+	drupal_add_js('jQuery(document).ready(function($) {
 
 	$(window).load(function() {
-	
+
 		$("#slideshow img").show();
 		$("#slideshow").fadeIn("slow");
 		$("#slider-controls-wrapper").fadeIn("slow");
@@ -93,7 +93,7 @@ if (theme_get_setting('slideshow_js','corporateclean')):
 			after: onAfter
 		});
 	});
-	
+
 	function onAfter(curr, next, opts, fwd){
 		var $ht = $(this).height();
 		$(this).parent().animate({height: $ht});
diff --git a/theme-settings.php b/theme-settings.php
index acc150d..2e3d3cc 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -22,53 +22,53 @@ function corporateclean_form_system_theme_settings_alter(&$form, &$form_state) {
     '#collapsible' => TRUE,
 	'#collapsed' => FALSE,
   );
-  
+
   $form['mtt_settings']['breadcrumb']['breadcrumb_display'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show breadcrumb'),
   	'#description'   => t('Use the checkbox to enable or disable breadcrumb.'),
-	'#default_value' => theme_get_setting('breadcrumb_display','corporateclean'),
+	'#default_value' => theme_get_setting('breadcrumb_display'),
   );
-  
+
   $form['mtt_settings']['breadcrumb']['breadcrumb_separator'] = array(
     '#type' => 'textfield',
     '#title' => t('Breadcrumb separator'),
-	'#default_value' => theme_get_setting('breadcrumb_separator','corporateclean'),
+	'#default_value' => theme_get_setting('breadcrumb_separator'),
     '#size'          => 5,
     '#maxlength'     => 10,
   );
-  
+
   $form['mtt_settings']['breadcrumb']['breadcrumb_home'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Show home page link in breadcrumb'),
   	'#description'   => t('Use the checkbox to enable or disable the home page link in breadcrumb.'),
     '#default_value' => theme_get_setting('breadcrumb_home'),
   );
-  
+
   $form['mtt_settings']['slideshow'] = array(
     '#type' => 'fieldset',
     '#title' => t('Front Page Slideshow'),
     '#collapsible' => TRUE,
 	'#collapsed' => FALSE,
   );
-  
+
   $form['mtt_settings']['slideshow']['slideshow_display'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show slideshow'),
-	'#default_value' => theme_get_setting('slideshow_display','corporateclean'),
+	'#default_value' => theme_get_setting('slideshow_display'),
   );
-  
+
   $form['mtt_settings']['slideshow']['slideshow_js'] = array(
     '#type' => 'checkbox',
     '#title' => t('Include slideshow javascript code'),
-	'#default_value' => theme_get_setting('slideshow_js','corporateclean'),
+	'#default_value' => theme_get_setting('slideshow_js'),
   );
-  
+
   $form['mtt_settings']['slideshow']['slideshow_effect'] = array(
     '#type' => 'select',
     '#title' => t('Effects'),
   	'#description'   => t('From the drop-down menu, select the slideshow effect you prefer.'),
-	'#default_value' => theme_get_setting('slideshow_effect','corporateclean'),
+	'#default_value' => theme_get_setting('slideshow_effect'),
     '#options' => array(
 		'blindX' => t('blindX'),
 		'blindY' => t('blindY'),
@@ -99,29 +99,29 @@ function corporateclean_form_system_theme_settings_alter(&$form, &$form_state) {
 		'zoom' => t('zoom'),
     ),
   );
-  
+
   $form['mtt_settings']['slideshow']['slideshow_effect_time'] = array(
     '#type' => 'textfield',
     '#title' => t('Effect duration (sec)'),
-	'#default_value' => theme_get_setting('slideshow_effect_time','corporateclean'),
+	'#default_value' => theme_get_setting('slideshow_effect_time'),
   );
-  
+
   $form['mtt_settings']['slideshow']['slideshow_randomize'] = array(
     '#type' => 'checkbox',
     '#title' => t('Randomize slideshow order'),
-	'#default_value' => theme_get_setting('slideshow_randomize','corporateclean'),
+	'#default_value' => theme_get_setting('slideshow_randomize'),
   );
-  
+
   $form['mtt_settings']['slideshow']['slideshow_wrap'] = array(
     '#type' => 'checkbox',
     '#title' => t('Prevent slideshow from wrapping'),
-	'#default_value' => theme_get_setting('slideshow_wrap','corporateclean'),
+	'#default_value' => theme_get_setting('slideshow_wrap'),
   );
-  
+
   $form['mtt_settings']['slideshow']['slideshow_pause'] = array(
     '#type' => 'checkbox',
     '#title' => t('Pause slideshow on hover'),
-	'#default_value' => theme_get_setting('slideshow_pause','corporateclean'),
+	'#default_value' => theme_get_setting('slideshow_pause'),
   );
-  
+
 }
\ No newline at end of file