diff --git a/src/lib/section.html b/src/lib/section.html
new file mode 100644
index 0000000..247d31b
--- /dev/null
+++ b/src/lib/section.html
@@ -0,0 +1,11 @@
+{% macro section(title, title_image, title_image_hover) -%}
+
+
{{ title }}
+ {{ caller() }}
+
+{%- endmacro -%}
diff --git a/src/lib/section.html.j2 b/src/lib/section.html.j2
deleted file mode 100644
index e012c3f..0000000
--- a/src/lib/section.html.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
{{ title }}
- {% block content %}{% endblock %}
-
-
diff --git a/src/pages/index/games.html b/src/pages/index/games.html
index 76eed68..428b579 100644
--- a/src/pages/index/games.html
+++ b/src/pages/index/games.html
@@ -1,9 +1,6 @@
-{% set title = gettext("Games") %}
-{% set title_image = "/img/section-games.png" %}
+{% from "lib/section.html" import section %}
-{% extends "lib/section.html.j2" %}
-
-{% block content %}
+{% call section(gettext("Games"), "/img/section-games.png") %}
{% for game in glob("games/*.md") | map('markdown') %}
{% endfor %}
-{% endblock %}
+{% endcall %}
diff --git a/src/pages/index/news.html b/src/pages/index/news.html
index 52650e8..dd91f40 100644
--- a/src/pages/index/news.html
+++ b/src/pages/index/news.html
@@ -1,9 +1,6 @@
-{% set title = "News" %}
-{% set title_image = "/img/section-news.png" %}
+{% from "lib/section.html" import section %}
-{% extends "lib/section.html.j2" %}
-
-{% block content %}
+{% call section(gettext("News"), "/img/section-news.png") %}
{% for news in glob("news/*.md") | map('markdown') %}
{% endfor %}
-{% endblock %}
+{% endcall %}
diff --git a/src/pages/index/presentation.html b/src/pages/index/presentation.html
index 9a609d2..1a68aec 100644
--- a/src/pages/index/presentation.html
+++ b/src/pages/index/presentation.html
@@ -1,10 +1,6 @@
-{% set title = "Frog Collective" %}
-{% set title_image = "/img/section-collective.png" %}
-{% set title_image_hover = "/img/section-collective-hover.png" %}
+{% from "lib/section.html" import section %}
-{% extends "lib/section.html.j2" %}
-
-{% block content %}
+{% call section(gettext("Collective"), "/img/section-collective.png", "/img/section-collective-hover.png") %}
{% trans %}
Welcome to the cozy world of the Frog Collective, where big dreams come
@@ -53,4 +49,4 @@
{% endfor %}
-{% endblock %}
+{% endcall %}