Lots of stuff.

packages/Marginalia.sty

@@ -61,26 +61,40 @@
 	}%
 }
 
-\NewDocumentCommand{\MarginFig}{
-	% #1: Graphic file name.
-	m
-	% #2: Options passed to \includegraphics.
+% Wrapper for \marginalia with some improvements.
+\NewDocumentCommand{\Marginalia}{
+	% #1: Options passed to \marginalia.
 	O{}
-	% #3: Label.
-	>{\TrimSpaces}m
-	% #4: Caption.
+	% #2: Contents.
 	+m
 }{
-	% This mbox ensures that the margin figure is counted as part of the
+	% This mbox ensures that the margin paragraph is counted as part of the
 	% following paragraph and is vertically aligned with it.
 	\mbox{
-		\marginalia{
+		\marginalia[#1]{
 			\MarginHyperSetup
-			\begin{MyCaption}[
-				format={\RaggedOutside\small\color{captionColor}}
-			]{fig:#3}{#4}
-				\Centering\includegraphics[keepaspectratio,#2]{#1}
-			\end{MyCaption}
+			#2
 		}
 	}
+}
+
+\NewDocumentCommand{\MarginFig}{
+	% #1: Options passed to \marginalia via \Marginalia.
+	O{}
+	% #2: Graphic file name.
+	m
+	% #3: Options passed to \includegraphics.
+	O{}
+	% #4: Label.
+	>{\TrimSpaces}m
+	% #5: Caption.
+	>{\TrimSpaces}+m
+}{
+	\Marginalia{
+		\begin{MyCaption}[
+			format={\RaggedOutside\small\color{captionColor}}
+		]{fig:#4}{#5}
+			\Centering\includegraphics[keepaspectratio,#3]{#2}
+		\end{MyCaption}
+	}
 }