Re-colored everywhing. Some changes.