Move styles around to increase performance.
Merge branch 'master' into textures

Conflicts:
	uw.mss