Initial pump support

Started adding ThemePrefs, too, to replace the archaic UserPrefs this
thing still uses.