Reworked Preferences

Reworked Preferences