Update with latest theme dev work.