Add settings for theme (on/off + 2 colors)
Fix theme colors
Theme fixes for system colors