Update ThemeEventHandlers.php, ThemeFinder.php, ThemePresenter.php and theme.php