Switch to flat by default
3.1.1