Pulled in upstream theme changes.

Also making sublists in sidebar nested.