Merge in NametagEdit; I need more control!