Fix colour logic