Fix issue with colours in screen
more todo