Partial state
Fix HighlightPreferences panel; optimize