Automate demo themes build system
Tidy up
Implement loading indicator