Restyling and supporting more forks