More general restyling and repairing