diff --git a/manchot-article.cls b/manchot-article.cls
index f62723f..fe6d668 100644
--- a/manchot-article.cls
+++ b/manchot-article.cls
@@ -31,20 +31,12 @@
 
 \ProvidesClass{manchot-article}[2025-05-03]
 
-\LoadClass[10pt, a4paper]{article}
 
-% Required Packages 
+% Initial packages 
 
 \RequirePackage[utf8]{inputenc} % input encoding
 \RequirePackage[T1]{fontenc} % font encoding
-\RequirePackage{geometry} % page geometry
-\RequirePackage{paracol} % multiple columns
-\RequirePackage{fancyhdr} % header and footer
 \RequirePackage{xcolor} % colours
-\RequirePackage{pagecolor} % page colours
-\RequirePackage{setspace} % spacing between lines
-\RequirePackage{cuted} % full width strip environment
-\RequirePackage{hyperref} % links, references, etc. - must be the last package
 
 % Definitions
 
@@ -68,13 +60,27 @@
 \newlength\varparindent
 \newlength\varparskip
 
-
 \input{src/common_palette.tex}
 
 % Options
 
+\PassOptionsToClass{10pt}{article}
+\PassOptionsToClass{a4paper}{article}
+
 \input{src/article_options.tex}
 
+\LoadClass{article}
+
+% Additional packages
+
+\RequirePackage{geometry} % page geometry
+\RequirePackage{paracol} % multiple columns
+\RequirePackage{fancyhdr} % header and footer
+\RequirePackage{pagecolor} % page colours
+\RequirePackage{setspace} % spacing between lines
+\RequirePackage{cuted} % full width strip environment
+\RequirePackage{hyperref} % links, references, etc. - must be the last package
+
 % Settings
 
 \input{src/article_settings.tex}
diff --git a/manchot-beamer.cls b/manchot-beamer.cls
index 3cca299..13f7099 100644
--- a/manchot-beamer.cls
+++ b/manchot-beamer.cls
@@ -94,8 +94,6 @@
 \RequirePackage{cuted} % full width strip environment
 \RequirePackage{hyperref} % links, references, etc. - must be the last package
 
-
-
 % Settings
 
 \input{src/beamer_settings.tex}
diff --git a/src/article_options.tex b/src/article_options.tex
index 18f4fb1..cc1f2f3 100644
--- a/src/article_options.tex
+++ b/src/article_options.tex
@@ -76,21 +76,18 @@
 }
 
 \DeclareOption{onecolumn}{
-     \geometry{top=3cm, bottom=3cm, left=3cm, right=3cm, headheight=1cm, headsep=0.5cm}
-     \setlength\parindent{0cm} % No paragraph indent
-     \setlength\parskip{\bigskipamount} % Make bigskip at each new paragraph
      \twocolumnfalse
 }
 
 \DeclareOption{twocolumn}{
-     \geometry{top=3cm, bottom=3cm, left=2cm, right=2cm, headheight=1cm, headsep=0.5cm}
-     \setlength\parindent{1em}
-     \setlength\parskip{0cm}
      \twocolumntrue
 }
 
+\DeclareOption*{
+     \PassOptionsToClass{\CurrentOption}{article}
+}
+
 \ExecuteOptions{onecolumn, white, colour}
 
 \ProcessOptions\relax
 
-
diff --git a/src/article_settings.tex b/src/article_settings.tex
index f597dd8..ee83291 100644
--- a/src/article_settings.tex
+++ b/src/article_settings.tex
@@ -45,6 +45,16 @@
 \author{\yii@author\\\yii@institution\\\yii@division}
 \date{\yii@date}
 
+\iftwocolumn
+     \geometry{top=3cm, bottom=3cm, left=2cm, right=2cm, headheight=1cm, headsep=0.5cm}
+     \setlength\parindent{1em}
+     \setlength\parskip{0cm}
+\else
+     \geometry{top=3cm, bottom=3cm, left=3cm, right=3cm, headheight=1cm, headsep=0.5cm}
+     \setlength\parindent{0cm} % No paragraph indent
+     \setlength\parskip{\bigskipamount} % Make bigskip at each new paragraph
+\fi
+
 
 \ifbright
      \ifdark