Adds several fixes for theming for search