Aside navigation styles from template
Merge remote-tracking branch 'origin/master'