Upgradle and buildscript overhaul. Also remove thumbs