Improve settings
Make menu more themeable