Fixes commit e72ef92 and ea661a1 + fixes colour issue