diff --git a/404.html b/404.html
index 38757f7..986e8c3 100644
--- a/404.html
+++ b/404.html
@@ -3,11 +3,11 @@ title: Page not found
 jumbotron: credits
 layout: default
 redirect_from:
-  - /404/
+  - /404.html
 ---
 
 <img style="float:left;margin: -10px 40px 0 0;"
-  src="media/unknown_node.jpg"
+  src="/media/unknown_node.jpg"
   alt="unknown_node">
 
 <h2>Sorry, we could not find that page!</h2>
diff --git a/_config.yml b/_config.yml
index 76ada43..b102e8d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,4 @@
-permalink: /:title.html
+permalink: pretty
 gems:
   - jekyll-redirect-from
 exclude:
diff --git a/_includes/footer.html b/_includes/footer.html
index 29596d1..02ca41b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -10,11 +10,11 @@
       </p>
     </footer>
 
-    <script src="lib/js/jquery.min.js"></script>
-    <script src="lib/js/jquery.smooth-scroll.min.js"></script>
-    <script src="lib/js/jquery.goup.min.js"></script>
-    <script src="lib/js/bootstrap.min.js"></script>
-    <script src="lib/js/fastclick.min.js"></script>
-    <script src="assets/js/main.js"></script>
+    <script src="/lib/js/jquery.min.js"></script>
+    <script src="/lib/js/jquery.smooth-scroll.min.js"></script>
+    <script src="/lib/js/jquery.goup.min.js"></script>
+    <script src="/lib/js/bootstrap.min.js"></script>
+    <script src="/lib/js/fastclick.min.js"></script>
+    <script src="/assets/js/main.js"></script>
   </body>
 </html>
diff --git a/_includes/header.html b/_includes/header.html
index 691fa4b..f583eb7 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -5,8 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{ page.title }} - Minetest</title>
-    <link rel="stylesheet" href="lib/css/bootstrap.min.css">
-    <link rel="stylesheet" href="assets/css/main.min.css">
+    <link rel="stylesheet" href="/lib/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/assets/css/main.min.css">
 
     <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
     <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
@@ -53,9 +53,9 @@
             <span class="icon-bar"></span>
           </button>
           <a class="navbar-brand" href="//minetest.net">
-            <img alt="Minetest" src="favicon-96x96.png" style="height:260%;">
+            <img alt="Minetest" src="/favicon-96x96.png" style="height:260%;">
           </a>
-          <a class="navbar-brand" href="//minetest.net">
+          <a class="navbar-brand" href="//www.minetest.net">
             Minetest
           </a>
         </div>
@@ -64,19 +64,19 @@
             <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Home <span class="caret"></span></a>
                <ul class="dropdown-menu">
-                 <li><a href="index.html#about">About</a></li>
-                 <li><a href="index.html#features">Features</a></li>
-                 <li><a href="index.html#gallery">Gallery</a></li>
+                 <li><a href="/#about">About</a></li>
+                 <li><a href="/#features">Features</a></li>
+                 <li><a href="/#gallery">Gallery</a></li>
                  <li role="separator" class="divider"></li>
-                 <li><a href="downloads.html">Download</a></li>
+                 <li><a href="/downloads/">Download</a></li>
                </ul>
              </li>
              <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Customize <span class="caret"></span></a>
                 <ul class="dropdown-menu">
-                  <li><a href="customize.html">Subgames</a></li>
-                  <li><a href="customize.html#mods">Mods</a></li>
-                  <li><a href="customize.html#texture-packs">Texture Packs</a></li>
+                  <li><a href="/customize/">Subgames</a></li>
+                  <li><a href="/customize/#mods">Mods</a></li>
+                  <li><a href="/customize/#texture-packs">Texture Packs</a></li>
                   <li><a href="https://forum.minetest.net/viewforum.php?f=15">Forum: Subgames ↗</a></li>
                   <li><a href="https://forum.minetest.net/viewforum.php?f=11">Forum: Mods ↗</a></li>
                   <li><a href="https://forum.minetest.net/viewforum.php?f=4">Forum: Texture Packs ↗</a></li>
@@ -85,21 +85,21 @@
               <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
                  <ul class="dropdown-menu">
-                   <li><a href="community.html">Overview</a></li>
+                   <li><a href="/community/">Overview</a></li>
                    <li><a href="https://forum.minetest.net">Forum ↗</a></li>
                    <li><a href="//wiki.minetest.net">Wiki ↗</a></li>
-                   <li><a href="irc.html">IRC</a></li>
+                   <li><a href="/irc/">IRC</a></li>
                    <li><a href="https://reddit.com/r/minetest">Subreddit ↗</a></li>
-                   <li><a href="credits.html">Contributors</a></li>
-                   <li><a href="servers.html">Server list</a></li>
+                   <li><a href="/credits/">Contributors</a></li>
+                   <li><a href="/servers/">Server list</a></li>
                  </ul>
                </li>
             <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Development <span class="caret"></span></a>
                <ul class="dropdown-menu">
-                 <li><a href="development.html">Overview</a></li>
-                 <li><a href="development.html#reporting-issues">Reporting issues</a></li>
-                 <li><a href="development.html#donate">Donate</a></li>
+                 <li><a href="/development/">Overview</a></li>
+                 <li><a href="/development/#reporting-issues">Reporting issues</a></li>
+                 <li><a href="/development/#donate">Donate</a></li>
                  <li><a href="https://github.com/minetest">GitHub ↗</a></li>
                  <li><a href="//dev.minetest.net">Developer wiki ↗</a></li>
                  <li><a href="//dev.minetest.net/Category:Methods">API ↗</a></li>
diff --git a/community.html b/community.html
index 5021507..a2259c6 100644
--- a/community.html
+++ b/community.html
@@ -2,7 +2,7 @@
 title: Community
 layout: default
 redirect_from:
-  - /community/
+  - /community.html
 ---
 
 <h1>Get involved</h1>
@@ -12,11 +12,11 @@ redirect_from:
 </p>
 
 <ul>
-  <li>Giving support on <a href="irc.html">IRC</a></li>
+  <li>Giving support on <a href="/irc/">IRC</a></li>
   <li>Giving support on the <a href="https://forum.minetest.net">forums</a>, publishing mods, subgames, maps, texture packs</li>
   <li>Contribute on <a href="https://github.com/minetest">GitHub</a> - report bugs, make pull requests</li>
   <li>Talk about Minetest on <a href="http://www.reddit.com/r/Minetest">reddit</a></li>
-  <li>Perform some <a href="development.html">development</a></li>
+  <li>Perform some <a href="/development/">development</a></li>
 </ul>
 
 <div class="line"></div>
@@ -29,9 +29,9 @@ redirect_from:
 </p>
 
 <p>
-  <a href="//minetest.net">minetest.net</a> and <a href="https://forum.minetest.net">forum.minetest.net</a> are currently hosted by celeron55 in the Netherlands.
+  <a href="//www.minetest.net">minetest.net</a> and <a href="https://forum.minetest.net">forum.minetest.net</a> are currently hosted by celeron55 in the Netherlands.
 </p>
 
 <p>
-  If you find problems or think something needs to be updated on this website, please contact us on <a href="irc.html">IRC</a> or <a href="https://forum.minetest.net">forums</a>.
+  If you find problems or think something needs to be updated on this website, please contact us on <a href="/irc/">IRC</a> or <a href="https://forum.minetest.net">forums</a>.
 </p>
diff --git a/credits.html b/credits.html
index 86db2b0..fe42db4 100644
--- a/credits.html
+++ b/credits.html
@@ -2,7 +2,7 @@
 title: Credits
 layout: default
 redirect_from:
-  - /credits/
+  - /credits.html
   - /contributors/
 ---
 
@@ -77,5 +77,5 @@ redirect_from:
 </p>
 
 <p>
-  Want to <a href="/development.html" title="development">contribute</a>?
+  Want to <a href="/development/" title="development">contribute</a>?
 </p>
diff --git a/customize.html b/customize.html
index 6abcc60..ec813c8 100644
--- a/customize.html
+++ b/customize.html
@@ -2,7 +2,7 @@
 title: Customize
 layout: default
 redirect_from:
-  - /customize/
+  - /customize.html
   - /mods/
   - /games/
   - /subgames/
diff --git a/development.html b/development.html
index 4166d19..43e6aed 100644
--- a/development.html
+++ b/development.html
@@ -2,7 +2,7 @@
 title: Development
 layout: default
 redirect_from:
-  - /development/
+  - /development.html
   - /reporting_issues/
   - /donate/
   - /support/
@@ -29,7 +29,7 @@ There are several ways to get into development:
 </p>
 
 <p>
-  The core team is formed of people who have made great <a href="credits.html">contributions</a> to Minetest.
+  The core team is formed of people who have made great <a href="/credits/">contributions</a> to Minetest.
 </p>
 
 <p>
diff --git a/downloads.html b/downloads.html
index f2237bd..28c79ec 100644
--- a/downloads.html
+++ b/downloads.html
@@ -1,8 +1,8 @@
 ---
-title: Download
+title: Downloads
 layout: default
 redirect_from:
-  - /downloads/
+  - /downloads.html
   - /download/
   - /old_releases/
   - /other_distros/
diff --git a/index.html b/index.html
index 8977f4c..08c170d 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,6 @@
 ---
 title: Home
 redirect_from:
-  - /index/
   - /screenshots/
 ---
 
@@ -11,7 +10,7 @@ redirect_from:
   <div class="center">
     <h1>Meet Minetest.</h1>
     <h3>A free, open source voxel game engine and game. Fully extendable. You are in control.</h3>
-    <p><a class="btn btn-primary" href="#about">Tell me more</a> <a class="btn btn-success" href="downloads.html">Download</a></p>
+    <p><a class="btn btn-primary" href="#about">Tell me more</a> <a class="btn btn-success" href="/downloads/">Download</a></p>
     <p><small><strong>News:</strong> 0.4.13 released (August 20<sup>th</sup> 2015)</small></p>
   </div>
 </div>
@@ -50,7 +49,7 @@ redirect_from:
     </div>
     <div class="col-lg-4">
       <h4>Texture packs</h4>
-      <p>Not happy at the look of the textures? <a href="customize.html#texture-packs">Change the textures!</a></p>
+      <p>Not happy at the look of the textures? <a href="/customize/#texture-packs">Change the textures!</a></p>
     </div>
     <div class="col-lg-4">
       <h4>Beautiful map generators</h4>
@@ -62,38 +61,38 @@ redirect_from:
 
   <div class="row">
     <div class="col-lg-6">
-      <a href="media/gallery/1.jpg" class="thumbnail">
-        <img src="media/gallery/1.jpg">
+      <a href="/media/gallery/1.jpg" class="thumbnail">
+        <img src="/media/gallery/1.jpg">
       </a>
     </div>
 
     <div class="col-lg-6">
-      <a href="media/gallery/2.jpg" class="thumbnail">
-        <img src="media/gallery/2.jpg">
+      <a href="/media/gallery/2.jpg" class="thumbnail">
+        <img src="/media/gallery/2.jpg">
       </a>
     </div>
 
     <div class="col-lg-6">
-      <a href="media/gallery/3.jpg" class="thumbnail">
-        <img src="media/gallery/3.jpg">
+      <a href="/media/gallery/3.jpg" class="thumbnail">
+        <img src="/media/gallery/3.jpg">
       </a>
     </div>
 
     <div class="col-lg-6">
-      <a href="media/gallery/4.jpg" class="thumbnail">
-        <img src="media/gallery/4.jpg">
+      <a href="/media/gallery/4.jpg" class="thumbnail">
+        <img src="/media/gallery/4.jpg">
       </a>
     </div>
 
     <div class="col-lg-6">
-      <a href="media/gallery/5.jpg" class="thumbnail">
-        <img src="media/gallery/5.jpg">
+      <a href="/media/gallery/5.jpg" class="thumbnail">
+        <img src="/media/gallery/5.jpg">
       </a>
     </div>
 
     <div class="col-lg-6">
-      <a href="media/gallery/6.jpg" class="thumbnail">
-        <img src="media/gallery/6.jpg">
+      <a href="/media/gallery/6.jpg" class="thumbnail">
+        <img src="/media/gallery/6.jpg">
       </a>
     </div>
   </div>
diff --git a/irc.html b/irc.html
index 7025f8e..8e64af7 100644
--- a/irc.html
+++ b/irc.html
@@ -3,7 +3,7 @@ title: IRC
 jumbotron: IRC
 layout: default
 redirect_from:
-  - /irc/
+  - /irc.html
 ---
 
 <h1>Channels</h1>
diff --git a/servers.html b/servers.html
index b3f77d5..cc212ff 100644
--- a/servers.html
+++ b/servers.html
@@ -2,7 +2,7 @@
 title: Server list
 layout: default
 redirect_from:
-  - /servers/
+  - /servers.html
 ---
 
 <br>