Redesign the theme, making it a bit more resilient