diff --git a/packages/Floats.sty b/packages/Floats.sty
index aa8aace..9555a92 100644
--- a/packages/Floats.sty
+++ b/packages/Floats.sty
@@ -82,14 +82,14 @@
 	\ExpEnvOption%
 	\begin{\l_BigFloat_type_str}[\l_BigFloat_placement_str]% float environment
 		\begin{SmartAdjustWidth}{%
-			
+
 			\fp_to_dim:n {
 				-\l_BigFloat_overhang_dim
 			}%
 		}{%
 			\fp_to_dim:n {%
-				-\l_BigFloat_overhang_dim 
-				* \l_BigFloat_offset_fp 
+				-\l_BigFloat_overhang_dim
+				* \l_BigFloat_offset_fp
 			}%
 		}%
 			\begin{minipage}{\linewidth}%
@@ -118,11 +118,11 @@
 	% Key-value options passed to \includegraphics.
 	O{}
 	% Key-value options.
-	O{} 
+	O{}
 	% Graphic file.
-	m 
+	m
 	% Label.
-	>{\TrimSpaces}m 
+	>{\TrimSpaces}m
 	% Caption.
 	m
 }{
@@ -142,15 +142,6 @@
 \keys_define:nn{}{
 	BigFig	.inherit:n	= BigFloat,
 }
-% \keys_define:nn{BigFig}{
-% 	overhang	.dim_set:N	= \l_BigFig_overhang_dim,
-% 	overhang	.initial:e	= {\c_BigFloat_overhang_dim},
-
-% 	placement	.clist_set:N= \l_BigFig_placement_clist,
-
-% 	offset		.fp_set:N	= \l_BigFig_offset_fp,
-% 	offset		.initial:e	= {\c_BigFloat_offset_fp},
-% }
 
 \NewDocumentCommand{\BigFig}{
 	% Key=value options.
@@ -260,15 +251,15 @@
 	% #1: Key=value options.
 	O{}
 	% #2: First graphic file.
-	m 
+	m
 	% #3: First label.
-	>{\TrimSpaces}m 
+	>{\TrimSpaces}m
 	% #4: First caption.
-	>{\TrimSpaces}m 
+	>{\TrimSpaces}m
 	% #5: Second graphic file.
-	m 
+	m
 	% #6: Second label.
-	>{\TrimSpaces}m 
+	>{\TrimSpaces}m
 	% #7: Second caption.
 	>{\TrimSpaces}m
 }{%
diff --git a/packages/Fonts.sty b/packages/Fonts.sty
index 3de1591..33907a2 100644
--- a/packages/Fonts.sty
+++ b/packages/Fonts.sty
@@ -2,60 +2,62 @@
 \ProvidesPackage{PrimeTeX/packages/Fonts}[2025-06-24]
 
 % Specify Fonts
-	\RequirePackage{fontspec}
+\RequirePackage{fontspec}
 
-	\NewDocumentCommand{\fontpath}{}{PrimeTeX/fonts}
+\NewDocumentCommand{\fontpath}{}{PrimeTeX/fonts}
 
-	% Main font: Roboto Serif
-	\setmainfont{RobotoSerif}[
-		Path			= {\fontpath/RobotoSerif/},
-		Extension		= .ttf,
-		UprightFont		= *-Light,
-		BoldFont		= *-SemiBold,
-		ItalicFont		= *-LightItalic,
-		BoldItalicFont	= *-SemiBoldItalic,
-	]
+% Main font: Roboto Serif
+\setmainfont{RobotoSerif}[
+	Path			= {\fontpath/RobotoSerif/},
+	Extension		= .ttf,
+	UprightFont		= *-Light,
+	BoldFont		= *-SemiBold,
+	ItalicFont		= *-LightItalic,
+	BoldItalicFont	= *-SemiBoldItalic,
+]
 
-	% Sans serif font: Roboto
-	\setsansfont{Roboto}[
-		Path			= {\fontpath/Roboto/},
-		Extension		= .ttf,
-		UprightFont		= *-Regular,
-		BoldFont		= *-Bold,
-		ItalicFont		= *-Italic,
-		BoldItalicFont	= *-BoldItalic,
-	]
+% Sans serif font: Roboto
+\setsansfont{Roboto}[
+	Path			= {\fontpath/Roboto/},
+	Extension		= .ttf,
+	UprightFont		= *-Regular,
+	BoldFont		= *-Bold,
+	ItalicFont		= *-Italic,
+	BoldItalicFont	= *-BoldItalic,
+]
 
-	% Monospace font: Roboto Mono
-	\setmonofont{RobotoMono}[
-		Path			= {\fontpath/RobotoMono/},
-		Extension		= .ttf,
-		UprightFont		= *-Regular,
-		BoldFont		= *-Bold,
-		ItalicFont		= *-Italic,
-		BoldItalicFont	= *-BoldItalic,
-	]
+% Monospace font: Roboto Mono
+\setmonofont{RobotoMono}[
+	Path			= {\fontpath/RobotoMono/},
+	Extension		= .ttf,
+	UprightFont		= *-Regular,
+	BoldFont		= *-Bold,
+	ItalicFont		= *-Italic,
+	BoldItalicFont	= *-BoldItalic,
+]
 
-	% Headings & Titles font: Roboto Slab
-	\newfontfamily{\sbfamily}{RobotoSlab}[
-		Path			= {\fontpath/},
-		Extension		= .ttf,
-		UprightFont		= RobotoSlab/RobotoSlab-SemiBold,
-		BoldFont		= RobotoSlab/RobotoSlab-Black,
-		% Roboto Slab doesn't have any italic form, so use 
-		% the Roboto Serif version.
-		ItalicFont		= RobotoSerif/RobotoSerif-SemiBoldItalic,
-		BoldItalicFont	= RobotoSerif/RobotoSerif-ExtraBoldItalic,
-	]
+% Headings & Titles font: Roboto Slab
+\newfontfamily{\sbfamily}{RobotoSlab}[
+	Path			= {\fontpath/},
+	Extension		= .ttf,
+	UprightFont		= RobotoSlab/RobotoSlab-SemiBold,
+	BoldFont		= RobotoSlab/RobotoSlab-Black,
+	% Roboto Slab doesn't have any italic form, so use
+	% the Roboto Serif version.
+	ItalicFont		= RobotoSerif/RobotoSerif-SemiBoldItalic,
+	BoldItalicFont	= RobotoSerif/RobotoSerif-ExtraBoldItalic,
+]
 
-	% Emoji font: Noto Emoji
-	\newfontfamily{\emfamily}{NotoEmoji}[
-		Path			= {\fontpath/},
-		Extension		= .ttf,
-		UprightFont		= NotoEmoji/NotoEmoji-Regular,
-		BoldFont		= NotoEmoji/NotoEmoji-Bold,
-		ItalicFont		= NotoEmoji/NotoEmoji-Light,
-	]
+% Emoji font: Noto Emoji
+\newfontfamily{\emfamily}{NotoEmoji}[
+	Path			= {\fontpath/},
+	Extension		= .ttf,
+	UprightFont		= NotoEmoji/NotoEmoji-Regular,
+	BoldFont		= NotoEmoji/NotoEmoji-Bold,
+	ItalicFont		= NotoEmoji/NotoEmoji-Light,
+]
+
+\RequirePackage{amssymb}
 
 \NewDocumentCommand{\serif}{m}{\textrm{#1}}
 \NewDocumentCommand{\sans}{m}{\textsf{#1}}
@@ -64,8 +66,6 @@
 \NewDocumentCommand{\code}{m}{\mono{\small{}#1}}
 \NewDocumentCommand{\emoji}{m}{{\emfamily{}#1}}
 
-\RequirePackage{amssymb}
-
 \RequirePackage[os=win]{menukeys}
 
 \renewmenumacro{\directory}[/]{hyphenatepaths}
diff --git a/packages/Graphics.sty b/packages/Graphics.sty
index 670b243..3ed412e 100644
--- a/packages/Graphics.sty
+++ b/packages/Graphics.sty
@@ -44,28 +44,40 @@
 	\includegraphics[keepaspectratio,#1]{#2}%
 }
 
+\NewDocumentCommand{\@wrapfigbody}{m m m m}{
+	\captionsetup{type=figure}%
+	\capstart%
+	\includegraphics[%
+		keepaspectratio,%
+		#2%
+	]{#1}%
+	\Centering\captionof{figure}{#4}%
+	\label{fig:#3}%
+}
+
 \NewDocumentCommand{\wrapfig}{
-	% alignment [l,r,i,o]
+	% #1: alignment [l,r,i,o]
 	O{O}
-	% horizontal_offset
+	% #2: horizontal_offset
 	O{\marparwidth}
-	% graphic_file
+	% #3: graphic_file
 	m
-	% (width|height)=lengthvalue
+	% #4: (width|height)=lengthvalue
 	O{}
-	% label
+	% #5: label
 	>{\TrimSpaces}m
-	% caption
+	% #6: caption
 	m%
+	% #7: indented lines override
+	o
 }{%
-	\begin{wrapfigure}{#1}[#2]%
-		\captionsetup{type=figure}%
-		\capstart%
-		\includegraphics[%
-			keepaspectratio,%
-			#4%
-		]{#3}%
-		\Centering\captionof{figure}{#6}%
-		\label{fig:#5}%
-	\end{wrapfigure}%
+	\IfNoValueTF{#7}{%
+		\begin{wrapfigure}{#1}[#2]%
+			\@wrapfigbody{#3}{#4}{#5}{#6}%
+		\end{wrapfigure}%
+	}{%
+		\begin{wrapfigure}[#7]{#1}[#2]%
+			\@wrapfigbody{#3}{#4}{#5}{#6}%
+		\end{wrapfigure}%
+	}%
 }
\ No newline at end of file