Major update to themes v.1.2.0