Update build configuration
Improve demo project theme chooser and code styles