diff --git a/db/config.xml b/db/config.xml
index 9e913e3..5014e32 100644
--- a/db/config.xml
+++ b/db/config.xml
@@ -53,7 +53,7 @@
 		<y>10</y>
 	</item>
 	<item id="mappy">
-		<visibility>true</visibility>
+		<visibility>false</visibility>
 	</item>
 	<item id="gmap">
 		<visibility>true</visibility>
diff --git a/index.php b/index.php
index 91c61cb..ea26623 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,3 @@
-<?
-if($config = simplexml_load_file('db/config.xml')){
-	$config_xml = $config->item;
-?>
 <html> 
 <head> 
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -9,157 +5,16 @@ if($config = simplexml_load_file('db/config.xml')){
 	<link rel="stylesheet" type="text/css" href="css/main.css">
 	<link rel="stylesheet" type="text/css" href="css/jquery.fancybox-1.3.0.css">
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="js/jquery.fancybox-1.3.1.pack.js"></script>
 	<script type="text/javascript" src="js/main.js"></script>
-	
-	
-	<?if ($config_xml[0]->visibility == "true"){?>
-	<script type="text/javascript" src="js/jquery.jclock.js"></script>
-	<?}
-	if ($config_xml[2]->visibility == "true"){?>
-	<script type="text/javascript" src="js/jquery.notes.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/note.css">
-	<?}
-	if ($config_xml[1]->visibility == "true"){
-		$city = $config_xml[1]->city;
-		include 'GoogleMeteo.php';
-		?><script type="text/javascript" src="js/jquery.weather.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/weather.css"><?
-	}
-	if($config_xml[5]->visibility == "true")
-		echo '<script type="text/javascript" src="js/jquery.blogs.js"></script>';
-	if($config_xml[6]->visibility == "true")
-		echo '<link rel="stylesheet" type="text/css" href="css/todo.css">';
-?>
-
 	<title>Ma Page d'accueil</title> 
-
 </head> 
- 
 <body> 
-
-<?if ($config_xml[0]->visibility == "true"){?><div class="jclock" id="clock" style="left:<?echo $config_xml[0]->x;?>; top:<?echo $config_xml[0]->y;?>;"></div>
-<?}?>
-<?if ($config_xml[1]->visibility == "true"){?>
-<div id="weather" style="left:<?echo $config_xml[1]->x;?>; top:<?echo $config_xml[1]->y;?>;">
-	<div class="weatherpic"></div>
-	<strong><?echo $present_weather;?></strong><br/>
-	<?echo $future_weather1;?><br/>
-	<?echo $future_weather2;?>
-</div>
-<?}?>
-<?if ($config_xml[2]->visibility == "true"){?>
-<a id="addButton" class="green-button" href="add_note.html">Add a note</a><?include 'notes_extract.php';?>
-<?}?>
-<?if($config_xml[3]->visibility == "true"){?>
-<center>
-<form method="get" action="http://www.google.fr/custom" target="_top" name="form" id="form">
-<table bgcolor="#ffffff" id="recherche">
-<tr><td nowrap="nowrap" valign="top" align="left" height="32">
-<input type="text" name="q" id="q" size="31" maxlength="255" value=""></input>
-<input type="submit" name="sa" value="Rechercher" class="searchbutton"></input>
-<input type="hidden" name="client" value="pub-5878090856826866"></input>
-<input type="hidden" name="forid" value="1"></input>
-<input type="hidden" name="ie" value="ISO-8859-1"></input>
-<input type="hidden" name="oe" value="ISO-8859-1"></input>
-<input type="hidden" name="cof" value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;FORID:1;"></input>
-<input type="hidden" name="hl" value="fr"></input>
-</td></tr></table>
-</form>
-</center>
-<? }?>
-<?if($config_xml[4]->visibility == "true"){?>
-	<div class="appscontainer"> 
-		<span class="label">Google Apps</span> 
-		<ul class="iconlist"> 
-			<li class="item"><a href="http://mail.google.com" onclick="spawnLink(this);return false;"><img src="images/links/gmail_128.png" /><br>Gmail</a></li> 
-			<li class="item"><a href="http://mail.live.com" onclick="spawnLink(this);return false;"><img src="images/links/mail-msn.png" /><br>Hotmail</a></li> 
-			<li class="item"><a href="http://mail1.voila.fr/webmail/fr_FR/login.html" onclick="spawnLink(this);return false;"><img src="images/links/voila.png" /><br>Voila.fr mail</a></li> 
-			<li class="item"><a href="http://calendar.google.com" onclick="spawnLink(this);return false;"><img src="images/links/calendar_128.png" /><br>Google&nbsp;Calendar</a></li> 
-			<li class="item"><a href="http://reader.google.com" onclick="spawnLink(this);return false;"><img src="images/links/reader_128.png" /><br>Google Reader</a></li>
-			<li class="item"><a href="http://docs.google.com" onclick="return spawnLink(this);"><img src="images/links/docs_128.png" /><br>Google Docs</a></li> 
-		</ul> 
-		<hr> 
- 
-		<span class="label">Media</span> 
-		<ul class="iconlist"> 
-			<li class="item"><a href="http://youtube.com" onclick="spawnLink(this);return false;"><img src="images/links/youtube_128.png" /><br>YouTube</a></li> 
-			<li class="item"><a href="http://picasaweb.com" onclick="spawnLink(this);return false;"><img src="images/links/picasaweb_128.png" /><br>PicasaWeb</a></li> 
-			<li class="item"><a href="http://www.netvibes.com" onclick="spawnLink(this);return false;"><img src="images/links/netvibes.png" /><br>Netvibes</a></li> 
-			<li class="item"><a href="http://www.deviantart.com" onclick="spawnLink(this);return false;"><img src="images/links/deviantART128.png" /><br>DeviantArt</a></li>
-			<li class="item"><a href="https://www.labanquepostale.fr/index.html" onclick="spawnLink(this);return false;"><img src="images/links/banquepostale.png" /><br>Banque 1</a></li>
-			<li class="item"><a href="http://www.societegenerale.fr/" onclick="spawnLink(this);return false;"><img src="images/links/societegenerale.png" /><br>Banque 2</a></li>			
-		</ul> 
-		<hr> 
- 
-		<span class="label">Desk Accessories</span> 
-		<ul class="iconlist"> 
-			<li class="item"><a href="javascript: openContactList()" ><img src="images/links/contacts.png" /><br>Contacts</a></li> 
-			<li class="item"><a href="javascript: openCalculator();"><img src="images/links/calculator.png" width="16" height="16" /><br>Calculator</a></li> 
-			<li class="item"><a href="javascript: openTodo();"><img src="images/links/tasks.png" width="16" height="16" /><br>To-do list</a></li> 
-			<li class="item"><a href="javascript: openCalendar();"><img src="images/links/calendar_128.png" width="16" height="16" /><br>Calendar Panel</a></li> 
-            <li class="item"><a href="javascript: openNotepad();"><img src="images/links/notepad.png" width="16" height="16" /><br>NotePad</a></li>
-		</ul> 
-		<hr> 
- 
-		<span class="label">Entertainment</span> 
-		<ul class="iconlist"> 
-			<li class="item"><a href="http://facebook.com" onclick="spawnLink(this);return false;"><img src="images/links/facebook.png" /><br>Facebook</a></li> 
-			<li class="item"><a href="http://twitter.com" onclick="spawnLink(this);return false;"><img src="images/links/twitter.png" />Twitter</a></li> 
-			<li class="item"><a href="http://fr.vente-privee.com/" onclick="spawnLink(this);return false;"><img src="images/links/vp128.png" />Ventes Privées</a></li>
-			<li class="item"><a href="http://www.google.fr/movies" onclick="spawnLink(this);return false;"><img src="images/links/Gmovie.png" />Horaires Ciné</a></li>			
-			
-		</ul> 
-		<hr> 
- 
-	</div>
-	<?}?>
-	<a href="#config" id="config-menu">Configuration</a>
-	<div style="display:none;">
-	<div id="config">
-	<form id="config_form" action="" method="post">
-		<h3>Modules configuration</h3><br/>
-		<?=$config_xml[0]->attributes()?> module : <input type="radio" name="clock_group" value="true"<?if ($config_xml[0]->visibility == "true"){echo " checked";}?> />true&nbsp;&nbsp;<input type="radio" name="clock_group" value="false"<?if ($config_xml[0]->visibility == "false"){echo " checked";}?> />false<br/><br/>
-		<?=$config_xml[1]->attributes()?> module : <input type="radio" name="meteo_group" value="true"<?if ($config_xml[1]->visibility == "true"){echo " checked";}?> />true&nbsp;&nbsp;<input type="radio" name="meteo_group" value="false"<?if ($config_xml[1]->visibility == "false"){echo " checked";}?> />false<br/><br/>
-		<?=$config_xml[2]->attributes()?> module : <input type="radio" name="notes_group" value="true"<?if ($config_xml[2]->visibility == "true"){echo " checked";}?> />true&nbsp;&nbsp;<input type="radio" name="notes_group" value="false"<?if ($config_xml[2]->visibility == "false"){echo " checked";}?> />false<br/><br/>
-		<?=$config_xml[3]->attributes()?> module : <input type="radio" name="search_group" value="true"<?if ($config_xml[3]->visibility == "true"){echo " checked";}?> />true&nbsp;&nbsp;<input type="radio" name="search_group" value="false"<?if ($config_xml[3]->visibility == "false"){echo " checked";}?> />false<br/><br/>
-		<?=$config_xml[4]->attributes()?> module : <input type="radio" name="links_group" value="true"<?if ($config_xml[4]->visibility == "true"){echo " checked";}?> />true&nbsp;&nbsp;<input type="radio" name="links_group" value="false"<?if ($config_xml[4]->visibility == "false"){echo " checked";}?> />false<br/><br/>
-		<?=$config_xml[5]->attributes()?> module : <input type="radio" name="blogs_group" value="true"<?if ($config_xml[5]->visibility == "true"){echo " checked";}?> />true&nbsp;&nbsp;<input type="radio" name="blogs_group" value="false"<?if ($config_xml[5]->visibility == "false"){echo " checked";}?> />false<br/><br/>
-		<a id="config-submit" href="" class="green-button">Enregistrer</a>
-	</form>
-	</div>
-	</div>
-	<?if($config_xml[5]->visibility == "true"){require('blogs_last_post.php');
-		echo '<a href="#blogLinksManager" id="blog-links-manager">Manage blog links</a>';?>
-	<div style="display:none;">
-	<div id="blogLinksManager">
-		<h3>Blogs Management</h3><br/>
-		<h4>Delete Site feed</h4>
-		<ul>
-		<?$blogs = new Blogs_last_post();
-			foreach($blogs->getLinks() as $link)
-				echo '<li>'.$link['url'].' <img src="images/interface/delete.png" id="link-'.$link['name'].'"/></li>';?>
-		</ul>
-		<h4>Insert Site feed</h4>
-		<form action="addSite.php" method="POST">
-		<input type="text" id="newLink" name="newLink" value="url" />
-		<input type="submit" id="link-submit" class="green-button" value="Ajouter"></input>
-		</form>
-	</div>
-	</div>
-	<?}?>
-<?if($config_xml[6]->visibility == "true"){
-$xmla = simplexml_load_file('db/todoist.xml');
-echo '<div id="todoList">';
-if($xmla->token== '' || $xmla->token == null || $xmla->id == '' || $xmla->id == null)
-echo 'Impossible de trouver votre configuration. <a href="install-todoist.php">Cliquez ici</a> pour la mettre en place.</div>';
-else{
-$token 	= $xmla->token;
-$id		= $xmla->id;?>
-</div>
-<script type="text/javascript" src="js/getUncompletedTasks.php?token=<?=$token?>&id=<?=$id?>"></script>
-<?}}?>
+<?
+require 'class/AccueilModules.php';
+$index = new AccueilModules();
+?>
 </body> 
 </html> 
-<?} else {die('Fichier de configuration non trouvé');}?>
+
diff --git a/modules/links/db/links.xml b/modules/links/db/links.xml
index 78ffe2e..1a373f1 100644
--- a/modules/links/db/links.xml
+++ b/modules/links/db/links.xml
@@ -13,10 +13,10 @@
 			<title>Hotmail</title>
 		</link>
 		<link>
-			<url>http://mail1.voila.fr/webmail/fr_FR/login.html</url>
+			<url>http://fr.mail.yahoo.com/</url>
 			<onclick>popup</onclick>
-			<img>voila.png</img>
-			<title>Voila.fr mail</title>
+			<img>mail-yahoo.png</img>
+			<title>Yahoo Mail</title>
 		</link>
 		<link>
 			<url>http://calendar.google.com</url>
@@ -62,18 +62,6 @@
 			<img>deviantART128.png</img>
 			<title>DeviantArt</title>
 		</link>
-		<link>
-			<url>https://www.labanquepostale.fr/index.html</url>
-			<onclick>popup</onclick>
-			<img>banquepostale.png</img>
-			<title>Banque 1</title>
-		</link>
-		<link>
-			<url>http://www.societegenerale.fr/</url>
-			<onclick>popup</onclick>
-			<img>societegenerale.png</img>
-			<title>Banque 2</title>
-		</link>
 	</label>
 	<label id="Desk Accessories">
 	<link>
@@ -135,10 +123,10 @@
 	</label>	
 	<reserve>
 		<link>
-			<url>http://fr.mail.yahoo.com/</url>
+			<url>http://mail1.voila.fr/webmail/fr_FR/login.html</url>
 			<onclick>popup</onclick>
-			<img>mail-yahoo.png</img>
-			<title>Yahoo Mail</title>
+			<img>voila.png</img>
+			<title>Voila.fr mail</title>
 		</link>
 		<link>
 			<url>http://www.meebo.com/messenger/</url>
@@ -164,5 +152,17 @@
 			<img>leboncoin.gif</img>
 			<title>LeBonCoin</title>
 		</link>
+		<link>
+			<url>https://www.labanquepostale.fr/index.html</url>
+			<onclick>popup</onclick>
+			<img>banquepostale.png</img>
+			<title>Banque 1</title>
+		</link>
+		<link>
+			<url>http://www.societegenerale.fr/</url>
+			<onclick>popup</onclick>
+			<img>societegenerale.png</img>
+			<title>Banque 2</title>
+		</link>
 	</reserve>
 </links>
\ No newline at end of file
diff --git a/modules/notes/db/notes.xml b/modules/notes/db/notes.xml
index 789527e..3791b45 100644
--- a/modules/notes/db/notes.xml
+++ b/modules/notes/db/notes.xml
@@ -3,4 +3,4 @@
 
 
 
-<note id="2"><text>Test de post-it.</text><color>green</color><zindex>1</zindex><top>153</top><left>53</left></note><note id="7"><text>/!\ C'est bien fait ? :)</text><color>yellow</color><zindex>1</zindex><top>85</top><left>1038</left></note><note id="10"><text>Des améliorations ?</text><color>yellow</color><zindex>1</zindex><top>264</top><left>1038</left></note><note id="11"><text>Application android pour les horaires et prix des trains à faire</text><color>blue</color><zindex>2</zindex><top>586</top><left>916</left></note></Notes>
+<note id="2"><text>Test de post-it.</text><color>green</color><zindex>1</zindex><top>153</top><left>53</left></note><note id="7"><text>/!\ C'est bien fait ? :)</text><color>yellow</color><zindex>1</zindex><top>85</top><left>1038</left></note><note id="10"><text>Des améliorations ?</text><color>yellow</color><zindex>1</zindex><top>264</top><left>1038</left></note></Notes>
