Armor texture fixes

Please report back if I fixed them or fucked them up even more...
Hopefully the first!