- Change underscores in file names to hyphens.

- Make color names clearer.
- Clean up commonincludes.

commonincludes.def

@@ -35,8 +35,6 @@
 
 \RequirePackage{hyperref}
 
-%\RequirePackage{hypcap}
-
 \RequirePackage{ifthen}
 
 \RequirePackage{lua-widow-control}
@@ -65,8 +63,6 @@
 % Color import and definition
 \RequirePackage{xcolor}
 
-\RequirePackage{xstring}
-
 % A lot of other packages require Layout, so load it first.
 \RequirePackage{PrimeTeX/packages/Layout}