diff --git a/content/verein/fotos.md b/content/verein/fotos.md
index 1bf6d3d..3c6b9c9 100644
--- a/content/verein/fotos.md
+++ b/content/verein/fotos.md
@@ -6,33 +6,7 @@ menu:
     parent: "Verein"
 ---
 
-{{< gallery >}}
-<img src="/img/club/27480379957_c09e86189b.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/27479845037_9e4ece985c.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/27481915157_3cde02aaa3.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/27481933907_f240f4232d.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/27481964727_04959aa83b.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/27481969187_a23cf0c7ab.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/28476390838_3684d048ef.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/28476394828_1ed64af4f5.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/40542196560_f22e53153c.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/40544370280_1703903e06.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/41447101455_c6ace71115.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/41447109945_3ab5a6e7ef.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/41627141884_48e4bb4dec.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/41627160174_4d494549a2.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/41629042814_df533c84e0.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42300970272_667569d239.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42301473062_cdcea7912f.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42301482072_7092c55ef0.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42303237782_7107fcf7c7.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42303241962_665df39b87.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42303247602_56716d8704.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42349449581_3c634b4245.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42349465201_9fff7450d4.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42349973551_9f1a404c0f.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42350001481_48a8be981e.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-<img src="/img/club/42351605711_6d40412b75.jpg" class="grid-w50 md:grid-w33 xl:grid-w25" />
-{{< /gallery >}}
+Fotos aus den Räumen des Chaos Computer Club Berlin aus 2018
 
-Fotos aus den Räumen des Chaos Computer Club Berlin aus 2018
\ No newline at end of file
+{{< foldergallery dir="img/club" >}}
+{{< /foldergallery >}}
diff --git a/layouts/shortcodes/foldergallery.html b/layouts/shortcodes/foldergallery.html
new file mode 100644
index 0000000..39a0cbd
--- /dev/null
+++ b/layouts/shortcodes/foldergallery.html
@@ -0,0 +1,41 @@
+<!--
+Put this file in /layouts/shortcodes/gallery.html
+Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
+-->
+<!-- count how many times we've called this shortcode; load the css if it's the first time -->
+{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="{{ "css/hugo-easy-gallery.css" | absURL }}" />{{ end }}
+{{- $.Page.Scratch.Add "figurecount" 1 }}
+{{ $baseURL := .Site.BaseURL }}
+<div class="gallery caption-position-{{ with .Get "caption-position" | default "bottom" }}{{.}}{{end}} caption-effect-{{ with .Get "caption-effect" | default "slide" }}{{.}}{{end}} hover-effect-{{ with .Get "hover-effect" | default "zoom" }}{{.}}{{end}} {{ if ne (.Get "hover-transition") "none" }}hover-transition{{end}}" itemscope itemtype="http://schema.org/ImageGallery">
+	{{- with (.Get "dir") -}}
+		<!-- If a directory was specified, generate figures for all of the images in the directory -->
+		{{- $files := readDir (print "/static/" .) }}
+		{{- range $files -}}
+			<!-- skip files that aren't images, or that inlcude the thumb suffix in their name -->
+			{{- $thumbext := $.Get "thumb" | default "-thumb" }}
+			{{- $isthumb := .Name | findRE ($thumbext | printf "%s\\.") }}<!-- is the current file a thumbnail image? -->
+			{{- $isimg := lower .Name | findRE "\\.(gif|jpg|jpeg|tiff|png|bmp)" }}<!-- is the current file an image? -->
+			{{- if and $isimg (not $isthumb) }}
+				{{- $caption :=  .Name | replaceRE "\\..*" "" | humanize }}<!-- humanized filename without extension -->
+				{{- $linkURL := print $baseURL ($.Get "dir") "/" .Name | absURL }}<!-- absolute URL to hi-res image -->
+				{{- $thumb := .Name | replaceRE "(\\.)" ($thumbext | printf "%s.") }}<!-- filename of thumbnail image -->
+				{{- $thumbexists := where $files "Name" $thumb }}<!-- does a thumbnail image exist? -->
+				{{- $thumbURL := print $baseURL ($.Get "dir") "/" $thumb | absURL }}<!-- absolute URL to thumbnail image -->
+				<div class="box">
+				  <figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+				    <div class="img" style="background-image: url('{{ if $thumbexists }}{{ $thumbURL }}{{ else }}{{ $linkURL }}{{ end }}');" >
+				      <img itemprop="thumbnail" src="{{ if $thumbexists }}{{ $thumbURL }}{{ else }}{{ $linkURL }}{{ end }}" alt="{{ $caption }}" /><!-- <img> hidden if in .gallery -->
+                    </div><!--/.img-->
+			      <figcaption>
+		          <p>{{ $caption }}</p>
+			      </figcaption>
+				    <a href="{{ $linkURL }}" itemprop="contentUrl"></a><!-- put <a> last so it is stacked on top -->
+				  </figure>
+                </div><!--/.box-->
+			{{- end }}
+		{{- end }}
+	{{- else -}}
+		<!-- If no directory was specified, include any figure shortcodes called within the gallery -->
+	  {{ .Inner }}
+	{{- end }}
+</div><!--/.gallery .caption-position-{{ with .Get "caption-position" | default "bottom" }}{{.}}{{end}} .caption-effect-{{ with .Get "caption-effect" | default "slide" }}{{.}}{{end}} .hover-effect-{{ with .Get "hover-effect" | default "zoom" }}{{.}}{{end}} {{ if ne (.Get "hover-transition") "none" }}.hover-transition{{end}}-->
diff --git a/static/css/hugo-easy-gallery.css b/static/css/hugo-easy-gallery.css
new file mode 100644
index 0000000..d78dfec
--- /dev/null
+++ b/static/css/hugo-easy-gallery.css
@@ -0,0 +1,159 @@
+/*
+Put this file in /static/css/hugo-easy-gallery.css
+Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
+*/
+
+
+/*
+Grid Layout Styles
+*/
+.gallery {
+    overflow: hidden;
+    margin: 10px;
+    max-width: 768px;
+}
+.gallery .box {
+    float: left;
+    position: relative;
+    /* Default: 1 tile wide */
+    width: 100%;
+    padding-bottom: 100%; 
+}
+@media only screen and (min-width : 365px) {
+    /* Tablet view: 2 tiles */
+    .gallery .box {
+        width: 50%;
+        padding-bottom: 50%;
+    }
+}
+@media only screen and (min-width : 480px) {
+    /* Small desktop / ipad view: 3 tiles */
+    .gallery .box {
+        width: 33.3%;
+        padding-bottom: 33.3%; /*  */
+    }
+}
+@media only screen and (min-width : 9999px) {
+   /* Medium desktop: 4 tiles */
+   .box {
+      width: 25%;
+      padding-bottom: 25%;
+   }
+}
+
+/*
+Transition styles
+*/
+.gallery.hover-transition figure,
+.gallery.hover-effect-zoom .img, 
+.gallery:not(.caption-effect-appear) figcaption,
+.fancy-figure:not(.caption-effect-appear) figcaption {
+    -webkit-transition: all 0.3s ease-in-out;
+    -moz-transition: all 0.3s ease-in-out;
+    -o-transition: all 0.3s ease-in-out;
+    transition: all 0.3s ease-in-out;
+}
+/*
+figure styles
+*/
+figure {
+    position:relative; /* purely to allow absolution positioning of figcaption */
+    overflow: hidden;
+}
+.gallery figure {
+    position: absolute;
+    left: 5px;
+    right: 5px;
+    top: 5px;
+    bottom: 5px;
+}
+.gallery.hover-effect-grow figure:hover {
+    transform: scale(1.05);
+}
+.gallery.hover-effect-shrink figure:hover {
+    transform: scale(0.95);
+}
+.gallery.hover-effect-slidedown figure:hover {
+    transform: translateY(5px);
+}
+.gallery.hover-effect-slideup figure:hover {
+    transform: translateY(-5px);
+}
+
+/*
+img / a styles
+*/
+
+.gallery .img {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    background-size: cover;
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+}
+.gallery.hover-effect-zoom figure:hover .img {
+    transform: scale(1.05);
+}
+.gallery img {
+    display: none; /* only show the img if not inside a gallery */
+}
+figure a {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+
+/*
+figcaption styles
+*/
+.gallery figcaption,
+.fancy-figure figcaption {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: #000;
+    color: #FFF;
+    text-align: center;
+    font-size: 75%; /* change this if you want bigger text */
+    background: rgba(0, 0, 0, 0.5);
+    opacity: 1;
+    cursor: pointer;
+}
+.gallery.caption-position-none figcaption,
+.fancy-figure.caption-position-none figcaption  {
+    display: none;
+}
+.gallery.caption-position-center figcaption,
+.fancy-figure.caption-position-center figcaption {
+    top: 0;
+    padding: 40% 5px;
+}
+.gallery.caption-position-bottom figcaption,
+.fancy-figure.caption-position-bottom figcaption {
+    padding: 5px;
+}
+.gallery.caption-effect-fade figure:not(:hover) figcaption,
+.gallery.caption-effect-appear figure:not(:hover) figcaption,
+.fancy-figure.caption-effect-fade figure:not(:hover) figcaption,
+.fancy-figure.caption-effect-appear figure:not(:hover) figcaption {
+    background: rgba(0, 0, 0, 0);
+    opacity: 0;
+}
+.gallery.caption-effect-slide.caption-position-bottom figure:not(:hover) figcaption,
+.fancy-figure.caption-effect-slide.caption-position-bottom figure:not(:hover) figcaption {
+    margin-bottom: -100%;
+}
+.gallery.caption-effect-slide.caption-position-center figure:not(:hover) figcaption,
+.fancy-figure.caption-effect-slide.caption-position-center figure:not(:hover) figcaption  {
+    top: 100%;
+}
+figcaption p {
+    margin: auto; /* override style in theme */
+}
+
diff --git a/static/img/club/27479845037_9e4ece985c-thumb.jpg b/static/img/club/27479845037_9e4ece985c-thumb.jpg
new file mode 100644
index 0000000..d03ebec
Binary files /dev/null and b/static/img/club/27479845037_9e4ece985c-thumb.jpg differ
diff --git a/static/img/club/27480379957_c09e86189b-thumb.jpg b/static/img/club/27480379957_c09e86189b-thumb.jpg
new file mode 100644
index 0000000..1c9a800
Binary files /dev/null and b/static/img/club/27480379957_c09e86189b-thumb.jpg differ
diff --git a/static/img/club/27481915157_3cde02aaa3-thumb.jpg b/static/img/club/27481915157_3cde02aaa3-thumb.jpg
new file mode 100644
index 0000000..b9f04da
Binary files /dev/null and b/static/img/club/27481915157_3cde02aaa3-thumb.jpg differ
diff --git a/static/img/club/27481933907_f240f4232d-thumb.jpg b/static/img/club/27481933907_f240f4232d-thumb.jpg
new file mode 100644
index 0000000..d51a381
Binary files /dev/null and b/static/img/club/27481933907_f240f4232d-thumb.jpg differ
diff --git a/static/img/club/27481964727_04959aa83b-thumb.jpg b/static/img/club/27481964727_04959aa83b-thumb.jpg
new file mode 100644
index 0000000..401aac9
Binary files /dev/null and b/static/img/club/27481964727_04959aa83b-thumb.jpg differ
diff --git a/static/img/club/27481969187_a23cf0c7ab-thumb.jpg b/static/img/club/27481969187_a23cf0c7ab-thumb.jpg
new file mode 100644
index 0000000..313a02d
Binary files /dev/null and b/static/img/club/27481969187_a23cf0c7ab-thumb.jpg differ
diff --git a/static/img/club/28476390838_3684d048ef-thumb.jpg b/static/img/club/28476390838_3684d048ef-thumb.jpg
new file mode 100644
index 0000000..a1d19a1
Binary files /dev/null and b/static/img/club/28476390838_3684d048ef-thumb.jpg differ
diff --git a/static/img/club/28476394828_1ed64af4f5-thumb.jpg b/static/img/club/28476394828_1ed64af4f5-thumb.jpg
new file mode 100644
index 0000000..b218994
Binary files /dev/null and b/static/img/club/28476394828_1ed64af4f5-thumb.jpg differ
diff --git a/static/img/club/40542196560_f22e53153c-thumb.jpg b/static/img/club/40542196560_f22e53153c-thumb.jpg
new file mode 100644
index 0000000..f36481c
Binary files /dev/null and b/static/img/club/40542196560_f22e53153c-thumb.jpg differ
diff --git a/static/img/club/40544370280_1703903e06-thumb.jpg b/static/img/club/40544370280_1703903e06-thumb.jpg
new file mode 100644
index 0000000..1751de5
Binary files /dev/null and b/static/img/club/40544370280_1703903e06-thumb.jpg differ
diff --git a/static/img/club/41447101455_c6ace71115-thumb.jpg b/static/img/club/41447101455_c6ace71115-thumb.jpg
new file mode 100644
index 0000000..1cb43cc
Binary files /dev/null and b/static/img/club/41447101455_c6ace71115-thumb.jpg differ
diff --git a/static/img/club/41447109945_3ab5a6e7ef-thumb.jpg b/static/img/club/41447109945_3ab5a6e7ef-thumb.jpg
new file mode 100644
index 0000000..c3e131b
Binary files /dev/null and b/static/img/club/41447109945_3ab5a6e7ef-thumb.jpg differ
diff --git a/static/img/club/41627141884_48e4bb4dec-thumb.jpg b/static/img/club/41627141884_48e4bb4dec-thumb.jpg
new file mode 100644
index 0000000..d0c5ce9
Binary files /dev/null and b/static/img/club/41627141884_48e4bb4dec-thumb.jpg differ
diff --git a/static/img/club/41627160174_4d494549a2-thumb.jpg b/static/img/club/41627160174_4d494549a2-thumb.jpg
new file mode 100644
index 0000000..8e590e7
Binary files /dev/null and b/static/img/club/41627160174_4d494549a2-thumb.jpg differ
diff --git a/static/img/club/41629042814_df533c84e0-thumb.jpg b/static/img/club/41629042814_df533c84e0-thumb.jpg
new file mode 100644
index 0000000..79974ec
Binary files /dev/null and b/static/img/club/41629042814_df533c84e0-thumb.jpg differ
diff --git a/static/img/club/42300970272_667569d239-thumb.jpg b/static/img/club/42300970272_667569d239-thumb.jpg
new file mode 100644
index 0000000..3ecd299
Binary files /dev/null and b/static/img/club/42300970272_667569d239-thumb.jpg differ
diff --git a/static/img/club/42301473062_cdcea7912f-thumb.jpg b/static/img/club/42301473062_cdcea7912f-thumb.jpg
new file mode 100644
index 0000000..a031a10
Binary files /dev/null and b/static/img/club/42301473062_cdcea7912f-thumb.jpg differ
diff --git a/static/img/club/42301482072_7092c55ef0-thumb.jpg b/static/img/club/42301482072_7092c55ef0-thumb.jpg
new file mode 100644
index 0000000..e89e0ef
Binary files /dev/null and b/static/img/club/42301482072_7092c55ef0-thumb.jpg differ
diff --git a/static/img/club/42303237782_7107fcf7c7-thumb.jpg b/static/img/club/42303237782_7107fcf7c7-thumb.jpg
new file mode 100644
index 0000000..5cb4332
Binary files /dev/null and b/static/img/club/42303237782_7107fcf7c7-thumb.jpg differ
diff --git a/static/img/club/42303241962_665df39b87-thumb.jpg b/static/img/club/42303241962_665df39b87-thumb.jpg
new file mode 100644
index 0000000..7088329
Binary files /dev/null and b/static/img/club/42303241962_665df39b87-thumb.jpg differ
diff --git a/static/img/club/42303247602_56716d8704-thumb.jpg b/static/img/club/42303247602_56716d8704-thumb.jpg
new file mode 100644
index 0000000..c177deb
Binary files /dev/null and b/static/img/club/42303247602_56716d8704-thumb.jpg differ
diff --git a/static/img/club/42349449581_3c634b4245-thumb.jpg b/static/img/club/42349449581_3c634b4245-thumb.jpg
new file mode 100644
index 0000000..0e24339
Binary files /dev/null and b/static/img/club/42349449581_3c634b4245-thumb.jpg differ
diff --git a/static/img/club/42349465201_9fff7450d4-thumb.jpg b/static/img/club/42349465201_9fff7450d4-thumb.jpg
new file mode 100644
index 0000000..a4632a5
Binary files /dev/null and b/static/img/club/42349465201_9fff7450d4-thumb.jpg differ
diff --git a/static/img/club/42349973551_9f1a404c0f-thumb.jpg b/static/img/club/42349973551_9f1a404c0f-thumb.jpg
new file mode 100644
index 0000000..00871a1
Binary files /dev/null and b/static/img/club/42349973551_9f1a404c0f-thumb.jpg differ
diff --git a/static/img/club/42350001481_48a8be981e-thumb.jpg b/static/img/club/42350001481_48a8be981e-thumb.jpg
new file mode 100644
index 0000000..da8ea0e
Binary files /dev/null and b/static/img/club/42350001481_48a8be981e-thumb.jpg differ
diff --git a/static/img/club/42351605711_6d40412b75-thumb.jpg b/static/img/club/42351605711_6d40412b75-thumb.jpg
new file mode 100644
index 0000000..cce5f55
Binary files /dev/null and b/static/img/club/42351605711_6d40412b75-thumb.jpg differ