diff --git a/packages/Color.sty b/packages/Color.sty
index 8866f98..536202f 100644
--- a/packages/Color.sty
+++ b/packages/Color.sty
@@ -41,16 +41,12 @@
 \colorlet{boxedcoloroutline}{black}
 
 \NewDocumentCommand{\boxedcolor}{O{\rule{0pt}{1ex}\rule{1ex}{0pt}} m m}{%
-	\providelength[\fboxsep]{\fboxsepdefault}%
-	\providelength[\fboxrule]{\fboxruledefault}%
-	%
-	\setlength{\fboxsep}{1pt}%
-	\setlength{\fboxrule}{0.2pt}%
-	%
-	\fcolorbox{boxedcoloroutline}{#2}{\color{#3}\strut{}#1}%
-	%
-	\setlength{\fboxsep}{\fboxsepdefault}%
-	\setlength{\fboxrule}{\fboxruledefault}%
+	{ % Temporarily set fboxrule and fboxsep.
+		\setlength{\fboxrule}{0.2pt}%
+		\setlength{\fboxsep}{1pt}%
+		%
+		\fcolorbox{boxedcoloroutline}{#2}{\color{#3}\strut{}#1}%
+	}%
 }
 
 \providelength[12.3599pt]{\warningboxsizeoffset}
diff --git a/packages/Layout.sty b/packages/Layout.sty
index 0564427..ef16626 100644
--- a/packages/Layout.sty
+++ b/packages/Layout.sty
@@ -5,7 +5,7 @@
 \let\CheckCommand\providecommand
 % Suppress "Underfull \hbox" infos.
 \hbadness=10000
-% Suppress small overfill infos.
+% Suppress small overfull infos.
 \hfuzz = 6.0pt
 \vfuzz = 0.0pt
 
@@ -86,28 +86,27 @@
 \newlength{\bigfloatoverhang}
 \setlength{\bigfloatoverhang}{0.81in}
 
-\NewDocumentCommand{\bigfloat}{O{\bigfloatoverhang} m m +m}{%
+\providecommand{\adjwidthtype}{}
+
+\NewDocumentCommand{\bigfloat}{
+	O{\bigfloatoverhang} m m +m O{\bigfloatoffset}
+}{%
+	\ifthenelse{\boolean{isElectronic}}{%
+		\bfloat{#1}{#2}{#3}{#4}{#5}{adjustwidth}%
+	}{%
+		\bfloat{#1}{#2}{#3}{#4}{#5}{adjustwidth*}%
+	}%
+}
+
+\NewDocumentCommand{\bfloat}{m m m +m m m}{
 	\begin{#2}[#3]%
-		\ifthenelse{\boolean{isElectronic}}{%
-			% adjustwidth adjusts all pages the same.
-			\begin{adjustwidth}{-#1+\bigfloatoffset}{-#1-\bigfloatoffset}%
-				\begin{minipage}{#1 * 2 + \textwidth}%
-					\ifthenelse{\boolean{isDraft}}{%
-						\rule{\textwidth}{1pt}\zws%
-					}{}%
-					#4%
-				\end{minipage}%
-			\end{adjustwidth}%
-		}{%
-			% adjustwidth* accounts for twosided document.
-			\begin{adjustwidth*}{-#1+\bigfloatoffset}{-#1-\bigfloatoffset}%
-				\begin{minipage}{#1 * 2 + \textwidth}%
-					\ifthenelse{\boolean{isDraft}}{%
-						\rule{\textwidth}{1pt}\zws%
-					}{}%
-					#4%
-				\end{minipage}%
-			\end{adjustwidth*}%
-		}%
+		\begin{#6}{-#1+#5}{-#1-#5}%
+			\begin{minipage}{#1 * 2 + \textwidth}%
+				\ifthenelse{\boolean{isDraft}}{%
+					\rule{\textwidth}{1pt}\zws%
+				}{}%
+				#4%
+			\end{minipage}%
+		\end{#6}%
 	\end{#2}%
 }
\ No newline at end of file
diff --git a/packages/Tables.sty b/packages/Tables.sty
index 0e8b351..adfe800 100644
--- a/packages/Tables.sty
+++ b/packages/Tables.sty
@@ -4,20 +4,30 @@
 % Table formatting.
 \RequirePackage{tabularray}
 
-% Enable putting a list in a tabularray
-%\UseTblrLibrary{varwidth}
+\UseTblrLibrary{siunitx}
 
-\renewcommand{\TblrOverlap}[1]{#1}
+\SetTblrInner{
+	rowhead		= 1,
+	row{1}		= {font=\bfseries},
+	hline{1,Z}	= {0.6pt},
+	hline{2}	= {0.4pt},
+}
 
-% \DeclareTblrTemplate{note-tag}{default}{
-% 	\textsuperscript{\textrm{\InsertTblrNoteTag}}
-% }
-%\DeclareTblrTemplate{note-sep}{default}{\space}
+%\renewcommand{\TblrOverlap}[1]{#1}
 
 \DeclareTblrTemplate{remark-tag}{default}{
 	\strong{\InsertTblrRemarkTag}
 }
 
+\NewTblrEnviron{tblrBanded}
+\SetTblrInner[tblrBanded]{
+	rowhead		= 1,
+	row{odd}	= {paleGray},
+	row{1}		= {bg=pageColor, font=\bfseries},
+	hline{1,Z}	= {0.6pt},
+	hline{2}	= {0.4pt},
+}
+
 \NewTblrEnviron{tblrBoxout}
 \SetTblrInner[tblrBoxout]{
 	colspec 	= {Q[c,h]X[1,m]},
@@ -29,18 +39,6 @@
 	columns		= {PrimePaleBlue},
 }
 
-\NewTblrEnviron{tblrBanded}
-\SetTblrOuter[tblrBanded]{
-	tall,
-}
-\SetTblrInner[tblrBanded]{
-	rowhead		= 1,
-	row{odd}	= {paleGray},
-	row{1}		= {bg=pageColor, font=\bfseries},
-	hline{1,Z}	= {0.6pt},
-	hline{2}	= {0.4pt},
-}
-
 \NewTblrTableCommand{\midtitle}[1][pageColor]{
 	\SetCell[c=2]{
 		c,