Fixed a bug with themes