Images and twbs 3.0 fixes