Restructured theme settings