Updated styles
Merge remote-tracking branch 'origin/aesthetics' into sal2

Conflicts:
	.gitignore