Theme module upgrade and bug fixes