- Replace MarginNote package with Marginalia.

- Miscellaneous cleanup.

Layout.sty

@@ -22,20 +22,18 @@
 
 \RequirePackage{calc}
 \RequirePackage[strict]{changepage}
-% \RequirePackage{caption}
-% \RequirePackage{graphicx}
-% \RequirePackage{PrimeTeX/Tables}
 
 \newlength{\contentwidth}
 \setlength{\contentwidth}{\textwidth + \marginparsep + \marginparwidth}
 
 % Header & Footer Options
-	\pagestyle{plain}
+\pagestyle{plain}
 
 % Paragraph formatting.
-	\setlength{\parindent}{0pt}
-	\setlength{\parskip}{2ex plus 0.5ex minus 0.5ex}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{2ex plus 0.5ex minus 0.5ex}
 
+% Float Page Configuration
 \renewcommand{\topfraction}{0.9}	% max fraction of floats at top
 \renewcommand{\bottomfraction}{0.8}	% max fraction of floats at bottom
 %   Parameters for TEXT pages (not float pages):
@@ -50,6 +48,11 @@
 % N.B.: floatpagefraction MUST be less than topfraction !!
 \renewcommand{\dblfloatpagefraction}{0.7}	% require fuller float pages
 
+% Line-breaking zero-width space
+\newcommand{\zws}{\hspace{0pt}}
+% Line-breaking dot
+\newcommand{\bdot}{.\hspace{0pt}}
+
 \newlength{\bigfloatoffset}
 \setlength{\bigfloatoffset}{0.25in}
 
@@ -73,7 +76,7 @@
 \newcommand{\boxout}[4][\bigfloatoverhang]{%
 	\bigfloat[#1]{figure}{#2}{%
 		\fcolorbox{PrimeBlue}{PrimePaleBlue}{%
-			\begin{minipage}{\textwidth}%
+			\begin{minipage}{\boxoutpadding*-2 + \textwidth}%
 				\vspace{\boxoutpadding}%
 				{\centering%
 					\begin{minipage}{\boxoutpadding*-2 + \textwidth}%