diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md
index b0dadba3e..77ea1f112 100644
--- a/content/navigation/navigation.md
+++ b/content/navigation/navigation.md
@@ -12,10 +12,10 @@ navLinks:
     expandable: false
     submenu:
       - title: Page2
-        path: /page2
+        path: /threefold/page2
 
       - title: Page3
-        path: /page3
+        path: /threefold/page3
 
   - name: People
     link: /people
@@ -28,10 +28,10 @@ navLinks:
     expandable: false
     submenu:
       - title: NewsRoom
-        path: /news
+        path: /threefold/news
 
       - title: Blog
-        path: /blog
+        path: /threefold/blog
 
       - title: Community
         path: https://forums.threefold.io/
diff --git a/gridsome.config.js b/gridsome.config.js
index f03eefd14..483bbaa43 100644
--- a/gridsome.config.js
+++ b/gridsome.config.js
@@ -6,6 +6,7 @@
 
 module.exports = {
     siteName: 'Threefold Webstack',
+    pathPrefix: 'threefold',
     plugins: [
 
         // Local models
diff --git a/static/img/TFN_black.svg b/src/assets/images/TFN_black.svg
similarity index 100%
rename from static/img/TFN_black.svg
rename to src/assets/images/TFN_black.svg
diff --git a/static/img/TFN_white.svg b/src/assets/images/TFN_white.svg
similarity index 100%
rename from static/img/TFN_white.svg
rename to src/assets/images/TFN_white.svg
diff --git a/src/assets/imgs/loader.gif b/src/assets/images/loader.gif
similarity index 100%
rename from src/assets/imgs/loader.gif
rename to src/assets/images/loader.gif
diff --git a/static/img/tf_icon_black.svg b/src/assets/images/tf_icon_black.svg
similarity index 100%
rename from static/img/tf_icon_black.svg
rename to src/assets/images/tf_icon_black.svg
diff --git a/static/img/tf_icon_white.svg b/src/assets/images/tf_icon_white.svg
similarity index 100%
rename from static/img/tf_icon_white.svg
rename to src/assets/images/tf_icon_white.svg
diff --git a/src/components/custom/Navbar/Navbar.vue b/src/components/custom/Navbar/Navbar.vue
index 5ef669f33..c1d9b14fa 100644
--- a/src/components/custom/Navbar/Navbar.vue
+++ b/src/components/custom/Navbar/Navbar.vue
@@ -11,7 +11,7 @@
         <div class="inline-flex items-center flex-shrink-0">
           <a href="/" class="flex">
             <img
-              src="/img/TFN_black.svg"
+              :src="require(`!!assets-loader!@images/TFN_black.svg`)"
               class="mr-3 fill-current"
               width="180"
               v-if="theme == 'light'"
@@ -19,12 +19,28 @@
             />
 
             <img
-              src="/img/TFN_white.svg"
+              :src="require(`!!assets-loader!@images/TFN_black.svg`)"
               class="mr-3 fill-current"
               width="180"
               v-else
               alt=""
             />
+
+            <!-- <g-image
+              v-if="theme == 'light'"
+              width="180"
+              class="mr-3 fill-current"
+              :src="require(`!!assets-loader!@images/TFN_black.svg`)"
+              alt=""
+            />
+            <g-image
+              v-else
+              width="180"
+              class="mr-3 fill-current"
+              :src="require(`!!assets-loader!@images/TFN_white.svg`)"
+              alt=""
+            /> -->
+
             <!-- <span
               class="hidden md:block font-semibold text-xl tracking-tight"
               >{{ $static.metadata.siteName }}</span
@@ -214,7 +230,7 @@
           </li>
         </ul>
       </div>
-    </header> 
+    </header>
   </div>
 </template>
 
diff --git a/src/components/marketing/sections/cta-sections/Footer.vue b/src/components/marketing/sections/cta-sections/Footer.vue
index 1046fdf38..d65878e3c 100644
--- a/src/components/marketing/sections/cta-sections/Footer.vue
+++ b/src/components/marketing/sections/cta-sections/Footer.vue
@@ -9,14 +9,14 @@
         <div class="space-y-8 xl:col-span-1">
           <g-image
             class="h-10"
-            src="/img/tf_icon_black.svg"
+            :src="require(`!!assets-loader!@images/tf_icon_black.svg`)"
             alt="Company name"
             v-if="theme == 'light'"
           />
 
           <g-image
             class="h-10"
-            src="/img/tf_icon_white.svg"
+            :src="require(`!!assets-loader!@images/tf_icon_white.svg`)"
             alt="Company name"
             v-else
           />
diff --git a/src/templates/Search.vue b/src/templates/Search.vue
index dba21ea57..d2784ccce 100644
--- a/src/templates/Search.vue
+++ b/src/templates/Search.vue
@@ -4,10 +4,10 @@
       class="container sm:pxi-0 mx-auto"
       :style="{ 'min-height': contentHeight + 'px' }"
     >
-      <img
+      <g-image
         v-if="loading"
         class="m-auto"
-        src="/img/loader.gif"
+        :src="require(`!!assets-loader!@images/loader.gif`)"
         alt=""
       />
       <div