New colors and warp parameter

Also some various bug fixes.