diff -urp cygdrive/d/drupal/patches/new/skinr/modules/node.skinr.inc cygdrive/d/drupal/patches/old/skinr/modules/node.skinr.inc
--- cygdrive/d/drupal/patches/new/skinr/modules/node.skinr.inc	2010-10-22 12:06:03.090550800 +0530
+++ cygdrive/d/drupal/patches/old/skinr/modules/node.skinr.inc	2010-03-04 19:37:00.000000000 +0530
@@ -29,11 +29,6 @@ function node_skinr_config() {
   $data['node']['preprocess']['node'] = array(
     'index_handler' => 'node_skinr_preprocess_index_handler',
   );
-  $data['node']['form']['page_node_form'] = array(
-    'index_handler' => 'node_skinr_form_index_handler',
-    'preprocess_hook' => 'node',
-    'title' => t('node settings'),
-  );
 
   return $data;
 }
@@ -58,6 +53,7 @@ function node_skinr_form_index_handler($
   switch ($op) {
     case 'form':
       return $form['#node_type']->type;
+
     case 'submit':
       // Clear old variable before we set a new one if the node type has changed
       if ($form_state['values']['old_type'] != $form_state['values']['type']) {
@@ -71,9 +67,6 @@ function node_skinr_form_index_handler($
           skinr_set($skinr);
         }
       }
-	if (isset($form_state['values']['nid'])) {
-	  return $form_state['values']['nid'];
-	}
     return $form_state['values']['type'];
   }
 }
@@ -89,9 +82,8 @@ function node_skinr_form_index_handler($
  *   The preprocess_hook we wish to use.
  */
 function node_skinr_preprocess_hook_callback(&$form, $form_state) {
-
   $preprocess_hooks = array();
-  
+
   if (!isset($form['#node_type']->type) && !empty($form['skinr']['sid']['#value'])) {
     $preprocess_hooks[] = 'node_'. $form['skinr']['sid']['#value'];
   }
@@ -114,20 +106,7 @@ function node_skinr_preprocess_hook_call
  *   structure and merge the returned classes.
  */
 function node_skinr_preprocess_index_handler(&$vars) {
-  $sids = array();
-  
-  $theme = skinr_current_theme();
-  
-  $skinr = skinr_get($theme, 'node', $vars['node']->type);
-  if (isset($skinr->sid)) {
-    $sids[] = $vars['node']->type;
-  }
-  
-  $skinr = skinr_get($theme, 'node', $vars['node']->nid);
-  if (isset($skinr->sid)) {
-    $sids[] = $vars['node']->nid;
-  }
-  return $sids;
+  return $vars['node']->type;
 }
 
 /**
diff -urp cygdrive/d/drupal/patches/new/skinr/skinr.module cygdrive/d/drupal/patches/old/skinr/skinr.module
--- cygdrive/d/drupal/patches/new/skinr/skinr.module	2010-10-22 16:56:23.554944400 +0530
+++ cygdrive/d/drupal/patches/old/skinr/skinr.module	2010-10-08 06:11:56.000000000 +0530
@@ -33,7 +33,6 @@ function skinr_init() {
  * Implementation of hook_preprocess().
  */
 function skinr_preprocess(&$vars, $hook) {
-
   // Let's make sure this has been run. There have been problems where other
   // modules implement a theme function in their hook_init(), so we make doubly
   // sure that the includes are included.
@@ -69,7 +68,7 @@ function skinr_preprocess(&$vars, $hook)
         }
         $vars['skinr'] = implode(' ', $extracted['classes']);
         $vars['skinr_array'] = $extracted['classes'];
-        
+
         // Need to add a hook for skinr_ui to plug into.
         $data = array(
           'hook' => $hook,
@@ -87,7 +86,6 @@ function skinr_preprocess(&$vars, $hook)
 }
 
 function skinr_skin_extract($module, $sids, $settings, $theme = NULL, $reset = FALSE) {
-
   if (empty($sids)) {
     return FALSE;
   }
@@ -110,29 +108,13 @@ function skinr_skin_extract($module, $si
   );
 
   $skins = array();
-  // Collects the skins in $skins below
   foreach ($sids as $sid) {
     if ($skinr = skinr_get($theme, $module, $sid, $reset)) {
-      foreach ($skinr->skins as  $key => $value) {
-		$skins[$key] = "$skins[$key] ". "$value";
-	  }
-	}
+      $skins = $skinr->skins + $skins;
+    }
     // Only need to reset the first time.
     $reset = FALSE;
   }
-  // Removes duplicate skins below
-  $string_skins = $skins[key($skins)];
-  $string_skins = explode(" ", $string_skins);
-  $output[] = $string_skins[0];
-  for ($i=0; $i < count($string_skins); $i++) {
-    if (!in_array($string_skins[$i], $output)) {
-	  $output[]=$string_skins[$i];
-	}
-  }
-  $output =  implode(" ", $output);
-  $skins[key($skins)] = $output;
-
-  //  $skins = array_unique($skins);
 
   // Allow other modules to alter the skinr skins array.
   // @todo Fix this to work with skinr ui.
@@ -148,6 +130,7 @@ function skinr_skin_extract($module, $si
   }
 
   $extracted['classes'] = skinr_flatten_skins_array($skins);
+
   return $extracted;
 }
 
@@ -313,7 +296,6 @@ function skinr_flatten_skins_array($skin
  * Save a skinr page rule object.
  */
 function skinr_rule_save($rule) {
-
   drupal_write_record('skinr_rules', $rule, !empty($rule->rid) ? array('rid') : array());
 }
 
@@ -329,6 +311,7 @@ function skinr_rule_load($rid = NULL) {
       $rule->roles = unserialize($rule->roles);
       $rules[] = $rule;
     }
+
     return $rules;
   }
   else {
@@ -505,7 +488,6 @@ function skinr_get($theme = NULL, $modul
   }
 
   if (!isset($cache[$theme][$module][$sid])) {
-    
     if (!isset($cache[$theme])) {
       $cache[$theme] = array();
     }
@@ -536,21 +518,17 @@ function skinr_get($theme = NULL, $modul
   if (is_null($sid) && is_null($module)) {
     // Return all the skinrs for the theme.
     if (isset($cache[$theme])) {
-
       return $cache[$theme];
     }
   }
   elseif(is_null($sid)) {
     // Return all the skinrs for the module.
     if (isset($cache[$theme][$module])) {
-
       return $cache[$theme][$module];
     }
   }
   elseif (isset($cache[$theme][$module][$sid])) {
-
-	return $cache[$theme][$module][$sid];
-	
+    return $cache[$theme][$module][$sid];
   }
   return FALSE;
 }
@@ -838,7 +816,6 @@ function _skinr_add_paths_to_files(&$ski
  *    An array of files with the root path added.
  */
 function _skinr_add_path_to_files($files, $path, $type) {
-
   if ($type == 'css') {
     $pathed_stylesheets = array();
     foreach ($files as $media => $stylesheets) {
@@ -936,7 +913,6 @@ function skinr_skinsets($type, $refresh
  *   Array of statuses for individual skins in a skinset.
  */
 function skinr_skinset_statuses($skinset_name, $refresh = FALSE) {
-
   static $statuses = array();
 
   if (isset($refresh)) {
@@ -960,7 +936,6 @@ function skinr_skinset_statuses($skinset
  *   Array of all available skinsets and their data.
  */
 function skinr_rebuild_skinset_data() {
-
   $skinsets = _skinr_skins_data();
   skinr_get_files_database($skinsets);
 
@@ -977,7 +952,6 @@ function skinr_rebuild_skinset_data() {
  * Implementation of hook_flush_caches().
  */
 function skinr_flush_caches() {
-
   skinr_rebuild_skinset_data();
   return array();
 }
@@ -989,7 +963,6 @@ function skinr_flush_caches() {
  *   An array of files to check.
  */
 function skinr_get_files_database(&$files) {
-
   // Extract current files from database.
   $result = db_query("SELECT filename, name, status FROM {skinr_skinsets}");
   while ($file = db_fetch_object($result)) {
@@ -1013,7 +986,6 @@ function skinr_get_files_database(&$file
  * @todo Use DB caching. No need to keep processing things every page load.
  */
 function skinr_skin_data() {
-
   static $cache = NULL;
 
   if (is_null($cache)) {