Added partial support for latest homedecor