added check for colour picker, removed some debug stuff