Add mirrors, update selectors