#463356 | applying patches to provide theme functions for popups.