Move faces out of custom and into theme.