Fix crash from nil content
Update themes