Enhanced compatibility with more themes