Update theme with latest from dev.