added on the fly theme changing