Preferences and Properties

Changed Preferences and Properties Helper classes. Easier to use and to
save.