Finishing up backwards compatibility for dye colors.
Resolving minor merge conflict.
Merge pull request #458 from Glitchfinder/master

Adding a bit more in the way of Dye-related backwards compatibility.