diff --git a/Lettre/carlletter.sty b/Lettre/carlletter.sty
index 6c837c7..2948613 100644
--- a/Lettre/carlletter.sty
+++ b/Lettre/carlletter.sty
@@ -6,13 +6,13 @@
 
 %% LOAD SUPPORTING PACKAGES
 
-% We want to use US letter paper with one-inch margins
+% We want to use A4 paper with one-inch margins
 \RequirePackage{geometry}
-\geometry{letterpaper, margin=1.0in}
-
-% PDFLaTeX commands
-\pdfpagewidth=\paperwidth
-\pdfpageheight=\paperheight
+\geometry{a4paper, margin=1.0in}
+% Alternatives:
+% \geometry{letterpaper, margin=1.0in} % US Letter
+% \geometry{legalpaper, margin=1.0in}  % US Legal
+% \geometry{a5paper, margin=0.75in}    % A5
 
 % And we should use T1 for the output encoding, because the default results
 % in a big mess with accented characters in the PDF
diff --git a/Lettre/carlletter.tex b/Lettre/carlletter.tex
index c9f9734..963045e 100644
--- a/Lettre/carlletter.tex
+++ b/Lettre/carlletter.tex
@@ -4,6 +4,21 @@
 \usepackage{lmodern}
 \usepackage{carlletter}
 
+\usepackage[dvipsnames]{xcolor}
+\usepackage{circledsteps}
+% status pills: \TODO, \TODO{text}, likewise \FIXME and \DONE
+\usepackage{xparse} % for the optional {text} argument
+\usepackage{xspace}
+\NewDocumentCommand{\pill}{m m m g}{%
+    \CircledParamOpts{inner color=#1, outer color=#2, fill color=#2}{1}{%
+        \textbf{#3}\IfValueT{#4}{ \textbf{--} #4}%
+    }%
+    \IfNoValueT{#4}{\xspace}% keep the space in "\TODO bla"
+}
+\newcommand{\DONE}{\pill{black}{LimeGreen}{DONE}}
+\newcommand{\TODO}{\pill{black}{Goldenrod}{TODO}}
+\newcommand{\FIXME}{\pill{white}{Red}{FIXME}}
+
 \usepackage{graphicx}
 \graphicspath{{img/}}
 
@@ -12,33 +27,33 @@
 
 \begin{document}
 
-    Vincent Lannurien \\
-    64 rue Paul Masson \\
-    29200 Brest
-    
-    \begin{flushright}
-        À l'attention de ...
-    \end{flushright}
-    
-    \begin{flushright}
-        le , à, \\
-    \end{flushright}
+Vincent Lannurien \\
+64 rue Paul Masson \\
+29200 Brest
 
-    \vspace{40px}
-    
-    Madame, Monsieur,
+\begin{flushright}
+    À l'attention de ...
+\end{flushright}
+
+\begin{flushright}
+    le , à, \\
+\end{flushright}
+
+\vspace{40px}
+
+Madame, Monsieur,
+
+\vspace{20px}
+
+...
+
+\vspace{40px}
+
+\begin{flushright}
+    Vincent Lannurien
 
     \vspace{20px}
 
-    ...
-
-    \vspace{40px}
-    
-    \begin{flushright}
-        Vincent Lannurien
-
-        \vspace{20px}
-        
-        \includegraphics[width=4cm]{signature.png}
-    \end{flushright}
+    \includegraphics[width=4cm]{signature.png}
+\end{flushright}
 \end{document}
\ No newline at end of file
diff --git a/Poster/main.tex b/Poster/main.tex
index 65639d1..ebf1372 100644
--- a/Poster/main.tex
+++ b/Poster/main.tex
@@ -67,6 +67,18 @@
 % colorlet commands reference: https://texdoc.org/serve/tikzposter/0
 % color names reference: https://sharelatex-wiki-cdn-671420.c.cdn77.org/learn-scripts/images/e/ef/OLxcolorList2.png
 \usepackage[dvipsnames]{xcolor}
+% status pills: \TODO, \TODO{text}, likewise \FIXME and \DONE
+\usepackage{xparse} % for the optional {text} argument
+\usepackage{xspace}
+\NewDocumentCommand{\pill}{m m m g}{%
+    \CircledParamOpts{inner color=#1, outer color=#2, fill color=#2}{1}{%
+        \textbf{#3}\IfValueT{#4}{ \textbf{--} #4}%
+    }%
+    \IfNoValueT{#4}{\xspace}% keep the space in "\TODO bla"
+}
+\newcommand{\DONE}{\pill{black}{LimeGreen}{DONE}}
+\newcommand{\TODO}{\pill{black}{Goldenrod}{TODO}}
+\newcommand{\FIXME}{\pill{white}{Red}{FIXME}}
 \definecolor{accent}{HTML}{4D7EA8}
 \definecolor{foreground}{HTML}{272932}
 \definecolor{background}{HTML}{FFFFFF}
@@ -133,7 +145,7 @@
     {
         TODO
     }
-    
+
     \column{0.65}
     \begin{subcolumns}
         \subcolumn{1}
@@ -170,7 +182,7 @@
     \column{0.75}
     \colorlet{blockbodyfgcolor}{gray}
     \block{}{
-     \vspace{-40pt}
+        \vspace{-40pt}
         \nocite{*}
         \printbibliography[heading=none]
     }
diff --git a/Projet/main.tex b/Projet/main.tex
index f2f81cf..fed71d7 100644
--- a/Projet/main.tex
+++ b/Projet/main.tex
@@ -25,6 +25,19 @@
 \MakeOuterQuote{"}
 \usepackage{enumitem}
 \usepackage[dvipsnames]{xcolor}
+\usepackage{circledsteps}
+% status pills: \TODO, \TODO{text}, likewise \FIXME and \DONE
+\usepackage{xparse} % for the optional {text} argument
+\usepackage{xspace}
+\NewDocumentCommand{\pill}{m m m g}{%
+    \CircledParamOpts{inner color=#1, outer color=#2, fill color=#2}{1}{%
+        \textbf{#3}\IfValueT{#4}{ \textbf{--} #4}%
+    }%
+    \IfNoValueT{#4}{\xspace}% keep the space in "\TODO bla"
+}
+\newcommand{\DONE}{\pill{black}{LimeGreen}{DONE}}
+\newcommand{\TODO}{\pill{black}{Goldenrod}{TODO}}
+\newcommand{\FIXME}{\pill{white}{Red}{FIXME}}
 \usepackage{graphicx}
 \usepackage{titlesec}
 \usepackage{booktabs}
diff --git a/Rapport/main.tex b/Rapport/main.tex
index 87a62bd..42e585a 100644
--- a/Rapport/main.tex
+++ b/Rapport/main.tex
@@ -60,22 +60,22 @@
 %%%%%%%%%%%%
 
 \begin{document}
-    \maketitle
-    \romantableofcontents
+\maketitle
+\romantableofcontents
 
-    \section*{Glossaire}
-    \addcontentsline{toc}{section}{Glossaire}
-    \printglossaries
-    \newpage
+\section*{Glossaire}
+\addcontentsline{toc}{section}{Glossaire}
+\printglossaries
+\newpage
 
-    \input{sections/1_introduction}
-    \newpage
+\input{sections/1_introduction}
+\newpage
 
-    % \nocite{*}
-    \printbibliography
-    \newpage
+% \nocite{*}
+\printbibliography
+\newpage
 
-    \appendix
+\appendix
 
-    \section{Annexes}
+\section{Annexes}
 \end{document}
diff --git a/Rapport/packages/sleek.sty b/Rapport/packages/sleek.sty
index 580f5d8..5f7377c 100644
--- a/Rapport/packages/sleek.sty
+++ b/Rapport/packages/sleek.sty
@@ -86,6 +86,18 @@
 \newcommand{\cmark}{{\color{YellowGreen}\ding{51}}}
 \newcommand{\xmark}{{\color{BrickRed}\ding{55}}}
 \newcommand{\imark}{{\color{Orange}\ding{109}}}
+% status pills: \TODO, \TODO{text}, likewise \FIXME and \DONE
+\RequirePackage{xparse} % for the optional {text} argument
+\RequirePackage{xspace}
+\NewDocumentCommand{\pill}{m m m g}{%
+    \CircledParamOpts{inner color=#1, outer color=#2, fill color=#2}{1}{%
+        \textbf{#3}\IfValueT{#4}{ \textbf{--} #4}%
+    }%
+    \IfNoValueT{#4}{\xspace}% keep the space in "\TODO bla"
+}
+\newcommand{\DONE}{\pill{black}{LimeGreen}{DONE}}
+\newcommand{\TODO}{\pill{black}{Goldenrod}{TODO}}
+\newcommand{\FIXME}{\pill{white}{Red}{FIXME}}
 
 % Figures
 
diff --git a/Slides/slides.cls b/Slides/slides.cls
index ed57506..6bdabcb 100644
--- a/Slides/slides.cls
+++ b/Slides/slides.cls
@@ -126,35 +126,18 @@
 \newcommand{\cmark}{{\color{YellowGreen}\ding{51}}}
 \newcommand{\xmark}{{\color{BrickRed}\ding{55}}}
 \newcommand{\imark}{{\color{Orange}\ding{109}}}
-% pills
-\RequirePackage{xparse}
-\NewDocumentCommand{\DONE}{g}{%
-    \IfNoValueTF{#1}{%
-        \CircledParamOpts{inner color=black, outer color=LimeGreen, fill color=LimeGreen}
-            {1}{\textbf{DONE}}%
-    }{%
-        \CircledParamOpts{inner color=black, outer color=LimeGreen, fill color=LimeGreen}
-            {1}{\textbf{DONE --} #1}%
-    }%
-}
-\NewDocumentCommand{\TODO}{g}{%
-    \IfNoValueTF{#1}{%
-        \CircledParamOpts{inner color=black, outer color=Goldenrod, fill color=Goldenrod}
-            {1}{\textbf{TODO}}%
-    }{%
-        \CircledParamOpts{inner color=black, outer color=Goldenrod, fill color=Goldenrod}
-            {1}{\textbf{TODO --} #1}%
-    }%
-}
-\NewDocumentCommand{\FIXME}{g}{%
-    \IfNoValueTF{#1}{%
-        \CircledParamOpts{inner color=white, outer color=Red, fill color=Red}
-            {1}{\textbf{FIXME}}%
-    }{%
-        \CircledParamOpts{inner color=white, outer color=Red, fill color=Red}
-            {1}{\textbf{FIXME --} #1}%
+% status pills: \TODO, \TODO{text}, likewise \FIXME and \DONE
+\RequirePackage{xparse} % for the optional {text} argument
+\RequirePackage{xspace}
+\NewDocumentCommand{\pill}{m m m g}{%
+    \CircledParamOpts{inner color=#1, outer color=#2, fill color=#2}{1}{%
+        \textbf{#3}\IfValueT{#4}{ \textbf{--} #4}%
     }%
+    \IfNoValueT{#4}{\xspace}% keep the space in "\TODO bla"
 }
+\newcommand{\DONE}{\pill{black}{LimeGreen}{DONE}}
+\newcommand{\TODO}{\pill{black}{Goldenrod}{TODO}}
+\newcommand{\FIXME}{\pill{white}{Red}{FIXME}}
 % custom font size for a slide (cf. https://tex.stackexchange.com/a/401409)
 \RequirePackage{environ}
 \newcommand{\customframefont}[1]{
diff --git a/Slides/slides.tex b/Slides/slides.tex
index a3c092a..b584401 100644
--- a/Slides/slides.tex
+++ b/Slides/slides.tex
@@ -65,17 +65,17 @@
 }
 
 \begin{framefont}{\small}
-\begin{frame}[t]{Plan de la présentation}
-    \begin{columns}
-        \column{0.5\textwidth}
-        \tableofcontents[hideallsubsections]
+    \begin{frame}[t]{Plan de la présentation}
+        \begin{columns}
+            \column{0.5\textwidth}
+            \tableofcontents[hideallsubsections]
 
-        \column{0.5\textwidth}
-        \begin{center}
-            \includegraphics[width=0.9\columnwidth]{img/logos.png}
-        \end{center}
-    \end{columns}
-\end{frame}
+            \column{0.5\textwidth}
+            \begin{center}
+                \includegraphics[width=0.9\columnwidth]{img/logos.png}
+            \end{center}
+        \end{columns}
+    \end{frame}
 \end{framefont}
 
 \section{Contexte}
@@ -91,11 +91,48 @@
         \end{center}
     \end{columns}
 
+    \TODO{bla}
+
+    \FIXME bla
+
+    \DONE
+
     \addtocounter{footnote}{1}
     \footnotetext{\fullcite{herofake}}
 \end{frame}
 
+\begin{frame}{...}
+    \begin{table}[ht]
+        \centering
 
+        \begin{tabular}{L{2cm} C{2.2cm} C{3.8cm} C{3.8cm}}
+            \toprule
+            \textbf{X}           &
+            \textbf{Y}           &
+            \textbf{\Circled{+}} &
+            \textbf{\Circled{-}}          \\
+            \midrule
+
+            \rowcolor{rowgray}
+            \textbf{ABC}
+                                 & foo
+                                 & bar
+                                 & baz    \\
+
+            \textbf{DEF}
+                                 & ?
+                                 & !
+                                 & mmh... \\
+
+            \rowcolor{rowgray}
+            \textbf{XYZ}
+                                 & \cmark
+                                 & \xmark
+                                 & \imark \\
+            \bottomrule
+        \end{tabular}
+    \end{table}
+\end{frame}
 
 \begin{frame}[standout]
     Merci de votre attention.