Refactored with CustomThemeFilter.