diff --git a/eisvogel.tex b/eisvogel.tex
index 4f2c0be..0db6c5f 100644
--- a/eisvogel.tex
+++ b/eisvogel.tex
@@ -290,11 +290,16 @@ $if(verbatim-in-note)$
 $endif$
 $if(geometry)$
 $if(beamer)$
-\geometry{margin=2.5cm,includehead=true,includefoot=true,centering,$for(geometry)$$geometry$$sep$,$endfor$}
+\geometry{$for(geometry)$$geometry$$sep$,$endfor$}
+$else$
+\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
 $endif$
 $else$
+$if(beamer)$
+$else$
 \usepackage[margin=2.5cm,includehead=true,includefoot=true,centering,$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
 $endif$
+$endif$
 $if(logo)$
 \usepackage[export]{adjustbox}
 \usepackage{graphicx}