Palette swaps now based on textures rather than hard-coded values
Merge remote-tracking branch 'origin/master'