diff --git a/_config.yml b/_config.yml
index 1f91e38..269d19a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -121,6 +121,6 @@ description: "Merlin 6 is the HPC cluster at Paul Scherrer Institute in Switzerl
 # url: http://idratherbewriting.com
 # baseurl: /documentation-theme-jekyll
 url: "https://lsm-hpce.gitpages.psi.ch"
-baseurl: ""
+baseurl: /
 
 github: [metadata]
diff --git a/_includes/footer.html b/_includes/footer.html
index a8264ca..bdaa613 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -3,7 +3,7 @@
                 <div class="col-lg-12 footer">
                &copy;{{ site.time | date: "%Y"  }} {{site.company_name}}. All rights reserved. <br />
 {% if page.last_updated %}<span>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Site last generated: {{ site.time | date: "%b %-d, %Y"  }} <br />
-<p><img src="{{ site.baseurl }}/images/company_logo.png" alt="Company logo"/></p>
+<p><img src="{{ "/images/company_logo.png"| prepend: site.baseurl | prepend: site.url }}" alt="Company logo"/></p>
                 </div>
             </div>
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
index 7208a64..0191c4c 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -4,32 +4,32 @@
 <meta name="description" content="{% if page.summary %}{{ page.summary | strip_html | strip_newlines | truncate: 160 }}{% endif %}">
 <meta name="keywords" content="{{page.tags}}{% if page.tags %}, {% endif %} {{page.keywords}}">
 <title>{{ page.title }} | {{ site.site_title }}</title>
-<link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
+<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl | prepend: site.url}}">
 
 <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-<!--<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/bootstrap.min.css">-->
-<link rel="stylesheet" href="{{ site.baseurl }}/css/modern-business.css">
+<!--<link rel="stylesheet" type="text/css" href="{{ "/css/bootstrap.min.css"| prepend: site.baseurl | prepend: site.url }}">-->
+<link rel="stylesheet" href="{{ "/css/modern-business.css"| prepend: site.baseurl | prepend: site.url }}">
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-<link rel="stylesheet" href="{{ site.baseurl }}/css/customstyles.css">
-<link rel="stylesheet" href="{{ site.baseurl }}/css/boxshadowproperties.css">
+<link rel="stylesheet" href="{{ "/css/customstyles.css"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/boxshadowproperties.css"| prepend: site.baseurl | prepend: site.url }}">
 <!-- most color styles are extracted out to here -->
-<link rel="stylesheet" href="{{ site.baseurl }}/css/theme-blue.css">
+<link rel="stylesheet" href="{{ "/css/theme-blue.css"| prepend: site.baseurl | prepend: site.url }}">
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>
-<script src="{{ site.baseurl }}/js/jquery.navgoco.min.js"></script>
+<script src="{{ "/js/jquery.navgoco.min.js"| prepend: site.baseurl | prepend: site.url }}"></script>
 
 
 <!-- Latest compiled and minified JavaScript -->
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 <!-- Anchor.js -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.2.0/anchor.min.js"></script>
-<script src="{{ site.baseurl }}/js/toc.js"></script>
-<script src="{{ site.baseurl }}/js/customscripts.js"></script>
+<script src="{{ "/js/toc.js"| prepend: site.baseurl | prepend: site.url }}"></script>
+<script src="{{ "/js/customscripts.js"| prepend: site.baseurl | prepend: site.url }}"></script>
 
-<link rel="shortcut icon" href="{{ site.baseurl }}/images/favicon.ico">
+<link rel="shortcut icon" href="{{ "/images/favicon.ico"| prepend: site.baseurl | prepend: site.url }}">
 
 <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/_includes/image.html b/_includes/image.html
index ba5164a..aaee858 100644
--- a/_includes/image.html
+++ b/_includes/image.html
@@ -1 +1 @@
-<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" rel="noopener" href="{{include.url}}">{% endif %}<img class="docimage" src="{{ site.baseurl }}/images/{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption>{% endif %}</figure>
+<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" rel="noopener" href="{{include.url}}">{% endif %}<img class="docimage" src="{{ "/images/"| prepend: site.baseurl | prepend: site.url }}{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption>{% endif %}</figure>
diff --git a/_includes/inline_image.html b/_includes/inline_image.html
index aab55c5..2ae9817 100644
--- a/_includes/inline_image.html
+++ b/_includes/inline_image.html
@@ -1 +1 @@
-<img class="inline" src="{{ site.baseurl }}/images/{{include.file}}" alt="{{include.alt}}" />
+<img class="inline" src="{{ "/images/"| prepend: site.baseurl | prepend: site.url }}{{include.file}}" alt="{{include.alt}}" />
diff --git a/_includes/topnav.html b/_includes/topnav.html
index 6b31014..4decdea 100644
--- a/_includes/topnav.html
+++ b/_includes/topnav.html
@@ -60,12 +60,12 @@
                         <input type="text" id="search-input" placeholder="{{site.data.strings.search_placeholder_text}}">
                         <ul id="results-container"></ul>
                     </div>
-                    <script src="{{ site.baseurl }}/js/jekyll-search.js" type="text/javascript"></script>
+                    <script src="{{ "/js/jekyll-search.js"| prepend: site.baseurl | prepend: site.url }}" type="text/javascript"></script>
                     <script type="text/javascript">
                             SimpleJekyllSearch.init({
                                 searchInput: document.getElementById('search-input'),
                                 resultsContainer: document.getElementById('results-container'),
-                                dataSource: '{{ site.baseurl }}/search.json',
+                                dataSource: '{{ "/search.json"| prepend: site.baseurl | prepend: site.url }}',
                                 searchResultTemplate: '<li><a href="{url}" title="{{page.title | escape }}">{title}</a></li>',
                     noResultsText: '{{site.data.strings.search_no_results_text}}',
                             limit: 10,