Added dyeable flag to arms and shields

Also corrected an issue with shield import field order