diff --git a/assets/js/scripts.json b/assets/js/scripts.json
index 496ed49..3c0f753 100644
--- a/assets/js/scripts.json
+++ b/assets/js/scripts.json
@@ -1,6 +1,7 @@
 {
   "scripts": [
     "js/fuse.js",
-    "js/mark.min.js"
+    "js/mark.min.js",
+    "js/search.js"
   ]
 }
diff --git a/static/js/search.js b/assets/js/search.js
similarity index 100%
rename from static/js/search.js
rename to assets/js/search.js
diff --git a/assets/opengraph/background.png b/assets/opengraph/background.png
new file mode 100644
index 0000000..215771d
Binary files /dev/null and b/assets/opengraph/background.png differ
diff --git a/assets/opengraph/background.png.txt b/assets/opengraph/background.png.txt
new file mode 100644
index 0000000..a7b6e4b
--- /dev/null
+++ b/assets/opengraph/background.png.txt
@@ -0,0 +1,11 @@
+Created with https://angrytools.com/gradient/image/
+
+Alpha: 100
+
+linksonder:
+RGB 255, 255, 255
+location 0%
+
+rechtsonder:
+RGB 106, 32, 96
+location 84%
diff --git a/assets/opengraph/background_blank.png b/assets/opengraph/background_blank.png
new file mode 100644
index 0000000..99ab3a7
Binary files /dev/null and b/assets/opengraph/background_blank.png differ
diff --git a/assets/opengraph/mulish-black.ttf b/assets/opengraph/mulish-black.ttf
new file mode 100644
index 0000000..db680a0
Binary files /dev/null and b/assets/opengraph/mulish-black.ttf differ
diff --git a/config/_default/menus.toml b/config/_default/menus.toml
index 3f13470..5aafe33 100644
--- a/config/_default/menus.toml
+++ b/config/_default/menus.toml
@@ -60,6 +60,13 @@
     parent = "lidmaatschap"
     weight = 32
 
+  [[main]]
+    identifier = "lidmaatschap-ereleden"
+    name = "Ereleden"
+    url = "/lidmaatschap/ereleden/"
+    parent = "lidmaatschap"
+    weight = 33
+
   [[main]]
     identifier = "nieuws"
     name = "Nieuws"
diff --git a/content/lidmaatschap/ereleden/index.md b/content/lidmaatschap/ereleden/index.md
new file mode 100644
index 0000000..d2db309
--- /dev/null
+++ b/content/lidmaatschap/ereleden/index.md
@@ -0,0 +1,19 @@
+---
+categories:
+- Lidmaatschap
+date: 2023-05-21T12:36:42+02:00
+description: "Door een bijzondere of langjarige inzet kent onze vereniging ook een aantal ereleden. Deze pagina laat zien wie dit zijn."
+layout: ereleden
+slug:
+tags:
+- erelid
+title: "Ereleden"
+---
+
+# Ereleden
+
+Binnen onze vereniging kennen we naast leden ook ereleden. Deze titel hebben deze leden te danken aan bijzondere en/of langjarige inzet voor de vereniging.
+
+## Toekenning
+
+Het erelidmaatschap wordt toegekend door het bestuur.
diff --git a/content/website/stijlgids/index.md b/content/website/stijlgids/index.md
new file mode 100644
index 0000000..9f2b7fa
--- /dev/null
+++ b/content/website/stijlgids/index.md
@@ -0,0 +1,46 @@
+---
+categories:
+- website
+date: 2023-05-20T23:19:44+02:00
+description: "Dit is de NLUUG stijlgids voor de website en bevat de structuur en kleuren van onze huisstijl."
+slug:
+tags:
+- kleuren
+- stijl
+- website
+title: "Stijlgids"
+---
+
+# Stijlgids NLUUG-website
+
+## Kleuren
+
+We gebruiken zoveel mogelijk de kleurstelling zoals die ooit in de oude website werd toegepast.
+
+* Donkerblauw: #1D3160
+* Extra donkere versie van donkerblauw: #17274d
+* Groen (voor call-to-action): #138808
+* Donkergroen voor call-to-action (hover): #0F6D06
+* Paars: #6A2060;
+* Lichtpaars (uitgangspunt 6A2060): #EBBCE5
+
+Nog te benoemen:
+
+* #99AFE2
+* #E3E9F7
+
+## Headings
+
+Binnen de website maken we vooral gebruik van H1, H2, H3, H4.
+
+### H1
+
+Komt maximaal eenmalig voor per pagina
+
+### H2
+
+De hoofdsecties van een pagina worden voorzien van H2. Op een doorsnee pagina is het gebruikelijk om meerdere H2-headings te zien.
+
+### H3 en H4
+
+Waar de content wat langer is kan het gebruik van H3 en zelfs H4 worden toegepast.
diff --git a/data/personen/bob-eskes.json b/data/personen/bob-eskes.json
new file mode 100644
index 0000000..2bff34d
--- /dev/null
+++ b/data/personen/bob-eskes.json
@@ -0,0 +1,17 @@
+{
+  "id": "bob-eskes",
+  "name": "Bob Eskes",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/chel-van-gennip.json b/data/personen/chel-van-gennip.json
new file mode 100644
index 0000000..e16ae78
--- /dev/null
+++ b/data/personen/chel-van-gennip.json
@@ -0,0 +1,17 @@
+{
+  "id": "chel-van-gennip",
+  "name": "Chel van Gennip",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/edwin-kremer.json b/data/personen/edwin-kremer.json
new file mode 100644
index 0000000..177b534
--- /dev/null
+++ b/data/personen/edwin-kremer.json
@@ -0,0 +1,17 @@
+{
+  "id": "edwin-kremer",
+  "name": "Edwin Kremer",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/frances-brazier.json b/data/personen/frances-brazier.json
new file mode 100644
index 0000000..8c49676
--- /dev/null
+++ b/data/personen/frances-brazier.json
@@ -0,0 +1,17 @@
+{
+  "id": "frances-brazier",
+  "name": "Frances Brazier",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/fred-donck.json b/data/personen/fred-donck.json
index 1a86c69..d547bb2 100644
--- a/data/personen/fred-donck.json
+++ b/data/personen/fred-donck.json
@@ -3,6 +3,7 @@
   "name": "Fred Donck",
   "email": "",
   "gender": "male",
+  "honorary_member": true,
   "nationality": "Dutch",
   "thumbnail": "/afbeeldingen/personen/fred-donck-200x200.jpg",
   "social": {
diff --git a/data/personen/gerrit-a-smit.json b/data/personen/gerrit-a-smit.json
new file mode 100644
index 0000000..ecf3d92
--- /dev/null
+++ b/data/personen/gerrit-a-smit.json
@@ -0,0 +1,17 @@
+{
+  "id": "gerrit-a-smit",
+  "name": "Gerrit A. Smit",
+  "email": "",
+  "gender": "Male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/hendrik-jan-thomassen.json b/data/personen/hendrik-jan-thomassen.json
new file mode 100644
index 0000000..d7c8a46
--- /dev/null
+++ b/data/personen/hendrik-jan-thomassen.json
@@ -0,0 +1,17 @@
+{
+  "id": "hendrik-jan-thomassen",
+  "name": "Hendrik Jan Thomassen",
+  "email": "",
+  "gender": "male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/jack-jansen.json b/data/personen/jack-jansen.json
new file mode 100644
index 0000000..d79f3be
--- /dev/null
+++ b/data/personen/jack-jansen.json
@@ -0,0 +1,17 @@
+{
+  "id": "jack-jansen",
+  "name": "Jack Jansen",
+  "email": "",
+  "gender": "Male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/jan-christiaan-van-winkel.json b/data/personen/jan-christiaan-van-winkel.json
new file mode 100644
index 0000000..9ac36df
--- /dev/null
+++ b/data/personen/jan-christiaan-van-winkel.json
@@ -0,0 +1,17 @@
+{
+  "id": "jan-christiaan-van-winkel",
+  "name": "Jan Christiaan van Winkel",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/jos-alsters.json b/data/personen/jos-alsters.json
new file mode 100644
index 0000000..344fadd
--- /dev/null
+++ b/data/personen/jos-alsters.json
@@ -0,0 +1,17 @@
+{
+  "id": "jos-alsters",
+  "name": "Jos Alsters",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/klaas-van-gend.json b/data/personen/klaas-van-gend.json
new file mode 100644
index 0000000..128a6c9
--- /dev/null
+++ b/data/personen/klaas-van-gend.json
@@ -0,0 +1,17 @@
+{
+  "id": "klaas-van-gend",
+  "name": "Klaas van Gend",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/luc-nieland.json b/data/personen/luc-nieland.json
new file mode 100644
index 0000000..6a78ad6
--- /dev/null
+++ b/data/personen/luc-nieland.json
@@ -0,0 +1,17 @@
+{
+  "id": "luc-nieland",
+  "name": "Luc Nieland",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/marcel-nijenhof.json b/data/personen/marcel-nijenhof.json
new file mode 100644
index 0000000..18aa991
--- /dev/null
+++ b/data/personen/marcel-nijenhof.json
@@ -0,0 +1,17 @@
+{
+  "id": "marcel-nijenhof",
+  "name": "Marcel Nijenhof",
+  "email": "",
+  "gender": "Male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/marielle-klatten.json b/data/personen/marielle-klatten.json
new file mode 100644
index 0000000..dc6fa74
--- /dev/null
+++ b/data/personen/marielle-klatten.json
@@ -0,0 +1,17 @@
+{
+  "id": "marielle-klatten",
+  "name": "Mariëlle Klatten",
+  "email": "",
+  "gender": "Female",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/mark-janssen.json b/data/personen/mark-janssen.json
index 96f14d1..f6d8687 100644
--- a/data/personen/mark-janssen.json
+++ b/data/personen/mark-janssen.json
@@ -3,6 +3,7 @@
   "name": "Mark Janssen",
   "email": "",
   "gender": "male",
+  "honorary_member": true,
   "nationality": "Dutch",
   "thumbnail": "/afbeeldingen/personen/mark-janssen-200x200.jpg",
   "social": {
diff --git a/data/personen/mark-overmeer.json b/data/personen/mark-overmeer.json
new file mode 100644
index 0000000..b32f746
--- /dev/null
+++ b/data/personen/mark-overmeer.json
@@ -0,0 +1,17 @@
+{
+  "id": "mark-overmeer",
+  "name": "Mark Overmeer",
+  "email": "",
+  "gender": "Male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/marten-van-gelderen.json b/data/personen/marten-van-gelderen.json
new file mode 100644
index 0000000..9888ade
--- /dev/null
+++ b/data/personen/marten-van-gelderen.json
@@ -0,0 +1,17 @@
+{
+  "id": "marten-van-gelderen",
+  "name": "Marten van Gelderen",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/michael-boelen.json b/data/personen/michael-boelen.json
index d120981..96166d0 100644
--- a/data/personen/michael-boelen.json
+++ b/data/personen/michael-boelen.json
@@ -3,6 +3,7 @@
   "name": "Michael Boelen",
   "email": "michael@nluug.nl",
   "gender": "male",
+  "honorary_member": true,
   "nationality": "Dutch",
   "profile_page": "/organisatie/personen/michael-boelen/",
   "thumbnail": "/afbeeldingen/personen/michael-boelen-200x200.png",
diff --git a/data/personen/monique-rours.json b/data/personen/monique-rours.json
new file mode 100644
index 0000000..e12dede
--- /dev/null
+++ b/data/personen/monique-rours.json
@@ -0,0 +1,17 @@
+{
+  "id": "monique-rours",
+  "name": "Monique Rours",
+  "email": "",
+  "gender": "Female",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/patricia-otter.json b/data/personen/patricia-otter.json
new file mode 100644
index 0000000..99a91ba
--- /dev/null
+++ b/data/personen/patricia-otter.json
@@ -0,0 +1,17 @@
+{
+  "id": "patricia-otter",
+  "name": "Patricia Otter",
+  "email": "",
+  "gender": "Female",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/patrick-reijnen.json b/data/personen/patrick-reijnen.json
index 04f6bb5..4a21553 100644
--- a/data/personen/patrick-reijnen.json
+++ b/data/personen/patrick-reijnen.json
@@ -3,6 +3,7 @@
   "name": "Patrick Reijnen",
   "email": "patrick@nluug.nl",
   "gender": "male",
+  "honorary_member": true,
   "nationality": "Dutch",
   "profile_page": "/organisatie/personen/patrick-reijnen/",
   "thumbnail": "/afbeeldingen/personen/patrick-reijnen-200x200.jpg",
diff --git a/data/personen/piet-beertema.json b/data/personen/piet-beertema.json
new file mode 100644
index 0000000..8edf2bf
--- /dev/null
+++ b/data/personen/piet-beertema.json
@@ -0,0 +1,17 @@
+{
+  "id": "piet-beertema",
+  "name": "Piet Beertema",
+  "email": "",
+  "gender": "Male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/pieter-paul-spiertz.json b/data/personen/pieter-paul-spiertz.json
new file mode 100644
index 0000000..ddcba69
--- /dev/null
+++ b/data/personen/pieter-paul-spiertz.json
@@ -0,0 +1,17 @@
+{
+  "id": "pieter-paul-spiertz",
+  "name": "Pieter-Paul Spiertz",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/rene-pluis.json b/data/personen/rene-pluis.json
new file mode 100644
index 0000000..2d60847
--- /dev/null
+++ b/data/personen/rene-pluis.json
@@ -0,0 +1,17 @@
+{
+  "id": "rene-pluis",
+  "name": "René Pluis",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/rudi-van-drunen.json b/data/personen/rudi-van-drunen.json
index 8bd584d..601d12c 100644
--- a/data/personen/rudi-van-drunen.json
+++ b/data/personen/rudi-van-drunen.json
@@ -3,6 +3,7 @@
   "name": "Rudi van Drunen",
   "email": "",
   "gender": "male",
+  "honorary_member": true,
   "nationality": "Dutch",
   "thumbnail": "/afbeeldingen/personen/rudi-van-drunen-200x200.jpg",
   "websites": [{
diff --git a/data/personen/ted-lindgreen.json b/data/personen/ted-lindgreen.json
new file mode 100644
index 0000000..fb7cb9f
--- /dev/null
+++ b/data/personen/ted-lindgreen.json
@@ -0,0 +1,17 @@
+{
+  "id": "ted-lindgreen",
+  "name": "Ted Lindgreen",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/teus-hagen.json b/data/personen/teus-hagen.json
new file mode 100644
index 0000000..31acde3
--- /dev/null
+++ b/data/personen/teus-hagen.json
@@ -0,0 +1,17 @@
+{
+  "id": "teus-hagen",
+  "name": "Teus Hagen",
+  "email": "",
+  "gender": "Male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/theo-de-ridder.json b/data/personen/theo-de-ridder.json
new file mode 100644
index 0000000..de2ac69
--- /dev/null
+++ b/data/personen/theo-de-ridder.json
@@ -0,0 +1,17 @@
+{
+  "id": "theo-de-ridder",
+  "name": "Theo de Ridder",
+  "email": "",
+  "gender": "Male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/walter-belgers.json b/data/personen/walter-belgers.json
new file mode 100644
index 0000000..e16902d
--- /dev/null
+++ b/data/personen/walter-belgers.json
@@ -0,0 +1,17 @@
+{
+  "id": "walter-belgers",
+  "name": "Walter Belgers",
+  "email": "",
+  "gender": "Male",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/willem-de-vries.json b/data/personen/willem-de-vries.json
new file mode 100644
index 0000000..93d627e
--- /dev/null
+++ b/data/personen/willem-de-vries.json
@@ -0,0 +1,17 @@
+{
+  "id": "willem-de-vries",
+  "name": "Willem de Vries",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/data/personen/wytze-van-der-raay.json b/data/personen/wytze-van-der-raay.json
new file mode 100644
index 0000000..6100f69
--- /dev/null
+++ b/data/personen/wytze-van-der-raay.json
@@ -0,0 +1,17 @@
+{
+  "id": "wytze-van-der-raay",
+  "name": "Wytze van der Raay",
+  "email": "",
+  "gender": "",
+  "honorary_member": true,
+  "nationality": "Dutch",
+  "thumbnail": "",
+  "social": {
+    "github": "",
+    "twitter": "",
+    "instagram": "",
+    "linkedin": "",
+    "mastodon": "",
+    "mastodon_url": ""
+  }
+}
diff --git a/themes/nluug/layouts/_default/baseof.html b/themes/nluug/layouts/_default/baseof.html
index 147a4bb..8eabd36 100644
--- a/themes/nluug/layouts/_default/baseof.html
+++ b/themes/nluug/layouts/_default/baseof.html
@@ -47,7 +47,6 @@
         </div>
       </main>
       {{ partial "footer.html" . }}
+      {{ partialCached "scripts_loadlast.html" . }}
   </body>
-  {{ partialCached "scripts_loadlast.html" . }}
-
 </html>
diff --git a/themes/nluug/layouts/lidmaatschap/ereleden.html b/themes/nluug/layouts/lidmaatschap/ereleden.html
new file mode 100644
index 0000000..58fe88b
--- /dev/null
+++ b/themes/nluug/layouts/lidmaatschap/ereleden.html
@@ -0,0 +1,13 @@
+{{ define "main" }}
+  {{ .Content }}
+
+    <h2>Ereleden</h2>
+    <ul>
+    {{ range $key,$val := $.Site.Data.personen }}
+      {{ if eq $val.honorary_member true }}
+      <li>{{ if .profile_page }}<a href="{{ .profile_page }}">{{ .name }}</a>{{ else }}{{ .name }}{{ end }}</li>
+      {{ end }}
+    {{ end }}
+    </ul>
+
+{{ end }}
diff --git a/themes/nluug/layouts/organisatie/section.html b/themes/nluug/layouts/organisatie/section.html
index 8d4bdae..a26c7e1 100644
--- a/themes/nluug/layouts/organisatie/section.html
+++ b/themes/nluug/layouts/organisatie/section.html
@@ -1,11 +1,12 @@
 {{ define "main" }}
   {{ .Content }}
 
-  <section>
-    <h2>Actieve leden</h2>
-    {{ if .Params.active_members }}
+  {{ if .Params.active_members }}
+    <section>
+      <h2>Actieve leden</h2>
       {{ .Scratch.Set "active_members" .Params.active_members }}
       {{ partial "show-active-members-small.html" . }}
-    {{ end }}
-  </section>
+    </section>
+  {{ end }}
+
 {{ end }}
diff --git a/themes/nluug/layouts/partials/head.html b/themes/nluug/layouts/partials/head.html
index 1b17134..5fced5c 100644
--- a/themes/nluug/layouts/partials/head.html
+++ b/themes/nluug/layouts/partials/head.html
@@ -5,12 +5,12 @@
     <title>{{ if eq .IsHome true }}{{ .Site.Title }}{{ else }}{{ .Title }} | {{ .Site.Title }}{{ end }}</title>
     <meta name="description" content="{{ if ne .Description "" }}{{ .Description }}{{ else }}{{ .Site.Params.description }}{{ end }}">
     <!-- Social media -->
-    {{ template "_internal/opengraph.html" . }}
-    {{ template "_internal/twitter_cards.html" . }}
+    {{ partial "opengraph/opengraph.html" . }}
+    {{ partial "opengraph/twitter_cards.html" . }}
     <link rel="canonical" href="{{ .Permalink }}">
-    <link rel="icon" href="{{ absURL "assets/favicon.ico" }} ">
-    <link rel="alternate" type="application/atom+xml" title="{{ .Site.Title }}" href="{{ absURL "atom.xml" }}" />
-    <link rel="alternate" type="application/json" title="{{ .Site.Title }}" href="{{ absURL "feed.json" }}" />
+    <link rel="icon" href="{{ absURL "assets/favicon.ico" }}">
+    <link rel="alternate" type="application/atom+xml" title="{{ .Site.Title }}" href="{{ absURL "atom.xml" }}">
+    <link rel="alternate" type="application/json" title="{{ .Site.Title }}" href="{{ absURL "feed.json" }}">
     <link rel="shortcut icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=">
     {{ partialCached "style.html" . }}
 
diff --git a/themes/nluug/layouts/partials/opengraph/get-featured-image.html b/themes/nluug/layouts/partials/opengraph/get-featured-image.html
new file mode 100644
index 0000000..d616b1f
--- /dev/null
+++ b/themes/nluug/layouts/partials/opengraph/get-featured-image.html
@@ -0,0 +1,24 @@
+{{ $images := $.Resources.ByType "image" }}
+{{ $featured := $images.GetMatch "*feature*" }}
+{{ if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end }}
+{{ if not $featured }}
+    {{ $featured = resources.Get "/opengraph/background.png" }}
+    {{ $size := 80 }}
+    {{ $title := $.LinkTitle }}
+    {{ if gt (len $title) 20 }}
+    {{ $size = 70 }}
+    {{ end }}
+
+    {{ $text := $title }}
+                {{ $textOptions := dict 
+                    "color" "#1D3160"
+                    "size" $size
+                    "lineSpacing" 10
+                    "x" 65 "y" 80
+                    "font" (resources.Get "/opengraph/mulish-black.ttf")
+                }}
+
+    {{ $featured = $featured | images.Filter (images.Text $text $textOptions) }}
+{{ end }}
+
+{{ return $featured }}
diff --git a/themes/nluug/layouts/partials/opengraph/opengraph.html b/themes/nluug/layouts/partials/opengraph/opengraph.html
new file mode 100644
index 0000000..874a193
--- /dev/null
+++ b/themes/nluug/layouts/partials/opengraph/opengraph.html
@@ -0,0 +1,42 @@
+<meta property="og:title" content="{{ .Title }}">
+<meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
+<meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}">
+<meta property="og:url" content="{{ .Permalink }}">
+
+{{- with $.Params.images -}}
+{{- range first 6 . }}<meta property="og:image" content="{{ . | absURL }}">{{ end -}}
+{{- else -}}
+{{- $featured := partial "opengraph/get-featured-image.html" . }}
+{{- with $featured -}}
+<meta property="og:image" content="{{ $featured.Permalink }}">
+{{- else -}}
+{{- with $.Site.Params.images }}<meta property="og:image" content="{{ index . 0 | absURL }}">{{ end -}}
+{{- end -}}
+{{- end -}}
+
+{{- if .IsPage }}
+{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}}
+<meta property="article:section" content="{{ .Section }}">
+{{ with .PublishDate }}<meta property="article:published_time" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }}>{{ end }}
+{{ with .Lastmod }}<meta property="article:modified_time" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }}>{{ end }}
+{{- end -}}
+
+{{- with .Params.audio }}<meta property="og:audio" content="{{ . }}">{{ end }}
+{{- with .Params.locale }}<meta property="og:locale" content="{{ . }}">{{ end }}
+{{- with .Site.Params.title }}<meta property="og:site_name" content="{{ . }}">{{ end }}
+{{- with .Params.videos }}{{- range . }}
+<meta property="og:video" content="{{ . | absURL }}">
+{{ end }}{{ end }}
+
+{{- /* If it is part of a series, link to related articles */}}
+{{- $permalink := .Permalink }}
+{{- $siteSeries := .Site.Taxonomies.series }}
+{{ with .Params.series }}{{- range $name := . }}
+  {{- $series := index $siteSeries ($name | urlize) }}
+  {{- range $page := first 6 $series.Pages }}
+    {{- if ne $page.Permalink $permalink }}<meta property="og:see_also" content="{{ $page.Permalink }}">{{ end }}
+  {{- end }}
+{{ end }}{{ end }}
+
+{{- /* Facebook Page Admin ID for Domain Insights */}}
+{{- with .Site.Social.facebook_admin }}<meta property="fb:admins" content="{{ . }}">{{ end }}
diff --git a/themes/nluug/layouts/partials/opengraph/twitter_cards.html b/themes/nluug/layouts/partials/opengraph/twitter_cards.html
new file mode 100644
index 0000000..9cd345c
--- /dev/null
+++ b/themes/nluug/layouts/partials/opengraph/twitter_cards.html
@@ -0,0 +1,22 @@
+{{- with $.Params.images -}}
+<meta name="twitter:card" content="summary_large_image">
+<meta name="twitter:image" content="{{ index . 0 | absURL }}">
+{{ else -}}
+{{- $featured := partial "opengraph/get-featured-image.html" . }}
+{{- with $featured -}}
+<meta name="twitter:card" content="summary_large_image">
+<meta name="twitter:image" content="{{ $featured.Permalink }}">
+{{- else -}}
+{{- with $.Site.Params.images -}}
+<meta name="twitter:card" content="summary_large_image">
+<meta name="twitter:image" content="{{ index . 0 | absURL }}">
+{{ else -}}
+<meta name="twitter:card" content="summary"/>
+{{- end -}}
+{{- end -}}
+{{- end }}
+<meta name="twitter:title" content="{{ .Title }}">
+<meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}">
+{{ with .Site.Social.twitter -}}
+<meta name="twitter:site" content="@{{ . }}">
+{{ end -}}
diff --git a/themes/nluug/layouts/partials/scripts_loadlast.html b/themes/nluug/layouts/partials/scripts_loadlast.html
index e490149..ad76ffe 100644
--- a/themes/nluug/layouts/partials/scripts_loadlast.html
+++ b/themes/nluug/layouts/partials/scripts_loadlast.html
@@ -1,5 +1,3 @@
-<script src="{{ "js/search.js" | absURL }}"></script>
-
 {{ $assetBusting := not .Site.Params.disableAssetsBusting }}
 {{ $scripts := getJSON "assets/js/scripts.json" }}
 
diff --git a/themes/nluug/layouts/partials/show-active-members-small.html b/themes/nluug/layouts/partials/show-active-members-small.html
index a3f038e..29af14d 100644
--- a/themes/nluug/layouts/partials/show-active-members-small.html
+++ b/themes/nluug/layouts/partials/show-active-members-small.html
@@ -1,23 +1,22 @@
-
 {{ $size_in_pixels := 150 }}
 
 <div class="grid-team-members-small-photos">
   {{ range $key,$val := .Scratch.Get "active_members" }}
-      {{ with (index $.Site.Data.personen .) }}
-        <div>
-            {{ if .thumbnail }}
-              <figure>
-                {{ if .profile_page }}
-                  <a href="{{ .profile_page }}"><img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" height="{{ $size_in_pixels }}" width="{{ $size_in_pixels }}" /></a>
-                {{ else }}
-                <img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" height="{{ $size_in_pixels }}" width="{{ $size_in_pixels }}" />
-                {{ end }}
-                <figcaption>
-                  <small><strong>{{ .name }}</strong></small>
-                </figcaption>
-              </figure>
-            {{ end }}
-        </div>
-      {{ end }}
+    {{ with (index $.Site.Data.personen .) }}
+      <div>
+          {{ if .thumbnail }}
+            <figure>
+              {{ if .profile_page }}
+                <a href="{{ .profile_page }}"><img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" height="{{ $size_in_pixels }}" width="{{ $size_in_pixels }}"></a>
+              {{ else }}
+                <img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" height="{{ $size_in_pixels }}" width="{{ $size_in_pixels }}">
+              {{ end }}
+              <figcaption>
+                <small><strong>{{ .name }}</strong></small>
+              </figcaption>
+            </figure>
+          {{ end }}
+      </div>
     {{ end }}
-  </div>
+  {{ end }}
+</div>
diff --git a/themes/nluug/layouts/partials/show-related-members.html b/themes/nluug/layouts/partials/show-related-members.html
index 47d95ac..3995548 100644
--- a/themes/nluug/layouts/partials/show-related-members.html
+++ b/themes/nluug/layouts/partials/show-related-members.html
@@ -1,23 +1,22 @@
-
 {{ $size_in_pixels := 150 }}
 
 <div class="grid-team-members-small-photos">
   {{ range $key,$val := .Scratch.Get "related_members" }}
-      {{ with (index $.Site.Data.personen .) }}
-        <div>
-            {{ if .thumbnail }}
-              <figure>
-                {{ if .profile_page }}
-                  <a href="{{ .profile_page }}"><img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" height="{{ $size_in_pixels }}" width="{{ $size_in_pixels }}" /></a>
-                {{ else }}
-                <img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" height="{{ $size_in_pixels }}" width="{{ $size_in_pixels }}" />
-                {{ end }}
-                <figcaption>
-                  <small><strong>{{ .name }}</strong></small>
-                </figcaption>
-              </figure>
-            {{ end }}
-        </div>
-      {{ end }}
+    {{ with (index $.Site.Data.personen .) }}
+      <div>
+          {{ if .thumbnail }}
+            <figure>
+              {{ if .profile_page }}
+                <a href="{{ .profile_page }}"><img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" height="{{ $size_in_pixels }}" width="{{ $size_in_pixels }}"></a>
+              {{ else }}
+                <img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" height="{{ $size_in_pixels }}" width="{{ $size_in_pixels }}">
+              {{ end }}
+              <figcaption>
+                <small><strong>{{ .name }}</strong></small>
+              </figcaption>
+            </figure>
+          {{ end }}
+      </div>
     {{ end }}
-  </div>
+  {{ end }}
+</div>
diff --git a/themes/nluug/layouts/team/single.html b/themes/nluug/layouts/team/single.html
index a20b459..62ea4d3 100644
--- a/themes/nluug/layouts/team/single.html
+++ b/themes/nluug/layouts/team/single.html
@@ -16,9 +16,9 @@
             {{ if .thumbnail }}
               <figure>
                 {{ if .profile_page }}
-                  <a href="{{ .profile_page }}"><img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" /></a>
+                  <a href="{{ .profile_page }}"><img src="{{ .thumbnail }}" alt="Foto van {{ .name }}"></a>
                 {{ else }}
-                  <img src="{{ .thumbnail }}" alt="Foto van {{ .name }}" />
+                  <img src="{{ .thumbnail }}" alt="Foto van {{ .name }}">
                 {{ end }}
                 <figcaption>
                   <strong>{{ .name }}</strong>