diff --git a/rotare-doc.tex b/rotare-doc.tex
index 87596b5bc15ddd5e72f6b89254305c1a036bfe62..2439aece48c3a43dc8ca012a67ee08d2aeb94ffc 100644
--- a/rotare-doc.tex
+++ b/rotare-doc.tex
@@ -92,9 +92,6 @@ draft,            % toggle if draft version
 
 % Other additional packages
 % ***********************************************
-\usepackage{definitions} % Custom definitions (see style/definitions.sty)
-\usepackage{symbols} % Custom definitions (see style/definitions.sty)
-\usepackage{commmmands} % Custom definitions (see style/definitions.sty)
 
 \usepackage{ULiege-colors} % ULiege color theme
 \usepackage{scrhack} % So other packages play nice with KOMA-Scripts
@@ -111,32 +108,14 @@ draft,            % toggle if draft version
 \usepackage{pdfpages}
 \usepackage{transparent}
 
+% Fixme for todo messages in text
 \usepackage[inline, marginclue]{fixme}
 \fxsetup{theme=color}
-\newcommand\fxcite{\fxerror{Citation missing}}
-\newcommand{\todo}[1]{\fxnote{#1}}
-
-% ==============================================================================
-%                        COMMANDS AND ENVIRONMENTS
-% ==============================================================================
 
-\newcommand{\describeOption}[4]{
-  \par\noindent
-  \textbf{\textsf{#1}}
-  \if\relax\detokenize{#2}\relax
-    % nothing
-  \else
-    [#2]
-  \fi
-  \dotfill\, #3\newline
-  #4
-}
-
-
-\newcommand{\incfig}[2][1]{%
-    \def\svgwidth{#1\textwidth}
-    \input{#2.pdf_tex}
-}
+% MY PACKAGES
+\usepackage{definitions} % Custom definitions (see style/definitions.sty)
+\usepackage{symbols} % Custom definitions (see style/definitions.sty)
+\usepackage{commands} % Custom definitions (see style/definitions.sty)
 
 % ==============================================================================
 %                             DOCUMENT CONTENT
diff --git a/style/commands.sty b/style/commands.sty
new file mode 100644
index 0000000000000000000000000000000000000000..7fb8ef311fd54564a6d71bf31d2d4e06179b71d5
--- /dev/null
+++ b/style/commands.sty
@@ -0,0 +1,41 @@
+% -----------------------------------------------------------------------------
+% Definitions of custom commands to simplify the writing of this document.
+%
+% Author: Thomas Lambert <t.lambert@uliege.be>
+% ULiege - Aeroelasticity and Experimental Aerodynamics
+% CC0 License
+% https://gitlab.uliege.be/thlamb/rotare-doc
+% ------------------------------------------------------------------------------
+
+% --- Listings -----------------------------------------------------------------
+\newcommand\lst[1]{\lstinline[basicstyle=\ttfamily\normalsize]{#1}}
+\newcommand\lstmat[1]{\lstinline[language=matlab]{#1}}
+
+
+% --- Fixme --------------------------------------------------------------------
+\newcommand\fxcite{\fxerror{REF: Citation missing}}
+\newcommand\fxref{\fxerror{REF: Reference missing}}
+\newcommand{\todo}[1]{\fxnote{#1}}
+
+
+% --- Custom -------------------------------------------------------------------
+
+% Format option description
+\newcommand{\describeOption}[4]{
+  \par\noindent
+  \textbf{\textsf{#1}}
+  \if\relax\detokenize{#2}\relax
+    % nothing
+  \else
+    [#2]
+  \fi
+  \dotfill\, #3\newline
+  #4
+}
+
+% Include inkscape figures
+\newcommand{\incfig}[2][1]{%
+    \def\svgwidth{#1\textwidth}
+    \input{#2.pdf_tex}
+}
+
diff --git a/style/commmmands.sty b/style/commmmands.sty
deleted file mode 100644
index 59825d4ceb21cb4d54e80d73c0e931a5eeeb2976..0000000000000000000000000000000000000000
--- a/style/commmmands.sty
+++ /dev/null
@@ -1,12 +0,0 @@
-% -----------------------------------------------------------------------------
-% Definitions of custom commands to simplify the writing of this document.
-%
-% Author: Thomas Lambert <t.lambert@uliege.be>
-% ULiege - Aeroelasticity and Experimental Aerodynamics
-% CC0 License
-% https://gitlab.uliege.be/thlamb/rotare-doc
-% ------------------------------------------------------------------------------
-
-% --- Listings -----------------------------------------------------------------
-\newcommand\lst[1]{\lstinline[basicstyle=\ttfamily\normalsize]{#1}}
-\newcommand\lstmat[1]{\lstinline[language=matlab]{#1}}