Improving layout of ThemeViewController and resetting/saving theme when necessary.