Dyes- not all, and not final

Also added gunpowder, I had missed it before