diff --git a/theme-settings.php b/theme-settings.php
index 9764d73..fe2d6b8 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -5,12 +5,12 @@
  * NewsFlash teheme-settings.php
  */
 function newsflash_form_system_theme_settings_alter(&$form, $form_state) {
-
+  $theme = $form_state['build_info']['args'][0];
 $form['newsflash_style'] = array
   (
     '#type' => 'select',
     '#title' => t('Style'),
-    '#default_value' => theme_get_setting('newsflash_style'),
+    '#default_value' => theme_get_setting('newsflash_style', $theme),
     '#description' => t('Choose your favorite color.'),
     '#options' => array
     (
@@ -29,7 +29,7 @@ $form['newsflash_style'] = array
     '#type' => 'checkbox',
     '#title' => t('Enable StylePicker Javasrcipt'),
     '#description' => t('If enabled then you can use stylepicker see README.txt.'),
-    '#default_value' => theme_get_setting('newsflash_pickstyle'),
+    '#default_value' => theme_get_setting('newsflash_pickstyle', $theme),
   );
   
   $form['newsflash_themelogo'] = array
@@ -37,7 +37,7 @@ $form['newsflash_style'] = array
     '#type' => 'checkbox',
     '#title' => t('Use Themed Logo'),
     '#description' => t('If enabled then will the themed logo use the color you have selected above.'),
-    '#default_value' => theme_get_setting('newsflash_themelogo'),
+    '#default_value' => theme_get_setting('newsflash_themelogo', $theme),
   );
 
   $form['newsflash_width'] = array
@@ -45,7 +45,7 @@ $form['newsflash_style'] = array
     '#type' => 'textfield',
     '#title' => t('Width Size'),
     '#description' => t('Set the width. You  can set the width in percent for dynamic width or in px for fixed width.<br /><b>eg.: 850px or 60%</b>'),
-    '#default_value' => theme_get_setting('newsflash_width'),
+    '#default_value' => theme_get_setting('newsflash_width', $theme),
     '#size' => 7,
     '#maxlength' => 7,
   );
@@ -54,7 +54,7 @@ $form['newsflash_style'] = array
   (
     '#type' => 'checkbox',
     '#title' => t('Show Breadcrumbs'),
-    '#default_value' => theme_get_setting('newsflash_breadcrumb'),
+    '#default_value' => theme_get_setting('newsflash_breadcrumb', $theme),
   );
 
   $form['newsflash_permalink'] = array
@@ -62,7 +62,7 @@ $form['newsflash_style'] = array
     '#type' => 'checkbox',
     '#title' => t('Show Permanent Links'),
     '#description' => t('Enable/disable permanent links in comments'),
-    '#default_value' => theme_get_setting('newsflash_permalink'),
+    '#default_value' => theme_get_setting('newsflash_permalink', $theme),
   );
 
   $form['newsflash_fontfamily'] = array
@@ -70,7 +70,7 @@ $form['newsflash_style'] = array
     '#type' => 'select',
     '#title' => t('Font Family'),
     '#description' => t('Choose your favorite Fonts'),
-    '#default_value' => theme_get_setting('newsflash_fontfamily'),
+    '#default_value' => theme_get_setting('newsflash_fontfamily', $theme),
     '#options' => array
     (
       'Arial, Verdana, sans-serif' => t('Arial, Verdana, sans-serif'),
@@ -89,7 +89,7 @@ $form['newsflash_style'] = array
     '#type' => 'textfield',
     '#title' => t('Custom Font-Family Setting'),
     '#description' => t('type your fonts separated by ,<br />eg. <b>"Lucida Grande", Verdana, sans-serif</b>'),
-    '#default_value' => theme_get_setting('newsflash_customfont'),
+    '#default_value' => theme_get_setting('newsflash_customfont', $theme),
     '#size' => 40,
     '#maxlength' => 75,
   );
@@ -98,7 +98,7 @@ $form['newsflash_style'] = array
   (
     '#type' => 'checkbox',
     '#title' => t('Include Custom Stylesheet'),
-    '#default_value' => theme_get_setting('newsflash_uselocalcontent'),
+    '#default_value' => theme_get_setting('newsflash_uselocalcontent', $theme),
   );
 
   $form['newsflash_localcontentfile'] = array
@@ -106,7 +106,7 @@ $form['newsflash_style'] = array
     '#type' => 'textfield',
     '#title' => t('Path to Custom Stylesheet'),
     '#description' => t('type the location of your custom css without leading slash<br />eg. <b>sites/all/themes/newsflash/css/icons.css</b>'),
-    '#default_value' => theme_get_setting('newsflash_localcontentfile'),
+    '#default_value' => theme_get_setting('newsflash_localcontentfile', $theme),
     '#size' => 40,
     '#maxlength' => 75,
   );
@@ -116,7 +116,7 @@ $form['newsflash_style'] = array
     '#type' => 'textfield',
     '#title' => t('Left Sidebar Width'),
     '#description' => t('Set the width in Pixel.'),
-    '#default_value' => theme_get_setting('newsflash_leftsidebarwidth'),
+    '#default_value' => theme_get_setting('newsflash_leftsidebarwidth', $theme),
     '#size' => 5,
     '#maxlength' => 5,
   );
@@ -126,7 +126,7 @@ $form['newsflash_style'] = array
     '#type' => 'textfield',
     '#title' => t('Right Sidebar Width'),
     '#description' => t('Set the width in Pixel.'),
-    '#default_value' => theme_get_setting('newsflash_rightsidebarwidth'),
+    '#default_value' => theme_get_setting('newsflash_rightsidebarwidth', $theme),
     '#size' => 5,
     '#maxlength' => 5,
   );
@@ -135,14 +135,14 @@ $form['newsflash_style'] = array
   (
     '#type' => 'checkbox',
     '#title' => t('Use Suckerfish Menus'),
-    '#default_value' => theme_get_setting('newsflash_suckerfish'),
+    '#default_value' => theme_get_setting('newsflash_suckerfish', $theme),
   );
 
   $form['newsflash_usecustomlogosize'] = array
   (
     '#type' => 'checkbox',
     '#title' => t('Specify Custom Logo Size'),
-    '#default_value' => theme_get_setting('newsflash_usecustomlogosize'),
+    '#default_value' => theme_get_setting('newsflash_usecustomlogosize, $theme'),
   );
 
   $form['newsflash_logowidth'] = array
@@ -150,7 +150,7 @@ $form['newsflash_style'] = array
     '#type' => 'textfield',
     '#title' => t('Logo Width'),
     '#description' => t('Set the width in Pixel.'),
-    '#default_value' => theme_get_setting('newsflash_logowidth'),
+    '#default_value' => theme_get_setting('newsflash_logowidth', $theme),
     '#size' => 5,
     '#maxlength' => 5,
   );
@@ -160,7 +160,7 @@ $form['newsflash_style'] = array
     '#type' => 'textfield',
     '#title' => t('Logo Height'),
     '#description' => t('Set the width in Pixel.'),
-    '#default_value' => theme_get_setting('newsflash_logoheight'),
+    '#default_value' => theme_get_setting('newsflash_logoheight', $theme),
     '#size' => 5,
     '#maxlength' => 5,
   );
@@ -170,7 +170,7 @@ $form['newsflash_style'] = array
     '#type' => 'checkbox',
     '#title' => t('Show RoopleTheme Footer Logo'),
     '#description' => t('if unchecked then roopletheme logo in the footer will disapear<br />so you don\'t need touch the code'),
-    '#default_value' => theme_get_setting('newsflash_banner'),
+    '#default_value' => theme_get_setting('newsflash_banner', $theme),
   );
   
   return $form;