Add support for desktop. Remove vendors