diff --git a/PrimeGeometry.tex b/PrimeGeometry.tex
new file mode 100644
index 0000000..a02b0a0
--- /dev/null
+++ b/PrimeGeometry.tex
@@ -0,0 +1,17 @@
+\newgeometry{
+	margin = 1in,
+	% twoside	= true,
+	% inner	= 1in,
+	% top		= 1in,
+	% marginratio = 2:3,
+}
+\savegeometry{smallMargin}
+\newgeometry{
+	margin = 0.25in,
+%	twoside	= true,
+%	inner	= 0.25in,
+%	top		= 0.25in,
+%	marginratio = 2:3,}
+}
+\savegeometry{tinyMargin}
+\restoregeometry
\ No newline at end of file
diff --git a/PrimeManual.sty b/PrimeManual.sty
index 25860d8..f940f63 100644
--- a/PrimeManual.sty
+++ b/PrimeManual.sty
@@ -52,6 +52,9 @@
 	BoldItalicFont	= *-BoldItalic,
 ]
 
+% Page Layout
+\RequirePackage[pass]{geometry}
+
 % Title & Heading Options
 \RequirePackage[sf,raggedright]{titlesec}
 
@@ -59,7 +62,7 @@
 \pagestyle{plain}
 
 % Color import and definition
-\RequirePackage{color}
+\RequirePackage{xcolor}
 \definecolor{PrimeBlue}{RGB}{25,45,145}
 
 % Use Hyperref to automatically create links in the document
@@ -112,9 +115,13 @@
 
 % Table formatting.
 \renewcommand{\arraystretch}{1.5}
+\RequirePackage{csvsimple}
+\RequirePackage{longtable}
+\RequirePackage{colortbl}
+\RequirePackage{booktabs}
 
 % Glossary formatting.
-\RequirePackage[nopostdot,toc]{glossaries}
+\RequirePackage[nopostdot,toc,sort=standard]{glossaries}
 
 % Index formatting.
 \RequirePackage{makeidx}
@@ -135,4 +142,31 @@
 	\marginnote{% Create the margin note.
 		\margintitle{\Glsentryname{#2}:% Create the title of the margin note.
 		} \glsdesc*{#2}}[#1]% Create the text of the margin note.
+}
+
+% Cross references
+\newcommand{\refGeneral}[3][]{
+	\if\relax\detokenize{#1}\relax % Check if #1 is empty string.
+		#3{#2}\label{ch:#2}
+	\else
+		#3{#2}\label{ch:#1}
+	\fi
+}
+\newcommand{\refChapter}[2][]{
+	\refGeneral[#1]{#2}{\chapter}
+}
+\newcommand{\refSection}[2][]{
+	\refGeneral[#1]{#2}{\section}
+}
+\newcommand{\refSubsection}[2][]{
+	\refGeneral[#1]{#2}{\subsection}
+}
+\newcommand{\refSubsubsection}[2][]{
+	\refGeneral[#1]{#2}{\subsubsection}
+}
+\newcommand{\refParagraph}[2][]{
+	\refGeneral[#1]{#2}{\paragraph}
+}
+\newcommand{\refSubparagraph}[2][]{
+	\refGeneral[#1]{#2}{\subparagraph}
 }
\ No newline at end of file