Fixed theme support for popups