diff --git a/contrib/templates/default/navbar.mustache b/contrib/templates/default/navbar.mustache
index afe372c..5c0fa34 100644
--- a/contrib/templates/default/navbar.mustache
+++ b/contrib/templates/default/navbar.mustache
@@ -38,7 +38,7 @@
      |
    </span>
    <span class="navbar-links"> 
-     <span class="navbar-link"><a href="{{prefix}}overboard/">{{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}}</a></span>
+     <span class="navbar-link"><a href="{{prefix}}o/">{{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}}</a></span>
    </span>
    <span class="navbar-sep">
      |
diff --git a/contrib/templates/default/ukko.mustache b/contrib/templates/default/ukko.mustache
index a194466..71cf1a1 100644
--- a/contrib/templates/default/ukko.mustache
+++ b/contrib/templates/default/ukko.mustache
@@ -25,12 +25,12 @@
       <div id="ukko_paginator">
         {{#prev}}
           <span id="ukko_prev">
-            <a href="{{prefix}}ukko-{{no}}.html">previous</a>
+            <a href="{{prefix}}o/{{no}}/">previous</a>
           </span>
         {{/prev}}
         {{#next}}
           <span id="ukko_next">
-            <a href="{{prefix}}ukko-{{no}}.html">next</a>
+            <a href="{{prefix}}o/{{no}}/">next</a>
           </span>
         {{/next}}
       </div>
@@ -68,12 +68,12 @@
       <div id="ukko_paginator">
         {{#prev}}
           <span id="ukko_prev">
-            <a href="{{prefix}}ukko-{{no}}.html">previous</a>
+            <a href="{{prefix}}o/{{no}}/">previous</a>
           </span>
         {{/prev}}
         {{#next}}
           <span id="ukko_next">
-            <a href="{{prefix}}ukko-{{no}}.html">next</a>
+            <a href="{{prefix}}o/{{no}}/">next</a>
           </span>
         {{/next}}
       </div>