Initial colour and input refactoring