diff --git a/doc/chalmerstitle.sty b/doc/chalmerstitle.sty
index d7332c2..90cd06c 100644
--- a/doc/chalmerstitle.sty
+++ b/doc/chalmerstitle.sty
@@ -40,7 +40,7 @@
 \newcommand*{\subtitle}[1]{\gdef\@subtitle{#1}}
 %% FRONTMATTER
 \newcommand*{\myfrontmatter}{%
-\newgeometry{top=3cm, bottom=3cm,left=2.25 cm, right=2.25cm}
+%% \newgeometry{top=3cm, bottom=3cm,left=2.25 cm, right=2.25cm}
 \begingroup
 \thispagestyle{empty}
 {\Huge\@title}\\[.5cm]
@@ -66,7 +66,7 @@ Master's thesis in Computer Science
 }
 
 \renewcommand*{\maketitle}{%
-\begin{titlepage}
+%% \begin{titlepage}
 
 % TITLE PAGE
 \newpage
@@ -131,5 +131,6 @@ Telephone +46 31 772 1000 \setlength{\parskip}{0.5cm}\\
 %Printed by [Name of printing company]\\
 Gothenburg, Sweden \the\year
 
-\restoregeometry
-\end{titlepage}}
+%% \restoregeometry
+%% \end{titlepage}
+}
diff --git a/doc/main.tex b/doc/main.tex
index 4ce17d7..9dfde95 100644
--- a/doc/main.tex
+++ b/doc/main.tex
@@ -43,19 +43,14 @@
 \department{Department of Computer Science and Engineering}
 \researchgroup{Programming Logic Group}
 
-%% \newtheorem{prop}{Proposition}
-\makeatletter
-\newcommand*{\rom}[1]{\expandafter\@slowroman\romannumeral #1@}
-\makeatother
-
 \begin{document}
 
+\frontmatter
 \myfrontmatter
-\pagenumbering{roman}
 \maketitle
 \addtocontents{toc}{\protect\thispagestyle{empty}}
 \tableofcontents
-\pagenumbering{arabic}
+\mainmatter
 %
 \input{introduction.tex}
 \input{cubical.tex}
@@ -67,7 +62,6 @@
 \nocite{coquand-2013}
 
 \bibliography{refs}
-%% \printindex
 \begin{appendices}
 \setcounter{page}{1}
 \pagenumbering{roman}
@@ -75,4 +69,5 @@
 %% \input{planning.tex}
 %% \input{halftime.tex}
 \end{appendices}
+\printindex
 \end{document}
diff --git a/doc/packages.tex b/doc/packages.tex
index 20a944e..c203951 100644
--- a/doc/packages.tex
+++ b/doc/packages.tex
@@ -17,7 +17,7 @@
 \usepackage{amssymb,amsmath,amsthm,stmaryrd,mathrsfs,wasysym}
 \usepackage[toc,page]{appendix}
 \usepackage{xspace}
-\usepackage[a4paper]{geometry}
+\usepackage[a4paper,top=3cm,bottom=3cm]{geometry}
 \usepackage{makeidx}
 \makeindex
 % \setlength{\parskip}{10pt}
@@ -88,3 +88,28 @@
 \newunicodechar{𝒜}{\textfallback{?}}
 \newunicodechar{ℬ}{\textfallback{?}}
 %% \newunicodechar{≊}{\textfallback{≊}}
+\makeatletter
+\newcommand*{\rom}[1]{\expandafter\@slowroman\romannumeral #1@}
+\makeatother
+\makeatletter
+
+\newcommand\frontmatter{%
+    \cleardoublepage
+  %\@mainmatterfalse
+  \pagenumbering{roman}}
+
+\newcommand\mainmatter{%
+    \cleardoublepage
+ % \@mainmattertrue
+  \pagenumbering{arabic}}
+
+\newcommand\backmatter{%
+  \if@openright
+    \cleardoublepage
+  \else
+    \clearpage
+  \fi
+ % \@mainmatterfalse
+   }
+
+\makeatother