Merged TrunkRings and Tree, disabled lights for now