- Removed colour wheel work
- Rearranging stuff and renamed things