Fix quoting issue in theme. Other small tweaks.