Transparency changes

Merging the 0.6.0 transparency changes into sofo-master