UPDATE: Bug fix + base colour implementation