diff --git a/jl-devoir/amsthm.tex b/jl-devoir/amsthm.tex
new file mode 100644
index 0000000..4288c5c
--- /dev/null
+++ b/jl-devoir/amsthm.tex
@@ -0,0 +1,103 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+% AMSTHM
+%
+%
+
+
+%% AMSThm styles for exercises
+%%
+
+\newtheoremstyle{exostyle1}
+{\topsep}% espace avant
+{\topsep}% espace apres
+{}% Police utilisee par le style de thm
+{}% Indentation (vide = aucune, \parindent = indentation paragraphe)
+{\bfseries}% Police du titre de thm
+{}% Signe de ponctuation apres le titre du thm
+{\newline}% Espace apres le titre du thm (\newline = linebreak)
+{%
+  \if\relax\detokenize{#3}\relax
+  % no optional argument
+  \else
+  \makebox[0pt][l]{\hspace{.9\textwidth}\normalfont\itshape#3}%
+  \fi
+  \thmname{#1}\thmnumber{ #2}%
+}
+
+\newtheoremstyle{exostyle2}
+{\topsep}% espace avant
+{\topsep}% espace apres
+{}% Police utilisee par le style de thm
+{}% Indentation (vide = aucune, \parindent = indentation paragraphe)
+{\bfseries}% Police du titre de thm
+{}% Signe de ponctuation apres le titre du thm
+{\newline}% Espace apres le titre du thm (\newline = linebreak)
+{%
+  \if\relax\detokenize{#3}\relax
+  % no optional argument
+  \else
+  \makebox[0pt][l]{\hspace{.9\textwidth}\normalfont\itshape#3}%
+  \fi
+  \thmname{#1 }%
+}
+
+\theoremstyle{exostyle1}
+\newtheorem{exercice}{Exercice}
+\newtheorem{exercice*}[exercice]{\faPencil \ Exercice}
+
+\theoremstyle{exostyle2}
+\newtheorem{exercice**}{Exercice}
+
+% amsthm proofs customization
+\newenvironment{solution}
+  {\begin{proof}[\textbf{Solution}]}
+  {\end{proof}}
+
+%
+%
+% TODO: Replace amsthm exercices with xsim
+%
+%
+%\usepackage{xsim}
+%
+%\DeclareExerciseTranslations{exercise}{
+%  Fallback = exercise,
+%  English  = exercise,
+%  French   = exercice
+%}
+%
+%\DeclareExerciseType{exercice}{
+%  exercise-env = exercice ,
+%  solution-env = answer ,
+%  exercise-name = Exercice ,
+%  solution-name = Solution ,
+%  exercise-template = exercice ,
+%  solution-template = exercice
+%}
+%
+%\DeclareExerciseEnvironmentTemplate{exercice}{%
+%  \subsection*
+%  {%
+%    \XSIMmixedcase{\GetExerciseName}\nobreakspace
+%    \GetExerciseProperty{counter}%
+%    \IfInsideSolutionF
+%    {%
+%      \GetExercisePropertyT{subtitle}
+%      { {\normalfont\itshape\PropertyValue}}%
+%    }%
+%  }
+%  \GetExercisePropertyT{points}
+%  {%
+%    \hspace{.9\textwidth}\\
+%    {%
+%      \IfInsideSolutionF{\rule{1.2cm}{1pt}\slash}%
+%      \printgoal{\PropertyValue}
+%      \GetExercisePropertyT{bonus-points}{~(+\printgoal{\PropertyValue})}%
+%      ~\XSIMtranslate {point-abbr}%
+%    }%
+%  }%
+%}
+%{}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/jl-devoir/fixes.tex b/jl-devoir/fixes.tex
new file mode 100644
index 0000000..78d34c9
--- /dev/null
+++ b/jl-devoir/fixes.tex
@@ -0,0 +1,10 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+% FIXES
+%
+%
+
+% Fix error from KOMA-Script scrartcl class.
+\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/jl-devoir/jl-devoir.cls b/jl-devoir/jl-devoir.cls
index 5339d0c..4708c70 100644
--- a/jl-devoir/jl-devoir.cls
+++ b/jl-devoir/jl-devoir.cls
@@ -11,33 +11,42 @@
 \ProvidesClass{jl-devoir}[2018/10/03 Classe pour les devoirs et tests, V1.0]
 
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
 % INIT
 %
 %
+
 \LoadClassWithOptions{scrartcl}
-%\LoadClass[a4paper, 12pt, DIV=24]{scrartcl}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
 % PACKAGES
 %
 %
-% Others
+
+%% Others
+%%
 \RequirePackage{xkeyval}
 
-% Own packages. Those contains some global settings and definitions.
+%% Own packages. Those contains some global settings and definitions.
+%%
 \RequirePackage{commun}
 \RequirePackage{couleurs}
 \RequirePackage{shortcuts}
 
-% Output
+%% Output
+%%
 \RequirePackage{comment}
 
-% Layout
+%% Layout
+%%
 \RequirePackage{geometry}
 \RequirePackage[footsepline, plainfootsepline]{scrlayer-scrpage}
 \RequirePackage{titling}
@@ -45,6 +54,7 @@
 \RequirePackage{pageslts}
 \RequirePackage{enumitem}
 \RequirePackage[]{hyperref}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 
@@ -52,6 +62,7 @@
 
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
 % OPTIONS
@@ -70,20 +81,23 @@
 \ExecuteOptionsX{type}
 \ExecuteOptionsX{size}
 \ProcessOptionsX
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
 % FIXES
 %
 %
 
-% Fix error from KOMA-Script scrartcl class.
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\input{fixes.tex}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
 % SETTINGS
@@ -163,16 +177,19 @@
 
 % paths
 \graphicspath{{images/}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
-% MACROS
+% COMMANDS
 %
 %
 
-% new lists definitions
+%% new lists definitions
+%%
 \newlist{questions}{enumerate}{2}
 \setlist[questions]{labelindent=0em, leftmargin=*, labelsep=0.5em}
 \setlist[questions, 1]{label=\textbf{\arabic*.}}
@@ -186,131 +203,54 @@
 
 \setlist[description]{font=\sffamily\bfseries}
 
-
-% print a "Please, turn the page" at bottom right of the page
+%% \displayturnpage
+%% print a "Please, turn the page" at bottom right of the page.
+%%
 \NewDocumentCommand \displayturnpage{ }{
   \rofoot[\textit{Tourner la page, svp} \faHandORight]
     {\textit{Tourner la page, svp} \faHandORight}
 }
 
-
-% print the main directives of the test
+%% \displaydirectives
+%% print the main directives of the test.
+%%
 \NewDocumentCommand \displaydirectives{ }{
-\begin{center}
-  \fbox{
-    \parbox{.9\textwidth}{
-      \centering
-      \small
-      Le prêt de matériel et de documents personnels est interdit.\\
-      Le barème est donné à titre indicatif : il pourra être légèrement différent.\\
-      Les exercices peuvent être traités dans n’importe quel ordre mais attention à bien reporter les numéros des questions.\\
-      Il sera tenu compte dans la notation du soin apporté à la copie et de la clarté des raisonnements.\\
-      Si présent, le symbole \faPencil\ indique que tout ou partie de l'exercice est à réaliser sur l’énoncé.\\
-      Sauf mention contraire, toutes les questions sont à justifier rigoureusement.
+  \begin{center}
+    \fbox{
+      \parbox{.9\textwidth}{
+        \centering
+        Le prêt de matériel et de documents personnels sont interdits.\\
+        Le barème est donné à titre indicatif : il pourra être légèrement différent.\\
+        Les exercices peuvent être traités dans n’importe quel ordre mais attention à bien reporter les numéros des questions.\\
+        Il sera tenu compte dans la notation du soin apporté à la copie et de la clarté des raisonnements.\\
+        Si présent, le symbole \faPencil\ indique que tout ou partie de l'exercice est à réaliser sur l’énoncé.\\
+        Sauf mention contraire, toutes les questions sont à justifier rigoureusement.
+      }
     }
-  }
-\end{center}
+  \end{center}
 
-\vspace{.2cm}
+  \vspace{.2cm}
 }
 
-% amsthm style for exercises
-\newtheoremstyle{exostyle1}
-{\topsep}% espace avant
-{\topsep}% espace apres
-{}% Police utilisee par le style de thm
-{}% Indentation (vide = aucune, \parindent = indentation paragraphe)
-{\bfseries}% Police du titre de thm
-{}% Signe de ponctuation apres le titre du thm
-{\newline}% Espace apres le titre du thm (\newline = linebreak)
-{%
-  \if\relax\detokenize{#3}\relax
-  % no optional argument
-  \else
-  \makebox[0pt][l]{\hspace{.9\textwidth}\normalfont\itshape#3}%
-  \fi
-  \thmname{#1}\thmnumber{ #2}%
-}
-
-\newtheoremstyle{exostyle2}
-{\topsep}% espace avant
-{\topsep}% espace apres
-{}% Police utilisee par le style de thm
-{}% Indentation (vide = aucune, \parindent = indentation paragraphe)
-{\bfseries}% Police du titre de thm
-{}% Signe de ponctuation apres le titre du thm
-{\newline}% Espace apres le titre du thm (\newline = linebreak)
-{%
-  \if\relax\detokenize{#3}\relax
-  % no optional argument
-  \else
-  \makebox[0pt][l]{\hspace{.9\textwidth}\normalfont\itshape#3}%
-  \fi
-  \thmname{#1 }%
-}
-
-\theoremstyle{exostyle1}
-\newtheorem{exercice}{Exercice}
-\newtheorem{exercice*}[exercice]{\faPencil \ Exercice}
-
-\theoremstyle{exostyle2}
-\newtheorem{exercice**}{Exercice}
-
-% amsthm proofs customization
-\newenvironment{solution}
-  {\begin{proof}[\textbf{Solution}]}
-  {\end{proof}}
-
-%
-%
-% TODO: Replace amsthm exercices with xsim
-%
-%
-%\usepackage{xsim}
-%
-%\DeclareExerciseTranslations{exercise}{
-%  Fallback = exercise,
-%  English  = exercise,
-%  French   = exercice
-%}
-%
-%\DeclareExerciseType{exercice}{
-%  exercise-env = exercice ,
-%  solution-env = answer ,
-%  exercise-name = Exercice ,
-%  solution-name = Solution ,
-%  exercise-template = exercice ,
-%  solution-template = exercice
-%}
-%
-%\DeclareExerciseEnvironmentTemplate{exercice}{%
-%  \subsection*
-%  {%
-%    \XSIMmixedcase{\GetExerciseName}\nobreakspace
-%    \GetExerciseProperty{counter}%
-%    \IfInsideSolutionF
-%    {%
-%      \GetExercisePropertyT{subtitle}
-%      { {\normalfont\itshape\PropertyValue}}%
-%    }%
-%  }
-%  \GetExercisePropertyT{points}
-%  {%
-%    \hspace{.9\textwidth}\\
-%    {%
-%      \IfInsideSolutionF{\rule{1.2cm}{1pt}\slash}%
-%      \printgoal{\PropertyValue}
-%      \GetExercisePropertyT{bonus-points}{~(+\printgoal{\PropertyValue})}%
-%      ~\XSIMtranslate {point-abbr}%
-%    }%
-%  }%
-%}
-%{}
-
-% text customization
+%% text customization
+%%
 \NewDocumentCommand \devprintconc{ }{
   \underline{Conclusion :}
 }
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+% AMSTHM
+%
+%
+
+\input{amsthm.tex}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 
 
 \makeatother