diff --git a/main.tex b/main.tex
index 2f8d230..d40aeb0 100644
--- a/main.tex
+++ b/main.tex
@@ -19,15 +19,15 @@
 %\usepackage{lipsum}                                                  % Command to generate temporary dummy text
 \usepackage[ruled,vlined,linesnumbered]{algorithm2e}                  % Add the algorithm environnement
 \usepackage[codedark]{packages/themes}                                % Include many colours themes ([default], codedark or dracula)
-\pagecolor{th_colour_bg}
-\color{th_colour_fg}
+\pagecolor{theme_colour_background}
+\color{theme_colour_foreground}
 \usepackage{amsmath}                                                  % Provides command to typeset matrices with different delimiters
 \usepackage{listings}                                                 % Add an environnement to highlight code
 \usepackage{xargs}                                                    % Allow multiple optional parameters parsing
 \usepackage{mdframed}                                                 % Fancy rectangles
-\mdfsetup{linecolor = th_colour_fg, innerlinecolor = th_colour_fg,%
-	middlelinecolor = th_colour_fg, outerlinecolor = th_colour_fg,%
-	backgroundcolor = th_colour_bg, fontcolor = th_colour_fg}
+\mdfsetup{linecolor = theme_colour_foreground, innerlinecolor = theme_colour_foreground, %
+	middlelinecolor = theme_colour_foreground, outerlinecolor = theme_colour_foreground, %
+	backgroundcolor = theme_colour_background, fontcolor = theme_colour_foreground}
 \usepackage{packages/macros}                                          % Customs macros
 \usepackage{graphicx}
 \usepackage{makeidx}[intoc]                                           % Make a word index
diff --git a/packages/macros.sty b/packages/macros.sty
index daa8d55..a4ff967 100644
--- a/packages/macros.sty
+++ b/packages/macros.sty
@@ -21,10 +21,8 @@
 \newcommand{\Ot}{\mathbb{O}}			% Octonions numbers symbol
 \newcommand{\Se}{\mathbb{S}}			% Sedenions numbers symbol
 \newcommand{\Pn}{\mathbb{P}}			% Sets of all the prime numbers
-\newcommand{\false}{{\color{th_colour_red}F}}	% New symbol for false value
-\newcommand{\true}{{\color{th_colour_green}V}}	% New symbol for true value
-%\newcommand{\false}{F}				% New symbol for false value
-%\newcommand{\true}{V}				% New symbol for true value
+\newcommand{\false}{F}				% New symbol for false value
+\newcommand{\true}{V}				% New symbol for true value
 \DeclareMathOperator{\Rel}{\mathcal{R}}		% New symbol for binary relations
 \DeclarePairedDelimiter{\abs}{|}{|}
 \DeclarePairedDelimiter{\card}{|}{|}
diff --git a/packages/themes.sty b/packages/themes.sty
index 059ea1a..77fdc0f 100644
--- a/packages/themes.sty
+++ b/packages/themes.sty
@@ -4,44 +4,44 @@
 \RequirePackage{xcolor}
 
 \DeclareOption{default}{\OptionNotUsed}
-\definecolor{th_colour_bg}      {RGB} {255,  255,  255}
-\definecolor{th_colour_fg}      {RGB} {0,    0,    0  }
-\definecolor{th_colour_cl}      {RGB} {68,   71,   90 }
-\definecolor{th_colour_comment} {RGB} {98,   114,  164}
-\definecolor{th_colour_cyan}    {RGB} {139,  233,  253}
-\definecolor{th_colour_green}   {RGB} {0,    255,  0  }
-\definecolor{th_colour_orange}  {RGB} {255,  184,  108}
-\definecolor{th_colour_pink}    {RGB} {255,  121,  198}
-\definecolor{th_colour_purple}  {RGB} {189,  147,  249}
-\definecolor{th_colour_red}     {RGB} {255,  0,    0  }
-\definecolor{th_colour_yellow}  {RGB} {255,  255,  0  }
+\definecolor{theme_colour_background} {RGB} {255, 255, 255}
+\definecolor{theme_colour_foreground} {RGB} {0,   0,   0  }
+\definecolor{theme_colour_cl}	      {RGB} {68,  71,  90 }
+\definecolor{theme_colour_comment}    {RGB} {98,  114, 164}
+\definecolor{theme_colour_cyan}	      {RGB} {139, 233, 253}
+\definecolor{theme_colour_green}      {RGB} {0,   255, 0  }
+\definecolor{theme_colour_orange}     {RGB} {255, 184, 108}
+\definecolor{theme_colour_pink}	      {RGB} {255, 121, 198}
+\definecolor{theme_colour_purple}     {RGB} {189, 147, 249}
+\definecolor{theme_colour_red}	      {RGB} {255, 0,   0  }
+\definecolor{theme_colour_yellow}     {RGB} {255, 255, 0  }
 
 \DeclareOption{codedark}{
-	\definecolor{th_colour_bg}      {HTML} {222324}
-	\definecolor{th_colour_fg}      {HTML} {FFFFFF}
-	\definecolor{th_colour_cl}      {RGB} {68,   71,   90 }
-	\definecolor{th_colour_comment} {RGB} {98,   114,  164}
-	\definecolor{th_colour_cyan}    {RGB} {139,  233,  253}
-	\definecolor{th_colour_green}   {RGB} {80,   250,  123}
-	\definecolor{th_colour_orange}  {RGB} {255,  184,  108}
-	\definecolor{th_colour_pink}    {RGB} {255,  121,  198}
-	\definecolor{th_colour_purple}  {RGB} {189,  147,  249}
-	\definecolor{th_colour_red}     {RGB} {255,  85,   85 }
-	\definecolor{th_colour_yellow}  {RGB} {241,  250,  140}
+	\definecolor{theme_colour_background} {HTML} {222324}
+	\definecolor{theme_colour_foreground} {HTML} {FFFFFF}
+	\definecolor{theme_colour_cl}	      {RGB}  {68,  71,  90 }
+	\definecolor{theme_colour_comment}    {RGB}  {98,  114, 164}
+	\definecolor{theme_colour_cyan}	      {RGB}  {139, 233, 253}
+	\definecolor{theme_colour_green}      {RGB}  {80,  250, 123}
+	\definecolor{theme_colour_orange}     {RGB}  {255, 184, 108}
+	\definecolor{theme_colour_pink}	      {RGB}  {255, 121, 198}
+	\definecolor{theme_colour_purple}     {RGB}  {189, 147, 249}
+	\definecolor{theme_colour_red}	      {RGB}  {255, 85,  85 }
+	\definecolor{theme_colour_yellow}     {RGB}  {241, 250, 140}
 }
 
 \DeclareOption{dracula}{
-	\definecolor{th_colour_bg}      {RGB} {40,   42,   54 }
-	\definecolor{th_colour_fg}      {RGB} {248,  248,  242}
-	\definecolor{th_colour_cl}      {RGB} {68,   71,   90 }
-	\definecolor{th_colour_comment} {RGB} {98,   114,  164}
-	\definecolor{th_colour_cyan}    {RGB} {139,  233,  253}
-	\definecolor{th_colour_green}   {RGB} {80,   250,  123}
-	\definecolor{th_colour_orange}  {RGB} {255,  184,  108}
-	\definecolor{th_colour_pink}    {RGB} {255,  121,  198}
-	\definecolor{th_colour_purple}  {RGB} {189,  147,  249}
-	\definecolor{th_colour_red}     {RGB} {255,  85,   85 }
-	\definecolor{th_colour_yellow}  {RGB} {241,  250,  140}
+	\definecolor{theme_colour_background} {RGB} {40,  42,  54 }
+	\definecolor{theme_colour_foreground} {RGB} {248, 248, 242}
+	\definecolor{theme_colour_cl}	      {RGB} {68,  71,  90 }
+	\definecolor{theme_colour_comment}    {RGB} {98,  114, 164}
+	\definecolor{theme_colour_cyan}	      {RGB} {139, 233, 253}
+	\definecolor{theme_colour_green}      {RGB} {80,  250, 123}
+	\definecolor{theme_colour_orange}     {RGB} {255, 184, 108}
+	\definecolor{theme_colour_pink}	      {RGB} {255, 121, 198}
+	\definecolor{theme_colour_purple}     {RGB} {189, 147, 249}
+	\definecolor{theme_colour_red}	      {RGB} {255, 85,  85 }
+	\definecolor{theme_colour_yellow}     {RGB} {241, 250, 140}
 }
 
 \ProcessOptions\relax