New file and style tweaks