Removed bugs, introduced colors