Added handling of the "theme" settings