Fixed completion and changed colors