Merge branch 'newstyles' into userguide