Fix regression in alpha blending code
Tweak water
Fix two GUI crashes and threading-selection error
Style conformance and fix csproj to not reference deleted FastPaletteEntry file