Continue placing and updating styles.
Merge branch 'source'

Conflicts:
	.idea/workspace.xml