Adjust base.hair to new modules