Fixed the extra color showing
Merge remote-tracking branch 'origin/dev' into dev