Merge styles branch
Finish styles
Fix conflicts with styles merge
Update schema