Cleaning up overridetheme and php errors