Update ThemeEventHandlers.php and ThemeFinder.php