diff --git a/main.go b/main.go
index d653547..bee2213 100644
--- a/main.go
+++ b/main.go
@@ -98,8 +98,26 @@ func NewServer() *Server {
 		SonBirthDate:     getEnv("SON_BIRTH_DATE", "2022-01-01"),
 	}
 
+	// Template Funcs
+	funcs := template.FuncMap{
+		"dict": func(values ...interface{}) (map[string]interface{}, error) {
+			if len(values)%2 != 0 {
+				return nil, fmt.Errorf("dict expects even number of args")
+			}
+			m := make(map[string]interface{}, len(values)/2)
+			for i := 0; i < len(values); i += 2 {
+				k, ok := values[i].(string)
+				if !ok {
+					return nil, fmt.Errorf("dict keys must be strings")
+				}
+				m[k] = values[i+1]
+			}
+			return m, nil
+		},
+	}
+
 	// Parse templates with error handling
-	templates, err := template.ParseGlob("templates/*.html")
+	templates, err := template.New("").Funcs(funcs).ParseGlob("templates/*.html")
 	if err != nil {
 		log.Fatalf("Failed to parse templates: %v", err)
 	}
diff --git a/templates/index.html b/templates/index.html
index 47c5d40..aa1bb60 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -110,7 +110,7 @@
             </div>
         </section>
 
-        {{template "benefits" .}}
+        {{template "benefits" (dict "Page" . "SectionClass" "section--light") }}
 
         <section id="windows10-eol" class="section windows-eol">
             <div class="container">
@@ -322,7 +322,7 @@
             </div>
         </section>
 
-        {{template "linux_features" .}}
+        {{template "linux_features" (dict "Page" . "SectionClass" "section--light-green") }}
 
         <section class="section cta">
             <div class="container">
diff --git a/templates/linux.html b/templates/linux.html
index 6cd70dd..f49aebb 100644
--- a/templates/linux.html
+++ b/templates/linux.html
@@ -72,7 +72,7 @@
             </div>
         </section>
 
-        {{template "benefits" .}}
+        {{template "benefits" (dict "Page" . "SectionClass" "section--light-green") }}
 
         <section class="section section--light distros">
             <div class="container">
@@ -113,7 +113,7 @@
             </div>
         </section>
 
-        {{template "linux_features" .}}
+        {{template "linux_features" (dict "Page" . "SectionClass" "section--light-green") }}
 
         <section class="section cta">
             <div class="container">
diff --git a/templates/partials/benefits.html b/templates/partials/benefits.html
index 40b0ddc..33848cf 100644
--- a/templates/partials/benefits.html
+++ b/templates/partials/benefits.html
@@ -1,5 +1,8 @@
 {{define "benefits"}}
-        <section id="voordelen" class="section {{if eq .CurrentPage "linux"}}section--light-green{{else}}section--light{{end}} benefits">
+        {{/* Pass SectionClass via dict: template "benefits" (dict "Page" . "SectionClass" "section--light") */}}
+        {{ $sectionClass := "section--light" }}
+        {{ with index . "SectionClass" }}{{ $sectionClass = . }}{{ end }}
+        <section id="voordelen" class="section {{$sectionClass}} benefits">
             <div class="container">
                 <h2><a href="/linux">Waarom Linux kiezen?</a></h2>
                 <div class="benefits-grid">
diff --git a/templates/partials/linux_features.html b/templates/partials/linux_features.html
index 349ff11..0da200f 100644
--- a/templates/partials/linux_features.html
+++ b/templates/partials/linux_features.html
@@ -1,5 +1,7 @@
 {{define "linux_features"}}
-        <section class="section section--light-green linux-features">
+        {{ $sectionClass := "section--light-green" }}
+        {{ with index . "SectionClass" }}{{ $sectionClass = . }}{{ end }}
+        <section class="section {{$sectionClass}} linux-features">
             <div class="container">
                 <h2><a href="/linux">Linux in actie</a></h2>
                 <p class="section-subtitle">Zie hoe Linux eruitziet en werkt in de praktijk</p>