Last style changes for v1!