Add new files, add new styles
Merge branch 'updates'