Add switching between shadings
Temporary commit
Fix merge conflicts