diff --git a/texmf/tex/latex/mycustomstyles/auto/komageneral.el b/texmf/tex/latex/mycustomstyles/auto/komageneral.el
index d6cd5d91..e1313a9b 100644
--- a/texmf/tex/latex/mycustomstyles/auto/komageneral.el
+++ b/texmf/tex/latex/mycustomstyles/auto/komageneral.el
@@ -46,7 +46,7 @@
     "listings"
     "csvsimple")
    (TeX-add-symbols
-    '("TitlePage" 3)
+    '("TitlePage" 1)
     '("code" 1)
     '("important" 1))
    (LaTeX-add-environments
diff --git a/texmf/tex/latex/mycustomstyles/komageneral.sty b/texmf/tex/latex/mycustomstyles/komageneral.sty
index b98290b1..b9c1ea3c 100644
--- a/texmf/tex/latex/mycustomstyles/komageneral.sty
+++ b/texmf/tex/latex/mycustomstyles/komageneral.sty
@@ -30,15 +30,24 @@
 \usepackage{csvsimple}
 
 \KOMAoptions{
+  DIV=12,
+  BCOR=10mm,
   twoside=true,
   toc=listof,
   titlepage=false,
-  headings=normal
+  headings=normal,
+  headsepline=true,
+  footsepline=false,
+  headinclude=false,
+  footinclude=false,
+  mpinclude=false,
+  titlepage=true
 }
 
 \definecolor{darkgray}{RGB}{64,64,64}
 \definecolor{lightgray}{RGB}{200,200,200}
 
+% necessary to set max height and width for images
 \adjustboxset{max size={\textwidth}{0.6\textheight}}
 
 % Font settings
@@ -71,17 +80,18 @@
     Scale = 1.0
 ]
 
+% better readability on screen
 \linespread{1.15}
 
 % Geometry settings
-\geometry{
-  a4paper,
-  left=2.5cm,
-  right=2.5cm,
-  top=2.5cm,
-  bottom=2.5cm,
-  marginparwidth=1.5cm
-}
+% \geometry{
+%   a4paper,
+%   left=2.5cm,
+%   right=2.5cm,
+%   top=2.5cm,
+%   bottom=2.5cm,
+%   marginparwidth=1.5cm
+% }
 
 % % Header and footer settings with scrlayer-scrpage
 \pagestyle{scrheadings}
@@ -96,7 +106,7 @@
 \setkomafont{pagehead}{\normalfont}
 
 % Add lines under the header and above the footer
-\setheadsepline{0.2pt} % Thickness of the header line
+% \setheadsepline{0.2pt} % Thickness of the header line
 
 % Section formatting with KOMA-Script features
 \setkomafont{section}{\LARGE\bfseries\sffamily\color{darkgray}}
@@ -133,16 +143,18 @@
 \newcommand{\code}[1]{\texttt{#1}}
 
 % Title page settings
-\newcommand{\TitlePage}[3]{ % #1 - Logo file, #2 - Company name, #3 - Title
+\newcommand{\TitlePage}[1]{
   \begin{titlepage}
     \centering
     \vspace*{1cm}
-    \includegraphics[width=0.3\textwidth]{#1}\par\vspace{1cm}
-    {\Huge #2\par}
+    \includegraphics[width=0.3\textwidth]{#1}\par
     \vspace{2cm}
-    {\Large #3\par}
-    \vfill
-    {\large \today\par}
+    {\huge\bfseries \@title\par}
+    {\Large \@subtitle\par}
+    \vspace{2cm}
+    {\large \@author\par}
+    \vspace{0.5cm}
+    {\normalsize \@date\par}
   \end{titlepage}
 }