Further fixing color changes, fixed #5.