Add pine, remove subsilver, subblack