Added remaining scaffolds, except obsolete ones and ones from gems