Update from upstream
Update theme setup