Replace theme-specific modal reference to generic calls