Adjust caption formatting; add wrapfig macro.

Graphics.sty

@@ -5,9 +5,17 @@
 
 % Graphics package for including images
 \RequirePackage{graphicx}
-\RequirePackage[hypcap=true]{caption}
+
+\RequirePackage[
+	hypcap=true,
+	justification = centering,
+]{caption}
+\captionsetup{font = {color=PrimeBlue}}
+
 \RequirePackage{calc}
 
+\newcommand{\iconsize}{0.25in}
+
 \newcommand{\ig}[2][0.5in]{
 	\includegraphics[keepaspectratio,width=#1]{#2}
 }
@@ -24,7 +32,7 @@
 	\end{figure}%
 }
 
-\newcommand{\bigfig}[4][\bigfloatwidth]{%
+\newcommand{\bigfig}[4][\bigfloatoverhang]{%
 	\bigfloat[#1]{figure}{htp}{%
 		\captionsetup{type=figure}%
 		\includegraphics[keepaspectratio,width=\textwidth]{#2}%
@@ -33,7 +41,7 @@
 	}%
 }
 
-\newcommand{\doublebigfig}[7][\bigfloatwidth]{%
+\newcommand{\doublebigfig}[7][\bigfloatoverhang]{%
 	\bigfloat[#1]{figure}{p}{%
 		\captionsetup{type=figure}%
 		\includegraphics[keepaspectratio,width=\textwidth]{#2}%
@@ -46,4 +54,14 @@
 		\label{fig:#6}%
 	}%
 }
-%#endregion
+
+\newcommand{\wrapfig}[6][0in]{%
+	\begin{wrapfigure}{#3}[#1]{#4}%
+		\includegraphics[%
+			keepaspectratio,%
+			width	= #4,%
+		]{#2}%
+		\centering\caption{#6}%
+		\label{fig:#5}%
+	\end{wrapfigure}%
+}