Merge "Bugfix: remove vivid as it is EOL"