Make armor_types a hiddin field
Render armor types better
Merged character files back