diff --git a/mothership/template.php b/mothership/template.php
index 05f46b2..98798e9 100644
--- a/mothership/template.php
+++ b/mothership/template.php
@@ -2,7 +2,7 @@
 /**
  * include template overwrites
  */
- 
+
 $path_mothership = drupal_get_path('theme', 'mothership');
   include_once './' . $path_mothership . '/functions/css.php';
   include_once './' . $path_mothership . '/functions/js.php';
@@ -21,7 +21,7 @@ $path_mothership = drupal_get_path('theme', 'mothership');
 if (theme_get_setting('mothership_goodies_login')) {
  include_once './' . $path_mothership . '/goodies/login.inc';
 }
- 
+
 // Auto-rebuild the theme registry during theme development.
 if (theme_get_setting('mothership_rebuild_registry')) {
   system_rebuild_theme_data();
@@ -44,7 +44,7 @@ function mothership_theme(){
 */
 function mothership_preprocess(&$vars, $hook) {
   global $theme;
-  global $base_url;  
+  global $base_url;
   $path = drupal_get_path('theme', $theme);
   $path_mothership = drupal_get_path('theme', 'mothership');
 
@@ -60,6 +60,14 @@ function mothership_preprocess(&$vars, $hook) {
   //For non-Retina iPhone, iPod Touch, and Android 2.1+ devices
   $appletouchicon .=  '<link rel="apple-touch-icon" href="' . $base_url .'/'.  $path . '/apple-touch-icon.png">' . "\n";
 
+  //---- selectivizr
+  $selectivizr = '';
+  if(theme_get_setting('mothership_selectivizr')) {
+    $vars['selectivizr'] .= '<!--[if (gte IE 6)&(lte IE 8)]>' . "\n";;
+    $vars['selectivizr'] .= '<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/selectivizr/1.0.2/selectivizr-min.js"></script>' . "\n";;
+    $vars['selectivizr'] .= '<![endif]-->' . "\n";;
+  }
+
 
   /*
     Go through all the hooks of drupal and give em epic love
@@ -70,8 +78,8 @@ function mothership_preprocess(&$vars, $hook) {
 
     //get the path for the site
     $vars['mothership_path'] = $base_url .'/'. $path_mothership;
-    
-    
+
+
     //lets make it a tiny bit more readable in the html.tpl.php
     //gets processed in mothership_process_html
     $vars['html_attributes_array'] = array(
@@ -131,7 +139,7 @@ function mothership_preprocess(&$vars, $hook) {
     }
 
     if (theme_get_setting('mothership_mediaquery_indicator')) {
-      drupal_add_css( $path_mothership . '/css/mothership-devel-mediaqueries.css', array('group' => CSS_THEME, 'every_page' => TRUE, 'weight' => 0));      
+      drupal_add_css( $path_mothership . '/css/mothership-devel-mediaqueries.css', array('group' => CSS_THEME, 'every_page' => TRUE, 'weight' => 0));
     }
 
     //LIBS
@@ -143,12 +151,7 @@ function mothership_preprocess(&$vars, $hook) {
     }
 
     //---- selectivizr
-    $vars['selectivizr'] = '';
-    if(theme_get_setting('mothership_selectivizr')) {
-      $vars['selectivizr'] .= '<!--[if (gte IE 6)&(lte IE 8)]>' . "\n";;
-      $vars['selectivizr'] .= '<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/selectivizr/1.0.2/selectivizr-min.js"></script>' . "\n";;
-      $vars['selectivizr'] .= '<![endif]-->' . "\n";;
-    }
+    $vars['selectivizr'] = $selectivizr;
 
     //---html5 fix
     $vars['html5iefix'] = '';
@@ -196,7 +199,7 @@ function mothership_preprocess(&$vars, $hook) {
     if (theme_get_setting('mothership_classes_body_nodetype')) {
       $vars['classes_array'] = preg_grep('/^node-type/', $vars['classes_array'], PREG_GREP_INVERT);
     }
-    
+
     if (theme_get_setting('mothership_classes_body_path')) {
       $path_all = drupal_get_path_alias($_GET['q']);
       $vars['classes_array'][] = drupal_html_class('path-' . $path_all);
@@ -304,11 +307,11 @@ function mothership_preprocess(&$vars, $hook) {
     if (theme_get_setting('mothership_classes_block')) {
       $vars['classes_array'] = array_values(array_diff($vars['classes_array'],array('block')));
     }
-    
+
     if (theme_get_setting('mothership_classes_block')) {
       $vars['classes_array'] = preg_grep('/^block-/', $vars['classes_array'], PREG_GREP_INVERT);
     }
-    
+
     if (theme_get_setting('mothership_classes_block_contextual')) {
       $vars['classes_array'] = array_values(array_diff($vars['classes_array'],array('contextual-links-region')));
     }
@@ -352,7 +355,7 @@ function mothership_preprocess(&$vars, $hook) {
     //add new theme hook suggestions based on type & wiewmode
     // a default catch all theaser are set op as node--nodeteaser.tpl.php
     //kpr($vars['theme_hook_suggestions']);
-    
+
     //one unified node teaser template
     if($vars['view_mode'] == "teaser"){
       $vars['theme_hook_suggestions'][] = 'node__nodeteaser';
@@ -369,7 +372,7 @@ function mothership_preprocess(&$vars, $hook) {
     if($vars['view_mode'] == "teaser" AND $vars['is_front']){
       $vars['theme_hook_suggestions'][] = 'node__nodeteaser__front';
     }
-   
+
     //$vars['theme_hook_suggestions'][] = 'node__' . $vars['type'] ;
 
     //fx node--gallery--teaser.tpl
@@ -381,9 +384,9 @@ function mothership_preprocess(&$vars, $hook) {
       $vars['theme_hook_suggestions'][] = 'node__noderef__' . $vars['type'];
       $vars['theme_hook_suggestions'][] = 'node__noderef__' . $vars['type'] . '__' . $vars['view_mode'];
     }
-    
 
-    
+
+
     $vars['id_node'] ="";
 
     if (theme_get_setting('mothership_classes_node')) {
@@ -513,7 +516,7 @@ function mothership_preprocess(&$vars, $hook) {
 
     $vars['path'] = $path;
     $vars['appletouchicon'] = $appletouchicon;
-    $vars['selectivizr'] = $selectivizr;
+    $vars['selectivizr'] = !empty($selectivizr) ? $selectivizr : false ;
     $vars['theme_hook_suggestions'][] = 'static__maintenance';
 
   }