Fixing theme references