- Debugging.

- Move all \RequirePackages to commonincludes.def.

packages/Floats.sty

@@ -4,10 +4,6 @@
 	Custom Float Environments.
 }
 
-\RequirePackage{PrimeTeX/packages/Layout}
-
-\RequirePackage{float}
-
 \floatstyle{plain}
 \newfloat{generic}{htpb}{lgf}
 \floatplacement{figure}{htpb}
@@ -119,25 +115,25 @@
 }
 
 \NewDocumentCommand{\CenterFig}{
-	% Key-value options passed to \includegraphics.
-	O{}
 	% Key-value options.
 	O{}
 	% Graphic file.
 	m
+	% Key-value options passed to \includegraphics.
+	O{}
 	% Label.
 	>{\TrimSpaces}m
 	% Caption.
 	m
 }{ \group_begin:
-	\keys_set:nn{CenterFig}{#2}
+	\keys_set:nn{CenterFig}{#1}
 	\clist_use_default:Nnnn \l_CenterFig_placement_str
 		{\l_Float_placement_clist}
 		{\c_Float_placement_clist}
 	\expanded{\noexpand\begin{figure}[\l_CenterFig_placement_str]}
 		\begin{MyCaption}{fig:#4}{#5}
 			\Centering
-			\includegraphics[keepaspectratio,#1]{#3}
+			\includegraphics[keepaspectratio,#3]{#2}
 		\end{MyCaption}
 	\end{figure}
 \group_end: }