diff --git a/content/home/1-visit.md b/content/home/1-visit/index.md
similarity index 100%
rename from content/home/1-visit.md
rename to content/home/1-visit/index.md
diff --git a/content/home/2-kalender.md b/content/home/2-kalender/index.md
similarity index 100%
rename from content/home/2-kalender.md
rename to content/home/2-kalender/index.md
diff --git a/content/home/3-gruppen.md b/content/home/3-gruppen/index.md
similarity index 100%
rename from content/home/3-gruppen.md
rename to content/home/3-gruppen/index.md
diff --git a/content/home/4-kontakt.md b/content/home/4-kontakt/index.md
similarity index 100%
rename from content/home/4-kontakt.md
rename to content/home/4-kontakt/index.md
diff --git a/content/home/images/cryptoparty-300x100.png b/content/home/9-freunde/cryptoparty-300x100.png
similarity index 100%
rename from content/home/images/cryptoparty-300x100.png
rename to content/home/9-freunde/cryptoparty-300x100.png
diff --git a/content/home/images/ffhhlogo_neu.png b/content/home/9-freunde/ffhhlogo_neu.png
similarity index 100%
rename from content/home/images/ffhhlogo_neu.png
rename to content/home/9-freunde/ffhhlogo_neu.png
diff --git a/content/home/images/fiff.png b/content/home/9-freunde/fiff.png
similarity index 100%
rename from content/home/images/fiff.png
rename to content/home/9-freunde/fiff.png
diff --git a/content/home/images/frappant.png b/content/home/9-freunde/frappant.png
similarity index 100%
rename from content/home/images/frappant.png
rename to content/home/9-freunde/frappant.png
diff --git a/content/home/images/fux_logo.png b/content/home/9-freunde/fux_logo.png
similarity index 100%
rename from content/home/images/fux_logo.png
rename to content/home/9-freunde/fux_logo.png
diff --git a/content/home/images/gaengeviertel.png b/content/home/9-freunde/gaengeviertel.png
similarity index 100%
rename from content/home/images/gaengeviertel.png
rename to content/home/9-freunde/gaengeviertel.png
diff --git a/content/home/images/hbgu.png b/content/home/9-freunde/hbgu.png
similarity index 100%
rename from content/home/images/hbgu.png
rename to content/home/9-freunde/hbgu.png
diff --git a/content/home/9-freunde.md b/content/home/9-freunde/index.md
similarity index 68%
rename from content/home/9-freunde.md
rename to content/home/9-freunde/index.md
index 95bb3dd..5b18d3c 100644
--- a/content/home/9-freunde.md
+++ b/content/home/9-freunde/index.md
@@ -4,25 +4,25 @@ date: 2022-11-20T09:03:20-08:00
 draft: false
 headless: true
 resources:
-- src: images/cryptoparty-300x100.png
+- src: cryptoparty-300x100.png
   params:
     url: https://cryptoparty-hamburg.de
-- src: images/ffhhlogo_neu.png
+- src: ffhhlogo_neu.png
   params:
     url: https://hamburg.freifunk.net/
-- src: images/fux_logo.png
+- src: fux_logo.png
   params:
     url: https://www.fux-eg.org/
-- src: images/fiff.png
+- src: fiff.png
   params:
     url: https://www.fiff.de/
-- src: images/hbgu.png
+- src: hbgu.png
   params:
     url: https://www.stop-watching-hamburg.de/
-- src: images/frappant.png
+- src: frappant.png
   params:
     url: https://frappant.org/
-- src: images/gaengeviertel.png
+- src: gaengeviertel.png
   params:
     url: https://das-gaengeviertel.info/
 
diff --git a/themes/ccchh/layouts/index.html b/themes/ccchh/layouts/index.html
index 4c58c3e..994d007 100644
--- a/themes/ccchh/layouts/index.html
+++ b/themes/ccchh/layouts/index.html
@@ -23,16 +23,17 @@
     </div>
     {{- end }}
 
-    {{- $home_sections := .Site.GetPage "/home" }}
-    {{- range sort ($home_sections.Resources.Match "*.md") ".Name" }}
+    {{- $home := .Site.GetPage "/home" }}
+    {{- range sort ($home.Resources.ByType "page") "File.Path" "asc" }}
     <div class="section">
       <h2>{{ .Title }}</h2>
       {{ .Content -}}
 
+      {{- $sec := .CurrentSection }}
       {{- with .Params.Resources }}
       <div class="flex-grid">
         {{- range . }}
-        {{- $img := $home_sections.Resources.GetMatch (printf "%s" .src) }}
+        {{- $img := $sec.Resources.GetMatch (printf "*/%s" .src) }}
         <div class="img-link"><a href="{{ .params.url }}"><img src="{{ $img.Permalink }}" class="box-image" alt=""></a></div>
         {{- end }}
       </div>