Clean up controls/add colors