This is a backport of the useful stuff in !82 (closed). At least testing the Flatpak build it looks the same.