Update theme, merged 1-3-4 with master.