made additional sections of theming scheme modular