diff --git a/commonincludes.def b/commonincludes.def
index a8407e3..8470a57 100644
--- a/commonincludes.def
+++ b/commonincludes.def
@@ -12,6 +12,10 @@
 
 \RequirePackage{PrimeTeX/packages/DocProperties}
 
+% Load graphicx before Fonts because the menukeys packages causes a conflict.
+% Graphics package for including images
+\RequirePackage[final]{graphicx}
+
 \RequirePackage{PrimeTeX/packages/Fonts}
 
 \RequirePackage{PrimeTeX/packages/Glossary}
diff --git a/packages/Fonts.sty b/packages/Fonts.sty
index 944b7f5..6dde8d9 100644
--- a/packages/Fonts.sty
+++ b/packages/Fonts.sty
@@ -56,5 +56,6 @@
 
 \NewDocumentCommand{\objref}{m}{{\sans{\strong{#1}}}}
 
+\RequirePackage{amssymb}
 
-\RequirePackage{amssymb}
\ No newline at end of file
+\RequirePackage[os=win]{menukeys}
\ No newline at end of file
diff --git a/packages/Graphics.sty b/packages/Graphics.sty
index 5d756d7..8dec90c 100644
--- a/packages/Graphics.sty
+++ b/packages/Graphics.sty
@@ -3,17 +3,16 @@
 
 \RequirePackage{PrimeTeX/packages/Layout}
 
-% Graphics package for including images
-\RequirePackage[final]{graphicx}
-
 \RequirePackage{calc}
 
 \RequirePackage{wrapfig2}
 
-\NewDocumentCommand{\iconsize}{}{0.25in}
+\providelength[0.25in]{\iconsize}
+\providelength[10pt]{\igh} % igh = Inline Graphics Height.
 
-\NewDocumentCommand{\ig}{O{width=0.5in} m}{
-	\includegraphics[keepaspectratio,#1]{#2}
+% Shorthand command for \includegraphics.
+\NewDocumentCommand{\ig}{O{width=0.5in} m}{%
+	\includegraphics[keepaspectratio,#1]{#2}%
 }
 
 \NewDocumentCommand{\centerfig}{O{} m >{\TrimSpaces}m m}{