Updated code base.

picking up client build fix and server theme watch.