diff --git a/threadr/about/index.php b/threadr/about/index.php
index ed09897..4eb6c0e 100644
--- a/threadr/about/index.php
+++ b/threadr/about/index.php
@@ -15,11 +15,11 @@ session_start();
   </head>
   <body>
     <ul class="topnav">
-      <li><a href="%CONTENT_DIR%/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
+      <li>%HOME_LINK%</li>
       <li><a href="%CONTENT_DIR%/news/">News</a></li>
       <!--<li><a href="%CONTENT_DIR%/boards/">Boards</a></li>-->
 	  <div class="dropdown">
-	  	<button class="dropbtn">Boards 
+	  	<button class="dropbtn">Boards
 			<i class="fa fa-caret-down"></i>
 		</button>
 		<div class="dropdown-content">
@@ -27,9 +27,9 @@ session_start();
 			<a href="#">Board 2</a>
 			<a href="#">Board 3</a>
 		</div>
-	  </div> 
+	  </div>
       <li><a class="active" href="%CONTENT_DIR%/about/">About</a></li>
-      <li class="right"><a href="%CONTENT_DIR%/login/">Log In</a></li>
+      <li class="right">%LOGIN_LINK%</li>
     </ul>
     <h1>
       <center>About us and our website...</center>
diff --git a/threadr/boards/index.php b/threadr/boards/index.php
index 37ae91a..de209c4 100644
--- a/threadr/boards/index.php
+++ b/threadr/boards/index.php
@@ -13,11 +13,11 @@ session_start();
     </head>
     <body>
       <ul class="topnav">
-        <li><a href="%CONTENT_DIR%/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
+        <li>%HOME_LINK%</li>
         <li><a href="%CONTENT_DIR%/news/">News</a></li>
         <!--<li><a href="%CONTENT_DIR%/boards/">Boards</a></li>-->
 	  	<div class="dropdown">
-	  	<button class="dropbtn">Boards 
+	  	<button class="dropbtn">Boards
 			<i class="fa fa-caret-down"></i>
 		</button>
 		<div class="dropdown-content">
@@ -25,9 +25,9 @@ session_start();
 			<a href="#">Board 2</a>
 			<a href="#">Board 3</a>
 		</div>
-	    </div> 
+	    </div>
         <li><a href="%CONTENT_DIR%/about/">About</a></li>
-        <li class="right"><a href="%CONTENT_DIR%/login/">Log In</a></li>
+        <li class="right">%LOGIN_LINK%</li>
       </ul>
       <br />
       <div class="container">
diff --git a/threadr/index.php b/threadr/index.php
index 2d21970..3e31637 100644
--- a/threadr/index.php
+++ b/threadr/index.php
@@ -12,24 +12,21 @@ session_start();
   </head>
   <body>
     <ul class="topnav">
-      <li><a class="active" href="%CONTENT_DIR%/">
-        <img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" class="available_space"/>
-      </a></li>
-      
+      <li>%HOME_LINK%</li>
 
       <li><a href="%CONTENT_DIR%/news/">News</a></li>
       <div class="dropdown">
-	  <button class="dropbtn">Boards 
-	  	<i class="fa fa-caret-down"></i>
+	  <button class="dropbtn">Boards
+	  	<i class="fa fa-caret-down"></i> <!-- Hä? Ein leerer kursiver Textteil? -->
 	  </button>
 	  <div class="dropdown-content">
       	<a href="%CONTENT_DIR%/boards/">Board 1</a>
 		<a href="#">Board 2</a>
 		<a href="#">Board 3</a>
 	  </div>
-	  </div> 
+	  </div>
       <li><a href="%CONTENT_DIR%/about/">About</a></li>
-      <li class="right"><a href="%CONTENT_DIR%/login/">Log In</a></li>
+      <li class="right">%LOGIN_LINK%</li>
     </ul>
     <br />
     <div class="container">
diff --git a/threadr/login/index.php b/threadr/login/index.php
index da8d0a7..41f35b5 100644
--- a/threadr/login/index.php
+++ b/threadr/login/index.php
@@ -1,6 +1,6 @@
 <?php
 session_start();
-%NO_CHEAP_SESSION_STEALING%
+//todo: force log out any user if logged in on this page
 ?>
 <!DOCTYPE html>
 <html>
@@ -12,11 +12,11 @@ session_start();
   </head>
   <body>
     <ul class="topnav">
-      <li><a href="%CONTENT_DIR%/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
+      <li><a href="%CONTENT_DIR%/">%HOME_LINK%</li>
       <li><a href="%CONTENT_DIR%/news/">News</a></li>
       <!--<li><a href="%CONTENT_DIR%/boards/">Boards</a></li>-->
 	  <div class="dropdown">
-	  	<button class="dropbtn">Boards 
+	  	<button class="dropbtn">Boards
 			<i class="fa fa-caret-down"></i>
 		</button>
 		<div class="dropdown-content">
@@ -24,10 +24,10 @@ session_start();
 			<a href="#">Board 2</a>
 			<a href="#">Board 3</a>
 		</div>
-	  </div> 
+	  </div>
 
       <li><a href="%CONTENT_DIR%/about/">About</a></li>
-      <li class="right"><a class="active" href="%CONTENT_DIR%/login/">Log In</a></li>
+      <li class="right">%LOGIN_LINK%</li>
     </ul>
     <br />
     <div class="container">
diff --git a/threadr/logout/index.php b/threadr/logout/index.php
index 9f4574a..5f0e809 100644
--- a/threadr/logout/index.php
+++ b/threadr/logout/index.php
@@ -16,11 +16,10 @@ session_destroy();
       </head>
       <body>
         <ul class="topnav">
-          <li><a href="%CONTENT_DIR%/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
-	  		
+          <li>%HOME_LINK%</li>
           <li><a href="%CONTENT_DIR%/news/">News</a></li>
 		  <div class="dropdown">
-	  			<button class="dropbtn">Boards 
+	  			<button class="dropbtn">Boards
 			<i class="fa fa-caret-down"></i>
 			</button>
 			<div class="dropdown-content">
@@ -28,9 +27,9 @@ session_destroy();
 				<a href="#">Board 2</a>
 				<a href="#">Board 3</a>
 			</div>
-	  	  </div> 
+	  	  </div>
           <li><a href="%CONTENT_DIR%/about/">About</a></li>
-          <li class="right"><a href="%CONTENT_DIR%/login/">Log In</a></li>
+          <li class="right">%LOGIN_LINK%</li>
         </ul>
         <br />
         <div class="container">
diff --git a/threadr/news/index.php b/threadr/news/index.php
index 4d66dcd..0baba9f 100644
--- a/threadr/news/index.php
+++ b/threadr/news/index.php
@@ -13,11 +13,11 @@ session_start();
   </head>
   <body>
     <ul class="topnav">
-      <li><a href="%CONTENT_DIR%/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
+      <li>%HOME_LINK%</li>
       <li><a class="active" href="%CONTENT_DIR%/news/">News</a></li>
       <!--<li><a href="%CONTENT_DIR%/boards/">Boards</a></li>-->
 	  <div class="dropdown">
-	  	<button class="dropbtn">Boards 
+	  	<button class="dropbtn">Boards
 			<i class="fa fa-caret-down"></i>
 		</button>
 		<div class="dropdown-content">
@@ -25,9 +25,9 @@ session_start();
 			<a href="#">Board 2</a>
 			<a href="#">Board 3</a>
 		</div>
-	  </div> 
+	  </div>
       <li><a href="%CONTENT_DIR%/about/">About</a></li>
-      <li class="right"><a href="%CONTENT_DIR%/login/">Log In</a></li>
+      <li class="right">%LOGIN_LINK%</li>
     </ul>
     <br />
     <div class="container">
@@ -40,6 +40,7 @@ session_start();
         <ul class="list">
         <li><p> 2020-02-21 Whole Website updated: Homepage, News, Boards, About, Log In, Userhome, Log Out</p></li>
         <li><p> 2020-01-06 First Steps done </p></li>
+        <li><pre> @ my fellow devs: Yeeee! This will be gone once the DB table is in place.  Don’t bother. </pre></li>
         </ul>
       </div>
     </div>
diff --git a/threadr/profile/index.php b/threadr/profile/index.php
index 34b2c4d..f61fef4 100644
--- a/threadr/profile/index.php
+++ b/threadr/profile/index.php
@@ -17,13 +17,13 @@ $username = $dbentry['name'];
     <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
   </head>
-  
+
   <body>
     <ul class="topnav">
-    <li><a class="active" href="%CONTENT_DIR%/userhome/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
+    <li>%HOME_LINK%</li>
     <li><a href="%CONTENT_DIR%/news/">News</a></li>
 	<div class="dropdown">
-		<button class="dropbtn">Boards 
+		<button class="dropbtn">Boards
 	<i class="fa fa-caret-down"></i>
 	</button>
 	<div class="dropdown-content">
@@ -31,9 +31,9 @@ $username = $dbentry['name'];
 		<a href="#">Board 2</a>
 		<a href="#">Board 3</a>
 	</div>
-	</div> 
+	</div>
     <li><a href="%CONTENT_DIR%/about/">About</a></li>
-    <li class="right"><a href="%CONTENT_DIR%/logout/">Log Out</a></li>
+    <li class="right">%LOGIN_LINK%</li>
   </ul>
   <br />
   <div class="container">
@@ -46,4 +46,4 @@ $username = $dbentry['name'];
       </ul>
     </div>
   </div>
-</html>
\ No newline at end of file
+</html>
diff --git a/threadr/signup/index.php b/threadr/signup/index.php
index afd22c0..56c7ebc 100644
--- a/threadr/signup/index.php
+++ b/threadr/signup/index.php
@@ -13,11 +13,11 @@ session_start();
   </head>
   <body>
     <ul class="topnav">
-      <li><a href="%CONTENT_DIR%/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
+      <li>%HOME_LINK%</li>
       <li><a href="%CONTENT_DIR%/news/">News</a></li>
       <li><a href="%CONTENT_DIR%/boards/">Boards</a></li>
       <li><a href="%CONTENT_DIR%/about/">About</a></li>
-      <li class="right"><a class="active" href="%CONTENT_DIR%/login/">Log In</a></li>
+      <li class="right">%LOGIN_LINK%</li>
     </ul>
     <br />
     <div class="container">
diff --git a/threadr/signup/verify-email/index.php b/threadr/signup/verify-email/index.php
index 32dccf1..e726a28 100644
--- a/threadr/signup/verify-email/index.php
+++ b/threadr/signup/verify-email/index.php
@@ -37,9 +37,9 @@
       </head>
       <body>
         <ul class="topnav">
-          <li><a href="%CONTENT_DIR%/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
+          <li>%HOME_LINK%</li>
           <!-- <li><a class="dropdown">
-            <button class="dropbtn">News 
+            <button class="dropbtn">News
               <i class="fa fa-caret-down"></i>
             </button>
             <div class="dropdown-content">
@@ -51,7 +51,7 @@
           <li><a href="%CONTENT_DIR%/news/">News</a></li>
           <li><a href="%CONTENT_DIR%/boards/">Boards</a></li>
           <li><a href="%CONTENT_DIR%/about/">About</a></li>
-          <li class="right"><a class="active" href="%CONTENT_DIR%/login/">Log In</a></li>
+          <li class="right">%LOGIN_LINK%</li>
         </ul>
         <br />
         <div class="container">
diff --git a/threadr/userhome/index.php b/threadr/userhome/index.php
index 9e25dc3..2041719 100644
--- a/threadr/userhome/index.php
+++ b/threadr/userhome/index.php
@@ -20,10 +20,10 @@ $username = $dbentry['name'];
   </head>
   <body>
     <ul class="topnav">
-    <li><a class="active" href="%CONTENT_DIR%/userhome/"><img src="%CONTENT_DIR%/img/ThreadR_Home.svg" alt="Home" /></a></li>
+    <li>%HOME_LINK%</li>
     <li><a href="%CONTENT_DIR%/news/">News</a></li>
 	<div class="dropdown">
-		<button class="dropbtn">Boards 
+		<button class="dropbtn">Boards
 	<i class="fa fa-caret-down"></i>
 	</button>
 	<div class="dropdown-content">
@@ -31,9 +31,9 @@ $username = $dbentry['name'];
 		<a href="#">Board 2</a>
 		<a href="#">Board 3</a>
 	</div>
-	</div> 
+	</div>
     <li><a href="%CONTENT_DIR%/about/">About</a></li>
-    <li class="right"><a href="%CONTENT_DIR%/logout/">Log Out</a></li>
+    <li class="right">%LOGIN_LINK%</li>
   </ul>
   <br />
   <div class="container">
