diff --git a/_config.yml b/_config.yml
index 0551acc8..5b33cc09 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,6 +29,15 @@ icteamURL: https://www.uclouvain.be/en-icteam.html
 intopixURL: http://www.intopix.com/
 latestReleaseURL: https://github.com/uclouvain/openjpeg/releases/latest
 allReleasesURL: https://github.com/uclouvain/openjpeg/releases/
+docInstallURL: https://github.com/uclouvain/openjpeg/wiki/Installation
+docUsageURL: https://github.com/uclouvain/openjpeg/wiki/DocJ2KCodec
+docAPIURL: http://www.openjpeg.org/libdoc/index.html
+ciURL: http://my.cdash.org/index.php?project=OPENJPEG
+dataURL: https://github.com/uclouvain/openjpeg-data
+newIssueURL: https://github.com/uclouvain/openjpeg/issues/new
+mlURL: 'https://groups.google.com/forum/#!forum/openjpeg'
+mlsubURL: 'https://groups.google.com/forum/#!forum/openjpeg/join'
+refSoftURL: http://www.jpeg.org/jpeg2000/software.html
 
 # The production_url is only used when full-domain names are needed
 # such as sitemap.txt 
diff --git a/_includes/themes/twitter/default.html b/_includes/themes/twitter/default.html
index 9280d73f..03cdedc2 100644
--- a/_includes/themes/twitter/default.html
+++ b/_includes/themes/twitter/default.html
@@ -65,17 +65,22 @@
          
       <div class="sidebar">
         <h2>Documentation</h2>
+          <p><a href="{{ site.docInstallURL }}">Build / Installation</a></p>
+          <p><a href="{{ site.docUsageURL }}">Usage</a></p>
       </div>
 
+      <div class="sidebar">
+        <h2>Community</h2>
+          <p><a href="{{ site.mlURL }}">Mailing-list</a> (<a href="{{ site.mlsubURL }}">subscribe</a>)</p>
+          <p><a href="{{ site.issuesURL }}">Issue tracker</a> (<a href="{{ site.newIssueURL }}">fill an issue</a>)</p> 
+      </div>
+      
+
       <div class="sidebar">
         <h2>Developers</h2>
-          
-          <figure>
-            <a href="{{ site.issuesURL}}"><img src="{{ BASE_PATH }}/assets/images/issue-64.png" alt="issue tracker"  width="64" height="64"></a>
-        <figcaption>
-              <a href="{{ site.issuesURL}}">Issue tracker</a>
-        </figcaption>
-          </figure>           
+          <p><a href="{{ site.gitURL }}">Source code</a></p>
+          <p><a href="{{ site.dataURL }}">Test files</a></p> 
+          <p><a href="{{ site.ciURL }}">CDash</a></p> 
       </div>
 	  </div>
 	
@@ -90,14 +95,17 @@
               
 	    <div class="sidebarLeft">
 	      <!-- Column right -->
-        <p><a href="{{ BASE_PATH}}/2014/09/11/openjpeg-finalist-dpa"><img src="{{ BASE_PATH }}/assets/images/J2Klogo_wide.png" alt="JPEG 2000 Reference software"  width="200"></a></p>
+        <p><a href="{{ site.refSoftURL}}"><img src="{{ BASE_PATH }}/assets/images/J2Klogo_wide.png" alt="JPEG 2000 Reference software"  width="200"></a></p>
     <br>
     <p><a href="{{ site.uclURL}}"><img src="{{ BASE_PATH }}/assets/images/UCL_logo.png" alt="UCL"  width="160"></a></p>
     <br>
-    <p><a href="{{ site.icteamURL}}"><img src="{{ BASE_PATH }}/assets/images/logo-icteam.jpg" alt="ICTEAM"  width="160"></a></p>
-    <br>
+    <!--<p><a href="{{ site.icteamURL}}"><img src="{{ BASE_PATH }}/assets/images/logo-icteam.jpg" alt="ICTEAM"  width="160"></a></p>
+    <br>-->
     <p><a href="{{ site.intopixURL}}"><img src="{{ BASE_PATH }}/assets/images/logo_intopix.png" alt="INTOPIX"  width="160"></a></p>
-    <br><br><br><br>
+    <br><br>
+    <p><a class="twitter-timeline" href="https://twitter.com/OpenJPEG" data-widget-id="619207551389986816">Tweets de @OpenJPEG</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></p>
+    <br>
     <figure>
           <a href="{{ BASE_PATH }}/rss.xml"><img src="{{ BASE_PATH }}/assets/images/feed-icon-32.png" alt="RSS" width="32" height="32"></a>
           <figcaption>
diff --git a/index.md b/index.md
index 9161ca3d..ce641cca 100644
--- a/index.md
+++ b/index.md
@@ -7,15 +7,12 @@ tagline: An open-source JPEG 2000 codec written in C
 
 ## What is OpenJPEG ?
 
-OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of [JPEG 2000](http://www.jpeg.org/jpeg2000), a still-image compression standard from the Joint Photographic Experts Group ([JPEG](http://www.jpeg.org)).  Since october 2014, it is officially recognized by ISO/IEC and ITU-T as a [JPEG 2000 Reference Software](http://www.itu.int/rec/T-REC-T.804-201504-I!Amd2).
+OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of [JPEG 2000](http://www.jpeg.org/jpeg2000), a still-image compression standard from the Joint Photographic Experts Group ([JPEG](http://www.jpeg.org)).  Since october 2014, it is officially recognized by ISO/IEC and ITU-T as a [JPEG 2000 Reference Software](http://www.jpeg.org/jpeg2000/software.html).
 
 ## Who can use the code ?
 
 Anyone. As the OpenJPEG code is released under the [2-clauses BSD license](https://github.com/uclouvain/openjpeg/blob/master/LICENSE), anyone can use or modify the code, even for commercial applications. The only restriction is to retain the copyright in the sources or in the binaries documentation. Of course, if you modified the code in a way that might be of interest for other users, you are encouraged to share it (through a [github pull request](https://github.com/uclouvain/openjpeg/pulls) or by filling an [issue](https://github.com/uclouvain/openjpeg/issues)) but this is not a requirement.
-
-## How to install and use OpenJPEG ?
-API Documentation needs a major refactoring. Meanwhile, you can check [installation](https://github.com/uclouvain/openjpeg/wiki/Installation) instructions and [codec documentation](https://github.com/uclouvain/openjpeg/wiki/DocJ2KCodec).
     
-## Who are the developers ?
+## Who supports the project ?
 
-The library is developed and maintained by the Image and Signal Processing Group ([ISPGroup](http://sites.uclouvain.be/ispgroup/)), in the Université catholique de Louvain ([UCL](http://www.uclouvain.be/en-index.html), with the support of the [CNES](https://cnes.fr/), the [CS](http://www.c-s.fr/) company and the [intoPIX](http://www.intopix.com) company. The JPWL module has been developed by the Digital Signal Processing Lab ([DSPLab](http://dsplab.diei.unipg.it/)) of the University of Perugia, Italy ([UNIPG](http://www.unipg.it/)).
\ No newline at end of file
+The library has been created and is still maintained by the Image and Signal Processing Group ([ISPGroup](http://sites.uclouvain.be/ispgroup/)), in the Université catholique de Louvain ([UCL](http://www.uclouvain.be/en-index.html)), with the support of [intoPIX](http://www.intopix.com). It has been supported and partially funded in the past by the [CNES](https://cnes.fr/) and the [CS](http://www.c-s.fr/) company. The JPWL module has been developed by the Digital Signal Processing Lab ([DSPLab](http://dsplab.diei.unipg.it/)) of the University of Perugia, Italy ([UNIPG](http://www.unipg.it/)).
\ No newline at end of file