Tiding up styles and folders