Overhaul to address #473 and #369

Moved much of the wargear over to shared entries, reducing the filesize
by almost 1/5th.