Bugfix Theme changes