Merge "Temporary fix for themes" into oc-dev