Add more styles, rename files