Merge django theme fixes