moved theme selection to class
updated demo to set theme via class
updated default demo with theme class