Index: trunk/admin/install/theme_select.php
===================================================================
diff -u -r315 -r1807
--- trunk/admin/install/theme_select.php	(.../theme_select.php)	(revision 315)
+++ trunk/admin/install/theme_select.php	(.../theme_select.php)	(revision 1807)
@@ -15,16 +15,23 @@
 				              <td class="txt">
 				                <b>Default Theme:</b></td>
 				              <td>
-				                <SELECT NAME="theme">
-				<?php
-				$objThemes->Clear();
-				$objThemes->Query_Item("SELECT * FROM ".GetTablePrefix()."Theme");
-				foreach($objThemes->Items as $t)
-				{
-				    echo "<OPTION VALUE=\"".$t->Get("ThemeId")."\">".$t->Get("Name")."\n";
-				}
-				?>
-				                </SELECT>           				            				            
+				                <select name="theme">
+									<?php
+										$objThemes->Clear();
+										$objThemes->Query_Item("SELECT * FROM ".GetTablePrefix()."Theme");
+										$option_tpl = '<option value="%s"%s>%s</option>';
+										
+										$db =& inst_GetADODBConnection();
+										$modules_list = $db->GetCol('SELECT Name FROM '.GetTablePrefix().'Modules');
+										$name_selected = count($modules_list) == 2 && in_array('In-Commerce', $modules_list) ? 'incommerce' : 'default';
+										
+										foreach($objThemes->Items as $t)
+										{
+										    $selected = $t->Get('Name') == $name_selected ? ' selected' : '';
+											echo sprintf($option_tpl, $t->Get('ThemeId'), $selected, $t->Get('Name') );
+										}
+									?>
+				                </select>
 				              </td>
 				            </tr>
 				            <tr class="table_color2">