diff --git a/.config/xm1/texmaker.ini b/.config/xm1/texmaker.ini
index 0b40fa3..5790e28 120000
--- a/.config/xm1/texmaker.ini
+++ b/.config/xm1/texmaker.ini
@@ -1 +1 @@
-texmaker.ini.darksolaris
\ No newline at end of file
+texmaker.ini.original
\ No newline at end of file
diff --git a/.config/xm1/texmaker.ini.darksolaris b/.config/xm1/texmaker.ini.darksolaris
index c398b58..80c6737 100644
--- a/.config/xm1/texmaker.ini.darksolaris
+++ b/.config/xm1/texmaker.ini.darksolaris
@@ -39,13 +39,13 @@ Files\Last%20Template=
 Files\Recent%20Files%20New=/home/jpt/ownCloud/HSH/Studium/Master/SS2018/MA/Writing/Masterarbeit.tex, /home/jpt/ownCloud/HSH/Studium/Master/WS1718/IT-Sicherheit Spezialthema/Vortrag IPv6/Vortrag/Vortrag.tex, /home/jpt/ownCloud/HSH/Studium/Master/WS1718/IT-Sicherheit Spezialthema/Vortrag IPv6/Vortrag/Vortrag2.tex, /usr/local/texlive/2017/texmf-dist/tex/latex/base/fontenc.sty, /usr/local/texlive/2016/texmf-dist/tex/latex/sansmathaccent/sansmathaccent.sty, /home/jpt/ownCloud/HSH/Studium/Master/SS2017/Seminar/Private Key Sharing/Ausarbeitung/Ausarbeitung.tex, /usr/local/texlive/2016/texmf-dist/tex/latex/caption/caption.sty, /home/jpt/ownCloud/HSH/Studium/Master/SS2017/Seminar/Private Key Sharing/Ausarbeitung/sig-alternate-05-2015.cls, /home/jpt/ownCloud/HSH/Studium/Master/SS2017/Seminar/Private Key Sharing/Vortrag/Vortrag.tex, /home/jpt/ownCloud/HSH/Studium/Master/SS2017/Seminar/Private Key Sharing/Vortrag/Vortrag.vrb
 GUI\New%20Version=true
 GUI\Style=true
-Geometries\MainwindowHeight=745
+Geometries\MainwindowHeight=726
 Geometries\MainwindowWidth=1364
 Geometries\MainwindowX=0
-Geometries\MainwindowY=0
+Geometries\MainwindowY=20
 MainWindowMaximized=false
-MainWindowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5T\0\0\x2\x95\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\b\0\x46\0i\0l\0\x65\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\b\0\x45\0\x64\0i\0t\x1\0\0\0m\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\n\0T\0o\0o\0l\0s\x1\0\0\x1\x18\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
-PdfView\Scale=55
+MainWindowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5T\0\0\x2\x82\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\b\0\x46\0i\0l\0\x65\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\b\0\x45\0\x64\0i\0t\x1\0\0\0m\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\n\0T\0o\0o\0l\0s\x1\0\0\x1\x18\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
+PdfView\Scale=71
 Print\PaperSize=a4
 Quick\AMS=true
 Quick\Author=
@@ -73,7 +73,7 @@ Show\Indice=true
 Show\Mathmode=true
 Show\Metapost=true
 Show\Newline=true
-Show\OutputView=true
+Show\OutputView=false
 Show\Pdfview=true
 Show\Pstricks=true
 Show\Puissance=true
@@ -85,7 +85,7 @@ Show\Tikz=true
 Spell\Dic=/usr/share/texmaker/de_DE.dic
 Spell\Inline=false
 Spell\Words=
-Splitter1State=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x3\0\0\0\0\0\0\x3\x38\0\0\x2\x1b\0\0\0\0\x1\x1\0\0\0\x1\0)
+Splitter1State=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x3\0\0\0\xd2\0\0\x3\x38\0\0\x2\x1b\0\0\0\0\x1\x1\0\0\0\x1\0)
 Splitter2State=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x4k\0\0\0\xc7\0\0\0\0\x1\x1\0\0\0\x2\0)
 Splitter3State=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x3\xa2\0\0\0\x44\0\0\0\0\x1\x1\0\0\0\x2\0)
 Structure\Structure%20Level%201=part
@@ -525,7 +525,7 @@ Tools\Makeindex=makeindex %.idx
 Tools\Metapost="mpost --interaction nonstopmode "
 Tools\OutputDir=true
 Tools\Pdf=evince %.pdf
-Tools\PdfInternalViewEmbed=true
+Tools\PdfInternalViewEmbed=false
 Tools\Pdflatex="pdflatex -synctex=1 -interaction=nonstopmode %.tex"
 Tools\Ps=evince %.ps
 Tools\Ps2pdf=ps2pdf %.ps
diff --git a/.config/xm1/texmaker.ini.original b/.config/xm1/texmaker.ini.original
index d80627a..a98a46f 100644
--- a/.config/xm1/texmaker.ini.original
+++ b/.config/xm1/texmaker.ini.original
@@ -33,19 +33,19 @@ Editor\UserCompletion=@Invalid()
 Editor\Watcher=false
 Editor\WordWrap=true
 Files\Input%20Encoding=UTF-8
-Files\Last%20Document=/home/jpt/Bachelorarbeit/Bachelorarbeit.tex
+Files\Last%20Document=/home/jpt/Masterarbeit/SRV-DOC-Inhalt.tex
 Files\Last%20Script=/usr/share/texmaker/
 Files\Last%20Template=
-Files\Recent%20Files%20New=/home/jpt/Bachelorarbeit/Bachelorarbeit.tex, /home/jpt/Bachelorarbeit/Literaturverweise.bib, /home/jpt/ownCloud/HSH/Studium/ss2016/BA/Writing/Bachelorarbeit.tex
+Files\Recent%20Files%20New=/home/jpt/Masterarbeit/SRV-DOC-Inhalt.tex, /home/jpt/Masterarbeit/SRV-DOC-Master.tex, /home/jpt/Masterarbeit/CA-DOC-Inhalt.tex, /home/jpt/Masterarbeit/MA-Inhalt.tex, /home/jpt/Masterarbeit/CA-DOC-Master.tex, /home/jpt/Masterarbeit/MA-Master.tex, /home/jpt/Masterarbeit/CA-DOC-Titelseite.tex, /home/jpt/Masterarbeit/SRV-DOC-Titelseite.tex, /home/jpt/ownCloud/HSH/Studium/Master/SS2018/MA/Writing/MA-Erklaerung.tex, /home/jpt/Masterarbeit/MA-Anhang.tex
 GUI\New%20Version=true
 GUI\Style=true
-Geometries\MainwindowHeight=1056
-Geometries\MainwindowWidth=1920
+Geometries\MainwindowHeight=726
+Geometries\MainwindowWidth=1364
 Geometries\MainwindowX=0
-Geometries\MainwindowY=0
+Geometries\MainwindowY=20
 MainWindowMaximized=true
-MainWindowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\a\x80\0\0\x3\xd2\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\b\0\x46\0i\0l\0\x65\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\b\0\x45\0\x64\0i\0t\x1\0\0\0\x65\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\n\0T\0o\0o\0l\0s\x1\0\0\x1\x6\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
-PdfView\Scale=10
+MainWindowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5T\0\0\x2\x82\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\b\0\x46\0i\0l\0\x65\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\b\0\x45\0\x64\0i\0t\x1\0\0\0m\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\n\0T\0o\0o\0l\0s\x1\0\0\x1\x18\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
+PdfView\Scale=81
 Print\PaperSize=a4
 Quick\AMS=true
 Quick\Author=
@@ -80,7 +80,7 @@ Show\Puissance=true
 Show\Racine=true
 Show\Smallfrac=true
 Show\Sourceview=false
-Show\Structureview=true
+Show\Structureview=false
 Show\Tikz=true
 Spell\Dic=/usr/share/texmaker/de_DE.dic
 Spell\Inline=false
@@ -507,7 +507,7 @@ Symbols\symbol97=0
 Symbols\symbol98=0
 Symbols\symbol99=0
 Tools\Asymptote=asy %.asy
-Tools\Bibtex=bibtex %.aux
+Tools\Bibtex=bibtex build/%.aux
 Tools\CleanWhenExit=false
 Tools\Dvi=evince %.dvi
 Tools\Dvipdf=dvipdfm %.dvi
@@ -523,19 +523,19 @@ Tools\Latexmk="latexmk -e \"$pdflatex=q/pdflatex -synctex=1 -interaction=nonstop
 Tools\Lualatex="lualatex -interaction=nonstopmode %.tex"
 Tools\Makeindex=makeindex %.idx
 Tools\Metapost="mpost --interaction nonstopmode "
-Tools\OutputDir=false
+Tools\OutputDir=true
 Tools\Pdf=evince %.pdf
 Tools\PdfInternalViewEmbed=false
 Tools\Pdflatex="pdflatex -synctex=1 -interaction=nonstopmode %.tex"
 Tools\Ps=evince %.ps
 Tools\Ps2pdf=ps2pdf %.ps
-Tools\Quick%20Mode=6
+Tools\Quick%20Mode=3
 Tools\QuickAsy=asy -f pdf -noView %.asy|evince %.pdf
-Tools\Run=0
+Tools\Run=3
 Tools\SingleViewerInstance=false
 Tools\Sweave=R CMD Sweave %.Rnw
 Tools\Texdoc=texdoc
-Tools\Userquick="pdflatex -synctex=1 -interaction=nonstopmode %.tex|bibtex %.aux|pdflatex -synctex=1 -interaction=nonstopmode %.tex|pdflatex -synctex=1 -interaction=nonstopmode %.tex|evince %.pdf"
+Tools\Userquick="pdflatex -synctex=1 -interaction=nonstopmode %.tex|bibtex build/%.aux|pdflatex -synctex=1 -interaction=nonstopmode %.tex|pdflatex -synctex=1 -interaction=nonstopmode %.tex|evince %.pdf"
 Tools\View=2
 Tools\Xelatex="xelatex -synctex=1 -interaction=nonstopmode %.tex"
 User\Menu1=