Update theme layout to be less complex and rebuild
Cleanup image usage in gallery
Manual merge with upstream
Manual merge