diff --git a/addons/actions.md b/addons/actions.md
index d69aeb3b5..2ee3e4307 100644
--- a/addons/actions.md
+++ b/addons/actions.md
@@ -153,7 +153,7 @@ if ((thingStatusInfo != null) && (thingStatusInfo.getStatus().toString() == "ONL
     {% for action in site.addons_actions %}
         <tr class="install-{{action.install}} since-{{action.since}}">
           <td>
-            <h4><a href="{{action.url}}">{% if action.logo %}<img class="logo" src="{{base}}/{{action.logo}}" title="{{ action.label }}" alt="{{ action.label }}" />{% else %}{{ action.label }}{% endif %}</a></h4>
+            <h4><a href="{{base}}{{action.url}}">{% if action.logo %}<img class="logo" src="{{base}}/{{action.logo}}" title="{{ action.label }}" alt="{{ action.label }}" />{% else %}{{ action.label }}{% endif %}</a></h4>
             <img src="{{base}}/images/tag-since-{{action.since}}.svg"> <img src="{{base}}/images/tag-install-{{action.install}}.svg">
           </td>
           <td>{{ action.description | markdownify }}</td>
diff --git a/addons/bindings.md b/addons/bindings.md
index 77ec0fe7d..6b5cfc4a5 100644
--- a/addons/bindings.md
+++ b/addons/bindings.md
@@ -67,7 +67,7 @@ Bindings connect your smart home's devices and technologies to openHAB.
         Many openHAB 1 bindings have not yet completed validation for inclusion in the distribution; however, they may indeed work properly under openHAB 2.
         All openHAB 1 addons can be downloaded in a zip file <a href="https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F1.9.0%2Fopenhab-1.9.0-addons.zip">(1.9.0)</a>.
         We need your help testing them so that they may be easily installed in a future distribution.
-        Please see the <a href="{{base}}/developers/development/compatibilitylayer.html#how-to-use-openhab-1x-add-ons-that-are-not-part-of-the-distribution">compatibility layer documentation</a> and
+        Please see the <a href="{{root}}/developers/development/compatibilitylayer.html#how-to-use-openhab-1x-add-ons-that-are-not-part-of-the-distribution">compatibility layer documentation</a> and
         also search the <a href="https://community.openhab.org">openHAB community forum</a> for the latest information and steps for manual installation.
         </p>
       </td>
@@ -86,7 +86,7 @@ Bindings connect your smart home's devices and technologies to openHAB.
     {% for binding in site.addons_bindings %}
         <tr class="install-{{binding.install}} since-{{binding.since}}">
           <td>
-            <h4><a href="{{binding.url}}">{% if binding.logo %}<img class="logo" src="{{base}}/{{binding.logo}}" title="{{ binding.label }}" alt="{{ binding.label }}" />{% else %}{{ binding.label }}{% endif %}</a></h4>
+            <h4><a href="{{base}}{{binding.url}}">{% if binding.logo %}<img class="logo" src="{{base}}/{{binding.logo}}" title="{{ binding.label }}" alt="{{ binding.label }}" />{% else %}{{ binding.label }}{% endif %}</a></h4>
             <img src="{{base}}/images/tag-since-{{binding.since}}.svg"> <img src="{{base}}/images/tag-install-{{binding.install}}.svg">
           </td>
           <td>{{ binding.description | markdownify }}</td>
diff --git a/addons/io.md b/addons/io.md
index c6ec8118b..a28d42ddf 100644
--- a/addons/io.md
+++ b/addons/io.md
@@ -43,7 +43,7 @@ openHAB supports services that enable integration with various technologies that
     <!-- <tr class="install-{{io.install}} since-{{io.since}}"> -->
     <tr>
       <td>
-        <h4><a href="{{io.url}}">{% if io.logo %}<img class="logo" src="{{base}}/{{io.logo}}" title="{{ io.label }}" alt="{{ io.label }}" />{% else %}{{ io.label }}{% endif %}</a></h4>
+        <h4><a href="{{base}}{{io.url}}">{% if io.logo %}<img class="logo" src="{{base}}/{{io.logo}}" title="{{ io.label }}" alt="{{ io.label }}" />{% else %}{{ io.label }}{% endif %}</a></h4>
         <img src="{{base}}/images/tag-install-{{io.install}}.svg">
       </td>
       <td>{{ io.description | markdownify }}</td>
diff --git a/addons/persistence.md b/addons/persistence.md
index be67a221b..5de4be517 100644
--- a/addons/persistence.md
+++ b/addons/persistence.md
@@ -42,7 +42,7 @@ Persistence services enable the storage of item states over time.
     {% for persistence in site.addons_persistences %}
         <tr class="install-{{persistence.install}} since-{{persistence.since}}">
           <td>
-            <h4><a href="{{persistence.url}}">{% if persistence.logo %}<img class="logo" src="{{base}}/{{persistence.logo}}" title="{{ persistence.label }}" alt="{{ persistence.label }}" />{% else %}{{ persistence.label }}{% endif %}</a></h4>
+            <h4><a href="{{base}}{{persistence.url}}">{% if persistence.logo %}<img class="logo" src="{{base}}/{{persistence.logo}}" title="{{ persistence.label }}" alt="{{ persistence.label }}" />{% else %}{{ persistence.label }}{% endif %}</a></h4>
             <img src="{{base}}/images/tag-since-{{persistence.since}}.svg"> <img src="{{base}}/images/tag-install-{{persistence.install}}.svg">
           </td>
           <td>{{ persistence.description | markdownify }}</td>
diff --git a/addons/transformations.md b/addons/transformations.md
index ff5250d40..2a28d680b 100644
--- a/addons/transformations.md
+++ b/addons/transformations.md
@@ -68,7 +68,7 @@ Be aware that a transformation service just as any other openHAB add-on needs to
     {% for transformation in site.addons_transformations %}
     <tr class="install-{{transformation.install}} since-{{transformation.since}}">
       <td>
-        <h4><a href="{{transformation.url}}">{% if transformation.logo %}<img class="logo" src="{{base}}/{{transformation.logo}}" title="{{ transformation.label }}" alt="{{ transformation.label }}" />{% else %}{{ transformation.label }}{% endif %}</a></h4>
+        <h4><a href="{{base}}{{transformation.url}}">{% if transformation.logo %}<img class="logo" src="{{base}}/{{transformation.logo}}" title="{{ transformation.label }}" alt="{{ transformation.label }}" />{% else %}{{ transformation.label }}{% endif %}</a></h4>
         <img src="{{base}}/images/tag-install-{{transformation.install}}.svg">
       </td>
       <td>{{ transformation.description | markdownify }}</td>
diff --git a/addons/uis.md b/addons/uis.md
index 844ffc67c..cec1982e1 100644
--- a/addons/uis.md
+++ b/addons/uis.md
@@ -11,17 +11,17 @@ openHAB offers a variety of frontends for user interaction, from administrative
 
 | Web Application | Description   |
 |-----------------|---------------|
-| [Basic UI]({{docu}}/addons/uis/basic/readme.html) | The Basic UI is an HTML5 web application in Material Design, designed for operating openHAB. |
-| [Classic UI]({{docu}}/addons/uis/classic/readme.html) | The Classic UI is the original openHAB 1.x webui, designed for operating openHAB. |
-| [HABmin]({{docu}}/addons/uis/habmin/readme.html) | HABmin is a modern, professional and portable user interface for openHAB, providing both user and administrative functions. |
-| [HABPanel]({{docu}}/addons/uis/habpanel/readme.html) | HABPanel is a lightweight dashboard interface for openHAB. |
-| [Paper UI]({{docu}}/addons/uis/paper/readme.html) | The Paper UI is an AngularJS-based HTML5 web application in Material Design, designed for setup and administration purposes. |
+| [Basic UI]({{base}}/addons/uis/basic/readme.html) | The Basic UI is an HTML5 web application in Material Design, designed for operating openHAB. |
+| [Classic UI]({{base}}/addons/uis/classic/readme.html) | The Classic UI is the original openHAB 1.x webui, designed for operating openHAB. |
+| [HABmin]({{base}}/addons/uis/habmin/readme.html) | HABmin is a modern, professional and portable user interface for openHAB, providing both user and administrative functions. |
+| [HABPanel]({{base}}/addons/uis/habpanel/readme.html) | HABPanel is a lightweight dashboard interface for openHAB. |
+| [Paper UI]({{base}}/addons/uis/paper/readme.html) | The Paper UI is an AngularJS-based HTML5 web application in Material Design, designed for setup and administration purposes. |
 
 | App     | Description          |
 |---------|----------------------|
-| [Android App]({{docu}}/addons/uis/apps/android.html) | The native Android app to access openHAB on the go. |
-| [iOS App]({{docu}}/addons/uis/apps/ios.html) | The native iOS app to access openHAB on the go. |
-| [Windows 10 App]({{docu}}/addons/uis/apps/windows.html) | The native Windows 10 app to access openHAB on the go. |
+| [Android App]({{base}}/addons/uis/apps/android.html) | The native Android app to access openHAB on the go. |
+| [iOS App]({{base}}/addons/uis/apps/ios.html) | The native iOS app to access openHAB on the go. |
+| [Windows 10 App]({{base}}/addons/uis/apps/windows.html) | The native Windows 10 app to access openHAB on the go. |
 
 ## Iconsets
 
@@ -34,4 +34,4 @@ See the instructions about [Custom Icons and Custom Dynamic Icons]({{base}}/conf
 
 | Iconset | Description          |
 |---------|----------------------|
-| [Classic Icons]({{docu}}/addons/iconsets/classic/readme.html) | This is a modernized version of the original icon set of openHAB 1. |
+| [Classic Icons]({{base}}/addons/iconsets/classic/readme.html) | This is a modernized version of the original icon set of openHAB 1. |
diff --git a/addons/voices.md b/addons/voices.md
index 2d054340f..50a2fe532 100644
--- a/addons/voices.md
+++ b/addons/voices.md
@@ -9,5 +9,5 @@ title: Voice Services
 
 | Voice Service | Description |
 |---------------|-------------|
-{% for voice in site.addons_voices %}| [{% if voice.logo %}<img class="logo" src="{{base}}/{{voice.logo}}" title="{{ voice.label }}" alt="{{ voice.label }}" />{% else %}{{ voice.label }}{% endif %}]({{ voice.url }}) | {{ voice.description }} |
+{% for voice in site.addons_voices %}| [{% if voice.logo %}<img class="logo" src="{{base}}/{{voice.logo}}" title="{{ voice.label }}" alt="{{ voice.label }}" />{% else %}{{ voice.label }}{% endif %}]({{base}}{{ voice.url }}) | {{ voice.description }} |
 {% endfor %}