Updated epe_ev and epe_theme