Fix issues with theme
Fix theme crashes