Fixed the broken colours and stuff