Done some testing, here are the fixes.

Also, new neat colors :3