Reworked theme settings to be more intuitive