Deleted some obsolete files
More cleanup
Added colours and stuff from c720