Refactored theme and background settings for 3.5