Fixes and color settings updated