Fixes and color change