diff --git a/Classes/PhDThesisPSnPDF.cls b/Classes/PhDThesisPSnPDF.cls
index e00fa16..0c48d70 100644
--- a/Classes/PhDThesisPSnPDF.cls
+++ b/Classes/PhDThesisPSnPDF.cls
@@ -228,14 +228,6 @@ footnotes.}
     `preamble.tex'}}%
 
 
-% Deprecated option - use draft instead
-\DeclareOption{draftmode}{
-\ClassError{PhDThesisPSnPDF}{This option is deprecated. Use `draft' 
-  instead this option replaces `draftmode'. To use the classic version
-  of draft use `draftclassic`}
-\stop}% 
-
-
 % Line Numbers
 \newif\ifPHD@lineno\PHD@linenotrue
 \DeclareOption{lineno}{\PHD@linenotrue}
@@ -362,9 +354,27 @@ supported!}
 % Line numbering (can be switched off)
 \ifPHD@lineno
 \RequirePackage[switch,pagewise,mathlines]{lineno}
-\renewcommand{\frontmatter}{\nolinenumbers}
-\renewcommand{\mainmatter}{\linenumbers}
-\renewcommand{\backmatter}{\linenumbers}
+\renewcommand{\frontmatter}{%
+  \cleardoublepage
+  \@mainmatterfalse
+  \pagenumbering{roman}
+  \nolinenumbers
+}
+\renewcommand{\mainmatter}{%
+  \cleardoublepage
+  \@mainmattertrue
+  \pagenumbering{arabic}
+  \linenumbers
+}
+\renewcommand{\backmatter}{%
+  \if@openright
+    \cleardoublepage
+  \else
+    \clearpage
+  \fi
+  \@mainmatterfalse
+  \linenumbers
+}
 
 % Fix display lineno issue in mathmode
 \newcommand*\patchAmsMathEnvironmentForLineno[1]{%
diff --git a/thesis.pdf b/thesis.pdf
index 20133fe..473221a 100644
Binary files a/thesis.pdf and b/thesis.pdf differ
diff --git a/thesis.tex b/thesis.tex
index 620d21b..714f833 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -1,7 +1,7 @@
 % ******************************* PhD Thesis Template **************************
 % Please have a look at the README.md file for info on how to use the template
 
-\documentclass[a4paper,12pt,times,numbered,print,index]{Classes/PhDThesisPSnPDF}
+\documentclass[a4paper,12pt,times,numbered,print,draft,index]{Classes/PhDThesisPSnPDF}
 
 % ******************************************************************************
 % ******************************* Class Options ********************************