This merge request is not tested due to me being unable to build discover. ("screenshot" made in gimp)