Revert "Change default theming to Unity + Xcode"

This reverts commit af71f1648a2f06507d7562b1448134983d1ffb7b.
Merge branch 'master' into laptop