diff --git a/.drone.yml b/.drone.yml
index d0541de..f49242b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ trigger:
     - main
 
 steps:
-  - name: docker-default
+  - name: docker
     image: plugins/docker
     settings:
       registry: git.riksolo.com
@@ -18,30 +18,4 @@ steps:
         - latest
         - ${DRONE_COMMIT}
       password:
-        from_secret: dockertoken
-
-  - name: docker-rblicht
-    image: plugins/docker
-    settings:
-      registry: git.riksolo.com
-      username: riksolo
-      repo: git.riksolo.com/${DRONE_REPO,,}
-      build_args:
-        - SITE=rblicht
-      tags:
-        - latest-rblicht
-        - ${DRONE_COMMIT}-rblicht
-      password:
-        from_secret: dockertoken
-
-  - name: trigger docker-compose release
-    image: plugins/downstream
-    settings:
-      server: https://drone.riksolo.com
-      token:
-        from_secret: drone_token
-      repositories:
-        - RikSolo/docker-compose
-    depends_on:
-      - docker-default
-      - docker-rblicht
\ No newline at end of file
+        from_secret: dockertoken
\ No newline at end of file
diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
deleted file mode 100644
index c0b30ba..0000000
--- a/.forgejo/workflows/build.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Build
-on: [workflow_dispatch]
-
-jobs:
-  Deploy:
-    runs-on: docker
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
-
-    steps:
-      - name: Install LFS
-        run: |
-          curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-          apt-get update
-          apt-get install -y git-lfs
-          git lfs install
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          lfs: 'true'
-
-      - name: Docker Login
-        run: |
-          docker login -u riksolo -p ${{secrets.CONTAINER_REGISTRY_TOKEN}} git.riksolo.com
-
-      - name: Build and push
-        run: |
-          docker build -t git.riksolo.com/riksolo/eleventy-riksolo-com:latest -t git.riksolo.com/riksolo/eleventy-riksolo-com:${{github.sha}} .
-          docker push git.riksolo.com/riksolo/eleventy-riksolo-com:latest
-          docker push git.riksolo.com/riksolo/eleventy-riksolo-com:${{github.sha}}
-          docker build --build-arg SITE=rblicht -t git.riksolo.com/riksolo/eleventy-riksolo-com:latest-rblicht -t git.riksolo.com/riksolo/eleventy-riksolo-com:${{github.sha}}-rblicht .
-          docker push git.riksolo.com/riksolo/eleventy-riksolo-com:latest-rblicht
-          docker push git.riksolo.com/riksolo/eleventy-riksolo-com:${{github.sha}}-rblicht
-
-      - name: Trigger Compose Deploy
-        uses: https://github.com/fjogeleit/http-request-action@v1
-        with:
-          url: ${{ vars.DOCKER_COMPOSE_DEPLOY_URL }}
-          method: 'POST'
-          customHeaders: '{"Content-Type": "application/json", "Authorization": "token ${{secrets.FORGEJO_TOKEN}}"}'
-          data: '{"ref": "${{forgejo.ref}}"}'
\ No newline at end of file
diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
new file mode 100644
index 0000000..0fd5c20
--- /dev/null
+++ b/.gitea/workflows/build.yml
@@ -0,0 +1,65 @@
+name: Build
+on: [workflow_dispatch]
+
+jobs:
+  Deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Start webhook
+        if: ${{always()}}
+        continue-on-error: true
+        uses: fjogeleit/http-request-action@v1
+        with:
+          url: ${{vars.NODE_RED_WORKFLOW_STARTED_URL}}
+          data: '{"job": ${{toJSON(job)}}, "gitea": ${{toJSON(gitea)}}}'
+
+      - name: Install LFS
+        run: |
+          curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+          apt-get update
+          apt-get install -y git-lfs
+          git lfs install
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          lfs: 'true'
+
+      - name: Docker install
+        run: |
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update
+          apt-get install -yqq ca-certificates curl
+          install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+          chmod a+r /etc/apt/keyrings/docker.asc
+          echo \
+            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+            $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+            tee /etc/apt/sources.list.d/docker.list > /dev/null
+          apt-get update
+          apt-get install -yqq docker-ce docker-ce-cli containerd.io          
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker Login
+        uses: docker/login-action@v3
+        with:
+          registry: git.riksolo.com
+          username: riksolo
+          password: ${{secrets.CONTAINER_REGISTRY_TOKEN}}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: git.riksolo.com/riksolo/eleventy-riksolo-com:latest , git.riksolo.com/riksolo/eleventy-riksolo-com:${{github.sha}}
+
+      - name: Completion webhook
+        if: ${{always()}}
+        continue-on-error: true
+        uses: fjogeleit/http-request-action@v1
+        with:
+          url: ${{vars.NODE_RED_WORKFLOW_COMPLETE_URL}}
+          data: '{"job": ${{toJSON(job)}}, "gitea": ${{toJSON(gitea)}}}'
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 5b64798..781c554 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,6 @@
 FROM node:22
 WORKDIR /usr/src/app
 
-ARG SITE=default
-ENV SITE=$SITE
-
 COPY package*.json ./
 RUN npm install
 ADD . .
diff --git a/content/_data/site.js b/content/_data/site.js
deleted file mode 100644
index 472322c..0000000
--- a/content/_data/site.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default function () {
-	return {
-		title: process.env.SITE === "rblicht" ? "RBLicht" : "Rik Berkelder",
-		url: process.env.SITE == "rblicht" ? "https://rblicht.nl" : "https://riksolo.com",
-		author: "Rik Berkelder",
-		site: process.env.SITE || 'default'
-	};
-}
\ No newline at end of file
diff --git a/content/_data/site.json b/content/_data/site.json
new file mode 100644
index 0000000..e1ee386
--- /dev/null
+++ b/content/_data/site.json
@@ -0,0 +1,5 @@
+{
+	"title": "Rik Berkelder",
+	"url": "https://riksolo.com",
+	"author": "Rik Berkelder"
+}
\ No newline at end of file
diff --git a/content/blogposts/2024-05-04-grandma3-fader-feedback.md b/content/blogposts/2024-05-04-grandma3-fader-feedback.md
index 45c790f..b384ff0 100644
--- a/content/blogposts/2024-05-04-grandma3-fader-feedback.md
+++ b/content/blogposts/2024-05-04-grandma3-fader-feedback.md
@@ -2,7 +2,7 @@
 slug: "grandma3-fader-feedback-2024-05-04"
 title: "GrandMA3 Fader Feedback Plugin"
 date: "2024-05-04"
-modified: "2025-12-05"
+modified: "2024-05-04"
 description: "A free MA3 LUA plugin to provide per-fader feedback over OSC"
 ---
 You might have used the new OSC features in GrandMA3 to connect a MIDI controller to get some extra faders on your system. In my experience, this works quite smoothly. You then might have wanted to go extra fancy and tried to hook up the OSC that MA3 sends you back to make your motorized faders work, only to find out that, for some reason, it doesn't send feedback per fader, only per sequence, which is difficult to map to physical faders as you move things around.
@@ -13,7 +13,7 @@ The plugin worked, but was kind of messy, so I rewrote the plugin to a point whe
 
 It's not the fanciest thing out there. there's no fancy GUIs for your settings, just a couple of variables to tweak and then never think about again. The upside of this is that the plugin is very small and light-weight.
 
-You can download the plugin (along with any others I've made) [over here](https://git.riksolo.com/RikSolo/GrandMA3-Plugins/releases/tag/latest).
+You can download the plugin [over here](https://git.riksolo.com/riksolo/GrandMA3-Plugins/releases).
 
 # Installation & Usage
 1. Download the plugin from the link above.
@@ -35,7 +35,7 @@ You can download the plugin (along with any others I've made) [over here](https:
 7. Open the plugin back up, select the first (and only) line in the table, and hit the Edit button on the bottom of the window.
 8. Change the variables at the top of the plugin to your liking. There are comments above each one to tell you how they work.
 9. Now run the plugin. 
-
+ 
 MA3 should start sending feedback for the executors you configured in the plugin file. The OSC addresses are the same as the ones you would use to send OSC into MA# (using the current page). So, for example, the feedback for fader 202 would be sent to `/Page/Fader/202`.
 
 For faders, the plugin will send a Float value between 0.00 and 1.00. For buttons, a value of 0 or 1 will be sent.
diff --git a/content/blogposts/2025-09-09-ma3-tip-conditional-recipes.md b/content/blogposts/2025-09-09-ma3-tip-conditional-recipes.md
deleted file mode 100644
index e6f5d0a..0000000
--- a/content/blogposts/2025-09-09-ma3-tip-conditional-recipes.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-slug: ma3-tip-conditional-recipes
-title: "MA3 Tip: Customizing Shows On The Fly Using Conditional Recipes"
-date: "2025-09-11"
-modified: "2025-09-11"
-description: "Easily adapting GrandMA3 showfiles to different situations by bulk-toggling Recipe lines based on tags."
----
-Touring with a super detailed, highly programmed light show is great, until you find yourself having to adapt to more limited venues than anticipated.
-
-I found myself facing this problem earlier this year. A band I've been working with had mostly been doing big one-off festival shows, and not a huge amount per year. With those circumstances, it wasn't a big problem for me to manually go over the showfile for every show and fixing things that didn't really work with each festival rig.
-
-Until they booked a two week club tour through Europe, and while it was a big step for the band, the variety of venues ranged from tiny 100-capacity music places to the mainstage of a festival with 40,000 sold tickets.
-
-Spending a couple of hours per show doing previz would be possible, but I kept making more or less the same substitutions, which left me wondering if I could lighten that workload.
-
-## The easy option, and the engineering perspective
-The first thought was to just build a second "minimal" showfile, for very small rigs. This would be a lot easier to scale up, but it would mean having two base files to keep up to date and program new tracks into. I absolutely hate doing repetitive work though, so keeping two separate showfiles up to date sounds like a pain.
-
-DRY (don't repeat yourself) is one of the first things hammered into you when you're learning computer programming. If you notice you're writing the same code multiple times, it means you can probably simplify something, or extract it into a reusable bit of code, so that when you change some part of it, it updates anywhere. A great example of DRY in lighting programming would be using presets in your show, instead of hardcoding values into every cue. So I started thinking if I could come up with a more elegant solution for my situation.
-
-## The elegant solution
-The entire show has been programmed using recipes, and when I was thinking this problem through, tags were recently added into the MA3 software. I noticed that a Tag field was also added to the recipe lines I started wondering if I could bulk edit recipe lines that have a tag. And as basically any question about doing things in MA using commands, the answer was "of course!"
-
-I ended up with the following syntax:
-`
-Set Sequence 1 Thru Cue 1 Thru Part Thru.Thru Property "enabled" 0 if #[Tag 'No Sides']
-`
- 
- This disables any recipe line in any cue in any sequence as long as it has a certain tag. change the 0 for a 1 and it enables it. So I created a few tags ("No Sides", "No Floor Spots", "No Floor Washes",  and so on), then went through the show, adding additional programming for these situations. Then I just had to create a couple of simple macros to toggle the recipe lines on and off, and I was left with an on-the-fly configurable showfile to adapt to wildly differing show scenarios. 
-
-## Takeaways and other uses
-Being able to mix and match multiple options also lets me make sure to still maximize what I'm doing with the parts of a rig that are there. Had I chosen to go with a "minimal" showfile, using it when I don't have washes on the floor would also mean losing any cool stuff I was doing with the side lights, or having to manually program it back.
-
-This technique has saved me several hours per gig, most of which wouldn't have been paid either. 
-
-This trick can be very useful when you're not touring too. I've also started using the `If Tag` technique in my busking showfile. For example for enabling/disabling certain groups in my LOS-inspired system.
diff --git a/content/blogposts/2025-12-05-grandma3-osc-hardkeys.md b/content/blogposts/2025-12-05-grandma3-osc-hardkeys.md
deleted file mode 100644
index 81a8fe1..0000000
--- a/content/blogposts/2025-12-05-grandma3-osc-hardkeys.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-slug: "grandma3-osc-keys"
-title: "GrandMA3 OSC Hardkeys Plugin"
-date: "2025-12-05"
-modified: "2025-12-05"
-description: "A free MA3 LUA plugin to emulate key presses as if they were entered on a console or command wing"
----
-
-Back when I decided to invest in some MA hardware of my own, I only had budget for a command wing at most. At the time MA2 was already more or less discontinued, and MA3 wasn't really ready to be used on shows yet. So, instead of a command wing, which would lock me in MA2 or MA3, I decided to buy a GrandMA3 OnPC 2port node to unlock my parameters, and build my setup around that. 
-
-That setup started out with a little midi controller for faders, and using the keyboard of my laptop to do my programming using keyboard shortcuts. Shortly after, I custom-built a keyboard to enter MA's specific keyboard shortcuts with single key presses. This was a big improvement, but working through keyboard shortcuts had it's problems. One big nuisance was constantly having to switch keyboard shortcuts on and off if I wanted to do different things, and they buttons would still do random other actions if programs other than MA3 OnPC were currently highlighted.
-
-I figured out pretty early on that it would be aMAzing to be able to trigger MA's specific programming keys through OSC, but I never figured out a way to do so, until now!
-
-I present to you: the MA3 OSC Keys plugin.
-
-It works quite simply. First, it creates a block of 10 blank quickeys, generally somewhere out of the way. It then assigns these 10 quickeys to 10 executor buttons (also somewhere out of the way, and configurable). When the plugin is called with a command, such as "STORE press", it figures out the first available quickey slot. It then sets it's keycode to STORE, and "presses" it's corresponding executor button. When the plugin then receives a "STORE release" command, the executor button is "released" and the quickey slot is marked as free. This makes it so you can press and hold a number of keys in various overlapping sequences without any collisions or needing a separate quickey and executor for each possible keycode.
-
-You can download the plugin (and any other ones i've made) [over here](https://git.riksolo.com/RikSolo/GrandMA3-Plugins/releases/tag/latest).
-
-> **Note:** This is the very first iteration of the plugin, and it's not been tested very thoroughly yet. Things are bound to change or need fixing, so keep an eye on this page for updates.
-
-# Installation & Usage
-1. Download the plugin from the link above.
-2. Take both of the files of the "grandma3-plugins/OSC Keys" folder and put them where you normally put your MA3 plugins
-	- If you're not sure where that is, your best choice is probably on whichever USB stick you also keep your showfiles, the folder will be `/ma/ma3_library/datapools/plugins`
-3. Open up MA3
-4. Edit an empty slot in your Plugins pool in MA3, hit the "import" button on the bottom of the dialogue, and find the plugin.
-5. If you haven't gotten an OSC input set up yet, create one:
-	- In the MA3 menu, go to "In & Out", then into the OSC tab
-	- Create a new OSC entry with the following settings:
-		- Port: What port to listen on.
-		- Receive: Yes
-		- Receive Command: Yes
-6. Open the plugin back up, select the first (and only) line in the table, and hit the Edit button on the bottom of the window.
-7. Change the variables at the top of the plugin to your liking. There are comments above each one to tell you how they work.
-8. Run the plugin once to initialize it.
-9. From your OSC software, send a "String" type message to the IP of your machine, at the port you set in your OSC configuration earlier. The address should be `/cmd`, and the data should be something like `Plugin "RBOSCKeys" "STORE press"` or `Plugin "RBOSCKeys" "MA1 release"`.
-	- If you change the name of the plugin, you should rename the first value after the "Plugin" keyword. 
-	- `STORE` can be replaced with any valid MA3 keycode. This list is the same of codes that are available for use in Quickeys
-	- the last word can be "press" or "release". For proper functionality of the plugin, it's very important that whenever you send a "press" event for a keycode, you also send a "release" event afterwards. The reason there aren't just one single action is for keys which also have functionality when held, such as the MA key. 
-
-# Support
-I maintain this plugin in my free time. This plugin is available free, and the code is free for you to edit. If you have any issues with the plugin, feel free to contact me through the contact info on this website, but please don't expect me to respond right away. 
-
-If this plugin makes your life better, you can consider buying me a beer through [ko-fi](https://ko-fi.com/riksolo)
\ No newline at end of file
diff --git a/content/blogposts/blogposts.11tydata.js b/content/blogposts/blogposts.11tydata.js
index dd1cae7..51c301b 100644
--- a/content/blogposts/blogposts.11tydata.js
+++ b/content/blogposts/blogposts.11tydata.js
@@ -1,5 +1,5 @@
 const conf = {
-	tags: "blogpost",
+	tags: "blogposts",
 	layout: "blogpost.njk",
 	eleventyComputed: {
 		permalink(data) {
diff --git a/content/includes/highlights.njk b/content/includes/highlights.njk
deleted file mode 100644
index 6097482..0000000
--- a/content/includes/highlights.njk
+++ /dev/null
@@ -1,11 +0,0 @@
-<ul>
-	<li><a href="https://www.sowulo.nl">Sowulo</a> - Lighting design & international touring since 2023</li>
-	<li><a href="https://aitum.tv">Aitum</a> - React & Electron development + MIDI and OSC integration</li>
-	<li><a href="https://twitch.tv/mrgregles">MrGregles</a> - Fully remote, real-time live show lighting control</li>
-	<li>RN7 - Custom digital signage with radio playout data integration</li>
-	<li>Doornroosje / TivoliVredenburg / Luxor Live / Musis Sacrum - House LD / System Technician</li>
-	<li>ShowLine / Hoevenaars / Ecolicht - Lighting Operator / System Technician</li>
-	<li>DG Producties / Theater Terra / Ellen ten Damme - Theatre Touring</li>
-	<li>Deyval - Last-minute work for a wide range of customers</li>
-	<small><a href="/portfolio">See More -></a></small>
-</ul>
\ No newline at end of file
diff --git a/content/includes/navbar.njk b/content/includes/navbar.njk
deleted file mode 100644
index 4ce96ad..0000000
--- a/content/includes/navbar.njk
+++ /dev/null
@@ -1,29 +0,0 @@
-{% macro navItem(title, url, hyphen=true, target='_self') %}
-<span>
-	<a href="{{url}}" target="{{target}}">{{title}}</a>
-	{% if hyphen %} - {% endif %}
-</span>
-{% endmacro %}
-
-<div class="container">
-	<div class="nav">
-		<a class="d-inline-block main-logo" href="/">
-			<img src="/img/RB-w.png" alt="RB logo" eleventy:widths="100" />
-			Rik Berkelder
-		</a>
-		<div class="nav-links">
-			<div class="d-inline-block">
-				{{navItem("Home", "/")}}
-				{{navItem("Blog", "/blog")}}
-				{{navItem("Portfolio", "/portfolio", false)}}
-			</div>
-			<div class="d-inline-block">
-				<span> | </span>
-				{% if site.site != "rblicht" %}
-				{{navItem("Mastodon", "https://dook.business/@RikSolo")}}
-				{% endif %}
-				{{navItem("Instagram", "https://instagram.com/RikBerkelder", false)}}
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/content/includes/skills.njk b/content/includes/skills.njk
deleted file mode 100644
index 4c74dcc..0000000
--- a/content/includes/skills.njk
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="flex">
-	<div class="col-half">
-		<b>Lighting</b>
-		<ul>
-			<li>GrandMA2/3, Avolites, Obsidian Onyx</li>
-			<li>ATEM, Resolume, VMix, OBS</li>
-			<li>Timecode, Remote Production, System Integration</li>
-			<li>Capture</li>
-		</ul>
-	</div>
-	<div class="col-half">
-		<b>Software</b>
-		<ul>
-			<li>Typescript, Rust</li>
-			<li>React, Angular, Node, Electron, Embedded</li>
-			<li>Git, Docker</li>
-			<li>GitHub Actions, GitLab CI, DroneCI</li>
-		</ul>
-	</div>
-</div>
\ No newline at end of file
diff --git a/content/layouts/base-nonav.njk b/content/layouts/base-nonav.njk
deleted file mode 100644
index 2e706e6..0000000
--- a/content/layouts/base-nonav.njk
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-<html>
-
-	<head>
-		<link rel="preconnect" href="https://fonts.googleapis.com">
-		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-		<link href="https://fonts.googleapis.com/css2?family=Inconsolata:wght@400;700&display=swap" rel="stylesheet">
-		<link rel="stylesheet" type="text/css" href="/style.css" />
-		<link href="https://unpkg.com/prism-themes@1.9.0/themes/prism-nord.css" rel="stylesheet" media="print" onload="this.media='all'" />
-		<link rel="stylesheet" href="https://unpkg.com/simplelightbox@2.14.3/dist/simple-lightbox.min.css" />
-
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<meta name="robots" content="index, follow" />
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="language" content="English" />
-		<meta name="google-site-verification" content="x17arJy33V33DYnmMYybZciXngFd8R8xn1UZRdp7qxo" />
-
-		<link rel="canonical" href="{{site.url}}{{page.url | url}}" />
-
-		{%if tags.includes("blogpost")%}
-		<meta property="og:type" content="article" />
-		{%if description %}
-		<meta property="description" content="{{description}}" />
-		<meta property="og:description" content="{{description}}" />
-		{% endif %}
-		<meta property="og:title" content="{{title}}" />
-		<meta property="og:url" content="{{site.url}}{{page.url | url}}" />
-		<meta property="og:sitename" content="{{site.title}}" />
-		<meta property="og:image" content="{{site.url}}/img/RB-w.png" />
-		{%endif%}
-
-
-		<title>{% if title %}{{title}} | {% endif %}{{site.title}}</title>
-	</head>
-
-	<body>
-
-		{{content | safe}}
-
-		<script src="//instant.page/5.2.0" type="module" integrity="sha384-jnZyxPjiipYXnSU0ygqeac2q7CVYMbh84q0uHVRRxEtvFPiQYbXWUorga2aqZJ0z"></script>
-		<script data-goatcounter="https://goatcounter.riksolo.com/count" async src="//goatcounter.riksolo.com/count.js"></script>
-		<script src="//unpkg.com/simplelightbox@2.14.3/dist/simple-lightbox.min.js"></script>
-		<script>
-			new SimpleLightbox('.gallery a', {
-				widthRatio: 0.9,
-				heightRatio: 0.95,
-				captionSelector: '.gallery-caption',
-				captionType: 'text',
-			});
-		</script>
-
-	</body>
-
-</html>
\ No newline at end of file
diff --git a/content/layouts/base.njk b/content/layouts/base.njk
index e1f9f3c..0744101 100644
--- a/content/layouts/base.njk
+++ b/content/layouts/base.njk
@@ -1,7 +1,82 @@
----
-layout:  'base-nonav.njk'
----
+{% macro navItem(title, url, hyphen=true, target='_self') %}
+<span>
+	<a href="{{url}}" target="{{target}}">{{title}}</a>
+	{% if hyphen %} - {% endif %}
+</span>
+{% endmacro %}
 
-{%include "navbar.njk"%}
+<!doctype html>
+<html>
 
-{{content | safe}}
\ No newline at end of file
+	<head>
+		<link rel="preconnect" href="https://fonts.googleapis.com">
+		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+		<link href="https://fonts.googleapis.com/css2?family=Inconsolata:wght@400;700&display=swap" rel="stylesheet">
+		<link rel="stylesheet" type="text/css" href="/style.css" />
+		<link href="https://unpkg.com/prism-themes@1.9.0/themes/prism-nord.css" rel="stylesheet" />
+		<link rel="stylesheet" href="https://unpkg.com/simplelightbox@2.14.3/dist/simple-lightbox.min.css" />
+
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="robots" content="index, follow" />
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="language" content="English" />
+		<meta name="google-site-verification" content="x17arJy33V33DYnmMYybZciXngFd8R8xn1UZRdp7qxo" />
+
+		<link rel="canonical" href="{{site.url}}{{page.url | url}}" />
+
+		{%if tags.includes("blogpost")%}
+		<meta property="og:type" content="article" />
+		{%if description %}
+		<meta property="description" content="{{description}}" />
+		<meta property="og:description" content="{{description}}" />
+		{% endif %}
+		<meta property="og:title" content="{{title}}" />
+		<meta property="og:url" content="{{site.url}}{{page.url | url}}" />
+		<meta property="og:sitename" content="{{site.title}}" />
+		<meta property="og:image" content="{{site.url}}/img/RB-w.png" />
+		{%endif%}
+
+		<title>{% if title %}{{title}} | {% endif %}{{site.title}}</title>
+	</head>
+
+	<body>
+		<div class="container">
+			<div class="nav">
+				<a class="d-inline-block main-logo" href="/">
+					<img src="/img/RB-w.png" alt="RB logo" eleventy:widths="100" />
+					Rik Berkelder
+				</a>
+				<div class="nav-links">
+					<div class="d-inline-block">
+						{{navItem("Home", "/")}}
+						{{navItem("Blog", "/blog")}}
+						{{navItem("Portfolio", "/portfolio", false)}}
+					</div>
+					<div class="d-inline-block">
+						<span> | </span>
+						{{navItem("Mastodon", "https://dook.business/@RikSolo")}}
+						{{navItem("Instagram", "https://instagram.com/RikBerkelder", false)}}
+					</div>
+				</div>
+			</div>
+		</div>
+
+		{{content | safe}}
+
+		<script src="//instant.page/5.2.0" type="module"
+			integrity="sha384-jnZyxPjiipYXnSU0ygqeac2q7CVYMbh84q0uHVRRxEtvFPiQYbXWUorga2aqZJ0z"></script>
+		<script data-goatcounter="https://goatcounter.riksolo.com/count" async
+			src="//goatcounter.riksolo.com/count.js"></script>
+		<script src="//unpkg.com/simplelightbox@2.14.3/dist/simple-lightbox.min.js"></script>
+		<script>
+			new SimpleLightbox('.gallery a', {
+				widthRatio: 0.9,
+				heightRatio: 0.95,
+				captionSelector: '.gallery-caption',
+				captionType: 'text',
+			});
+		</script>
+	</body>
+
+</html>
\ No newline at end of file
diff --git a/content/layouts/portfolio.njk b/content/layouts/portfolio.njk
index 48d2aeb..f4db953 100644
--- a/content/layouts/portfolio.njk
+++ b/content/layouts/portfolio.njk
@@ -14,7 +14,7 @@ layout: base.njk
 	<div class="portfolio-detail-images gallery">
 		{% for image in data.images %}
 		<a href="{% imageUrl image.url %}">
-			<img src="{{image.url}}" alt="" loading="lazy" />
+			<img src="{{image.url}}" alt="" loading="lazy" width="600" />
 			{% if image.caption %}
 			<div class="gallery-caption">
 				{{image.caption}}
diff --git a/content/pages/blog.njk b/content/pages/blog.njk
index 14e4a25..d2a5794 100644
--- a/content/pages/blog.njk
+++ b/content/pages/blog.njk
@@ -4,7 +4,7 @@ permalink: "/blog/"
 ---
 
 <h1>Blog</h1>
-{% for post in collections.blogpost | reverse %}
+{% for post in collections.blogposts | reverse %}
 <div>
 	{{post.data.date | dateLocale}} - <a href="{{ post.data.permalink | safe }}">{{post.data.title}}</a>
 </div>
diff --git a/content/pages/cv.njk b/content/pages/cv.njk
deleted file mode 100644
index 3c2054d..0000000
--- a/content/pages/cv.njk
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: CV
-permalink: "/cv/"
-layout: 'base-nonav.njk'
-draft: true
----
-<div class="container">
-	<h1>Rik Berkelder</h1>
-	Lighting Designer/Technician | Software Engineer | Nerd
-
-	<h2>About</h2>
-
-	<p>
-		I am a freelance lighting designer, technician, and systems specialist with a focus on touring productions and live
-		performance. Since 2018, I have worked freelance, initially alongside a career in IT and software engineering and
-		full time since 2022, bringing together technical precision, creative design, and a strong respect for the craft and
-		crew.
-	</p>
-
-	<p>
-		I have designed lighting for touring shows that require both creative adaptability and practical problem solving on
-		the road. As a house and systems technician in a variety of venues, I regularly support international acts and
-		crews, adapting to varied
-		setups and workflows. My theatre and festival touring experience has also strengthened my ability to communicate
-		clearly with local teams and deliver consistent, high quality results in dynamic environments.
-	</p>
-
-	<p>
-		A perfectionist by nature, I value preparation, attention to detail, and reliability while staying flexible and
-		collaborative to meet the demands of live production. My background in IT and network management supports
-		increasingly complex lighting and control systems, ensuring stable and efficient operation across all types of
-		venues.
-	</p>
-
-	<h2>Skills</h2>
-	{%include "skills.njk" %}
-
-	<h2>Highlighted work</h2>
-	{%include "highlights.njk" %}
-
-	<h2>Contact</h2>
-	rik@rblicht.nl / +31 6 37 27 17 91
-</div>
\ No newline at end of file
diff --git a/content/pages/index.njk b/content/pages/index.njk
index 478f6ef..5af5b8f 100644
--- a/content/pages/index.njk
+++ b/content/pages/index.njk
@@ -1,94 +1,51 @@
 ---
 title: Home
 permalink: "/"
-layout: 'base.njk'
 ---
 
-<div class="container">
-	<h1>Rik Berkelder</h1>
-	Lighting Designer | Software Engineer | Nerd
+<h1>Rik Berkelder</h1>
+Lighting Designer | Software Engineer | Nerd
+
+<h2>Skills</h2>
+<div class="flex">
+
+	<div class="col-half">
+		<b>Lighting & AV</b>
+		<ul>
+			<li>GrandMA2/3, Avolites, Hog4, Obsidian Onyx</li>
+			<li>Capture, Vectorworks</li>
+			<li>ATEM, Resolume, VMix, OBS</li>
+			<li>Timecode, Remote Production, System Integration</li>
+		</ul>
+	</div>
+	<div class="col-half">
+		<b>Software</b>
+		<ul>
+			<li>Typescript, GraphQL</li>
+			<li>React (Native), Angular, NodeJS, Electron</li>
+			<li>Git, Docker, Gitlab CI, GitHub Actions, DroneCI</li>
+			<li>Sass/SCSS, Tailwind, Bootstrap</li>
+		</ul>
+	</div>
 </div>
 
-<div class="homepage-images">
-	<a href="/portfolio/tivolivredenburg">
-		<img src="/portfolio/tivolivredenburg/001.jpg" width="750" alt="" />
-	</a>
+<h2>Highlighted Projects/Clients</h2>
+<ul>
+	<li><a href="https://www.sowulo.nl">Sowulo</a> - Lighting design & touring since 2023</li>
+	<li><a href="https://aitum.tv">Aitum</a> - React & Electron development</li>
+	<li><a href="https://twitch.tv/mrgregles">MrGregles</a> - Fully remote, real-time live show lighting control</li>
+	<li><a href="https://rn7.nl">RN7</a> - Custom digital signage with radio playout data integration</li>
+	<li>Doornroosje / TivoliVredenburg / Luxor Live - House LD</li>
+	<small><a href="/portfolio">See More -></a></small>
+</ul>
 
-	<a href="/portfolio/doornroosje">
-		<img src="/portfolio/doornroosje/03.jpg" width="750" alt="" />
-	</a>
+<h2>Contact</h2>
+mail@riksolo.com / rik@rblicht.nl
 
-	<a href="/portfolio/sowulo">
-		<img src="/portfolio/sowulo/33.jpg" width="750" alt="" />
-	</a>
-</div>
-
-<div class="container">
-	<h2>About</h2>
-
-	<p>
-		I am a freelance lighting designer/technician with a passion for the intersection of technical problem-solving with creative expression. My journey in lighting began in primary school, where I didn't want to perform in the school play and got put behind the technical desk instead. At that point, something clicked in me, and I've found a drive to pass that feeling of magic along to audiences through creating unique live experiences. I grew to greatly appreciate how light can affect mood and atmosphere, and I've found it fascinating to explore these relationships through technology.
-	</p>
-
-	<p>
-		This passion for stagecraft is contrasted by a long-running interest in computers, and a solid background in software development. Aside from working in software for a living before transitioning into lighting full-time, I still program for clients on occasion. The software projects I take on now usually involve some blend of art and technology. Such projects have included custom integrations with external tools for live show concepts, automation tools for solo live-streaming and remote production tools that have helped enable remotely-produced events during social distancing.
-	</p>
-
-	<p>
-		A perfectionist by nature, I deeply value preparation, attention to detail and reliability without losing sight of the spontaneity that fuels the creative process. I always aim to bring professionalism and technical precision to the table, blending it with a love for creative problem-solving and, in the end, a never-ending drive to make any project the best version of itself it can possibly be.
-	</p>
-
-	<p>
-		I strongly believe that, in this highly specific and inseparable mix of art and technology, a new kind of magic is to be explored.
-	</p>
-
-
-</div>
-<div class="homepage-images">
-	<a href="/portfolio/tivolivredenburg">
-		<img src="/portfolio/tivolivredenburg/007.jpg" width="750" alt="" />
-	</a>
-
-	<a href="/portfolio/sowulo">
-		<img src="/portfolio/sowulo/3.jpg" width="750" alt="" />
-	</a>
-
-	<a href="/portfolio/luxorlive">
-		<img src="/portfolio/luxorlive/91.jpg" width="750" alt="" />
-	</a>
-</div>
-<div class="container">
-
-	<h2>Skills</h2>
-	{%include "skills.njk" %}
-
-	<h2>Highlighted Projects/Clients</h2>
-	{%include "highlights.njk" %}
-
-	<h2>Contact</h2>
-	{% if site.site != "rblicht" %}mail@riksolo.com / {% endif %}rik@rblicht.nl
-
-	<h3>Find me elsewhere</h3>
-	<ul>
-		{% if site.site != "rblicht" %}
-		<li><a href="https://dook.business/@RikSolo">Mastodon</a> <small>(dook.business)</small></li>
-		{%endif%}
-		<li><a href="https://instagram.com/RikBerkelder">Instagram</a></li>
-		<li><a href="https://github.com/rikberkelder">GitHub</a></li>
-		<li><a href="https://git.riksolo.com">Gitea</a></li>
-	</ul>
-</div>
-
-<div class="homepage-images">
-	<a href="/portfolio/femina">
-		<img src="/portfolio/femina/02.jpg" width="750" alt="" />
-	</a>
-
-	<a href="/portfolio/luxorlive">
-		<img src="/portfolio/luxorlive/32.jpg" width="750" alt="" />
-	</a>
-
-	<a href="/portfolio/musis">
-		<img src="/portfolio/musis/1.jpg" width="750" alt="" />
-	</a>
-</div>
\ No newline at end of file
+<h3>Find me elsewhere</h3>
+<ul>
+	<li><a href="https://dook.business/@RikSolo">Mastodon</a> <small>(dook.business)</small></li>
+	<li><a href="https://instagram.com/RikBerkelder">Instagram</a></li>
+	<li><a href="https://github.com/rikberkelder">GitHub</a></li>
+	<li><a href="https://git.riksolo.com">Gitea</a></li>
+</ul>
\ No newline at end of file
diff --git a/content/portfolio/dgtheater/Kalabante-5-fotograaf-nvt.jpg b/content/portfolio/dgtheater/Kalabante-5-fotograaf-nvt.jpg
deleted file mode 100644
index c4dd68a..0000000
--- a/content/portfolio/dgtheater/Kalabante-5-fotograaf-nvt.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14d553a251b40ae934a9d8f9b3b3488484ed15aa09dd35d4a44c2b6664250273
-size 618543
diff --git a/content/portfolio/dgtheater/dgtheater.md b/content/portfolio/dgtheater/dgtheater.md
deleted file mode 100644
index 2c21b9d..0000000
--- a/content/portfolio/dgtheater/dgtheater.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-order: 4
-title: DG Theater
-description: "National theatre tours with Cirque en Afrique: Kalabante (2024) and African Mama's: The Great Five (2025). Bringing the show's designs to life in varying conditions, and making sure all of the technical lighting aspects of the show are maintained properly and function perfectly every performance."
-timeframe: 2024 - now
----
\ No newline at end of file
diff --git a/content/portfolio/dgtheater/img57646_orig.png b/content/portfolio/dgtheater/img57646_orig.png
deleted file mode 100644
index 29a0eb3..0000000
--- a/content/portfolio/dgtheater/img57646_orig.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d1e40c2b776897a0b89c1a0554d95ac2cd257f7d66112e2edd1b06ccb306994
-size 1495596
diff --git a/content/portfolio/dgtheater/img57647_orig.png b/content/portfolio/dgtheater/img57647_orig.png
deleted file mode 100644
index cac5fc6..0000000
--- a/content/portfolio/dgtheater/img57647_orig.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e4d35e57ef730899b1f1af785a09098622d597c945da4b6c0174e15cc7b268d
-size 1369904
diff --git a/content/portfolio/doornroosje/001.jpg b/content/portfolio/doornroosje/001.jpg
deleted file mode 100644
index 2129d02..0000000
--- a/content/portfolio/doornroosje/001.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5aa4b1ccd62c084ab2a25b1c7d6a24e1b256e172f5f25cddd99c1900903bfca2
-size 175930
diff --git a/content/portfolio/doornroosje/002.jpg b/content/portfolio/doornroosje/002.jpg
deleted file mode 100644
index bc89a56..0000000
--- a/content/portfolio/doornroosje/002.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2dcfb8ab66b8f2c0be37477a9914e3ce8db5271a102217b403dcd386fda0bff
-size 1799627
diff --git a/content/portfolio/doornroosje/01.jpg b/content/portfolio/doornroosje/01.jpg
deleted file mode 100644
index 8454bef..0000000
--- a/content/portfolio/doornroosje/01.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a53ffa4305302f0f38e4b21e0d31e613a1f206d1b8f336e7d20e178af950d36
-size 325912
diff --git a/content/portfolio/doornroosje/03.jpg b/content/portfolio/doornroosje/03.jpg
deleted file mode 100644
index 0f022d7..0000000
--- a/content/portfolio/doornroosje/03.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9d70ee15d57d7f025bb7219d303f6d24972d5f618f8b4695c2546883c08d072
-size 319109
diff --git a/content/portfolio/doornroosje/1.jpg b/content/portfolio/doornroosje/1.jpg
deleted file mode 100644
index b33b1b1..0000000
--- a/content/portfolio/doornroosje/1.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:022d43bbb47330b150063bbc2ab1a0e3aa062dcb88acae5ee3ce5fbab19b7bb9
-size 1333027
diff --git a/content/portfolio/doornroosje/2.jpg b/content/portfolio/doornroosje/2.jpg
deleted file mode 100644
index 7129de4..0000000
--- a/content/portfolio/doornroosje/2.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baac02a00758cc35f39a302c0020a813bcdacdaf2ccc66fa604387e4a4d62e8f
-size 47196
diff --git a/content/portfolio/doornroosje/3.jpg b/content/portfolio/doornroosje/3.jpg
deleted file mode 100644
index cd6587c..0000000
--- a/content/portfolio/doornroosje/3.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:452cd42db57be6b848da86b5ecd6fb5100c124de7e06bd658e17a5b1bcc63ead
-size 273060
diff --git a/content/portfolio/doornroosje/4.jpg b/content/portfolio/doornroosje/4.jpg
deleted file mode 100644
index a551c78..0000000
--- a/content/portfolio/doornroosje/4.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bcc157830f5e7e81f8395760a859ed1afe4a922a1ce5a2d3a901bdbe084d479b
-size 318209
diff --git a/content/portfolio/doornroosje/doornroosje.md b/content/portfolio/doornroosje/doornroosje.md
deleted file mode 100644
index 38b47b6..0000000
--- a/content/portfolio/doornroosje/doornroosje.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-order: 5
-title: Doornroosje
-description: Making sure visiting technicians have a smooth experience at the iconic Nijmegen venue, and providing fitting lighting on the fly for any act not travelling with their own lighting designer and a variety of dance events.
-timeframe: 2024 - now
----
\ No newline at end of file
diff --git a/content/portfolio/femina/03.jpg b/content/portfolio/femina/03.JPG
similarity index 100%
rename from content/portfolio/femina/03.jpg
rename to content/portfolio/femina/03.JPG
diff --git a/content/portfolio/koenjesse/01.jpg b/content/portfolio/koenjesse/01.jpg
deleted file mode 100644
index 6a23d9b..0000000
--- a/content/portfolio/koenjesse/01.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0a6c2cbd320f2e15555127c4ba62f6e15b9bc2769423688a8eab222d96a54ac
-size 19186696
diff --git a/content/portfolio/koenjesse/02.jpg b/content/portfolio/koenjesse/02.jpg
deleted file mode 100644
index aad63df..0000000
--- a/content/portfolio/koenjesse/02.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3198808fd1d98f993ebb847d20b0449efcf0ad7b83182f0fa27e7c70c79b13c1
-size 2754541
diff --git a/content/portfolio/koenjesse/03.png b/content/portfolio/koenjesse/03.png
deleted file mode 100644
index 8f40e94..0000000
--- a/content/portfolio/koenjesse/03.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8064e2ccf43ffbb6da29690624d0cb967863744349c1be35fa646dd387f46a0f
-size 1178780
diff --git a/content/portfolio/koenjesse/04.png b/content/portfolio/koenjesse/04.png
deleted file mode 100644
index 389438e..0000000
--- a/content/portfolio/koenjesse/04.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a1e1cca50bc588a1a64a3ea6cb8a4d974d23610d89e2a128636288d21525d7c
-size 113565
diff --git a/content/portfolio/koenjesse/koenjesse.md b/content/portfolio/koenjesse/koenjesse.md
deleted file mode 100644
index 2843239..0000000
--- a/content/portfolio/koenjesse/koenjesse.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-order: 5
-title: Wedding Koen & Jesse
-description: Complete technical production transforming a classical church to provide an elegant look for the wedding itself, a cozy space for the reception and a night club for the party going on into the small hours.
-timeframe: may 2025
----
\ No newline at end of file
diff --git a/content/portfolio/luxorlive/01.jpg b/content/portfolio/luxorlive/01.jpg
deleted file mode 100644
index e7c386e..0000000
--- a/content/portfolio/luxorlive/01.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e27b4b1907f4bf53cc575cfe42b84483b3fda5e683896ba5e6931f4d70977ce
-size 688736
diff --git a/content/portfolio/luxorlive/1.jpg b/content/portfolio/luxorlive/1.JPG
similarity index 100%
rename from content/portfolio/luxorlive/1.jpg
rename to content/portfolio/luxorlive/1.JPG
diff --git a/content/portfolio/luxorlive/32.jpg b/content/portfolio/luxorlive/2.JPG
similarity index 100%
rename from content/portfolio/luxorlive/32.jpg
rename to content/portfolio/luxorlive/2.JPG
diff --git a/content/portfolio/luxorlive/21.webp b/content/portfolio/luxorlive/21.webp
new file mode 100644
index 0000000..88e86e6
Binary files /dev/null and b/content/portfolio/luxorlive/21.webp differ
diff --git a/content/portfolio/luxorlive/3.jpg b/content/portfolio/luxorlive/3.JPG
similarity index 100%
rename from content/portfolio/luxorlive/3.jpg
rename to content/portfolio/luxorlive/3.JPG
diff --git a/content/portfolio/luxorlive/4.jpg b/content/portfolio/luxorlive/4.JPG
similarity index 100%
rename from content/portfolio/luxorlive/4.jpg
rename to content/portfolio/luxorlive/4.JPG
diff --git a/content/portfolio/luxorlive/5.jpg b/content/portfolio/luxorlive/5.JPG
similarity index 100%
rename from content/portfolio/luxorlive/5.jpg
rename to content/portfolio/luxorlive/5.JPG
diff --git a/content/portfolio/luxorlive/6.jpg b/content/portfolio/luxorlive/6.JPG
similarity index 100%
rename from content/portfolio/luxorlive/6.jpg
rename to content/portfolio/luxorlive/6.JPG
diff --git a/content/portfolio/luxorlive/7.jpg b/content/portfolio/luxorlive/7.JPG
similarity index 100%
rename from content/portfolio/luxorlive/7.jpg
rename to content/portfolio/luxorlive/7.JPG
diff --git a/content/portfolio/luxorlive/8.jpg b/content/portfolio/luxorlive/8.JPG
similarity index 100%
rename from content/portfolio/luxorlive/8.jpg
rename to content/portfolio/luxorlive/8.JPG
diff --git a/content/portfolio/luxorlive/ll-flow-2_00000060.webp b/content/portfolio/luxorlive/ll-flow-2_00000060.webp
new file mode 100644
index 0000000..b13cae9
Binary files /dev/null and b/content/portfolio/luxorlive/ll-flow-2_00000060.webp differ
diff --git a/content/portfolio/luxorlive/ll-flow-2_00000080.webp b/content/portfolio/luxorlive/ll-flow-2_00000080.webp
new file mode 100644
index 0000000..9de46ab
Binary files /dev/null and b/content/portfolio/luxorlive/ll-flow-2_00000080.webp differ
diff --git a/content/portfolio/luxorlive/luxorlive.md b/content/portfolio/luxorlive/luxorlive.md
index 82d7a3c..20383fe 100644
--- a/content/portfolio/luxorlive/luxorlive.md
+++ b/content/portfolio/luxorlive/luxorlive.md
@@ -1,6 +1,15 @@
 ---
 order: 2
 title: Luxor Live
-description: Delivering dynamic, on-the-spot lighting for visiting acts without their own lighting designer, and ensuring the house system is in perfect shape for visiting technicians.
+description: Delivering dynamic, on-the-spot lighting for visiting acts without their own lighting designer, and ensuring a smooth experience with the house rig for visiting technicians. 
 timeframe: 2022 - now
----
\ No newline at end of file
+---
+
+## Notable shows
+(without touring LD)
+- GZA
+- Vandenberg
+- Go_A
+- Lucky Chops
+- Robin Borneman
+- Julian Sas
\ No newline at end of file
diff --git a/content/portfolio/musis/1.jpg b/content/portfolio/musis/1.JPG
similarity index 100%
rename from content/portfolio/musis/1.jpg
rename to content/portfolio/musis/1.JPG
diff --git a/content/portfolio/portfolio.11tydata.js b/content/portfolio/portfolio.11tydata.js
index 375b372..9e32baf 100644
--- a/content/portfolio/portfolio.11tydata.js
+++ b/content/portfolio/portfolio.11tydata.js
@@ -17,7 +17,8 @@ const conf = {
 			const images = await Promise.all(files.map(async (image) => {
 
 				const imagePath = path.resolve(dir + '/' + image);
-				const exif = await exifr.parse(imagePath, { pick: ['XPComment', 'DateTimeOriginal'] });
+				//const exif = await exifr.parse(imagePath, { pick: ['XPComment', 'DateTimeOriginal'] });
+				const exif = {};
 
 				return {
 					url: data.page.url + image,
diff --git a/content/portfolio/prijsvdvrijheid/01.jpg b/content/portfolio/prijsvdvrijheid/01.JPG
similarity index 100%
rename from content/portfolio/prijsvdvrijheid/01.jpg
rename to content/portfolio/prijsvdvrijheid/01.JPG
diff --git a/content/portfolio/prijsvdvrijheid/02.jpg b/content/portfolio/prijsvdvrijheid/02.JPG
similarity index 100%
rename from content/portfolio/prijsvdvrijheid/02.jpg
rename to content/portfolio/prijsvdvrijheid/02.JPG
diff --git a/content/portfolio/prijsvdvrijheid/03.jpg b/content/portfolio/prijsvdvrijheid/03.JPG
similarity index 100%
rename from content/portfolio/prijsvdvrijheid/03.jpg
rename to content/portfolio/prijsvdvrijheid/03.JPG
diff --git a/content/portfolio/prijsvdvrijheid/04.jpg b/content/portfolio/prijsvdvrijheid/04.JPG
similarity index 100%
rename from content/portfolio/prijsvdvrijheid/04.jpg
rename to content/portfolio/prijsvdvrijheid/04.JPG
diff --git a/content/portfolio/prijsvdvrijheid/05.jpg b/content/portfolio/prijsvdvrijheid/05.JPG
similarity index 100%
rename from content/portfolio/prijsvdvrijheid/05.jpg
rename to content/portfolio/prijsvdvrijheid/05.JPG
diff --git a/content/portfolio/prijsvdvrijheid/06.jpg b/content/portfolio/prijsvdvrijheid/06.JPG
similarity index 100%
rename from content/portfolio/prijsvdvrijheid/06.jpg
rename to content/portfolio/prijsvdvrijheid/06.JPG
diff --git a/content/portfolio/prijsvdvrijheid/07.jpg b/content/portfolio/prijsvdvrijheid/07.JPG
similarity index 100%
rename from content/portfolio/prijsvdvrijheid/07.jpg
rename to content/portfolio/prijsvdvrijheid/07.JPG
diff --git a/content/portfolio/sowulo/1.JPG b/content/portfolio/sowulo/1.JPG
new file mode 100644
index 0000000..efa457f
--- /dev/null
+++ b/content/portfolio/sowulo/1.JPG
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3164afa2f150489b66fe66219de9b586941e3fc14b27ce9fc4f94a5829cb661
+size 325029
diff --git a/content/portfolio/sowulo/1.jpg b/content/portfolio/sowulo/1.jpg
deleted file mode 100644
index f341667..0000000
--- a/content/portfolio/sowulo/1.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b02b46421301f8be85102abaa0f2d50e607a6b835e35a2d502794f7d93f4686
-size 28642254
diff --git a/content/portfolio/sowulo/2.jpg b/content/portfolio/sowulo/2.jpg
index 6f8f298..79b08b6 100644
--- a/content/portfolio/sowulo/2.jpg
+++ b/content/portfolio/sowulo/2.jpg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fd8d2fc90f5aca952b8bafce8ed9e80cc3f66370839cfc2a6a8c6b800bca151
-size 361917
+oid sha256:db093cfd613480360ca51b8121e13ea7c0d51802c6d6c068349352ea0b9c1dbf
+size 2138012
diff --git a/content/portfolio/sowulo/3.jpg b/content/portfolio/sowulo/3.jpg
index d498745..6f8f298 100644
--- a/content/portfolio/sowulo/3.jpg
+++ b/content/portfolio/sowulo/3.jpg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37e8c8b5a6ef67f129f62176a8cebf3efa1022666e56c33cbf9bf2f4132aa7b6
-size 266297
+oid sha256:3fd8d2fc90f5aca952b8bafce8ed9e80cc3f66370839cfc2a6a8c6b800bca151
+size 361917
diff --git a/content/portfolio/sowulo/32.jpg b/content/portfolio/sowulo/32.jpg
deleted file mode 100644
index 79b08b6..0000000
--- a/content/portfolio/sowulo/32.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db093cfd613480360ca51b8121e13ea7c0d51802c6d6c068349352ea0b9c1dbf
-size 2138012
diff --git a/content/portfolio/sowulo/33.jpg b/content/portfolio/sowulo/33.jpg
deleted file mode 100644
index 785b6ff..0000000
--- a/content/portfolio/sowulo/33.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faa9c645993ef6b281923fcd368251b1c4e9a5eb7f7d54a75a821a9d61892f2d
-size 35534376
diff --git a/content/portfolio/sowulo/43.jpg b/content/portfolio/sowulo/43.jpg
deleted file mode 100644
index 471f198..0000000
--- a/content/portfolio/sowulo/43.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62ede381cf3ef2bf59deb7e8eebd1f9169df45a00dd30bb2027c5619a980711d
-size 247356
diff --git a/content/portfolio/sowulo/5.jpg b/content/portfolio/sowulo/5.jpg
index a1f55f3..988d90a 100644
--- a/content/portfolio/sowulo/5.jpg
+++ b/content/portfolio/sowulo/5.jpg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:342d8fde5f7363cdc92e071646135b06d15d56261b627ec9ae79bdd24b0c07f6
-size 4238911
+oid sha256:3bcd2340bc3fbb6af2179c8b42698097ca3d8d833d82d9c33c2692872e395b70
+size 4534321
diff --git a/content/portfolio/sowulo/51.jpg b/content/portfolio/sowulo/51.jpg
deleted file mode 100644
index 68287df..0000000
--- a/content/portfolio/sowulo/51.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef63d06095ab2c13d319402f341bf954fc005374f223219c248efac49f7a2080
-size 152786
diff --git a/content/portfolio/sowulo/sowulo.md b/content/portfolio/sowulo/sowulo.md
index 387492a..9c3bc63 100644
--- a/content/portfolio/sowulo/sowulo.md
+++ b/content/portfolio/sowulo/sowulo.md
@@ -1,30 +1,19 @@
 ---
 order: 1
 title: Sowulo 
-description: Designing a theatrical, atmospheric and detailed show while and bringing it to a variety venues and festivals of varying sizes with very short on-site preparation times. Highlights include Hellfest, Motocultor, Castlefest and a 2025 EU Headline Tour
+description: Designing a theatrical, atmospheric and detailed show while and bringing it to a variety venues and festivals of varying sizes with very short on-site preparation times.
 timeframe: 2023 - now
 ---
 
 ## Notable shows
-<div class="list-no-newline">
-
-- Patronaat, Haarlem (NL)
-- Midgardsblod 2025 (NO), mainstage
-- Castlefest 2025 (NL), mainstage
-- Hellfest 2025 (FR), temple stage
-- Echos & Merveilles 2025 (FR), mainstage
-- Doornroosje, Nijmegen (NL)
-- Clubtour 2025 (NL, DE, FR)
-- P60, Amstelveen (NL)
-- Motocultor 2024 (FR)
-- Sint Stevenskerk, 4daagsefeesten, Nijmegen (NL)
-- Opera Leśna (PL), support Heilung
-- Wave Gothik Treffen 2024 (DE)
-- Echos & Merveilles 2024 (FR)
-- Trolls & Legends 2024 (BE)
-- TivoliVredenburg (NL), pandora
-- Menuo Juodoragis 2023 (LT), mainstage
-- Midgardsblot 2023 (NO), mainstage
-- Castlefest 2023 (NL), mainstage
-
-</div>
\ No newline at end of file
+- Castlefest (mainstage) 2023
+- Midgardsblot (mainstage) 2023
+- Menuo Juodoragis (mainstage) 2023
+- TivoliVredenburg (Pandora)
+- Trolls & Legends 2024
+- Echos & Merveilles 2024
+- Wave Gothik Treffen 2024
+- Opera Leśna (support Heilung)
+- Sint Stevenskerk Nijmegen
+- Motocultor 2024
+- P60 amstelveen
\ No newline at end of file
diff --git a/content/portfolio/tinderella/20240126_202807.jpg b/content/portfolio/tinderella/20240126_202807.JPG
similarity index 100%
rename from content/portfolio/tinderella/20240126_202807.jpg
rename to content/portfolio/tinderella/20240126_202807.JPG
diff --git a/content/portfolio/tinderella/20240126_212503.jpg b/content/portfolio/tinderella/20240126_212503.JPG
similarity index 100%
rename from content/portfolio/tinderella/20240126_212503.jpg
rename to content/portfolio/tinderella/20240126_212503.JPG
diff --git a/content/portfolio/tinderella/20240126_214152.jpg b/content/portfolio/tinderella/20240126_214152.JPG
similarity index 100%
rename from content/portfolio/tinderella/20240126_214152.jpg
rename to content/portfolio/tinderella/20240126_214152.JPG
diff --git a/content/portfolio/tivolivredenburg/002.jpg b/content/portfolio/tivolivredenburg/001.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/002.jpg
rename to content/portfolio/tivolivredenburg/001.JPG
diff --git a/content/portfolio/tivolivredenburg/001.jpg b/content/portfolio/tivolivredenburg/001.jpg
deleted file mode 100644
index 3a9839d..0000000
--- a/content/portfolio/tivolivredenburg/001.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9300d2532a3b195b6274de8603380df9c24546038146ae7dc178bcad745406b3
-size 1137131
diff --git a/content/portfolio/tivolivredenburg/003.jpg b/content/portfolio/tivolivredenburg/002.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/003.jpg
rename to content/portfolio/tivolivredenburg/002.JPG
diff --git a/content/portfolio/tivolivredenburg/004.jpg b/content/portfolio/tivolivredenburg/003.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/004.jpg
rename to content/portfolio/tivolivredenburg/003.JPG
diff --git a/content/portfolio/tivolivredenburg/006.jpg b/content/portfolio/tivolivredenburg/004.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/006.jpg
rename to content/portfolio/tivolivredenburg/004.JPG
diff --git a/content/portfolio/tivolivredenburg/008.jpg b/content/portfolio/tivolivredenburg/005.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/008.jpg
rename to content/portfolio/tivolivredenburg/005.JPG
diff --git a/content/portfolio/tivolivredenburg/005.jpg b/content/portfolio/tivolivredenburg/005.jpg
deleted file mode 100644
index 5ccb939..0000000
--- a/content/portfolio/tivolivredenburg/005.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fcac203e087c4c6bf3475e7e0a391bb55d0f5f245eab271f5244559726cca435
-size 917433
diff --git a/content/portfolio/tivolivredenburg/009.jpg b/content/portfolio/tivolivredenburg/006.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/009.jpg
rename to content/portfolio/tivolivredenburg/006.JPG
diff --git a/content/portfolio/tivolivredenburg/010.jpg b/content/portfolio/tivolivredenburg/007.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/010.jpg
rename to content/portfolio/tivolivredenburg/007.JPG
diff --git a/content/portfolio/tivolivredenburg/007.jpg b/content/portfolio/tivolivredenburg/007.jpg
deleted file mode 100644
index 7771e9c..0000000
--- a/content/portfolio/tivolivredenburg/007.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b055e1bcec92bc87145ed45b199adc16b779650f2899877b9dc7cd3bd894dc11
-size 1051027
diff --git a/content/portfolio/tivolivredenburg/011.jpg b/content/portfolio/tivolivredenburg/008.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/011.jpg
rename to content/portfolio/tivolivredenburg/008.JPG
diff --git a/content/portfolio/tivolivredenburg/012.jpg b/content/portfolio/tivolivredenburg/009.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/012.jpg
rename to content/portfolio/tivolivredenburg/009.JPG
diff --git a/content/portfolio/tivolivredenburg/013.jpg b/content/portfolio/tivolivredenburg/010.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/013.jpg
rename to content/portfolio/tivolivredenburg/010.JPG
diff --git a/content/portfolio/tivolivredenburg/014.jpg b/content/portfolio/tivolivredenburg/011.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/014.jpg
rename to content/portfolio/tivolivredenburg/011.JPG
diff --git a/content/portfolio/tivolivredenburg/015.jpg b/content/portfolio/tivolivredenburg/012.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/015.jpg
rename to content/portfolio/tivolivredenburg/012.JPG
diff --git a/content/portfolio/tivolivredenburg/016.jpg b/content/portfolio/tivolivredenburg/013.JPG
similarity index 100%
rename from content/portfolio/tivolivredenburg/016.jpg
rename to content/portfolio/tivolivredenburg/013.JPG
diff --git a/content/portfolio/tivolivredenburg/017.jpg b/content/portfolio/tivolivredenburg/017.jpg
deleted file mode 100644
index d34e6f9..0000000
--- a/content/portfolio/tivolivredenburg/017.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b0d99c180c140f8783fd61c3ce749cc90a5263dcc1106849232f62fbc55257c7
-size 1470729
diff --git a/content/portfolio/tivolivredenburg/tivolivredenburg.md b/content/portfolio/tivolivredenburg/tivolivredenburg.md
index b1281ea..d992cf8 100644
--- a/content/portfolio/tivolivredenburg/tivolivredenburg.md
+++ b/content/portfolio/tivolivredenburg/tivolivredenburg.md
@@ -1,6 +1,6 @@
 ---
 order: 3
 title: TivoliVredenburg
-description: Creative and fitting lighting for a wide variety of productions. From sales to classical to jazz to metal, across 5 stages in the venue. As well as making sure the house systems function and adapt perfectly to visiting tours and complex international productions, including regular maintenance and show-specific adaptations.
+description: Creative and fitting lighting for a wide variety of productions. From sales to classical to jazz to metal, across 5 stages in the venue.
 timeframe: 2023 - now
 ---
\ No newline at end of file
diff --git a/content/portfolio/willemeen/01.jpg b/content/portfolio/willemeen/01.JPG
similarity index 100%
rename from content/portfolio/willemeen/01.jpg
rename to content/portfolio/willemeen/01.JPG
diff --git a/content/portfolio/willemeen/02.jpg b/content/portfolio/willemeen/02.JPG
similarity index 100%
rename from content/portfolio/willemeen/02.jpg
rename to content/portfolio/willemeen/02.JPG
diff --git a/content/portfolio/willemeen/03.jpg b/content/portfolio/willemeen/03.JPG
similarity index 100%
rename from content/portfolio/willemeen/03.jpg
rename to content/portfolio/willemeen/03.JPG
diff --git a/content/portfolio/willemeen/05.jpg b/content/portfolio/willemeen/05.JPG
similarity index 100%
rename from content/portfolio/willemeen/05.jpg
rename to content/portfolio/willemeen/05.JPG
diff --git a/content/style.scss b/content/style.scss
index 67e1617..ce3b85e 100644
--- a/content/style.scss
+++ b/content/style.scss
@@ -30,34 +30,10 @@ body {
 		color: $white-vdark;
 	}
 
-	.homepage-images {
-		display: flex;
-		max-height: 30vh;
-		width: 100%;
-		margin: 1rem 0;
-
-		img {
-			object-fit: cover;
-			height: 100% !important;
-			width: 100% !important;
-
-		}
-
-
-		@media screen and (max-width:750px) {
-			a:nth-child(3) {
-				display: none;
-			}
-		}
-
-	}
-
 	.container {
 		max-width: 900px;
 		margin-left: auto;
 		margin-right: auto;
-
-		padding: 0 1rem;
 		display: block;
 	}
 
@@ -65,7 +41,6 @@ body {
 		max-width: 700px;
 		margin-left: auto;
 		margin-right: auto;
-		padding: 0 1rem;
 
 		&-header {
 			&>* {
@@ -112,9 +87,11 @@ body {
 				flex-wrap: wrap !important;
 			}
 
-			picture {
+			picture,
+			img {
 				display: block;
-				height: 15rem;
+				height: 15rem !important;
+				max-width: 33.33%;
 				flex-grow: 1;
 
 				img {
@@ -256,29 +233,15 @@ body {
 
 	pre[class*="language-"] {
 		max-width: 100%;
-		box-sizing: border-box;
 		background: $grey-dark !important;
 		border-radius: 0;
 		padding: 0.5rem;
 	}
 
-	blockquote {
-		background-color: $grey-dark;
-		box-sizing: border-box;
-		padding: 1rem;
-		padding-bottom: 0.5rem;
-		margin: 0;
-		margin-bottom: 1rem;
-
-		p {
-			margin-bottom: 1rem;
-		}
-	}
-
 	.nav {
 		width: 100%;
 
-		padding-top: 0.6rem;
+		padding-top: 0.2rem;
 		padding-bottom: 0.9em;
 		margin-bottom: 0.6em;
 		border-bottom: 1px $grey-dark solid;
@@ -406,22 +369,5 @@ body {
 		width: 100%;
 		padding: 0.3rem 0.4rem;
 	}
-}
-
-.list-no-newline {
-	& ul {
-		text-align: left;
-		margin: 0;
-		padding: 0;
-	}
-
-	& li {
-		display: inline-block;
-
-		&::before {
-			content: '• ';
-
-		}
-	}
 
 }
\ No newline at end of file
diff --git a/eleventy.config.js b/eleventy.config.js
index 290d3ef..61ff530 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -31,7 +31,13 @@ export default async function (eleventyConfig) {
 
 	//Images
 	eleventyConfig.addPlugin(eleventyImageTransformPlugin, {
-		widths: ["700"]
+		widths: ["700"],
+		formats: ["jpeg", "webp", "gif"],
+		useCache: true,
+		sharpOptions: {
+			animated: true,
+			limitInputPixels: false
+		}
 	});
 	eleventyConfig.addShortcode("figure", (url, alt, caption, width) => {
 		return `
@@ -45,10 +51,15 @@ export default async function (eleventyConfig) {
 	eleventyConfig.addShortcode("imageUrl", async (image, width) => {
 		const img = await Image(`./content${image}`, {
 			outputDir: 'dist/img/',
-			useCache: true
+			useCache: true,
+			sharpOptions: {
+				animated: true,
+				limitInputPixels: false
+			}
 		});
 
-		return img.jpeg[0].url;
+		const files = img.jpeg ?? img.webp;
+		return files[0].url;
 	});
 
 	//Markdown