Ensure correct fading behaviour when switching between light and dark themes