Updated changes for theme system