diff --git a/.config/nvim/templates/latex/theory/preamble.latex b/.config/nvim/templates/latex/theory/preamble.latex
index e50317d..a0cf31c 100644
--- a/.config/nvim/templates/latex/theory/preamble.latex
+++ b/.config/nvim/templates/latex/theory/preamble.latex
@@ -2,6 +2,7 @@
 % PACKAGE IMPORTS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+% TODO: Change Bable Language if needed
 % \usepackage[ngerman]{babel}
 \usepackage[macchiato, styleAll]{catppuccinpalette}
 \usepackage[tmargin=2cm,rmargin=1in,lmargin=1in,margin=0.85in,bmargin=2cm,footskip=.2in]{geometry}
@@ -362,16 +363,16 @@
 %================================
 
 \newtcbtheorem[number within=section]{Definition}{Definition}{enhanced,
-	before skip=2mm,after skip=2mm, colback=red!5,colframe=red!80!black,boxrule=0.5mm,
+	before skip=2mm,after skip=2mm, colback=CtpRed!5,colframe=CtpRed!80!CtpText,boxrule=0.5mm,
 	attach boxed title to top left={xshift=1cm,yshift*=1mm-\tcboxedtitleheight}, varwidth boxed title*=-3cm,
 	boxed title style={frame code={
-					\path[fill=tcbcolback]
+					\path[fill=CtpRed]
 					([yshift=-1mm,xshift=-1mm]frame.north west)
 					arc[start angle=0,end angle=180,radius=1mm]
 					([yshift=-1mm,xshift=1mm]frame.north east)
 					arc[start angle=180,end angle=0,radius=1mm];
-					\path[left color=tcbcolback!60!black,right color=tcbcolback!60!black,
-						middle color=tcbcolback!80!black]
+					\path[left color=CtpRed!60!CtpText,right color=CtpRed!60!CtpText,
+						middle color=CtpRed!80!CtpText]
 					([xshift=-2mm]frame.north west) -- ([xshift=2mm]frame.north east)
 					[rounded corners=1mm]-- ([xshift=1mm,yshift=-1mm]frame.north east)
 					-- (frame.south east) -- (frame.south west)
@@ -382,16 +383,16 @@
 	fonttitle=\bfseries,
 	title={#2},#1}{def}
 \newtcbtheorem[number within=chapter]{definition}{Definition}{enhanced,
-	before skip=2mm,after skip=2mm, colback=red!5,colframe=red!80!black,boxrule=0.5mm,
+	before skip=2mm,after skip=2mm, colback=CtpRed!5,colframe=CtpRed!80!CtpText,boxrule=0.5mm,
 	attach boxed title to top left={xshift=1cm,yshift*=1mm-\tcboxedtitleheight}, varwidth boxed title*=-3cm,
 	boxed title style={frame code={
-					\path[fill=tcbcolback]
+					\path[fill=CtpRed]
 					([yshift=-1mm,xshift=-1mm]frame.north west)
 					arc[start angle=0,end angle=180,radius=1mm]
 					([yshift=-1mm,xshift=1mm]frame.north east)
 					arc[start angle=180,end angle=0,radius=1mm];
-					\path[left color=tcbcolback!60!black,right color=tcbcolback!60!black,
-						middle color=tcbcolback!80!black]
+					\path[left color=CtpRed!60!CtpText,right color=CtpRed!60!CtpText,
+						middle color=CtpRed!80!CtpText]
 					([xshift=-2mm]frame.north west) -- ([xshift=2mm]frame.north east)
 					[rounded corners=1mm]-- ([xshift=1mm,yshift=-1mm]frame.north east)
 					-- (frame.south east) -- (frame.south west)
@@ -411,8 +412,8 @@
 \makeatletter
 \newtcbtheorem{question}{\questiontitle}{enhanced,
 	breakable,
-	colback=white,
-	colframe=CtpSaphire!80!black,
+	colback=CtpSurface0,
+	colframe=CtpSaphire!80!CtpText,
 	attach boxed title to top left={yshift*=-\tcboxedtitleheight},
 	fonttitle=\bfseries,
 	title={#2},
@@ -424,7 +425,7 @@
 			boxrule=0pt,
 		},
 	underlay boxed title={%
-			\path[fill=tcbcolframe] (title.south west)--(title.south east)
+			\path[fill=CtpSaphire] (title.south west)--(title.south east)
 			to[out=0, in=180] ([xshift=5mm]title.east)--
 			(title.center-|frame.east)
 			[rounded corners=\kvtcb@arc] |-
@@ -441,8 +442,8 @@
 \makeatletter
 \newtcolorbox{solution}{enhanced,
 	breakable,
-	colback=white,
-	colframe=CtpGreen!80!black,
+	colback=CtpSurface0,
+	colframe=CtpGreen!80!CtpText,
 	attach boxed title to top left={yshift*=-\tcboxedtitleheight},
 	title=Solution,
 	boxed title size=title,
@@ -453,7 +454,7 @@
 			boxrule=0pt,
 		},
 	underlay boxed title={%
-			\path[fill=tcbcolframe] (title.south west)--(title.south east)
+			\path[fill=CtpGreen] (title.south west)--(title.south east)
 			to[out=0, in=180] ([xshift=5mm]title.east)--
 			(title.center-|frame.east)
 			[rounded corners=\kvtcb@arc] |-
@@ -469,7 +470,7 @@
 \makeatletter
 \newtcbtheorem{qstion}{\questiontitle}{enhanced,
 	breakable,
-	colback=white,
+	colback=CtpSurface0,
 	colframe=CtpTeal,
 	attach boxed title to top left={yshift*=-\tcboxedtitleheight},
 	fonttitle=\bfseries,
@@ -482,7 +483,7 @@
 			boxrule=0pt,
 		},
 	underlay boxed title={%
-			\path[fill=tcbcolframe] (title.south west)--(title.south east)
+			\path[fill=CtpTeal] (title.south west)--(title.south east)
 			to[out=0, in=180] ([xshift=5mm]title.east)--
 			(title.center-|frame.east)
 			[rounded corners=\kvtcb@arc] |-
@@ -495,7 +496,7 @@
 \newtcbtheorem[number within=chapter]{wconc}{\wrongctitle}{
 	breakable,
 	enhanced,
-	colback=white,
+	colback=CtpSurface0,
 	colframe=CtpRed,
 	arc=0pt,
 	outer arc=0pt,
@@ -522,8 +523,8 @@
 \tcbuselibrary{skins}
 \newtcolorbox{note}[1][]{%
 	enhanced jigsaw,
-	colback=gray!20!white,%
-	colframe=gray!80!black,
+	colback=CtpSurface1,%
+	colframe=CtpSurface0
 	size=small,
 	boxrule=1pt,
 	title=\textbf{Bemerkung:-},
@@ -534,7 +535,7 @@
 	attach boxed title to top left={xshift=1cm,yshift=-\tcboxedtitleheight/2,yshifttext=-\tcboxedtitleheight/2},
 	minipage boxed title=2.5cm,
 	boxed title style={%
-			colback=white,
+			colback=CtpBase,
 			size=fbox,
 			boxrule=1pt,
 			boxsep=2pt,
@@ -543,9 +544,9 @@
 					\coordinate (dotB) at ($(interior.east) + (0.5pt,0)$);
 					\begin{scope}
 						\clip (interior.north west) rectangle ([xshift=3ex]interior.east);
-						\filldraw [white, blur shadow={shadow opacity=60, shadow yshift=-.75ex}, rounded corners=2pt] (interior.north west) rectangle (interior.south east);
+						\filldraw [CtpBase, blur shadow={shadow opacity=60, shadow yshift=-.75ex}, rounded corners=2pt] (interior.north west) rectangle (interior.south east);
 					\end{scope}
-					\begin{scope}[gray!80!black]
+					\begin{scope}[CtpSurface1]
 						\fill (dotA) circle (2pt);
 						\fill (dotB) circle (2pt);
 					\end{scope}