diff --git a/Fonts.sty b/Fonts.sty
index aa713a6..ceacd0f 100644
--- a/Fonts.sty
+++ b/Fonts.sty
@@ -46,9 +46,9 @@
 	]
 %#endregion
 
-\newcommand{\objref}[1]{{\textbf{#1}}}
-%\textsf
 \newcommand{\serif}[1]{\textrm{#1}}
-%\newcommand{\sans}[1]{\textsf{#1}}
+\newcommand{\sans}[1]{\textsf{#1}}
 \newcommand{\mono}[1]{\texttt{#1}}
-\newcommand{\slab}[1]{{\sbfamily{}#1}}
\ No newline at end of file
+\newcommand{\slab}[1]{{\sbfamily{}#1}}
+
+\newcommand{\objref}[1]{{\sans{\strong{#1}}}}
\ No newline at end of file
diff --git a/Graphics.sty b/Graphics.sty
index 9ee34db..0f767d3 100644
--- a/Graphics.sty
+++ b/Graphics.sty
@@ -14,6 +14,8 @@
 
 \RequirePackage{calc}
 
+\RequirePackage{wrapfig2}
+
 \newcommand{\iconsize}{0.25in}
 
 \newcommand{\ig}[2][0.5in]{
@@ -56,10 +58,11 @@
 }
 
 \newcommand{\wrapfig}[6][0in]{%
-	\begin{wrapfigure}{#3}[#1]{#4}%
+	\begin{wrapfigure}{#3}[#1]%{#4}%
+		\captionsetup{type=figure}%
 		\includegraphics[%
 			keepaspectratio,%
-			width	= #4,%
+			#4%
 		]{#2}%
 		\centering\caption{#6}%
 		\label{fig:#5}%
diff --git a/Layout.sty b/Layout.sty
index bd9876b..1e04a99 100644
--- a/Layout.sty
+++ b/Layout.sty
@@ -27,43 +27,7 @@
 % \RequirePackage{PrimeTeX/Tables}
 
 \newlength{\contentwidth}
-\setlength{\contentwidth}{\textwidth+\marginparsep+\marginparwidth}
-
-\newlength{\bigfloatoffset}
-\setlength{\bigfloatoffset}{0.25in}
-
-% Maximum width adjustment to fit 2 16x9 screensots on one page.
-\newlength{\bigfloatoverhang}
-\setlength{\bigfloatoverhang}{0.81in}
-
-\newcommand{\bigfloat}[4][\bigfloatoverhang]{%
-	\begin{#2}[#3]%
-		\begin{adjustwidth*}{-#1+\bigfloatoffset}{-#1-\bigfloatoffset}%
-			\begin{minipage}{#1 * 2 + \textwidth}%
-				#4%
-			\end{minipage}%
-		\end{adjustwidth*}%
-	\end{#2}%
-}
-
-\RequirePackage{wrapfig}
-
-\newcommand{\boxout}[4][\bigfloatoverhang]{%
-	\bigfloat[#1]{figure}{#2}{%
-		\fcolorbox{PrimeBlue}{PrimePaleBlue}{%
-			\begin{minipage}{\textwidth}%
-				\vspace{1em}%
-				{\centering\textbf{#3}%
-					\begin{minipage}{-2em + \textwidth}%
-						\medskip%	
-						#4%
-					\end{minipage}
-				\par}%
-				\vspace{1em}%
-			\end{minipage}%
-		}%
-	}%
-}
+\setlength{\contentwidth}{\textwidth + \marginparsep + \marginparwidth}
 
 % Header & Footer Options
 %#region
@@ -88,4 +52,40 @@
 %   Parameters for FLOAT pages (not text pages):
 \renewcommand{\floatpagefraction}{0.7}	% require fuller float pages
 % N.B.: floatpagefraction MUST be less than topfraction !!
-\renewcommand{\dblfloatpagefraction}{0.7}	% require fuller float pages
\ No newline at end of file
+\renewcommand{\dblfloatpagefraction}{0.7}	% require fuller float pages
+
+\newlength{\bigfloatoffset}
+\setlength{\bigfloatoffset}{0.25in}
+
+% Maximum width adjustment to fit 2 16x9 screensots on one page.
+\newlength{\bigfloatoverhang}
+\setlength{\bigfloatoverhang}{0.81in}
+
+\newcommand{\bigfloat}[4][\bigfloatoverhang]{%
+	\begin{#2}[#3]%
+		\begin{adjustwidth*}{-#1+\bigfloatoffset}{-#1-\bigfloatoffset}%
+			\begin{minipage}{#1 * 2 + \textwidth}%
+				#4%
+			\end{minipage}%
+		\end{adjustwidth*}%
+	\end{#2}%
+}
+
+\newcommand{\boxout}[4][\bigfloatoverhang]{%
+	\bigfloat[#1]{figure}{#2}{%
+		\fcolorbox{PrimeBlue}{PrimePaleBlue}{%
+			\begin{minipage}{\textwidth}%
+				\vspace{1em}%
+				{\centering\textbf{#3}\medskip
+					\begin{minipage}{-2em + \textwidth}%
+						%\renewcommand{\thempfootnote}{\fnsymbol{mpfootnote}}
+						\setlength{\parskip}{\medskipamount}
+						\medskip%
+						#4%
+					\end{minipage}
+				\par}%
+				\vspace{1em}%
+			\end{minipage}%
+		}%
+	}%
+}
\ No newline at end of file
diff --git a/MarginNotes.sty b/MarginNotes.sty
index 0e81d0e..34d5651 100644
--- a/MarginNotes.sty
+++ b/MarginNotes.sty
@@ -47,13 +47,13 @@
 			\ifthenelse{\boolean{oddpage}}{%
 				\captionsetup{%
 					type	= figure,%
-					font	= {color=marginTextColor},%
+					font	= {small,color=marginTextColor},%
 					justification = centering,%raggedright,%
 				}%
 			}{%
 				\captionsetup{%
 					type	= figure,%
-					font	= {color=marginTextColor},%
+					font	= {small,color=marginTextColor},%
 					justification = centering,%raggedleft,%
 				}%
 			}%
diff --git a/Tables.sty b/Tables.sty
index 7e0e090..8d0f5d9 100644
--- a/Tables.sty
+++ b/Tables.sty
@@ -4,6 +4,8 @@
 % Table formatting.
 \RequirePackage{tabularray}
 
+\DeclareTblrTemplate{note-tag}{default}{\textsuperscript{\textit{\InsertTblrNoteTag}}}
+
 \NewTblrEnviron{tblrBoxout}
 \SetTblrInner[tblrBoxout]{
 	colspec 	= {Q[c,h]X[1,m]},
diff --git a/Titles.sty b/Titles.sty
index 853af05..0f71d0b 100644
--- a/Titles.sty
+++ b/Titles.sty
@@ -10,7 +10,7 @@
 }{20pt}{\Huge}
 
 \titleformat{\chapter}[display]{
-	\normalfont\sbfamily\huge
+	\normalfont\sbfamily\huge\raggedright
 }{
 	\chaptertitlename{} \thechapter
 }{20pt}{\Huge}