diff --git a/agenda/git-agenda.tex b/agenda/git-agenda.tex
index 71fc58de5..803a1203e 100644
--- a/agenda/git-agenda.tex
+++ b/agenda/git-agenda.tex
@@ -9,64 +9,55 @@
 
 \feshowtitle
 
-\arrayrulecolor{lightgray} {
-  \begin{tabularx}{\textwidth}{|g|h|}
-    {\bf Title} & {\bf Source control using Git training} \\
-    \hline
-
-    {\bf Overview} &
-    Introduction to source control and Git \par
-    Git glossary\par
-    Git basics\par
-    Branches\par
-    Remotes\par
-    Collaborating\par
-    Workflows\par
-    \\
-    \hline
-
-    {\bf Duration} & {\bf One} day - 8 hours.
-    \newline 40\% of lectures, 60\% of practical labs. \\
-    \hline
-
-    {\bf Language} & Oral lectures: English, French.
-    \newline Materials: English.\\
-    \hline
-
-    {\bf Audience} & Companies already using or interested in using
-    Git to managed their source code.\\
-    \hline
-
-    {\bf Prerequisites} & {\bf None}\\
-    \hline
-  \end{tabularx}
-
-  \begin{tabularx}{\textwidth}{|g|h|}
-    {\bf Required equipment} &
-    {\bf For on-site sessions only.}
-    \newline Everything is supplied by Bootlin in public
-    sessions.
-    \begin{itemize}
-    \item Video projector
-    \item PC computers with at least 8 GB of RAM, and Ubuntu Linux
+\feagendasummaryitem{Title}{
+  {\bf Source control using Git training}
+}
+\feagendasummaryitem{Overview}{
+  Introduction to source control and Git \par
+  Git glossary\par
+  Git basics\par
+  Branches\par
+  Remotes\par
+  Collaborating\par
+  Workflows
+}
+\feagendasummaryitem{Duration}{
+  {\bf One} day - 8 hours.
+  \newline 40\% of lectures, 60\% of practical labs.
+}
+\feagendasummaryitem{Language}{
+  Oral lectures: English, French.
+  \newline Materials: English.
+}
+\feagendasummaryitem{Audience}{
+  Companies already using or interested in using
+  Git to managed their source code.
+}
+\feagendasummaryitem{Prerequisites}{
+  None
+}
+\feagendasummaryitem{Required equipment}{
+  {\bf For on-site sessions only.}
+  \newline Everything is supplied by Bootlin in public
+  sessions.
+  \begin{itemize}
+  \item Video projector
+  \item PC computers with at least 8 GB of RAM, and Ubuntu Linux
     installed in a {\bf free partition of at least 20 GB}.
-    \item We need Ubuntu Desktop 18.04 (Xubuntu and
+  \item We need Ubuntu Desktop 18.04 (Xubuntu and
     other variants are fine). We don't support other
     distributions, because we can't test all possible package versions.
-    \item {\bf Connection to the Internet} (direct or through the
+  \item {\bf Connection to the Internet} (direct or through the
     company proxy).
-    \item {\bf PC computers with valuable data must be backed up}
+  \item {\bf PC computers with valuable data must be backed up}
     before being used in our sessions.  Some people have already made
     mistakes during our sessions and damaged work data.
-    \end{itemize}\\
-    \hline
-
-    {\bf Materials} & Electronic copies of presentations and
-    labs.
-    \newline Electronic copy of lab files.\\
-    \hline
-
-\end{tabularx}}
+  \end{itemize}
+}
+\feagendasummaryitem{Materials}{
+  Electronic copies of presentations and labs.
+  \newline Electronic copy of lab files.
+}
 
 \section{Morning}