misc Metrics cleanup
replace UserPrefs system with ThemePrefs