- Improve wrap objects.

- Debug.

commonincludes.def

@@ -1,5 +1,10 @@
 \ProvidesFile{commonincludes.def}[2025-09-02 v1.0]
 
+% Load graphicx first because the menukeys package (in Fonts.sty) causes a conflict.
+% Graphics package for including images
+\RequirePackage[final]{graphicx}
+\RequirePackage{graphbox}
+
 % A lot of other packages require Layout, so load it first.
 \RequirePackage{PrimeTeX/packages/Layout}
 
@@ -9,16 +14,10 @@
 
 \RequirePackage{PrimeTeX/packages/Color}
 
-%\RequirePackage{PrimeTeX/packages/CrossRef}
-
 \RequirePackage{PrimeTeX/packages/DocProperties}
 
 \RequirePackage{PrimeTeX/packages/Floats}
 
-% Load graphicx before Fonts because the menukeys package causes a conflict.
-% Graphics package for including images
-\RequirePackage[final]{graphicx}
-
 \RequirePackage{PrimeTeX/packages/Fonts}
 
 \RequirePackage{PrimeTeX/packages/Glossary}