diff --git a/PrimeManual.sty b/PrimeManual.sty
index 8696bb4..01f2a57 100644
--- a/PrimeManual.sty
+++ b/PrimeManual.sty
@@ -75,7 +75,7 @@
 
 % Color import and definition
 %#region
-	\RequirePackage{xcolor}
+	\RequirePackage[RGB]{xcolor}
 	\definecolor{PrimeBlue}{RGB}{25,45,145}
 %#endregion
 
@@ -85,10 +85,12 @@
 	\hypersetup{colorlinks=true, allcolors=PrimeBlue}
 %#endregion
 
-% Graphics package for including images
+% Graphics packages for including images
 %#region
 	\RequirePackage{graphicx}
 	\RequirePackage{calc}
+	
+	\newcommand{\ig}[2][0.5in]{\includegraphics[keepaspectratio,width=#1]{graphics/#2}}
 %#endregion
 
 % Define custom title page.
@@ -109,11 +111,11 @@
 					% Move the rule graphic to 0.25 in from the left edge of the 
 					% paper and vertically centered on the heartbeat graphic.
 					\put(-\oddsidemargin-0.75in,10pt){
-						\includegraphics{graphics/prime_rule.pdf}
+						\includegraphics{graphics/title/prime_rule.pdf}
 					}
 					% The numbers here are just what looks good.
 					\put(100pt,0pt){
-						\includegraphics{graphics/prime_heartbeat.pdf}
+						\includegraphics{graphics/title/prime_heartbeat.pdf}
 					}
 				}
 				
@@ -137,13 +139,8 @@
 
 % Table formatting.
 %#region
-	\renewcommand{\arraystretch}{1.5}
-	\RequirePackage{csvsimple}
-	\RequirePackage{longtable}
-	\RequirePackage{colortbl}
-	\RequirePackage{booktabs}
-
-	\newcommand{\bandedrows}{\rowcolors{2}{white}{gray!10}}
+	\RequirePackage{tabularray}
+	\RequirePackage{csvsimple-l3}
 %#endregion
 
 % Glossary formatting.
@@ -218,4 +215,7 @@
 	\newcommand{\lblTable}[2][]{
 		\textbf{\lblGeneral[#1]{#2}{\caption}{tbl}}
 	}
+	\newcommand{\lblFigure}[2][]{
+		\textbf{\lblGeneral[#1]{#2}{\caption}{fig}}
+	}
 %#endregion
\ No newline at end of file