Add fountain trims and missing headers.