Index: branches/2.5/expressoCalendar/inc/hook_admin.inc.php
===================================================================
--- branches/2.5/expressoCalendar/inc/hook_admin.inc.php	(revision 5804)
+++ branches/2.5/expressoCalendar/inc/hook_admin.inc.php	(revision 7982)
@@ -13,5 +13,6 @@
 	$title = $appname;
 	$file = Array(
-		'ExpressoCalendar migração' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname)
+                'ExpressoCalendar migration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname. '&config=migra'), 
+        'Global Settings' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname) 
 	);
 	//Do not modify below this line
Index: branches/2.5/expressoCalendar/templates/default/config.tpl
===================================================================
--- branches/2.5/expressoCalendar/templates/default/config.tpl	(revision 5804)
+++ branches/2.5/expressoCalendar/templates/default/config.tpl	(revision 7982)
@@ -1,41 +1,34 @@
 <!-- BEGIN header -->
-<form  method="POST" action="{action_url}">
-<input type="hidden" name="migration" value="true">
-<table border="0" align="center">
-	<tr class="th">
-		<td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
-	</tr>
-	<tr>
-   		<td></td>
-	</tr>
-	<tr>
-		<td colspan="2"><b>{error}</b></td>
-	</tr>
-   <tr>
-   	<td></td>
-   </tr>
-<!-- END header -->
-<!-- BEGIN body -->
-	<tr class="th">
-		<td colspan="2" align="center"><b>{lang_expressoCalendar_migration}</b></td>
-	</tr>
-	<tr>
-   		<td></td>
-	</tr>
-	<tr class="row_on">
-		<td>{lang_Migrate_all_calendar_events_for_expressoCalendar}:</td>
-	</tr>	
-<!-- END body -->
-<!-- BEGIN footer -->
-	<tr class="th">
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td colspan="2" align="center">
-			<input type="submit" name="submit" value="{lang_submit}">
-			<input type="submit" name="cancel" value="{lang_cancel}">
-		</td>
-	</tr>
-</table>
+<form method="POST" action="{action_url}"> 
+    <table border="0" align="center"> 
+        <!-- END header --> 
+        <!-- BEGIN body --> 
+        <tr class="th"> 
+            <td colspan="2" align="center"><b>{lang_expressoCalendar_Setup}</b></td> 
+        </tr> 
+ 
+        <tr><td></td></tr> 
+ 
+        <tr class="row_off"> 
+            <td>{lang_Auto_import_calendars_to_receive_an_internal_event}:</td> 
+            <td> 
+                <select name="newsettings[expressoCalendar_autoImportCalendars]"> 
+                    <option value="false" {selected_expressoCalendar_autoImportCalendars_false}>{lang_no}</option> 
+                    <option value="true"  {selected_expressoCalendar_autoImportCalendars_true}>{lang_yes}</option> 
+                </select> 
+            </td> 
+        </tr> 
+        <!-- END body --> 
+        <!-- BEGIN footer --> 
+        <tr class="th"> 
+            <td colspan="2">&nbsp;</td> 
+        </tr> 
+        <tr> 
+            <td colspan="2" align="center"> 
+                <input type="submit" name="submit" value="{lang_submit}"> 
+                <input type="submit" name="cancel" value="{lang_cancel}"> 
+            </td> 
+        </tr> 
+    </table> 
 </form>
 <!-- END footer -->
Index: branches/2.5/expressoCalendar/templates/default/migra.tpl
===================================================================
--- branches/2.5/expressoCalendar/templates/default/migra.tpl	(revision 7982)
+++ branches/2.5/expressoCalendar/templates/default/migra.tpl	(revision 7982)
@@ -0,0 +1,41 @@
+<!-- BEGIN header -->
+<form  method="POST" action="{action_url}">
+<input type="hidden" name="migration" value="true">
+<table border="0" align="center">
+	<tr class="th">
+		<td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
+	</tr>
+	<tr>
+   		<td></td>
+	</tr>
+	<tr>
+		<td colspan="2"><b>{error}</b></td>
+	</tr>
+   <tr>
+   	<td></td>
+   </tr>
+<!-- END header -->
+<!-- BEGIN body -->
+	<tr class="th">
+		<td colspan="2" align="center"><b>{lang_expressoCalendar_migration}</b></td>
+	</tr>
+	<tr>
+   		<td></td>
+	</tr>
+	<tr class="row_on">
+		<td>{lang_Migrate_all_calendar_events_for_expressoCalendar}:</td>
+	</tr>	
+<!-- END body -->
+<!-- BEGIN footer -->
+	<tr class="th">
+		<td colspan="2">&nbsp;</td>
+	</tr>
+	<tr>
+		<td colspan="2" align="center">
+			<input type="submit" name="submit" value="{lang_submit}">
+			<input type="submit" name="cancel" value="{lang_cancel}">
+		</td>
+	</tr>
+</table>
+</form>
+<!-- END footer -->
