Added option to properly apply a theme