tone down colors, move wrap routine