Improved theme compatibility