diff --git a/portfolio/site.hs b/portfolio/site.hs
index 6e6b851..4842378 100644
--- a/portfolio/site.hs
+++ b/portfolio/site.hs
@@ -25,7 +25,7 @@ main = hakyll $ do
     match (fromList ["about.rst", "contact.markdown"]) $ do
         route   $ setExtension "html"
         compile $ pandocCompiler
-            >>= loadAndApplyTemplate "templates/default.html" defaultContext
+            >>= loadAndApplyTemplate "templates/default.html" staticPageContext
             >>= relativizeUrls
 
     match "posts/*" $ do
@@ -57,6 +57,7 @@ main = hakyll $ do
                     listField  "posts"    postCtx (return posts) `mappend`
                     constField "title"    "Archives"             `mappend`
                     constField "language" "en"                   `mappend`
+                    langDict "en" <>
                     defaultContext
 
             makeItem ""
@@ -73,6 +74,7 @@ main = hakyll $ do
                     constField "title"    "Plamo"                `mappend`
                     constField "logosub"  "Plamo enthousiast"    `mappend`
                     constField "language" "en"                   `mappend`
+                    langDict "en" <>
                     defaultContext
 
             makeItem ""
@@ -116,9 +118,16 @@ main = hakyll $ do
 
 
 --------------------------------------------------------------------------------
+staticPageContext :: Context String
+staticPageContext =
+        langDict "en" <>
+        defaultContext
+
 postCtx :: Context String
 postCtx =
     dateField "date" "%e %B %Y" `mappend`
+    constField "language" "en"  `mappend`
+    langDict "en" <>
     defaultContext
 
 isUpcoming :: UTCTime -> Item a -> Compiler Bool
@@ -135,16 +144,28 @@ langDict :: String -> Context a
 langDict "nl" =
     constField "welcome" "Welkom" <>
     constField "switcher" "Taal" <>
+    constField "title-japan" "Japan" <>
+    constField "title-plamo" "Plamo" <>
+    constField "title-radio" "Radio" <>
+    constField "title-software" "Software" <>
     mempty
 
 langDict "jp" =
     constField "welcome" "ようこそ" <>
     constField "switcher" "言語" <>
+    constField "title-japan" "日本" <>
+    constField "title-plamo" "プラモ" <>
+    constField "title-radio" "ラジオ" <>
+    constField "title-software" "ソフトウェア" <>
     mempty
 
 langDict "en" =
     constField "welcome" "Welcome" <>
     constField "switcher" "Language" <>
+    constField "title-japan" "Japan" <>
+    constField "title-plamo" "Plamo" <>
+    constField "title-radio" "Radio" <>
+    constField "title-software" "Software" <>
     mempty
 
 langDict _ = mempty
diff --git a/portfolio/templates/index.html b/portfolio/templates/index.html
index 9f54f4b..9856dce 100644
--- a/portfolio/templates/index.html
+++ b/portfolio/templates/index.html
@@ -17,7 +17,7 @@
         <img src="/images/plamo/model-kits/gundam/hg/smc-2025-gundam/thumbnail.webp" alt="thumbnail" class="card-img-top img-fluid rounded-top" >
       </a>
       <div class="card-body">
-        <p class="card-text text-center">Japan</p>
+        <p class="card-text text-center">$title-japan$</p>
       </div>
     </div>
   </div>
@@ -29,7 +29,7 @@
         <img src="/images/plamo/model-kits/gundam/hg/smc-2025-gundam/thumbnail.webp" alt="thumbnail" class="card-img-top img-fluid rounded-top" >
       </a>
       <div class="card-body">
-        <p class="card-text text-center">Plamo</p>
+        <p class="card-text text-center">$title-plamo$</p>
       </div>
     </div>
   </div>
@@ -41,7 +41,7 @@
         <img src="/images/plamo/model-kits/gundam/hg/smc-2025-gundam/thumbnail.webp" alt="thumbnail" class="card-img-top img-fluid rounded-top" >
       </a>
       <div class="card-body">
-        <p class="card-text text-center">Radio</p>
+        <p class="card-text text-center">$title-radio$</p>
       </div>
     </div>
   </div>
@@ -53,7 +53,7 @@
         <img src="/images/plamo/model-kits/gundam/hg/smc-2025-gundam/thumbnail.webp" alt="thumbnail" class="card-img-top img-fluid rounded-top" >
       </a>
       <div class="card-body">
-        <p class="card-text text-center">Software</p>
+        <p class="card-text text-center">$title-software$</p>
       </div>
     </div>
   </div>
diff --git a/portfolio/templates/navbar.html b/portfolio/templates/navbar.html
index ab320d5..fcc9a29 100644
--- a/portfolio/templates/navbar.html
+++ b/portfolio/templates/navbar.html
@@ -9,16 +9,16 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav me-auto mb-2 mb-lg-0">
         <li class="nav-item">
-          <a class="nav-link disabled" aria-disabled="true">Japan</a>
+          <a class="nav-link disabled" aria-disabled="true">$title-japan$</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="/plamo.html">Plamo</a>
+          <a class="nav-link" href="/plamo.html">$title-plamo$</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link disabled" aria-disabled="true">Radio</a>
+          <a class="nav-link disabled" aria-disabled="true">$title-radio$</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link disabled" aria-disabled="true">Software</a>
+          <a class="nav-link disabled" aria-disabled="true">$title-software$</a>
         </li>
       </ul>
     </div>