after rebasing styles