Theme bug fixes