Ensure theme API returns consistent results