diff --git a/gen_vor.php b/gen_vor.php
index 277c0cb..df1cebb 100644
--- a/gen_vor.php
+++ b/gen_vor.php
@@ -8,6 +8,13 @@ $fil = file($file_txt, FILE_IGNORE_NEW_LINES);
 // Insert header
 $arr = ['| | |  |', '|:------|:------|:------|'];
 $ts=(new DateTime('first day of this month'))->getTimeStamp();
+$tues_ts = strtotime('fourth tuesday of this month + 1 day', $ts);
+
+// Are we past the fourst Tuesday in the month?
+if ((new DateTime())->getTimeStamp() >= $tues_ts) {
+    $ts = strtotime('+1 month', $ts);
+}    
+
 foreach ($fil as $line) {
     $fields = array_filter(explode('|', $line));
     if (count($fields) == 2) {
@@ -15,7 +22,7 @@ foreach ($fil as $line) {
         $tuesday = strftime('%A, %d.%m.%Y ', strtotime('fourth tuesday of this month', $ts));
         array_unshift($fields, $tuesday);
     }
-    $ts=strtotime('+1 month', $ts);
+    $ts = strtotime('+1 month', $ts);
     $li = implode('|', $fields);
     // Insert leading and trailing spaces if required
     if ($li[0] != ' ') {
diff --git a/layouts/partial/site-header.html~ b/layouts/partial/site-header.html~
deleted file mode 100644
index 92f5027..0000000
--- a/layouts/partial/site-header.html~
+++ /dev/null
@@ -1,30 +0,0 @@
-<header class="gblog-header">
-    <div class="container flex align-center justify-center">
-        <a class="gblog-header__link" rel="me" href="{{ .Site.BaseURL }}">
-            <span class="gblog-brand flex align-center justify-center">
-                <img class="gblog-brand__img" src="{{ (default "brand.svg" .Site.Params.logo) | relURL }}" alt="FraLUG" width=180 height=96>
-                {{ .Site.Title }}
-            </span>
-            {{ with .Site.Params.subtitle }}
-            <span class="gblog-brand__subtitle flex align-center justify-center">{{ . }}</span>
-            {{ end }}
-        </a>
-    </div>
-</header>
-<nav class="gblog-nav">
-    <input type="checkbox" id="menu-control" class="hidden">
-
-    <ul class="gblog-nav__list container flex flex-wrap justify-center menu-content">
-        {{ $currentPage := .RelPermalink }}
-        {{ range $name, $taxonomy := .Site.Taxonomies.tags }}
-        {{ with $.Site.GetPage (printf "/tags/%s" $name) }}
-        <li>
-            <a class="gblog-nav__entry {{ if eq $currentPage .RelPermalink }} is-active {{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a>
-        </li>
-        {{ end }}
-        {{ end }}
-        {{ if .Site.Data.menu.extra.header }}
-        {{ partial "menu-extra" (dict "current" . "source" .Site.Data.menu.extra.header "target" "header") }}
-        {{ end }}
-    </ul>
-</nav>
diff --git a/layouts/shortcodes/dat.html~ b/layouts/shortcodes/dat.html~
deleted file mode 100644
index 472b056..0000000
--- a/layouts/shortcodes/dat.html~
+++ /dev/null
@@ -1,32 +0,0 @@
-<div id="dat">
-  <script language="javascript" type="text/javascript" src="/js/datejs/date-de-DE.js"></script>
-  <script language="javascript" type="text/javascript">
-    function getNextMeetingDate() {
-	let today = Date.today();
-	// Are we past the fourth Tuesday of a month?
-	var secondMonday = today.second().monday();
-	var fourthTuesday = today.fourth().tuesday();
-	if (today > fourthTuesday) {
-	    var nextDate = (1).months().fromNow().second().monday();
-	} else if (today <= secondMonday) {
-	    // Are we before the second Monday?
-	    var nextDate = secondMonday;
-	} else {
-	    // Are we in between?
-	    var nextDate = fourthTuesday;
-	}
-
-	return nextDate;
-    }
-    // Get the first parameter containing shortcode language ID
-    if ('{{ .Get 0 }}' == 'en') {
-	var lang = 'en-US';
-    } else {
-	var lang = 'de-DE';
-    }
-    
-    Date.i18n.setLanguage(lang);
-    let date = getNextMeetingDate();
-    document.getElementById('dat').innerHTML = date.toString('D');
-  </script>
-</div>
diff --git a/layouts/shortcodes/past.html~ b/layouts/shortcodes/past.html~
deleted file mode 100644
index e71090d..0000000
--- a/layouts/shortcodes/past.html~
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="vor">
-  {{ readFile "vor.md" | markdownify }}
-</div>
diff --git a/layouts/shortcodes/tabref.html~ b/layouts/shortcodes/tabref.html~
deleted file mode 100644
index 3695c16..0000000
--- a/layouts/shortcodes/tabref.html~
+++ /dev/null
@@ -1 +0,0 @@
-<a href="{{ .Get "href" }}" rel="noopener" target="_blank">{{ .Get "title" }}</a>
diff --git a/layouts/shortcodes/vor.html~ b/layouts/shortcodes/vor.html~
deleted file mode 100644
index d3ffaf6..0000000
--- a/layouts/shortcodes/vor.html~
+++ /dev/null
@@ -1,2 +0,0 @@
-<div id="vor">
-  {{ readFile "vor.md" | markdownify }}