Fix theme fallback not working