Removed unused namespaces
Added more colours to default