add node ref and theme tweaks