diff --git a/.htaccess b/.htaccess
index 53d89e2..3e77119 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,10 +1,33 @@
 RewriteEngine On
 
+# ################
+# RSS
+# ################
 RewriteCond %{QUERY_STRING} ^title=Special:Newpages\&feed=rss$
-RewriteRule ^index\.php$ /feed.xml? [R=301,L]
+RewriteRule ^index\.php$ https://%{HTTP_HOST}/feed.xml [R=301,NE,QSD,L]
 
+# ################
+# Conmpanion pages
+# ################
 RewriteCond %{QUERY_STRING} ^title=Sp%C3%A9cial:Nouvelles_pages&feed=rss$
-RewriteRule ^index\.php$ /feed.xml? [R=301,L]
+RewriteRule ^index\.php$ https://%{HTTP_HOST}/feed.xml [R=301,NE,QSD,L]
 
+RewriteCond %{QUERY_STRING} ^title=Special:Export/(.*)$
+RewriteRule ^index\.php$ https://%{HTTP_HOST}/%1 [R=301,NE,QSD,L]
+
+RewriteCond %{QUERY_STRING} ^title=Sp%C3%A9cial:Exporter/(.*)$
+RewriteRule ^index\.php$ https://%{HTTP_HOST}/%1 [R=301,NE,QSD,L]
+
+RewriteCond %{QUERY_STRING} ^title=Discussion:(.*)$
+RewriteRule ^index\.php$ https://%{HTTP_HOST}/%1 [R=301,NE,QSD,L] 
+
+# ################
+# Main pages
+# ################
 RewriteCond %{QUERY_STRING} [^&?]*?=([^&?]*)[&]?(.*)
-RewriteRule ^index\.php$ /%1.html?%2 [R=301,L]
\ No newline at end of file
+RewriteRule ^index\.php$ https://%{HTTP_HOST}/%1?%2 [R=301,NE,L]
+
+# ################
+# Error pages
+# ################
+ErrorDocument 404 https://%{HTTP_HOST}/404
\ No newline at end of file
diff --git a/_global/Special:AllPages.html b/_global/Special:AllPages.html
index 90080f8..d54fd6b 100644
--- a/_global/Special:AllPages.html
+++ b/_global/Special:AllPages.html
@@ -11,8 +11,8 @@ menu: ['global']
     {%- assign page_name = page_name | append: " - " | append: page.title -%}
   {%- endif -%}
   <li>
-    <a href="{{ page.url }}.html">{{ page_name }}</a>&nbsp; [{{ page.bytes }} bytes]
-    {%- if page.author_full -%}&nbsp;(by <a href="{{ page.author_full.url }}.html">{{ page.author_full.name }}</a>) {%- endif -%}
+    <a href="{{ page.url }}">{{ page_name }}</a>&nbsp; [{{ page.bytes }} bytes]
+    {%- if page.author_full -%}&nbsp;(by <a href="{{ page.author_full.url }}">{{ page.author_full.name }}</a>) {%- endif -%}
   </li>
 {%- endfor -%}
 </ul>
diff --git a/_global/Special:Categories.html b/_global/Special:Categories.html
index 5db067b..6e7bce9 100644
--- a/_global/Special:Categories.html
+++ b/_global/Special:Categories.html
@@ -13,6 +13,6 @@ menu: ['global']
 	  {%- endif -%}
   {%- endfor -%}
 
-  <li><a href="/{{ site.data.i18n[site.lang].prefix.tag }}{{ tag }}.html">{{ tag }}</a> ({{counter}} pages)</li>
+  <li><a href="/{{ site.data.i18n[site.lang].prefix.tag }}{{ tag }}">{{ tag }}</a> ({{counter}} pages)</li>
 {%- endfor -%}
 </ul>
diff --git a/_global/Special:ListRedirects.html b/_global/Special:ListRedirects.html
index 9003bdf..937cd8b 100644
--- a/_global/Special:ListRedirects.html
+++ b/_global/Special:ListRedirects.html
@@ -7,7 +7,7 @@ menu: ['global']
 {%- for source_page in site.data.wiki_redirects -%}
   <li>
     {%- assign redirect_page = source_page.redirect_target -%}
-    <a href="{{ source_page.url }}.html">{{ source_page.id }}</a> → <a href="{{ redirect_page.url }}.html">{{ redirect_page.title }}</a>
+    <a href="{{ source_page.url }}">{{ source_page.id }}</a> → <a href="{{ redirect_page.url }}">{{ redirect_page.title }}</a>
   </li>
 {%- endfor -%}
 </ul>
diff --git a/_global/Special:ListUsers.html b/_global/Special:ListUsers.html
index 1a1b510..bfa35d7 100644
--- a/_global/Special:ListUsers.html
+++ b/_global/Special:ListUsers.html
@@ -6,7 +6,7 @@ menu: ['global']
 <ul>
   {%- for author in site.data.authors -%}
   <li>
-    <a href="{{ author.url }}.html">{{ author.name }}</a> (<a href="{{ author.contributions_url }}.html">{{author.contributions_count}} pages</a>)
+    <a href="{{ author.url }}">{{ author.name }}</a> (<a href="{{ author.contributions_url }}">{{author.contributions_count}} pages</a>)
   </li>
   {%- endfor -%}
 </ul>
diff --git a/_global/Special:LongPages.html b/_global/Special:LongPages.html
index e7ba1a5..8deeecb 100644
--- a/_global/Special:LongPages.html
+++ b/_global/Special:LongPages.html
@@ -7,7 +7,7 @@ menu: ['global']
 <ol>
 {%- for page in long_pages limit:50 -%}
   <li>
-    <a href="{{ page.url }}.html">{{ page.title }}</a>&nbsp; [{{ page.bytes }} bytes]
+    <a href="{{ page.url }}">{{ page.title }}</a>&nbsp; [{{ page.bytes }} bytes]
   </li>
 {%- endfor -%}
 </ol>
diff --git a/_global/Special:RecentChanges.html b/_global/Special:RecentChanges.html
index 5620476..d268eac 100644
--- a/_global/Special:RecentChanges.html
+++ b/_global/Special:RecentChanges.html
@@ -7,7 +7,7 @@ menu: ['global']
 <ul>
 {%- for page in recent_changes limit:20 -%}
   <li>
-    <a href="{{ page.url }}.html">{{ page.title }}</a>
+    <a href="{{ page.url }}">{{ page.title }}</a>
     &nbsp;- {{ page.modified }}
   </li>
 {%- endfor -%}
diff --git a/_global/Special:ShortPages.html b/_global/Special:ShortPages.html
index 1c94be8..91d9250 100644
--- a/_global/Special:ShortPages.html
+++ b/_global/Special:ShortPages.html
@@ -7,7 +7,7 @@ menu: ['global']
 <ol>
 {%- for page in long_pages limit:50 -%}
   <li>
-    <a href="{{ page.url }}.html">{{ page.title }}</a>&nbsp; [{{ page.bytes }} bytes]
+    <a href="{{ page.url }}">{{ page.title }}</a>&nbsp; [{{ page.bytes }} bytes]
   </li>
 {%- endfor -%}
 </ol>
diff --git a/_global/feed.xml b/_global/feed.xml
index 2e0348c..3163900 100644
--- a/_global/feed.xml
+++ b/_global/feed.xml
@@ -7,14 +7,15 @@ layout: null
     <title>{{ site.title }}</title>
     <description>{{ site.description }}</description>
     <link>{{ site.url }}</link>
-    {% for post in site.data.wiki_pages reversed%}
+    {% assign wiki_pages = site.data.wiki_pages | sort: 'created' %}
+    {% for post in wiki_pages reversed%}
       {% unless post.draft %}
         <item>
           <title>{{ post.title | xml_escape }}</title>
-          <description>{{ post.description | xml_escape | truncate: 300 }}</description>
+          <description>{{ post.excerpt | strip_html }}</description>
           <pubDate>{{ post.created | date_to_xmlschema }}</pubDate>
-          <link>{{ post.url | prepend: site.url | append: '.html'}}</link>
-          <guid isPermaLink="true">{{ post.url | prepend: site.url  | append: '.html' }}</guid>
+          <link>{{ post.url | prepend: site.url}}</link>
+          <guid isPermaLink="true">{{ post.url | prepend: site.url }}</guid>
         </item>
       {% endunless %}
     {% endfor %}
diff --git a/_global/tags.html b/_global/tags.html
index b5f55a0..81e255d 100644
--- a/_global/tags.html
+++ b/_global/tags.html
@@ -4,7 +4,7 @@ title: Tags
 ---
 <ul>
 {% for tag in site.data.wiki_tags %}
-	<li id="n-tag-{{ tag }}"><a href="/{{ site.data.i18n[site.lang].prefix.tag }}{{ tag }}.html">{{ tag }}</a></li>
+	<li id="n-tag-{{ tag }}"><a href="/{{ site.data.i18n[site.lang].prefix.tag }}{{ tag }}">{{ tag }}</a></li>
 	<ul>
 	{% for other_page in site.data.wiki_pages %}
 	{% if other_page.tags contains tag %}
diff --git a/_includes/global.html b/_includes/global.html
index f01763d..902f577 100644
--- a/_includes/global.html
+++ b/_includes/global.html
@@ -2,7 +2,7 @@
   <h3>{{ site.data.i18n[site.lang].label.global_pages }}</h3>
   <ul class="portlet-body">
     {%- for link in site.data.i18n[site.lang].global_pages -%}
-    <li><a href="{{link.url}}.html">{{link.text}}</a></li>
+    <li><a href="{{link.url}}">{{link.text}}</a></li>
     {%- endfor -%}
   </ul>
 </div>
diff --git a/_includes/logo.html b/_includes/logo.html
index c9e97cf..a83980c 100644
--- a/_includes/logo.html
+++ b/_includes/logo.html
@@ -1,3 +1,3 @@
 <div id="logo">
-  <a href="/{{ site.data.i18n[site.lang].home }}.html" style="background-image: url({{ site.data.i18n[site.lang].logo }});" title="{{ site.data.i18n[site.lang].label.main_page }}"></a>
+  <a href="/{{ site.data.i18n[site.lang].home }}" style="background-image: url({{ site.data.i18n[site.lang].logo }});" title="{{ site.data.i18n[site.lang].label.main_page }}"></a>
 </div>
diff --git a/_includes/tags.html b/_includes/tags.html
index f271c03..41ae14d 100644
--- a/_includes/tags.html
+++ b/_includes/tags.html
@@ -4,11 +4,11 @@
   <div class="portlet-body">
     <ul>
       {%- for tag in page.tags -%}
-      <li id="n-tag-{{ tag }}"><a href="/{{ site.data.i18n[site.lang].prefix.tag }}{{ tag }}.html">{{ tag }}</a></li>
+      <li id="n-tag-{{ tag }}"><a href="/{{ site.data.i18n[site.lang].prefix.tag }}{{ tag }}">{{ tag }}</a></li>
       <ul>
       {%- for other_page in site.data.wiki_pages -%}
         {%- if other_page.tags contains tag and other_page.id != page.id -%}
-          <li><a href="{{ other_page.url }}.html">{{ other_page.title }}</a></li>
+          <li><a href="{{ other_page.url }}">{{ other_page.title }}</a></li>
         {%- endif -%}
       {%- endfor -%}
       </ul>
diff --git a/_layouts/contributions.html b/_layouts/contributions.html
index 76f2afb..71600c9 100644
--- a/_layouts/contributions.html
+++ b/_layouts/contributions.html
@@ -5,7 +5,7 @@ menu: ['global']
 <ul class="columns">
 {%- for doc in page.author_full.contributions -%}
   <li>
-    <a href="{{ doc.url }}.html">{{ doc.title }}</a>
+    <a href="{{ doc.url }}">{{ doc.title }}</a>
   </li>
 {%- endfor -%}
 </ul>
diff --git a/_layouts/redirect.html b/_layouts/redirect.html
index 5a94255..fc9d232 100644
--- a/_layouts/redirect.html
+++ b/_layouts/redirect.html
@@ -11,7 +11,7 @@
         <div class="redirectMsg">
           <p>{{ site.data.i18n[site.lang].label.redirect }} :</p>
           <ul class="redirectText">
-            <li><a href="{{ redirect_page.url }}.html" title="{{ redirect_page.name }}">{{ redirect_page.title }}</a></li>
+            <li><a href="{{ redirect_page.url }}" title="{{ redirect_page.name }}">{{ redirect_page.title }}</a></li>
           </ul>
         </div>
       </div>
diff --git a/_plugins/contributions-page-generator.rb b/_plugins/contributions-page-generator.rb
index 70bbaf3..0607736 100644
--- a/_plugins/contributions-page-generator.rb
+++ b/_plugins/contributions-page-generator.rb
@@ -11,12 +11,12 @@ module Jekyll
     def initialize(site, author)
       @site = site
       @base = site.source
-      @name = "#{author['contributions_url']}.html"
+      @name = "#{author['contributions_url']}"
 
       self.process(@name)
-      self.read_yaml(File.join(@base, '_layouts'), 'contributions.html')
+      self.read_yaml(File.join(@base, '_layouts'), 'contributions')
       self.data['author_full'] = author
-      self.data['title'] = "Contributions by <a href=\"/#{site.data['i18n'][site.config['lang']]['prefix']['user']}#{author['id']}.html\">#{author['name']}</a>"
+      self.data['title'] = "Contributions by <a href=\"/#{site.data['i18n'][site.config['lang']]['prefix']['user']}#{author['id']}\">#{author['name']}</a>"
     end
   end
 end
\ No newline at end of file
diff --git a/_wiki/Main.md b/_wiki/Main.md
index b69ff84..1c9c4c1 100644
--- a/_wiki/Main.md
+++ b/_wiki/Main.md
@@ -249,10 +249,10 @@ References:
 
 # Examples
 
-* Example of a [new page](New.html)
-* Example of a [legacy page](Old.html)
-* Example of a [redirected page](Redirect.html)
-* Example of a [user page](./User:Alexis.html)
+* Example of a [new page](New)
+* Example of a [legacy page](Old)
+* Example of a [redirected page](Redirect)
+* Example of a [user page](./User:Alexis)
 * [RSS](feed.xml) feed of new pages
-* Example of a [tag page](./Tag:Example.html)
-* [All tags page](./tags.html)
+* Example of a [tag page](./Tag:Example)
+* [All tags page](./tags)