- Change underscores in file names to hyphens.

- Make color names clearer.
- Clean up commonincludes.

packages/Marginalia.sty

@@ -17,15 +17,15 @@
 		- \textheight
 	},
 	yshift	= {7pt},	% Just a magic number that lines up margin notes with their reference.
-	style~recto~outer = {\RaggedRight\small\color{marginText}},
-	style~verso~outer = {\RaggedLeft\small\color{marginText}},
+	style~recto~outer = {\RaggedRight\small\color{marginTextColor}},
+	style~verso~outer = {\RaggedLeft\small\color{marginTextColor}},
 }
 
 \NewDocumentCommand{\MarginHyperSetup}{}{
 	\ifthenelse{\boolean{isElectronic}}{
-		\hypersetup{allcolors = link}
+		\hypersetup{allcolors = linkColor}
 	}{
-		\hypersetup{allcolors = marginText}
+		\hypersetup{allcolors = marginTextColor}
 	}
 }
 
@@ -77,7 +77,7 @@
 		\marginalia{
 			\MarginHyperSetup
 			\begin{MyCaption}[
-				format={\RaggedOutside\small\color{caption}}
+				format={\RaggedOutside\small\color{captionColor}}
 			]{fig:#3}{#4}
 				\Centering\includegraphics[keepaspectratio,#1]{#2}
 			\end{MyCaption}