Conflicts: modules/themeroller/controllers/admin_themeroller.php modules/themeroller/helpers/themeroller_event.php modules/themeroller/views/site_screen.css.php