Real Clean up, change Colors, complete Legend