cleaned code and removed color prefs