adjusted shader colors
Merge branch 'colors'
restored alpha-discarding