diff --git a/preamble.tex b/preamble.tex
index 83c4c61..adcdeff 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -35,6 +35,7 @@
 \usepackage{tikz}
 \usetikzlibrary{shadings, backgrounds}
 \usepackage[minted]{tcolorbox}
+\setminted{style=default}
 \tcbuselibrary{skins} % breakable
 
 % Math
@@ -60,8 +61,8 @@
 
 % Pagestyle
 \KOMAoptions{%
-  chapterprefix,
-  appendixprefix,
+  % chapterprefix,
+  % appendixprefix,
   headsepline,
   % footsepline,
   % cleardoublepage=current, % linenumbers and headers on interleaf pages
@@ -69,6 +70,17 @@
   footnotes=multiple, % TODO: Doesn't work, maybe because of hyperref?
 }
 
+% Chapter style
+\renewcommand*{\chapterformat}{%
+  {\huge\mdseries\chapapp~\thechapter\autodot\enskip}%
+}
+\setkomafont{chapter}{\huge\bfseries}
+\renewcommand{\chapterlinesformat}[3]{%
+  #2{\MakeUppercase{#3}}%
+  \par\nobreak\vspace{.3\baselineskip}%
+  \rule{\textwidth}{.5pt}%
+}
+
 % Various stuff
 \usepackage[page]{appendix} % [toc]
 \usepackage{lipsum}
@@ -79,13 +91,16 @@
 \usepackage{siunitx}
 \sisetup{detect-all}
 \usepackage[l2tabu,orthodox]{nag}
-% \usepackage{etoolbox} % For \ifstrequal
+\usepackage{etoolbox} % For \ifstrequal
 \usepackage[autostyle]{csquotes} % Correct quotation marks with \textquote{}
 \usepackage{silence} % Silence warnings
 % \usepackage[intoc]{nomencl} % Nomenclature
 \usepackage[luatex,colorlinks]{hyperref} % Load late, hidelinks
 \usepackage{bookmark} % Needed for hyperref with scrbook
 \usepackage[acronym,automake=immediate,nonumberlist,nogroupskip,toc]{glossaries} % Load after hyperref, toc
+\setacronymstyle{long-short}
+\setglossarystyle{super}
+\renewcommand{\glsnamefont}[1]{\sansbf{#1}}
 \usepackage{xurl} % xurl does url-line-breaks in contrast to url
 
 % Multi-file
@@ -182,10 +197,10 @@
     \tableofcontents%
     \cleardoublepage%
 
+    \phantomsection%
     \todototoc\listoftodos%
     \cleardoublepage%
 
-    \setacronymstyle{long-short}
     \printacronyms%
     \cleardoublepage%
     \printglossary%