Additional polishing, some hardcoded styles removal.