moved theme selection to class
updated default demo with theme class