Upgrade Theme model and view