Theme change bug fixes