Theme tweaks and additions to demo