Collector theme updates. #3322