diff --git a/README.md b/README.md
index 142f88e1..b4e21c85 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@
 
 - Build status: [![Build Status](https://travis-ci.org/Xephi/AuthMeReloaded.svg?branch=master)](https://travis-ci.org/Xephi/AuthMeReloaded)
 
-- Build Server (Jenkins): http://ci.xephi.fr
+- Build Server: <a href="http://ci.xephi.fr">Jenkins</a>
 
-- JavaDoc: <a href="http://xephi.github.io/AuthMeReloaded/index.html">AuthMe Javadoc</a></p>
+- JavaDoc: <a href="http://xephi.github.io/AuthMeReloaded/index.html">AuthMe Javadoc</a>
 
-- MavenRepository: <p><a href="http://xephi.fr:8080/plugin/repository/everything/">Maven Repo</a></p>
+- MavenRepository: <a href="http://xephi.fr:8080/plugin/repository/everything/">Maven Repo</a>
 
 <hr>
 
@@ -38,7 +38,7 @@ AuthMe Reloaded prevents players who aren't logged in from actions like placing
 <p>Login Sessions make it possible that you don't have to login within a given time period.</p>
 <p>Each command and every setting can be enabled or disabled by a easy structured config file. </p>
 <p>If you don't like English or don't like my translations you can easily edit almost every message sent by AuthMe!</p>
-======================
+
 ####Features:
 <ul><li><strong>E-Mail Recovery System</strong> !!!
 </li><li>Playername spoof protection
@@ -80,12 +80,12 @@ AuthMe Reloaded prevents players who aren't logged in from actions like placing
 </li><li>Import your database from Rakamak, xAuth, CrazyLogin, RoyalAuth, vAuth !
 </li></ul>
 ####Configuration
-<p><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/configure-auth-me/">How to Configure Authme</a></p>
+<a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/configure-auth-me/">How to Configure Authme</a>
 ####Email Recovery Dependency
-<p><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-configure-email-recovery-system/">How to configure email recovery system?</a></p>
+<a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-configure-email-recovery-system/">How to configure email recovery system?</a>
 ####Commands
-<p><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/command/">Command list and usage</a></p>
-<h2 id="w-permissions">Permissions</h2>
+<a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/command/">Command list and usage</a>
+####Permissions
 <ul><li>authme.player.* - for all user command
 </li><li>authme.admin.* - for all admin command
 </li><li>authme.* - for all user and admin command
@@ -99,21 +99,17 @@ AuthMe Reloaded prevents players who aren't logged in from actions like placing
 </li><li><a href="http://dev.bukkit.org/server-mods/authme-reloaded/pages/how-to-import-database-from-rakamak/">How to convert from Rakamak</a>
 </li><li>Convert from FlatFile (auths.db but not the sqlite one ) to MySQL : /converter
 </li></ul>
-======================
+<hr>
 
-
-<h2 id="w-geo-ip">GeoIP</h2>
+#####GeoIP
 <p>This product includes and download automatically GeoLite data created by MaxMind, available from <a href="http://www.maxmind.com">http://www.maxmind.com</a></p>
-<h2 id="w-donate">Donate</h2>
+
+#####Donate
 <p>Do you like my work ? Or just want to buy me a coffee for quickly update?<br>
-Use this link in EUR :
-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=QLMM9SNCX825Y"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" alt="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" title="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif"></a>
-Or this link in USD :
-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=PWQMYCP2SAH6L"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" alt="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" title="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif"></a></p>
+Use this link in EUR: <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=QLMM9SNCX825Y"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif"></a>
+Or this link in USD: <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=PWQMYCP2SAH6L"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif"></a></p>
+
+#####Credits
 <p>Credit for old version to d4rkwarriors, fabe1337 , Whoami and pomo4ka</p>
 <p>Thanks to : AS1LV3RN1NJA, Hoeze, eprimex</p>
-<h2 id="w-official-servers">Official servers</h2>
-<p><a href="http://www.minewish.fr/">Minewish Serveur homepage (French server)</a> <br>
-<img src="https://minestatus.net/47900-minewish/image/original.png" alt="Minewish" title="Minewish"> <br>
-<a href="http://www.rautamiekka.org/?page_id=14">EpriMC homepage (English/Finnish)</a>
-<img src="http://minecraft-server-list.com/server/logo/51237.png" alt="EpriMC" title="EpriMC"> <br></p>
+