10 files changed, 507 insertions, 529 deletions

diff --git a/static/styles.sass b/static/styles.sass
index 7566f42a..0abad13a 100644
--- a/static/styles.sass
+++ b/static/styles.sass
@@ -281,3 +281,8 @@ footer
 
 .row
   min-width: 50%
+
+header
+  text-align: center
+  margin-top: 30px
+  margin-bottom: 50px
diff --git a/template/about.html.j2 b/template/about.html.j2
index 497bb470..2886870d 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -1,15 +1,11 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container">
-  <div class="row">
-    <div class="container">
-      <header>
-        <h1 class="text-center">{{ _("About GNUnet") }}</h1>
-      </header>
-    </div>
-  </div>
-</div>
-<div class="container">
+<article class="container">
+
+  <header>
+    <h1>{{ _("About GNUnet") }}</h1>
+  </header>
+
   <div class="row">
     <div class="col">
       <h3>{{ _("What is GNUnet?") }}</h3>
diff --git a/template/copyright.html.j2 b/template/copyright.html.j2
index d3501c60..ca779567 100644
--- a/template/copyright.html.j2
+++ b/template/copyright.html.j2
@@ -1,9 +1,12 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
+<article class="container">
+
+  <header>
+    <h1>{{ _("Copyright Assignment") }}</h1>
+  </header>
 
-<div class="container-fluid">
   <div class="container text-center">
-    <h1>{{ _("Copyright Assignment") }}</h1><br><br>
     <!-- Note: source of the pdf/copyright.pdf is in gitolite-admin/ -->
     {% trans %}
     <p>
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index 6b6a1bee..0f4fae20 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -1,98 +1,93 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-  <article class="d-flex flex-column p-2 bd-highlight">
-    <div class="container">
-      <div class="text-center">
-        <header>
-          <h1>{{ _("Engage!") }}</h1>
-        </header>
-      </div>
-    </div>
-    <div class="container">
-      <div class="row">
-        <div class="col-lg-5">
-          <h2>Join the conversation!</h2>
-          <p>
-            There are many ways to get engaged with GNUnet. A first step is to join the conversation on the mailing lists and on our IRC channel to keep up with development, find technical help, and discuss GNUnet:
-          </p>
-          <h4>Mailing List</h4>
-          <p>
-            You can get help on our mailing list <a href="https://lists.gnu.org/mailman/listinfo/help-gnunet">help-gnunet</a>. <br>If you want to hack on GNUnet or generally want to be informed about recent updates and happenings, get in touch over our mailing list <a href="https://lists.gnu.org/mailman/listinfo/gnunet-developers">gnunet-developers</a>.
-          </p>
-          <h4>IRC</h4>
-          <p>
-            Most of the GNUnet developers are on the <a href="ircs://chat.freenode.net:6697/#gnunet">IRC channel #gnunet on freenode</a>. Please be patient and stay around at least for some hours to get an answer for your request. <!-- There is also a Matrix bridge to the IRC where you can get a backlog without staying connected. -->
-          </p>
-          <h4>Mumble</h4>
-          <p>
-                We have a monthly get-together on mumble where we talk about recent developments, strategies, and politics ;-) <br>
-                We come together on that day of the month, where n.day==n.month. E.g. we’ll meet on 6th of June, 7th of July, 8th of August, 9th of September, 10th of October and so on. We will usually start around 8 PM CEST, but try to be there earlier and stay longer just to hang around together.<br>
-                To connect just enter "gnunet.org" as server into your mumble client; leave everything else as default. 
-          </p>
-          </p>
-          <h4>PSYC</h4>
-          <p>
-            You find some of us on PSYC using the following adresses: 
-            <ul>
-              <li>psyc://loupsycedyglgamf.onion/@welcome</li>
-              <li>irc://loupsycedyglgamf.onion:67/welcome</li>
-              <li>psyc://psyced.org/@welcome</li>
-              <li>irc://psyced.org/welcome</li>
-              <li>xmpp:*welcome@psyced.org</li>
-            </li>
-          </p>
-        </div>
+<article class="container">
 
-        <div class="col-lg-5 offset-md-1">
-          <h2>Install GNUnet!</h2>
-          <p>
-            Another thing you might want now is your own GNUnet installation. As we haven’t packaged the new versions yet (June 2019) we provide <a href="https://gnunet.org/en/tutorial.html">some tutorials how to install step-by-step</a>.
-         </p>
-         <h2>Use GNUnet!</h2>
-          <p>
-          <a href="use.html">Let's gets started...</a>
-          </p>
-         <h2>Report bugs!</h2>
-          <p>
-            While using GNUnet you will find bugs. Here are some notes on how to do that the most effective way: 
-              <ul>
-                <li>Run 'gnunet-bugreport'</li>
-                <li>Report the output into our <a href="https://bugs.gnunet.org/">bug tracker</a>. Add more details e.g. what happened and what you expected to happen. </li>
-                <li>If you do not want to use the public bug tracker, you can also eMail to bug-gnunet@gnu.org.</li>
-                <li>Please inform us if your operating system applies any vendor changes to GNUnet which you know about (to exclude sources of problems introduced by your OS).</li>
-                <li>Wait until your bug report is acknowledged/replied to. Note that only volunteers work on this – responses may take a while.</li>
-                <li>Please follow up with eventual questions about the bug. </li>
-                <li>Once a fix is there: Check if it's working as expected, so that we can properly close the bug report and/or give you credits :)</li>
-             </ul>
-          </p>
-        <h2>Contribute!</h2>
-          <p>
-            There are various ways to contribute. We especially need coders with C skills and knowledge of crypto – but supporting with this website, it's translations, the bibliography and our wide documentation efforts are most welcome, too. As we are delivereing a new version now regularly, some packaging skills (for any OS) would a great thing to have – and if you are a designer we would need a hand, too. 
-        </p>
-        </div>
-      </div>
+  <header>
+    <h1>{{ _("Engage!") }}</h1>
+  </header>
 
-      <div class="row">
-        <div class="col-lg-5">
-          <h2>Bibliography</h2>
-          <p>If you are more the reading kind of person, please take a seat <a href="https://bib.gnunet.org/">in our libary...</a></p>
-          <h2>Videos</h2>
-          <p>...or if you rather want hear us talking to you, lean back and watch some <a href="video.html">videos</a> of our talks at conferences.</p>
-        </div>
+  <div class="row">
+    <div class="col">
+      <h2>Join the conversation!</h2>
+      <p>
+        There are many ways to get engaged with GNUnet. A first step is to join the conversation on the mailing lists and on our IRC channel to keep up with development, find technical help, and discuss GNUnet:
+      </p>
+      <h4>Mailing List</h4>
+      <p>
+        You can get help on our mailing list <a href="https://lists.gnu.org/mailman/listinfo/help-gnunet">help-gnunet</a>. <br>If you want to hack on GNUnet or generally want to be informed about recent updates and happenings, get in touch over our mailing list <a href="https://lists.gnu.org/mailman/listinfo/gnunet-developers">gnunet-developers</a>.
+      </p>
+      <h4>IRC</h4>
+      <p>
+        Most of the GNUnet developers are on the <a href="ircs://chat.freenode.net:6697/#gnunet">IRC channel #gnunet on freenode</a>. Please be patient and stay around at least for some hours to get an answer for your request. <!-- There is also a Matrix bridge to the IRC where you can get a backlog without staying connected. -->
+      </p>
+      <h4>Mumble</h4>
+      <p>
+            We have a monthly get-together on mumble where we talk about recent developments, strategies, and politics ;-) <br>
+            We come together on that day of the month, where n.day==n.month. E.g. we’ll meet on 6th of June, 7th of July, 8th of August, 9th of September, 10th of October and so on. We will usually start around 8 PM CEST, but try to be there earlier and stay longer just to hang around together.<br>
+            To connect just enter "gnunet.org" as server into your mumble client; leave everything else as default. 
+      </p>
+      </p>
+      <h4>PSYC</h4>
+      <p>
+        You find some of us on PSYC using the following adresses: 
+        <ul>
+          <li>psyc://loupsycedyglgamf.onion/@welcome</li>
+          <li>irc://loupsycedyglgamf.onion:67/welcome</li>
+          <li>psyc://psyced.org/@welcome</li>
+          <li>irc://psyced.org/welcome</li>
+          <li>xmpp:*welcome@psyced.org</li>
+        </li>
+      </p>
+    </div>
+    <div class="col">
+      <h2>Install GNUnet!</h2>
+      <p>
+        Another thing you might want now is your own GNUnet installation. As we haven’t packaged the new versions yet (June 2019) we provide <a href="https://gnunet.org/en/tutorial.html">some tutorials how to install step-by-step</a>.
+     </p>
+     <h2>Use GNUnet!</h2>
+      <p>
+      <a href="use.html">Let's gets started...</a>
+      </p>
+     <h2>Report bugs!</h2>
+      <p>
+        While using GNUnet you will find bugs. Here are some notes on how to do that the most effective way: 
+          <ul>
+            <li>Run 'gnunet-bugreport'</li>
+            <li>Report the output into our <a href="https://bugs.gnunet.org/">bug tracker</a>. Add more details e.g. what happened and what you expected to happen. </li>
+            <li>If you do not want to use the public bug tracker, you can also eMail to bug-gnunet@gnu.org.</li>
+            <li>Please inform us if your operating system applies any vendor changes to GNUnet which you know about (to exclude sources of problems introduced by your OS).</li>
+            <li>Wait until your bug report is acknowledged/replied to. Note that only volunteers work on this – responses may take a while.</li>
+            <li>Please follow up with eventual questions about the bug. </li>
+            <li>Once a fix is there: Check if it's working as expected, so that we can properly close the bug report and/or give you credits :)</li>
+         </ul>
+      </p>
+    <h2>Contribute!</h2>
+      <p>
+        There are various ways to contribute. We especially need coders with C skills and knowledge of crypto – but supporting with this website, it's translations, the bibliography and our wide documentation efforts are most welcome, too. As we are delivereing a new version now regularly, some packaging skills (for any OS) would a great thing to have – and if you are a designer we would need a hand, too. 
+    </p>
+    </div>
+  </div>
 
-        <div class="col-lg-5 offset-md-1">
-          <h2>Get together!</h2>
-          <p>
-            We meet in meatspace occasionally, mostly in Germany and Switzerland. The usual occasions are:
-            <ul>
-              <li><a href="https://events.ccc.de/congress">Chaos Communication Congress</a> in Leipzig (DE), 27th-30th December</li>
-              <li><a href="https://datenspuren.de">Datenspuren</a> in Dresden (DE), usually by mid/end of September</li>
-              <li>GNUnet Hackweek in Mont-Soleil (CH), usually by the end of June</li>
-              <li>Other meetings happening throughout the year: You’ll get to know about it on our Mailinglist (or propose them yourself).</li>
-            </ul>
-          </p>
-        </div>
+  <div class="row">
+    <div class="col">
+      <h2>Bibliography</h2>
+      <p>If you are more the reading kind of person, please take a seat <a href="https://bib.gnunet.org/">in our libary...</a></p>
+      <h2>Videos</h2>
+      <p>...or if you rather want hear us talking to you, lean back and watch some <a href="video.html">videos</a> of our talks at conferences.</p>
+    </div>
+    <div class="col">
+      <h2>Get together!</h2>
+      <p>
+        We meet in meatspace occasionally, mostly in Germany and Switzerland. The usual occasions are:
+        <ul>
+          <li><a href="https://events.ccc.de/congress">Chaos Communication Congress</a> in Leipzig (DE), 27th-30th December</li>
+          <li><a href="https://datenspuren.de">Datenspuren</a> in Dresden (DE), usually by mid/end of September</li>
+          <li>GNUnet Hackweek in Mont-Soleil (CH), usually by the end of June</li>
+          <li>Other meetings happening throughout the year: You’ll get to know about it on our Mailinglist (or propose them yourself).</li>
+        </ul>
+      </p>
     </div>
   </div>
+
 </article>
 {% endblock body_content %}
diff --git a/template/ev.html.j2 b/template/ev.html.j2
index 31c580d9..d99a6500 100644
--- a/template/ev.html.j2
+++ b/template/ev.html.j2
@@ -1,32 +1,33 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<article>
-<div class="container-fluid">
-  <div class="container text-center">
+<article class="container">
+
   <header>
     <h1>{{ _("Verein zur F&ouml;rderung von GNUnet e.V.") }}</h1>
   </header>
-    <p>
-      {% trans %}
-      On December 27th 2013 a group of GNUnet hackers met at 30c3
-      to create the "Verein zur F&ouml;rderung von GNUnet e.V.", an
-      association under German law to support GNUnet development.
-      The Amtsgericht M&uuml;nchen registered the association on the
-      7th of March under VR 205287.
-      {% endtrans %}
-    </p>
-    <p>
-      {% trans %}
-        The association is officially dedicated to supporting research,
-        development and education in the area of secure decentralized
-        networking in general, and GNUnet specifically.  This is the
-        official website for the association.
-      {% endtrans %}
-    </p>
+
+  <div class="row container justify-content-center">
+    <div class="col-6">
+      <p>
+        {% trans %}
+        On December 27th 2013 a group of GNUnet hackers met at 30c3
+        to create the "Verein zur F&ouml;rderung von GNUnet e.V.", an
+        association under German law to support GNUnet development.
+        The Amtsgericht M&uuml;nchen registered the association on the
+        7th of March under VR 205287.
+        {% endtrans %}
+      </p>
+      <p>
+        {% trans %}
+          The association is officially dedicated to supporting research,
+          development and education in the area of secure decentralized
+          networking in general, and GNUnet specifically.  This is the
+          official website for the association.
+        {% endtrans %}
+      </p>
+    </div>
   </div>
-</div>
 
-<div class="container">
   <div class="row">
     <div class="col-lg-6">
       <h3>{{ _("Governance") }}</h3>
@@ -65,7 +66,8 @@
         {% endtrans %}
       </p>
     </div>
-  </div>
+  </div><!-- END:row -->
+
   <div class="row">
     <div class="col-lg-6">
       <h3>{{ _("Support Us!") }}</h3>
@@ -113,8 +115,7 @@
         </ul>
       </p>
     </div>
-  </div>
-</div>
+  </div><!-- END:row -->
 
 </div> <!-- /container -->
 </article>
diff --git a/template/glossary.html.j2 b/template/glossary.html.j2
index 9af47d57..2e76b085 100644
--- a/template/glossary.html.j2
+++ b/template/glossary.html.j2
@@ -1,11 +1,11 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container text-center">
-    <header>
-      <h1>{{ _("Glossary") }}</h1>
-    </header>
-</div>
-<div class="container">
+<article class="container">
+
+  <header>
+    <h1>{{ _("Glossary") }}</h1>
+  </header>
+
   <div class="row">
     <div class="col">
       <dl>
diff --git a/template/gsoc.html.j2 b/template/gsoc.html.j2
index f6b16bde..50228192 100644
--- a/template/gsoc.html.j2
+++ b/template/gsoc.html.j2
@@ -6,14 +6,16 @@
     <h1>{{ _("GNUnet's Google Summer of Code projects") }}</h1>
   </header>
 
-  <p>
+  <div class="row container justify-content-center">
+    <div class="col-6">
     {% trans %}
       As a GNU project, GNUnet has participated in the
       Google Summer of Code (GSoC) for a number of years.
       This page lists all current, past, and finished
       projects.
     {% endtrans %}
-  </p>
+    </div>
+  </div>
 
   <h2>{{ _("Current projects (2019)") }}</h2>
   <section>
diff --git a/template/install.html.j2 b/template/install.html.j2
index 3874cdff..1e53df4e 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -1,21 +1,17 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container">
-  <div class="row">
-    <div class="container">
-      <header>
-        <h1 class="text-center">{{ _("Install") }}</h1>
-      </header>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-4 offset-lg-2 col-md-6">
+<article class="container">
+
+  <header>
+    <h1>{{ _("Install") }}</h1>
+  </header>
+
+  <div class="row container justify-content-center">
+    <div class="col-6">
       {% trans %}
       <p>The following GNUnet installation instructions help you building from source for your distribution.</p> 
       <p><i>Please note that the installation process will get much easier once we have proper packages again (planned for winter 2019).</i></p>
       {% endtrans %}
-    </div>
-    <div class="col-lg-4 col-md-6">
       {% trans %}
       <p>You have already installed GNUnet and want to use it? <a href="https://gnunet.org/en/use">Check this out!</a></p>
       <p>Further information is available in our <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">handbook</a>.</p>
@@ -23,52 +19,39 @@
       {% endtrans %}
     </div>
   </div>
-</div>
 
-<div class="container">
-  <div class="row">
-    <div class="col-lg-4 offset-lg-2 col-md-6 text-center">
+  <div class="row container justify-content-center text-center">
+    <div class="col-3">
       <p><a href="install-on-ubuntu1804.html"><img src="{{ url('static/images/ubuntu-logo32.png') }}" class="distro-logo"></a></p>
       <h3>Ubuntu 18.04</h3>
     </div>
-    <div class="col-lg-4 col-md-6 text-center">
+    <div class="col-3">
       <p><a href="install-on-debian9.html"><img src="{{ url('static/images/debian-logo.svg') }}" class="distro-logo"></a></p>
       <h3>Debian 9</h3>
     </div>
-  </div>
-</div>
-<div class="container">
-  <div class="row">
-    <div class="col-lg-4 offset-lg-2 col-md-6 text-center">
-      <p><a href="install-on-macos.html"><img src="{{ url('static/images/apple-logo.svg') }}" class="distro-logo"></a></p>
-      <h3>macOS</h3>
-    </div>
-    <div class="col-lg-4 col-md-6 text-center">
+    <div class="col-3">
       <!-- Not the officially distributed file, but it's the same logo, in svg. Use this. -->
       <p><a href="install-on-netbsd.html"><img src="{{ url('static/images/NetBSD_Logo.svg') }}" class="distro-logo"></a></p>
       <h3>NetBSD</h3>
     </div>
   </div>
-</div>
-<div class="container">
-  <div class="row">
-    <div class="col-lg-4 offset-lg-2 col-md-6 text-center">
+
+  <div class="row container justify-content-center text-center">
+    <div class="col-3">
+      <p><a href="install-on-macos.html"><img src="{{ url('static/images/apple-logo.svg') }}" class="distro-logo"></a></p>
+      <h3>macOS</h3>
+    </div>
+    <div class="col-3">
       <p><a href="install-on-archpi.html"><img src="{{ url('static/images/archlinux-logo.svg') }}" class="distro-logo" style="width:300px;height:auto"></a></p>
       <h3>Arch-Pi</h3>
     </div>
     <!--
-    <div class="col-lg-4 col-md-6 text-center">
+    <div class="col-3">
       <p><a href="https://tutorial.gnunet.org/"><img src="{{ url('static/images/gnunet-logo-dark-text.png') }}" class="distro-logo" alt="GNUnet" /></a></p>
       <h3>C Coding Tutorial for GNUnet</h3>
     </div>
     -->
   </div>
-</div>
-
-<div class="container">
-  <div class="row">
-  </div>
-</div>
 
 </article>
 {% endblock body_content %}
diff --git a/template/use.html.j2 b/template/use.html.j2
index 0a068682..f95434d9 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -1,389 +1,383 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
 <article class="container">
-<!--<article> -->
-<div class="container">
-  <div class="row">
-    <div class="container">
-      <header>
-        <h1 class="text-center">{{ _("How to use GNUnet - in a nutshell") }}</h1>
-      </header>
-    </div>
-  </div>
-</div>
 
-<section>
-  <p>
-   This document is just a brief intro on what can be done with GNUnet. Find much more in our <a ref="https://docs.gnunet.org/">handbook / reference manual</a>, e.g. in the section <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">"using GNUnet"</a>.
+  <header>
+    <h1>{{ _("How to use GNUnet - in a nutshell") }}</h1>
+  </header>
 
-   The configuration in the handbook / reference manual is done with the UI interface gnunet-gtk. 
-  </p>
-</section>
+  <section>
+    <p>
+     This document is just a brief intro on what can be done with GNUnet. Find much more in our <a ref="https://docs.gnunet.org/">handbook / reference manual</a>, e.g. in the section <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">"using GNUnet"</a>.
 
-<section>
-  <h3>{{ _("Make sure your GNUnet installation works...") }}</h3>
-   <p>After installing and starting GNUnet you should make sure that your peer is connecting 
-        to the P2P-network. By typing gnunet-core you should see something like this:
-  </p>
-   <p>
-        <code>
-        $ gnunet-core <br>
-        Tue Oct 30 19:58:48 2018: connection established DSTJ (timeout in 293 s)<br>
-        Tue Oct 30 19:58:48 2018: connection established A4MK (timeout in 292 s)<br>
-        Tue Oct 30 19:58:48 2018: connection established 7WRD (timeout in 299 s)<br>
-        Tue Oct 30 19:58:48 2018: connection established 5WBG (timeout in 299 s)<br>
-        </code>
-  </p>
-</section>
-<section>
-  <h4>{{ _("... and play around with it.") }}</h4>
-  <p>
-        So let's try out some of GNUnet's use cases. Please mind that some should be done in a particular order, one after another:
-  </p>
+     The configuration in the handbook / reference manual is done with the UI interface gnunet-gtk. 
+    </p>
+  </section>
 
-  <ul>
-    <li>filesharing</li>
-    <li>A simple chat using CADET</li>
-    <li>Another simple chat using a nim client</i>
-    <li>Name resolution using GNS on the command line</li>
-    <li>Name resolution using GNS with a browser (do it on the command line first)</li>
-    <li>Serving a website using VPN (do name resolution with a browser first)</li>
-  </ul>
-</section>
+  <section>
+    <h3>{{ _("Make sure your GNUnet installation works...") }}</h3>
+     <p>After installing and starting GNUnet you should make sure that your peer is connecting 
+          to the P2P-network. By typing gnunet-core you should see something like this:
+    </p>
+     <p>
+          <code>
+          $ gnunet-core <br>
+          Tue Oct 30 19:58:48 2018: connection established DSTJ (timeout in 293 s)<br>
+          Tue Oct 30 19:58:48 2018: connection established A4MK (timeout in 292 s)<br>
+          Tue Oct 30 19:58:48 2018: connection established 7WRD (timeout in 299 s)<br>
+          Tue Oct 30 19:58:48 2018: connection established 5WBG (timeout in 299 s)<br>
+          </code>
+    </p>
+  </section>
+  <section>
+    <h4>{{ _("... and play around with it.") }}</h4>
+    <p>
+          So let's try out some of GNUnet's use cases. Please mind that some should be done in a particular order, one after another:
+    </p>
 
+    <ul>
+      <li>filesharing</li>
+      <li>A simple chat using CADET</li>
+      <li>Another simple chat using a nim client</i>
+      <li>Name resolution using GNS on the command line</li>
+      <li>Name resolution using GNS with a browser (do it on the command line first)</li>
+      <li>Serving a website using VPN (do name resolution with a browser first)</li>
+    </ul>
+  </section>
 
-<section>
-  <h4>{{ _("Filesharing") }}</h4>
 
-  <p>
-    Let's publish a file in the GNUnet filesharing network. We use the keywords
-    ("commons" and "state") so other people will be able to search for the file.
-  </p>
+  <section>
+    <h4>{{ _("Filesharing") }}</h4>
 
-  <p>
-    We can choose any file and describe it with meaningful keywords (using the
-    `-k` command line option).
-  </p>
-  <p>
-  <code>
-    $ gnunet-publish -k commons -k state ostrom.pdf<br>
-    Publishing `/home/myself/ostrom.pdf' done.<br>
-    URI is `gnunet://fs/chk/M57SXDJ72EWS25CT6307KKJ8K0GCNSPTAZ649NA1NS10MJB4A1GZ9EN4Y02KST9VA5BHE8B335RPXQVBWVZ587Y83WQ7J3DHMBX30Q8.DHNGBN4CB2DBX1QRZ1R0B1Q18WTEAK4R94S9D57C9JMJJ3H7SSQDCV4D1218C4S2VP085AMQQSMG18FCP6NQMZQZJ91XR5NBX7YF0V0.42197237'.
-  </code>
-  </p>
-  <p>
-    Finding the file by keyword works with `gnunet-search`.
-  </p>
-  <p>
-  <code>
-    $ gnunet-search commons<br>
-    #1:<br>
-    gnunet-download -o "ostrom.pdf" gnunet://fs/chk/M57SXDJ72EWS25CT6307KKJ8K0GCNSPTAZ649NA1NS10MJB4A1GZ9EN4Y02KST9VA5BHE8B335RPXQVBWVZ587Y83WQ7J3DHMBX30Q8.DHNGBN4CB2DBX1QRZ1R0B1Q18WTEAK4R94S9D57C9JMJJ3H7SSQDCV4D1218C4S2VP085AMQQSMG18FCP6NQMZQZJ91XR5NBX7YF0V0.42197237
-  </code>
-  </p>
-  <p>
-    It gives us the command line call to download the file (and store it as
-    ostrom.pdf)!
-  </p>
-  <p>
-    Please also refer to the chapter on <a href="=> https://docs.gnunet.org/#File_002dsharing
-">filesharing in the handbook</a>. 
+    <p>
+      Let's publish a file in the GNUnet filesharing network. We use the keywords
+      ("commons" and "state") so other people will be able to search for the file.
+    </p>
 
-</section>
+    <p>
+      We can choose any file and describe it with meaningful keywords (using the
+      `-k` command line option).
+    </p>
+    <p>
+    <code>
+      $ gnunet-publish -k commons -k state ostrom.pdf<br>
+      Publishing `/home/myself/ostrom.pdf' done.<br>
+      URI is `gnunet://fs/chk/M57SXDJ72EWS25CT6307KKJ8K0GCNSPTAZ649NA1NS10MJB4A1GZ9EN4Y02KST9VA5BHE8B335RPXQVBWVZ587Y83WQ7J3DHMBX30Q8.DHNGBN4CB2DBX1QRZ1R0B1Q18WTEAK4R94S9D57C9JMJJ3H7SSQDCV4D1218C4S2VP085AMQQSMG18FCP6NQMZQZJ91XR5NBX7YF0V0.42197237'.
+    </code>
+    </p>
+    <p>
+      Finding the file by keyword works with `gnunet-search`.
+    </p>
+    <p>
+    <code>
+      $ gnunet-search commons<br>
+      #1:<br>
+      gnunet-download -o "ostrom.pdf" gnunet://fs/chk/M57SXDJ72EWS25CT6307KKJ8K0GCNSPTAZ649NA1NS10MJB4A1GZ9EN4Y02KST9VA5BHE8B335RPXQVBWVZ587Y83WQ7J3DHMBX30Q8.DHNGBN4CB2DBX1QRZ1R0B1Q18WTEAK4R94S9D57C9JMJJ3H7SSQDCV4D1218C4S2VP085AMQQSMG18FCP6NQMZQZJ91XR5NBX7YF0V0.42197237
+    </code>
+    </p>
+    <p>
+      It gives us the command line call to download the file (and store it as
+      ostrom.pdf)!
+    </p>
+    <p>
+      Please also refer to the chapter on <a href="=> https://docs.gnunet.org/#File_002dsharing
+  ">filesharing in the handbook</a>. 
 
+  </section>
 
 
-<section>
-  <h4>{{ _("CADET (and Chat)") }}</h4>
 
-  <p>
-    We can use the `gnunet-cadet` command line tool to open a port and from
-    another machine connect to this port and chat or transfer data. First we need
-    our *peer ID* of the GNUnet peer opening the port.
-  </p>
-  <p>
-  <code>
-    $ gnunet-peerinfo -s<br>
-    I am peer `P4T5GHS1PCZ06R82D3KW8Z8J1113BQZWAWGYHTZ8G1ZXMWXQGAVG'.
-  </code>
-  </p>
-  <p>
-    Now we open the port (it can be any string!):
-  </p>
-  <p>
-  <code>
-    $ gnunet-cadet -o my-secret-port
-  </code>
-  </p>
-  <p>On the other machine we can connect using the peer ID and the port and start chatting!</p>
-  <p>
-  <code>
-    $ gnunet-cadet P4T5GHS1PCZ06R82D3KW8Z8J1113BQZWAWGYHTZ8G1ZXMWXQGAVG my-secret-port
-  </code>
-  </p>
-  <p>
-        If you are interested into CADET in detail, please have a look in the <a href="https://docs.gnunet.org/#CADET-Subsystem">chapter "Cadet-Subsystem" in our handbook</a>.
-  </p>
+  <section>
+    <h4>{{ _("CADET (and Chat)") }}</h4>
 
-</section>
+    <p>
+      We can use the `gnunet-cadet` command line tool to open a port and from
+      another machine connect to this port and chat or transfer data. First we need
+      our *peer ID* of the GNUnet peer opening the port.
+    </p>
+    <p>
+    <code>
+      $ gnunet-peerinfo -s<br>
+      I am peer `P4T5GHS1PCZ06R82D3KW8Z8J1113BQZWAWGYHTZ8G1ZXMWXQGAVG'.
+    </code>
+    </p>
+    <p>
+      Now we open the port (it can be any string!):
+    </p>
+    <p>
+    <code>
+      $ gnunet-cadet -o my-secret-port
+    </code>
+    </p>
+    <p>On the other machine we can connect using the peer ID and the port and start chatting!</p>
+    <p>
+    <code>
+      $ gnunet-cadet P4T5GHS1PCZ06R82D3KW8Z8J1113BQZWAWGYHTZ8G1ZXMWXQGAVG my-secret-port
+    </code>
+    </p>
+    <p>
+          If you are interested into CADET in detail, please have a look in the <a href="https://docs.gnunet.org/#CADET-Subsystem">chapter "Cadet-Subsystem" in our handbook</a>.
+    </p>
 
-<section>
-  <h4>{{ _("Chatting with a (simple) client") }}</h4>
-   <p>
-        To chat a tiny bit prettier, we need to install and compile additional software. 
-        If you join the chat mentioned below and no one is there, feel free to ping on 
-        IRC/freenode #gnunet and ask if someone can join to test with you! (But we are 
-        trying to be there as often as possible). 
-   </p>
-   <p>
-   <code>
-        $ git clone https://gnunet.org/git/gnunet-nim.git<br>
-        $ cd gnunet-nim/examples<br>
-        $ nim c groupchat.nim<br>
-   </code>
-   <p>
-   <p>
-        Fine! We can now try to enter a chat server running on another GNUnet node.
-   </p>
-   <p>
-   <code>
-        $LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat --config=/path/to/gnunet.conf --server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss --nick=YOURNICK
-   </code>
-   </p>
-   <p>
-        The peer and port in this example should work in real, because that peer is almost online and running groupchat on that port.
-   <p>
-        You should now see something like this:
-   </p>
-   <p>
-   <code>
-        > 2018-10-30 19:50:10 Welcome 8Q2T! participants: @[]<br>
-        Hello GNUnet!<br>
-        2018-10-30 19:52:53 [8Q2T] Hello GNUnet!<br>
-   </code>
-   <p>
-   <p>
-        Here we have typed "Hello gnunet!" to standard in which is then written out to standard out after having been sent back from GNUnet.
-   </p>
-</section>
+  </section>
 
+  <section>
+    <h4>{{ _("Chatting with a (simple) client") }}</h4>
+     <p>
+          To chat a tiny bit prettier, we need to install and compile additional software. 
+          If you join the chat mentioned below and no one is there, feel free to ping on 
+          IRC/freenode #gnunet and ask if someone can join to test with you! (But we are 
+          trying to be there as often as possible). 
+     </p>
+     <p>
+     <code>
+          $ git clone https://gnunet.org/git/gnunet-nim.git<br>
+          $ cd gnunet-nim/examples<br>
+          $ nim c groupchat.nim<br>
+     </code>
+     <p>
+     <p>
+          Fine! We can now try to enter a chat server running on another GNUnet node.
+     </p>
+     <p>
+     <code>
+          $LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat --config=/path/to/gnunet.conf --server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss --nick=YOURNICK
+     </code>
+     </p>
+     <p>
+          The peer and port in this example should work in real, because that peer is almost online and running groupchat on that port.
+     <p>
+          You should now see something like this:
+     </p>
+     <p>
+     <code>
+          > 2018-10-30 19:50:10 Welcome 8Q2T! participants: @[]<br>
+          Hello GNUnet!<br>
+          2018-10-30 19:52:53 [8Q2T] Hello GNUnet!<br>
+     </code>
+     <p>
+     <p>
+          Here we have typed "Hello gnunet!" to standard in which is then written out to standard out after having been sent back from GNUnet.
+     </p>
+  </section>
 
 
-<section>
-  <h4>{{ _("Name resolution using GNS on the command line") }}</h4>
 
-  <p>GNS is the GNU name service, a fully decentralized alternatice to DNS. We'll publish an IP address in a GNS record try to resolve it on the command line. First we need an identity which is the
-    equivalent to a zone in DNS. We'll call it "myself" and create it using the
-    `gnunet-identity` command line tool. Instead of "myself" you can surely use your
-    nick or any other name. </p>
-  <p>
-  <code>
-    $ gnunet-identity -C myself
-  </code>
-  </p>
-  <p>We can check if it worked using the same tool. We expect the name of our identity and the corresponding public key to be displayed.</p>
-  <p>
-  <code>
-    $ gnunet-identity -d<br>
-    myself - HWTYD3P5D77JVFNVMZ1M5T10V4SZYNMY3PCGQCSVENKD6ZCRKPMG
-  </code>
-  </p>
-  <p>
-    Now we add a public `A` record to our zone. It has the name "ccc", a value
-    of "195.54.164.39" and it expires after one day.
-  </p>
-  <p>
-  <code>
-    $ gnunet-namestore -z myself -a -e "1 d" -p -t A -n ccc -V 195.54.164.39
-  </code>
-  </p>
-  <p>Now we can query that record using the command line tool `gnunet-gns`.</p>
-  <p>
-  <code>
-    $ gnunet-gns -t A -u ccc.myself<br>
-    ccc.myself:<br>
-    Got `A' record: 195.54.164.39
-  </code>
-  </p>
-  <p>
-    So it worked! But only resolving our own records is boring. So we
-    can give our identity (the public key of it to be precise) to
-    someone else so they can try to resolve our records, too. The
-    other person (Bob) has to add it to his namestore like this:
-  </p>
-  <p>
-  <code>
-    $ gnunet-namestore -z myself -a -e never -p -t PKEY -n alice -V HWTYD3P5D77JVFNVMZ1M5T10V4SZYNMY3PCGQCSVENKD6ZCRKPMG
-  </code>
-  </p>
-  <p>
-    Our identity in Bobs namestore is a public record (-p) and never
-    expires (-e never). Now Bob (let's assume he has called his
-    identity myself, too) should be able to resolve our "ccc" record,
-    too!
-  </p>
-  <p>
-  <code>
-    $ gnunet-gns -t A -u ccc.alice.myself<br>
-    ccc.alice.myself:<br>
-    Got `A' record: 195.54.164.39
-  </code>
-  </p>
-  <p>
-    It can continue like this. A friend of Bob would be able to
-    resolve our records too because Bob published our identity in a
-    public record. Bobs friend would simply use "ccc.alice.bob.myself"
-    to resolve our "ccc" record.
-  </p>
-  <p>
-See the <a href="https://docs.gnunet.org/#First-steps-_002d-Using-the-GNU-Name-System">chapter "Using the GNU Name System" in our handbook</a> for a more detailed documentation.
-  </p>
-</section>
+  <section>
+    <h4>{{ _("Name resolution using GNS on the command line") }}</h4>
 
+    <p>GNS is the GNU name service, a fully decentralized alternatice to DNS. We'll publish an IP address in a GNS record try to resolve it on the command line. First we need an identity which is the
+      equivalent to a zone in DNS. We'll call it "myself" and create it using the
+      `gnunet-identity` command line tool. Instead of "myself" you can surely use your
+      nick or any other name. </p>
+    <p>
+    <code>
+      $ gnunet-identity -C myself
+    </code>
+    </p>
+    <p>We can check if it worked using the same tool. We expect the name of our identity and the corresponding public key to be displayed.</p>
+    <p>
+    <code>
+      $ gnunet-identity -d<br>
+      myself - HWTYD3P5D77JVFNVMZ1M5T10V4SZYNMY3PCGQCSVENKD6ZCRKPMG
+    </code>
+    </p>
+    <p>
+      Now we add a public `A` record to our zone. It has the name "ccc", a value
+      of "195.54.164.39" and it expires after one day.
+    </p>
+    <p>
+    <code>
+      $ gnunet-namestore -z myself -a -e "1 d" -p -t A -n ccc -V 195.54.164.39
+    </code>
+    </p>
+    <p>Now we can query that record using the command line tool `gnunet-gns`.</p>
+    <p>
+    <code>
+      $ gnunet-gns -t A -u ccc.myself<br>
+      ccc.myself:<br>
+      Got `A' record: 195.54.164.39
+    </code>
+    </p>
+    <p>
+      So it worked! But only resolving our own records is boring. So we
+      can give our identity (the public key of it to be precise) to
+      someone else so they can try to resolve our records, too. The
+      other person (Bob) has to add it to his namestore like this:
+    </p>
+    <p>
+    <code>
+      $ gnunet-namestore -z myself -a -e never -p -t PKEY -n alice -V HWTYD3P5D77JVFNVMZ1M5T10V4SZYNMY3PCGQCSVENKD6ZCRKPMG
+    </code>
+    </p>
+    <p>
+      Our identity in Bobs namestore is a public record (-p) and never
+      expires (-e never). Now Bob (let's assume he has called his
+      identity myself, too) should be able to resolve our "ccc" record,
+      too!
+    </p>
+    <p>
+    <code>
+      $ gnunet-gns -t A -u ccc.alice.myself<br>
+      ccc.alice.myself:<br>
+      Got `A' record: 195.54.164.39
+    </code>
+    </p>
+    <p>
+      It can continue like this. A friend of Bob would be able to
+      resolve our records too because Bob published our identity in a
+      public record. Bobs friend would simply use "ccc.alice.bob.myself"
+      to resolve our "ccc" record.
+    </p>
+    <p>
+  See the <a href="https://docs.gnunet.org/#First-steps-_002d-Using-the-GNU-Name-System">chapter "Using the GNU Name System" in our handbook</a> for a more detailed documentation.
+    </p>
+  </section>
 
-<section id='gns_proxy'>
-  <h4>{{ _("Name resolution using GNS with a browser") }}</h4>
 
-  <p>
-    In the previous use case "Name resolution using GNS on the command line" we got an idea
-    about what GNS is about, but now let's use it with a browser, to make it actually useful. Currently Firefox and Chromium are known to work.
-  </p>
+  <section id='gns_proxy'>
+    <h4>{{ _("Name resolution using GNS with a browser") }}</h4>
 
-  <p>
-    Many websites enforce HTTPS and thus provide certificates for
-    their hostnames (and not our GNS names). Browsers don't like wrong
-    hostnames in certificates and will present error messages. So GNUnet
-    has to trick them by generating own certificates for our GNS
-    names. This means we need to create our own certificate authority
-    and tell our browser about it. Luckily there's a script for it:
-  </p>
-  <p>
-  <code>
-    $ gnunet-gns-proxy-setup-ca 
-  </code>
-  </p>
-  <p>After executing this script the Browser has to be restarted.</p>
+    <p>
+      In the previous use case "Name resolution using GNS on the command line" we got an idea
+      about what GNS is about, but now let's use it with a browser, to make it actually useful. Currently Firefox and Chromium are known to work.
+    </p>
+
+    <p>
+      Many websites enforce HTTPS and thus provide certificates for
+      their hostnames (and not our GNS names). Browsers don't like wrong
+      hostnames in certificates and will present error messages. So GNUnet
+      has to trick them by generating own certificates for our GNS
+      names. This means we need to create our own certificate authority
+      and tell our browser about it. Luckily there's a script for it:
+    </p>
+    <p>
+    <code>
+      $ gnunet-gns-proxy-setup-ca 
+    </code>
+    </p>
+    <p>After executing this script the Browser has to be restarted.</p>
 
-  <p>
-    GNUnet provides a proxy service (gnunet-gns-proxy) that the
-    browser can send DNS and HTTP traffic to. It will try to resolve
-    names with GNS first and forward the rest of the DNS traffic to
-    the system's DNS resolver. It will also take care of the HTTP
-    traffic, so the browser gets valid certificates and the web server
-    will not be confused by our GNS hostnames. Our GNS namestore
-    doesn't know about any DNS hostnames yet, so we have to store
-    them, too. For our "ccc" A record, we have to store a LEHO (legacy
-    hostname) record, too. It must contain the website's original DNS
-    hostname:
-  </p>
-  <p>
-  <code>
-    $ gnunet-namestore -z myself -a -e "1 d" -p -t LEHO -n ccc -V www.ccc.de
-  </code>
-  </p>
-  <p>Now let's start gnunet-gns-proxy.</p>
-  <p>
-  <code>
-    $ /usr/lib/gnunet/libexec/gnunet-gns-proxy
-  </code>
-  </p>
-  <p>
-    Our browser has to be configured so it uses our proxy. In Firefox
-    we have to set these options under "about:config":
-  </p>
-  <p>
-  <code>
-    network.proxy.socks:            localhost<br>
-    network.proxy.socks_port:       7777<br>
-    network.proxy.socks_remote_dns  true<br>
-    network.proxy.type:             1
-  </code>
-  </p>
-  <p>
-    To tell Chromium to use the proxy, it has to be started with the
-    "--proxy-server" command line option:
-  </p>
-  <p>
-  <code>
-    $ chromium --proxy-server="socks5://127.0.0.1:7777"
-  </code>
-  </p>
-  <p>
-    Now we should be able to resolve our GNS names in the browser! We
-    just have to type "https://ccc.myself" into the address bar. If
-    our friend Bob prepared his system, too, he can resolve our record
-    by typing "ccc.alice.myself".
-  </p>
-  <p>
-   See the <a href="https://docs.gnunet.org/#Integration-with-Browsers">chapter on Integration with Browsers in our handbook</a> for a more detailed description.
-  </p>
-</section>
-<section>
-  <h4>{{ _("VPN") }}</h4>
-  <p>
-        VPN can be used to share your Internet connection (yes, this may be dangerous, just as running a Tor exit node) or to provide access to services on your host (this should be less dangerous, as long as those services are secure).
-  </p>
-  <p>
-    In this tutorial we concentrate on providing access to services on your host.
-  </p>
-  <p>
-    For documentation to share your Internet connection have a look into <a href="https://docs.gnunet.org/#Configuring-the-GNUnet-VPN">chapter "Configuring the GNUnet VPN" in the handbook.</a>
-  </p>
-  <p>
-    First you have to edit your gnunet.conf and add this section.
-  </p>
-  <p>
+    <p>
+      GNUnet provides a proxy service (gnunet-gns-proxy) that the
+      browser can send DNS and HTTP traffic to. It will try to resolve
+      names with GNS first and forward the rest of the DNS traffic to
+      the system's DNS resolver. It will also take care of the HTTP
+      traffic, so the browser gets valid certificates and the web server
+      will not be confused by our GNS hostnames. Our GNS namestore
+      doesn't know about any DNS hostnames yet, so we have to store
+      them, too. For our "ccc" A record, we have to store a LEHO (legacy
+      hostname) record, too. It must contain the website's original DNS
+      hostname:
+    </p>
+    <p>
     <code>
-    [exit]</br>
-    START_ON_DEMAND = YES
+      $ gnunet-namestore -z myself -a -e "1 d" -p -t LEHO -n ccc -V www.ccc.de
     </code>
-  </p>
-  <p>
-    This is necessary to start the exit daemon.
-  </p>
-  <p>
-    Furthermore you need to add a section for your service.
-  </p>
-  <p>
+    </p>
+    <p>Now let's start gnunet-gns-proxy.</p>
+    <p>
     <code>
-    [http.gnunet.]</br>
-    TCP_REDIRECTS = 80:169.254.86.1:80 
+      $ /usr/lib/gnunet/libexec/gnunet-gns-proxy
     </code>
-  </p>
-  <p>
-    Here a service named 'http' is configured to be accessed on a remote and local host on port 80. The IP address is the default IP address for the exit interface. If you like to change to another private IP address range you can use can change
-  </p>
-  <p>
+    </p>
+    <p>
+      Our browser has to be configured so it uses our proxy. In Firefox
+      we have to set these options under "about:config":
+    </p>
+    <p>
     <code>
-    IPV4ADDR = 169.254.86.1
+      network.proxy.socks:            localhost<br>
+      network.proxy.socks_port:       7777<br>
+      network.proxy.socks_remote_dns  true<br>
+      network.proxy.type:             1
     </code>
-  </p>
-  <p>
-    in section 'exit'.
-  </p>
-  <p>
-    Now we have to add a GNS record to the namestore.
-  </p>
-  <p>
+    </p>
+    <p>
+      To tell Chromium to use the proxy, it has to be started with the
+      "--proxy-server" command line option:
+    </p>
+    <p>
     <code>
-    gnunet-namestore -z myself -a -e "1 d" -p -t VPN -n www -V "1 PKEY http"
+      $ chromium --proxy-server="socks5://127.0.0.1:7777"
     </code>
-  </p>
-  <p>
-    Where myself is the name of the zone we already used <a href='#gns_proxy'>above</a>, but now we are adding a record of type VPN, and the value is a string containing three values. A boolean indicating the use of TCP or UDP (TCP in the example above), the public key of your node and the identifier of the service we used <a href='#'>above</a> ([http.gnunet.].
-  </p>
-  <p>
-    After we added this record we should be able to access www.myself like we did ccc.myself via the browser <a href='#gns_proxy'>above</a>.
-  </p>
-  <p>
-    The UI version of this Tutorial can be find in Chapter <a href='https://docs.gnunet.org/#First-steps-_002d-Using-the-GNUnet-VPN'>Using the GNUnet VPN</a> in the handbook.
-  </p>
-</section>
-<section>
-  <h4>{{ _("Conversation") }}</h4>
-  <p>
-    TBD, see <a href="hhttps://docs.gnunet.org/#First-steps-_002d-Using-GNUnet-Conversation">chapter "Using GNUnet Conversation" in the handbook.</a>
-  </p>
-</section>
+    </p>
+    <p>
+      Now we should be able to resolve our GNS names in the browser! We
+      just have to type "https://ccc.myself" into the address bar. If
+      our friend Bob prepared his system, too, he can resolve our record
+      by typing "ccc.alice.myself".
+    </p>
+    <p>
+     See the <a href="https://docs.gnunet.org/#Integration-with-Browsers">chapter on Integration with Browsers in our handbook</a> for a more detailed description.
+    </p>
+  </section>
+  <section>
+    <h4>{{ _("VPN") }}</h4>
+    <p>
+          VPN can be used to share your Internet connection (yes, this may be dangerous, just as running a Tor exit node) or to provide access to services on your host (this should be less dangerous, as long as those services are secure).
+    </p>
+    <p>
+      In this tutorial we concentrate on providing access to services on your host.
+    </p>
+    <p>
+      For documentation to share your Internet connection have a look into <a href="https://docs.gnunet.org/#Configuring-the-GNUnet-VPN">chapter "Configuring the GNUnet VPN" in the handbook.</a>
+    </p>
+    <p>
+      First you have to edit your gnunet.conf and add this section.
+    </p>
+    <p>
+      <code>
+      [exit]</br>
+      START_ON_DEMAND = YES
+      </code>
+    </p>
+    <p>
+      This is necessary to start the exit daemon.
+    </p>
+    <p>
+      Furthermore you need to add a section for your service.
+    </p>
+    <p>
+      <code>
+      [http.gnunet.]</br>
+      TCP_REDIRECTS = 80:169.254.86.1:80 
+      </code>
+    </p>
+    <p>
+      Here a service named 'http' is configured to be accessed on a remote and local host on port 80. The IP address is the default IP address for the exit interface. If you like to change to another private IP address range you can use can change
+    </p>
+    <p>
+      <code>
+      IPV4ADDR = 169.254.86.1
+      </code>
+    </p>
+    <p>
+      in section 'exit'.
+    </p>
+    <p>
+      Now we have to add a GNS record to the namestore.
+    </p>
+    <p>
+      <code>
+      gnunet-namestore -z myself -a -e "1 d" -p -t VPN -n www -V "1 PKEY http"
+      </code>
+    </p>
+    <p>
+      Where myself is the name of the zone we already used <a href='#gns_proxy'>above</a>, but now we are adding a record of type VPN, and the value is a string containing three values. A boolean indicating the use of TCP or UDP (TCP in the example above), the public key of your node and the identifier of the service we used <a href='#'>above</a> ([http.gnunet.].
+    </p>
+    <p>
+      After we added this record we should be able to access www.myself like we did ccc.myself via the browser <a href='#gns_proxy'>above</a>.
+    </p>
+    <p>
+      The UI version of this Tutorial can be find in Chapter <a href='https://docs.gnunet.org/#First-steps-_002d-Using-the-GNUnet-VPN'>Using the GNUnet VPN</a> in the handbook.
+    </p>
+  </section>
+  <section>
+    <h4>{{ _("Conversation") }}</h4>
+    <p>
+      TBD, see <a href="hhttps://docs.gnunet.org/#First-steps-_002d-Using-GNUnet-Conversation">chapter "Using GNUnet Conversation" in the handbook.</a>
+    </p>
+  </section>
 </article>
 {% endblock body_content %}
diff --git a/template/video.html.j2 b/template/video.html.j2
index 27800ef3..8760fd18 100644
--- a/template/video.html.j2
+++ b/template/video.html.j2
@@ -1,11 +1,10 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container">
-  <div class="container text-center">
-    <header>
-      <h1>{{ _("Videos related to GNUnet") }}</h1>
-    </header>
-  </div>
+<article class="container">
+
+  <header>
+    <h1>{{ _("Videos related to GNUnet") }}</h1>
+  </header>
 
   <div class="row">
     <div class="col-lg-12">