From 153838772cfefe400bcf284aba09b11c9c5c0e03 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sat, 15 Jan 2022 02:55:43 +0000
Subject: [PATCH 01/33] update zbus (#434)

---
 Cargo.lock           | 193 ++++++++++++++++++++++--------
 Cargo.toml           |   5 +-
 build-aux/clippy.sh  |   2 +-
 cargo-sources.json   | 240 ++++++++++++++++++++++++++-----------
 src/app/mod.rs       |   2 +-
 src/dbus/listener.rs | 141 ++++++++++++++++++++++
 src/dbus/mod.rs      | 278 ++++++++++++++-----------------------------
 src/dbus/mpris.rs    | 154 ++++++++++++++----------
 src/dbus/types.rs    | 119 +++++++-----------
 src/meson.build      |   1 +
 10 files changed, 683 insertions(+), 452 deletions(-)
 create mode 100644 src/dbus/listener.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0e839cbd..d2be8efb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,9 +47,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.15"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
@@ -88,11 +88,22 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62"
 
+[[package]]
+name = "async-broadcast"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90622698a1218e0b2fb846c97b5f19a0831f6baddee73d9454156365ccfa473b"
+dependencies = [
+ "easy-parallel",
+ "event-listener",
+ "futures-core",
+]
+
 [[package]]
 name = "async-channel"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9"
+checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -101,16 +112,16 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146"
+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
 dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand",
  "futures-lite",
  "once_cell",
- "vec-arena",
+ "slab",
 ]
 
 [[package]]
@@ -167,6 +178,17 @@ dependencies = [
  "event-listener",
 ]
 
+[[package]]
+name = "async-recursion"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-std"
 version = "1.10.0"
@@ -670,6 +692,12 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "easy-parallel"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946"
+
 [[package]]
 name = "either"
 version = "1.6.1"
@@ -691,7 +719,17 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
 dependencies = [
- "enumflags2_derive",
+ "enumflags2_derive 0.6.4",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a25c90b056b3f84111cf183cbeddef0d3a0bbe9a674f057e1a1533c315f24def"
+dependencies = [
+ "enumflags2_derive 0.7.3",
  "serde",
 ]
 
@@ -706,6 +744,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "144ec79496cbab6f84fa125dc67be9264aef22eb8a28da8454d9c33f15108da4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.8.4"
@@ -1601,9 +1650,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.94"
+version = "0.2.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "libloading"
@@ -1954,9 +2003,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
@@ -2074,9 +2123,9 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.19.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
 dependencies = [
  "bitflags",
  "cc",
@@ -2086,14 +2135,15 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.20.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
 dependencies = [
  "bitflags",
  "cc",
  "cfg-if 1.0.0",
  "libc",
+ "memoffset",
 ]
 
 [[package]]
@@ -2339,6 +2389,16 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "ordered-stream"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1"
+dependencies = [
+ "futures-core",
+ "pin-project-lite 0.2.4",
+]
+
 [[package]]
 name = "pango"
 version = "0.14.0"
@@ -2719,9 +2779,9 @@ checksum = "2b5ceb840e4009da4841ed22a15eb49f64fdd00a2138945c5beacf506b2fb5ed"
 
 [[package]]
 name = "regex"
-version = "1.4.6"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2730,9 +2790,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.22"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -2830,8 +2890,8 @@ dependencies = [
  "sha2",
  "zbus 1.8.0",
  "zbus_macros 1.8.0",
- "zvariant",
- "zvariant_derive",
+ "zvariant 2.10.0",
+ "zvariant_derive 2.10.0",
 ]
 
 [[package]]
@@ -2963,15 +3023,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
-[[package]]
-name = "slotmap"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3003725ae562cf995f3dc82bb99e70926e09000396816765bb6d7adbe740b1"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "sluice"
 version = "0.5.4"
@@ -3048,9 +3099,8 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "zbus 2.0.0-beta.3",
- "zvariant",
- "zvariant_derive",
+ "zbus 2.0.1",
+ "zvariant 3.0.0",
 ]
 
 [[package]]
@@ -3619,7 +3669,7 @@ dependencies = [
  "async-io",
  "byteorder",
  "derivative",
- "enumflags2",
+ "enumflags2 0.6.4",
  "fastrand",
  "futures",
  "nb-connect",
@@ -3630,35 +3680,42 @@ dependencies = [
  "serde",
  "serde_repr",
  "zbus_macros 1.8.0",
- "zvariant",
+ "zvariant 2.10.0",
 ]
 
 [[package]]
 name = "zbus"
-version = "2.0.0-beta.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e1e656194618d167524f97e88ff9bf87f2b1e8bf58f357b2a7abfdff8cc85c9"
+checksum = "2ac8424f5aa1f239d2d7ecb32f9d5ffc6fcf5fb9298d2d524a7e7c8b258c3f80"
 dependencies = [
+ "async-broadcast",
+ "async-channel",
+ "async-executor",
  "async-io",
  "async-lock",
+ "async-recursion",
+ "async-task",
+ "async-trait",
  "byteorder",
  "derivative",
- "enumflags2",
+ "enumflags2 0.7.3",
  "event-listener",
  "futures-core",
  "futures-sink",
  "futures-util",
  "hex",
- "nix 0.19.1",
+ "nix 0.23.1",
  "once_cell",
+ "ordered-stream",
  "rand 0.8.4",
- "scoped-tls",
  "serde",
  "serde_repr",
  "sha1",
- "slotmap",
- "zbus_macros 2.0.0-beta.3",
- "zvariant",
+ "static_assertions",
+ "zbus_macros 2.0.1",
+ "zbus_names",
+ "zvariant 3.0.0",
 ]
 
 [[package]]
@@ -3675,16 +3732,28 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "2.0.0-beta.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcd4cb372bc2cade3f2323e4104112dceb6819f5dd9afa98515b4e821d232932"
+checksum = "3e03af45fc15e2c977161c5ffea56c43c41f425a963affd7074bf91b5bf5a8cf"
 dependencies = [
- "proc-macro-crate 0.1.5",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
+ "regex",
  "syn",
 ]
 
+[[package]]
+name = "zbus_names"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant 3.0.0",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.3.0"
@@ -3713,11 +3782,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525"
 dependencies = [
  "byteorder",
- "enumflags2",
+ "enumflags2 0.6.4",
  "libc",
  "serde",
  "static_assertions",
- "zvariant_derive",
+ "zvariant_derive 2.10.0",
+]
+
+[[package]]
+name = "zvariant"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a946c049b2eac1a253f98e9267a8ce7a3d93be274ea146e6dd7a0965232a911"
+dependencies = [
+ "byteorder",
+ "enumflags2 0.7.3",
+ "libc",
+ "serde",
+ "static_assertions",
+ "zvariant_derive 3.0.0",
 ]
 
 [[package]]
@@ -3731,3 +3814,15 @@ dependencies = [
  "quote",
  "syn",
 ]
+
+[[package]]
+name = "zvariant_derive"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990"
+dependencies = [
+ "proc-macro-crate 1.0.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 4091a5ff..bfefb6fc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -63,9 +63,8 @@ ref_filter_map = "^1.0.1"
 regex = "^1.4.6"
 async-std = "^1.10.0"
 form_urlencoded = "^1.0.1"
-zbus = "^2.0.0-beta.3"
-zvariant = "^2.10.0"
-zvariant_derive = "^2.5.0"
+zbus = "^2.0.1"
+zvariant = "^3.0.0"
 thiserror = "^1.0.30"
 lazy_static = "^1.4.0"
 log = "0.4.14"
diff --git a/build-aux/clippy.sh b/build-aux/clippy.sh
index f60004bf..da649d85 100644
--- a/build-aux/clippy.sh
+++ b/build-aux/clippy.sh
@@ -8,4 +8,4 @@ if [[ $OFFLINE = "true" ]]; then
     export CARGO_HOME="$SRC"/cargo
 fi
 
-cargo clippy --manifest-path "$SRC"/Cargo.toml -- -D warnings -A clippy::module_inception -A clippy::new_without_default
+cargo clippy --manifest-path "$SRC"/Cargo.toml -- -D warnings -A clippy::module_inception -A clippy::new_without_default -A clippy::enum-variant-names
diff --git a/cargo-sources.json b/cargo-sources.json
index 785c60d5..ed2f2a84 100644
--- a/cargo-sources.json
+++ b/cargo-sources.json
@@ -53,15 +53,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.15.crate",
-        "sha256": "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5",
+        "url": "https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.18.crate",
+        "sha256": "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f",
         "dest": "cargo/vendor",
-        "dest-filename": "aho-corasick-0.7.15.crate"
+        "dest-filename": "aho-corasick-0.7.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/aho-corasick-0.7.15",
+        "url": "data:%7B%22package%22%3A%20%221e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/aho-corasick-0.7.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -118,28 +118,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/async-channel/async-channel-1.5.1.crate",
-        "sha256": "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9",
+        "url": "https://static.crates.io/crates/async-broadcast/async-broadcast-0.3.4.crate",
+        "sha256": "90622698a1218e0b2fb846c97b5f19a0831f6baddee73d9454156365ccfa473b",
         "dest": "cargo/vendor",
-        "dest-filename": "async-channel-1.5.1.crate"
+        "dest-filename": "async-broadcast-0.3.4.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2259740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/async-channel-1.5.1",
+        "url": "data:%7B%22package%22%3A%20%2290622698a1218e0b2fb846c97b5f19a0831f6baddee73d9454156365ccfa473b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/async-broadcast-0.3.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/async-executor/async-executor-1.4.0.crate",
-        "sha256": "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146",
+        "url": "https://static.crates.io/crates/async-channel/async-channel-1.6.1.crate",
+        "sha256": "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319",
         "dest": "cargo/vendor",
-        "dest-filename": "async-executor-1.4.0.crate"
+        "dest-filename": "async-channel-1.6.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/async-executor-1.4.0",
+        "url": "data:%7B%22package%22%3A%20%222114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/async-channel-1.6.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/async-executor/async-executor-1.4.1.crate",
+        "sha256": "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965",
+        "dest": "cargo/vendor",
+        "dest-filename": "async-executor-1.4.1.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/async-executor-1.4.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -194,6 +207,19 @@
         "dest": "cargo/vendor/async-mutex-1.4.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/async-recursion/async-recursion-0.3.2.crate",
+        "sha256": "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2",
+        "dest": "cargo/vendor",
+        "dest-filename": "async-recursion-0.3.2.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/async-recursion-0.3.2",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/async-std/async-std-1.10.0.crate",
@@ -857,6 +883,19 @@
         "dest": "cargo/vendor/digest-0.9.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/easy-parallel/easy-parallel-3.2.0.crate",
+        "sha256": "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946",
+        "dest": "cargo/vendor",
+        "dest-filename": "easy-parallel-3.2.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%226907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/easy-parallel-3.2.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/either/either-1.6.1.crate",
@@ -896,6 +935,19 @@
         "dest": "cargo/vendor/enumflags2-0.6.4",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/enumflags2/enumflags2-0.7.3.crate",
+        "sha256": "a25c90b056b3f84111cf183cbeddef0d3a0bbe9a674f057e1a1533c315f24def",
+        "dest": "cargo/vendor",
+        "dest-filename": "enumflags2-0.7.3.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22a25c90b056b3f84111cf183cbeddef0d3a0bbe9a674f057e1a1533c315f24def%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/enumflags2-0.7.3",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/enumflags2_derive/enumflags2_derive-0.6.4.crate",
@@ -909,6 +961,19 @@
         "dest": "cargo/vendor/enumflags2_derive-0.6.4",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/enumflags2_derive/enumflags2_derive-0.7.3.crate",
+        "sha256": "144ec79496cbab6f84fa125dc67be9264aef22eb8a28da8454d9c33f15108da4",
+        "dest": "cargo/vendor",
+        "dest-filename": "enumflags2_derive-0.7.3.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22144ec79496cbab6f84fa125dc67be9264aef22eb8a28da8454d9c33f15108da4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/enumflags2_derive-0.7.3",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/env_logger/env_logger-0.8.4.crate",
@@ -1938,15 +2003,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libc/libc-0.2.94.crate",
-        "sha256": "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e",
+        "url": "https://static.crates.io/crates/libc/libc-0.2.112.crate",
+        "sha256": "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125",
         "dest": "cargo/vendor",
-        "dest-filename": "libc-0.2.94.crate"
+        "dest-filename": "libc-0.2.112.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2218794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libc-0.2.94",
+        "url": "data:%7B%22package%22%3A%20%221b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libc-0.2.112",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2263,15 +2328,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/memchr/memchr-2.3.3.crate",
-        "sha256": "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400",
+        "url": "https://static.crates.io/crates/memchr/memchr-2.4.1.crate",
+        "sha256": "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a",
         "dest": "cargo/vendor",
-        "dest-filename": "memchr-2.3.3.crate"
+        "dest-filename": "memchr-2.4.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%223728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/memchr-2.3.3",
+        "url": "data:%7B%22package%22%3A%20%22308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/memchr-2.4.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2419,28 +2484,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/nix/nix-0.19.1.crate",
-        "sha256": "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2",
+        "url": "https://static.crates.io/crates/nix/nix-0.20.0.crate",
+        "sha256": "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a",
         "dest": "cargo/vendor",
-        "dest-filename": "nix-0.19.1.crate"
+        "dest-filename": "nix-0.20.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/nix-0.19.1",
+        "url": "data:%7B%22package%22%3A%20%22fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/nix-0.20.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/nix/nix-0.20.0.crate",
-        "sha256": "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a",
+        "url": "https://static.crates.io/crates/nix/nix-0.23.1.crate",
+        "sha256": "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6",
         "dest": "cargo/vendor",
-        "dest-filename": "nix-0.20.0.crate"
+        "dest-filename": "nix-0.23.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/nix-0.20.0",
+        "url": "data:%7B%22package%22%3A%20%229f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/nix-0.23.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2755,6 +2820,19 @@
         "dest": "cargo/vendor/openssl-sys-0.9.56",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/ordered-stream/ordered-stream-0.0.1.crate",
+        "sha256": "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1",
+        "dest": "cargo/vendor",
+        "dest-filename": "ordered-stream-0.0.1.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2244630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ordered-stream-0.0.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/pango/pango-0.14.0.crate",
@@ -3290,28 +3368,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/regex/regex-1.4.6.crate",
-        "sha256": "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759",
+        "url": "https://static.crates.io/crates/regex/regex-1.5.4.crate",
+        "sha256": "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461",
         "dest": "cargo/vendor",
-        "dest-filename": "regex-1.4.6.crate"
+        "dest-filename": "regex-1.5.4.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/regex-1.4.6",
+        "url": "data:%7B%22package%22%3A%20%22d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/regex-1.5.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.22.crate",
-        "sha256": "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581",
+        "url": "https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.25.crate",
+        "sha256": "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b",
         "dest": "cargo/vendor",
-        "dest-filename": "regex-syntax-0.6.22.crate"
+        "dest-filename": "regex-syntax-0.6.25.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/regex-syntax-0.6.22",
+        "url": "data:%7B%22package%22%3A%20%22f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/regex-syntax-0.6.25",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3639,19 +3717,6 @@
         "dest": "cargo/vendor/slab-0.4.2",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/slotmap/slotmap-1.0.2.crate",
-        "sha256": "ab3003725ae562cf995f3dc82bb99e70926e09000396816765bb6d7adbe740b1",
-        "dest": "cargo/vendor",
-        "dest-filename": "slotmap-1.0.2.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ab3003725ae562cf995f3dc82bb99e70926e09000396816765bb6d7adbe740b1%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/slotmap-1.0.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/sluice/sluice-0.5.4.crate",
@@ -4525,15 +4590,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zbus/zbus-2.0.0-beta.3.crate",
-        "sha256": "3e1e656194618d167524f97e88ff9bf87f2b1e8bf58f357b2a7abfdff8cc85c9",
+        "url": "https://static.crates.io/crates/zbus/zbus-2.0.1.crate",
+        "sha256": "2ac8424f5aa1f239d2d7ecb32f9d5ffc6fcf5fb9298d2d524a7e7c8b258c3f80",
         "dest": "cargo/vendor",
-        "dest-filename": "zbus-2.0.0-beta.3.crate"
+        "dest-filename": "zbus-2.0.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%223e1e656194618d167524f97e88ff9bf87f2b1e8bf58f357b2a7abfdff8cc85c9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zbus-2.0.0-beta.3",
+        "url": "data:%7B%22package%22%3A%20%222ac8424f5aa1f239d2d7ecb32f9d5ffc6fcf5fb9298d2d524a7e7c8b258c3f80%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zbus-2.0.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4551,15 +4616,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zbus_macros/zbus_macros-2.0.0-beta.3.crate",
-        "sha256": "fcd4cb372bc2cade3f2323e4104112dceb6819f5dd9afa98515b4e821d232932",
+        "url": "https://static.crates.io/crates/zbus_macros/zbus_macros-2.0.1.crate",
+        "sha256": "3e03af45fc15e2c977161c5ffea56c43c41f425a963affd7074bf91b5bf5a8cf",
         "dest": "cargo/vendor",
-        "dest-filename": "zbus_macros-2.0.0-beta.3.crate"
+        "dest-filename": "zbus_macros-2.0.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fcd4cb372bc2cade3f2323e4104112dceb6819f5dd9afa98515b4e821d232932%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zbus_macros-2.0.0-beta.3",
+        "url": "data:%7B%22package%22%3A%20%223e03af45fc15e2c977161c5ffea56c43c41f425a963affd7074bf91b5bf5a8cf%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zbus_macros-2.0.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/zbus_names/zbus_names-2.1.0.crate",
+        "sha256": "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1",
+        "dest": "cargo/vendor",
+        "dest-filename": "zbus_names-2.1.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2245dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zbus_names-2.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4601,6 +4679,19 @@
         "dest": "cargo/vendor/zvariant-2.10.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/zvariant/zvariant-3.0.0.crate",
+        "sha256": "4a946c049b2eac1a253f98e9267a8ce7a3d93be274ea146e6dd7a0965232a911",
+        "dest": "cargo/vendor",
+        "dest-filename": "zvariant-3.0.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%224a946c049b2eac1a253f98e9267a8ce7a3d93be274ea146e6dd7a0965232a911%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zvariant-3.0.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/zvariant_derive/zvariant_derive-2.10.0.crate",
@@ -4614,6 +4705,19 @@
         "dest": "cargo/vendor/zvariant_derive-2.10.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/zvariant_derive/zvariant_derive-3.0.0.crate",
+        "sha256": "28fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990",
+        "dest": "cargo/vendor",
+        "dest-filename": "zvariant_derive-3.0.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2228fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zvariant_derive-3.0.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "shell",
         "dest": "cargo/vendor",
diff --git a/src/app/mod.rs b/src/app/mod.rs
index d635e5c9..af0291a3 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -109,7 +109,7 @@ impl App {
         app_model: Rc<AppModel>,
         sender: UnboundedSender<AppAction>,
     ) -> Box<impl EventListener> {
-        Box::new(crate::dbus::start_dbus_server(app_model, sender).expect("could not start server"))
+        Box::new(crate::dbus::start_dbus_server(app_model, sender))
     }
 
     fn make_window(
diff --git a/src/dbus/listener.rs b/src/dbus/listener.rs
new file mode 100644
index 00000000..bda57021
--- /dev/null
+++ b/src/dbus/listener.rs
@@ -0,0 +1,141 @@
+use futures::channel::mpsc::UnboundedSender;
+use std::rc::Rc;
+
+use crate::app::{
+    components::EventListener,
+    models::SongDescription,
+    state::{PlaybackEvent, RepeatMode},
+    AppEvent, AppModel,
+};
+
+use super::types::{LoopStatus, PlaybackStatus, TrackMetadata};
+
+#[derive(Debug)]
+pub enum MprisStateUpdate {
+    SetVolume(f64),
+    SetCurrentTrack {
+        has_prev: bool,
+        current: Option<TrackMetadata>,
+        has_next: bool,
+    },
+    SetPositionMs(u128),
+    SetLoopStatus {
+        has_prev: bool,
+        loop_status: LoopStatus,
+        has_next: bool,
+    },
+    SetShuffled(bool),
+    SetPlaying(PlaybackStatus),
+}
+
+pub struct AppPlaybackStateListener {
+    app_model: Rc<AppModel>,
+    sender: UnboundedSender<MprisStateUpdate>,
+}
+
+impl AppPlaybackStateListener {
+    pub fn new(app_model: Rc<AppModel>, sender: UnboundedSender<MprisStateUpdate>) -> Self {
+        Self { app_model, sender }
+    }
+
+    fn make_track_meta(&self) -> Option<TrackMetadata> {
+        self.app_model
+            .get_state()
+            .playback
+            .current_song()
+            .cloned()
+            .map(
+                |SongDescription {
+                     id,
+                     title,
+                     artists,
+                     album,
+                     duration,
+                     art,
+                     ..
+                 }| TrackMetadata {
+                    id: format!("/dev/alextren/Spot/Track/{}", id),
+                    length: 1000 * duration as u64,
+                    title,
+                    album: album.name,
+                    artist: artists.into_iter().map(|a| a.name).collect(),
+                    art,
+                },
+            )
+    }
+
+    fn has_prev_next(&self) -> (bool, bool) {
+        let state = self.app_model.get_state();
+        (
+            state.playback.prev_song().is_some(),
+            state.playback.next_song().is_some(),
+        )
+    }
+
+    fn is_shuffled(&self) -> bool {
+        let state = self.app_model.get_state();
+        state.playback.is_shuffled()
+    }
+
+    fn loop_status(&self) -> LoopStatus {
+        let state = self.app_model.get_state();
+        match state.playback.repeat_mode() {
+            RepeatMode::None => LoopStatus::None,
+            RepeatMode::Song => LoopStatus::Track,
+            RepeatMode::Playlist => LoopStatus::Playlist,
+        }
+    }
+
+    fn update_for(&self, event: &PlaybackEvent) -> Option<MprisStateUpdate> {
+        match event {
+            PlaybackEvent::PlaybackPaused => {
+                Some(MprisStateUpdate::SetPlaying(PlaybackStatus::Paused))
+            }
+            PlaybackEvent::PlaybackResumed => {
+                Some(MprisStateUpdate::SetPlaying(PlaybackStatus::Playing))
+            }
+            PlaybackEvent::PlaybackStopped => {
+                Some(MprisStateUpdate::SetPlaying(PlaybackStatus::Stopped))
+            }
+            PlaybackEvent::TrackChanged(_) => {
+                let current = self.make_track_meta();
+                let (has_prev, has_next) = self.has_prev_next();
+                Some(MprisStateUpdate::SetCurrentTrack {
+                    has_prev,
+                    has_next,
+                    current,
+                })
+            }
+            PlaybackEvent::RepeatModeChanged(_) => {
+                let loop_status = self.loop_status();
+                let (has_prev, has_next) = self.has_prev_next();
+                Some(MprisStateUpdate::SetLoopStatus {
+                    has_prev,
+                    has_next,
+                    loop_status,
+                })
+            }
+            PlaybackEvent::ShuffleChanged => {
+                Some(MprisStateUpdate::SetShuffled(self.is_shuffled()))
+            }
+            PlaybackEvent::TrackSeeked(pos) | PlaybackEvent::SeekSynced(pos) => {
+                let pos = 1000 * (*pos as u128);
+                Some(MprisStateUpdate::SetPositionMs(pos))
+            }
+            PlaybackEvent::VolumeSet(vol) => Some(MprisStateUpdate::SetVolume(*vol)),
+            _ => None,
+        }
+    }
+}
+
+impl EventListener for AppPlaybackStateListener {
+    fn on_event(&mut self, event: &AppEvent) {
+        if let AppEvent::PlaybackEvent(event) = event {
+            if let Some(update) = self.update_for(event) {
+                self.sender
+                    .unbounded_send(update)
+                    .expect("Could not send event to DBUS server");
+            }
+        }
+    }
+}
diff --git a/src/dbus/mod.rs b/src/dbus/mod.rs
index b0fc8482..53bd8e17 100644
--- a/src/dbus/mod.rs
+++ b/src/dbus/mod.rs
@@ -1,213 +1,109 @@
-use futures::channel::mpsc::UnboundedSender;
+use futures::channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
+use futures::StreamExt;
 use std::rc::Rc;
 use std::thread;
-use zbus::fdo;
+use zbus::Connection;
 
-use crate::app::components::EventListener;
-use crate::app::state::{PlaybackEvent, RepeatMode};
-use crate::app::{models::SongDescription, AppAction, AppEvent, AppModel};
+use crate::app::{AppAction, AppModel};
 
 mod mpris;
 pub use mpris::*;
 
 mod types;
-use types::*;
 
-// This one wraps a connection and reads the app state
-pub struct AppPlaybackStateListener {
-    object_server: zbus::ObjectServer,
-    app_model: Rc<AppModel>,
-}
-
-impl AppPlaybackStateListener {
-    fn new(
-        connection: zbus::Connection,
-        mpris: SpotMpris,
-        player: SpotMprisPlayer,
-        app_model: Rc<AppModel>,
-    ) -> Result<Self, zbus::Error> {
-        let object_server = register_mpris(&connection, mpris, player)?;
-        Ok(Self {
-            object_server,
-            app_model,
-        })
-    }
-
-    fn with_player<F: Fn(&SpotMprisPlayer) -> zbus::Result<()>>(&self, f: F) -> zbus::Result<()> {
-        self.object_server
-            .with("/org/mpris/MediaPlayer2", |iface: &SpotMprisPlayer| {
-                f(iface)
-            })
-    }
-
-    fn make_track_meta(&self) -> Option<TrackMetadata> {
-        self.app_model
-            .get_state()
-            .playback
-            .current_song()
-            .cloned()
-            .map(
-                |SongDescription {
-                     id,
-                     title,
-                     artists,
-                     album,
-                     duration,
-                     art,
-                     ..
-                 }| TrackMetadata {
-                    id: format!("/dev/alextren/Spot/Track/{}", id),
-                    length: 1000 * duration as u64,
-                    title,
-                    album: album.name,
-                    artist: artists.into_iter().map(|a| a.name).collect(),
-                    art,
-                },
-            )
-    }
-
-    fn has_prev_next(&self) -> (bool, bool) {
-        let state = self.app_model.get_state();
-        (
-            state.playback.prev_song().is_some(),
-            state.playback.next_song().is_some(),
-        )
-    }
-
-    fn is_shuffled(&self) -> bool {
-        let state = self.app_model.get_state();
-        state.playback.is_shuffled()
-    }
-
-    fn loop_status(&self) -> LoopStatus {
-        let state = self.app_model.get_state();
-        match state.playback.repeat_mode() {
-            RepeatMode::None => LoopStatus::None,
-            RepeatMode::Song => LoopStatus::Track,
-            RepeatMode::Playlist => LoopStatus::Playlist,
-        }
-    }
-}
-
-impl EventListener for AppPlaybackStateListener {
-    fn on_event(&mut self, event: &AppEvent) {
-        match event {
-            AppEvent::PlaybackEvent(PlaybackEvent::PlaybackPaused) => {
-                self.with_player(|player| {
-                    player.state.set_playing(PlaybackStatus::Paused);
-                    player.notify_playback_status()?;
-                    Ok(())
-                })
-                .unwrap();
-            }
-            AppEvent::PlaybackEvent(PlaybackEvent::PlaybackResumed) => {
-                self.with_player(|player| {
-                    player.state.set_playing(PlaybackStatus::Playing);
-                    player.notify_playback_status()?;
-                    Ok(())
-                })
-                .unwrap();
-            }
-            AppEvent::PlaybackEvent(PlaybackEvent::PlaybackStopped) => {
-                self.with_player(|player| {
-                    player.state.set_playing(PlaybackStatus::Stopped);
-                    player.notify_playback_status()?;
-                    Ok(())
-                })
-                .unwrap();
-            }
-            AppEvent::PlaybackEvent(PlaybackEvent::TrackChanged(_)) => {
-                self.with_player(|player| {
-                    let meta = self.make_track_meta();
-                    let (has_prev, has_next) = self.has_prev_next();
-                    player.state.set_current_track(meta);
-                    player.state.set_has_prev(has_prev);
-                    player.state.set_has_next(has_next);
-                    player.notify_metadata_and_prev_next()?;
-                    Ok(())
-                })
-                .unwrap();
-            }
-            AppEvent::PlaybackEvent(PlaybackEvent::RepeatModeChanged(_)) => {
-                self.with_player(|player| {
-                    let (has_prev, has_next) = self.has_prev_next();
-                    player.state.set_loop_status(self.loop_status());
-                    player.loop_status_changed()?;
-                    player.state.set_has_prev(has_prev);
-                    player.state.set_has_next(has_next);
-                    player.notify_metadata_and_prev_next()?;
-                    Ok(())
-                })
-                .unwrap();
-            }
-            AppEvent::PlaybackEvent(PlaybackEvent::ShuffleChanged) => {
-                self.with_player(|player| {
-                    player.state.set_shuffled(self.is_shuffled());
-                    player.shuffle_changed()?;
-                    Ok(())
-                })
-                .unwrap();
-            }
-            AppEvent::PlaybackEvent(PlaybackEvent::TrackSeeked(pos))
-            | AppEvent::PlaybackEvent(PlaybackEvent::SeekSynced(pos)) => {
-                self.with_player(|player| {
-                    let pos = 1000 * (*pos as u128);
-                    player.state.set_position(pos);
-                    player.seeked(pos as i64)?;
-                    Ok(())
-                })
-                .unwrap();
-            }
-            AppEvent::PlaybackEvent(PlaybackEvent::VolumeSet(vol)) => {
-                self.with_player(|player| {
-                    player.state.set_volume(*vol);
-                    Ok(())
-                })
-                .unwrap();
-            }
-            _ => {}
-        }
-    }
-}
+mod listener;
+use listener::*;
 
-fn register_mpris(
-    connection: &zbus::Connection,
+#[tokio::main]
+async fn dbus_server(
     mpris: SpotMpris,
     player: SpotMprisPlayer,
-) -> Result<zbus::ObjectServer, zbus::Error> {
-    let mut object_server = zbus::ObjectServer::new(connection);
-    object_server.at("/org/mpris/MediaPlayer2", mpris)?;
-    object_server.at("/org/mpris/MediaPlayer2", player)?;
-    Ok(object_server)
+    receiver: UnboundedReceiver<MprisStateUpdate>,
+) -> zbus::Result<()> {
+    let connection = Connection::session().await?;
+    connection
+        .object_server()
+        .at("/org/mpris/MediaPlayer2", mpris)
+        .await?;
+    connection
+        .object_server()
+        .at("/org/mpris/MediaPlayer2", player)
+        .await?;
+    connection
+        .request_name("org.mpris.MediaPlayer2.Spot")
+        .await?;
+
+    receiver
+        .for_each(|update| async {
+            if let Ok(player_ref) = connection
+                .object_server()
+                .interface::<_, SpotMprisPlayer>("/org/mpris/MediaPlayer2")
+                .await
+            {
+                let mut player = player_ref.get_mut().await;
+                let ctxt = player_ref.signal_context();
+                let res: zbus::Result<()> = match update {
+                    MprisStateUpdate::SetVolume(volume) => {
+                        player.state_mut().set_volume(volume);
+                        player.volume_changed(ctxt).await
+                    }
+                    MprisStateUpdate::SetCurrentTrack {
+                        has_prev,
+                        has_next,
+                        current,
+                    } => {
+                        player.state_mut().set_has_prev(has_prev);
+                        player.state_mut().set_has_next(has_next);
+                        player.state_mut().set_current_track(current);
+                        player
+                            .notify_current_track_changed(ctxt.to_owned())
+                            .await
+                            .map_err(|e| zbus::Error::FDO(Box::new(e)))
+                    }
+                    MprisStateUpdate::SetPositionMs(position) => {
+                        player.state_mut().set_position(position);
+                        Ok(())
+                    }
+                    MprisStateUpdate::SetLoopStatus {
+                        has_prev,
+                        has_next,
+                        loop_status,
+                    } => {
+                        player.state_mut().set_has_prev(has_prev);
+                        player.state_mut().set_has_next(has_next);
+                        player.state_mut().set_loop_status(loop_status);
+                        player
+                            .notify_loop_status(ctxt.to_owned())
+                            .await
+                            .map_err(|e| zbus::Error::FDO(Box::new(e)))
+                    }
+                    MprisStateUpdate::SetShuffled(shuffled) => {
+                        player.state_mut().set_shuffled(shuffled);
+                        player.shuffle_changed(ctxt).await
+                    }
+                    MprisStateUpdate::SetPlaying(status) => {
+                        player.state_mut().set_playing(status);
+                        player.playback_status_changed(ctxt).await
+                    }
+                };
+                res.expect("Signal emission failed");
+            }
+        })
+        .await;
+
+    Ok(())
 }
 
 pub fn start_dbus_server(
     app_model: Rc<AppModel>,
     sender: UnboundedSender<AppAction>,
-) -> Result<AppPlaybackStateListener, zbus::Error> {
-    let state = SharedMprisState::new();
-
-    let connection = zbus::Connection::new_session()?;
-    fdo::DBusProxy::new(&connection)?.request_name(
-        "org.mpris.MediaPlayer2.Spot",
-        fdo::RequestNameFlags::AllowReplacement.into(),
-    )?;
-
+) -> AppPlaybackStateListener {
     let mpris = SpotMpris::new(sender.clone());
-    let player = SpotMprisPlayer::new(state, sender);
+    let player = SpotMprisPlayer::new(sender);
 
-    let mpris_clone = mpris.clone();
-    let player_clone = player.clone();
-    let conn_clone = connection.clone();
+    let (sender, receiver) = unbounded();
 
-    thread::spawn(move || {
-        let mut object_server = register_mpris(&conn_clone, mpris_clone, player_clone).unwrap();
-        loop {
-            if let Err(err) = object_server.try_handle_next() {
-                error!("{}", err);
-            }
-        }
-    });
+    thread::spawn(move || dbus_server(mpris, player, receiver));
 
-    AppPlaybackStateListener::new(connection, mpris, player, app_model)
+    AppPlaybackStateListener::new(app_model, sender)
 }
diff --git a/src/dbus/mpris.rs b/src/dbus/mpris.rs
index c666e553..f709bab7 100644
--- a/src/dbus/mpris.rs
+++ b/src/dbus/mpris.rs
@@ -1,12 +1,13 @@
 #![allow(non_snake_case)]
 #![allow(unused_variables)]
 
+use std::collections::HashMap;
+use std::convert::TryInto;
+
 use futures::channel::mpsc::UnboundedSender;
-use std::convert::{Into, TryInto};
-use zbus::dbus_interface;
 use zbus::fdo::{Error, Result};
-use zbus::ObjectServer;
-use zvariant::ObjectPath;
+use zbus::{dbus_interface, Interface, SignalContext};
+use zvariant::{ObjectPath, Value};
 
 use super::types::*;
 use crate::app::state::RepeatMode;
@@ -71,21 +72,27 @@ impl SpotMpris {
     }
 }
 
-#[derive(Clone)]
 pub struct SpotMprisPlayer {
-    pub state: SharedMprisState,
+    state: MprisState,
     sender: UnboundedSender<AppAction>,
 }
 
 impl SpotMprisPlayer {
-    pub fn new(state: SharedMprisState, sender: UnboundedSender<AppAction>) -> Self {
-        Self { state, sender }
+    pub fn new(sender: UnboundedSender<AppAction>) -> Self {
+        Self {
+            state: MprisState::new(),
+            sender,
+        }
+    }
+
+    pub fn state_mut(&mut self) -> &mut MprisState {
+        &mut self.state
     }
 }
 
 #[dbus_interface(interface = "org.mpris.MediaPlayer2.Player")]
 impl SpotMprisPlayer {
-    pub fn next(&mut self) -> Result<()> {
+    pub fn next(&self) -> Result<()> {
         self.sender
             .unbounded_send(PlaybackAction::Next.into())
             .map_err(|_| Error::Failed("Could not send action".to_string()))
@@ -107,48 +114,62 @@ impl SpotMprisPlayer {
             .map_err(|_| Error::Failed("Could not send action".to_string()))
     }
 
-    pub fn play_pause(&mut self) -> Result<()> {
+    pub fn play_pause(&self) -> Result<()> {
         self.sender
             .unbounded_send(PlaybackAction::TogglePlay.into())
             .map_err(|_| Error::Failed("Could not send action".to_string()))
     }
 
-    pub fn notify_playback_status(&self) -> zbus::Result<()> {
-        let invalidated: Vec<String> = vec![];
-        let mut changed = std::collections::HashMap::new();
-        changed.insert(
-            "PlaybackStatus",
-            zvariant::Value::from(self.playback_status()),
-        );
-        ObjectServer::local_node_emit_signal(
-            None,
-            "org.freedesktop.DBus.Properties",
-            "PropertiesChanged",
-            &("org.mpris.MediaPlayer2.Player", changed, invalidated),
+    pub async fn notify_current_track_changed(
+        &self,
+        #[zbus(signal_context)] ctxt: SignalContext<'_>,
+    ) -> Result<()> {
+        let metadata = Value::from(self.metadata());
+        let can_go_next = Value::from(self.can_go_next());
+        let can_go_previous = Value::from(self.can_go_previous());
+
+        zbus::fdo::Properties::properties_changed(
+            &ctxt,
+            Self::name(),
+            &HashMap::from([
+                ("Metadata", &metadata),
+                ("CanGoNext", &can_go_next),
+                ("CanGoPrevious", &can_go_previous),
+            ]),
+            &[],
         )
-    }
-
-    pub fn notify_metadata_and_prev_next(&self) -> zbus::Result<()> {
-        let invalidated: Vec<String> = vec![];
-        let mut changed = std::collections::HashMap::new();
-        changed.insert("Metadata", zvariant::Value::from(self.metadata()));
-        changed.insert("CanGoNext", zvariant::Value::from(self.can_go_next()));
-        changed.insert(
-            "CanGoPrevious",
-            zvariant::Value::from(self.can_go_previous()),
-        );
-        ObjectServer::local_node_emit_signal(
-            None,
-            "org.freedesktop.DBus.Properties",
-            "PropertiesChanged",
-            &("org.mpris.MediaPlayer2.Player", changed, invalidated),
+        .await?;
+
+        Ok(())
+    }
+
+    pub async fn notify_loop_status(
+        &self,
+        #[zbus(signal_context)] ctxt: SignalContext<'_>,
+    ) -> Result<()> {
+        let loop_status = Value::from(self.loop_status());
+        let can_go_next = Value::from(self.can_go_next());
+        let can_go_previous = Value::from(self.can_go_previous());
+
+        zbus::fdo::Properties::properties_changed(
+            &ctxt,
+            Self::name(),
+            &HashMap::from([
+                ("LoopStatus", &loop_status),
+                ("CanGoNext", &can_go_next),
+                ("CanGoPrevious", &can_go_previous),
+            ]),
+            &[],
         )
+        .await?;
+
+        Ok(())
     }
 
-    fn previous(&mut self) -> Result<()> {
+    pub fn previous(&self) -> Result<()> {
         self.sender
             .unbounded_send(PlaybackAction::Previous.into())
-            .map_err(|_| zbus::fdo::Error::Failed("Could not send action".to_string()))
+            .map_err(|_| Error::Failed("Could not send action".to_string()))
     }
 
     pub fn seek(&self, Offset: i64) -> Result<()> {
@@ -164,7 +185,7 @@ impl SpotMprisPlayer {
 
         let new_pos: u32 = (new_pos)
             .try_into()
-            .map_err(|_| zbus::fdo::Error::Failed("Could not parse position".to_string()))?;
+            .map_err(|_| Error::Failed("Could not parse position".to_string()))?;
 
         // As per spec, if new position is past the length of the song skip to
         // the next song
@@ -175,7 +196,7 @@ impl SpotMprisPlayer {
         } else {
             self.sender
                 .unbounded_send(PlaybackAction::Seek(new_pos).into())
-                .map_err(|_| zbus::fdo::Error::Failed("Could not send action".to_string()))
+                .map_err(|_| Error::Failed("Could not send action".to_string()))
         }
     }
 
@@ -188,9 +209,11 @@ impl SpotMprisPlayer {
             return Ok(());
         }
 
-        let length: i64 = self.metadata().length.try_into().map_err(|_| {
-            zbus::fdo::Error::Failed("Could not cast length (too large)".to_string())
-        })?;
+        let length: i64 = self
+            .metadata()
+            .length
+            .try_into()
+            .map_err(|_| Error::Failed("Could not cast length (too large)".to_string()))?;
 
         if Position > length {
             return Ok(());
@@ -198,11 +221,11 @@ impl SpotMprisPlayer {
 
         let pos: u32 = (Position / 1000)
             .try_into()
-            .map_err(|_| zbus::fdo::Error::Failed("Could not parse position".to_string()))?;
+            .map_err(|_| Error::Failed("Could not parse position".to_string()))?;
 
         self.sender
             .unbounded_send(PlaybackAction::Seek(pos).into())
-            .map_err(|_| zbus::fdo::Error::Failed("Could not send action".to_string()))
+            .map_err(|_| Error::Failed("Could not send action".to_string()))
     }
 
     pub fn stop(&self) -> Result<()> {
@@ -210,8 +233,7 @@ impl SpotMprisPlayer {
     }
 
     #[dbus_interface(signal)]
-    #[rustfmt::skip]
-    pub fn seeked(&self, Position: i64) -> zbus::Result<()>;
+    pub async fn seeked(ctxt: &SignalContext<'_>, Position: i64) -> zbus::Result<()>;
 
     #[dbus_interface(property)]
     pub fn can_control(&self) -> bool {
@@ -250,14 +272,17 @@ impl SpotMprisPlayer {
 
     #[dbus_interface(property)]
     pub fn metadata(&self) -> TrackMetadata {
-        self.state.current_track().unwrap_or(TrackMetadata {
-            id: String::new(),
-            length: 0,
-            title: "Not playing".to_string(),
-            artist: vec![],
-            album: String::new(),
-            art: None,
-        })
+        self.state
+            .current_track()
+            .cloned()
+            .unwrap_or_else(|| TrackMetadata {
+                id: String::new(),
+                length: 0,
+                title: "Not playing".to_string(),
+                artist: vec![],
+                album: String::new(),
+                art: None,
+            })
     }
 
     #[dbus_interface(property)]
@@ -276,7 +301,7 @@ impl SpotMprisPlayer {
     }
 
     #[dbus_interface(property)]
-    pub fn set_loop_status(&self, value: LoopStatus) -> Result<()> {
+    pub fn set_loop_status(&self, value: LoopStatus) -> zbus::Result<()> {
         let mode = match value {
             LoopStatus::None => RepeatMode::None,
             LoopStatus::Track => RepeatMode::Song,
@@ -284,7 +309,8 @@ impl SpotMprisPlayer {
         };
         self.sender
             .unbounded_send(PlaybackAction::SetRepeatMode(mode).into())
-            .map_err(|_| zbus::fdo::Error::Failed("Could not send action".to_string()))
+            .map_err(|_| Error::Failed("Could not send action".to_string()))?;
+        Ok(())
     }
 
     #[dbus_interface(property)]
@@ -306,10 +332,11 @@ impl SpotMprisPlayer {
     }
 
     #[dbus_interface(property)]
-    pub fn set_shuffle(&self, value: bool) -> Result<()> {
+    pub fn set_shuffle(&self, value: bool) -> zbus::Result<()> {
         self.sender
             .unbounded_send(PlaybackAction::ToggleShuffle.into())
-            .map_err(|_| zbus::fdo::Error::Failed("Could not send action".to_string()))
+            .map_err(|_| Error::Failed("Could not send action".to_string()))?;
+        Ok(())
     }
 
     #[dbus_interface(property)]
@@ -318,12 +345,13 @@ impl SpotMprisPlayer {
     }
 
     #[dbus_interface(property)]
-    pub fn set_volume(&self, value: f64) -> Result<()> {
+    pub fn set_volume(&self, value: f64) -> zbus::Result<()> {
         // As per spec, if new volume less than 0 round to 0
         // also, we don't support volume higher than 100% at the moment.
         let volume = value.clamp(0.0, 1.0);
         self.sender
             .unbounded_send(PlaybackAction::SetVolume(value).into())
-            .map_err(|_| zbus::fdo::Error::Failed("Could not send action".to_string()))
+            .map_err(|_| Error::Failed("Could not send action".to_string()))?;
+        Ok(())
     }
 }
diff --git a/src/dbus/types.rs b/src/dbus/types.rs
index 6895427f..aea0429b 100644
--- a/src/dbus/types.rs
+++ b/src/dbus/types.rs
@@ -1,5 +1,4 @@
 use std::convert::{Into, TryFrom};
-use std::sync::{Arc, Mutex};
 use std::time::Instant;
 use zvariant::Type;
 use zvariant::{Dict, Signature, Str, Value};
@@ -82,6 +81,7 @@ impl PositionMicros {
             rate,
         }
     }
+
     fn current(&self) -> u128 {
         let current_progress = self.last_resume_instant.map(|ri| {
             let elapsed = ri.elapsed().as_micros() as f32;
@@ -106,7 +106,7 @@ impl PositionMicros {
     }
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct TrackMetadata {
     pub id: String,
     pub length: u64,
@@ -144,7 +144,7 @@ impl From<TrackMetadata> for Value<'_> {
     }
 }
 
-struct MprisState {
+pub struct MprisState {
     status: PlaybackStatus,
     loop_status: LoopStatus,
     volume: f64,
@@ -155,12 +155,9 @@ struct MprisState {
     has_next: bool,
 }
 
-#[derive(Clone)]
-pub struct SharedMprisState(Arc<Mutex<MprisState>>);
-
-impl SharedMprisState {
+impl MprisState {
     pub fn new() -> Self {
-        Self(Arc::new(Mutex::new(MprisState {
+        Self {
             status: PlaybackStatus::Stopped,
             loop_status: LoopStatus::None,
             shuffled: false,
@@ -169,113 +166,83 @@ impl SharedMprisState {
             has_prev: false,
             has_next: false,
             volume: 1f64,
-        })))
+        }
     }
 
     pub fn volume(&self) -> f64 {
-        self.0
-            .lock()
-            .map(|s| s.volume)
-            .map_err(|e| error!("Failed to get volume: {:?}", e))
-            .unwrap_or(1.0f64)
+        self.volume
     }
 
-    pub fn set_volume(&self, volume: f64) {
-        if let Ok(mut state) = self.0.lock() {
-            (*state).volume = volume;
-        }
+    pub fn set_volume(&mut self, volume: f64) {
+        self.volume = volume;
     }
 
     pub fn status(&self) -> PlaybackStatus {
-        self.0
-            .lock()
-            .map(|s| s.status)
-            .unwrap_or(PlaybackStatus::Stopped)
+        self.status
     }
 
     pub fn loop_status(&self) -> LoopStatus {
-        self.0
-            .lock()
-            .map(|s| s.loop_status)
-            .unwrap_or(LoopStatus::None)
+        self.loop_status
     }
 
     pub fn is_shuffled(&self) -> bool {
-        self.0.lock().ok().map(|s| s.shuffled).unwrap_or(false)
+        self.shuffled
     }
 
-    pub fn current_track(&self) -> Option<TrackMetadata> {
-        self.0.lock().ok().and_then(|s| s.metadata.clone())
+    pub fn current_track(&self) -> Option<&TrackMetadata> {
+        self.metadata.as_ref()
     }
 
     pub fn has_prev(&self) -> bool {
-        self.0.lock().ok().map(|s| s.has_prev).unwrap_or(false)
+        self.has_prev
     }
 
     pub fn has_next(&self) -> bool {
-        self.0.lock().ok().map(|s| s.has_next).unwrap_or(false)
+        self.has_next
     }
 
-    pub fn set_has_prev(&self, has_prev: bool) {
-        if let Ok(mut state) = self.0.lock() {
-            (*state).has_prev = has_prev;
-        }
+    pub fn set_has_prev(&mut self, has_prev: bool) {
+        self.has_prev = has_prev;
     }
 
-    pub fn set_has_next(&self, has_next: bool) {
-        if let Ok(mut state) = self.0.lock() {
-            (*state).has_next = has_next;
-        }
+    pub fn set_has_next(&mut self, has_next: bool) {
+        self.has_next = has_next;
     }
 
-    pub fn set_current_track(&self, track: Option<TrackMetadata>) {
-        if let Ok(mut state) = self.0.lock() {
-            let playing = state.status == PlaybackStatus::Playing;
-            (*state).metadata = track;
-            (*state).position.set(0, playing);
-        }
+    pub fn set_current_track(&mut self, track: Option<TrackMetadata>) {
+        let playing = self.status == PlaybackStatus::Playing;
+        self.metadata = track;
+        self.position.set(0, playing);
     }
 
     pub fn position(&self) -> u128 {
-        self.0
-            .lock()
-            .ok()
-            .map(|s| s.position.current())
-            .unwrap_or(0)
+        self.position.current()
     }
 
-    pub fn set_position(&self, position: u128) {
-        if let Ok(mut state) = self.0.lock() {
-            let playing = state.status == PlaybackStatus::Playing;
-            (*state).position.set(position, playing);
-        }
+    pub fn set_position(&mut self, position: u128) {
+        let playing = self.status == PlaybackStatus::Playing;
+        self.position.set(position, playing);
     }
 
-    pub fn set_loop_status(&self, loop_status: LoopStatus) {
-        if let Ok(mut state) = self.0.lock() {
-            (*state).loop_status = loop_status;
-        }
+    pub fn set_loop_status(&mut self, loop_status: LoopStatus) {
+        self.loop_status = loop_status;
     }
 
-    pub fn set_shuffled(&self, shuffled: bool) {
-        if let Ok(mut state) = self.0.lock() {
-            (*state).shuffled = shuffled;
-        }
+    pub fn set_shuffled(&mut self, shuffled: bool) {
+        self.shuffled = shuffled;
     }
 
-    pub fn set_playing(&self, status: PlaybackStatus) {
-        if let Ok(mut state) = self.0.lock() {
-            (*state).status = status;
-            match status {
-                PlaybackStatus::Playing => {
-                    (*state).position.resume();
-                }
-                PlaybackStatus::Paused => {
-                    (*state).position.pause();
-                }
-                PlaybackStatus::Stopped => {
-                    (*state).position.set(0, false);
-                }
+    pub fn set_playing(&mut self, status: PlaybackStatus) {
+        self.status = status;
+        match status {
+            PlaybackStatus::Playing => {
+                self.position.resume();
+            }
+            PlaybackStatus::Paused => {
+                self.position.pause();
+            }
+            PlaybackStatus::Stopped => {
+                self.position.set(0, false);
             }
         }
     }
diff --git a/src/meson.build b/src/meson.build
index e4899d3f..f48fdbb5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -70,6 +70,7 @@ sources = files(
 './api/cache.rs',
 './dbus/types.rs',
 './dbus/mpris.rs',
+'./dbus/listener.rs',
 './dbus/mod.rs',
 './config.rs',
 './app/rng.rs',

From 82a304f2a452ba259e12fdc8a095a7f9114e4fa4 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sat, 15 Jan 2022 02:56:17 +0000
Subject: [PATCH 02/33] use adwaita toasts (#435)

---
 Cargo.toml                             |  2 +-
 src/app.css                            | 12 +----
 src/app/components/notification/mod.rs | 71 +++++---------------------
 src/app/mod.rs                         | 16 ++----
 src/app/state/app_state.rs             |  3 --
 src/window.ui.in                       | 26 +---------
 6 files changed, 20 insertions(+), 110 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bfefb6fc..1f7cf68e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,7 +58,7 @@ features = ["gettext-system"]
 [dependencies]
 secret-service = "^2.0.1"
 gdk-pixbuf = "^0.14.0"
-libadwaita = "^0.1.0-alpha-4"
+libadwaita = "^0.1.0-beta-1"
 ref_filter_map = "^1.0.1"
 regex = "^1.4.6"
 async-std = "^1.10.0"
diff --git a/src/app.css b/src/app.css
index a623528c..762abf36 100644
--- a/src/app.css
+++ b/src/app.css
@@ -1,16 +1,6 @@
 @define-color accent_bg_color @green_5;
 @define-color accent_color @green_3;
 
-.notification {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  border-radius: 6px;
-}
-
-.notification--shown {
-  opacity: 1;
-}
-
 .container {
   transition: opacity 0.3s ease;
   opacity: 0;
@@ -18,4 +8,4 @@
 
 .container--loaded {
   opacity: 1;
-}
+}
\ No newline at end of file
diff --git a/src/app/components/notification/mod.rs b/src/app/components/notification/mod.rs
index 6288b1cd..5d171c1c 100644
--- a/src/app/components/notification/mod.rs
+++ b/src/app/components/notification/mod.rs
@@ -1,75 +1,28 @@
-use gtk::prelude::*;
-use std::rc::Rc;
-
-use crate::app::components::utils::Debouncer;
 use crate::app::components::EventListener;
-use crate::app::{ActionDispatcher, AppAction, AppEvent};
-
-pub struct NotificationModel {
-    dispatcher: Box<dyn ActionDispatcher>,
-}
-
-impl NotificationModel {
-    pub fn new(dispatcher: Box<dyn ActionDispatcher>) -> Self {
-        Self { dispatcher }
-    }
-
-    fn close(&self) {
-        self.dispatcher.dispatch(AppAction::HideNotification);
-    }
-}
+use crate::app::AppEvent;
 
 pub struct Notification {
-    model: Rc<NotificationModel>,
-    root: gtk::Box,
-    content: gtk::Label,
-    debouncer: Debouncer,
+    toast_overlay: libadwaita::ToastOverlay,
 }
 
 impl Notification {
-    pub fn new(
-        model: NotificationModel,
-        root: gtk::Box,
-        content: gtk::Label,
-        close_btn: gtk::Button,
-    ) -> Self {
-        let model = Rc::new(model);
-        close_btn.connect_clicked(clone!(@weak model => move |_| model.close()));
-
-        Self {
-            model,
-            root,
-            content,
-            debouncer: Debouncer::new(),
-        }
-    }
-    fn show(&self, content: &str) {
-        self.debouncer.debounce(
-            4000,
-            clone!(@weak self.model as model => move || {
-                model.close();
-            }),
-        );
-        self.content.set_text(content);
-        self.root.show();
-        self.root.style_context().add_class("notification--shown")
+    pub fn new(toast_overlay: libadwaita::ToastOverlay) -> Self {
+        Self { toast_overlay }
     }
 
-    fn hide(&self) {
-        self.root.hide();
-        self.root
-            .style_context()
-            .remove_class("notification--shown")
+    fn show(&self, content: &str) {
+        let toast = libadwaita::ToastBuilder::new()
+            .title(content)
+            .timeout(4)
+            .build();
+        self.toast_overlay.add_toast(&toast);
     }
 }
 
 impl EventListener for Notification {
     fn on_event(&mut self, event: &AppEvent) {
-        match event {
-            AppEvent::NotificationShown(content) => self.show(content),
-            AppEvent::NotificationHidden => self.hide(),
-            // _ if cfg!(debug_assertions) => self.show(&format!("{:?}", event)),
-            _ => {}
+        if let AppEvent::NotificationShown(content) = event {
+            self.show(content)
         }
     }
 }
diff --git a/src/app/mod.rs b/src/app/mod.rs
index af0291a3..165f8025 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -88,8 +88,8 @@ impl App {
                 worker.clone(),
             ),
             App::make_search_button(builder, dispatcher.box_clone()),
-            App::make_user_menu(builder, Rc::clone(model), dispatcher.box_clone()),
-            App::make_notification(builder, dispatcher),
+            App::make_user_menu(builder, Rc::clone(model), dispatcher),
+            App::make_notification(builder),
         ];
 
         self.components.append(&mut components);
@@ -196,15 +196,9 @@ impl App {
         Box::new(user_menu)
     }
 
-    fn make_notification(
-        builder: &gtk::Builder,
-        dispatcher: Box<dyn ActionDispatcher>,
-    ) -> Box<Notification> {
-        let root: gtk::Box = builder.object("notification").unwrap();
-        let content: gtk::Label = builder.object("notification_content").unwrap();
-        let close: gtk::Button = builder.object("close_notification").unwrap();
-        let model = NotificationModel::new(dispatcher);
-        Box::new(Notification::new(model, root, content, close))
+    fn make_notification(builder: &gtk::Builder) -> Box<Notification> {
+        let toast_overlay: libadwaita::ToastOverlay = builder.object("main").unwrap();
+        Box::new(Notification::new(toast_overlay))
     }
 
     fn handle(&mut self, message: AppAction) {
diff --git a/src/app/state/app_state.rs b/src/app/state/app_state.rs
index 6b219021..8a140945 100644
--- a/src/app/state/app_state.rs
+++ b/src/app/state/app_state.rs
@@ -15,7 +15,6 @@ pub enum AppAction {
     Start,
     Raise,
     ShowNotification(String),
-    HideNotification,
     ViewNowPlaying,
     // cross-state actions
     QueueSelection,
@@ -62,7 +61,6 @@ pub enum AppEvent {
     Started,
     Raised,
     NotificationShown(String),
-    NotificationHidden,
     NowPlayingShown,
 }
 
@@ -87,7 +85,6 @@ impl AppState {
         match message {
             AppAction::Start => vec![AppEvent::Started],
             AppAction::ShowNotification(c) => vec![AppEvent::NotificationShown(c)],
-            AppAction::HideNotification => vec![AppEvent::NotificationHidden],
             AppAction::ViewNowPlaying => vec![AppEvent::NowPlayingShown],
             AppAction::Raise => vec![AppEvent::Raised],
             AppAction::QueueSelection => {
diff --git a/src/window.ui.in b/src/window.ui.in
index 423e8e66..ab7aba51 100644
--- a/src/window.ui.in
+++ b/src/window.ui.in
@@ -108,7 +108,7 @@
                   <object class="GtkBox">
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkOverlay" id="main">
+                      <object class="AdwToastOverlay" id="main">
                         <property name="hexpand">1</property>
                         <property name="vexpand">1</property>
                         <child>
@@ -116,30 +116,6 @@
                             <property name="transition-type">slide-left-right</property>
                           </object>
                         </child>
-                        <child type="overlay">
-                          <object class="GtkBox" id="notification">
-                            <property name="halign">center</property>
-                            <property name="valign">start</property>
-                            <property name="margin-top">50</property>
-                            <property name="spacing">10</property>
-                            <child>
-                              <object class="GtkLabel" id="notification_content">
-                                <property name="label">Information</property>
-                                <property name="wrap">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="close_notification">
-                                <property name="receives-default">1</property>
-                                <property name="icon-name">window-close-symbolic</property>
-                              </object>
-                            </child>
-                            <style>
-                              <class name="app-notification" />
-                              <class name="notification" />
-                            </style>
-                          </object>
-                        </child>
                       </object>
                     </child>
                     <child>

From 1812877444611cc4f0dcfaff18a488b1abc45ff9 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sat, 15 Jan 2022 16:10:11 -0500
Subject: [PATCH 03/33] update a couple dependencies

---
 Cargo.lock         | 1150 ++++++++++++-------------
 cargo-sources.json | 2024 +++++++++++++++++++++-----------------------
 2 files changed, 1547 insertions(+), 1627 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d2be8efb..805cab65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -78,15 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.34"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
-
-[[package]]
-name = "arc-swap"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62"
+checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
 
 [[package]]
 name = "async-broadcast"
@@ -142,29 +136,28 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.3.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
+checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
 dependencies = [
  "concurrent-queue",
- "fastrand",
  "futures-lite",
  "libc",
  "log",
- "nb-connect",
  "once_cell",
  "parking",
  "polling",
- "vec-arena",
+ "slab",
+ "socket2",
  "waker-fn",
  "winapi",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb"
+checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
 dependencies = [
  "event-listener",
 ]
@@ -210,7 +203,7 @@ dependencies = [
  "memchr",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.2.4",
+ "pin-project-lite",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -224,9 +217,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-trait"
-version = "0.1.42"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
+checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -252,9 +245,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "base64"
@@ -264,13 +257,12 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bindgen"
-version = "0.53.2"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb26d6a69a335b8cb0e7c7e9775cd5666611dc50a37177c3f2cedcfc040e8c8"
+checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"
 dependencies = [
  "bitflags",
  "cexpr",
- "cfg-if 0.1.10",
  "clang-sys",
  "lazy_static",
  "lazycell",
@@ -284,9 +276,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "block"
@@ -321,9 +313,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "blocking"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9"
+checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427"
 dependencies = [
  "async-channel",
  "async-task",
@@ -335,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
 
 [[package]]
 name = "byteorder"
@@ -347,27 +339,21 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
-
-[[package]]
-name = "bytes"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
 [[package]]
 name = "cache-padded"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 
 [[package]]
 name = "cairo-rs"
-version = "0.14.0"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d32eecb1e806433cf68063c4548bbdc15cc56d35db19d685ab60909c4c85206"
+checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482"
 dependencies = [
  "bitflags",
  "cairo-sys-rs",
@@ -378,20 +364,26 @@ dependencies = [
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.14.0"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80"
+checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 3.1.1",
+ "system-deps 3.2.0",
 ]
 
+[[package]]
+name = "castaway"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
+
 [[package]]
 name = "cc"
-version = "1.0.66"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 dependencies = [
  "jobserver",
 ]
@@ -413,9 +405,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.7.4"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30aa9e2ffbb838c6b451db14f3cd8e63ed622bf859f9956bc93845a10fafc26a"
+checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e"
 dependencies = [
  "smallvec",
 ]
@@ -443,13 +435,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.11"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
+ "libc",
  "num-integer",
  "num-traits",
  "time",
+ "winapi",
 ]
 
 [[package]]
@@ -463,9 +457,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "0.29.3"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a"
+checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90"
 dependencies = [
  "glob",
  "libc",
@@ -474,11 +468,11 @@ dependencies = [
 
 [[package]]
 name = "combine"
-version = "4.5.2"
+version = "4.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e"
+checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062"
 dependencies = [
- "bytes 1.0.1",
+ "bytes",
  "memchr",
 ]
 
@@ -493,9 +487,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.6.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "coreaudio-rs"
@@ -509,18 +503,18 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.4"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e81f1c165c33ffab90a03077ac3b03462b34d5947145dfa48102e063d581502c"
+checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa"
 dependencies = [
  "bindgen",
 ]
 
 [[package]]
 name = "cpal"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25"
+checksum = "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418"
 dependencies = [
  "alsa",
  "core-foundation-sys",
@@ -530,8 +524,8 @@ dependencies = [
  "lazy_static",
  "libc",
  "mach",
- "ndk",
- "ndk-glue",
+ "ndk 0.3.0",
+ "ndk-glue 0.3.0",
  "nix 0.20.0",
  "oboe",
  "parking_lot",
@@ -543,35 +537,28 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec1028182c380cc45a2e2c5ec841134f2dfd0f8f5f0a5bcd68004f81b5efdf4"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cpuid-bool"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
-
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.1"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
 dependencies = [
- "autocfg",
  "cfg-if 1.0.0",
  "lazy_static",
 ]
 
 [[package]]
 name = "crypto-mac"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
+checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
 dependencies = [
  "generic-array",
  "subtle",
@@ -579,9 +566,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-mac"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
+checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
  "generic-array",
  "subtle",
@@ -589,9 +576,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.1.19"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
+checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa"
 dependencies = [
  "quote",
  "syn",
@@ -608,24 +595,24 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.34"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e"
+checksum = "7de97b894edd5b5bcceef8b78d7da9b75b1d2f2f9a910569d0bde3dd31d84939"
 dependencies = [
  "curl-sys",
  "libc",
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.3.12",
+ "socket2",
  "winapi",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.39+curl-7.74.0"
+version = "0.4.52+curl-7.81.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07a8ce861e7b68a0b394e814d7ee9f1b2750ff8bd10372c6ad3bacc10e86f874"
+checksum = "14b8c2d1023ea5fded5b7b892e4b8e95f70038a421126a056761a84246a28971"
 dependencies = [
  "cc",
  "libc",
@@ -643,8 +630,18 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.10.2",
+ "darling_macro 0.10.2",
+]
+
+[[package]]
+name = "darling"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4"
+dependencies = [
+ "darling_core 0.13.1",
+ "darling_macro 0.13.1",
 ]
 
 [[package]]
@@ -657,7 +654,21 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
+ "strsim 0.9.3",
+ "syn",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
  "syn",
 ]
 
@@ -667,16 +678,27 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
- "darling_core",
+ "darling_core 0.10.2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
+dependencies = [
+ "darling_core 0.13.1",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "derivative"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaed5874effa6cde088c644ddcdcb4ffd1511391c5be4fdd7a5ccd02c7e4a183"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -706,11 +728,11 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.22"
+version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
+checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -788,9 +810,9 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
 
 [[package]]
 name = "fastrand"
-version = "1.4.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
+checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2"
 dependencies = [
  "instant",
 ]
@@ -802,26 +824,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
 dependencies = [
  "memoffset",
- "rustc_version",
-]
-
-[[package]]
-name = "flume"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0362ef9c4c1fa854ff95b4cb78045a86e810d804dc04937961988b45427104a9"
-dependencies = [
- "futures-core",
- "futures-sink",
- "pin-project 1.0.2",
- "spinning_top",
+ "rustc_version 0.3.3",
 ]
 
 [[package]]
 name = "fnv"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
@@ -835,9 +845,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
+checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -850,9 +860,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
+checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -860,15 +870,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
+checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97"
+checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -877,30 +887,30 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
+checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"
 
 [[package]]
 name = "futures-lite"
-version = "1.11.2"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658"
+checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
 dependencies = [
  "fastrand",
  "futures-core",
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.1.11",
+ "pin-project-lite",
  "waker-fn",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
+checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -909,21 +919,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
+checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"
 
 [[package]]
 name = "futures-task"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
+checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"
 
 [[package]]
 name = "futures-util"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
+checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -932,7 +942,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.4",
+ "pin-project-lite",
  "pin-utils",
  "slab",
 ]
@@ -959,7 +969,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 3.1.1",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
@@ -997,9 +1007,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
 dependencies = [
  "typenum",
  "version_check",
@@ -1016,24 +1026,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "wasi 0.10.1+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
@@ -1048,12 +1047,12 @@ dependencies = [
 
 [[package]]
 name = "gettext-sys"
-version = "0.21.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "885d118016f633f99f741afe6c1433c040813a3cbc755cbfdf85f963e02fad80"
+checksum = "afa9e06ab9e7514cc9ae668ea3b71ea1536259d767dff0289ac23ad134f99929"
 dependencies = [
  "cc",
- "tempfile",
+ "temp-dir",
 ]
 
 [[package]]
@@ -1082,7 +1081,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 3.1.1",
+ "system-deps 3.2.0",
  "winapi",
 ]
 
@@ -1107,13 +1106,13 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eb7bdf41972a6f6dab5d72c23d22789f400059a43ba0d72b4bb2f8664d946a9"
+checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
 dependencies = [
  "anyhow",
  "heck",
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 1.1.0",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -1127,7 +1126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
 dependencies = [
  "libc",
- "system-deps 3.1.1",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
@@ -1138,9 +1137,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f"
+checksum = "6f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1157,14 +1156,14 @@ checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 3.1.1",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
 name = "graphene-rs"
-version = "0.14.0"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1460a39f06e491e6112f27e71e51435c833ba370723224dd1743dfd1f201f19"
+checksum = "e3380f132530ef9eb9e0a2bac180e30390aa5e49892d20294f822a974117a563"
 dependencies = [
  "glib",
  "graphene-sys",
@@ -1173,14 +1172,14 @@ dependencies = [
 
 [[package]]
 name = "graphene-sys"
-version = "0.14.0"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d23fb7a9547e5f072a7e0cd49cd648fedeb786d122b106217511980cbb8962"
+checksum = "9a9ac7450b3aa80792513a3c029920a2ede419de13fb5169a4e51b07a5685332"
 dependencies = [
  "glib-sys",
  "libc",
  "pkg-config",
- "system-deps 3.1.1",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
@@ -1247,7 +1246,7 @@ dependencies = [
  "anyhow",
  "heck",
  "itertools",
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 1.1.0",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -1275,24 +1274,24 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "headers"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855"
+checksum = "a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0"
 dependencies = [
  "base64",
  "bitflags",
- "bytes 1.0.1",
+ "bytes",
  "headers-core",
  "http",
+ "httpdate",
  "mime",
  "sha-1",
- "time",
 ]
 
 [[package]]
@@ -1306,27 +1305,27 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
 dependencies = [
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.12"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "hex"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hkdf"
@@ -1344,7 +1343,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
 dependencies = [
- "crypto-mac 0.10.0",
+ "crypto-mac 0.10.1",
  "digest",
 ]
 
@@ -1354,7 +1353,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
 dependencies = [
- "crypto-mac 0.11.0",
+ "crypto-mac 0.11.1",
  "digest",
 ]
 
@@ -1371,37 +1370,37 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
 dependencies = [
- "bytes 0.5.4",
+ "bytes",
  "fnv",
- "itoa",
+ "itoa 1.0.1",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
- "bytes 1.0.1",
+ "bytes",
  "http",
- "pin-project-lite 0.2.4",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.4.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437"
+checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
 
 [[package]]
 name = "httpdate"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "humantime"
@@ -1411,11 +1410,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.7"
+version = "0.14.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54"
+checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55"
 dependencies = [
- "bytes 1.0.1",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -1423,9 +1422,9 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa",
- "pin-project 1.0.2",
- "socket2 0.4.0",
+ "itoa 0.4.8",
+ "pin-project-lite",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -1438,7 +1437,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
 dependencies = [
- "bytes 1.0.1",
+ "bytes",
  "futures",
  "headers",
  "http",
@@ -1455,9 +1454,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.2.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -1466,9 +1465,9 @@ dependencies = [
 
 [[package]]
 name = "if-addrs"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48"
+checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de"
 dependencies = [
  "if-addrs-sys",
  "libc",
@@ -1487,9 +1486,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.6.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
+checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -1497,24 +1496,26 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.9"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "isahc"
-version = "1.2.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b24d2aed6bbe6faeab0e164ec2e9e6193fcfcfe489b6eb59fb0d0d34947d73"
+checksum = "d140e84730d325378912ede32d7cd53ef1542725503b3353e5ec8113c7c6f588"
 dependencies = [
+ "async-channel",
+ "castaway",
  "crossbeam-utils",
  "curl",
  "curl-sys",
  "encoding_rs",
- "flume",
+ "event-listener",
  "futures-lite",
  "http",
  "log",
@@ -1533,24 +1534,30 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.5"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
+[[package]]
+name = "itoa"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
 [[package]]
 name = "jni"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
 dependencies = [
  "cesu8",
  "combine",
@@ -1568,18 +1575,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.22"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.46"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
+checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1601,9 +1608,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lazycell"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "lewton"
@@ -1645,7 +1652,7 @@ dependencies = [
  "gobject-sys",
  "gtk4-sys",
  "libc",
- "system-deps 3.1.1",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
@@ -1656,11 +1663,11 @@ checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "libloading"
-version = "0.5.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 dependencies = [
- "cc",
+ "cfg-if 1.0.0",
  "winapi",
 ]
 
@@ -1672,9 +1679,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libmdns"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98477a6781ae1d6a1c2aeabfd2e23353a75fe8eb7c2545f6ed282ac8f3e2fc53"
+checksum = "fac185a4d02e873c6d1ead59d674651f8ae5ec23ffe1637bee8de80665562a6a"
 dependencies = [
  "byteorder",
  "futures-util",
@@ -1682,17 +1689,17 @@ dependencies = [
  "if-addrs",
  "log",
  "multimap",
- "rand 0.8.4",
- "socket2 0.4.0",
+ "rand",
+ "socket2",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "libnghttp2-sys"
-version = "0.1.3"
+version = "0.1.7+1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b359f5ec8106bc297694c9a562ace312be2cfd17a5fc68dc12249845aa144b11"
+checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
 dependencies = [
  "cc",
  "libc",
@@ -1700,9 +1707,9 @@ dependencies = [
 
 [[package]]
 name = "libpulse-binding"
-version = "2.23.1"
+version = "2.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db951f37898e19a6785208e3a290261e0f1a8e086716be596aaad684882ca8e3"
+checksum = "17be42160017e0ae993c03bfdab4ecb6f82ce3f8d515bd8da8fdf18d10703663"
 dependencies = [
  "bitflags",
  "libc",
@@ -1714,9 +1721,9 @@ dependencies = [
 
 [[package]]
 name = "libpulse-simple-binding"
-version = "2.23.0"
+version = "2.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a574975292db859087c3957b9182f7d53278553f06bddaa2099c90e4ac3a0ee0"
+checksum = "7cbf1a1dfd69a48cb60906399fa1d17f1b75029ef51c0789597be792dfd0bcd5"
 dependencies = [
  "libpulse-binding",
  "libpulse-simple-sys",
@@ -1725,9 +1732,9 @@ dependencies = [
 
 [[package]]
 name = "libpulse-simple-sys"
-version = "1.16.1"
+version = "1.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "468cf582b7b022c0d1b266fefc7fc8fa7b1ddcb61214224f2f105c95a9c2d5c1"
+checksum = "7c73f96f9ca34809692c4760cfe421225860aa000de50edab68a16221fd27cc1"
 dependencies = [
  "libpulse-sys",
  "pkg-config",
@@ -1735,9 +1742,9 @@ dependencies = [
 
 [[package]]
 name = "libpulse-sys"
-version = "1.18.0"
+version = "1.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf17e9832643c4f320c42b7d78b2c0510f45aa5e823af094413b94e45076ba82"
+checksum = "991e6bd0efe2a36e6534e136e7996925e4c1a8e35b7807fe533f2beffff27c30"
 dependencies = [
  "libc",
  "num-derive",
@@ -1781,7 +1788,7 @@ checksum = "e5f7cc7e4d1c2596191be523668c933e07ec8a318d099fd66658258a4fe4a2dc"
 dependencies = [
  "aes-ctr",
  "byteorder",
- "bytes 1.0.1",
+ "bytes",
  "futures-util",
  "librespot-core",
  "log",
@@ -1803,7 +1810,7 @@ dependencies = [
  "librespot-protocol",
  "log",
  "protobuf",
- "rand 0.8.4",
+ "rand",
  "serde",
  "serde_json",
  "tokio",
@@ -1819,7 +1826,7 @@ dependencies = [
  "aes",
  "base64",
  "byteorder",
- "bytes 1.0.1",
+ "bytes",
  "form_urlencoded",
  "futures-core",
  "futures-util",
@@ -1830,14 +1837,14 @@ dependencies = [
  "hyper-proxy",
  "librespot-protocol",
  "log",
- "num-bigint 0.4.0",
+ "num-bigint 0.4.3",
  "num-integer",
  "num-traits",
  "once_cell",
  "pbkdf2",
  "priority-queue",
  "protobuf",
- "rand 0.8.4",
+ "rand",
  "serde",
  "serde_json",
  "sha-1",
@@ -1867,7 +1874,7 @@ dependencies = [
  "libmdns",
  "librespot-core",
  "log",
- "rand 0.8.4",
+ "rand",
  "serde_json",
  "sha-1",
  "thiserror",
@@ -1907,7 +1914,7 @@ dependencies = [
  "librespot-metadata",
  "log",
  "ogg",
- "rand 0.8.4",
+ "rand",
  "rand_distr",
  "rodio",
  "shell-words",
@@ -1929,9 +1936,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
+checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
 dependencies = [
  "cc",
  "libc",
@@ -1954,9 +1961,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.2"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
 dependencies = [
  "scopeguard",
 ]
@@ -1997,9 +2004,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 
 [[package]]
 name = "matches"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "memchr"
@@ -2009,9 +2016,9 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
  "autocfg",
 ]
@@ -2024,9 +2031,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
 name = "mio"
-version = "0.7.11"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956"
+checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
 dependencies = [
  "libc",
  "log",
@@ -2046,21 +2053,21 @@ dependencies = [
 
 [[package]]
 name = "multimap"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "nb-connect"
-version = "1.0.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998"
+checksum = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15"
 dependencies = [
  "libc",
- "winapi",
+ "socket2",
 ]
 
 [[package]]
@@ -2070,7 +2077,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
 dependencies = [
  "jni-sys",
- "ndk-sys",
+ "ndk-sys 0.2.2",
+ "num_enum",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+dependencies = [
+ "bitflags",
+ "jni-sys",
+ "ndk-sys 0.3.0",
  "num_enum",
  "thiserror",
 ]
@@ -2084,9 +2104,23 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "ndk",
- "ndk-macro",
- "ndk-sys",
+ "ndk 0.3.0",
+ "ndk-macro 0.2.0",
+ "ndk-sys 0.2.2",
+]
+
+[[package]]
+name = "ndk-glue"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04c0d14b0858eb9962a5dac30b809b19f19da7e4547d64af2b0bb051d2e55d79"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "ndk 0.6.0",
+ "ndk-macro 0.3.0",
+ "ndk-sys 0.3.0",
 ]
 
 [[package]]
@@ -2095,18 +2129,40 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
 dependencies = [
- "darling",
+ "darling 0.10.2",
  "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "ndk-macro"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
+dependencies = [
+ "darling 0.13.1",
+ "proc-macro-crate 1.1.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "ndk-sys"
-version = "0.2.1"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
+
+[[package]]
+name = "ndk-sys"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d"
+checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+dependencies = [
+ "jni-sys",
+]
 
 [[package]]
 name = "nix"
@@ -2148,9 +2204,9 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "5.1.1"
+version = "5.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
 dependencies = [
  "memchr",
  "version_check",
@@ -2171,7 +2227,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f"
 dependencies = [
- "num-bigint 0.3.1",
+ "num-bigint 0.3.3",
  "num-complex",
  "num-integer",
  "num-iter",
@@ -2181,9 +2237,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
+checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2192,14 +2248,14 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
  "autocfg",
  "num-integer",
  "num-traits",
- "rand 0.8.4",
+ "rand",
 ]
 
 [[package]]
@@ -2250,7 +2306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
 dependencies = [
  "autocfg",
- "num-bigint 0.3.1",
+ "num-bigint 0.3.3",
  "num-integer",
  "num-traits",
 ]
@@ -2267,9 +2323,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -2277,21 +2333,20 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.5.1"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
+checksum = "720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad"
 dependencies = [
- "derivative",
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.1"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
+checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21"
 dependencies = [
- "proc-macro-crate 0.1.5",
+ "proc-macro-crate 1.1.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -2328,13 +2383,13 @@ dependencies = [
 
 [[package]]
 name = "oboe"
-version = "0.4.1"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4"
+checksum = "2463c8f2e19b4e0d0710a21f8e4011501ff28db1c95d7a5482a553b2100502d2"
 dependencies = [
  "jni",
- "ndk",
- "ndk-glue",
+ "ndk 0.6.0",
+ "ndk-glue 0.6.0",
  "num-derive",
  "num-traits",
  "oboe-sys",
@@ -2342,9 +2397,9 @@ dependencies = [
 
 [[package]]
 name = "oboe-sys"
-version = "0.4.0"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103"
+checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd"
 dependencies = [
  "cc",
 ]
@@ -2360,9 +2415,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.5.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
 
 [[package]]
 name = "opaque-debug"
@@ -2372,15 +2427,15 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.56"
+version = "0.9.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f02309a7f127000ed50594f0b50ecc69e7c654e16d41b4e8156d1b3df8e0b52e"
+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
 dependencies = [
  "autocfg",
  "cc",
@@ -2396,14 +2451,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.4",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "pango"
-version = "0.14.0"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415823a4fb9f1789785cd6e2d2413816f2ecff92380382969aaca9c400e13a19"
+checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581"
 dependencies = [
  "bitflags",
  "glib",
@@ -2421,7 +2476,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 3.1.1",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
@@ -2432,9 +2487,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
 
 [[package]]
 name = "parking_lot"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
@@ -2443,14 +2498,14 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
 dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.2.8",
+ "redox_syscall",
  "smallvec",
  "winapi",
 ]
@@ -2461,7 +2516,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
 dependencies = [
- "crypto-mac 0.11.0",
+ "crypto-mac 0.11.1",
  "hmac 0.11.0",
 ]
 
@@ -2488,38 +2543,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "0.4.16"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81d480cb4e89522ccda96d0eed9af94180b7a5f93fb28f66e1fd7d68431663d1"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
- "pin-project-internal 0.4.16",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
-dependencies = [
- "pin-project-internal 1.0.2",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82996f11efccb19b685b14b5df818de31c1edcee3daa256ab5775dd98e72feb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.2"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2528,15 +2563,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.4"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
 name = "pin-utils"
@@ -2546,34 +2575,34 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.17"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
 
 [[package]]
 name = "polling"
-version = "2.0.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
+checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
  "log",
- "wepoll-sys",
+ "wepoll-ffi",
  "winapi",
 ]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "priority-queue"
-version = "1.1.1"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1340009a04e81f656a4e45e295f0b1191c81de424bf940c865e33577a8e223"
+checksum = "00ba480ac08d3cfc40dea10fd466fd2c14dee3ea6fc7873bc4079eda2727caf0"
 dependencies = [
  "autocfg",
  "indexmap",
@@ -2590,9 +2619,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
+checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
 dependencies = [
  "thiserror",
  "toml",
@@ -2624,9 +2653,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid",
 ]
@@ -2658,26 +2687,13 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.8"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.14",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.4"
@@ -2685,47 +2701,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
- "rand_chacha 0.3.0",
- "rand_core 0.6.1",
- "rand_hc 0.3.0",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
 ]
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.1",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.14",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.1",
+ "getrandom",
 ]
 
 [[package]]
@@ -2735,38 +2732,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f"
 dependencies = [
  "num-traits",
- "rand 0.8.4",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "rand",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
- "rand_core 0.6.1",
+ "rand_core",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
 dependencies = [
  "bitflags",
 ]
@@ -2796,9 +2778,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
  "winapi",
 ]
@@ -2834,14 +2816,23 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
 dependencies = [
- "semver",
+ "semver 0.11.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver 1.0.4",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.4"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
 
 [[package]]
 name = "same-file"
@@ -2885,11 +2876,11 @@ dependencies = [
  "hkdf",
  "lazy_static",
  "num",
- "rand 0.8.4",
+ "rand",
  "serde",
  "sha2",
- "zbus 1.8.0",
- "zbus_macros 1.8.0",
+ "zbus 1.9.1",
+ "zbus_macros 1.9.1",
  "zvariant 2.10.0",
  "zvariant_derive 2.10.0",
 ]
@@ -2903,6 +2894,12 @@ dependencies = [
  "semver-parser",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
+
 [[package]]
 name = "semver-parser"
 version = "0.10.2"
@@ -2914,18 +2911,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.130"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.130"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2934,20 +2931,20 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.72"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
+checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
 dependencies = [
- "itoa",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_repr"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
+checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2956,9 +2953,9 @@ dependencies = [
 
 [[package]]
 name = "sha-1"
-version = "0.9.5"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659df5fc3ce22274daac600ffb845300bd2125bcfaec047823075afdab81c00"
+checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
 dependencies = [
  "block-buffer",
  "cfg-if 1.0.0",
@@ -2975,13 +2972,13 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 
 [[package]]
 name = "sha2"
-version = "0.9.2"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer",
  "cfg-if 1.0.0",
- "cpuid-bool",
+ "cpufeatures",
  "digest",
  "opaque-debug",
 ]
@@ -3009,68 +3006,46 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.2.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
- "arc-swap",
  "libc",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "sluice"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fa0333a60ff2e3474a6775cc611840c2a55610c831dd366503474c02f1a28f5"
+checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
 dependencies = [
- "futures-channel",
+ "async-channel",
  "futures-core",
  "futures-io",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
-
-[[package]]
-name = "socket2"
-version = "0.3.12"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "redox_syscall 0.1.56",
- "winapi",
-]
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "socket2"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
+checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
 dependencies = [
  "libc",
  "winapi",
 ]
 
-[[package]]
-name = "spinning_top"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e529d73e80d64b5f2631f9035113347c578a1c9c7774b83a2b880788459ab36"
-dependencies = [
- "lock_api",
-]
-
 [[package]]
 name = "spot"
 version = "0.3.0"
@@ -3091,7 +3066,7 @@ dependencies = [
  "librespot",
  "log",
  "protobuf",
- "rand 0.8.4",
+ "rand",
  "ref_filter_map",
  "regex",
  "secret-service",
@@ -3121,17 +3096,23 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
 [[package]]
 name = "strum"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c"
+checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
 
 [[package]]
 name = "strum_macros"
-version = "0.20.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
+checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -3141,15 +3122,15 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.60"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3158,9 +3139,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3170,12 +3151,12 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "3.1.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c248107ad7bc1ac07066a4d003cae9e9a7bc2e27d3418f7a9cdcdc8699dbea70"
+checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
 dependencies = [
  "anyhow",
- "cfg-expr 0.7.4",
+ "cfg-expr 0.8.1",
  "heck",
  "itertools",
  "pkg-config",
@@ -3199,25 +3180,31 @@ dependencies = [
  "version-compare",
 ]
 
+[[package]]
+name = "temp-dir"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
+
 [[package]]
 name = "tempfile"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
+ "fastrand",
  "libc",
- "rand 0.7.3",
- "redox_syscall 0.1.56",
+ "redox_syscall",
  "remove_dir_all",
  "winapi",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
  "winapi-util",
 ]
@@ -3254,9 +3241,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.2.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3269,18 +3256,17 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588b2d10a336da58d877567cd8fb8a14b463e2104910f8132cd054b4b96e29ee"
+checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
 dependencies = [
- "autocfg",
- "bytes 1.0.1",
+ "bytes",
  "libc",
  "memchr",
  "mio",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.2.4",
+ "pin-project-lite",
  "signal-hook-registry",
  "tokio-macros",
  "winapi",
@@ -3288,9 +3274,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.1.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3299,34 +3285,34 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0"
+checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.4",
+ "pin-project-lite",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.6.6"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e"
+checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
 dependencies = [
- "bytes 1.0.1",
+ "bytes",
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite 0.2.4",
+ "pin-project-lite",
  "tokio",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
  "serde",
 ]
@@ -3339,22 +3325,22 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.22"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
+checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
- "pin-project-lite 0.2.4",
+ "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.11"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
+checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3363,20 +3349,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
 name = "tracing-futures"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
 dependencies = [
- "pin-project 0.4.16",
+ "pin-project",
  "tracing",
 ]
 
@@ -3388,9 +3374,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "typenum"
-version = "1.12.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "ucd-trie"
@@ -3400,45 +3386,42 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.12"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
- "smallvec",
+ "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "url"
-version = "2.2.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3452,7 +3435,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.1",
+ "getrandom",
 ]
 
 [[package]]
@@ -3467,24 +3450,19 @@ dependencies = [
 
 [[package]]
 name = "vcpkg"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
-
-[[package]]
-name = "vec-arena"
-version = "1.0.0"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vergen"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb"
+checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a"
 dependencies = [
  "bitflags",
  "chrono",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
@@ -3495,9 +3473,9 @@ checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
 
 [[package]]
 name = "version_check"
-version = "0.9.1"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "void"
@@ -3534,21 +3512,15 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.1+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.69"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
+checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -3556,9 +3528,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.69"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
+checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -3571,9 +3543,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.19"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
+checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -3583,9 +3555,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.69"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
+checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3593,9 +3565,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.69"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
+checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3606,25 +3578,25 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.69"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
+checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
 
 [[package]]
 name = "web-sys"
-version = "0.3.46"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
+checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
 [[package]]
-name = "wepoll-sys"
-version = "3.0.1"
+name = "wepoll-ffi"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
+checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
 dependencies = [
  "cc",
 ]
@@ -3662,9 +3634,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "zbus"
-version = "1.8.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b4d4aa39daed4e32aed75f0c37b969184949a0fdfd5f2e1277abfda61f02a8"
+checksum = "2326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad"
 dependencies = [
  "async-io",
  "byteorder",
@@ -3679,7 +3651,7 @@ dependencies = [
  "scoped-tls",
  "serde",
  "serde_repr",
- "zbus_macros 1.8.0",
+ "zbus_macros 1.9.1",
  "zvariant 2.10.0",
 ]
 
@@ -3708,7 +3680,7 @@ dependencies = [
  "nix 0.23.1",
  "once_cell",
  "ordered-stream",
- "rand 0.8.4",
+ "rand",
  "serde",
  "serde_repr",
  "sha1",
@@ -3720,9 +3692,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "1.8.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc141cda72384bef359badf1808e391d3968f9299e8f3c3cbb78dafa1e0930"
+checksum = "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93"
 dependencies = [
  "proc-macro-crate 0.1.5",
  "proc-macro2",
@@ -3736,7 +3708,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e03af45fc15e2c977161c5ffea56c43c41f425a963affd7074bf91b5bf5a8cf"
 dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 1.1.0",
  "proc-macro2",
  "quote",
  "regex",
@@ -3809,7 +3781,7 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9"
 dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 1.1.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -3821,7 +3793,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990"
 dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 1.1.0",
  "proc-macro2",
  "quote",
  "syn",
diff --git a/cargo-sources.json b/cargo-sources.json
index ed2f2a84..5a4bcb03 100644
--- a/cargo-sources.json
+++ b/cargo-sources.json
@@ -92,28 +92,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/anyhow/anyhow-1.0.34.crate",
-        "sha256": "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7",
+        "url": "https://static.crates.io/crates/anyhow/anyhow-1.0.52.crate",
+        "sha256": "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3",
         "dest": "cargo/vendor",
-        "dest-filename": "anyhow-1.0.34.crate"
+        "dest-filename": "anyhow-1.0.52.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/anyhow-1.0.34",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/arc-swap/arc-swap-0.4.6.crate",
-        "sha256": "b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62",
-        "dest": "cargo/vendor",
-        "dest-filename": "arc-swap-0.4.6.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/arc-swap-0.4.6",
+        "url": "data:%7B%22package%22%3A%20%2284450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/anyhow-1.0.52",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -170,28 +157,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/async-io/async-io-1.3.1.crate",
-        "sha256": "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd",
+        "url": "https://static.crates.io/crates/async-io/async-io-1.6.0.crate",
+        "sha256": "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b",
         "dest": "cargo/vendor",
-        "dest-filename": "async-io-1.3.1.crate"
+        "dest-filename": "async-io-1.6.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%229315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/async-io-1.3.1",
+        "url": "data:%7B%22package%22%3A%20%22a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/async-io-1.6.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/async-lock/async-lock-2.3.0.crate",
-        "sha256": "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb",
+        "url": "https://static.crates.io/crates/async-lock/async-lock-2.4.0.crate",
+        "sha256": "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b",
         "dest": "cargo/vendor",
-        "dest-filename": "async-lock-2.3.0.crate"
+        "dest-filename": "async-lock-2.4.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/async-lock-2.3.0",
+        "url": "data:%7B%22package%22%3A%20%22e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/async-lock-2.4.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -248,15 +235,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/async-trait/async-trait-0.1.42.crate",
-        "sha256": "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d",
+        "url": "https://static.crates.io/crates/async-trait/async-trait-0.1.52.crate",
+        "sha256": "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3",
         "dest": "cargo/vendor",
-        "dest-filename": "async-trait-0.1.42.crate"
+        "dest-filename": "async-trait-0.1.52.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/async-trait-0.1.42",
+        "url": "data:%7B%22package%22%3A%20%22061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/async-trait-0.1.52",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -287,15 +274,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/autocfg/autocfg-1.0.0.crate",
-        "sha256": "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d",
+        "url": "https://static.crates.io/crates/autocfg/autocfg-1.0.1.crate",
+        "sha256": "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a",
         "dest": "cargo/vendor",
-        "dest-filename": "autocfg-1.0.0.crate"
+        "dest-filename": "autocfg-1.0.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/autocfg-1.0.0",
+        "url": "data:%7B%22package%22%3A%20%22cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/autocfg-1.0.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -313,28 +300,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/bindgen/bindgen-0.53.2.crate",
-        "sha256": "6bb26d6a69a335b8cb0e7c7e9775cd5666611dc50a37177c3f2cedcfc040e8c8",
+        "url": "https://static.crates.io/crates/bindgen/bindgen-0.56.0.crate",
+        "sha256": "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239",
         "dest": "cargo/vendor",
-        "dest-filename": "bindgen-0.53.2.crate"
+        "dest-filename": "bindgen-0.56.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226bb26d6a69a335b8cb0e7c7e9775cd5666611dc50a37177c3f2cedcfc040e8c8%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/bindgen-0.53.2",
+        "url": "data:%7B%22package%22%3A%20%222da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/bindgen-0.56.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/bitflags/bitflags-1.2.1.crate",
-        "sha256": "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693",
+        "url": "https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate",
+        "sha256": "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a",
         "dest": "cargo/vendor",
-        "dest-filename": "bitflags-1.2.1.crate"
+        "dest-filename": "bitflags-1.3.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/bitflags-1.2.1",
+        "url": "data:%7B%22package%22%3A%20%22bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/bitflags-1.3.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -391,28 +378,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/blocking/blocking-1.0.2.crate",
-        "sha256": "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9",
+        "url": "https://static.crates.io/crates/blocking/blocking-1.1.0.crate",
+        "sha256": "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427",
         "dest": "cargo/vendor",
-        "dest-filename": "blocking-1.0.2.crate"
+        "dest-filename": "blocking-1.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/blocking-1.0.2",
+        "url": "data:%7B%22package%22%3A%20%22046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/blocking-1.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/bumpalo/bumpalo-3.4.0.crate",
-        "sha256": "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820",
+        "url": "https://static.crates.io/crates/bumpalo/bumpalo-3.9.1.crate",
+        "sha256": "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899",
         "dest": "cargo/vendor",
-        "dest-filename": "bumpalo-3.4.0.crate"
+        "dest-filename": "bumpalo-3.9.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/bumpalo-3.4.0",
+        "url": "data:%7B%22package%22%3A%20%22a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/bumpalo-3.9.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -430,80 +417,80 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/bytes/bytes-0.5.4.crate",
-        "sha256": "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1",
+        "url": "https://static.crates.io/crates/bytes/bytes-1.1.0.crate",
+        "sha256": "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8",
         "dest": "cargo/vendor",
-        "dest-filename": "bytes-0.5.4.crate"
+        "dest-filename": "bytes-1.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/bytes-0.5.4",
+        "url": "data:%7B%22package%22%3A%20%22c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/bytes-1.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/bytes/bytes-1.0.1.crate",
-        "sha256": "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040",
+        "url": "https://static.crates.io/crates/cache-padded/cache-padded-1.2.0.crate",
+        "sha256": "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c",
         "dest": "cargo/vendor",
-        "dest-filename": "bytes-1.0.1.crate"
+        "dest-filename": "cache-padded-1.2.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/bytes-1.0.1",
+        "url": "data:%7B%22package%22%3A%20%22c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cache-padded-1.2.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cache-padded/cache-padded-1.1.1.crate",
-        "sha256": "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba",
+        "url": "https://static.crates.io/crates/cairo-rs/cairo-rs-0.14.9.crate",
+        "sha256": "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482",
         "dest": "cargo/vendor",
-        "dest-filename": "cache-padded-1.1.1.crate"
+        "dest-filename": "cairo-rs-0.14.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cache-padded-1.1.1",
+        "url": "data:%7B%22package%22%3A%20%2233b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cairo-rs-0.14.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cairo-rs/cairo-rs-0.14.0.crate",
-        "sha256": "8d32eecb1e806433cf68063c4548bbdc15cc56d35db19d685ab60909c4c85206",
+        "url": "https://static.crates.io/crates/cairo-sys-rs/cairo-sys-rs-0.14.9.crate",
+        "sha256": "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570",
         "dest": "cargo/vendor",
-        "dest-filename": "cairo-rs-0.14.0.crate"
+        "dest-filename": "cairo-sys-rs-0.14.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228d32eecb1e806433cf68063c4548bbdc15cc56d35db19d685ab60909c4c85206%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cairo-rs-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%22b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cairo-sys-rs-0.14.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cairo-sys-rs/cairo-sys-rs-0.14.0.crate",
-        "sha256": "d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80",
+        "url": "https://static.crates.io/crates/castaway/castaway-0.1.2.crate",
+        "sha256": "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6",
         "dest": "cargo/vendor",
-        "dest-filename": "cairo-sys-rs-0.14.0.crate"
+        "dest-filename": "castaway-0.1.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cairo-sys-rs-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%22a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/castaway-0.1.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cc/cc-1.0.66.crate",
-        "sha256": "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48",
+        "url": "https://static.crates.io/crates/cc/cc-1.0.72.crate",
+        "sha256": "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee",
         "dest": "cargo/vendor",
-        "dest-filename": "cc-1.0.66.crate"
+        "dest-filename": "cc-1.0.72.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cc-1.0.66",
+        "url": "data:%7B%22package%22%3A%20%2222a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cc-1.0.72",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -534,15 +521,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cfg-expr/cfg-expr-0.7.4.crate",
-        "sha256": "30aa9e2ffbb838c6b451db14f3cd8e63ed622bf859f9956bc93845a10fafc26a",
+        "url": "https://static.crates.io/crates/cfg-expr/cfg-expr-0.8.1.crate",
+        "sha256": "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e",
         "dest": "cargo/vendor",
-        "dest-filename": "cfg-expr-0.7.4.crate"
+        "dest-filename": "cfg-expr-0.8.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2230aa9e2ffbb838c6b451db14f3cd8e63ed622bf859f9956bc93845a10fafc26a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cfg-expr-0.7.4",
+        "url": "data:%7B%22package%22%3A%20%22b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cfg-expr-0.8.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -586,15 +573,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/chrono/chrono-0.4.11.crate",
-        "sha256": "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2",
+        "url": "https://static.crates.io/crates/chrono/chrono-0.4.19.crate",
+        "sha256": "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73",
         "dest": "cargo/vendor",
-        "dest-filename": "chrono-0.4.11.crate"
+        "dest-filename": "chrono-0.4.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2280094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/chrono-0.4.11",
+        "url": "data:%7B%22package%22%3A%20%22670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/chrono-0.4.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -612,28 +599,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/clang-sys/clang-sys-0.29.3.crate",
-        "sha256": "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a",
+        "url": "https://static.crates.io/crates/clang-sys/clang-sys-1.3.0.crate",
+        "sha256": "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90",
         "dest": "cargo/vendor",
-        "dest-filename": "clang-sys-0.29.3.crate"
+        "dest-filename": "clang-sys-1.3.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/clang-sys-0.29.3",
+        "url": "data:%7B%22package%22%3A%20%22fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/clang-sys-1.3.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/combine/combine-4.5.2.crate",
-        "sha256": "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e",
+        "url": "https://static.crates.io/crates/combine/combine-4.6.3.crate",
+        "sha256": "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062",
         "dest": "cargo/vendor",
-        "dest-filename": "combine-4.5.2.crate"
+        "dest-filename": "combine-4.6.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/combine-4.5.2",
+        "url": "data:%7B%22package%22%3A%20%2250b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/combine-4.6.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -651,15 +638,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.6.2.crate",
-        "sha256": "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b",
+        "url": "https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.3.crate",
+        "sha256": "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc",
         "dest": "cargo/vendor",
-        "dest-filename": "core-foundation-sys-0.6.2.crate"
+        "dest-filename": "core-foundation-sys-0.8.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/core-foundation-sys-0.6.2",
+        "url": "data:%7B%22package%22%3A%20%225827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/core-foundation-sys-0.8.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -677,106 +664,93 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/coreaudio-sys/coreaudio-sys-0.2.4.crate",
-        "sha256": "e81f1c165c33ffab90a03077ac3b03462b34d5947145dfa48102e063d581502c",
-        "dest": "cargo/vendor",
-        "dest-filename": "coreaudio-sys-0.2.4.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e81f1c165c33ffab90a03077ac3b03462b34d5947145dfa48102e063d581502c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/coreaudio-sys-0.2.4",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/cpal/cpal-0.13.3.crate",
-        "sha256": "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25",
+        "url": "https://static.crates.io/crates/coreaudio-sys/coreaudio-sys-0.2.8.crate",
+        "sha256": "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa",
         "dest": "cargo/vendor",
-        "dest-filename": "cpal-0.13.3.crate"
+        "dest-filename": "coreaudio-sys-0.2.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cpal-0.13.3",
+        "url": "data:%7B%22package%22%3A%20%222b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/coreaudio-sys-0.2.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cpufeatures/cpufeatures-0.1.1.crate",
-        "sha256": "dec1028182c380cc45a2e2c5ec841134f2dfd0f8f5f0a5bcd68004f81b5efdf4",
+        "url": "https://static.crates.io/crates/cpal/cpal-0.13.4.crate",
+        "sha256": "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418",
         "dest": "cargo/vendor",
-        "dest-filename": "cpufeatures-0.1.1.crate"
+        "dest-filename": "cpal-0.13.4.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22dec1028182c380cc45a2e2c5ec841134f2dfd0f8f5f0a5bcd68004f81b5efdf4%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cpufeatures-0.1.1",
+        "url": "data:%7B%22package%22%3A%20%2298f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cpal-0.13.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cpuid-bool/cpuid-bool-0.1.2.crate",
-        "sha256": "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634",
+        "url": "https://static.crates.io/crates/cpufeatures/cpufeatures-0.2.1.crate",
+        "sha256": "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469",
         "dest": "cargo/vendor",
-        "dest-filename": "cpuid-bool-0.1.2.crate"
+        "dest-filename": "cpufeatures-0.2.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cpuid-bool-0.1.2",
+        "url": "data:%7B%22package%22%3A%20%2295059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cpufeatures-0.2.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate",
-        "sha256": "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d",
+        "url": "https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.6.crate",
+        "sha256": "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120",
         "dest": "cargo/vendor",
-        "dest-filename": "crossbeam-utils-0.8.1.crate"
+        "dest-filename": "crossbeam-utils-0.8.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2202d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/crossbeam-utils-0.8.1",
+        "url": "data:%7B%22package%22%3A%20%22cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/crossbeam-utils-0.8.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/crypto-mac/crypto-mac-0.10.0.crate",
-        "sha256": "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6",
+        "url": "https://static.crates.io/crates/crypto-mac/crypto-mac-0.10.1.crate",
+        "sha256": "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a",
         "dest": "cargo/vendor",
-        "dest-filename": "crypto-mac-0.10.0.crate"
+        "dest-filename": "crypto-mac-0.10.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/crypto-mac-0.10.0",
+        "url": "data:%7B%22package%22%3A%20%22bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/crypto-mac-0.10.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/crypto-mac/crypto-mac-0.11.0.crate",
-        "sha256": "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e",
+        "url": "https://static.crates.io/crates/crypto-mac/crypto-mac-0.11.1.crate",
+        "sha256": "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714",
         "dest": "cargo/vendor",
-        "dest-filename": "crypto-mac-0.11.0.crate"
+        "dest-filename": "crypto-mac-0.11.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2225fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/crypto-mac-0.11.0",
+        "url": "data:%7B%22package%22%3A%20%22b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/crypto-mac-0.11.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/ctor/ctor-0.1.19.crate",
-        "sha256": "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19",
+        "url": "https://static.crates.io/crates/ctor/ctor-0.1.21.crate",
+        "sha256": "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa",
         "dest": "cargo/vendor",
-        "dest-filename": "ctor-0.1.19.crate"
+        "dest-filename": "ctor-0.1.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/ctor-0.1.19",
+        "url": "data:%7B%22package%22%3A%20%22ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ctor-0.1.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -794,28 +768,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/curl/curl-0.4.34.crate",
-        "sha256": "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e",
+        "url": "https://static.crates.io/crates/curl/curl-0.4.42.crate",
+        "sha256": "7de97b894edd5b5bcceef8b78d7da9b75b1d2f2f9a910569d0bde3dd31d84939",
         "dest": "cargo/vendor",
-        "dest-filename": "curl-0.4.34.crate"
+        "dest-filename": "curl-0.4.42.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/curl-0.4.34",
+        "url": "data:%7B%22package%22%3A%20%227de97b894edd5b5bcceef8b78d7da9b75b1d2f2f9a910569d0bde3dd31d84939%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/curl-0.4.42",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/curl-sys/curl-sys-0.4.39+curl-7.74.0.crate",
-        "sha256": "07a8ce861e7b68a0b394e814d7ee9f1b2750ff8bd10372c6ad3bacc10e86f874",
+        "url": "https://static.crates.io/crates/curl-sys/curl-sys-0.4.52+curl-7.81.0.crate",
+        "sha256": "14b8c2d1023ea5fded5b7b892e4b8e95f70038a421126a056761a84246a28971",
         "dest": "cargo/vendor",
-        "dest-filename": "curl-sys-0.4.39+curl-7.74.0.crate"
+        "dest-filename": "curl-sys-0.4.52+curl-7.81.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2207a8ce861e7b68a0b394e814d7ee9f1b2750ff8bd10372c6ad3bacc10e86f874%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/curl-sys-0.4.39+curl-7.74.0",
+        "url": "data:%7B%22package%22%3A%20%2214b8c2d1023ea5fded5b7b892e4b8e95f70038a421126a056761a84246a28971%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/curl-sys-0.4.52+curl-7.81.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -831,6 +805,19 @@
         "dest": "cargo/vendor/darling-0.10.2",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/darling/darling-0.13.1.crate",
+        "sha256": "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4",
+        "dest": "cargo/vendor",
+        "dest-filename": "darling-0.13.1.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/darling-0.13.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/darling_core/darling_core-0.10.2.crate",
@@ -844,6 +831,19 @@
         "dest": "cargo/vendor/darling_core-0.10.2",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/darling_core/darling_core-0.13.1.crate",
+        "sha256": "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324",
+        "dest": "cargo/vendor",
+        "dest-filename": "darling_core-0.13.1.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%227a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/darling_core-0.13.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/darling_macro/darling_macro-0.10.2.crate",
@@ -859,15 +859,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/derivative/derivative-2.1.3.crate",
-        "sha256": "eaed5874effa6cde088c644ddcdcb4ffd1511391c5be4fdd7a5ccd02c7e4a183",
+        "url": "https://static.crates.io/crates/darling_macro/darling_macro-0.13.1.crate",
+        "sha256": "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b",
+        "dest": "cargo/vendor",
+        "dest-filename": "darling_macro-0.13.1.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2272c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/darling_macro-0.13.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/derivative/derivative-2.2.0.crate",
+        "sha256": "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b",
         "dest": "cargo/vendor",
-        "dest-filename": "derivative-2.1.3.crate"
+        "dest-filename": "derivative-2.2.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22eaed5874effa6cde088c644ddcdcb4ffd1511391c5be4fdd7a5ccd02c7e4a183%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/derivative-2.1.3",
+        "url": "data:%7B%22package%22%3A%20%22fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/derivative-2.2.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -911,15 +924,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.22.crate",
-        "sha256": "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28",
+        "url": "https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.30.crate",
+        "sha256": "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df",
         "dest": "cargo/vendor",
-        "dest-filename": "encoding_rs-0.8.22.crate"
+        "dest-filename": "encoding_rs-0.8.30.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/encoding_rs-0.8.22",
+        "url": "data:%7B%22package%22%3A%20%227896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/encoding_rs-0.8.30",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1015,15 +1028,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/fastrand/fastrand-1.4.0.crate",
-        "sha256": "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3",
+        "url": "https://static.crates.io/crates/fastrand/fastrand-1.6.0.crate",
+        "sha256": "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2",
         "dest": "cargo/vendor",
-        "dest-filename": "fastrand-1.4.0.crate"
+        "dest-filename": "fastrand-1.6.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/fastrand-1.4.0",
+        "url": "data:%7B%22package%22%3A%20%22779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/fastrand-1.6.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1041,28 +1054,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/flume/flume-0.10.1.crate",
-        "sha256": "0362ef9c4c1fa854ff95b4cb78045a86e810d804dc04937961988b45427104a9",
-        "dest": "cargo/vendor",
-        "dest-filename": "flume-0.10.1.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%220362ef9c4c1fa854ff95b4cb78045a86e810d804dc04937961988b45427104a9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/flume-0.10.1",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/fnv/fnv-1.0.6.crate",
-        "sha256": "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3",
+        "url": "https://static.crates.io/crates/fnv/fnv-1.0.7.crate",
+        "sha256": "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1",
         "dest": "cargo/vendor",
-        "dest-filename": "fnv-1.0.6.crate"
+        "dest-filename": "fnv-1.0.7.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/fnv-1.0.6",
+        "url": "data:%7B%22package%22%3A%20%223f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/fnv-1.0.7",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1080,132 +1080,132 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures/futures-0.3.18.crate",
-        "sha256": "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e",
+        "url": "https://static.crates.io/crates/futures/futures-0.3.19.crate",
+        "sha256": "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-0.3.18.crate"
+        "dest-filename": "futures-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%2228560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-channel/futures-channel-0.3.18.crate",
-        "sha256": "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27",
+        "url": "https://static.crates.io/crates/futures-channel/futures-channel-0.3.19.crate",
+        "sha256": "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-channel-0.3.18.crate"
+        "dest-filename": "futures-channel-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-channel-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%22ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-channel-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-core/futures-core-0.3.18.crate",
-        "sha256": "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445",
+        "url": "https://static.crates.io/crates/futures-core/futures-core-0.3.19.crate",
+        "sha256": "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-core-0.3.18.crate"
+        "dest-filename": "futures-core-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-core-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%22d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-core-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-executor/futures-executor-0.3.18.crate",
-        "sha256": "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97",
+        "url": "https://static.crates.io/crates/futures-executor/futures-executor-0.3.19.crate",
+        "sha256": "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-executor-0.3.18.crate"
+        "dest-filename": "futures-executor-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-executor-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%2229d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-executor-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-io/futures-io-0.3.18.crate",
-        "sha256": "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11",
+        "url": "https://static.crates.io/crates/futures-io/futures-io-0.3.19.crate",
+        "sha256": "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-io-0.3.18.crate"
+        "dest-filename": "futures-io-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-io-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%22b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-io-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-lite/futures-lite-1.11.2.crate",
-        "sha256": "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658",
+        "url": "https://static.crates.io/crates/futures-lite/futures-lite-1.12.0.crate",
+        "sha256": "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-lite-1.11.2.crate"
+        "dest-filename": "futures-lite-1.12.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%225e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-lite-1.11.2",
+        "url": "data:%7B%22package%22%3A%20%227694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-lite-1.12.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-macro/futures-macro-0.3.18.crate",
-        "sha256": "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd",
+        "url": "https://static.crates.io/crates/futures-macro/futures-macro-0.3.19.crate",
+        "sha256": "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-macro-0.3.18.crate"
+        "dest-filename": "futures-macro-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-macro-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%226dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-macro-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-sink/futures-sink-0.3.18.crate",
-        "sha256": "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af",
+        "url": "https://static.crates.io/crates/futures-sink/futures-sink-0.3.19.crate",
+        "sha256": "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-sink-0.3.18.crate"
+        "dest-filename": "futures-sink-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-sink-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%22e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-sink-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-task/futures-task-0.3.18.crate",
-        "sha256": "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12",
+        "url": "https://static.crates.io/crates/futures-task/futures-task-0.3.19.crate",
+        "sha256": "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-task-0.3.18.crate"
+        "dest-filename": "futures-task-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-task-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%226ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-task-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-util/futures-util-0.3.18.crate",
-        "sha256": "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e",
+        "url": "https://static.crates.io/crates/futures-util/futures-util-0.3.19.crate",
+        "sha256": "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-util-0.3.18.crate"
+        "dest-filename": "futures-util-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2241d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-util-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%22d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-util-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1262,15 +1262,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/generic-array/generic-array-0.14.4.crate",
-        "sha256": "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817",
+        "url": "https://static.crates.io/crates/generic-array/generic-array-0.14.5.crate",
+        "sha256": "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803",
         "dest": "cargo/vendor",
-        "dest-filename": "generic-array-0.14.4.crate"
+        "dest-filename": "generic-array-0.14.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/generic-array-0.14.4",
+        "url": "data:%7B%22package%22%3A%20%22fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/generic-array-0.14.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1288,28 +1288,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/getrandom/getrandom-0.1.14.crate",
-        "sha256": "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb",
-        "dest": "cargo/vendor",
-        "dest-filename": "getrandom-0.1.14.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/getrandom-0.1.14",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/getrandom/getrandom-0.2.1.crate",
-        "sha256": "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6",
+        "url": "https://static.crates.io/crates/getrandom/getrandom-0.2.4.crate",
+        "sha256": "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c",
         "dest": "cargo/vendor",
-        "dest-filename": "getrandom-0.2.1.crate"
+        "dest-filename": "getrandom-0.2.4.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/getrandom-0.2.1",
+        "url": "data:%7B%22package%22%3A%20%22418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/getrandom-0.2.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1327,15 +1314,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gettext-sys/gettext-sys-0.21.0.crate",
-        "sha256": "885d118016f633f99f741afe6c1433c040813a3cbc755cbfdf85f963e02fad80",
+        "url": "https://static.crates.io/crates/gettext-sys/gettext-sys-0.21.2.crate",
+        "sha256": "afa9e06ab9e7514cc9ae668ea3b71ea1536259d767dff0289ac23ad134f99929",
         "dest": "cargo/vendor",
-        "dest-filename": "gettext-sys-0.21.0.crate"
+        "dest-filename": "gettext-sys-0.21.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22885d118016f633f99f741afe6c1433c040813a3cbc755cbfdf85f963e02fad80%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gettext-sys-0.21.0",
+        "url": "data:%7B%22package%22%3A%20%22afa9e06ab9e7514cc9ae668ea3b71ea1536259d767dff0289ac23ad134f99929%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gettext-sys-0.21.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1379,15 +1366,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/glib-macros/glib-macros-0.14.0.crate",
-        "sha256": "9eb7bdf41972a6f6dab5d72c23d22789f400059a43ba0d72b4bb2f8664d946a9",
+        "url": "https://static.crates.io/crates/glib-macros/glib-macros-0.14.1.crate",
+        "sha256": "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518",
         "dest": "cargo/vendor",
-        "dest-filename": "glib-macros-0.14.0.crate"
+        "dest-filename": "glib-macros-0.14.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%229eb7bdf41972a6f6dab5d72c23d22789f400059a43ba0d72b4bb2f8664d946a9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/glib-macros-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%222aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/glib-macros-0.14.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1418,15 +1405,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gloo-timers/gloo-timers-0.2.1.crate",
-        "sha256": "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f",
+        "url": "https://static.crates.io/crates/gloo-timers/gloo-timers-0.2.2.crate",
+        "sha256": "6f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e",
         "dest": "cargo/vendor",
-        "dest-filename": "gloo-timers-0.2.1.crate"
+        "dest-filename": "gloo-timers-0.2.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2247204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gloo-timers-0.2.1",
+        "url": "data:%7B%22package%22%3A%20%226f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gloo-timers-0.2.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1444,28 +1431,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/graphene-rs/graphene-rs-0.14.0.crate",
-        "sha256": "f1460a39f06e491e6112f27e71e51435c833ba370723224dd1743dfd1f201f19",
+        "url": "https://static.crates.io/crates/graphene-rs/graphene-rs-0.14.8.crate",
+        "sha256": "e3380f132530ef9eb9e0a2bac180e30390aa5e49892d20294f822a974117a563",
         "dest": "cargo/vendor",
-        "dest-filename": "graphene-rs-0.14.0.crate"
+        "dest-filename": "graphene-rs-0.14.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f1460a39f06e491e6112f27e71e51435c833ba370723224dd1743dfd1f201f19%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/graphene-rs-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%22e3380f132530ef9eb9e0a2bac180e30390aa5e49892d20294f822a974117a563%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/graphene-rs-0.14.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/graphene-sys/graphene-sys-0.14.0.crate",
-        "sha256": "e7d23fb7a9547e5f072a7e0cd49cd648fedeb786d122b106217511980cbb8962",
+        "url": "https://static.crates.io/crates/graphene-sys/graphene-sys-0.14.8.crate",
+        "sha256": "9a9ac7450b3aa80792513a3c029920a2ede419de13fb5169a4e51b07a5685332",
         "dest": "cargo/vendor",
-        "dest-filename": "graphene-sys-0.14.0.crate"
+        "dest-filename": "graphene-sys-0.14.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e7d23fb7a9547e5f072a7e0cd49cd648fedeb786d122b106217511980cbb8962%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/graphene-sys-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%229a9ac7450b3aa80792513a3c029920a2ede419de13fb5169a4e51b07a5685332%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/graphene-sys-0.14.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1535,28 +1522,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/hashbrown/hashbrown-0.9.1.crate",
-        "sha256": "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04",
+        "url": "https://static.crates.io/crates/hashbrown/hashbrown-0.11.2.crate",
+        "sha256": "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e",
         "dest": "cargo/vendor",
-        "dest-filename": "hashbrown-0.9.1.crate"
+        "dest-filename": "hashbrown-0.11.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/hashbrown-0.9.1",
+        "url": "data:%7B%22package%22%3A%20%22ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/hashbrown-0.11.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/headers/headers-0.3.4.crate",
-        "sha256": "f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855",
+        "url": "https://static.crates.io/crates/headers/headers-0.3.5.crate",
+        "sha256": "a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0",
         "dest": "cargo/vendor",
-        "dest-filename": "headers-0.3.4.crate"
+        "dest-filename": "headers-0.3.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/headers-0.3.4",
+        "url": "data:%7B%22package%22%3A%20%22a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/headers-0.3.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1574,41 +1561,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/heck/heck-0.3.1.crate",
-        "sha256": "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205",
+        "url": "https://static.crates.io/crates/heck/heck-0.3.3.crate",
+        "sha256": "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c",
         "dest": "cargo/vendor",
-        "dest-filename": "heck-0.3.1.crate"
+        "dest-filename": "heck-0.3.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2220564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/heck-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%226d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/heck-0.3.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.12.crate",
-        "sha256": "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4",
+        "url": "https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate",
+        "sha256": "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33",
         "dest": "cargo/vendor",
-        "dest-filename": "hermit-abi-0.1.12.crate"
+        "dest-filename": "hermit-abi-0.1.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2261565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/hermit-abi-0.1.12",
+        "url": "data:%7B%22package%22%3A%20%2262b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/hermit-abi-0.1.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/hex/hex-0.4.2.crate",
-        "sha256": "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35",
+        "url": "https://static.crates.io/crates/hex/hex-0.4.3.crate",
+        "sha256": "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70",
         "dest": "cargo/vendor",
-        "dest-filename": "hex-0.4.2.crate"
+        "dest-filename": "hex-0.4.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/hex-0.4.2",
+        "url": "data:%7B%22package%22%3A%20%227f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/hex-0.4.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1665,54 +1652,54 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/http/http-0.2.1.crate",
-        "sha256": "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9",
+        "url": "https://static.crates.io/crates/http/http-0.2.6.crate",
+        "sha256": "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03",
         "dest": "cargo/vendor",
-        "dest-filename": "http-0.2.1.crate"
+        "dest-filename": "http-0.2.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2228d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/http-0.2.1",
+        "url": "data:%7B%22package%22%3A%20%2231f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/http-0.2.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/http-body/http-body-0.4.2.crate",
-        "sha256": "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9",
+        "url": "https://static.crates.io/crates/http-body/http-body-0.4.4.crate",
+        "sha256": "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6",
         "dest": "cargo/vendor",
-        "dest-filename": "http-body-0.4.2.crate"
+        "dest-filename": "http-body-0.4.4.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2260daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/http-body-0.4.2",
+        "url": "data:%7B%22package%22%3A%20%221ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/http-body-0.4.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/httparse/httparse-1.4.0.crate",
-        "sha256": "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437",
+        "url": "https://static.crates.io/crates/httparse/httparse-1.5.1.crate",
+        "sha256": "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503",
         "dest": "cargo/vendor",
-        "dest-filename": "httparse-1.4.0.crate"
+        "dest-filename": "httparse-1.5.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/httparse-1.4.0",
+        "url": "data:%7B%22package%22%3A%20%22acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/httparse-1.5.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/httpdate/httpdate-1.0.0.crate",
-        "sha256": "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9",
+        "url": "https://static.crates.io/crates/httpdate/httpdate-1.0.2.crate",
+        "sha256": "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421",
         "dest": "cargo/vendor",
-        "dest-filename": "httpdate-1.0.0.crate"
+        "dest-filename": "httpdate-1.0.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2205842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/httpdate-1.0.0",
+        "url": "data:%7B%22package%22%3A%20%22c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/httpdate-1.0.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1730,15 +1717,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/hyper/hyper-0.14.7.crate",
-        "sha256": "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54",
+        "url": "https://static.crates.io/crates/hyper/hyper-0.14.16.crate",
+        "sha256": "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55",
         "dest": "cargo/vendor",
-        "dest-filename": "hyper-0.14.7.crate"
+        "dest-filename": "hyper-0.14.16.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/hyper-0.14.7",
+        "url": "data:%7B%22package%22%3A%20%22b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/hyper-0.14.16",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1769,28 +1756,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/idna/idna-0.2.0.crate",
-        "sha256": "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9",
+        "url": "https://static.crates.io/crates/idna/idna-0.2.3.crate",
+        "sha256": "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8",
         "dest": "cargo/vendor",
-        "dest-filename": "idna-0.2.0.crate"
+        "dest-filename": "idna-0.2.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2202e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/idna-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%22418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/idna-0.2.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/if-addrs/if-addrs-0.6.5.crate",
-        "sha256": "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48",
+        "url": "https://static.crates.io/crates/if-addrs/if-addrs-0.6.7.crate",
+        "sha256": "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de",
         "dest": "cargo/vendor",
-        "dest-filename": "if-addrs-0.6.5.crate"
+        "dest-filename": "if-addrs-0.6.7.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2228538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/if-addrs-0.6.5",
+        "url": "data:%7B%22package%22%3A%20%222273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/if-addrs-0.6.7",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1808,80 +1795,93 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/indexmap/indexmap-1.6.2.crate",
-        "sha256": "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3",
+        "url": "https://static.crates.io/crates/indexmap/indexmap-1.8.0.crate",
+        "sha256": "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223",
         "dest": "cargo/vendor",
-        "dest-filename": "indexmap-1.6.2.crate"
+        "dest-filename": "indexmap-1.8.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/indexmap-1.6.2",
+        "url": "data:%7B%22package%22%3A%20%22282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/indexmap-1.8.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/instant/instant-0.1.9.crate",
-        "sha256": "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec",
+        "url": "https://static.crates.io/crates/instant/instant-0.1.12.crate",
+        "sha256": "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c",
         "dest": "cargo/vendor",
-        "dest-filename": "instant-0.1.9.crate"
+        "dest-filename": "instant-0.1.12.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2261124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/instant-0.1.9",
+        "url": "data:%7B%22package%22%3A%20%227a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/instant-0.1.12",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/isahc/isahc-1.2.0.crate",
-        "sha256": "33b24d2aed6bbe6faeab0e164ec2e9e6193fcfcfe489b6eb59fb0d0d34947d73",
+        "url": "https://static.crates.io/crates/isahc/isahc-1.6.0.crate",
+        "sha256": "d140e84730d325378912ede32d7cd53ef1542725503b3353e5ec8113c7c6f588",
         "dest": "cargo/vendor",
-        "dest-filename": "isahc-1.2.0.crate"
+        "dest-filename": "isahc-1.6.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2233b24d2aed6bbe6faeab0e164ec2e9e6193fcfcfe489b6eb59fb0d0d34947d73%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/isahc-1.2.0",
+        "url": "data:%7B%22package%22%3A%20%22d140e84730d325378912ede32d7cd53ef1542725503b3353e5ec8113c7c6f588%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/isahc-1.6.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/itertools/itertools-0.10.1.crate",
-        "sha256": "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf",
+        "url": "https://static.crates.io/crates/itertools/itertools-0.10.3.crate",
+        "sha256": "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3",
         "dest": "cargo/vendor",
-        "dest-filename": "itertools-0.10.1.crate"
+        "dest-filename": "itertools-0.10.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2269ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/itertools-0.10.1",
+        "url": "data:%7B%22package%22%3A%20%22a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/itertools-0.10.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/itoa/itoa-0.4.5.crate",
-        "sha256": "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e",
+        "url": "https://static.crates.io/crates/itoa/itoa-0.4.8.crate",
+        "sha256": "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4",
         "dest": "cargo/vendor",
-        "dest-filename": "itoa-0.4.5.crate"
+        "dest-filename": "itoa-0.4.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/itoa-0.4.5",
+        "url": "data:%7B%22package%22%3A%20%22b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/itoa-0.4.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/jni/jni-0.18.0.crate",
-        "sha256": "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf",
+        "url": "https://static.crates.io/crates/itoa/itoa-1.0.1.crate",
+        "sha256": "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35",
         "dest": "cargo/vendor",
-        "dest-filename": "jni-0.18.0.crate"
+        "dest-filename": "itoa-1.0.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2224967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/jni-0.18.0",
+        "url": "data:%7B%22package%22%3A%20%221aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/itoa-1.0.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/jni/jni-0.19.0.crate",
+        "sha256": "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec",
+        "dest": "cargo/vendor",
+        "dest-filename": "jni-0.19.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/jni-0.19.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1899,28 +1899,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/jobserver/jobserver-0.1.22.crate",
-        "sha256": "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd",
+        "url": "https://static.crates.io/crates/jobserver/jobserver-0.1.24.crate",
+        "sha256": "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa",
         "dest": "cargo/vendor",
-        "dest-filename": "jobserver-0.1.22.crate"
+        "dest-filename": "jobserver-0.1.24.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/jobserver-0.1.22",
+        "url": "data:%7B%22package%22%3A%20%22af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/jobserver-0.1.24",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/js-sys/js-sys-0.3.46.crate",
-        "sha256": "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175",
+        "url": "https://static.crates.io/crates/js-sys/js-sys-0.3.55.crate",
+        "sha256": "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84",
         "dest": "cargo/vendor",
-        "dest-filename": "js-sys-0.3.46.crate"
+        "dest-filename": "js-sys-0.3.55.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/js-sys-0.3.46",
+        "url": "data:%7B%22package%22%3A%20%227cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/js-sys-0.3.55",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1951,15 +1951,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/lazycell/lazycell-1.2.1.crate",
-        "sha256": "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f",
+        "url": "https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate",
+        "sha256": "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55",
         "dest": "cargo/vendor",
-        "dest-filename": "lazycell-1.2.1.crate"
+        "dest-filename": "lazycell-1.3.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/lazycell-1.2.1",
+        "url": "data:%7B%22package%22%3A%20%22830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/lazycell-1.3.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2016,15 +2016,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libloading/libloading-0.5.2.crate",
-        "sha256": "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753",
+        "url": "https://static.crates.io/crates/libloading/libloading-0.7.3.crate",
+        "sha256": "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd",
         "dest": "cargo/vendor",
-        "dest-filename": "libloading-0.5.2.crate"
+        "dest-filename": "libloading-0.7.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libloading-0.5.2",
+        "url": "data:%7B%22package%22%3A%20%22efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libloading-0.7.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2042,80 +2042,80 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libmdns/libmdns-0.6.1.crate",
-        "sha256": "98477a6781ae1d6a1c2aeabfd2e23353a75fe8eb7c2545f6ed282ac8f3e2fc53",
+        "url": "https://static.crates.io/crates/libmdns/libmdns-0.6.2.crate",
+        "sha256": "fac185a4d02e873c6d1ead59d674651f8ae5ec23ffe1637bee8de80665562a6a",
         "dest": "cargo/vendor",
-        "dest-filename": "libmdns-0.6.1.crate"
+        "dest-filename": "libmdns-0.6.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2298477a6781ae1d6a1c2aeabfd2e23353a75fe8eb7c2545f6ed282ac8f3e2fc53%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libmdns-0.6.1",
+        "url": "data:%7B%22package%22%3A%20%22fac185a4d02e873c6d1ead59d674651f8ae5ec23ffe1637bee8de80665562a6a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libmdns-0.6.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libnghttp2-sys/libnghttp2-sys-0.1.3.crate",
-        "sha256": "b359f5ec8106bc297694c9a562ace312be2cfd17a5fc68dc12249845aa144b11",
+        "url": "https://static.crates.io/crates/libnghttp2-sys/libnghttp2-sys-0.1.7+1.45.0.crate",
+        "sha256": "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f",
         "dest": "cargo/vendor",
-        "dest-filename": "libnghttp2-sys-0.1.3.crate"
+        "dest-filename": "libnghttp2-sys-0.1.7+1.45.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b359f5ec8106bc297694c9a562ace312be2cfd17a5fc68dc12249845aa144b11%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libnghttp2-sys-0.1.3",
+        "url": "data:%7B%22package%22%3A%20%2257ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libnghttp2-sys-0.1.7+1.45.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libpulse-binding/libpulse-binding-2.23.1.crate",
-        "sha256": "db951f37898e19a6785208e3a290261e0f1a8e086716be596aaad684882ca8e3",
+        "url": "https://static.crates.io/crates/libpulse-binding/libpulse-binding-2.26.0.crate",
+        "sha256": "17be42160017e0ae993c03bfdab4ecb6f82ce3f8d515bd8da8fdf18d10703663",
         "dest": "cargo/vendor",
-        "dest-filename": "libpulse-binding-2.23.1.crate"
+        "dest-filename": "libpulse-binding-2.26.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22db951f37898e19a6785208e3a290261e0f1a8e086716be596aaad684882ca8e3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libpulse-binding-2.23.1",
+        "url": "data:%7B%22package%22%3A%20%2217be42160017e0ae993c03bfdab4ecb6f82ce3f8d515bd8da8fdf18d10703663%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libpulse-binding-2.26.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libpulse-simple-binding/libpulse-simple-binding-2.23.0.crate",
-        "sha256": "a574975292db859087c3957b9182f7d53278553f06bddaa2099c90e4ac3a0ee0",
+        "url": "https://static.crates.io/crates/libpulse-simple-binding/libpulse-simple-binding-2.25.0.crate",
+        "sha256": "7cbf1a1dfd69a48cb60906399fa1d17f1b75029ef51c0789597be792dfd0bcd5",
         "dest": "cargo/vendor",
-        "dest-filename": "libpulse-simple-binding-2.23.0.crate"
+        "dest-filename": "libpulse-simple-binding-2.25.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a574975292db859087c3957b9182f7d53278553f06bddaa2099c90e4ac3a0ee0%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libpulse-simple-binding-2.23.0",
+        "url": "data:%7B%22package%22%3A%20%227cbf1a1dfd69a48cb60906399fa1d17f1b75029ef51c0789597be792dfd0bcd5%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libpulse-simple-binding-2.25.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libpulse-simple-sys/libpulse-simple-sys-1.16.1.crate",
-        "sha256": "468cf582b7b022c0d1b266fefc7fc8fa7b1ddcb61214224f2f105c95a9c2d5c1",
+        "url": "https://static.crates.io/crates/libpulse-simple-sys/libpulse-simple-sys-1.19.2.crate",
+        "sha256": "7c73f96f9ca34809692c4760cfe421225860aa000de50edab68a16221fd27cc1",
         "dest": "cargo/vendor",
-        "dest-filename": "libpulse-simple-sys-1.16.1.crate"
+        "dest-filename": "libpulse-simple-sys-1.19.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22468cf582b7b022c0d1b266fefc7fc8fa7b1ddcb61214224f2f105c95a9c2d5c1%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libpulse-simple-sys-1.16.1",
+        "url": "data:%7B%22package%22%3A%20%227c73f96f9ca34809692c4760cfe421225860aa000de50edab68a16221fd27cc1%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libpulse-simple-sys-1.19.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libpulse-sys/libpulse-sys-1.18.0.crate",
-        "sha256": "cf17e9832643c4f320c42b7d78b2c0510f45aa5e823af094413b94e45076ba82",
+        "url": "https://static.crates.io/crates/libpulse-sys/libpulse-sys-1.19.3.crate",
+        "sha256": "991e6bd0efe2a36e6534e136e7996925e4c1a8e35b7807fe533f2beffff27c30",
         "dest": "cargo/vendor",
-        "dest-filename": "libpulse-sys-1.18.0.crate"
+        "dest-filename": "libpulse-sys-1.19.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cf17e9832643c4f320c42b7d78b2c0510f45aa5e823af094413b94e45076ba82%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libpulse-sys-1.18.0",
+        "url": "data:%7B%22package%22%3A%20%22991e6bd0efe2a36e6534e136e7996925e4c1a8e35b7807fe533f2beffff27c30%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libpulse-sys-1.19.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2224,15 +2224,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libz-sys/libz-sys-1.1.2.crate",
-        "sha256": "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655",
+        "url": "https://static.crates.io/crates/libz-sys/libz-sys-1.1.3.crate",
+        "sha256": "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66",
         "dest": "cargo/vendor",
-        "dest-filename": "libz-sys-1.1.2.crate"
+        "dest-filename": "libz-sys-1.1.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libz-sys-1.1.2",
+        "url": "data:%7B%22package%22%3A%20%22de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libz-sys-1.1.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2250,15 +2250,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/lock_api/lock_api-0.4.2.crate",
-        "sha256": "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312",
+        "url": "https://static.crates.io/crates/lock_api/lock_api-0.4.5.crate",
+        "sha256": "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109",
         "dest": "cargo/vendor",
-        "dest-filename": "lock_api-0.4.2.crate"
+        "dest-filename": "lock_api-0.4.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/lock_api-0.4.2",
+        "url": "data:%7B%22package%22%3A%20%22712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/lock_api-0.4.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2315,15 +2315,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/matches/matches-0.1.8.crate",
-        "sha256": "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08",
+        "url": "https://static.crates.io/crates/matches/matches-0.1.9.crate",
+        "sha256": "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f",
         "dest": "cargo/vendor",
-        "dest-filename": "matches-0.1.8.crate"
+        "dest-filename": "matches-0.1.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/matches-0.1.8",
+        "url": "data:%7B%22package%22%3A%20%22a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/matches-0.1.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2341,15 +2341,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/memoffset/memoffset-0.6.4.crate",
-        "sha256": "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9",
+        "url": "https://static.crates.io/crates/memoffset/memoffset-0.6.5.crate",
+        "sha256": "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce",
         "dest": "cargo/vendor",
-        "dest-filename": "memoffset-0.6.4.crate"
+        "dest-filename": "memoffset-0.6.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2259accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/memoffset-0.6.4",
+        "url": "data:%7B%22package%22%3A%20%225aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/memoffset-0.6.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2367,15 +2367,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/mio/mio-0.7.11.crate",
-        "sha256": "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956",
+        "url": "https://static.crates.io/crates/mio/mio-0.7.14.crate",
+        "sha256": "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc",
         "dest": "cargo/vendor",
-        "dest-filename": "mio-0.7.11.crate"
+        "dest-filename": "mio-0.7.14.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/mio-0.7.11",
+        "url": "data:%7B%22package%22%3A%20%228067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/mio-0.7.14",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2393,28 +2393,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/multimap/multimap-0.8.2.crate",
-        "sha256": "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333",
+        "url": "https://static.crates.io/crates/multimap/multimap-0.8.3.crate",
+        "sha256": "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a",
         "dest": "cargo/vendor",
-        "dest-filename": "multimap-0.8.2.crate"
+        "dest-filename": "multimap-0.8.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/multimap-0.8.2",
+        "url": "data:%7B%22package%22%3A%20%22e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/multimap-0.8.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/nb-connect/nb-connect-1.0.2.crate",
-        "sha256": "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998",
+        "url": "https://static.crates.io/crates/nb-connect/nb-connect-1.2.0.crate",
+        "sha256": "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15",
         "dest": "cargo/vendor",
-        "dest-filename": "nb-connect-1.0.2.crate"
+        "dest-filename": "nb-connect-1.2.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/nb-connect-1.0.2",
+        "url": "data:%7B%22package%22%3A%20%22b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/nb-connect-1.2.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2430,6 +2430,19 @@
         "dest": "cargo/vendor/ndk-0.3.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/ndk/ndk-0.6.0.crate",
+        "sha256": "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4",
+        "dest": "cargo/vendor",
+        "dest-filename": "ndk-0.6.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%222032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ndk-0.6.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/ndk-glue/ndk-glue-0.3.0.crate",
@@ -2443,6 +2456,19 @@
         "dest": "cargo/vendor/ndk-glue-0.3.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/ndk-glue/ndk-glue-0.6.0.crate",
+        "sha256": "04c0d14b0858eb9962a5dac30b809b19f19da7e4547d64af2b0bb051d2e55d79",
+        "dest": "cargo/vendor",
+        "dest-filename": "ndk-glue-0.6.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2204c0d14b0858eb9962a5dac30b809b19f19da7e4547d64af2b0bb051d2e55d79%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ndk-glue-0.6.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/ndk-macro/ndk-macro-0.2.0.crate",
@@ -2458,15 +2484,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/ndk-sys/ndk-sys-0.2.1.crate",
-        "sha256": "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d",
+        "url": "https://static.crates.io/crates/ndk-macro/ndk-macro-0.3.0.crate",
+        "sha256": "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c",
+        "dest": "cargo/vendor",
+        "dest-filename": "ndk-macro-0.3.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%220df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ndk-macro-0.3.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/ndk-sys/ndk-sys-0.2.2.crate",
+        "sha256": "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121",
+        "dest": "cargo/vendor",
+        "dest-filename": "ndk-sys-0.2.2.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ndk-sys-0.2.2",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/ndk-sys/ndk-sys-0.3.0.crate",
+        "sha256": "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97",
         "dest": "cargo/vendor",
-        "dest-filename": "ndk-sys-0.2.1.crate"
+        "dest-filename": "ndk-sys-0.3.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/ndk-sys-0.2.1",
+        "url": "data:%7B%22package%22%3A%20%226e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ndk-sys-0.3.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2510,15 +2562,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/nom/nom-5.1.1.crate",
-        "sha256": "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6",
+        "url": "https://static.crates.io/crates/nom/nom-5.1.2.crate",
+        "sha256": "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af",
         "dest": "cargo/vendor",
-        "dest-filename": "nom-5.1.1.crate"
+        "dest-filename": "nom-5.1.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%220b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/nom-5.1.1",
+        "url": "data:%7B%22package%22%3A%20%22ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/nom-5.1.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2549,28 +2601,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/num-bigint/num-bigint-0.3.1.crate",
-        "sha256": "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf",
+        "url": "https://static.crates.io/crates/num-bigint/num-bigint-0.3.3.crate",
+        "sha256": "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3",
         "dest": "cargo/vendor",
-        "dest-filename": "num-bigint-0.3.1.crate"
+        "dest-filename": "num-bigint-0.3.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%225e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/num-bigint-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%225f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/num-bigint-0.3.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/num-bigint/num-bigint-0.4.0.crate",
-        "sha256": "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512",
+        "url": "https://static.crates.io/crates/num-bigint/num-bigint-0.4.3.crate",
+        "sha256": "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f",
         "dest": "cargo/vendor",
-        "dest-filename": "num-bigint-0.4.0.crate"
+        "dest-filename": "num-bigint-0.4.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/num-bigint-0.4.0",
+        "url": "data:%7B%22package%22%3A%20%22f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/num-bigint-0.4.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2653,41 +2705,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/num_cpus/num_cpus-1.13.0.crate",
-        "sha256": "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3",
+        "url": "https://static.crates.io/crates/num_cpus/num_cpus-1.13.1.crate",
+        "sha256": "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1",
         "dest": "cargo/vendor",
-        "dest-filename": "num_cpus-1.13.0.crate"
+        "dest-filename": "num_cpus-1.13.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2205499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/num_cpus-1.13.0",
+        "url": "data:%7B%22package%22%3A%20%2219e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/num_cpus-1.13.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/num_enum/num_enum-0.5.1.crate",
-        "sha256": "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066",
+        "url": "https://static.crates.io/crates/num_enum/num_enum-0.5.6.crate",
+        "sha256": "720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad",
         "dest": "cargo/vendor",
-        "dest-filename": "num_enum-0.5.1.crate"
+        "dest-filename": "num_enum-0.5.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/num_enum-0.5.1",
+        "url": "data:%7B%22package%22%3A%20%22720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/num_enum-0.5.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/num_enum_derive/num_enum_derive-0.5.1.crate",
-        "sha256": "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e",
+        "url": "https://static.crates.io/crates/num_enum_derive/num_enum_derive-0.5.6.crate",
+        "sha256": "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21",
         "dest": "cargo/vendor",
-        "dest-filename": "num_enum_derive-0.5.1.crate"
+        "dest-filename": "num_enum_derive-0.5.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/num_enum_derive-0.5.1",
+        "url": "data:%7B%22package%22%3A%20%220d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/num_enum_derive-0.5.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2731,28 +2783,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/oboe/oboe-0.4.1.crate",
-        "sha256": "4cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4",
+        "url": "https://static.crates.io/crates/oboe/oboe-0.4.5.crate",
+        "sha256": "2463c8f2e19b4e0d0710a21f8e4011501ff28db1c95d7a5482a553b2100502d2",
         "dest": "cargo/vendor",
-        "dest-filename": "oboe-0.4.1.crate"
+        "dest-filename": "oboe-0.4.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/oboe-0.4.1",
+        "url": "data:%7B%22package%22%3A%20%222463c8f2e19b4e0d0710a21f8e4011501ff28db1c95d7a5482a553b2100502d2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/oboe-0.4.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/oboe-sys/oboe-sys-0.4.0.crate",
-        "sha256": "fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103",
+        "url": "https://static.crates.io/crates/oboe-sys/oboe-sys-0.4.5.crate",
+        "sha256": "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd",
         "dest": "cargo/vendor",
-        "dest-filename": "oboe-sys-0.4.0.crate"
+        "dest-filename": "oboe-sys-0.4.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/oboe-sys-0.4.0",
+        "url": "data:%7B%22package%22%3A%20%223370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/oboe-sys-0.4.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2770,15 +2822,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/once_cell/once_cell-1.5.2.crate",
-        "sha256": "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0",
+        "url": "https://static.crates.io/crates/once_cell/once_cell-1.9.0.crate",
+        "sha256": "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5",
         "dest": "cargo/vendor",
-        "dest-filename": "once_cell-1.5.2.crate"
+        "dest-filename": "once_cell-1.9.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2213bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/once_cell-1.5.2",
+        "url": "data:%7B%22package%22%3A%20%22da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/once_cell-1.9.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2796,28 +2848,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.2.crate",
-        "sha256": "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de",
+        "url": "https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.5.crate",
+        "sha256": "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf",
         "dest": "cargo/vendor",
-        "dest-filename": "openssl-probe-0.1.2.crate"
+        "dest-filename": "openssl-probe-0.1.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2277af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/openssl-probe-0.1.2",
+        "url": "data:%7B%22package%22%3A%20%22ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/openssl-probe-0.1.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.56.crate",
-        "sha256": "f02309a7f127000ed50594f0b50ecc69e7c654e16d41b4e8156d1b3df8e0b52e",
+        "url": "https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.72.crate",
+        "sha256": "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb",
         "dest": "cargo/vendor",
-        "dest-filename": "openssl-sys-0.9.56.crate"
+        "dest-filename": "openssl-sys-0.9.72.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f02309a7f127000ed50594f0b50ecc69e7c654e16d41b4e8156d1b3df8e0b52e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/openssl-sys-0.9.56",
+        "url": "data:%7B%22package%22%3A%20%227e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/openssl-sys-0.9.72",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2835,15 +2887,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/pango/pango-0.14.0.crate",
-        "sha256": "415823a4fb9f1789785cd6e2d2413816f2ecff92380382969aaca9c400e13a19",
+        "url": "https://static.crates.io/crates/pango/pango-0.14.8.crate",
+        "sha256": "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581",
         "dest": "cargo/vendor",
-        "dest-filename": "pango-0.14.0.crate"
+        "dest-filename": "pango-0.14.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22415823a4fb9f1789785cd6e2d2413816f2ecff92380382969aaca9c400e13a19%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pango-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%22546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/pango-0.14.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2874,28 +2926,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/parking_lot/parking_lot-0.11.1.crate",
-        "sha256": "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb",
+        "url": "https://static.crates.io/crates/parking_lot/parking_lot-0.11.2.crate",
+        "sha256": "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99",
         "dest": "cargo/vendor",
-        "dest-filename": "parking_lot-0.11.1.crate"
+        "dest-filename": "parking_lot-0.11.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/parking_lot-0.11.1",
+        "url": "data:%7B%22package%22%3A%20%227d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/parking_lot-0.11.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.3.crate",
-        "sha256": "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018",
+        "url": "https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.5.crate",
+        "sha256": "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216",
         "dest": "cargo/vendor",
-        "dest-filename": "parking_lot_core-0.8.3.crate"
+        "dest-filename": "parking_lot_core-0.8.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/parking_lot_core-0.8.3",
+        "url": "data:%7B%22package%22%3A%20%22d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/parking_lot_core-0.8.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2952,80 +3004,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/pin-project/pin-project-0.4.16.crate",
-        "sha256": "81d480cb4e89522ccda96d0eed9af94180b7a5f93fb28f66e1fd7d68431663d1",
-        "dest": "cargo/vendor",
-        "dest-filename": "pin-project-0.4.16.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2281d480cb4e89522ccda96d0eed9af94180b7a5f93fb28f66e1fd7d68431663d1%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pin-project-0.4.16",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/pin-project/pin-project-1.0.2.crate",
-        "sha256": "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7",
-        "dest": "cargo/vendor",
-        "dest-filename": "pin-project-1.0.2.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%229ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pin-project-1.0.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/pin-project-internal/pin-project-internal-0.4.16.crate",
-        "sha256": "a82996f11efccb19b685b14b5df818de31c1edcee3daa256ab5775dd98e72feb",
+        "url": "https://static.crates.io/crates/pin-project/pin-project-1.0.10.crate",
+        "sha256": "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e",
         "dest": "cargo/vendor",
-        "dest-filename": "pin-project-internal-0.4.16.crate"
+        "dest-filename": "pin-project-1.0.10.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a82996f11efccb19b685b14b5df818de31c1edcee3daa256ab5775dd98e72feb%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pin-project-internal-0.4.16",
+        "url": "data:%7B%22package%22%3A%20%2258ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/pin-project-1.0.10",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.0.2.crate",
-        "sha256": "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f",
+        "url": "https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.0.10.crate",
+        "sha256": "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb",
         "dest": "cargo/vendor",
-        "dest-filename": "pin-project-internal-1.0.2.crate"
+        "dest-filename": "pin-project-internal-1.0.10.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pin-project-internal-1.0.2",
+        "url": "data:%7B%22package%22%3A%20%22744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/pin-project-internal-1.0.10",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.1.11.crate",
-        "sha256": "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b",
+        "url": "https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.8.crate",
+        "sha256": "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c",
         "dest": "cargo/vendor",
-        "dest-filename": "pin-project-lite-0.1.11.crate"
+        "dest-filename": "pin-project-lite-0.2.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pin-project-lite-0.1.11",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.4.crate",
-        "sha256": "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827",
-        "dest": "cargo/vendor",
-        "dest-filename": "pin-project-lite-0.2.4.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pin-project-lite-0.2.4",
+        "url": "data:%7B%22package%22%3A%20%22e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/pin-project-lite-0.2.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3043,54 +3056,54 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/pkg-config/pkg-config-0.3.17.crate",
-        "sha256": "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677",
+        "url": "https://static.crates.io/crates/pkg-config/pkg-config-0.3.24.crate",
+        "sha256": "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe",
         "dest": "cargo/vendor",
-        "dest-filename": "pkg-config-0.3.17.crate"
+        "dest-filename": "pkg-config-0.3.24.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2205da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pkg-config-0.3.17",
+        "url": "data:%7B%22package%22%3A%20%2258893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/pkg-config-0.3.24",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/polling/polling-2.0.2.crate",
-        "sha256": "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4",
+        "url": "https://static.crates.io/crates/polling/polling-2.2.0.crate",
+        "sha256": "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259",
         "dest": "cargo/vendor",
-        "dest-filename": "polling-2.0.2.crate"
+        "dest-filename": "polling-2.2.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/polling-2.0.2",
+        "url": "data:%7B%22package%22%3A%20%22685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/polling-2.2.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.10.crate",
-        "sha256": "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857",
+        "url": "https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.16.crate",
+        "sha256": "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872",
         "dest": "cargo/vendor",
-        "dest-filename": "ppv-lite86-0.2.10.crate"
+        "dest-filename": "ppv-lite86-0.2.16.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/ppv-lite86-0.2.10",
+        "url": "data:%7B%22package%22%3A%20%22eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ppv-lite86-0.2.16",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/priority-queue/priority-queue-1.1.1.crate",
-        "sha256": "8e1340009a04e81f656a4e45e295f0b1191c81de424bf940c865e33577a8e223",
+        "url": "https://static.crates.io/crates/priority-queue/priority-queue-1.2.1.crate",
+        "sha256": "00ba480ac08d3cfc40dea10fd466fd2c14dee3ea6fc7873bc4079eda2727caf0",
         "dest": "cargo/vendor",
-        "dest-filename": "priority-queue-1.1.1.crate"
+        "dest-filename": "priority-queue-1.2.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228e1340009a04e81f656a4e45e295f0b1191c81de424bf940c865e33577a8e223%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/priority-queue-1.1.1",
+        "url": "data:%7B%22package%22%3A%20%2200ba480ac08d3cfc40dea10fd466fd2c14dee3ea6fc7873bc4079eda2727caf0%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/priority-queue-1.2.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3108,15 +3121,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-1.0.0.crate",
-        "sha256": "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92",
+        "url": "https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-1.1.0.crate",
+        "sha256": "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83",
         "dest": "cargo/vendor",
-        "dest-filename": "proc-macro-crate-1.0.0.crate"
+        "dest-filename": "proc-macro-crate-1.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2241fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/proc-macro-crate-1.0.0",
+        "url": "data:%7B%22package%22%3A%20%221ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/proc-macro-crate-1.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3147,15 +3160,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.24.crate",
-        "sha256": "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71",
+        "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.36.crate",
+        "sha256": "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029",
         "dest": "cargo/vendor",
-        "dest-filename": "proc-macro2-1.0.24.crate"
+        "dest-filename": "proc-macro2-1.0.36.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/proc-macro2-1.0.24",
+        "url": "data:%7B%22package%22%3A%20%22c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/proc-macro2-1.0.36",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3199,28 +3212,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/quote/quote-1.0.8.crate",
-        "sha256": "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df",
-        "dest": "cargo/vendor",
-        "dest-filename": "quote-1.0.8.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/quote-1.0.8",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/rand/rand-0.7.3.crate",
-        "sha256": "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03",
+        "url": "https://static.crates.io/crates/quote/quote-1.0.14.crate",
+        "sha256": "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d",
         "dest": "cargo/vendor",
-        "dest-filename": "rand-0.7.3.crate"
+        "dest-filename": "quote-1.0.14.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand-0.7.3",
+        "url": "data:%7B%22package%22%3A%20%2247aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/quote-1.0.14",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3238,54 +3238,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/rand_chacha/rand_chacha-0.2.2.crate",
-        "sha256": "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402",
-        "dest": "cargo/vendor",
-        "dest-filename": "rand_chacha-0.2.2.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand_chacha-0.2.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.0.crate",
-        "sha256": "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d",
-        "dest": "cargo/vendor",
-        "dest-filename": "rand_chacha-0.3.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand_chacha-0.3.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/rand_core/rand_core-0.5.1.crate",
-        "sha256": "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19",
+        "url": "https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate",
+        "sha256": "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88",
         "dest": "cargo/vendor",
-        "dest-filename": "rand_core-0.5.1.crate"
+        "dest-filename": "rand_chacha-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2290bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand_core-0.5.1",
+        "url": "data:%7B%22package%22%3A%20%22e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/rand_chacha-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/rand_core/rand_core-0.6.1.crate",
-        "sha256": "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5",
+        "url": "https://static.crates.io/crates/rand_core/rand_core-0.6.3.crate",
+        "sha256": "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7",
         "dest": "cargo/vendor",
-        "dest-filename": "rand_core-0.6.1.crate"
+        "dest-filename": "rand_core-0.6.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand_core-0.6.1",
+        "url": "data:%7B%22package%22%3A%20%22d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/rand_core-0.6.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3303,54 +3277,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/rand_hc/rand_hc-0.2.0.crate",
-        "sha256": "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c",
-        "dest": "cargo/vendor",
-        "dest-filename": "rand_hc-0.2.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand_hc-0.2.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/rand_hc/rand_hc-0.3.0.crate",
-        "sha256": "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73",
-        "dest": "cargo/vendor",
-        "dest-filename": "rand_hc-0.3.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%223190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand_hc-0.3.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/redox_syscall/redox_syscall-0.1.56.crate",
-        "sha256": "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84",
+        "url": "https://static.crates.io/crates/rand_hc/rand_hc-0.3.1.crate",
+        "sha256": "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7",
         "dest": "cargo/vendor",
-        "dest-filename": "redox_syscall-0.1.56.crate"
+        "dest-filename": "rand_hc-0.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/redox_syscall-0.1.56",
+        "url": "data:%7B%22package%22%3A%20%22d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/rand_hc-0.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.8.crate",
-        "sha256": "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc",
+        "url": "https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.10.crate",
+        "sha256": "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff",
         "dest": "cargo/vendor",
-        "dest-filename": "redox_syscall-0.2.8.crate"
+        "dest-filename": "redox_syscall-0.2.10.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/redox_syscall-0.2.8",
+        "url": "data:%7B%22package%22%3A%20%228383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/redox_syscall-0.2.10",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3394,15 +3342,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/remove_dir_all/remove_dir_all-0.5.2.crate",
-        "sha256": "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e",
+        "url": "https://static.crates.io/crates/remove_dir_all/remove_dir_all-0.5.3.crate",
+        "sha256": "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7",
         "dest": "cargo/vendor",
-        "dest-filename": "remove_dir_all-0.5.2.crate"
+        "dest-filename": "remove_dir_all-0.5.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/remove_dir_all-0.5.2",
+        "url": "data:%7B%22package%22%3A%20%223acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/remove_dir_all-0.5.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3459,15 +3407,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/ryu/ryu-1.0.4.crate",
-        "sha256": "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1",
+        "url": "https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate",
+        "sha256": "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366",
+        "dest": "cargo/vendor",
+        "dest-filename": "rustc_version-0.4.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/rustc_version-0.4.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/ryu/ryu-1.0.9.crate",
+        "sha256": "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f",
         "dest": "cargo/vendor",
-        "dest-filename": "ryu-1.0.4.crate"
+        "dest-filename": "ryu-1.0.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/ryu-1.0.4",
+        "url": "data:%7B%22package%22%3A%20%2273b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/ryu-1.0.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3548,6 +3509,19 @@
         "dest": "cargo/vendor/semver-0.11.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/semver/semver-1.0.4.crate",
+        "sha256": "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012",
+        "dest": "cargo/vendor",
+        "dest-filename": "semver-1.0.4.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/semver-1.0.4",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/semver-parser/semver-parser-0.10.2.crate",
@@ -3563,67 +3537,67 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde/serde-1.0.130.crate",
-        "sha256": "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913",
+        "url": "https://static.crates.io/crates/serde/serde-1.0.133.crate",
+        "sha256": "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a",
         "dest": "cargo/vendor",
-        "dest-filename": "serde-1.0.130.crate"
+        "dest-filename": "serde-1.0.133.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde-1.0.130",
+        "url": "data:%7B%22package%22%3A%20%2297565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde-1.0.133",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde_derive/serde_derive-1.0.130.crate",
-        "sha256": "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b",
+        "url": "https://static.crates.io/crates/serde_derive/serde_derive-1.0.133.crate",
+        "sha256": "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537",
         "dest": "cargo/vendor",
-        "dest-filename": "serde_derive-1.0.130.crate"
+        "dest-filename": "serde_derive-1.0.133.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde_derive-1.0.130",
+        "url": "data:%7B%22package%22%3A%20%22ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde_derive-1.0.133",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.72.crate",
-        "sha256": "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527",
+        "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.74.crate",
+        "sha256": "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142",
         "dest": "cargo/vendor",
-        "dest-filename": "serde_json-1.0.72.crate"
+        "dest-filename": "serde_json-1.0.74.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde_json-1.0.72",
+        "url": "data:%7B%22package%22%3A%20%22ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde_json-1.0.74",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde_repr/serde_repr-0.1.6.crate",
-        "sha256": "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76",
+        "url": "https://static.crates.io/crates/serde_repr/serde_repr-0.1.7.crate",
+        "sha256": "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5",
         "dest": "cargo/vendor",
-        "dest-filename": "serde_repr-0.1.6.crate"
+        "dest-filename": "serde_repr-0.1.7.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde_repr-0.1.6",
+        "url": "data:%7B%22package%22%3A%20%2298d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde_repr-0.1.7",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/sha-1/sha-1-0.9.5.crate",
-        "sha256": "b659df5fc3ce22274daac600ffb845300bd2125bcfaec047823075afdab81c00",
+        "url": "https://static.crates.io/crates/sha-1/sha-1-0.9.8.crate",
+        "sha256": "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6",
         "dest": "cargo/vendor",
-        "dest-filename": "sha-1-0.9.5.crate"
+        "dest-filename": "sha-1-0.9.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b659df5fc3ce22274daac600ffb845300bd2125bcfaec047823075afdab81c00%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/sha-1-0.9.5",
+        "url": "data:%7B%22package%22%3A%20%2299cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/sha-1-0.9.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3641,15 +3615,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/sha2/sha2-0.9.2.crate",
-        "sha256": "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8",
+        "url": "https://static.crates.io/crates/sha2/sha2-0.9.9.crate",
+        "sha256": "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800",
         "dest": "cargo/vendor",
-        "dest-filename": "sha2-0.9.2.crate"
+        "dest-filename": "sha2-0.9.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/sha2-0.9.2",
+        "url": "data:%7B%22package%22%3A%20%224d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/sha2-0.9.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3693,93 +3667,67 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.2.0.crate",
-        "sha256": "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41",
-        "dest": "cargo/vendor",
-        "dest-filename": "signal-hook-registry-1.2.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2294f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/signal-hook-registry-1.2.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/slab/slab-0.4.2.crate",
-        "sha256": "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8",
-        "dest": "cargo/vendor",
-        "dest-filename": "slab-0.4.2.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/slab-0.4.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/sluice/sluice-0.5.4.crate",
-        "sha256": "8fa0333a60ff2e3474a6775cc611840c2a55610c831dd366503474c02f1a28f5",
+        "url": "https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.0.crate",
+        "sha256": "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0",
         "dest": "cargo/vendor",
-        "dest-filename": "sluice-0.5.4.crate"
+        "dest-filename": "signal-hook-registry-1.4.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228fa0333a60ff2e3474a6775cc611840c2a55610c831dd366503474c02f1a28f5%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/sluice-0.5.4",
+        "url": "data:%7B%22package%22%3A%20%22e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/signal-hook-registry-1.4.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/smallvec/smallvec-1.6.1.crate",
-        "sha256": "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e",
+        "url": "https://static.crates.io/crates/slab/slab-0.4.5.crate",
+        "sha256": "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5",
         "dest": "cargo/vendor",
-        "dest-filename": "smallvec-1.6.1.crate"
+        "dest-filename": "slab-0.4.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/smallvec-1.6.1",
+        "url": "data:%7B%22package%22%3A%20%229def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/slab-0.4.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/socket2/socket2-0.3.12.crate",
-        "sha256": "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918",
+        "url": "https://static.crates.io/crates/sluice/sluice-0.5.5.crate",
+        "sha256": "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5",
         "dest": "cargo/vendor",
-        "dest-filename": "socket2-0.3.12.crate"
+        "dest-filename": "sluice-0.5.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2203088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/socket2-0.3.12",
+        "url": "data:%7B%22package%22%3A%20%226d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/sluice-0.5.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/socket2/socket2-0.4.0.crate",
-        "sha256": "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2",
+        "url": "https://static.crates.io/crates/smallvec/smallvec-1.8.0.crate",
+        "sha256": "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83",
         "dest": "cargo/vendor",
-        "dest-filename": "socket2-0.4.0.crate"
+        "dest-filename": "smallvec-1.8.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%229e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/socket2-0.4.0",
+        "url": "data:%7B%22package%22%3A%20%22f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/smallvec-1.8.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/spinning_top/spinning_top-0.2.2.crate",
-        "sha256": "7e529d73e80d64b5f2631f9035113347c578a1c9c7774b83a2b880788459ab36",
+        "url": "https://static.crates.io/crates/socket2/socket2-0.4.2.crate",
+        "sha256": "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516",
         "dest": "cargo/vendor",
-        "dest-filename": "spinning_top-0.2.2.crate"
+        "dest-filename": "socket2-0.4.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227e529d73e80d64b5f2631f9035113347c578a1c9c7774b83a2b880788459ab36%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/spinning_top-0.2.2",
+        "url": "data:%7B%22package%22%3A%20%225dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/socket2-0.4.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3823,80 +3771,93 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/strum/strum-0.20.0.crate",
-        "sha256": "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c",
+        "url": "https://static.crates.io/crates/strsim/strsim-0.10.0.crate",
+        "sha256": "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623",
+        "dest": "cargo/vendor",
+        "dest-filename": "strsim-0.10.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2273473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/strsim-0.10.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/strum/strum-0.21.0.crate",
+        "sha256": "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2",
         "dest": "cargo/vendor",
-        "dest-filename": "strum-0.20.0.crate"
+        "dest-filename": "strum-0.21.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/strum-0.20.0",
+        "url": "data:%7B%22package%22%3A%20%22aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/strum-0.21.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/strum_macros/strum_macros-0.20.1.crate",
-        "sha256": "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149",
+        "url": "https://static.crates.io/crates/strum_macros/strum_macros-0.21.1.crate",
+        "sha256": "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec",
         "dest": "cargo/vendor",
-        "dest-filename": "strum_macros-0.20.1.crate"
+        "dest-filename": "strum_macros-0.21.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/strum_macros-0.20.1",
+        "url": "data:%7B%22package%22%3A%20%22d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/strum_macros-0.21.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/subtle/subtle-2.3.0.crate",
-        "sha256": "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd",
+        "url": "https://static.crates.io/crates/subtle/subtle-2.4.1.crate",
+        "sha256": "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601",
         "dest": "cargo/vendor",
-        "dest-filename": "subtle-2.3.0.crate"
+        "dest-filename": "subtle-2.4.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/subtle-2.3.0",
+        "url": "data:%7B%22package%22%3A%20%226bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/subtle-2.4.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/syn/syn-1.0.60.crate",
-        "sha256": "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081",
+        "url": "https://static.crates.io/crates/syn/syn-1.0.85.crate",
+        "sha256": "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7",
         "dest": "cargo/vendor",
-        "dest-filename": "syn-1.0.60.crate"
+        "dest-filename": "syn-1.0.85.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/syn-1.0.60",
+        "url": "data:%7B%22package%22%3A%20%22a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/syn-1.0.85",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/synstructure/synstructure-0.12.4.crate",
-        "sha256": "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701",
+        "url": "https://static.crates.io/crates/synstructure/synstructure-0.12.6.crate",
+        "sha256": "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f",
         "dest": "cargo/vendor",
-        "dest-filename": "synstructure-0.12.4.crate"
+        "dest-filename": "synstructure-0.12.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/synstructure-0.12.4",
+        "url": "data:%7B%22package%22%3A%20%22f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/synstructure-0.12.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/system-deps/system-deps-3.1.1.crate",
-        "sha256": "c248107ad7bc1ac07066a4d003cae9e9a7bc2e27d3418f7a9cdcdc8699dbea70",
+        "url": "https://static.crates.io/crates/system-deps/system-deps-3.2.0.crate",
+        "sha256": "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6",
         "dest": "cargo/vendor",
-        "dest-filename": "system-deps-3.1.1.crate"
+        "dest-filename": "system-deps-3.2.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c248107ad7bc1ac07066a4d003cae9e9a7bc2e27d3418f7a9cdcdc8699dbea70%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/system-deps-3.1.1",
+        "url": "data:%7B%22package%22%3A%20%22480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/system-deps-3.2.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3914,28 +3875,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tempfile/tempfile-3.1.0.crate",
-        "sha256": "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9",
+        "url": "https://static.crates.io/crates/temp-dir/temp-dir-0.1.11.crate",
+        "sha256": "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab",
+        "dest": "cargo/vendor",
+        "dest-filename": "temp-dir-0.1.11.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/temp-dir-0.1.11",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/tempfile/tempfile-3.3.0.crate",
+        "sha256": "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4",
         "dest": "cargo/vendor",
-        "dest-filename": "tempfile-3.1.0.crate"
+        "dest-filename": "tempfile-3.3.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tempfile-3.1.0",
+        "url": "data:%7B%22package%22%3A%20%225cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tempfile-3.3.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/termcolor/termcolor-1.1.0.crate",
-        "sha256": "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f",
+        "url": "https://static.crates.io/crates/termcolor/termcolor-1.1.2.crate",
+        "sha256": "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4",
         "dest": "cargo/vendor",
-        "dest-filename": "termcolor-1.1.0.crate"
+        "dest-filename": "termcolor-1.1.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/termcolor-1.1.0",
+        "url": "data:%7B%22package%22%3A%20%222dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/termcolor-1.1.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3979,15 +3953,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tinyvec/tinyvec-1.2.0.crate",
-        "sha256": "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342",
+        "url": "https://static.crates.io/crates/tinyvec/tinyvec-1.5.1.crate",
+        "sha256": "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2",
         "dest": "cargo/vendor",
-        "dest-filename": "tinyvec-1.2.0.crate"
+        "dest-filename": "tinyvec-1.5.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%225b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tinyvec-1.2.0",
+        "url": "data:%7B%22package%22%3A%20%222c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tinyvec-1.5.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4005,67 +3979,67 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tokio/tokio-1.13.0.crate",
-        "sha256": "588b2d10a336da58d877567cd8fb8a14b463e2104910f8132cd054b4b96e29ee",
+        "url": "https://static.crates.io/crates/tokio/tokio-1.15.0.crate",
+        "sha256": "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838",
         "dest": "cargo/vendor",
-        "dest-filename": "tokio-1.13.0.crate"
+        "dest-filename": "tokio-1.15.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22588b2d10a336da58d877567cd8fb8a14b463e2104910f8132cd054b4b96e29ee%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tokio-1.13.0",
+        "url": "data:%7B%22package%22%3A%20%22fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tokio-1.15.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tokio-macros/tokio-macros-1.1.0.crate",
-        "sha256": "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57",
+        "url": "https://static.crates.io/crates/tokio-macros/tokio-macros-1.7.0.crate",
+        "sha256": "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7",
         "dest": "cargo/vendor",
-        "dest-filename": "tokio-macros-1.1.0.crate"
+        "dest-filename": "tokio-macros-1.7.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tokio-macros-1.1.0",
+        "url": "data:%7B%22package%22%3A%20%22b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tokio-macros-1.7.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tokio-stream/tokio-stream-0.1.5.crate",
-        "sha256": "e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0",
+        "url": "https://static.crates.io/crates/tokio-stream/tokio-stream-0.1.8.crate",
+        "sha256": "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3",
         "dest": "cargo/vendor",
-        "dest-filename": "tokio-stream-0.1.5.crate"
+        "dest-filename": "tokio-stream-0.1.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tokio-stream-0.1.5",
+        "url": "data:%7B%22package%22%3A%20%2250145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tokio-stream-0.1.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tokio-util/tokio-util-0.6.6.crate",
-        "sha256": "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e",
+        "url": "https://static.crates.io/crates/tokio-util/tokio-util-0.6.9.crate",
+        "sha256": "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0",
         "dest": "cargo/vendor",
-        "dest-filename": "tokio-util-0.6.6.crate"
+        "dest-filename": "tokio-util-0.6.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tokio-util-0.6.6",
+        "url": "data:%7B%22package%22%3A%20%229e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tokio-util-0.6.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/toml/toml-0.5.7.crate",
-        "sha256": "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645",
+        "url": "https://static.crates.io/crates/toml/toml-0.5.8.crate",
+        "sha256": "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa",
         "dest": "cargo/vendor",
-        "dest-filename": "toml-0.5.7.crate"
+        "dest-filename": "toml-0.5.8.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2275cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/toml-0.5.7",
+        "url": "data:%7B%22package%22%3A%20%22a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/toml-0.5.8",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4083,54 +4057,54 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tracing/tracing-0.1.22.crate",
-        "sha256": "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3",
+        "url": "https://static.crates.io/crates/tracing/tracing-0.1.29.crate",
+        "sha256": "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105",
         "dest": "cargo/vendor",
-        "dest-filename": "tracing-0.1.22.crate"
+        "dest-filename": "tracing-0.1.29.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%229f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tracing-0.1.22",
+        "url": "data:%7B%22package%22%3A%20%22375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tracing-0.1.29",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.11.crate",
-        "sha256": "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada",
+        "url": "https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.18.crate",
+        "sha256": "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e",
         "dest": "cargo/vendor",
-        "dest-filename": "tracing-attributes-0.1.11.crate"
+        "dest-filename": "tracing-attributes-0.1.18.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2280e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tracing-attributes-0.1.11",
+        "url": "data:%7B%22package%22%3A%20%22f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tracing-attributes-0.1.18",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tracing-core/tracing-core-0.1.17.crate",
-        "sha256": "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f",
+        "url": "https://static.crates.io/crates/tracing-core/tracing-core-0.1.21.crate",
+        "sha256": "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4",
         "dest": "cargo/vendor",
-        "dest-filename": "tracing-core-0.1.17.crate"
+        "dest-filename": "tracing-core-0.1.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tracing-core-0.1.17",
+        "url": "data:%7B%22package%22%3A%20%221f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tracing-core-0.1.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tracing-futures/tracing-futures-0.2.4.crate",
-        "sha256": "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c",
+        "url": "https://static.crates.io/crates/tracing-futures/tracing-futures-0.2.5.crate",
+        "sha256": "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2",
         "dest": "cargo/vendor",
-        "dest-filename": "tracing-futures-0.2.4.crate"
+        "dest-filename": "tracing-futures-0.2.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tracing-futures-0.2.4",
+        "url": "data:%7B%22package%22%3A%20%2297d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tracing-futures-0.2.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4148,15 +4122,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/typenum/typenum-1.12.0.crate",
-        "sha256": "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33",
+        "url": "https://static.crates.io/crates/typenum/typenum-1.15.0.crate",
+        "sha256": "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987",
         "dest": "cargo/vendor",
-        "dest-filename": "typenum-1.12.0.crate"
+        "dest-filename": "typenum-1.15.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/typenum-1.12.0",
+        "url": "data:%7B%22package%22%3A%20%22dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/typenum-1.15.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4174,80 +4148,80 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.4.crate",
-        "sha256": "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5",
+        "url": "https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.7.crate",
+        "sha256": "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f",
         "dest": "cargo/vendor",
-        "dest-filename": "unicode-bidi-0.3.4.crate"
+        "dest-filename": "unicode-bidi-0.3.7.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2249f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/unicode-bidi-0.3.4",
+        "url": "data:%7B%22package%22%3A%20%221a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/unicode-bidi-0.3.7",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.12.crate",
-        "sha256": "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4",
+        "url": "https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.19.crate",
+        "sha256": "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9",
         "dest": "cargo/vendor",
-        "dest-filename": "unicode-normalization-0.1.12.crate"
+        "dest-filename": "unicode-normalization-0.1.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%225479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/unicode-normalization-0.1.12",
+        "url": "data:%7B%22package%22%3A%20%22d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/unicode-normalization-0.1.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.6.0.crate",
-        "sha256": "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0",
+        "url": "https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.8.0.crate",
+        "sha256": "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b",
         "dest": "cargo/vendor",
-        "dest-filename": "unicode-segmentation-1.6.0.crate"
+        "dest-filename": "unicode-segmentation-1.8.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/unicode-segmentation-1.6.0",
+        "url": "data:%7B%22package%22%3A%20%228895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/unicode-segmentation-1.8.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/unicode-width/unicode-width-0.1.7.crate",
-        "sha256": "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479",
+        "url": "https://static.crates.io/crates/unicode-width/unicode-width-0.1.9.crate",
+        "sha256": "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973",
         "dest": "cargo/vendor",
-        "dest-filename": "unicode-width-0.1.7.crate"
+        "dest-filename": "unicode-width-0.1.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/unicode-width-0.1.7",
+        "url": "data:%7B%22package%22%3A%20%223ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/unicode-width-0.1.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.0.crate",
-        "sha256": "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c",
+        "url": "https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.2.crate",
+        "sha256": "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3",
         "dest": "cargo/vendor",
-        "dest-filename": "unicode-xid-0.2.0.crate"
+        "dest-filename": "unicode-xid-0.2.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/unicode-xid-0.2.0",
+        "url": "data:%7B%22package%22%3A%20%228ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/unicode-xid-0.2.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/url/url-2.2.0.crate",
-        "sha256": "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e",
+        "url": "https://static.crates.io/crates/url/url-2.2.2.crate",
+        "sha256": "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c",
         "dest": "cargo/vendor",
-        "dest-filename": "url-2.2.0.crate"
+        "dest-filename": "url-2.2.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%225909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/url-2.2.0",
+        "url": "data:%7B%22package%22%3A%20%22a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/url-2.2.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4278,41 +4252,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/vcpkg/vcpkg-0.2.8.crate",
-        "sha256": "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168",
-        "dest": "cargo/vendor",
-        "dest-filename": "vcpkg-0.2.8.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%223fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/vcpkg-0.2.8",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/vec-arena/vec-arena-1.0.0.crate",
-        "sha256": "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d",
+        "url": "https://static.crates.io/crates/vcpkg/vcpkg-0.2.15.crate",
+        "sha256": "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426",
         "dest": "cargo/vendor",
-        "dest-filename": "vec-arena-1.0.0.crate"
+        "dest-filename": "vcpkg-0.2.15.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/vec-arena-1.0.0",
+        "url": "data:%7B%22package%22%3A%20%22accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/vcpkg-0.2.15",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/vergen/vergen-3.1.0.crate",
-        "sha256": "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb",
+        "url": "https://static.crates.io/crates/vergen/vergen-3.2.0.crate",
+        "sha256": "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a",
         "dest": "cargo/vendor",
-        "dest-filename": "vergen-3.1.0.crate"
+        "dest-filename": "vergen-3.2.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/vergen-3.1.0",
+        "url": "data:%7B%22package%22%3A%20%22e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/vergen-3.2.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4330,15 +4291,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/version_check/version_check-0.9.1.crate",
-        "sha256": "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce",
+        "url": "https://static.crates.io/crates/version_check/version_check-0.9.4.crate",
+        "sha256": "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f",
         "dest": "cargo/vendor",
-        "dest-filename": "version_check-0.9.1.crate"
+        "dest-filename": "version_check-0.9.4.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/version_check-0.9.1",
+        "url": "data:%7B%22package%22%3A%20%2249874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/version_check-0.9.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4395,132 +4356,119 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate",
-        "sha256": "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519",
-        "dest": "cargo/vendor",
-        "dest-filename": "wasi-0.9.0+wasi-snapshot-preview1.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasi-0.9.0+wasi-snapshot-preview1",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/wasi/wasi-0.10.1+wasi-snapshot-preview1.crate",
-        "sha256": "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9",
+        "url": "https://static.crates.io/crates/wasi/wasi-0.10.2+wasi-snapshot-preview1.crate",
+        "sha256": "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6",
         "dest": "cargo/vendor",
-        "dest-filename": "wasi-0.10.1+wasi-snapshot-preview1.crate"
+        "dest-filename": "wasi-0.10.2+wasi-snapshot-preview1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2293c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasi-0.10.1+wasi-snapshot-preview1",
+        "url": "data:%7B%22package%22%3A%20%22fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasi-0.10.2+wasi-snapshot-preview1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.69.crate",
-        "sha256": "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e",
+        "url": "https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.78.crate",
+        "sha256": "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-0.2.69.crate"
+        "dest-filename": "wasm-bindgen-0.2.78.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%223cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-0.2.69",
+        "url": "data:%7B%22package%22%3A%20%22632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-0.2.78",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.69.crate",
-        "sha256": "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62",
+        "url": "https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.78.crate",
+        "sha256": "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-backend-0.2.69.crate"
+        "dest-filename": "wasm-bindgen-backend-0.2.78.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-backend-0.2.69",
+        "url": "data:%7B%22package%22%3A%20%22a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-backend-0.2.78",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.19.crate",
-        "sha256": "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35",
+        "url": "https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.28.crate",
+        "sha256": "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-futures-0.4.19.crate"
+        "dest-filename": "wasm-bindgen-futures-0.4.28.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-futures-0.4.19",
+        "url": "data:%7B%22package%22%3A%20%228e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-futures-0.4.28",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.69.crate",
-        "sha256": "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084",
+        "url": "https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.78.crate",
+        "sha256": "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-macro-0.2.69.crate"
+        "dest-filename": "wasm-bindgen-macro-0.2.78.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-macro-0.2.69",
+        "url": "data:%7B%22package%22%3A%20%22d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-macro-0.2.78",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.69.crate",
-        "sha256": "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549",
+        "url": "https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.78.crate",
+        "sha256": "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-macro-support-0.2.69.crate"
+        "dest-filename": "wasm-bindgen-macro-support-0.2.78.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-macro-support-0.2.69",
+        "url": "data:%7B%22package%22%3A%20%227803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-macro-support-0.2.78",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.69.crate",
-        "sha256": "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158",
+        "url": "https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.78.crate",
+        "sha256": "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-shared-0.2.69.crate"
+        "dest-filename": "wasm-bindgen-shared-0.2.78.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-shared-0.2.69",
+        "url": "data:%7B%22package%22%3A%20%220237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-shared-0.2.78",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/web-sys/web-sys-0.3.46.crate",
-        "sha256": "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3",
+        "url": "https://static.crates.io/crates/web-sys/web-sys-0.3.55.crate",
+        "sha256": "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb",
         "dest": "cargo/vendor",
-        "dest-filename": "web-sys-0.3.46.crate"
+        "dest-filename": "web-sys-0.3.55.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/web-sys-0.3.46",
+        "url": "data:%7B%22package%22%3A%20%2238eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/web-sys-0.3.55",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wepoll-sys/wepoll-sys-3.0.1.crate",
-        "sha256": "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff",
+        "url": "https://static.crates.io/crates/wepoll-ffi/wepoll-ffi-0.1.2.crate",
+        "sha256": "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb",
         "dest": "cargo/vendor",
-        "dest-filename": "wepoll-sys-3.0.1.crate"
+        "dest-filename": "wepoll-ffi-0.1.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%220fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wepoll-sys-3.0.1",
+        "url": "data:%7B%22package%22%3A%20%22d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wepoll-ffi-0.1.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4577,15 +4525,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zbus/zbus-1.8.0.crate",
-        "sha256": "40b4d4aa39daed4e32aed75f0c37b969184949a0fdfd5f2e1277abfda61f02a8",
+        "url": "https://static.crates.io/crates/zbus/zbus-1.9.1.crate",
+        "sha256": "2326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad",
         "dest": "cargo/vendor",
-        "dest-filename": "zbus-1.8.0.crate"
+        "dest-filename": "zbus-1.9.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2240b4d4aa39daed4e32aed75f0c37b969184949a0fdfd5f2e1277abfda61f02a8%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zbus-1.8.0",
+        "url": "data:%7B%22package%22%3A%20%222326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zbus-1.9.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4603,15 +4551,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zbus_macros/zbus_macros-1.8.0.crate",
-        "sha256": "87cc141cda72384bef359badf1808e391d3968f9299e8f3c3cbb78dafa1e0930",
+        "url": "https://static.crates.io/crates/zbus_macros/zbus_macros-1.9.1.crate",
+        "sha256": "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93",
         "dest": "cargo/vendor",
-        "dest-filename": "zbus_macros-1.8.0.crate"
+        "dest-filename": "zbus_macros-1.9.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2287cc141cda72384bef359badf1808e391d3968f9299e8f3c3cbb78dafa1e0930%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zbus_macros-1.8.0",
+        "url": "data:%7B%22package%22%3A%20%22a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zbus_macros-1.9.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {

From 357f791ab82ac2add995be70e36859e53e0e77d6 Mon Sep 17 00:00:00 2001
From: Warren Hu <me@warrenhu.com>
Date: Sun, 16 Jan 2022 07:47:16 -0800
Subject: [PATCH 04/33] Align album track song indices (#440)

Fixes #208. Spotify appears to reset the track index every 80
songs so 1.5em (enough for two digits) seems to be good
enough.

Tested by viewing the Thirukkural album which contains 1330
tracks. Seems to work well and everything is aligned.
---
 src/app/components/playlist/song.css | 1 +
 src/app/components/playlist/song.ui  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/app/components/playlist/song.css b/src/app/components/playlist/song.css
index 7cf470b5..806f0ccc 100644
--- a/src/app/components/playlist/song.css
+++ b/src/app/components/playlist/song.css
@@ -3,6 +3,7 @@
   margin: 6px 12px;
   padding: 0;
   opacity: 1;
+  min-width: 1.5em;
 }
 
 .song__cover {
diff --git a/src/app/components/playlist/song.ui b/src/app/components/playlist/song.ui
index 72c95a0c..341f93a5 100644
--- a/src/app/components/playlist/song.ui
+++ b/src/app/components/playlist/song.ui
@@ -19,6 +19,7 @@
           <object class="GtkLabel" id="song_index">
             <property name="label">1</property>
             <property name="sensitive">0</property>
+            <property name="halign">GTK_ALIGN_CENTER</property>
             <style>
               <class name="song__index"/>
               <class name="numeric"/>

From dca02c3444abf3239277aaff8af236157314bd9c Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sat, 15 Jan 2022 17:34:55 -0500
Subject: [PATCH 05/33] update notify methods

---
 src/dbus/mod.rs   | 10 ++----
 src/dbus/mpris.rs | 82 +++++++++++++++++++++--------------------------
 2 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/src/dbus/mod.rs b/src/dbus/mod.rs
index 53bd8e17..51752fa0 100644
--- a/src/dbus/mod.rs
+++ b/src/dbus/mod.rs
@@ -55,10 +55,7 @@ async fn dbus_server(
                         player.state_mut().set_has_prev(has_prev);
                         player.state_mut().set_has_next(has_next);
                         player.state_mut().set_current_track(current);
-                        player
-                            .notify_current_track_changed(ctxt.to_owned())
-                            .await
-                            .map_err(|e| zbus::Error::FDO(Box::new(e)))
+                        player.notify_current_track_changed(ctxt).await
                     }
                     MprisStateUpdate::SetPositionMs(position) => {
                         player.state_mut().set_position(position);
@@ -72,10 +69,7 @@ async fn dbus_server(
                         player.state_mut().set_has_prev(has_prev);
                         player.state_mut().set_has_next(has_next);
                         player.state_mut().set_loop_status(loop_status);
-                        player
-                            .notify_loop_status(ctxt.to_owned())
-                            .await
-                            .map_err(|e| zbus::Error::FDO(Box::new(e)))
+                        player.notify_loop_status(ctxt).await
                     }
                     MprisStateUpdate::SetShuffled(shuffled) => {
                         player.state_mut().set_shuffled(shuffled);
diff --git a/src/dbus/mpris.rs b/src/dbus/mpris.rs
index f709bab7..57522cb4 100644
--- a/src/dbus/mpris.rs
+++ b/src/dbus/mpris.rs
@@ -88,48 +88,14 @@ impl SpotMprisPlayer {
     pub fn state_mut(&mut self) -> &mut MprisState {
         &mut self.state
     }
-}
-
-#[dbus_interface(interface = "org.mpris.MediaPlayer2.Player")]
-impl SpotMprisPlayer {
-    pub fn next(&self) -> Result<()> {
-        self.sender
-            .unbounded_send(PlaybackAction::Next.into())
-            .map_err(|_| Error::Failed("Could not send action".to_string()))
-    }
-
-    pub fn open_uri(&self, Uri: &str) -> Result<()> {
-        Err(Error::NotSupported("Not implemented".to_string()))
-    }
-
-    pub fn pause(&self) -> Result<()> {
-        self.sender
-            .unbounded_send(PlaybackAction::Pause.into())
-            .map_err(|_| Error::Failed("Could not send action".to_string()))
-    }
-
-    pub fn play(&self) -> Result<()> {
-        self.sender
-            .unbounded_send(PlaybackAction::Play.into())
-            .map_err(|_| Error::Failed("Could not send action".to_string()))
-    }
-
-    pub fn play_pause(&self) -> Result<()> {
-        self.sender
-            .unbounded_send(PlaybackAction::TogglePlay.into())
-            .map_err(|_| Error::Failed("Could not send action".to_string()))
-    }
 
-    pub async fn notify_current_track_changed(
-        &self,
-        #[zbus(signal_context)] ctxt: SignalContext<'_>,
-    ) -> Result<()> {
+    pub async fn notify_current_track_changed(&self, ctxt: &SignalContext<'_>) -> zbus::Result<()> {
         let metadata = Value::from(self.metadata());
         let can_go_next = Value::from(self.can_go_next());
         let can_go_previous = Value::from(self.can_go_previous());
 
         zbus::fdo::Properties::properties_changed(
-            &ctxt,
+            ctxt,
             Self::name(),
             &HashMap::from([
                 ("Metadata", &metadata),
@@ -138,21 +104,16 @@ impl SpotMprisPlayer {
             ]),
             &[],
         )
-        .await?;
-
-        Ok(())
+        .await
     }
 
-    pub async fn notify_loop_status(
-        &self,
-        #[zbus(signal_context)] ctxt: SignalContext<'_>,
-    ) -> Result<()> {
+    pub async fn notify_loop_status(&self, ctxt: &SignalContext<'_>) -> zbus::Result<()> {
         let loop_status = Value::from(self.loop_status());
         let can_go_next = Value::from(self.can_go_next());
         let can_go_previous = Value::from(self.can_go_previous());
 
         zbus::fdo::Properties::properties_changed(
-            &ctxt,
+            ctxt,
             Self::name(),
             &HashMap::from([
                 ("LoopStatus", &loop_status),
@@ -161,9 +122,38 @@ impl SpotMprisPlayer {
             ]),
             &[],
         )
-        .await?;
+        .await
+    }
+}
 
-        Ok(())
+#[dbus_interface(interface = "org.mpris.MediaPlayer2.Player")]
+impl SpotMprisPlayer {
+    pub fn next(&self) -> Result<()> {
+        self.sender
+            .unbounded_send(PlaybackAction::Next.into())
+            .map_err(|_| Error::Failed("Could not send action".to_string()))
+    }
+
+    pub fn open_uri(&self, Uri: &str) -> Result<()> {
+        Err(Error::NotSupported("Not implemented".to_string()))
+    }
+
+    pub fn pause(&self) -> Result<()> {
+        self.sender
+            .unbounded_send(PlaybackAction::Pause.into())
+            .map_err(|_| Error::Failed("Could not send action".to_string()))
+    }
+
+    pub fn play(&self) -> Result<()> {
+        self.sender
+            .unbounded_send(PlaybackAction::Play.into())
+            .map_err(|_| Error::Failed("Could not send action".to_string()))
+    }
+
+    pub fn play_pause(&self) -> Result<()> {
+        self.sender
+            .unbounded_send(PlaybackAction::TogglePlay.into())
+            .map_err(|_| Error::Failed("Could not send action".to_string()))
     }
 
     pub fn previous(&self) -> Result<()> {

From 673144158cd56419f65b5b1945522c33a8b75ace Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Mon, 10 Jan 2022 21:14:05 -0500
Subject: [PATCH 06/33] cache code cleanup

---
 src/api/cache.rs         | 33 ++++++++++++++++----------
 src/api/cached_client.rs | 51 +++++++++++++++-------------------------
 src/api/mod.rs           |  4 ++--
 src/app/loader.rs        |  4 ++--
 4 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/src/api/cache.rs b/src/api/cache.rs
index e29e7f31..e2359a7a 100644
--- a/src/api/cache.rs
+++ b/src/api/cache.rs
@@ -1,5 +1,6 @@
 use async_std::fs;
 use async_std::io;
+use async_std::path::Path;
 use async_std::path::PathBuf;
 use async_std::prelude::*;
 use core::mem::size_of;
@@ -10,6 +11,8 @@ use std::future::Future;
 use std::time::{Duration, SystemTime};
 use thiserror::Error;
 
+const EXPIRY_FILE_EXT: &str = ".expiry";
+
 #[derive(Error, Debug)]
 pub enum CacheError {
     #[error("No content available")]
@@ -80,13 +83,12 @@ pub struct CacheManager {
 }
 
 impl CacheManager {
-    pub fn new(dirs: &[&str]) -> Option<Self> {
+    pub fn for_dir(dir: &str) -> Option<Self> {
         let root: PathBuf = glib::user_cache_dir().into();
+        let root = root.join(dir);
         let mask = 0o744;
 
-        for &dir in dirs.iter() {
-            glib::mkdir_with_parents(root.join(dir), mask);
-        }
+        glib::mkdir_with_parents(&root, mask);
 
         Some(Self { root })
     }
@@ -96,7 +98,7 @@ impl CacheManager {
     }
 
     fn cache_meta_path(&self, resource: &str) -> PathBuf {
-        let full = format!("{}.{}", resource, "expiry");
+        let full = resource.to_string() + EXPIRY_FILE_EXT;
         self.root.join(&full)
     }
 }
@@ -178,10 +180,8 @@ impl CacheManager {
         Ok(())
     }
 
-    pub async fn clear_cache_pattern(&self, dir: &str, regex: &Regex) -> Result<(), CacheError> {
-        let dir_path = self.cache_path(dir);
-
-        let mut entries = fs::read_dir(dir_path)
+    pub async fn clear_cache_pattern(&self, regex: &Regex) -> Result<(), CacheError> {
+        let mut entries = fs::read_dir(&self.root)
             .await
             .map_err(CacheError::ReadError)?;
 
@@ -192,19 +192,25 @@ impl CacheManager {
                 .map(|s| regex.is_match(s))
                 .unwrap_or(false);
             if matches {
+                info!("Removing {}...", entry.file_name().to_str().unwrap_or(""));
                 fs::remove_file(entry.path())
                     .await
                     .map_err(CacheError::RemoveError)?;
+                if let Some(expiry_file_path) = entry
+                    .path()
+                    .to_str()
+                    .map(|path| path.to_string() + EXPIRY_FILE_EXT)
+                {
+                    let _ = fs::remove_file(Path::new(&expiry_file_path)).await;
+                }
             }
         }
 
         Ok(())
     }
 
-    pub async fn set_expired_pattern(&self, dir: &str, regex: &Regex) -> Result<(), CacheError> {
-        let dir_path = self.cache_path(dir);
-
-        let mut entries = fs::read_dir(dir_path)
+    pub async fn set_expired_pattern(&self, regex: &Regex) -> Result<(), CacheError> {
+        let mut entries = fs::read_dir(&self.root)
             .await
             .map_err(CacheError::ReadError)?;
 
@@ -212,6 +218,7 @@ impl CacheManager {
             let matches = entry
                 .file_name()
                 .to_str()
+                .and_then(|s| s.strip_suffix(EXPIRY_FILE_EXT))
                 .map(|s| regex.is_match(s))
                 .unwrap_or(false);
             if matches {
diff --git a/src/api/cached_client.rs b/src/api/cached_client.rs
index c5b467fe..aa61856e 100644
--- a/src/api/cached_client.rs
+++ b/src/api/cached_client.rs
@@ -10,24 +10,6 @@ use super::cache::{CacheExpiry, CacheManager, CachePolicy, FetchResult};
 use super::client::{SpotifyApiError, SpotifyClient, SpotifyResponse, SpotifyResponseKind};
 use crate::app::models::*;
 
-lazy_static! {
-    pub static ref ME_ALBUMS_CACHE: Regex =
-        Regex::new(r"^me_albums_\w+_\w+\.json\.expiry$").unwrap();
-    pub static ref USER_CACHE: Regex =
-        Regex::new(r"^me_(albums|playlists)_\w+_\w+\.json(\.expiry)?$").unwrap();
-    pub static ref ALL_CACHE: Regex =
-        Regex::new(r"^(me_albums_|me_playlists_|album_|playlist_|artist_)\w+\.json(\.expiry)?$")
-            .unwrap();
-}
-
-fn _playlist_cache(id: &str) -> Regex {
-    Regex::new(&format!(
-        r"^playlist(_{}|item_{}_\w+_\w+)\.json\.expiry$",
-        id, id
-    ))
-    .unwrap()
-}
-
 pub type SpotifyResult<T> = Result<T, SpotifyApiError>;
 
 pub trait SpotifyApiClient {
@@ -145,6 +127,17 @@ impl<'a> SpotCacheKey<'a> {
     }
 }
 
+lazy_static! {
+    pub static ref ME_TRACKS_CACHE: Regex = Regex::new(r"^me_tracks_\w+_\w+\.json$").unwrap();
+    pub static ref ME_ALBUMS_CACHE: Regex = Regex::new(r"^me_albums_\w+_\w+\.json$").unwrap();
+    pub static ref USER_CACHE: Regex =
+        Regex::new(r"^me_(albums|playlists|tracks)_\w+_\w+\.json$").unwrap();
+}
+
+fn playlist_cache_key(id: &str) -> Regex {
+    Regex::new(&format!(r"^playlist(_{}|item_{}_\w+_\w+)\.json$", id, id)).unwrap()
+}
+
 pub struct CachedSpotifyClient {
     client: SpotifyClient,
     cache: CacheManager,
@@ -154,7 +147,7 @@ impl CachedSpotifyClient {
     pub fn new() -> CachedSpotifyClient {
         CachedSpotifyClient {
             client: SpotifyClient::new(),
-            cache: CacheManager::new(&["spot/net"]).unwrap(),
+            cache: CacheManager::for_dir("spot/net").unwrap(),
         }
     }
 
@@ -201,7 +194,7 @@ impl CachedSpotifyClient {
         T: DeserializeOwned,
     {
         let write = &write;
-        let cache_key = format!("spot/net/{}", key.into_raw());
+        let cache_key = key.into_raw();
         let raw = self
             .cache
             .get_or_write(
@@ -302,7 +295,7 @@ impl SpotifyApiClient for CachedSpotifyClient {
 
         Box::pin(async move {
             self.cache
-                .set_expired_pattern("spot/net", &_playlist_cache(&id))
+                .set_expired_pattern(&playlist_cache_key(&id))
                 .await
                 .unwrap_or(());
 
@@ -319,7 +312,7 @@ impl SpotifyApiClient for CachedSpotifyClient {
 
         Box::pin(async move {
             self.cache
-                .set_expired_pattern("spot/net", &_playlist_cache(&id))
+                .set_expired_pattern(&playlist_cache_key(&id))
                 .await
                 .unwrap_or(());
 
@@ -362,10 +355,7 @@ impl SpotifyApiClient for CachedSpotifyClient {
         let id = id.to_owned();
 
         Box::pin(async move {
-            self.cache
-                .set_expired_pattern("spot/net", &*ME_ALBUMS_CACHE)
-                .await
-                .unwrap_or(());
+            let _ = self.cache.set_expired_pattern(&*ME_ALBUMS_CACHE).await;
             self.client.save_album(&id).send_no_response().await?;
             self.get_album(&id[..]).await.map(|a| a.description)
         })
@@ -375,10 +365,7 @@ impl SpotifyApiClient for CachedSpotifyClient {
         let id = id.to_owned();
 
         Box::pin(async move {
-            self.cache
-                .set_expired_pattern("spot/net", &*ME_ALBUMS_CACHE)
-                .await
-                .unwrap_or(());
+            let _ = self.cache.set_expired_pattern(&*ME_ALBUMS_CACHE).await;
             self.client.remove_saved_album(&id).send_no_response().await
         })
     }
@@ -485,7 +472,7 @@ impl SpotifyApiClient for CachedSpotifyClient {
         })
     }
 
-    fn get_artist(&self, id: &str) -> BoxFuture<Result<ArtistDescription, SpotifyApiError>> {
+    fn get_artist(&self, id: &str) -> BoxFuture<SpotifyResult<ArtistDescription>> {
         let id = id.to_owned();
 
         Box::pin(async move {
@@ -579,7 +566,7 @@ impl SpotifyApiClient for CachedSpotifyClient {
         })
     }
 
-    fn get_user(&self, id: &str) -> BoxFuture<Result<UserDescription, SpotifyApiError>> {
+    fn get_user(&self, id: &str) -> BoxFuture<SpotifyResult<UserDescription>> {
         let id = id.to_owned();
 
         Box::pin(async move {
diff --git a/src/api/mod.rs b/src/api/mod.rs
index e089f611..8d986401 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -8,8 +8,8 @@ pub use cached_client::{CachedSpotifyClient, SpotifyApiClient, SpotifyResult};
 pub use client::SpotifyApiError;
 
 pub async fn clear_user_cache() -> Option<()> {
-    cache::CacheManager::new(&[])?
-        .clear_cache_pattern("spot/net", &*cached_client::USER_CACHE)
+    cache::CacheManager::for_dir("spot/net")?
+        .clear_cache_pattern(&*cached_client::USER_CACHE)
         .await
         .ok()
 }
diff --git a/src/app/loader.rs b/src/app/loader.rs
index 6a01d201..4dd24704 100644
--- a/src/app/loader.rs
+++ b/src/app/loader.rs
@@ -32,7 +32,7 @@ pub struct ImageLoader {
 impl ImageLoader {
     pub fn new() -> Self {
         Self {
-            cache: CacheManager::new(&["spot/img"]).unwrap(),
+            cache: CacheManager::for_dir("spot/img").unwrap(),
         }
     }
 
@@ -40,7 +40,7 @@ impl ImageLoader {
         let mut hasher = DefaultHasher::new();
         hasher.write(url.as_bytes());
         let hashed = hasher.finish().to_string();
-        format!("spot/img/{}.{}", hashed, ext)
+        hashed + "." + ext
     }
 
     async fn get_image(url: &str) -> Option<Response<AsyncBody>> {

From 4848adbc8226adea13ba84e796ce1797a65bf546 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 16 Jan 2022 10:47:44 -0500
Subject: [PATCH 07/33] update authors

---
 AUTHORS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 37352c69..a898bc12 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,4 +14,5 @@ Nils Tonnätt
 Niklas Sauter
 Nicolas Fella
 Fridolin Weisser
-Jan Przebor
\ No newline at end of file
+Jan Przebor
+Warren Hu
\ No newline at end of file

From 7a5b5631fe528d4283cd50dffa6548e84968c028 Mon Sep 17 00:00:00 2001
From: fbabetto <fbabetto.git@rbox.me>
Date: Sat, 29 Jan 2022 17:03:25 +0100
Subject: [PATCH 08/33] added italian translation (#446)

* added italian translation

* updated italian translation: fixed some translation strings and removed some unneeded metadata

* added italian translation to LINGUAS file
---
 po/LINGUAS |   2 +-
 po/it.po   | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 266 insertions(+), 1 deletion(-)
 create mode 100644 po/it.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 489a6d29..8f638355 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-en ru fr nl de ca cs pl es pt tr id pt-br fi eu ia nb sl ja ar
+en ru fr nl de ca cs pl es pt tr id pt-br fi eu ia nb sl ja ar it
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 00000000..0b4f3abe
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,265 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Spot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-01-19 19:46-0500\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "C'è stato un errore. Controlla i log per i dettagli!"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
+#: src/app/components/labels.rs:5
+msgid "View album"
+msgstr "Guarda l'album"
+
+#. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
+#: src/app/components/labels.rs:8
+msgid "Copy link"
+msgstr "Copia link"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
+msgid "Add to queue"
+msgstr "Aggiungi alla coda di riproduzione"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
+#: src/app/components/labels.rs:14
+msgid "Remove from queue"
+msgstr "Rimuovi dalla coda di riproduzione"
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:21
+msgid "Add to {}"
+msgstr "Aggiungi a {}"
+
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} brano selezionato"
+msgstr[1] "{} brani selezionati"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "Di più da {}"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} di {}"
+
+#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+#: src/app/components/login/login_model.rs:56
+msgid "Could not save password. Make sure the session keyring is unlocked."
+msgstr ""
+"Impossibile salvare la password. Controlla che la session keyring sia "
+"sbloccata."
+
+#. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
+#: src/app/components/navigation/home.rs:36
+msgid "Library"
+msgstr "Raccolta"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
+#: src/app/components/navigation/home.rs:42
+msgid "Playlists"
+msgstr "Playlist"
+
+#. translators: This is a sidebar entry to browse to saved tracks.
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr "Tracce salvate"
+
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
+msgid "Now playing"
+msgstr "In riproduzione"
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Riproduci"
+
+#. translators: Short text displayed instead of a song title when nothing plays
+#. Short text displayed instead of a song title when nothing plays
+#: src/app/components/playback/playback_info.rs:58
+#: src/app/components/playback/playback_info.ui:32
+msgid "No song playing"
+msgstr "Nessun brano in riproduzione"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:56
+msgid "About"
+msgstr "Informazioni su"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:58
+msgid "Quit"
+msgstr "Esci"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:63
+msgid "Log out"
+msgstr "Log out"
+
+#: src/app/state/login_state.rs:117
+msgid "Connection restored"
+msgstr "Connessione ripristinata"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "Non hai playlist salvate."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Le tue playlist verranno mostrate qui."
+
+#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
+#: src/app/components/artist_details/artist_details.ui:26
+msgid "Top tracks"
+msgstr "Brani più popolari"
+
+#. Title of the sections that contains all releases from an artist (both singles and albums).
+#: src/app/components/artist_details/artist_details.ui:55
+msgid "Releases"
+msgstr "Releases"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Album"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Artisti"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr "Cerca Spotify."
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr "Digita per cercare."
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr "Aggiungi alla playlist..."
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr "Rimuovi"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr "Etichetta discografica"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr "Data di uscita"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr "Traccia"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr "Durata"
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+msgid "Login to Spotify Premium"
+msgstr "Login su Spotify Premium"
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:64
+msgid "Username"
+msgstr "Username"
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:72
+msgid "Password"
+msgstr "Password"
+
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Il blocco maiuscole è abilitato!"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
+msgid "Authentication failed!"
+msgstr "Autenticazione fallita!"
+
+#. Log in button label
+#: src/app/components/login/login.ui:141
+msgid "Log in"
+msgstr "Log in"
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr "Annulla"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr "Seleziona tutto"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Mescola"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Precedente"
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Successivo"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Ripeti"
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "Non hai album salvati."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "La tua libreria verrà mostrata qui."
+
+#~ msgid "by"
+#~ msgstr "by"

From f74287767c921dc226f4e0254472c1611ceb123d Mon Sep 17 00:00:00 2001
From: Chris Lane <925091+ChrisLane@users.noreply.github.com>
Date: Sat, 29 Jan 2022 16:03:50 +0000
Subject: [PATCH 09/33] Add GenericName to desktop entry file (#455)

---
 data/dev.alextren.Spot.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/dev.alextren.Spot.desktop b/data/dev.alextren.Spot.desktop
index 8433f51f..d713ace3 100644
--- a/data/dev.alextren.Spot.desktop
+++ b/data/dev.alextren.Spot.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Spot
+GenericName=Music Player
 Exec=spot
 Icon=dev.alextren.Spot
 Terminal=false

From e8c567cf051b54019ce448fc89a275de750a7a57 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sat, 29 Jan 2022 16:04:07 +0000
Subject: [PATCH 10/33] Refactor list models (#456)

* refctor

* more refactor

* MORE

* M.O.R.E

* who said this was over

* stuff

* gtk rs update

* reorg files

* improve list model diffing
---
 .vscode/tasks.json                            |   2 +-
 Cargo.lock                                    | 200 ++++------
 Cargo.toml                                    |  10 +-
 src/api/api_models.rs                         |  22 +-
 .../artist_details/artist_details.rs          |   7 +-
 .../artist_details/artist_details_model.rs    |  70 ++--
 src/app/components/details/details.rs         |   4 +-
 src/app/components/details/details_model.rs   |  79 ++--
 src/app/components/details/release_details.rs |   5 -
 src/app/components/details/release_details.ui |  10 -
 src/app/components/headerbar/component.rs     |   2 +-
 src/app/components/library/library.rs         |   8 +-
 src/app/components/login/login.rs             |   4 +-
 src/app/components/navigation/home.rs         |  16 +-
 src/app/components/notification/mod.rs        |   2 +-
 src/app/components/now_playing/now_playing.rs |   7 +-
 .../now_playing/now_playing_model.rs          |  56 +--
 src/app/components/playback/component.rs      |   6 +-
 src/app/components/playlist/playlist.rs       | 152 ++++----
 src/app/components/playlist/song.rs           | 105 ++++--
 .../playlist_details/playlist_details.rs      |   1 -
 .../playlist_details_model.rs                 |  83 ++--
 .../saved_playlists/saved_playlists.rs        |   8 +-
 .../components/saved_tracks/saved_tracks.rs   |   7 +-
 .../saved_tracks/saved_tracks_model.rs        |  53 +--
 src/app/components/search/search.rs           |  14 +-
 src/app/components/search/search_model.rs     |  10 +-
 .../sidebar_listbox/sidebar_icon_widget.rs    |   9 +-
 .../sidebar_listbox/sidebar_item.rs           |  28 +-
 .../components/sidebar_listbox/sidebar_row.rs |   8 +-
 .../components/user_details/user_details.rs   |   6 +-
 .../user_details/user_details_model.rs        |   5 +-
 src/app/components/utils.rs                   |   6 +-
 src/app/list_store.rs                         |  42 ---
 src/app/models/{gtypes => }/album_model.rs    |  83 ++--
 src/app/models/{gtypes => }/artist_model.rs   |  43 +--
 src/app/models/gtypes/mod.rs                  |   8 -
 src/app/models/gtypes/song_model.rs           | 337 -----------------
 src/app/models/main.rs                        | 131 ++++---
 src/app/models/mod.rs                         |  60 ++-
 src/app/models/songs/mod.rs                   |   7 +
 src/app/models/songs/song_list_model.rs       | 251 ++++++++++++
 src/app/models/songs/song_model.rs            | 300 +++++++++++++++
 src/app/models/{core.rs => songs/support.rs}  | 356 ++++++++++++------
 src/app/state/app_state.rs                    |  32 +-
 src/app/state/browser_state.rs                |   6 +-
 src/app/state/playback_state.rs               | 311 ++++++++-------
 src/app/state/screen_states.rs                |  79 ++--
 src/dbus/listener.rs                          |  44 +--
 src/main.rs                                   |   3 +-
 src/meson.build                               |  21 +-
 51 files changed, 1591 insertions(+), 1528 deletions(-)
 rename src/app/models/{gtypes => }/album_model.rs (64%)
 rename src/app/models/{gtypes => }/artist_model.rs (72%)
 delete mode 100644 src/app/models/gtypes/mod.rs
 delete mode 100644 src/app/models/gtypes/song_model.rs
 create mode 100644 src/app/models/songs/mod.rs
 create mode 100644 src/app/models/songs/song_list_model.rs
 create mode 100644 src/app/models/songs/song_model.rs
 rename src/app/models/{core.rs => songs/support.rs} (53%)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 93154afe..ab4bc61d 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -5,7 +5,7 @@
     "options": {
         "env": {
             "RUST_BACKTRACE": "1",
-            "RUST_LOG": "info",
+            "RUST_LOG": "spot=debug",
             //"https_proxy": "localhost:8080"
         }
     },
diff --git a/Cargo.lock b/Cargo.lock
index 805cab65..de9f1965 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -351,9 +351,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 
 [[package]]
 name = "cairo-rs"
-version = "0.14.9"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482"
+checksum = "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a"
 dependencies = [
  "bitflags",
  "cairo-sys-rs",
@@ -364,13 +364,13 @@ dependencies = [
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.14.9"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570"
+checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -403,15 +403,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "cfg-expr"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e"
-dependencies = [
- "smallvec",
-]
-
 [[package]]
 name = "cfg-expr"
 version = "0.9.0"
@@ -720,12 +711,6 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946"
 
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.30"
@@ -949,10 +934,11 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f"
+checksum = "172dfe1d9dfb62936bf7ad3ede2913a1b21b1e3db56990e46e00789201de9070"
 dependencies = [
+ "bitflags",
  "gdk-pixbuf-sys",
  "gio",
  "glib",
@@ -961,22 +947,22 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590"
+checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171"
 dependencies = [
  "gio-sys",
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gdk4"
-version = "0.3.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f97a162c17214d1bf981af3f683156a0b1667dd1927057c4f0a68513251ecf0f"
+checksum = "319c74160dbe3e29cc1bf36ae4a08b9072f352b751e9e3e5501b3aa3ca633f66"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -990,19 +976,19 @@ dependencies = [
 
 [[package]]
 name = "gdk4-sys"
-version = "0.3.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9498f4e06969fb96a4e4234dfe1d308a3ac6b120b3c6d93e3ec5c77fe88bc6d5"
+checksum = "48a39e34abe35ee2cf54a1e29dd983accecd113ad30bdead5050418fa92f2a1b"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
  "gio-sys",
  "glib-sys",
  "gobject-sys",
- "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps 5.0.0",
+ "pkg-config",
+ "system-deps",
 ]
 
 [[package]]
@@ -1057,9 +1043,9 @@ dependencies = [
 
 [[package]]
 name = "gio"
-version = "0.14.8"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0"
+checksum = "4f80391bd2ac4981a3433137691211775bbb37c5347f8cfb7c0980187e0300c5"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -1074,22 +1060,22 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa"
+checksum = "04b57719ccaacf2a0d9c79f151be629f3a3ef3991658ee2af0bb66287e4ea86c"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
  "winapi",
 ]
 
 [[package]]
 name = "glib"
-version = "0.14.8"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4"
+checksum = "4a703581e2538fe699c5476cf26b456d694c5272b6e999d3ab47711c5eaa2dd2"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -1102,16 +1088,17 @@ dependencies = [
  "libc",
  "once_cell",
  "smallvec",
+ "thiserror",
 ]
 
 [[package]]
 name = "glib-macros"
-version = "0.14.1"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
+checksum = "e58b262ff65ef771003873cea8c10e0fe854f1c508d48d62a4111a1ff163f7d1"
 dependencies = [
  "anyhow",
- "heck",
+ "heck 0.4.0",
  "proc-macro-crate 1.1.0",
  "proc-macro-error",
  "proc-macro2",
@@ -1121,12 +1108,12 @@ dependencies = [
 
 [[package]]
 name = "glib-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
+checksum = "c668102c6e15e0a7f6b99b59f602c2e806967bb86414f617b77e19b1de5b3fac"
 dependencies = [
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -1150,20 +1137,20 @@ dependencies = [
 
 [[package]]
 name = "gobject-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
+checksum = "6edb1f0b3e4c08e2a0a490d1082ba9e902cdff8ff07091e85c6caec60d17e2ab"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "graphene-rs"
-version = "0.14.8"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3380f132530ef9eb9e0a2bac180e30390aa5e49892d20294f822a974117a563"
+checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570"
 dependencies = [
  "glib",
  "graphene-sys",
@@ -1172,21 +1159,21 @@ dependencies = [
 
 [[package]]
 name = "graphene-sys"
-version = "0.14.8"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9ac7450b3aa80792513a3c029920a2ede419de13fb5169a4e51b07a5685332"
+checksum = "03f311acb023cf7af5537f35de028e03706136eead7f25a31e8fd26f5011e0b3"
 dependencies = [
  "glib-sys",
  "libc",
  "pkg-config",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gsk4"
-version = "0.3.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff59ca46c4fc5087fd7a0c3770a71ea4b6e94f8c24c12e2c2e8538f9f6fd764"
+checksum = "0672c63e4101e19d5e9cb4a0aed8b3278e9573529bd0b6a86d9c748c71bd9882"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1200,9 +1187,9 @@ dependencies = [
 
 [[package]]
 name = "gsk4-sys"
-version = "0.3.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13aa53ce70234da02f9954339d988d5ab853d746a8f47a4ae17735ff873545b5"
+checksum = "e31d21d7ce02ba261bb24c50c4ab238a10b41a2c97c32afffae29471b7cca69b"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -1211,14 +1198,14 @@ dependencies = [
  "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps 5.0.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gtk4"
-version = "0.3.1"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58a04f421d1485ba4739e723199f5828bca05ab4e622ed39a96a342b6b1a6a3d"
+checksum = "d6f9e36fb6db3d70edf5cea9f4a20928c1d08ed3f27697cfd2d21ca3d8ac4a2d"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1239,13 +1226,11 @@ dependencies = [
 
 [[package]]
 name = "gtk4-macros"
-version = "0.3.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5068d4354af02454f44687adc613100aa98ae11e273cdcac84f89dc08be2b4a1"
+checksum = "573db42bb64973a4d5f718b73caa7204285a1a665308a23b11723d0ee56ec305"
 dependencies = [
  "anyhow",
- "heck",
- "itertools",
  "proc-macro-crate 1.1.0",
  "proc-macro-error",
  "proc-macro2",
@@ -1255,9 +1240,9 @@ dependencies = [
 
 [[package]]
 name = "gtk4-sys"
-version = "0.3.1"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e20a64c8f0ddcff8902ff04c130747f2fb7834a43530f75d03d6c71335733b49"
+checksum = "c47c075e8f795c38f6e9a47b51a73eab77b325f83c0154979ed4d4245c36490d"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -1269,7 +1254,7 @@ dependencies = [
  "gsk4-sys",
  "libc",
  "pango-sys",
- "system-deps 5.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -1312,6 +1297,12 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -1532,15 +1523,6 @@ dependencies = [
  "waker-fn",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -1625,9 +1607,9 @@ dependencies = [
 
 [[package]]
 name = "libadwaita"
-version = "0.1.0-beta-1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef1e2d4b5490caff8a1d44648f68721ab917f765a7fa1d0226fcdac42d86552"
+checksum = "0d4b1d54d907dfa5d6663fdf4bdbe46c34747258b85c787adbf66187ccbaac81"
 dependencies = [
  "gdk-pixbuf",
  "gdk4",
@@ -1642,9 +1624,9 @@ dependencies = [
 
 [[package]]
 name = "libadwaita-sys"
-version = "0.1.0-beta-1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a165d8c96824753ec072b70a9149790efa3d5abb07e130cda7eb04ef2006d4c"
+checksum = "f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8"
 dependencies = [
  "gdk4-sys",
  "gio-sys",
@@ -1652,7 +1634,7 @@ dependencies = [
  "gobject-sys",
  "gtk4-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -2456,9 +2438,9 @@ dependencies = [
 
 [[package]]
 name = "pango"
-version = "0.14.8"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581"
+checksum = "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94"
 dependencies = [
  "bitflags",
  "glib",
@@ -2469,14 +2451,14 @@ dependencies = [
 
 [[package]]
 name = "pango-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe"
+checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -3102,24 +3084,6 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strum"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
-
-[[package]]
-name = "strum_macros"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "subtle"
 version = "2.4.1"
@@ -3151,30 +3115,12 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "3.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
+checksum = "7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4"
 dependencies = [
- "anyhow",
- "cfg-expr 0.8.1",
- "heck",
- "itertools",
- "pkg-config",
- "strum",
- "strum_macros",
- "thiserror",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "system-deps"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
-dependencies = [
- "cfg-expr 0.9.0",
- "heck",
+ "cfg-expr",
+ "heck 0.3.3",
  "pkg-config",
  "toml",
  "version-compare",
@@ -3467,9 +3413,9 @@ dependencies = [
 
 [[package]]
 name = "version-compare"
-version = "0.0.11"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
+checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
 
 [[package]]
 name = "version_check"
diff --git a/Cargo.toml b/Cargo.toml
index 1f7cf68e..157b1a90 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,19 +5,19 @@ edition = "2018"
 license = "MIT"
 
 [dependencies.gtk]
-version = "^0.3.0"
+version = "^0.4.1"
 package = "gtk4"
 
 [dependencies.gdk]
-version = "^0.3.0"
+version = "^0.4.0"
 package = "gdk4"
 
 [dependencies.gio]
-version = "^0.14.8"
+version = "^0.15.2"
 features = ["v2_60"]
 
 [dependencies.glib]
-version = "^0.14.8"
+version = "^0.15.2"
 features = ["v2_60"]
 
 [dependencies.librespot]
@@ -57,7 +57,7 @@ features = ["gettext-system"]
 
 [dependencies]
 secret-service = "^2.0.1"
-gdk-pixbuf = "^0.14.0"
+gdk-pixbuf = "^0.15.1"
 libadwaita = "^0.1.0-beta-1"
 ref_filter_map = "^1.0.1"
 regex = "^1.4.6"
diff --git a/src/api/api_models.rs b/src/api/api_models.rs
index 61525997..64bf2e5c 100644
--- a/src/api/api_models.rs
+++ b/src/api/api_models.rs
@@ -208,6 +208,7 @@ pub struct Album {
 pub struct AlbumInfo {
     pub label: String,
     pub copyrights: Vec<Copyright>,
+    pub total_tracks: u32,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -435,12 +436,10 @@ impl From<Album> for AlbumDescription {
                 name: a.name.clone(),
             })
             .collect::<Vec<ArtistRef>>();
-        let songs = SongList::new_from_initial_batch(
-            album
-                .clone()
-                .try_into()
-                .unwrap_or_else(|_| SongBatch::empty()),
-        ); //FIXME
+        let songs = album
+            .clone()
+            .try_into()
+            .unwrap_or_else(|_| SongBatch::empty());
         let art = album.best_image_for_width(200).map(|i| i.url.clone());
 
         Self {
@@ -456,7 +455,13 @@ impl From<Album> for AlbumDescription {
 }
 
 impl From<AlbumInfo> for AlbumReleaseDetails {
-    fn from(AlbumInfo { label, copyrights }: AlbumInfo) -> Self {
+    fn from(
+        AlbumInfo {
+            label,
+            copyrights,
+            total_tracks,
+        }: AlbumInfo,
+    ) -> Self {
         let copyright_text = copyrights
             .iter()
             .map(|c| format!("[{}] {}", c.type_, c.text))
@@ -466,6 +471,7 @@ impl From<AlbumInfo> for AlbumReleaseDetails {
         Self {
             label,
             copyright_text,
+            total_tracks: total_tracks as usize,
         }
     }
 }
@@ -489,7 +495,7 @@ impl From<Playlist> for PlaylistDescription {
             id,
             title: name,
             art,
-            songs: SongList::new_from_initial_batch(song_batch),
+            songs: song_batch,
             owner: UserRef {
                 id: owner_id,
                 display_name,
diff --git a/src/app/components/artist_details/artist_details.rs b/src/app/components/artist_details/artist_details.rs
index 0425621c..729a81f1 100644
--- a/src/app/components/artist_details/artist_details.rs
+++ b/src/app/components/artist_details/artist_details.rs
@@ -90,7 +90,7 @@ impl ArtistDetailsWidget {
         store: &ListStore<AlbumModel>,
         on_album_pressed: F,
     ) where
-        F: Fn(&String) + Clone + 'static,
+        F: Fn(String) + Clone + 'static,
     {
         self.widget()
             .artist_releases
@@ -100,9 +100,7 @@ impl ArtistDetailsWidget {
                 let album = AlbumWidget::for_model(item, worker.clone());
                 let f = on_album_pressed.clone();
                 album.connect_album_pressed(clone!(@weak item => move |_| {
-                    if let Some(id) = item.uri().as_ref() {
-                        f(id);
-                    }
+                    f(item.uri());
                 }));
                 child.set_child(Some(&album));
                 child.upcast::<gtk::Widget>()
@@ -140,7 +138,6 @@ impl ArtistDetails {
             widget.top_tracks_widget().clone(),
             Rc::clone(&model),
             worker,
-            true,
         ));
 
         Self {
diff --git a/src/app/components/artist_details/artist_details_model.rs b/src/app/components/artist_details/artist_details_model.rs
index 94316d9f..f4e542bf 100644
--- a/src/app/components/artist_details/artist_details_model.rs
+++ b/src/app/components/artist_details/artist_details_model.rs
@@ -10,7 +10,7 @@ use crate::app::state::SelectionContext;
 use crate::app::state::{
     BrowserAction, BrowserEvent, PlaybackAction, SelectionAction, SelectionState,
 };
-use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel, ListDiff, ListStore};
+use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel, ListStore};
 
 pub struct ArtistDetailsModel {
     pub id: String,
@@ -27,11 +27,6 @@ impl ArtistDetailsModel {
         }
     }
 
-    fn songs_ref(&self) -> Option<impl Deref<Target = Vec<SongDescription>> + '_> {
-        self.app_model
-            .map_state_opt(|s| Some(&s.browser.artist_state(&self.id)?.top_tracks))
-    }
-
     pub fn get_artist_name(&self) -> Option<impl Deref<Target = String> + '_> {
         self.app_model
             .map_state_opt(|s| s.browser.artist_state(&self.id)?.artist.as_ref())
@@ -52,9 +47,8 @@ impl ArtistDetailsModel {
             });
     }
 
-    pub fn open_album(&self, id: &str) {
-        self.dispatcher
-            .dispatch(AppAction::ViewAlbum(id.to_string()));
+    pub fn open_album(&self, id: String) {
+        self.dispatcher.dispatch(AppAction::ViewAlbum(id));
     }
 
     pub fn load_more(&self) -> Option<()> {
@@ -78,39 +72,31 @@ impl ArtistDetailsModel {
 }
 
 impl PlaylistModel for ArtistDetailsModel {
-    fn current_song_id(&self) -> Option<String> {
+    fn song_list_model(&self) -> SongListModel {
         self.app_model
             .get_state()
-            .playback
-            .current_song_id()
-            .cloned()
+            .browser
+            .artist_state(&self.id)
+            .expect("illegal attempt to read artist_state")
+            .top_tracks
+            .clone()
     }
 
-    fn play_song_at(&self, _pos: usize, id: &str) {
-        let tracks = self.songs_ref();
-        if let Some(tracks) = tracks {
-            self.dispatcher
-                .dispatch(PlaybackAction::LoadSongs(tracks.clone()).into());
-            self.dispatcher
-                .dispatch(PlaybackAction::Load(id.to_string()).into());
-        }
+    fn current_song_id(&self) -> Option<String> {
+        self.app_model.get_state().playback.current_song_id()
     }
 
-    fn diff_for_event(&self, event: &AppEvent) -> Option<ListDiff<SongModel>> {
-        if matches!(
-            event,
-            AppEvent::BrowserEvent(BrowserEvent::ArtistDetailsUpdated(id)) if id == &self.id
-        ) {
-            let tracks = self.songs_ref()?;
-            Some(ListDiff::Set(tracks.iter().map(|s| s.into()).collect()))
-        } else {
-            None
-        }
+    fn play_song_at(&self, _pos: usize, id: &str) {
+        let tracks: Vec<SongDescription> = self.song_list_model().collect();
+        self.dispatcher
+            .dispatch(PlaybackAction::LoadSongs(tracks).into());
+        self.dispatcher
+            .dispatch(PlaybackAction::Load(id.to_string()).into());
     }
 
     fn actions_for(&self, id: &str) -> Option<gio::ActionGroup> {
-        let songs = self.songs_ref()?;
-        let song = songs.iter().find(|&song| song.id == id)?;
+        let song = self.song_list_model().get(id)?;
+        let song = song.description();
 
         let group = SimpleActionGroup::new();
 
@@ -125,8 +111,8 @@ impl PlaylistModel for ArtistDetailsModel {
     }
 
     fn menu_for(&self, id: &str) -> Option<gio::MenuModel> {
-        let songs = self.songs_ref()?;
-        let song = songs.iter().find(|&song| song.id == id)?;
+        let song = self.song_list_model().get(id)?;
+        let song = song.description();
 
         let menu = gio::Menu::new();
         menu.append(Some(&*labels::VIEW_ALBUM), Some("song.view_album"));
@@ -143,12 +129,10 @@ impl PlaylistModel for ArtistDetailsModel {
     }
 
     fn select_song(&self, id: &str) {
-        let song = self
-            .songs_ref()
-            .and_then(|songs| songs.iter().find(|&song| song.id == id).cloned());
+        let song = self.song_list_model().get(id);
         if let Some(song) = song {
             self.dispatcher
-                .dispatch(SelectionAction::Select(vec![song]).into());
+                .dispatch(SelectionAction::Select(vec![song.into_description()]).into());
         }
     }
 
@@ -185,10 +169,8 @@ impl SimpleHeaderBarModel for ArtistDetailsModel {
     }
 
     fn select_all(&self) {
-        if let Some(songs) = self.songs_ref() {
-            let songs: Vec<SongDescription> = songs.iter().cloned().collect();
-            self.dispatcher
-                .dispatch(SelectionAction::Select(songs).into());
-        }
+        let songs: Vec<SongDescription> = self.song_list_model().collect();
+        self.dispatcher
+            .dispatch(SelectionAction::Select(songs).into());
     }
 }
diff --git a/src/app/components/details/details.rs b/src/app/components/details/details.rs
index 9dca0b13..93b4feaf 100644
--- a/src/app/components/details/details.rs
+++ b/src/app/components/details/details.rs
@@ -218,7 +218,6 @@ impl Details {
             widget.album_tracks_widget().clone(),
             model.clone(),
             worker.clone(),
-            false,
         ));
 
         let headerbar_widget = widget.headerbar_widget();
@@ -288,8 +287,7 @@ impl Details {
                 &album.artists_name(),
                 &details.label,
                 album.release_date.as_ref().unwrap(),
-                album.songs.len(),
-                &album.formatted_time(),
+                details.total_tracks,
                 &details.copyright_text,
             );
 
diff --git a/src/app/components/details/details_model.rs b/src/app/components/details/details_model.rs
index 29c89f8b..e3598fb3 100644
--- a/src/app/components/details/details_model.rs
+++ b/src/app/components/details/details_model.rs
@@ -12,10 +12,8 @@ use crate::app::components::SimpleHeaderBarModelWrapper;
 use crate::app::dispatch::ActionDispatcher;
 use crate::app::models::*;
 use crate::app::state::SelectionContext;
-use crate::app::state::{
-    BrowserAction, BrowserEvent, PlaybackAction, SelectionAction, SelectionState,
-};
-use crate::app::{AppAction, AppEvent, AppModel, AppState, BatchQuery, ListDiff, SongsSource};
+use crate::app::state::{BrowserAction, PlaybackAction, SelectionAction, SelectionState};
+use crate::app::{AppAction, AppEvent, AppModel, AppState, BatchQuery, SongsSource};
 
 pub struct DetailsModel {
     pub id: String,
@@ -36,19 +34,6 @@ impl DetailsModel {
         self.app_model.get_state()
     }
 
-    fn songs_ref(&self) -> Option<impl Deref<Target = SongList> + '_> {
-        self.app_model.map_state_opt(|s| {
-            Some(
-                &s.browser
-                    .details_state(&self.id)?
-                    .content
-                    .as_ref()?
-                    .description
-                    .songs,
-            )
-        })
-    }
-
     pub fn get_album_info(&self) -> Option<impl Deref<Target = AlbumFullDescription> + '_> {
         self.app_model
             .map_state_opt(|s| s.browser.details_state(&self.id)?.content.as_ref())
@@ -108,7 +93,7 @@ impl DetailsModel {
     }
 
     pub fn load_more(&self) -> Option<()> {
-        let last_batch = self.songs_ref()?.last_batch()?;
+        let last_batch = self.song_list_model().last_batch()?;
         let query = BatchQuery {
             source: SongsSource::Album(self.id.clone()),
             batch: last_batch,
@@ -140,11 +125,25 @@ impl DetailsModel {
 }
 
 impl PlaylistModel for DetailsModel {
+    fn song_list_model(&self) -> SongListModel {
+        self.app_model
+            .get_state()
+            .browser
+            .details_state(&self.id)
+            .expect("illegal attempt to read details_state")
+            .songs
+            .clone()
+    }
+
+    fn show_song_covers(&self) -> bool {
+        false
+    }
+
     fn select_song(&self, id: &str) {
-        let song = self.songs_ref().and_then(|songs| songs.get(id).cloned());
-        if let Some(song) = song {
+        let songs = self.song_list_model();
+        if let Some(song) = songs.get(id) {
             self.dispatcher
-                .dispatch(SelectionAction::Select(vec![song]).into());
+                .dispatch(SelectionAction::Select(vec![song.description().clone()]).into());
         }
     }
 
@@ -164,12 +163,12 @@ impl PlaylistModel for DetailsModel {
     }
 
     fn current_song_id(&self) -> Option<String> {
-        self.state().playback.current_song_id().cloned()
+        self.state().playback.current_song_id()
     }
 
     fn play_song_at(&self, pos: usize, id: &str) {
         let source = SongsSource::Album(self.id.clone());
-        let batch = self.songs_ref().and_then(|songs| songs.song_batch_for(pos));
+        let batch = self.song_list_model().song_batch_for(pos);
         if let Some(batch) = batch {
             self.dispatcher
                 .dispatch(PlaybackAction::LoadPagedSongs(source, batch).into());
@@ -178,27 +177,9 @@ impl PlaylistModel for DetailsModel {
         }
     }
 
-    fn diff_for_event(&self, event: &AppEvent) -> Option<ListDiff<SongModel>> {
-        match event {
-            AppEvent::BrowserEvent(BrowserEvent::AlbumDetailsLoaded(id)) if id == &self.id => {
-                let songs = self.songs_ref()?;
-                Some(ListDiff::Set(songs.iter().map(|s| s.into()).collect()))
-            }
-            AppEvent::BrowserEvent(BrowserEvent::AlbumTracksAppended(id, index))
-                if id == &self.id =>
-            {
-                let songs = self.songs_ref()?;
-                Some(ListDiff::Append(
-                    songs.iter().skip(*index).map(|s| s.into()).collect(),
-                ))
-            }
-            _ => None,
-        }
-    }
-
     fn actions_for(&self, id: &str) -> Option<gio::ActionGroup> {
-        let songs = self.songs_ref()?;
-        let song = songs.get(id)?;
+        let song = self.song_list_model().get(id)?;
+        let song = song.description();
 
         let group = SimpleActionGroup::new();
 
@@ -212,8 +193,8 @@ impl PlaylistModel for DetailsModel {
     }
 
     fn menu_for(&self, id: &str) -> Option<gio::MenuModel> {
-        let songs = self.songs_ref()?;
-        let song = songs.get(id)?;
+        let song = self.song_list_model().get(id)?;
+        let song = song.description();
 
         let menu = gio::Menu::new();
         for artist in song.artists.iter() {
@@ -243,10 +224,8 @@ impl SimpleHeaderBarModel for DetailsModel {
     }
 
     fn select_all(&self) {
-        if let Some(songs) = self.songs_ref() {
-            let songs: Vec<SongDescription> = songs.iter().cloned().collect();
-            self.dispatcher
-                .dispatch(SelectionAction::Select(songs).into());
-        }
+        let songs: Vec<SongDescription> = self.song_list_model().collect();
+        self.dispatcher
+            .dispatch(SelectionAction::Select(songs).into());
     }
 }
diff --git a/src/app/components/details/release_details.rs b/src/app/components/details/release_details.rs
index fd46d752..4226a433 100644
--- a/src/app/components/details/release_details.rs
+++ b/src/app/components/details/release_details.rs
@@ -24,9 +24,6 @@ mod imp {
         #[template_child]
         pub tracks: TemplateChild<gtk::Label>,
 
-        #[template_child]
-        pub duration: TemplateChild<gtk::Label>,
-
         #[template_child]
         pub copyright: TemplateChild<gtk::Label>,
     }
@@ -78,7 +75,6 @@ impl ReleaseDetailsWindow {
         label: &str,
         release_date: &str,
         track_count: usize,
-        duration: &str,
         copyright: &str,
     ) {
         let widget = self.widget();
@@ -90,7 +86,6 @@ impl ReleaseDetailsWindow {
         widget.label.set_text(label);
         widget.release.set_text(release_date);
         widget.tracks.set_text(&track_count.to_string());
-        widget.duration.set_text(duration);
         widget.copyright.set_text(copyright);
     }
 }
diff --git a/src/app/components/details/release_details.ui b/src/app/components/details/release_details.ui
index 00745763..9f3cbee4 100644
--- a/src/app/components/details/release_details.ui
+++ b/src/app/components/details/release_details.ui
@@ -63,16 +63,6 @@
                 </child>
               </object>
             </child>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes" comments="This refers to the duration of a release">Duration</property>
-                <child type="suffix">
-                  <object class="GtkLabel" id="duration">
-                    <property name="label">Duration</property>
-                  </object>
-                </child>
-              </object>
-            </child>
             <child>
               <object class="AdwActionRow">
                 <property name="title" translatable="yes">Copyright</property>
diff --git a/src/app/components/headerbar/component.rs b/src/app/components/headerbar/component.rs
index 4f6e2912..a230d6e3 100644
--- a/src/app/components/headerbar/component.rs
+++ b/src/app/components/headerbar/component.rs
@@ -252,7 +252,7 @@ where
         let widget = HeaderBarWidget::new();
         common::bind_headerbar(&widget, &model);
 
-        let root = gtk::BoxBuilder::new()
+        let root = gtk::Box::builder()
             .orientation(gtk::Orientation::Vertical)
             .build();
         root.append(&widget);
diff --git a/src/app/components/library/library.rs b/src/app/components/library/library.rs
index c09a0cca..cf97f578 100644
--- a/src/app/components/library/library.rs
+++ b/src/app/components/library/library.rs
@@ -72,7 +72,7 @@ impl LibraryWidget {
 
     fn bind_albums<F>(&self, worker: Worker, store: &ListStore<AlbumModel>, on_album_pressed: F)
     where
-        F: Fn(&String) + Clone + 'static,
+        F: Fn(String) + Clone + 'static,
     {
         imp::LibraryWidget::from_instance(self).flowbox.bind_model(
             Some(store.unsafe_store()),
@@ -81,9 +81,7 @@ impl LibraryWidget {
                     let f = on_album_pressed.clone();
                     let album = AlbumWidget::for_model(album_model, worker.clone());
                     album.connect_album_pressed(clone!(@weak album_model => move |_| {
-                        if let Some(id) = album_model.uri().as_ref() {
-                            f(id);
-                        }
+                        f(album_model.uri());
                     }));
                     album
                 })
@@ -122,7 +120,7 @@ impl Library {
             self.worker.clone(),
             &*self.model.get_list_store().unwrap(),
             clone!(@weak self.model as model => move |id| {
-                model.open_album(id.clone());
+                model.open_album(id);
             }),
         );
     }
diff --git a/src/app/components/login/login.rs b/src/app/components/login/login.rs
index e80fc8ba..63b894ca 100644
--- a/src/app/components/login/login.rs
+++ b/src/app/components/login/login.rs
@@ -88,8 +88,8 @@ impl LoginWindow {
         controller.set_propagation_phase(gtk::PropagationPhase::Capture);
         controller.connect_key_pressed(
             clone!(@weak self as _self => @default-return gtk::Inhibit(false), move |_, key, _, modifier| {
-                _self.show_caps_lock_info((modifier == gdk::ModifierType::LOCK_MASK) ^ (key == gdk::keys::constants::Caps_Lock));
-                if key == gdk::keys::constants::Return {
+                _self.show_caps_lock_info((modifier == gdk::ModifierType::LOCK_MASK) ^ (key == gdk::Key::Caps_Lock));
+                if key == gdk::Key::Return {
                     _self.submit(&on_submit_clone);
                     gtk::Inhibit(true)
                 } else {
diff --git a/src/app/components/navigation/home.rs b/src/app/components/navigation/home.rs
index 0d1c50ec..313404e2 100644
--- a/src/app/components/navigation/home.rs
+++ b/src/app/components/navigation/home.rs
@@ -27,12 +27,12 @@ fn add_to_stack_and_listbox(
 }
 
 fn make_playlist_item(playlist_item: AlbumModel) -> SideBarItem {
-    let mut title = playlist_item.album_title().unwrap();
+    let mut title = playlist_item.album_title();
     if title.is_empty() {
         title = gettext("Unnamed playlist");
     }
 
-    let id = playlist_item.uri().unwrap();
+    let id = playlist_item.uri();
 
     SideBarItem::new(id.as_str(), &title, "playlist2-symbolic", false)
 }
@@ -136,14 +136,12 @@ impl HomePane {
     }
 
     fn update_playlists_in_sidebar(&mut self) {
-        let mut vec = Vec::new();
         let playlists = self.saved_playlists_model.get_playlists();
-        for (i, playlist_item) in playlists.iter().enumerate() {
-            if i == NUM_PLAYLISTS {
-                break;
-            }
-            vec.push(make_playlist_item(playlist_item).upcast());
-        }
+        let vec: Vec<SideBarItem> = playlists
+            .iter()
+            .take(NUM_PLAYLISTS)
+            .map(make_playlist_item)
+            .collect();
         self.list_store.splice(
             NUM_FIXED_ENTRIES,
             self.list_store.n_items() - NUM_FIXED_ENTRIES,
diff --git a/src/app/components/notification/mod.rs b/src/app/components/notification/mod.rs
index 5d171c1c..becb9848 100644
--- a/src/app/components/notification/mod.rs
+++ b/src/app/components/notification/mod.rs
@@ -11,7 +11,7 @@ impl Notification {
     }
 
     fn show(&self, content: &str) {
-        let toast = libadwaita::ToastBuilder::new()
+        let toast = libadwaita::Toast::builder()
             .title(content)
             .timeout(4)
             .build();
diff --git a/src/app/components/now_playing/now_playing.rs b/src/app/components/now_playing/now_playing.rs
index 0bfb2369..17f119da 100644
--- a/src/app/components/now_playing/now_playing.rs
+++ b/src/app/components/now_playing/now_playing.rs
@@ -85,12 +85,7 @@ impl NowPlaying {
             model.load_more();
         }));
 
-        let playlist = Playlist::new(
-            widget.song_list_widget().clone(),
-            model.clone(),
-            worker,
-            true,
-        );
+        let playlist = Playlist::new(widget.song_list_widget().clone(), model.clone(), worker);
 
         Self {
             widget,
diff --git a/src/app/components/now_playing/now_playing_model.rs b/src/app/components/now_playing/now_playing_model.rs
index 89bc6e9a..d6f94871 100644
--- a/src/app/components/now_playing/now_playing_model.rs
+++ b/src/app/components/now_playing/now_playing_model.rs
@@ -1,20 +1,16 @@
 use gettextrs::gettext;
 use gio::prelude::*;
 use gio::SimpleActionGroup;
-use std::cell::Ref;
 use std::ops::Deref;
 use std::rc::Rc;
 
 use crate::app::components::SimpleHeaderBarModel;
 use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::SongDescription;
-use crate::app::models::SongModel;
-use crate::app::state::PlaylistChange;
+use crate::app::models::SongListModel;
 use crate::app::state::SelectionContext;
-use crate::app::state::{
-    PlaybackAction, PlaybackEvent, PlaybackState, SelectionAction, SelectionState,
-};
-use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel, AppState, ListDiff};
+use crate::app::state::{PlaybackAction, PlaybackState, SelectionAction, SelectionState};
+use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel};
 
 pub struct NowPlayingModel {
     app_model: Rc<AppModel>,
@@ -29,18 +25,15 @@ impl NowPlayingModel {
         }
     }
 
-    fn state(&self) -> Ref<'_, AppState> {
-        self.app_model.get_state()
-    }
-
-    fn queue(&self) -> Ref<'_, PlaybackState> {
-        Ref::map(self.state(), |s| &s.playback)
+    fn queue(&self) -> impl Deref<Target = PlaybackState> + '_ {
+        self.app_model.map_state(|s| &s.playback)
     }
 
     pub fn load_more(&self) -> Option<()> {
         let queue = self.queue();
         let loader = self.app_model.get_batch_loader();
         let query = queue.next_query()?;
+        debug!("next_query = {:?}", &query);
 
         self.dispatcher.dispatch_async(Box::pin(async move {
             let source = query.source.clone();
@@ -57,8 +50,12 @@ impl NowPlayingModel {
 }
 
 impl PlaylistModel for NowPlayingModel {
+    fn song_list_model(&self) -> SongListModel {
+        self.queue().songs().clone()
+    }
+
     fn current_song_id(&self) -> Option<String> {
-        self.queue().current_song_id().cloned()
+        self.queue().current_song_id()
     }
 
     fn play_song_at(&self, _pos: usize, id: &str) {
@@ -66,31 +63,14 @@ impl PlaylistModel for NowPlayingModel {
             .dispatch(PlaybackAction::Load(id.to_string()).into());
     }
 
-    fn diff_for_event(&self, event: &AppEvent) -> Option<ListDiff<SongModel>> {
-        let queue = self.queue();
-        let songs = queue.songs().map(|s| s.into());
-
-        match event {
-            AppEvent::PlaybackEvent(PlaybackEvent::PlaylistChanged(change)) => match change {
-                PlaylistChange::Reset => Some(ListDiff::Set(songs.collect())),
-                PlaylistChange::InsertedAt(i, n) => {
-                    Some(ListDiff::Insert(*i, songs.skip(*i).take(*n).collect()))
-                }
-                PlaylistChange::AppendedAt(i) => Some(ListDiff::Append(songs.skip(*i).collect())),
-                PlaylistChange::MovedDown(i) => Some(ListDiff::MoveDown(*i)),
-                PlaylistChange::MovedUp(i) => Some(ListDiff::MoveUp(*i)),
-            },
-            _ => None,
-        }
-    }
-
     fn autoscroll_to_playing(&self) -> bool {
         true
     }
 
     fn actions_for(&self, id: &str) -> Option<gio::ActionGroup> {
         let queue = self.queue();
-        let song = queue.song(id)?;
+        let song = queue.songs().get(id)?;
+        let song = song.description();
         let group = SimpleActionGroup::new();
 
         for view_artist in song.make_artist_actions(self.dispatcher.box_clone(), None) {
@@ -105,7 +85,8 @@ impl PlaylistModel for NowPlayingModel {
 
     fn menu_for(&self, id: &str) -> Option<gio::MenuModel> {
         let queue = self.queue();
-        let song = queue.song(id)?;
+        let song = queue.songs().get(id)?;
+        let song = song.description();
 
         let menu = gio::Menu::new();
         menu.append(Some(&*labels::VIEW_ALBUM), Some("song.view_album"));
@@ -124,9 +105,10 @@ impl PlaylistModel for NowPlayingModel {
 
     fn select_song(&self, id: &str) {
         let queue = self.queue();
-        if let Some(song) = queue.song(id) {
+        if let Some(song) = queue.songs().get(id) {
+            let song = song.description().clone();
             self.dispatcher
-                .dispatch(SelectionAction::Select(vec![song.clone()]).into());
+                .dispatch(SelectionAction::Select(vec![song]).into());
         }
     }
 
@@ -161,7 +143,7 @@ impl SimpleHeaderBarModel for NowPlayingModel {
     }
 
     fn select_all(&self) {
-        let songs: Vec<SongDescription> = self.queue().songs().cloned().collect();
+        let songs: Vec<SongDescription> = self.queue().songs().collect();
         self.dispatcher
             .dispatch(SelectionAction::Select(songs).into());
     }
diff --git a/src/app/components/playback/component.rs b/src/app/components/playback/component.rs
index 7fc33aca..7ed8ff31 100644
--- a/src/app/components/playback/component.rs
+++ b/src/app/components/playback/component.rs
@@ -41,8 +41,8 @@ impl PlaybackModel {
         self.state().playback.is_shuffled()
     }
 
-    fn current_song(&self) -> Option<impl Deref<Target = SongDescription> + '_> {
-        self.app_model.map_state_opt(|s| s.playback.current_song())
+    fn current_song(&self) -> Option<SongDescription> {
+        self.app_model.get_state().playback.current_song()
     }
 
     fn play_next_song(&self) {
@@ -116,7 +116,7 @@ impl PlaybackControl {
             self.widget
                 .set_title_and_artist(&song.title, &song.artists_name());
             self.widget.set_song_duration(Some(song.duration as f64));
-            if let Some(url) = song.art.clone() {
+            if let Some(url) = song.art {
                 self.widget.set_artwork_from_url(url, &self.worker);
             }
         } else {
diff --git a/src/app/components/playlist/playlist.rs b/src/app/components/playlist/playlist.rs
index 10a8ac06..40d99578 100644
--- a/src/app/components/playlist/playlist.rs
+++ b/src/app/components/playlist/playlist.rs
@@ -5,29 +5,25 @@ use std::rc::Rc;
 
 use crate::app::components::utils::AnimatorDefault;
 use crate::app::components::{Component, EventListener, SongWidget};
-use crate::app::models::SongModel;
-use crate::app::{
-    state::{PlaybackEvent, SelectionEvent, SelectionState},
-    AppEvent, ListDiff, ListStore, Worker,
-};
-
-#[derive(Clone, Copy, Debug)]
-struct RowState {
-    is_selected: bool,
-    is_playing: bool,
-}
+use crate::app::models::{SongListModel, SongModel, SongState};
+use crate::app::state::{PlaybackEvent, SelectionEvent, SelectionState};
+use crate::app::{AppEvent, Worker};
 
 pub trait PlaylistModel {
+    fn song_list_model(&self) -> SongListModel;
+
     fn current_song_id(&self) -> Option<String>;
 
     fn play_song_at(&self, pos: usize, id: &str);
 
-    fn diff_for_event(&self, event: &AppEvent) -> Option<ListDiff<SongModel>>;
-
     fn autoscroll_to_playing(&self) -> bool {
         true
     }
 
+    fn show_song_covers(&self) -> bool {
+        true
+    }
+
     fn actions_for(&self, _id: &str) -> Option<gio::ActionGroup> {
         None
     }
@@ -50,13 +46,34 @@ pub trait PlaylistModel {
             .map(|s| s.is_selection_enabled())
             .unwrap_or(false)
     }
+
+    fn song_state(&self, id: &str) -> SongState {
+        let is_playing = self.current_song_id().map(|s| s.eq(id)).unwrap_or(false);
+        let is_selected = self
+            .selection()
+            .map(|s| s.is_song_selected(id))
+            .unwrap_or(false);
+        SongState {
+            is_selected,
+            is_playing,
+        }
+    }
+
+    fn toggle_select(&self, id: &str) {
+        if let Some(selection) = self.selection() {
+            if selection.is_song_selected(id) {
+                self.deselect_song(id);
+            } else {
+                self.select_song(id);
+            }
+        }
+    }
 }
 
 pub struct Playlist<Model> {
     animator: AnimatorDefault,
     listview: gtk::ListView,
     _press_gesture: gtk::GestureLongPress,
-    list_model: ListStore<SongModel>,
     model: Rc<Model>,
 }
 
@@ -64,14 +81,9 @@ impl<Model> Playlist<Model>
 where
     Model: PlaylistModel + 'static,
 {
-    pub fn new(
-        listview: gtk::ListView,
-        model: Rc<Model>,
-        worker: Worker,
-        show_song_covers: bool,
-    ) -> Self {
-        let list_model = ListStore::new();
-        let selection_model = gtk::NoSelection::new(Some(list_model.unsafe_store()));
+    pub fn new(listview: gtk::ListView, model: Rc<Model>, worker: Worker) -> Self {
+        let list_model = model.song_list_model();
+        let selection_model = gtk::NoSelection::new(Some(&list_model));
         let factory = gtk::SignalListItemFactory::new();
 
         let style_context = listview.style_context();
@@ -90,10 +102,10 @@ where
 
         factory.connect_bind(clone!(@weak model => move |_, item| {
             let song_model = item.item().unwrap().downcast::<SongModel>().unwrap();
-            song_model.set_state(Self::get_item_state(&*model, &song_model));
+            song_model.set_state(model.song_state(&song_model.get_id()));
 
             let widget = item.child().unwrap().downcast::<SongWidget>().unwrap();
-            widget.bind(&song_model, worker.clone(), show_song_covers);
+            widget.bind(&song_model, worker.clone(), model.show_song_covers());
 
             let id = &song_model.get_id();
             widget.set_actions(model.actions_for(id).as_ref());
@@ -106,12 +118,13 @@ where
         });
 
         listview.connect_activate(clone!(@weak list_model, @weak model => move |_, position| {
-            let song = list_model.get(position);
+            let song = list_model.index_continuous(position as usize).expect("attempt to access invalid index");
+            let song = song.description();
             let selection_enabled = model.is_selection_enabled();
             if selection_enabled {
-                Self::select_song(&*model, &song);
+                model.toggle_select(&song.id);
             } else {
-                model.play_song_at(position as usize, &song.get_id());
+                model.play_song_at(position as usize, &song.id);
             }
         }));
 
@@ -127,41 +140,17 @@ where
             animator: AnimatorDefault::ease_in_out_animator(),
             listview,
             _press_gesture: press_gesture,
-            list_model,
             model,
         }
     }
 
-    fn select_song(model: &Model, song: &SongModel) {
-        if let Some(selection) = model.selection() {
-            if selection.is_song_selected(&song.get_id()) {
-                model.deselect_song(&song.get_id());
-            } else {
-                model.select_song(&song.get_id());
-            }
-        }
-    }
-
-    fn get_item_state(model: &Model, item: &SongModel) -> RowState {
-        let id = &item.get_id();
-        let is_playing = model.current_song_id().map(|s| s.eq(id)).unwrap_or(false);
-        let is_selected = model
-            .selection()
-            .map(|s| s.is_song_selected(id))
-            .unwrap_or(false);
-        RowState {
-            is_selected,
-            is_playing,
-        }
-    }
-
     fn autoscroll_to_playing(&self, index: usize) {
-        let len = self.list_model.len() as f64;
+        let len = 1f64; //self.model.song_list_model().len() as f64;
         let adj = self
             .listview
             .parent()
             .and_then(|p| p.downcast::<gtk::ScrolledWindow>().ok())
-            .and_then(|w| w.vadjustment());
+            .map(|w| w.vadjustment());
         if let Some(adj) = adj {
             let v = adj.value();
             let pos = (index as f64) * adj.upper() / len;
@@ -179,32 +168,39 @@ where
     }
 
     fn update_list(&self) {
-        for (i, model_song) in self.list_model.iter().enumerate() {
-            let state = Self::get_item_state(&*self.model, &model_song);
+        let autoscroll_to_playing = self.model.autoscroll_to_playing();
+        let is_selection_enabled = self.model.is_selection_enabled();
+
+        self.model.song_list_model().for_each(|i, model_song| {
+            let state = self.model.song_state(&model_song.get_id());
             model_song.set_state(state);
-            if state.is_playing
-                && self.model.autoscroll_to_playing()
-                && !self.model.is_selection_enabled()
-            {
+            if state.is_playing && autoscroll_to_playing && !is_selection_enabled {
                 self.autoscroll_to_playing(i);
             }
-        }
+        });
     }
 
     fn set_selection_active(listview: &gtk::ListView, active: bool) {
+        let class_name = "playlist--selectable";
         let context = listview.style_context();
         if active {
-            context.add_class("playlist--selectable");
+            context.add_class(class_name);
         } else {
-            context.remove_class("playlist--selectable");
+            context.remove_class(class_name);
         }
     }
 }
 
 impl SongModel {
-    fn set_state(&self, state: RowState) {
-        self.set_playing(state.is_playing);
-        self.set_selected(state.is_selected);
+    fn set_state(
+        &self,
+        SongState {
+            is_playing,
+            is_selected,
+        }: SongState,
+    ) {
+        self.set_playing(is_playing);
+        self.set_selected(is_selected);
     }
 }
 
@@ -213,22 +209,18 @@ where
     Model: PlaylistModel + 'static,
 {
     fn on_event(&mut self, event: &AppEvent) {
-        if let Some(diff) = self.model.diff_for_event(event) {
-            self.list_model.update(diff);
-        } else {
-            match event {
-                AppEvent::SelectionEvent(SelectionEvent::SelectionChanged) => {
-                    self.update_list();
-                }
-                AppEvent::PlaybackEvent(PlaybackEvent::TrackChanged(_)) => {
-                    self.update_list();
-                }
-                AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(_)) => {
-                    Self::set_selection_active(&self.listview, self.model.is_selection_enabled());
-                    self.update_list();
-                }
-                _ => {}
+        match event {
+            AppEvent::SelectionEvent(SelectionEvent::SelectionChanged) => {
+                self.update_list();
+            }
+            AppEvent::PlaybackEvent(PlaybackEvent::TrackChanged(_)) => {
+                self.update_list();
+            }
+            AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(_)) => {
+                Self::set_selection_active(&self.listview, self.model.is_selection_enabled());
+                self.update_list();
             }
+            _ => {}
         }
     }
 }
diff --git a/src/app/components/playlist/song.rs b/src/app/components/playlist/song.rs
index 21c59edb..c37a8f96 100644
--- a/src/app/components/playlist/song.rs
+++ b/src/app/components/playlist/song.rs
@@ -9,8 +9,11 @@ use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 
 mod imp {
+
     use super::*;
 
+    const SONG_CLASS: &str = "song--playing";
+
     #[derive(Debug, Default, CompositeTemplate)]
     #[template(resource = "/dev/alextren/Spot/components/song.ui")]
     pub struct SongWidget {
@@ -54,11 +57,77 @@ mod imp {
         }
     }
 
+    lazy_static! {
+        static ref PROPERTIES: [glib::ParamSpec; 2] = [
+            glib::ParamSpecBoolean::new(
+                "playing",
+                "Playing",
+                "",
+                false,
+                glib::ParamFlags::READWRITE
+            ),
+            glib::ParamSpecBoolean::new(
+                "selected",
+                "Selected",
+                "",
+                false,
+                glib::ParamFlags::READWRITE,
+            ),
+        ];
+    }
+
     impl ObjectImpl for SongWidget {
+        fn properties() -> &'static [glib::ParamSpec] {
+            &*PROPERTIES
+        }
+
+        fn set_property(
+            &self,
+            obj: &Self::Type,
+            _id: usize,
+            value: &glib::Value,
+            pspec: &glib::ParamSpec,
+        ) {
+            match pspec.name() {
+                "playing" => {
+                    let is_playing = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    let context = obj.style_context();
+                    if is_playing {
+                        context.add_class(SONG_CLASS);
+                    } else {
+                        context.remove_class(SONG_CLASS);
+                    }
+                }
+                "selected" => {
+                    let is_selected = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    self.song_checkbox.set_active(is_selected);
+                }
+                _ => unimplemented!(),
+            }
+        }
+
+        fn property(&self, obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            match pspec.name() {
+                "playing" => obj.style_context().has_class(SONG_CLASS).to_value(),
+                "selected" => self.song_checkbox.is_active().to_value(),
+                _ => unimplemented!(),
+            }
+        }
+
         fn constructed(&self, obj: &Self::Type) {
             self.parent_constructed(obj);
             self.song_checkbox.set_sensitive(false);
         }
+
+        fn dispose(&self, obj: &Self::Type) {
+            while let Some(child) = obj.first_child() {
+                child.unparent();
+            }
+        }
     }
 
     impl WidgetImpl for SongWidget {}
@@ -79,12 +148,6 @@ impl SongWidget {
         imp::SongWidget::from_instance(self)
     }
 
-    pub fn for_model(model: SongModel, worker: Worker) -> Self {
-        let _self = Self::new();
-        _self.bind(&model, worker, true);
-        _self
-    }
-
     pub fn set_actions(&self, actions: Option<&gio::ActionGroup>) {
         self.insert_action_group("song", actions);
     }
@@ -100,22 +163,6 @@ impl SongWidget {
         }
     }
 
-    fn set_playing(&self, is_playing: bool) {
-        let song_class = "song--playing";
-        let context = self.style_context();
-        if is_playing {
-            context.add_class(song_class);
-        } else {
-            context.remove_class(song_class);
-        }
-    }
-
-    fn set_selected(&self, is_selected: bool) {
-        imp::SongWidget::from_instance(self)
-            .song_checkbox
-            .set_active(is_selected);
-    }
-
     fn set_show_cover(&self, show_cover: bool) {
         let song_class = "song--cover";
         let context = self.style_context();
@@ -131,7 +178,7 @@ impl SongWidget {
     }
 
     pub fn set_art(&self, model: &SongModel, worker: Worker) {
-        if let Some(url) = model.cover_url() {
+        if let Some(url) = model.description().art.clone() {
             let _self = self.downgrade();
             worker.send_local_task(async move {
                 if let Some(_self) = _self.upgrade() {
@@ -149,6 +196,8 @@ impl SongWidget {
         model.bind_title(&*widget.song_title, "label");
         model.bind_artist(&*widget.song_artist, "label");
         model.bind_duration(&*widget.song_length, "label");
+        model.bind_playing(self, "playing");
+        model.bind_selected(self, "selected");
 
         self.set_show_cover(show_cover);
         if show_cover {
@@ -156,15 +205,5 @@ impl SongWidget {
         } else {
             model.bind_index(&*widget.song_index, "label");
         }
-
-        self.set_playing(model.get_playing());
-        model.connect_playing_local(clone!(@weak self as _self => move |song| {
-            _self.set_playing(song.get_playing());
-        }));
-
-        self.set_selected(model.get_selected());
-        model.connect_selected_local(clone!(@weak self as _self => move |song| {
-            _self.set_selected(song.get_selected());
-        }));
     }
 }
diff --git a/src/app/components/playlist_details/playlist_details.rs b/src/app/components/playlist_details/playlist_details.rs
index 6686e3b2..ad78c4f5 100644
--- a/src/app/components/playlist_details/playlist_details.rs
+++ b/src/app/components/playlist_details/playlist_details.rs
@@ -164,7 +164,6 @@ impl PlaylistDetails {
             widget.playlist_tracks_widget().clone(),
             model.clone(),
             worker.clone(),
-            true,
         ));
 
         widget.connect_header();
diff --git a/src/app/components/playlist_details/playlist_details_model.rs b/src/app/components/playlist_details/playlist_details_model.rs
index a9444c51..62781748 100644
--- a/src/app/components/playlist_details/playlist_details_model.rs
+++ b/src/app/components/playlist_details/playlist_details_model.rs
@@ -1,6 +1,5 @@
 use gio::prelude::*;
 use gio::SimpleActionGroup;
-use std::cell::Ref;
 use std::ops::Deref;
 use std::rc::Rc;
 
@@ -8,12 +7,8 @@ use crate::app::components::SimpleHeaderBarModel;
 use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::*;
 use crate::app::state::SelectionContext;
-use crate::app::state::{
-    BrowserAction, BrowserEvent, PlaybackAction, SelectionAction, SelectionState,
-};
-use crate::app::{
-    ActionDispatcher, AppAction, AppEvent, AppModel, AppState, BatchQuery, ListDiff, SongsSource,
-};
+use crate::app::state::{BrowserAction, PlaybackAction, SelectionAction, SelectionState};
+use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel, BatchQuery, SongsSource};
 
 pub struct PlaylistDetailsModel {
     pub id: String,
@@ -32,27 +27,11 @@ impl PlaylistDetailsModel {
         }
     }
 
-    fn state(&self) -> Ref<'_, AppState> {
-        self.app_model.get_state()
-    }
-
     fn is_playlist_editable(&self) -> bool {
         let state = self.app_model.get_state();
         state.logged_user.playlists.iter().any(|p| p.id == self.id)
     }
 
-    fn songs_ref(&self) -> Option<impl Deref<Target = SongList> + '_> {
-        self.app_model.map_state_opt(|s| {
-            Some(
-                &s.browser
-                    .playlist_details_state(&self.id)?
-                    .playlist
-                    .as_ref()?
-                    .songs,
-            )
-        })
-    }
-
     pub fn get_playlist_info(&self) -> Option<impl Deref<Target = PlaylistDescription> + '_> {
         self.app_model.map_state_opt(|s| {
             s.browser
@@ -74,7 +53,7 @@ impl PlaylistDetailsModel {
     }
 
     pub fn load_more_tracks(&self) -> Option<()> {
-        let last_batch = self.songs_ref()?.last_batch()?;
+        let last_batch = self.song_list_model().last_batch()?;
         let query = BatchQuery {
             source: SongsSource::Playlist(self.id.clone()),
             batch: last_batch,
@@ -82,6 +61,7 @@ impl PlaylistDetailsModel {
 
         let id = self.id.clone();
         let next_query = query.next()?;
+        debug!("next_query = {:?}", &next_query);
         let loader = self.app_model.get_batch_loader();
 
         self.dispatcher.dispatch_async(Box::pin(async move {
@@ -106,13 +86,23 @@ impl PlaylistDetailsModel {
 }
 
 impl PlaylistModel for PlaylistDetailsModel {
+    fn song_list_model(&self) -> SongListModel {
+        self.app_model
+            .get_state()
+            .browser
+            .playlist_details_state(&self.id)
+            .expect("illegal attempt to read playlist_details_state")
+            .songs
+            .clone()
+    }
+
     fn current_song_id(&self) -> Option<String> {
-        self.state().playback.current_song_id().cloned()
+        self.app_model.get_state().playback.current_song_id()
     }
 
     fn play_song_at(&self, pos: usize, id: &str) {
         let source = SongsSource::Playlist(self.id.clone());
-        let batch = self.songs_ref().and_then(|songs| songs.song_batch_for(pos));
+        let batch = self.song_list_model().song_batch_for(pos);
         if let Some(batch) = batch {
             self.dispatcher
                 .dispatch(PlaybackAction::LoadPagedSongs(source, batch).into());
@@ -121,30 +111,9 @@ impl PlaylistModel for PlaylistDetailsModel {
         }
     }
 
-    fn diff_for_event(&self, event: &AppEvent) -> Option<ListDiff<SongModel>> {
-        match event {
-            AppEvent::BrowserEvent(BrowserEvent::PlaylistDetailsLoaded(id))
-            | AppEvent::BrowserEvent(BrowserEvent::PlaylistTracksRemoved(id, _))
-                if id == &self.id =>
-            {
-                let songs = self.songs_ref()?;
-                Some(ListDiff::Set(songs.iter().map(|s| s.into()).collect()))
-            }
-            AppEvent::BrowserEvent(BrowserEvent::PlaylistTracksAppended(id, index))
-                if id == &self.id =>
-            {
-                let songs = self.songs_ref()?;
-                Some(ListDiff::Append(
-                    songs.iter().skip(*index).map(|s| s.into()).collect(),
-                ))
-            }
-            _ => None,
-        }
-    }
-
     fn actions_for(&self, id: &str) -> Option<gio::ActionGroup> {
-        let songs = self.songs_ref()?;
-        let song = songs.get(id)?;
+        let song = self.song_list_model().get(id)?;
+        let song = song.description();
 
         let group = SimpleActionGroup::new();
 
@@ -159,8 +128,8 @@ impl PlaylistModel for PlaylistDetailsModel {
     }
 
     fn menu_for(&self, id: &str) -> Option<gio::MenuModel> {
-        let songs = self.songs_ref()?;
-        let song = songs.get(id)?;
+        let song = self.song_list_model().get(id)?;
+        let song = song.description();
 
         let menu = gio::Menu::new();
         menu.append(Some(&*labels::VIEW_ALBUM), Some("song.view_album"));
@@ -178,10 +147,10 @@ impl PlaylistModel for PlaylistDetailsModel {
     }
 
     fn select_song(&self, id: &str) {
-        let song = self.songs_ref().and_then(|s| s.get(id).cloned());
+        let song = self.song_list_model().get(id);
         if let Some(song) = song {
             self.dispatcher
-                .dispatch(SelectionAction::Select(vec![song]).into());
+                .dispatch(SelectionAction::Select(vec![song.into_description()]).into());
         }
     }
 
@@ -220,10 +189,8 @@ impl SimpleHeaderBarModel for PlaylistDetailsModel {
     }
 
     fn select_all(&self) {
-        if let Some(songs) = self.songs_ref() {
-            let songs: Vec<SongDescription> = songs.iter().cloned().collect();
-            self.dispatcher
-                .dispatch(SelectionAction::Select(songs).into());
-        }
+        let songs: Vec<SongDescription> = self.song_list_model().collect();
+        self.dispatcher
+            .dispatch(SelectionAction::Select(songs).into());
     }
 }
diff --git a/src/app/components/saved_playlists/saved_playlists.rs b/src/app/components/saved_playlists/saved_playlists.rs
index 7849b4e8..3016c44e 100644
--- a/src/app/components/saved_playlists/saved_playlists.rs
+++ b/src/app/components/saved_playlists/saved_playlists.rs
@@ -70,7 +70,7 @@ impl SavedPlaylistsWidget {
 
     fn bind_albums<F>(&self, worker: Worker, store: &ListStore<AlbumModel>, on_album_pressed: F)
     where
-        F: Fn(&String) + Clone + 'static,
+        F: Fn(String) + Clone + 'static,
     {
         imp::SavedPlaylistsWidget::from_instance(self)
             .flowbox
@@ -81,9 +81,7 @@ impl SavedPlaylistsWidget {
 
                 let f = on_album_pressed.clone();
                 album.connect_album_pressed(clone!(@weak album_model => move |_| {
-                    if let Some(id) = album_model.uri().as_ref() {
-                        f(id);
-                    }
+                    f(album_model.uri());
                 }));
 
                 child.set_child(Some(&album));
@@ -123,7 +121,7 @@ impl SavedPlaylists {
             self.worker.clone(),
             &*self.model.get_list_store().unwrap(),
             clone!(@weak self.model as model => move |id| {
-                model.open_playlist(id.clone());
+                model.open_playlist(id);
             }),
         );
     }
diff --git a/src/app/components/saved_tracks/saved_tracks.rs b/src/app/components/saved_tracks/saved_tracks.rs
index 04d4f019..76f8881a 100644
--- a/src/app/components/saved_tracks/saved_tracks.rs
+++ b/src/app/components/saved_tracks/saved_tracks.rs
@@ -86,12 +86,7 @@ impl SavedTracks {
             model.load_more();
         }));
 
-        let playlist = Playlist::new(
-            widget.song_list_widget().clone(),
-            model.clone(),
-            worker,
-            true,
-        );
+        let playlist = Playlist::new(widget.song_list_widget().clone(), model.clone(), worker);
 
         Self {
             widget,
diff --git a/src/app/components/saved_tracks/saved_tracks_model.rs b/src/app/components/saved_tracks/saved_tracks_model.rs
index 8d29ea90..6596ede0 100644
--- a/src/app/components/saved_tracks/saved_tracks_model.rs
+++ b/src/app/components/saved_tracks/saved_tracks_model.rs
@@ -7,10 +7,7 @@ use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::*;
 use crate::app::state::SelectionContext;
 use crate::app::state::{PlaybackAction, SelectionAction, SelectionState};
-use crate::app::{
-    ActionDispatcher, AppAction, AppEvent, AppModel, BatchQuery, BrowserAction, BrowserEvent,
-    ListDiff, SongsSource,
-};
+use crate::app::{ActionDispatcher, AppAction, AppModel, BatchQuery, BrowserAction, SongsSource};
 
 pub struct SavedTracksModel {
     app_model: Rc<AppModel>,
@@ -25,11 +22,6 @@ impl SavedTracksModel {
         }
     }
 
-    fn songs(&self) -> Option<impl Deref<Target = SongList> + '_> {
-        self.app_model
-            .map_state_opt(|s| Some(&s.browser.home_state()?.saved_tracks))
-    }
-
     pub fn load_initial(&self) {
         let query = BatchQuery {
             source: SongsSource::SavedTracks,
@@ -40,7 +32,7 @@ impl SavedTracksModel {
     }
 
     pub fn load_more(&self) -> Option<()> {
-        let last_batch = self.songs()?.last_batch()?;
+        let last_batch = self.song_list_model().last_batch()?;
         let query = BatchQuery {
             source: SongsSource::SavedTracks,
             batch: last_batch,
@@ -65,17 +57,23 @@ impl SavedTracksModel {
 }
 
 impl PlaylistModel for SavedTracksModel {
-    fn current_song_id(&self) -> Option<String> {
+    fn song_list_model(&self) -> SongListModel {
         self.app_model
             .get_state()
-            .playback
-            .current_song_id()
-            .cloned()
+            .browser
+            .home_state()
+            .expect("illegal attempt to read home_state")
+            .saved_tracks
+            .clone()
+    }
+
+    fn current_song_id(&self) -> Option<String> {
+        self.app_model.get_state().playback.current_song_id()
     }
 
     fn play_song_at(&self, pos: usize, id: &str) {
         let source = SongsSource::SavedTracks;
-        let batch = self.songs().and_then(|songs| songs.song_batch_for(pos));
+        let batch = self.song_list_model().song_batch_for(pos);
         if let Some(batch) = batch {
             self.dispatcher
                 .dispatch(PlaybackAction::LoadPagedSongs(source, batch).into());
@@ -83,26 +81,13 @@ impl PlaylistModel for SavedTracksModel {
                 .dispatch(PlaybackAction::Load(id.to_string()).into());
         }
     }
-
-    fn diff_for_event(&self, event: &AppEvent) -> Option<ListDiff<SongModel>> {
-        match event {
-            AppEvent::BrowserEvent(BrowserEvent::SavedTracksAppended(i)) => {
-                let songs = self.songs()?;
-                Some(ListDiff::Append(
-                    songs.iter().skip(*i).map(|s| s.into()).collect(),
-                ))
-            }
-            _ => None,
-        }
-    }
-
     fn autoscroll_to_playing(&self) -> bool {
         true
     }
 
     fn actions_for(&self, id: &str) -> Option<gio::ActionGroup> {
-        let songs = self.songs()?;
-        let song = songs.get(id)?;
+        let song = self.song_list_model().get(id)?;
+        let song = song.description();
 
         let group = SimpleActionGroup::new();
 
@@ -116,8 +101,8 @@ impl PlaylistModel for SavedTracksModel {
     }
 
     fn menu_for(&self, id: &str) -> Option<gio::MenuModel> {
-        let songs = self.songs()?;
-        let song = songs.get(id)?;
+        let song = self.song_list_model().get(id)?;
+        let song = song.description();
 
         let menu = gio::Menu::new();
         menu.append(Some(&*labels::VIEW_ALBUM), Some("song.view_album"));
@@ -134,10 +119,10 @@ impl PlaylistModel for SavedTracksModel {
     }
 
     fn select_song(&self, id: &str) {
-        let song = self.songs().and_then(|s| s.get(id).cloned());
+        let song = self.song_list_model().get(id);
         if let Some(song) = song {
             self.dispatcher
-                .dispatch(SelectionAction::Select(vec![song]).into());
+                .dispatch(SelectionAction::Select(vec![song.description().clone()]).into());
         }
     }
 
diff --git a/src/app/components/search/search.rs b/src/app/components/search/search.rs
index 65a7314b..0d23727c 100644
--- a/src/app/components/search/search.rs
+++ b/src/app/components/search/search.rs
@@ -95,7 +95,7 @@ impl SearchResultsWidget {
 
     fn bind_albums_results<F>(&self, worker: Worker, store: &gio::ListStore, on_album_pressed: F)
     where
-        F: Fn(&String) + Clone + 'static,
+        F: Fn(String) + Clone + 'static,
     {
         self.widget()
             .albums_results
@@ -104,9 +104,7 @@ impl SearchResultsWidget {
                     let f = on_album_pressed.clone();
                     let album = AlbumWidget::for_model(album_model, worker.clone());
                     album.connect_album_pressed(clone!(@weak album_model => move |_| {
-                        if let Some(id) = album_model.uri().as_ref() {
-                            f(id);
-                        }
+                        f(album_model.uri());
                     }));
                     album
                 })
@@ -115,7 +113,7 @@ impl SearchResultsWidget {
 
     fn bind_artists_results<F>(&self, worker: Worker, store: &gio::ListStore, on_artist_pressed: F)
     where
-        F: Fn(&String) + Clone + 'static,
+        F: Fn(String) + Clone + 'static,
     {
         self.widget()
             .artist_results
@@ -124,9 +122,7 @@ impl SearchResultsWidget {
                     let f = on_artist_pressed.clone();
                     let artist = ArtistWidget::for_model(artist_model, worker.clone());
                     artist.connect_artist_pressed(clone!(@weak artist_model => move |_| {
-                        if let Some(id) = artist_model.id().as_ref() {
-                            f(id);
-                        }
+                        f(artist_model.id());
                     }));
                     artist
                 })
@@ -191,7 +187,7 @@ impl SearchResults {
                     &album.artists_name(),
                     &album.title,
                     album.year(),
-                    &album.art,
+                    album.art.as_ref(),
                     &album.id,
                 ));
             }
diff --git a/src/app/components/search/search_model.rs b/src/app/components/search/search_model.rs
index f8e36164..8184ec6c 100644
--- a/src/app/components/search/search_model.rs
+++ b/src/app/components/search/search_model.rs
@@ -56,13 +56,11 @@ impl SearchResultsModel {
             .map_state_opt(|s| Some(&s.browser.search_state()?.artist_results))
     }
 
-    pub fn open_album(&self, id: &str) {
-        self.dispatcher
-            .dispatch(AppAction::ViewAlbum(id.to_string()));
+    pub fn open_album(&self, id: String) {
+        self.dispatcher.dispatch(AppAction::ViewAlbum(id));
     }
 
-    pub fn open_artist(&self, id: &str) {
-        self.dispatcher
-            .dispatch(AppAction::ViewArtist(id.to_string()));
+    pub fn open_artist(&self, id: String) {
+        self.dispatcher.dispatch(AppAction::ViewArtist(id));
     }
 }
diff --git a/src/app/components/sidebar_listbox/sidebar_icon_widget.rs b/src/app/components/sidebar_listbox/sidebar_icon_widget.rs
index 0a925f41..6be73f5b 100644
--- a/src/app/components/sidebar_listbox/sidebar_icon_widget.rs
+++ b/src/app/components/sidebar_listbox/sidebar_icon_widget.rs
@@ -31,7 +31,14 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for SideBarItemWidgetIcon {}
+    impl ObjectImpl for SideBarItemWidgetIcon {
+        fn dispose(&self, obj: &Self::Type) {
+            while let Some(child) = obj.first_child() {
+                child.unparent();
+            }
+        }
+    }
+
     impl WidgetImpl for SideBarItemWidgetIcon {}
     impl BoxImpl for SideBarItemWidgetIcon {}
 }
diff --git a/src/app/components/sidebar_listbox/sidebar_item.rs b/src/app/components/sidebar_listbox/sidebar_item.rs
index a22d30a0..270fa0d1 100644
--- a/src/app/components/sidebar_listbox/sidebar_item.rs
+++ b/src/app/components/sidebar_listbox/sidebar_item.rs
@@ -13,31 +13,19 @@ impl SideBarItem {
     }
 
     pub(crate) fn id(&self) -> String {
-        self.property("id")
-            .unwrap()
-            .get::<&str>()
-            .unwrap()
-            .to_string()
+        self.property::<String>("id")
     }
 
     pub(crate) fn title(&self) -> String {
-        self.property("title")
-            .unwrap()
-            .get::<&str>()
-            .unwrap()
-            .to_string()
+        self.property::<String>("title")
     }
 
     pub(crate) fn iconname(&self) -> String {
-        self.property("iconname")
-            .unwrap()
-            .get::<&str>()
-            .unwrap()
-            .to_string()
+        self.property::<String>("iconname")
     }
 
     pub(crate) fn grayedout(&self) -> bool {
-        self.property("grayedout").unwrap().get::<bool>().unwrap()
+        self.property::<bool>("grayedout")
     }
 }
 
@@ -72,16 +60,16 @@ mod imp {
 
     lazy_static! {
         static ref PROPERTIES: [glib::ParamSpec; 4] = [
-            glib::ParamSpec::new_string("id", "ID", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string("title", "Title", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string(
+            glib::ParamSpecString::new("id", "ID", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new("title", "Title", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new(
                 "iconname",
                 "IconName",
                 "",
                 None,
                 glib::ParamFlags::READWRITE
             ),
-            glib::ParamSpec::new_boolean(
+            glib::ParamSpecBoolean::new(
                 "grayedout",
                 "GrayedOut",
                 "",
diff --git a/src/app/components/sidebar_listbox/sidebar_row.rs b/src/app/components/sidebar_listbox/sidebar_row.rs
index 888d9992..c7d6d5c5 100644
--- a/src/app/components/sidebar_listbox/sidebar_row.rs
+++ b/src/app/components/sidebar_listbox/sidebar_row.rs
@@ -29,11 +29,7 @@ impl SideBarRow {
     }
 
     pub fn id(&self) -> String {
-        self.property("id")
-            .unwrap()
-            .get::<&str>()
-            .unwrap()
-            .to_string()
+        self.property::<String>("id")
     }
 }
 
@@ -61,7 +57,7 @@ mod imp {
     }
 
     lazy_static! {
-        static ref PROPERTIES: [glib::ParamSpec; 1] = [glib::ParamSpec::new_string(
+        static ref PROPERTIES: [glib::ParamSpec; 1] = [glib::ParamSpecString::new(
             "id",
             "ID",
             "",
diff --git a/src/app/components/user_details/user_details.rs b/src/app/components/user_details/user_details.rs
index 68f44a4e..671ae894 100644
--- a/src/app/components/user_details/user_details.rs
+++ b/src/app/components/user_details/user_details.rs
@@ -82,7 +82,7 @@ impl UserDetailsWidget {
 
     fn bind_user_playlists<F>(&self, worker: Worker, store: &ListStore<AlbumModel>, on_pressed: F)
     where
-        F: Fn(&String) + Clone + 'static,
+        F: Fn(String) + Clone + 'static,
     {
         self.widget()
             .user_playlists
@@ -91,9 +91,7 @@ impl UserDetailsWidget {
                     let f = on_pressed.clone();
                     let album = AlbumWidget::for_model(item, worker.clone());
                     album.connect_album_pressed(clone!(@weak item => move |_| {
-                        if let Some(id) = item.uri().as_ref() {
-                            f(id);
-                        }
+                        f(item.uri());
                     }));
                     album
                 })
diff --git a/src/app/components/user_details/user_details_model.rs b/src/app/components/user_details/user_details_model.rs
index cc7768a5..d47a7549 100644
--- a/src/app/components/user_details/user_details_model.rs
+++ b/src/app/components/user_details/user_details_model.rs
@@ -39,9 +39,8 @@ impl UserDetailsModel {
             });
     }
 
-    pub fn open_playlist(&self, id: &str) {
-        self.dispatcher
-            .dispatch(AppAction::ViewPlaylist(id.to_string()));
+    pub fn open_playlist(&self, id: String) {
+        self.dispatcher.dispatch(AppAction::ViewPlaylist(id));
     }
 
     pub fn load_more(&self) -> Option<()> {
diff --git a/src/app/components/utils.rs b/src/app/components/utils.rs
index 15e20561..6ca2a1bb 100644
--- a/src/app/components/utils.rs
+++ b/src/app/components/utils.rs
@@ -40,14 +40,14 @@ impl Clock {
             },
         ));
         if let Some(previous_source) = self.source.replace(new_source) {
-            glib::source_remove(previous_source);
+            previous_source.remove();
         }
     }
 
     pub fn stop(&self) {
         let new_source = None;
         if let Some(previous_source) = self.source.replace(new_source) {
-            glib::source_remove(previous_source);
+            previous_source.remove();
         }
     }
 }
@@ -71,7 +71,7 @@ impl Debouncer {
                 glib::Continue(false)
             });
         if let Some(previous_source) = self.0.replace(Some(new_source)) {
-            glib::source_remove(previous_source);
+            previous_source.remove();
         }
     }
 }
diff --git a/src/app/list_store.rs b/src/app/list_store.rs
index cdeb0dbc..2dce499b 100644
--- a/src/app/list_store.rs
+++ b/src/app/list_store.rs
@@ -3,18 +3,6 @@ use glib::clone::{Downgrade, Upgrade};
 use std::iter::Iterator;
 use std::marker::PhantomData;
 
-#[derive(Debug, Clone)]
-pub enum ListDiff<GType>
-where
-    GType: Clone,
-{
-    Set(Vec<GType>),
-    Insert(usize, Vec<GType>),
-    Append(Vec<GType>),
-    MoveUp(usize),
-    MoveDown(usize),
-}
-
 pub struct ListStore<GType> {
     store: gio::ListStore,
     _marker: PhantomData<GType>,
@@ -36,16 +24,6 @@ where
         }
     }
 
-    pub fn update(&mut self, diff: ListDiff<GType>) {
-        match diff {
-            ListDiff::Set(elements) => self.replace_all(elements.into_iter()),
-            ListDiff::Insert(i, elements) => self.insert_multiple(i as u32, elements.into_iter()),
-            ListDiff::Append(elements) => self.extend(elements.into_iter()),
-            ListDiff::MoveDown(i) => self.move_down_unchecked(i as u32),
-            ListDiff::MoveUp(i) => self.move_up_unchecked(i as u32),
-        }
-    }
-
     pub fn unsafe_store(&self) -> &gio::ListStore {
         &self.store
     }
@@ -60,26 +38,6 @@ where
         self.store.splice(0, self.store.n_items(), &upcast_vec[..]);
     }
 
-    pub fn move_up_unchecked(&mut self, index: u32) {
-        self.swap(index - 1, index).unwrap();
-    }
-
-    pub fn move_down_unchecked(&mut self, index: u32) {
-        self.swap(index, index + 1).unwrap();
-    }
-
-    fn swap(&mut self, ia: u32, ib: u32) -> Option<()> {
-        let a = self.store.item(ia)?;
-        let b = self.store.item(ib)?;
-        self.store.splice(ia, 2, &[b, a]);
-        Some(())
-    }
-
-    pub fn insert_multiple(&mut self, position: u32, elements: impl Iterator<Item = GType>) {
-        let upcast_vec: Vec<glib::Object> = elements.map(|e| e.upcast::<glib::Object>()).collect();
-        self.store.splice(position, 0, &upcast_vec[..]);
-    }
-
     pub fn insert(&mut self, position: u32, element: GType) {
         self.store.insert(position, &element);
     }
diff --git a/src/app/models/gtypes/album_model.rs b/src/app/models/album_model.rs
similarity index 64%
rename from src/app/models/gtypes/album_model.rs
rename to src/app/models/album_model.rs
index 807a1e13..d7b932ff 100644
--- a/src/app/models/gtypes/album_model.rs
+++ b/src/app/models/album_model.rs
@@ -11,25 +11,25 @@ glib::wrapper! {
 // initial values for our two properties and then returns the new instance
 impl AlbumModel {
     pub fn new(
-        artist: &str,
-        album: &str,
+        artist: &String,
+        album: &String,
         year: Option<u32>,
-        cover: &Option<String>,
-        uri: &str,
+        cover: Option<&String>,
+        uri: &String,
     ) -> AlbumModel {
-        let year = year.unwrap_or(0);
+        let year = &year.unwrap_or(0);
         glib::Object::new::<AlbumModel>(&[
-            ("artist", &artist),
-            ("album", &album),
-            ("year", &year),
-            ("cover", cover),
-            ("uri", &uri),
+            ("artist", artist),
+            ("album", album),
+            ("year", year),
+            ("cover", &cover),
+            ("uri", uri),
         ])
         .expect("Failed to create")
     }
 
     pub fn year(&self) -> Option<u32> {
-        match self.property("year").unwrap().get::<u32>().unwrap() {
+        match self.property::<u32>("year") {
             0 => None,
             year => Some(year),
         }
@@ -37,26 +37,14 @@ impl AlbumModel {
 
     pub fn cover_url(&self) -> Option<String> {
         self.property("cover")
-            .unwrap()
-            .get::<&str>()
-            .ok()
-            .map(|s| s.to_string())
     }
 
-    pub fn uri(&self) -> Option<String> {
+    pub fn uri(&self) -> String {
         self.property("uri")
-            .unwrap()
-            .get::<&str>()
-            .ok()
-            .map(|s| s.to_string())
     }
 
-    pub fn album_title(&self) -> Option<String> {
+    pub fn album_title(&self) -> String {
         self.property("album")
-            .unwrap()
-            .get::<&str>()
-            .ok()
-            .map(|s| s.to_string())
     }
 }
 
@@ -64,28 +52,29 @@ mod imp {
 
     use super::*;
 
-    use std::cell::RefCell;
+    use std::cell::{Cell, RefCell};
 
     // Static array for defining the properties of the new type.
     lazy_static! {
         static ref PROPERTIES: [glib::ParamSpec; 5] = [
-            glib::ParamSpec::new_string("artist", "Artist", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string("album", "Album", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_uint("year", "Year", "", 0, 9999, 0, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string("cover", "Cover", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string("uri", "URI", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new("artist", "Artist", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new("album", "Album", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecUInt::new("year", "Year", "", 0, 9999, 0, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new("cover", "Cover", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new("uri", "URI", "", None, glib::ParamFlags::READWRITE),
         ];
     }
 
     // This is the struct containing all state carried with
     // the new type. Generally this has to make use of
     // interior mutability.
+    #[derive(Default)]
     pub struct AlbumModel {
-        album: RefCell<Option<String>>,
-        artist: RefCell<Option<String>>,
-        year: RefCell<Option<u32>>,
+        album: RefCell<String>,
+        artist: RefCell<String>,
+        year: Cell<u32>,
         cover: RefCell<Option<String>>,
-        uri: RefCell<Option<String>>,
+        uri: RefCell<String>,
     }
 
     // ObjectSubclass is the trait that defines the new type and
@@ -100,21 +89,6 @@ mod imp {
 
         // The parent type this one is inheriting from.
         type ParentType = glib::Object;
-
-        // Interfaces this type implements
-        type Interfaces = ();
-
-        // Called every time a new instance is created. This should return
-        // a new instance of our type with its basic values.
-        fn new() -> Self {
-            Self {
-                album: RefCell::new(None),
-                artist: RefCell::new(None),
-                year: RefCell::new(None),
-                cover: RefCell::new(None),
-                uri: RefCell::new(None),
-            }
-        }
     }
 
     // Trait that is used to override virtual methods of glib::Object.
@@ -149,13 +123,10 @@ mod imp {
                     let year = value
                         .get()
                         .expect("type conformity checked by `Object::set_property`");
-                    match year {
-                        0 => self.year.replace(None),
-                        y => self.year.replace(Some(y)),
-                    };
+                    self.year.replace(year);
                 }
                 "cover" => {
-                    let cover = value
+                    let cover: Option<String> = value
                         .get()
                         .expect("type conformity checked by `Object::set_property`");
                     self.cover.replace(cover);
@@ -176,7 +147,7 @@ mod imp {
             match pspec.name() {
                 "album" => self.album.borrow().to_value(),
                 "artist" => self.artist.borrow().to_value(),
-                "year" => self.year.borrow().unwrap_or(0).to_value(),
+                "year" => self.year.get().to_value(),
                 "cover" => self.cover.borrow().to_value(),
                 "uri" => self.uri.borrow().to_value(),
                 _ => unimplemented!(),
diff --git a/src/app/models/gtypes/artist_model.rs b/src/app/models/artist_model.rs
similarity index 72%
rename from src/app/models/gtypes/artist_model.rs
rename to src/app/models/artist_model.rs
index f597cb39..0cf7fcb7 100644
--- a/src/app/models/gtypes/artist_model.rs
+++ b/src/app/models/artist_model.rs
@@ -17,18 +17,10 @@ impl ArtistModel {
 
     pub fn image_url(&self) -> Option<String> {
         self.property("image")
-            .unwrap()
-            .get::<&str>()
-            .ok()
-            .map(|s| s.to_string())
     }
 
-    pub fn id(&self) -> Option<String> {
+    pub fn id(&self) -> String {
         self.property("id")
-            .unwrap()
-            .get::<&str>()
-            .ok()
-            .map(|s| s.to_string())
     }
 }
 
@@ -40,19 +32,20 @@ mod imp {
     // Static array for defining the properties of the new type.
     lazy_static! {
         static ref PROPERTIES: [glib::ParamSpec; 3] = [
-            glib::ParamSpec::new_string("artist", "Artist", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string("image", "Image", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string("id", "id", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new("artist", "Artist", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new("image", "Image", "", None, glib::ParamFlags::READWRITE),
+            glib::ParamSpecString::new("id", "id", "", None, glib::ParamFlags::READWRITE),
         ];
     }
 
     // This is the struct containing all state carried with
     // the new type. Generally this has to make use of
     // interior mutability.
+    #[derive(Default)]
     pub struct ArtistModel {
-        artist: RefCell<Option<String>>,
+        artist: RefCell<String>,
         image: RefCell<Option<String>>,
-        id: RefCell<Option<String>>,
+        id: RefCell<String>,
     }
 
     // ObjectSubclass is the trait that defines the new type and
@@ -67,19 +60,6 @@ mod imp {
 
         // The parent type this one is inheriting from.
         type ParentType = glib::Object;
-
-        // Interfaces this type implements
-        type Interfaces = ();
-
-        // Called every time a new instance is created. This should return
-        // a new instance of our type with its basic values.
-        fn new() -> Self {
-            Self {
-                artist: RefCell::new(None),
-                image: RefCell::new(None),
-                id: RefCell::new(None),
-            }
-        }
     }
 
     // Trait that is used to override virtual methods of glib::Object.
@@ -130,14 +110,5 @@ mod imp {
                 _ => unimplemented!(),
             }
         }
-
-        // Called right after construction of the instance.
-        fn constructed(&self, obj: &Self::Type) {
-            // Chain up to the parent type's implementation of this virtual
-            // method.
-            self.parent_constructed(obj);
-
-            // And here we could do our own initialization.
-        }
     }
 }
diff --git a/src/app/models/gtypes/mod.rs b/src/app/models/gtypes/mod.rs
deleted file mode 100644
index 47ad0da5..00000000
--- a/src/app/models/gtypes/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-mod song_model;
-pub use song_model::SongModel;
-
-mod album_model;
-pub use album_model::AlbumModel;
-
-mod artist_model;
-pub use artist_model::ArtistModel;
diff --git a/src/app/models/gtypes/song_model.rs b/src/app/models/gtypes/song_model.rs
deleted file mode 100644
index 3fa29288..00000000
--- a/src/app/models/gtypes/song_model.rs
+++ /dev/null
@@ -1,337 +0,0 @@
-#![allow(clippy::all)]
-
-use gio::prelude::*;
-use glib::{subclass::prelude::*, SignalHandlerId};
-
-glib::wrapper! {
-    pub struct SongModel(ObjectSubclass<imp::SongModel>);
-}
-
-// Constructor for new instances. This simply calls glib::Object::new() with
-// initial values for our two properties and then returns the new instance
-impl SongModel {
-    pub fn new(
-        id: &str,
-        index: u32,
-        title: &str,
-        artist: &str,
-        duration: &str,
-        art: &Option<String>,
-    ) -> SongModel {
-        glib::Object::new::<SongModel>(&[
-            ("index", &index),
-            ("title", &title),
-            ("artist", &artist),
-            ("id", &id),
-            ("duration", &duration),
-            ("art", &art),
-        ])
-        .expect("Failed to create")
-    }
-
-    pub fn cover_url(&self) -> Option<String> {
-        self.property("art")
-            .unwrap()
-            .get::<&str>()
-            .ok()
-            .map(|s| s.to_string())
-    }
-
-    pub fn set_playing(&self, is_playing: bool) {
-        self.set_property("playing", is_playing)
-            .expect("set 'playing' failed");
-    }
-
-    pub fn set_selected(&self, is_selected: bool) {
-        self.set_property("selected", is_selected)
-            .expect("set 'selected' failed");
-    }
-
-    pub fn get_playing(&self) -> bool {
-        self.property("playing").unwrap().get::<bool>().unwrap()
-    }
-
-    pub fn get_selected(&self) -> bool {
-        self.property("selected").unwrap().get::<bool>().unwrap()
-    }
-
-    pub fn get_id(&self) -> String {
-        self.property("id")
-            .unwrap()
-            .get::<&str>()
-            .unwrap()
-            .to_string()
-    }
-
-    pub fn bind_index<O: ObjectType>(&self, o: &O, property: &str) {
-        imp::SongModel::from_instance(self).push_binding(
-            self.bind_property("index", o, property)
-                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
-                .build(),
-        );
-    }
-
-    pub fn bind_artist<O: ObjectType>(&self, o: &O, property: &str) {
-        imp::SongModel::from_instance(self).push_binding(
-            self.bind_property("artist", o, property)
-                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
-                .build(),
-        );
-    }
-
-    pub fn bind_title<O: ObjectType>(&self, o: &O, property: &str) {
-        imp::SongModel::from_instance(self).push_binding(
-            self.bind_property("title", o, property)
-                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
-                .build(),
-        );
-    }
-
-    pub fn bind_duration<O: ObjectType>(&self, o: &O, property: &str) {
-        imp::SongModel::from_instance(self).push_binding(
-            self.bind_property("duration", o, property)
-                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
-                .build(),
-        );
-    }
-
-    pub fn connect_playing_local<F: Fn(&Self) + 'static>(&self, handler: F) {
-        let signal_id = self
-            .connect_local("notify::playing", true, move |values| {
-                if let Ok(_self) = values[0].get::<Self>() {
-                    handler(&_self);
-                }
-                None
-            })
-            .expect("connecting to prop 'playing' failed");
-        imp::SongModel::from_instance(self).push_signal(signal_id);
-    }
-
-    pub fn connect_selected_local<F: Fn(&Self) + 'static>(&self, handler: F) {
-        let signal_id = self
-            .connect_local("notify::selected", true, move |values| {
-                if let Ok(_self) = values[0].get::<Self>() {
-                    handler(&_self);
-                }
-                None
-            })
-            .expect("connecting to prop 'selected' failed");
-        imp::SongModel::from_instance(self).push_signal(signal_id);
-    }
-
-    pub fn unbind_all(&self) {
-        imp::SongModel::from_instance(self).unbind_all(self);
-    }
-}
-
-mod imp {
-
-    use super::*;
-    use std::cell::RefCell;
-
-    #[derive(Default)]
-    struct BindingsInner {
-        pub signals: Vec<SignalHandlerId>,
-        pub bindings: Vec<glib::Binding>,
-    }
-
-    // This is the struct containing all state carried with
-    // the new type. Generally this has to make use of
-    // interior mutability.
-    pub struct SongModel {
-        id: RefCell<Option<String>>,
-        index: RefCell<u32>,
-        title: RefCell<Option<String>>,
-        artist: RefCell<Option<String>>,
-        duration: RefCell<Option<String>>,
-        art: RefCell<Option<String>>,
-        playing: RefCell<bool>,
-        selected: RefCell<bool>,
-        bindings: RefCell<BindingsInner>,
-    }
-
-    impl SongModel {
-        pub fn push_signal(&self, id: SignalHandlerId) {
-            self.bindings.borrow_mut().signals.push(id);
-        }
-
-        pub fn push_binding(&self, binding: Option<glib::Binding>) {
-            if let Some(binding) = binding {
-                self.bindings.borrow_mut().bindings.push(binding);
-            }
-        }
-
-        pub fn unbind_all<O: ObjectExt>(&self, o: &O) {
-            let mut bindings = self.bindings.borrow_mut();
-            bindings.signals.drain(..).for_each(|s| o.disconnect(s));
-            bindings.bindings.drain(..).for_each(|b| b.unbind());
-        }
-    }
-
-    // ObjectSubclass is the trait that defines the new type and
-    // contains all information needed by the GObject type system,
-    // including the new type's name, parent type, etc.
-    #[glib::object_subclass]
-    impl ObjectSubclass for SongModel {
-        // This type name must be unique per process.
-        const NAME: &'static str = "SongModel";
-
-        type Type = super::SongModel;
-
-        // The parent type this one is inheriting from.
-        type ParentType = glib::Object;
-
-        // Interfaces this type implements
-        type Interfaces = ();
-
-        // Called every time a new instance is created. This should return
-        // a new instance of our type with its basic values.
-        fn new() -> Self {
-            Self {
-                id: RefCell::new(None),
-                index: RefCell::new(1),
-                title: RefCell::new(None),
-                artist: RefCell::new(None),
-                duration: RefCell::new(None),
-                art: RefCell::new(None),
-                playing: RefCell::new(false),
-                selected: RefCell::new(false),
-                bindings: RefCell::new(Default::default()),
-            }
-        }
-    }
-
-    // Static array for defining the properties of the new type.
-    lazy_static! {
-        static ref PROPERTIES: [glib::ParamSpec; 8] = [
-            glib::ParamSpec::new_uint(
-                "index",
-                "Index",
-                "",
-                1,
-                u32::MAX,
-                1,
-                glib::ParamFlags::READWRITE,
-            ),
-            glib::ParamSpec::new_string("title", "Title", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string("artist", "Artist", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string("id", "id", "", None, glib::ParamFlags::READWRITE),
-            glib::ParamSpec::new_string(
-                "duration",
-                "Duration",
-                "",
-                None,
-                glib::ParamFlags::READWRITE,
-            ),
-            glib::ParamSpec::new_boolean(
-                "playing",
-                "Playing",
-                "",
-                false,
-                glib::ParamFlags::READWRITE
-            ),
-            glib::ParamSpec::new_boolean(
-                "selected",
-                "Selected",
-                "",
-                false,
-                glib::ParamFlags::READWRITE,
-            ),
-            glib::ParamSpec::new_string("art", "Art", "", None, glib::ParamFlags::READWRITE,),
-        ];
-    }
-
-    // Trait that is used to override virtual methods of glib::Object.
-    impl ObjectImpl for SongModel {
-        fn properties() -> &'static [glib::ParamSpec] {
-            &*PROPERTIES
-        }
-
-        // Called whenever a property is set on this instance. The id
-        // is the same as the index of the property in the PROPERTIES array.
-        fn set_property(
-            &self,
-            _obj: &Self::Type,
-            _id: usize,
-            value: &glib::Value,
-            pspec: &glib::ParamSpec,
-        ) {
-            match pspec.name() {
-                "index" => {
-                    let index = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-                    self.index.replace(index);
-                }
-                "title" => {
-                    let title = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-                    self.title.replace(title);
-                }
-                "artist" => {
-                    let artist = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-                    self.artist.replace(artist);
-                }
-                "id" => {
-                    let id = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-                    self.id.replace(id);
-                }
-                "duration" => {
-                    let dur = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-                    self.duration.replace(dur);
-                }
-                "art" => {
-                    let art = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-                    self.art.replace(art);
-                }
-                "playing" => {
-                    let playing = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-                    self.playing.replace(playing);
-                }
-                "selected" => {
-                    let selected = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-                    self.selected.replace(selected);
-                }
-                _ => unimplemented!(),
-            }
-        }
-
-        // Called whenever a property is retrieved from this instance. The id
-        // is the same as the index of the property in the PROPERTIES array.
-        fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-            match pspec.name() {
-                "index" => self.index.borrow().to_value(),
-                "title" => self.title.borrow().to_value(),
-                "artist" => self.artist.borrow().to_value(),
-                "id" => self.id.borrow().to_value(),
-                "duration" => self.duration.borrow().to_value(),
-                "art" => self.art.borrow().to_value(),
-                "playing" => self.playing.borrow().to_value(),
-                "selected" => self.selected.borrow().to_value(),
-                _ => unimplemented!(),
-            }
-        }
-
-        // Called right after construction of the instance.
-        fn constructed(&self, obj: &Self::Type) {
-            // Chain up to the parent type's implementation of this virtual
-            // method.
-            self.parent_constructed(obj);
-
-            // And here we could do our own initialization.
-        }
-    }
-}
diff --git a/src/app/models/main.rs b/src/app/models/main.rs
index f8c7e216..7f81e213 100644
--- a/src/app/models/main.rs
+++ b/src/app/models/main.rs
@@ -1,64 +1,34 @@
-use std::convert::From;
 use std::str::FromStr;
 
-use super::core::{Batch, SongList};
-use super::gtypes::*;
-
-use crate::app::components::utils::format_duration;
-
-impl From<&AlbumDescription> for AlbumModel {
-    fn from(album: &AlbumDescription) -> Self {
-        AlbumModel::new(
-            &album.artists_name(),
-            &album.title,
-            album.year(),
-            &album.art,
-            &album.id,
-        )
-    }
+#[derive(Clone, Copy, Debug)]
+pub struct Batch {
+    pub offset: usize,
+    pub batch_size: usize,
+    pub total: usize,
 }
 
-impl From<AlbumDescription> for AlbumModel {
-    fn from(album: AlbumDescription) -> Self {
-        Self::from(&album)
-    }
-}
-
-impl From<&PlaylistDescription> for AlbumModel {
-    fn from(playlist: &PlaylistDescription) -> Self {
-        AlbumModel::new(
-            &playlist.owner.display_name,
-            &playlist.title,
-            // Playlists do not have their released date since they are expected to be updated anytime.
-            None,
-            &playlist.art,
-            &playlist.id,
-        )
-    }
-}
-
-impl From<PlaylistDescription> for AlbumModel {
-    fn from(playlist: PlaylistDescription) -> Self {
-        Self::from(&playlist)
-    }
-}
-
-impl From<&SongDescription> for SongModel {
-    fn from(song: &SongDescription) -> Self {
-        SongModel::new(
-            &song.id,
-            song.track_number.unwrap_or(1),
-            &song.title,
-            &song.artists_name(),
-            &format_duration(song.duration.into()),
-            &song.art,
-        )
+impl Batch {
+    pub fn first_of_size(batch_size: usize) -> Self {
+        Self {
+            offset: 0,
+            batch_size,
+            total: 0,
+        }
     }
-}
 
-impl From<SongDescription> for SongModel {
-    fn from(song: SongDescription) -> Self {
-        SongModel::from(&song)
+    pub fn next(self) -> Option<Self> {
+        let Self {
+            offset,
+            batch_size,
+            total,
+        } = self;
+
+        Some(Self {
+            offset: offset + batch_size,
+            batch_size,
+            total,
+        })
+        .filter(|b| b.offset < total)
     }
 }
 
@@ -93,7 +63,7 @@ pub struct AlbumDescription {
     pub artists: Vec<ArtistRef>,
     pub release_date: Option<String>,
     pub art: Option<String>,
-    pub songs: SongList,
+    pub songs: SongBatch,
     pub is_liked: bool,
 }
 
@@ -106,11 +76,6 @@ impl AlbumDescription {
             .join(", ")
     }
 
-    pub fn formatted_time(&self) -> String {
-        let duration: u32 = self.songs.iter().map(|song| song.duration).sum();
-        format_duration(duration.into())
-    }
-
     pub fn year(&self) -> Option<u32> {
         self.release_date
             .as_ref()
@@ -129,6 +94,7 @@ pub struct AlbumFullDescription {
 pub struct AlbumReleaseDetails {
     pub label: String,
     pub copyright_text: String,
+    pub total_tracks: usize,
 }
 
 #[derive(Clone, Debug)]
@@ -136,7 +102,7 @@ pub struct PlaylistDescription {
     pub id: String,
     pub title: String,
     pub art: Option<String>,
-    pub songs: SongList,
+    pub songs: SongBatch,
     pub owner: UserRef,
 }
 
@@ -168,6 +134,12 @@ impl SongDescription {
     }
 }
 
+#[derive(Copy, Clone, Default)]
+pub struct SongState {
+    pub is_playing: bool,
+    pub is_selected: bool,
+}
+
 #[derive(Debug, Clone)]
 pub struct SongBatch {
     pub songs: Vec<SongDescription>,
@@ -237,3 +209,38 @@ pub struct UserDescription {
     pub name: String,
     pub playlists: Vec<PlaylistDescription>,
 }
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    fn song(id: &str) -> SongDescription {
+        SongDescription {
+            id: id.to_string(),
+            uri: "".to_string(),
+            title: "Title".to_string(),
+            artists: vec![],
+            album: AlbumRef {
+                id: "".to_string(),
+                name: "".to_string(),
+            },
+            duration: 1000,
+            art: None,
+            track_number: None,
+        }
+    }
+
+    #[test]
+    fn resize_batch() {
+        let batch = SongBatch {
+            songs: vec![song("1"), song("2"), song("3"), song("4")],
+            batch: Batch::first_of_size(4),
+        };
+
+        let batches = batch.resize(2);
+        assert_eq!(batches.len(), 2);
+        assert_eq!(&batches.get(0).unwrap().songs.get(0).unwrap().id, "1");
+        assert_eq!(&batches.get(1).unwrap().songs.get(0).unwrap().id, "3");
+    }
+}
diff --git a/src/app/models/mod.rs b/src/app/models/mod.rs
index 0f487767..b7b2f6d2 100644
--- a/src/app/models/mod.rs
+++ b/src/app/models/mod.rs
@@ -1,8 +1,60 @@
 mod main;
 pub use main::*;
 
-mod core;
-pub use self::core::*;
+mod songs;
+pub use songs::*;
 
-mod gtypes;
-pub use gtypes::*;
+mod album_model;
+pub use album_model::*;
+
+mod artist_model;
+pub use artist_model::*;
+
+impl From<&AlbumDescription> for AlbumModel {
+    fn from(album: &AlbumDescription) -> Self {
+        AlbumModel::new(
+            &album.artists_name(),
+            &album.title,
+            album.year(),
+            album.art.as_ref(),
+            &album.id,
+        )
+    }
+}
+
+impl From<AlbumDescription> for AlbumModel {
+    fn from(album: AlbumDescription) -> Self {
+        Self::from(&album)
+    }
+}
+
+impl From<&PlaylistDescription> for AlbumModel {
+    fn from(playlist: &PlaylistDescription) -> Self {
+        AlbumModel::new(
+            &playlist.owner.display_name,
+            &playlist.title,
+            // Playlists do not have their released date since they are expected to be updated anytime.
+            None,
+            playlist.art.as_ref(),
+            &playlist.id,
+        )
+    }
+}
+
+impl From<PlaylistDescription> for AlbumModel {
+    fn from(playlist: PlaylistDescription) -> Self {
+        Self::from(&playlist)
+    }
+}
+
+impl From<SongDescription> for SongModel {
+    fn from(song: SongDescription) -> Self {
+        SongModel::new(song)
+    }
+}
+
+impl From<&SongDescription> for SongModel {
+    fn from(song: &SongDescription) -> Self {
+        SongModel::new(song.clone())
+    }
+}
diff --git a/src/app/models/songs/mod.rs b/src/app/models/songs/mod.rs
new file mode 100644
index 00000000..b156fbeb
--- /dev/null
+++ b/src/app/models/songs/mod.rs
@@ -0,0 +1,7 @@
+mod support;
+
+mod song_list_model;
+pub use song_list_model::*;
+
+mod song_model;
+pub use song_model::*;
diff --git a/src/app/models/songs/song_list_model.rs b/src/app/models/songs/song_list_model.rs
new file mode 100644
index 00000000..d50e181c
--- /dev/null
+++ b/src/app/models/songs/song_list_model.rs
@@ -0,0 +1,251 @@
+use gio::prelude::*;
+use gio::ListModel;
+use glib::StaticType;
+use gtk::subclass::prelude::*;
+use std::cell::{Ref, RefCell, RefMut};
+
+use super::support::*;
+use crate::app::models::*;
+
+#[must_use]
+pub struct SongListModelPending<'a> {
+    change: Option<ListRangeUpdate>,
+    song_list_model: &'a mut SongListModel,
+}
+
+impl<'a> SongListModelPending<'a> {
+    fn new(change: Option<ListRangeUpdate>, song_list_model: &'a mut SongListModel) -> Self {
+        Self {
+            change,
+            song_list_model,
+        }
+    }
+
+    pub fn and<Op>(self, op: Op) -> Self
+    where
+        Op: FnOnce(&mut SongListModel) -> SongListModelPending<'_> + 'static,
+    {
+        let Self {
+            change,
+            song_list_model,
+        } = self;
+
+        let new_change = op(song_list_model).change;
+
+        let merged_change = if let (Some(change), Some(new_change)) = (change, new_change) {
+            Some(change.merge(new_change))
+        } else {
+            change.or(new_change)
+        };
+
+        Self {
+            change: merged_change,
+            song_list_model,
+        }
+    }
+
+    pub fn commit(self) -> bool {
+        let Self {
+            change,
+            song_list_model,
+        } = self;
+        song_list_model.notify_changes(change);
+        change.is_some()
+    }
+}
+
+glib::wrapper! {
+    pub struct SongListModel(ObjectSubclass<imp::SongListModel>) @implements gio::ListModel;
+}
+
+impl SongListModel {
+    pub fn new(batch_size: u32) -> Self {
+        glib::Object::new(&[("batch-size", &batch_size)]).unwrap()
+    }
+
+    fn inner_mut(&mut self) -> RefMut<SongList> {
+        imp::SongListModel::from_instance(self).get_mut()
+    }
+
+    fn inner(&self) -> Ref<SongList> {
+        imp::SongListModel::from_instance(self).get()
+    }
+
+    fn notify_changes(&self, changes: impl IntoIterator<Item = ListRangeUpdate> + 'static) {
+        if cfg!(not(test)) {
+            glib::source::idle_add_local_once(clone!(@weak self as s => move || {
+                for ListRangeUpdate(a, b, c) in changes.into_iter() {
+                    debug!("pos {}, removed {}, added {}", a, b, c);
+                    s.items_changed(a as u32, b as u32, c as u32);
+                }
+            }));
+        }
+    }
+
+    pub fn for_each<F>(&self, f: F)
+    where
+        F: Fn(usize, &SongModel),
+    {
+        for (i, song) in self.inner().iter().enumerate() {
+            f(i, song);
+        }
+    }
+
+    pub fn collect(&self) -> Vec<SongDescription> {
+        self.inner().iter().map(|s| s.into_description()).collect()
+    }
+
+    pub fn add(&mut self, song_batch: SongBatch) -> SongListModelPending {
+        let range = self.inner_mut().add(song_batch);
+        SongListModelPending::new(range, self)
+    }
+
+    pub fn get(&self, id: &str) -> Option<SongModel> {
+        self.inner().get(id).cloned()
+    }
+
+    pub fn index(&self, i: usize) -> Option<SongModel> {
+        self.inner().index(i).cloned()
+    }
+
+    pub fn index_continuous(&self, i: usize) -> Option<SongModel> {
+        self.inner().index_continuous(i).cloned()
+    }
+
+    pub fn song_batch_for(&self, i: usize) -> Option<SongBatch> {
+        self.inner().song_batch_for(i)
+    }
+
+    pub fn last_batch(&self) -> Option<Batch> {
+        self.inner().last_batch()
+    }
+
+    pub fn needed_batch_for(&self, i: usize) -> Option<Batch> {
+        self.inner().needed_batch_for(i)
+    }
+
+    pub fn len(&self) -> usize {
+        self.inner().len()
+    }
+
+    pub fn append(&mut self, songs: Vec<SongDescription>) -> SongListModelPending {
+        let range = self.inner_mut().append(songs);
+        SongListModelPending::new(Some(range), self)
+    }
+
+    pub fn find_index(&self, song_id: &str) -> Option<usize> {
+        self.inner().find_index(song_id)
+    }
+
+    pub fn remove(&mut self, ids: &[String]) -> SongListModelPending {
+        let change = self.inner_mut().remove(ids);
+        SongListModelPending::new(Some(change), self)
+    }
+
+    pub fn move_down(&mut self, a: usize) -> SongListModelPending {
+        let swap = self.inner_mut().swap(a + 1, a);
+        SongListModelPending::new(swap, self)
+    }
+
+    pub fn move_up(&mut self, a: usize) -> SongListModelPending {
+        let swap = self.inner_mut().swap(a - 1, a);
+        SongListModelPending::new(swap, self)
+    }
+
+    pub fn clear(&mut self) -> SongListModelPending {
+        let removed = self.inner_mut().clear();
+        SongListModelPending::new(Some(removed), self)
+    }
+}
+
+mod imp {
+
+    use super::*;
+
+    pub struct SongListModel(RefCell<Option<SongList>>);
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for SongListModel {
+        const NAME: &'static str = "SongList";
+
+        type Type = super::SongListModel;
+        type ParentType = glib::Object;
+        type Interfaces = (ListModel,);
+
+        fn new() -> Self {
+            Self(RefCell::new(None))
+        }
+    }
+
+    lazy_static! {
+        static ref PROPERTIES: [glib::ParamSpec; 1] = [glib::ParamSpecUInt::new(
+            "batch-size",
+            "Size of the batches",
+            "",
+            1,
+            u32::MAX,
+            1,
+            glib::ParamFlags::READWRITE,
+        )];
+    }
+
+    impl ObjectImpl for SongListModel {
+        fn properties() -> &'static [glib::ParamSpec] {
+            &*PROPERTIES
+        }
+
+        fn set_property(
+            &self,
+            _obj: &Self::Type,
+            _id: usize,
+            value: &glib::Value,
+            pspec: &glib::ParamSpec,
+        ) {
+            if "batch-size" == pspec.name() {
+                let batch_size = value.get::<u32>().unwrap();
+                *self.0.borrow_mut() = Some(SongList::new_sized(batch_size as usize))
+            } else {
+                unimplemented!()
+            }
+        }
+
+        fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            if "batch-size" == pspec.name() {
+                let size = self.get().batch_size() as u32;
+                size.to_value()
+            } else {
+                unimplemented!()
+            }
+        }
+    }
+
+    impl ListModelImpl for SongListModel {
+        fn item_type(&self, _: &Self::Type) -> glib::Type {
+            SongModel::static_type()
+        }
+
+        fn n_items(&self, _: &Self::Type) -> u32 {
+            self.get().partial_len() as u32
+        }
+
+        fn item(&self, _: &Self::Type, position: u32) -> Option<glib::Object> {
+            self.get()
+                .index_continuous(position as usize)
+                .map(|m| m.clone().upcast())
+        }
+    }
+
+    impl SongListModel {
+        pub fn get_mut(&self) -> RefMut<SongList> {
+            RefMut::map(self.0.borrow_mut(), |s| {
+                s.as_mut().expect("set at construction")
+            })
+        }
+
+        pub fn get(&self) -> Ref<SongList> {
+            Ref::map(self.0.borrow(), |s| {
+                s.as_ref().expect("set at construction")
+            })
+        }
+    }
+}
diff --git a/src/app/models/songs/song_model.rs b/src/app/models/songs/song_model.rs
new file mode 100644
index 00000000..3141dbe2
--- /dev/null
+++ b/src/app/models/songs/song_model.rs
@@ -0,0 +1,300 @@
+#![allow(clippy::all)]
+
+use gio::prelude::*;
+use glib::{subclass::prelude::*, SignalHandlerId};
+use std::{cell::Ref, ops::Deref};
+
+use crate::app::components::utils::format_duration;
+use crate::app::models::*;
+
+glib::wrapper! {
+    pub struct SongModel(ObjectSubclass<imp::SongModel>);
+}
+
+impl SongModel {
+    pub fn new(song: SongDescription) -> Self {
+        let o: Self = glib::Object::new(&[]).unwrap();
+        imp::SongModel::from_instance(&o).song.replace(Some(song));
+        o
+    }
+
+    pub fn set_playing(&self, is_playing: bool) {
+        self.set_property("playing", is_playing);
+    }
+
+    pub fn set_selected(&self, is_selected: bool) {
+        self.set_property("selected", is_selected);
+    }
+
+    pub fn get_playing(&self) -> bool {
+        self.property("playing")
+    }
+
+    pub fn get_selected(&self) -> bool {
+        self.property("selected")
+    }
+
+    pub fn get_id(&self) -> String {
+        self.property("id")
+    }
+
+    pub fn bind_index(&self, o: &impl ObjectType, property: &str) {
+        imp::SongModel::from_instance(self).push_binding(
+            self.bind_property("index", o, property)
+                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+                .build(),
+        );
+    }
+
+    pub fn bind_artist(&self, o: &impl ObjectType, property: &str) {
+        imp::SongModel::from_instance(self).push_binding(
+            self.bind_property("artist", o, property)
+                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+                .build(),
+        );
+    }
+
+    pub fn bind_title(&self, o: &impl ObjectType, property: &str) {
+        imp::SongModel::from_instance(self).push_binding(
+            self.bind_property("title", o, property)
+                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+                .build(),
+        );
+    }
+
+    pub fn bind_duration(&self, o: &impl ObjectType, property: &str) {
+        imp::SongModel::from_instance(self).push_binding(
+            self.bind_property("duration", o, property)
+                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+                .build(),
+        );
+    }
+
+    pub fn bind_playing(&self, o: &impl ObjectType, property: &str) {
+        imp::SongModel::from_instance(self).push_binding(
+            self.bind_property("playing", o, property)
+                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+                .build(),
+        );
+    }
+
+    pub fn bind_selected(&self, o: &impl ObjectType, property: &str) {
+        imp::SongModel::from_instance(self).push_binding(
+            self.bind_property("selected", o, property)
+                .flags(glib::BindingFlags::DEFAULT | glib::BindingFlags::SYNC_CREATE)
+                .build(),
+        );
+    }
+
+    pub fn unbind_all(&self) {
+        imp::SongModel::from_instance(self).unbind_all(self);
+    }
+
+    pub fn description(&self) -> impl Deref<Target = SongDescription> + '_ {
+        Ref::map(imp::SongModel::from_instance(self).song.borrow(), |s| {
+            s.as_ref().expect("song set at constructor")
+        })
+    }
+
+    pub fn into_description(&self) -> SongDescription {
+        imp::SongModel::from_instance(&self)
+            .song
+            .borrow()
+            .as_ref()
+            .cloned()
+            .expect("song set at constructor")
+    }
+}
+
+mod imp {
+
+    use super::*;
+    use std::cell::{Cell, RefCell};
+
+    #[derive(Default)]
+    struct BindingsInner {
+        pub signals: Vec<SignalHandlerId>,
+        pub bindings: Vec<glib::Binding>,
+    }
+
+    #[derive(Default)]
+    pub struct SongModel {
+        pub song: RefCell<Option<SongDescription>>,
+        pub state: Cell<SongState>,
+        bindings: RefCell<BindingsInner>,
+    }
+
+    impl SongModel {
+        pub fn push_signal(&self, id: SignalHandlerId) {
+            self.bindings.borrow_mut().signals.push(id);
+        }
+
+        pub fn push_binding(&self, binding: glib::Binding) {
+            self.bindings.borrow_mut().bindings.push(binding);
+        }
+
+        pub fn unbind_all<O: ObjectExt>(&self, o: &O) {
+            let mut bindings = self.bindings.borrow_mut();
+            bindings.signals.drain(..).for_each(|s| o.disconnect(s));
+            bindings.bindings.drain(..).for_each(|b| b.unbind());
+        }
+    }
+    #[glib::object_subclass]
+    impl ObjectSubclass for SongModel {
+        const NAME: &'static str = "SongModel";
+        type Type = super::SongModel;
+        type ParentType = glib::Object;
+    }
+
+    lazy_static! {
+        static ref PROPERTIES: [glib::ParamSpec; 8] = [
+            glib::ParamSpecString::new(
+                "id",
+                "Spotify identifier",
+                "",
+                None,
+                glib::ParamFlags::READABLE
+            ),
+            glib::ParamSpecUInt::new(
+                "index",
+                "Track number within an album",
+                "",
+                1,
+                u32::MAX,
+                1,
+                glib::ParamFlags::READABLE,
+            ),
+            glib::ParamSpecString::new(
+                "title",
+                "Title of the track",
+                "",
+                None,
+                glib::ParamFlags::READABLE
+            ),
+            glib::ParamSpecString::new(
+                "artist",
+                "Artists, comma separated",
+                "",
+                None,
+                glib::ParamFlags::READABLE
+            ),
+            glib::ParamSpecString::new(
+                "duration",
+                "Duration (formatted)",
+                "",
+                None,
+                glib::ParamFlags::READABLE,
+            ),
+            glib::ParamSpecString::new(
+                "art",
+                "URL to the cover art",
+                "",
+                None,
+                glib::ParamFlags::READABLE,
+            ),
+            glib::ParamSpecBoolean::new(
+                "playing",
+                "Playing",
+                "",
+                false,
+                glib::ParamFlags::READWRITE
+            ),
+            glib::ParamSpecBoolean::new(
+                "selected",
+                "Selected",
+                "",
+                false,
+                glib::ParamFlags::READWRITE,
+            ),
+        ];
+    }
+
+    impl ObjectImpl for SongModel {
+        fn properties() -> &'static [glib::ParamSpec] {
+            &*PROPERTIES
+        }
+
+        fn set_property(
+            &self,
+            _obj: &Self::Type,
+            _id: usize,
+            value: &glib::Value,
+            pspec: &glib::ParamSpec,
+        ) {
+            match pspec.name() {
+                "playing" => {
+                    let is_playing = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    let SongState { is_selected, .. } = self.state.get();
+                    self.state.set(SongState {
+                        is_playing,
+                        is_selected,
+                    });
+                }
+                "selected" => {
+                    let is_selected = value
+                        .get()
+                        .expect("type conformity checked by `Object::set_property`");
+                    let SongState { is_playing, .. } = self.state.get();
+                    self.state.set(SongState {
+                        is_playing,
+                        is_selected,
+                    });
+                }
+                _ => unimplemented!(),
+            }
+        }
+
+        fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            match pspec.name() {
+                "index" => self
+                    .song
+                    .borrow()
+                    .as_ref()
+                    .expect("song set at constructor")
+                    .track_number
+                    .unwrap_or(1)
+                    .to_value(),
+                "title" => self
+                    .song
+                    .borrow()
+                    .as_ref()
+                    .expect("song set at constructor")
+                    .title
+                    .to_value(),
+                "artist" => self
+                    .song
+                    .borrow()
+                    .as_ref()
+                    .expect("song set at constructor")
+                    .artists_name()
+                    .to_value(),
+                "id" => self
+                    .song
+                    .borrow()
+                    .as_ref()
+                    .expect("song set at constructor")
+                    .id
+                    .to_value(),
+                "duration" => self
+                    .song
+                    .borrow()
+                    .as_ref()
+                    .map(|s| format_duration(s.duration.into()))
+                    .expect("song set at constructor")
+                    .to_value(),
+                "art" => self
+                    .song
+                    .borrow()
+                    .as_ref()
+                    .expect("song set at constructor")
+                    .art
+                    .to_value(),
+                "playing" => self.state.get().is_playing.to_value(),
+                "selected" => self.state.get().is_selected.to_value(),
+                _ => unimplemented!(),
+            }
+        }
+    }
+}
diff --git a/src/app/models/core.rs b/src/app/models/songs/support.rs
similarity index 53%
rename from src/app/models/core.rs
rename to src/app/models/songs/support.rs
index 9e3d6fac..defe392c 100644
--- a/src/app/models/core.rs
+++ b/src/app/models/songs/support.rs
@@ -1,60 +1,114 @@
-use super::main::*;
 use std::collections::HashMap;
+use std::convert::{TryFrom, TryInto};
+
+use crate::app::models::*;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct InsertionRange(pub usize, pub usize);
-
-impl InsertionRange {
-    fn union(a: Option<Self>, b: Option<Self>) -> Option<Self> {
-        match (a, b) {
-            (Some(Self(a0, a1)), Some(Self(b0, b1))) => {
-                let start = usize::min(a0, b0);
-                let end = usize::max(a0 + b0, a1 + b1) - start;
-                Some(Self(start, end))
-            }
-            (Some(a), None) | (None, Some(a)) => Some(a),
-            _ => None,
+enum Range {
+    Empty,
+    NotEmpty(u32, u32),
+}
+
+impl Range {
+    fn of(a: impl TryInto<u32>, b: impl TryInto<u32>) -> Self {
+        match (a.try_into(), b.try_into()) {
+            (Ok(a), Ok(b)) if b >= a => Self::NotEmpty(a, b),
+            _ => Self::Empty,
         }
     }
-}
 
-#[derive(Clone, Copy, Debug)]
-pub struct Batch {
-    pub offset: usize,
-    pub batch_size: usize,
-    pub total: usize,
-}
+    fn len(self) -> u32 {
+        match self {
+            Self::Empty => 0,
+            Self::NotEmpty(a, b) => b - a + 1,
+        }
+    }
 
-impl Batch {
-    pub fn first_of_size(batch_size: usize) -> Self {
-        Self {
-            offset: 0,
-            batch_size,
-            total: 0,
+    fn union(self, other: Self) -> Self {
+        match (self, other) {
+            (Self::NotEmpty(a0, b0), Self::NotEmpty(a1, b1)) => {
+                let start = u32::min(a0, a1);
+                let end = u32::max(b0, b1);
+                Self::NotEmpty(start, end)
+            }
+            (Self::Empty, r) | (r, Self::Empty) => r,
         }
     }
 
-    pub fn next(self) -> Option<Self> {
-        let Self {
-            offset,
-            batch_size,
-            total,
-        } = self;
+    fn offset_by(self, offset: i32) -> Self {
+        match self {
+            Self::Empty => Self::Empty,
+            Self::NotEmpty(a, b) => Self::of((a as i32) + offset, (b as i32) + offset),
+        }
+    }
 
-        Some(Self {
-            offset: offset + batch_size,
-            batch_size,
-            total,
-        })
-        .filter(|b| b.offset < total)
+    fn start<Target>(self) -> Option<Target>
+    where
+        Target: TryFrom<u32>,
+    {
+        match self {
+            Self::Empty => None,
+            Self::NotEmpty(a, _) => Some(a.try_into().ok()?),
+        }
     }
 }
 
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub enum SongIndexStatus {
-    Present,
-    Absent,
-    OutOfBounds,
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ListRangeUpdate(pub i32, pub i32, pub i32);
+
+impl ListRangeUpdate {
+    pub fn inserted(position: impl TryInto<i32>, added: impl TryInto<i32>) -> Self {
+        Self(
+            position.try_into().unwrap_or_default(),
+            0,
+            added.try_into().unwrap_or_default(),
+        )
+    }
+
+    pub fn removed(position: impl TryInto<i32>, removed: impl TryInto<i32>) -> Self {
+        Self(
+            position.try_into().unwrap_or_default(),
+            removed.try_into().unwrap_or_default(),
+            0,
+        )
+    }
+
+    pub fn updated(position: impl TryInto<i32>) -> Self {
+        Self(position.try_into().unwrap_or_default(), 1, 1)
+    }
+
+    pub fn merge(self, other: Self) -> Self {
+        // reorder for simplicity
+        let (left, right) = if self.0 <= other.0 {
+            (self, other)
+        } else {
+            (other, self)
+        };
+
+        let Self(p0, r0, a0) = left;
+        let Self(p1, r1, a1) = right;
+
+        // range [s, e] affected by first update
+        let ra0 = Range::of(p0, p0 + r0 - 1);
+
+        // ...second update, but only the range affecting existing elements
+        let ra1 = {
+            let s1 = i32::max(p0 + a0, p1);
+            let e1 = i32::max(s1 - 1, p1 + r1 - 1);
+            Range::of(s1, e1)
+        };
+
+        // remap to original
+        let ra1 = ra1.offset_by(r0 - a0);
+
+        // union
+        let rau = ra0.union(ra1);
+
+        let removed = rau.len() as i32;
+        let position = rau.start().unwrap_or(p0);
+        let added = removed - (r0 - a0) - (r1 - a1);
+        Self(position, removed, added)
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -64,7 +118,7 @@ pub struct SongList {
     batch_size: usize,
     last_batch_key: usize,
     batches: HashMap<usize, Vec<String>>,
-    indexed_songs: HashMap<String, SongDescription>,
+    indexed_songs: HashMap<String, SongModel>,
 }
 
 impl SongList {
@@ -79,19 +133,13 @@ impl SongList {
         }
     }
 
-    pub fn new_from_initial_batch(initial: SongBatch) -> Self {
-        let mut s = Self::new_sized(initial.batch.batch_size);
-        s.add(initial);
-        s
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &'_ SongDescription> {
-        self.iter_from(0)
+    pub fn batch_size(&self) -> usize {
+        self.batch_size
     }
 
-    fn iter_from(&self, i: usize) -> impl Iterator<Item = &'_ SongDescription> {
+    pub fn iter(&self) -> impl Iterator<Item = &SongModel> {
         let indexed_songs = &self.indexed_songs;
-        self.iter_ids_from(i)
+        self.iter_ids_from(0)
             .filter_map(move |(_, id)| indexed_songs.get(id))
     }
 
@@ -152,7 +200,14 @@ impl SongList {
         }
     }
 
-    pub fn remove(&mut self, ids: &[String]) {
+    pub fn clear(&mut self) -> ListRangeUpdate {
+        let len = self.partial_len();
+        *self = Self::new_sized(self.batch_size);
+        ListRangeUpdate::removed(0, len)
+    }
+
+    pub fn remove(&mut self, ids: &[String]) -> ListRangeUpdate {
+        let len = self.total_loaded;
         let mut batches = HashMap::<usize, Vec<String>>::default();
         self.iter_ids_from(0)
             .filter(|(_, s)| !ids.contains(s))
@@ -161,39 +216,52 @@ impl SongList {
             });
         self.last_batch_key = batches.len().saturating_sub(1);
         self.batches = batches;
-        self.total = self.total.saturating_sub(ids.len());
-        self.total_loaded = self.total_loaded.saturating_sub(ids.len());
+        let removed = ids.len();
+        self.total = self.total.saturating_sub(removed);
+        self.total_loaded = self.total_loaded.saturating_sub(removed);
+        ListRangeUpdate(0, len as i32, self.total_loaded as i32)
     }
 
-    pub fn append(&mut self, songs: Vec<SongDescription>) {
-        self.total = self.total.saturating_add(songs.len());
-        self.total_loaded = self.total_loaded.saturating_add(songs.len());
+    pub fn append(&mut self, songs: Vec<SongDescription>) -> ListRangeUpdate {
+        let songs_len = songs.len();
+        let insertion_start = self.estimated_len(self.last_batch_key + 1);
+        self.total = self.total.saturating_add(songs_len);
+        self.total_loaded = self.total_loaded.saturating_add(songs_len);
         for song in songs {
             Self::batches_add(&mut self.batches, self.batch_size, &song.id);
-            self.indexed_songs.insert(song.id.clone(), song);
+            self.indexed_songs
+                .insert(song.id.clone(), SongModel::new(song));
         }
         self.last_batch_key = self.batches.len().saturating_sub(1);
+        ListRangeUpdate::inserted(insertion_start, songs_len)
     }
 
-    pub fn add(&mut self, song_batch: SongBatch) -> Option<InsertionRange> {
+    pub fn add(&mut self, song_batch: SongBatch) -> Option<ListRangeUpdate> {
         if song_batch.batch.batch_size != self.batch_size {
             song_batch
                 .resize(self.batch_size)
                 .into_iter()
-                .map(|new_batch| self.add_one(new_batch))
-                .reduce(InsertionRange::union)
+                .map(|new_batch| {
+                    debug!("adding batch {:?}", &new_batch.batch);
+                    self.add_one(new_batch)
+                })
+                .reduce(|acc, cur| {
+                    let merged = acc?.merge(cur?);
+                    Some(merged).or(acc).or(cur)
+                })
                 .unwrap_or(None)
         } else {
             self.add_one(song_batch)
         }
     }
 
-    fn add_one(&mut self, SongBatch { songs, batch }: SongBatch) -> Option<InsertionRange> {
+    fn add_one(&mut self, SongBatch { songs, batch }: SongBatch) -> Option<ListRangeUpdate> {
         assert_eq!(batch.batch_size, self.batch_size);
 
         let index = batch.offset / batch.batch_size;
 
         if self.batches.contains_key(&index) {
+            debug!("batch already loaded");
             return None;
         }
 
@@ -203,7 +271,8 @@ impl SongList {
             .into_iter()
             .map(|song| {
                 let song_id = song.id.clone();
-                self.indexed_songs.insert(song_id.clone(), song);
+                self.indexed_songs
+                    .insert(song_id.clone(), SongModel::new(song));
                 song_id
             })
             .collect();
@@ -213,7 +282,7 @@ impl SongList {
         self.total_loaded += len;
         self.last_batch_key = usize::max(self.last_batch_key, index);
 
-        Some(InsertionRange(insertion_start, len))
+        Some(ListRangeUpdate::inserted(insertion_start, len))
     }
 
     fn index_mut(&mut self, i: usize) -> Option<&mut String> {
@@ -224,9 +293,9 @@ impl SongList {
             .and_then(|s| s.get_mut(i % batch_size))
     }
 
-    pub fn swap(&mut self, a: usize, b: usize) {
+    pub fn swap(&mut self, a: usize, b: usize) -> Option<ListRangeUpdate> {
         if a == b {
-            return;
+            return None;
         }
         let a_value = self.index_mut(a).map(std::mem::take);
         let a_value = a_value.as_ref();
@@ -238,9 +307,10 @@ impl SongList {
         if let (Some(a_mut), Some(a_value)) = (a_mut, new_a_value) {
             *a_mut = a_value;
         }
+        Some(ListRangeUpdate::updated(a).merge(ListRangeUpdate::updated(b)))
     }
 
-    pub fn index(&self, i: usize) -> Option<&SongDescription> {
+    pub fn index(&self, i: usize) -> Option<&SongModel> {
         let batch_size = self.batch_size;
         let batch_id = i / batch_size;
         let indexed_songs = &self.indexed_songs;
@@ -250,6 +320,18 @@ impl SongList {
             .and_then(move |id| indexed_songs.get(id))
     }
 
+    pub fn index_continuous(&self, i: usize) -> Option<&SongModel> {
+        let batch_size = self.batch_size;
+        let bi = i / batch_size;
+        let batch = (0..=self.last_batch_key)
+            .into_iter()
+            .filter_map(move |i| self.batches.get(&i))
+            .nth(bi)?;
+        batch
+            .get(i % batch_size)
+            .and_then(move |id| self.indexed_songs.get(id))
+    }
+
     pub fn needed_batch_for(&self, i: usize) -> Option<Batch> {
         let total = self.total;
         let batch_size = self.batch_size;
@@ -273,8 +355,7 @@ impl SongList {
         self.batches.get(&batch_id).map(|songs| SongBatch {
             songs: songs
                 .iter()
-                .filter_map(move |id| indexed_songs.get(id))
-                .cloned()
+                .filter_map(move |id| Some(indexed_songs.get(id)?.into_description()))
                 .collect(),
             batch: Batch {
                 batch_size,
@@ -296,25 +377,9 @@ impl SongList {
         }
     }
 
-    pub fn get(&self, id: &str) -> Option<&SongDescription> {
+    pub fn get(&self, id: &str) -> Option<&SongModel> {
         self.indexed_songs.get(id)
     }
-
-    pub fn status(&self, i: usize) -> SongIndexStatus {
-        if i >= self.total {
-            return SongIndexStatus::OutOfBounds;
-        }
-
-        let batch_size = self.batch_size;
-        let batch_id = i / batch_size;
-        self.batches
-            .get(&batch_id)
-            .map(|batch| match batch.get(i % batch_size) {
-                Some(_) => SongIndexStatus::Present,
-                None => SongIndexStatus::OutOfBounds,
-            })
-            .unwrap_or(SongIndexStatus::Absent)
-    }
 }
 
 #[cfg(test)]
@@ -322,6 +387,16 @@ mod tests {
 
     use super::*;
 
+    const NO_CHANGE: ListRangeUpdate = ListRangeUpdate(0, 0, 0);
+
+    impl SongList {
+        fn new_from_initial_batch(initial: SongBatch) -> Self {
+            let mut s = Self::new_sized(initial.batch.batch_size);
+            s.add(initial);
+            s
+        }
+    }
+
     fn song(id: &str) -> SongDescription {
         SongDescription {
             id: id.to_string(),
@@ -353,13 +428,68 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_merge_range() {
+        // [0, 1, 2, 3, 4, 5]
+        let change1 = ListRangeUpdate(0, 4, 2);
+        // [x, x, 4, 5]
+        let change2 = ListRangeUpdate(1, 1, 2);
+        // [x, y, y, 4, 5]
+        assert_eq!(change1.merge(change2), ListRangeUpdate(0, 4, 3));
+        assert_eq!(change2.merge(change1), ListRangeUpdate(0, 4, 3));
+
+        // [0, 1, 2, 3, 4, 5, 6]
+        let change1 = ListRangeUpdate(0, 2, 3);
+        // [x, x, x, 2, 3, 4, 5, 6]
+        let change2 = ListRangeUpdate(4, 1, 1);
+        // [x, x, x, 2, y, 4, 5, 6]
+        assert_eq!(change1.merge(change2), ListRangeUpdate(0, 4, 5));
+        assert_eq!(change2.merge(change1), ListRangeUpdate(0, 4, 5));
+
+        // [0, 1, 2, 3, 4, 5, 6]
+        let change1 = ListRangeUpdate(0, 3, 2);
+        // [x, x, 3, 4, 5, 6]
+        let change2 = ListRangeUpdate(4, 1, 1);
+        // [x, x, 3, 4, y, 6]
+        assert_eq!(change1.merge(change2), ListRangeUpdate(0, 6, 5));
+        assert_eq!(change2.merge(change1), ListRangeUpdate(0, 6, 5));
+
+        // [0, 1, 2, 3, 4, 5]
+        let change1 = ListRangeUpdate(0, 4, 2);
+        // [x, x, 4, 5]
+        let change2 = ListRangeUpdate(1, 1, 1);
+        // [x, y, 4, 5]
+        assert_eq!(change1.merge(change2), ListRangeUpdate(0, 4, 2));
+        assert_eq!(change2.merge(change1), ListRangeUpdate(0, 4, 2));
+
+        // [0, 1, 2, 3, 4, 5]
+        let change1 = ListRangeUpdate(0, 4, 2);
+        // [x, x, 4, 5]
+        let change2 = ListRangeUpdate(0, 4, 2);
+        // [y, y]
+        assert_eq!(change1.merge(change2), ListRangeUpdate(0, 6, 2));
+        assert_eq!(change2.merge(change1), ListRangeUpdate(0, 6, 2));
+
+        // []
+        let change1 = ListRangeUpdate(0, 0, 2);
+        // [x, x]
+        let change2 = ListRangeUpdate(2, 0, 2);
+        // [x, x, y, y]
+        assert_eq!(change1.merge(change2), ListRangeUpdate(0, 0, 4));
+        assert_eq!(change2.merge(change1), ListRangeUpdate(0, 0, 4));
+
+        let change1 = ListRangeUpdate(0, 4, 2);
+        assert_eq!(change1.merge(NO_CHANGE), ListRangeUpdate(0, 4, 2));
+        assert_eq!(NO_CHANGE.merge(change1), ListRangeUpdate(0, 4, 2));
+    }
+
     #[test]
     fn test_iter() {
         let list = SongList::new_from_initial_batch(batch(0));
 
         let mut list_iter = list.iter();
-        assert_eq!(list_iter.next().unwrap().id, "song0");
-        assert_eq!(list_iter.next().unwrap().id, "song1");
+        assert_eq!(list_iter.next().unwrap().description().id, "song0");
+        assert_eq!(list_iter.next().unwrap().description().id, "song1");
         assert!(list_iter.next().is_none());
     }
 
@@ -390,15 +520,15 @@ mod tests {
         let mut list = SongList::new_from_initial_batch(batch(0));
 
         let range = list.add(batch(1));
-        assert_eq!(range, Some(InsertionRange(2, 2)));
+        assert_eq!(range, Some(ListRangeUpdate::inserted(2, 2)));
         assert_eq!(list.partial_len(), 4);
 
         let range = list.add(batch(3));
-        assert_eq!(range, Some(InsertionRange(4, 2)));
+        assert_eq!(range, Some(ListRangeUpdate::inserted(4, 2)));
         assert_eq!(list.partial_len(), 6);
 
         let range = list.add(batch(2));
-        assert_eq!(range, Some(InsertionRange(4, 2)));
+        assert_eq!(range, Some(ListRangeUpdate::inserted(4, 2)));
         assert_eq!(list.partial_len(), 8);
 
         let range = list.add(batch(2));
@@ -424,21 +554,13 @@ mod tests {
         assert_eq!(list.partial_len(), 4);
 
         let mut list_iter = list.iter();
-        assert_eq!(list_iter.next().unwrap().id, "song0");
-        assert_eq!(list_iter.next().unwrap().id, "song1");
-        assert_eq!(list_iter.next().unwrap().id, "song4");
-        assert_eq!(list_iter.next().unwrap().id, "song5");
+        assert_eq!(list_iter.next().unwrap().description().id, "song0");
+        assert_eq!(list_iter.next().unwrap().description().id, "song1");
+        assert_eq!(list_iter.next().unwrap().description().id, "song4");
+        assert_eq!(list_iter.next().unwrap().description().id, "song5");
         assert!(list_iter.next().is_none());
     }
 
-    #[test]
-    fn test_status() {
-        let list = SongList::new_from_initial_batch(batch(0));
-        assert_eq!(list.status(0), SongIndexStatus::Present);
-        assert_eq!(list.status(6), SongIndexStatus::Absent);
-        assert_eq!(list.status(10), SongIndexStatus::OutOfBounds);
-    }
-
     #[test]
     fn test_remove() {
         let mut list = SongList::new_from_initial_batch(batch(0));
@@ -449,9 +571,9 @@ mod tests {
         assert_eq!(list.partial_len(), 3);
 
         let mut list_iter = list.iter();
-        assert_eq!(list_iter.next().unwrap().id, "song1");
-        assert_eq!(list_iter.next().unwrap().id, "song2");
-        assert_eq!(list_iter.next().unwrap().id, "song3");
+        assert_eq!(list_iter.next().unwrap().description().id, "song1");
+        assert_eq!(list_iter.next().unwrap().description().id, "song2");
+        assert_eq!(list_iter.next().unwrap().description().id, "song3");
         assert!(list_iter.next().is_none());
     }
 
@@ -476,11 +598,11 @@ mod tests {
         list.append(vec![song("song4")]);
 
         let mut list_iter = list.iter();
-        assert_eq!(list_iter.next().unwrap().id, "song0");
-        assert_eq!(list_iter.next().unwrap().id, "song1");
-        assert_eq!(list_iter.next().unwrap().id, "song2");
-        assert_eq!(list_iter.next().unwrap().id, "song3");
-        assert_eq!(list_iter.next().unwrap().id, "song4");
+        assert_eq!(list_iter.next().unwrap().description().id, "song0");
+        assert_eq!(list_iter.next().unwrap().description().id, "song1");
+        assert_eq!(list_iter.next().unwrap().description().id, "song2");
+        assert_eq!(list_iter.next().unwrap().description().id, "song3");
+        assert_eq!(list_iter.next().unwrap().description().id, "song4");
         assert!(list_iter.next().is_none());
     }
 
@@ -497,9 +619,9 @@ mod tests {
         list.swap(2, 3); // should be no-op
 
         let mut list_iter = list.iter();
-        assert_eq!(list_iter.next().unwrap().id, "song1");
-        assert_eq!(list_iter.next().unwrap().id, "song2");
-        assert_eq!(list_iter.next().unwrap().id, "song0");
+        assert_eq!(list_iter.next().unwrap().description().id, "song1");
+        assert_eq!(list_iter.next().unwrap().description().id, "song2");
+        assert_eq!(list_iter.next().unwrap().description().id, "song0");
         assert!(list_iter.next().is_none());
     }
 }
diff --git a/src/app/state/app_state.rs b/src/app/state/app_state.rs
index 8a140945..99033014 100644
--- a/src/app/state/app_state.rs
+++ b/src/app/state/app_state.rs
@@ -3,7 +3,7 @@ use crate::app::state::{
     login_state::{LoginAction, LoginEvent, LoginState},
     playback_state::{PlaybackAction, PlaybackEvent, PlaybackState},
     selection_state::{SelectionAction, SelectionContext, SelectionEvent, SelectionState},
-    PlaylistChange, ScreenName, UpdatableState,
+    ScreenName, UpdatableState,
 };
 
 #[derive(Clone, Debug)]
@@ -88,22 +88,24 @@ impl AppState {
             AppAction::ViewNowPlaying => vec![AppEvent::NowPlayingShown],
             AppAction::Raise => vec![AppEvent::Raised],
             AppAction::QueueSelection => {
-                let append_at = self.playback.len();
-                for track in self.selection.take_selection() {
-                    self.playback.queue(track);
-                }
+                self.playback.queue(self.selection.take_selection());
                 vec![
                     SelectionEvent::SelectionModeChanged(false).into(),
-                    PlaybackEvent::PlaylistChanged(PlaylistChange::AppendedAt(append_at)).into(),
+                    PlaybackEvent::PlaylistChanged.into(),
                 ]
             }
             AppAction::DequeueSelection => {
-                for track in self.selection.take_selection() {
-                    self.playback.dequeue(&track.id);
-                }
+                let tracks: Vec<String> = self
+                    .selection
+                    .take_selection()
+                    .into_iter()
+                    .map(|s| s.id)
+                    .collect();
+                self.playback.dequeue(&tracks);
+
                 vec![
                     SelectionEvent::SelectionModeChanged(false).into(),
-                    PlaybackEvent::PlaylistChanged(PlaylistChange::Reset).into(),
+                    PlaybackEvent::PlaylistChanged.into(),
                 ]
             }
             AppAction::MoveDownSelection => {
@@ -112,11 +114,7 @@ impl AppState {
                 selection
                     .next()
                     .and_then(|song| playback.move_down(&song.id))
-                    .map(|index| {
-                        vec![
-                            PlaybackEvent::PlaylistChanged(PlaylistChange::MovedDown(index)).into(),
-                        ]
-                    })
+                    .map(|_| vec![PlaybackEvent::PlaylistChanged.into()])
                     .unwrap_or_else(Vec::new)
             }
             AppAction::MoveUpSelection => {
@@ -125,9 +123,7 @@ impl AppState {
                 selection
                     .next()
                     .and_then(|song| playback.move_up(&song.id))
-                    .map(|index| {
-                        vec![PlaybackEvent::PlaylistChanged(PlaylistChange::MovedUp(index)).into()]
-                    })
+                    .map(|_| vec![PlaybackEvent::PlaylistChanged.into()])
                     .unwrap_or_else(Vec::new)
             }
             AppAction::EnableSelection(context) => {
diff --git a/src/app/state/browser_state.rs b/src/app/state/browser_state.rs
index 86d10916..726712e1 100644
--- a/src/app/state/browser_state.rs
+++ b/src/app/state/browser_state.rs
@@ -56,10 +56,10 @@ pub enum BrowserEvent {
     LibraryUpdated,
     SavedPlaylistsUpdated,
     AlbumDetailsLoaded(String),
-    AlbumTracksAppended(String, usize),
+    AlbumTracksAppended(String),
     PlaylistDetailsLoaded(String),
-    PlaylistTracksAppended(String, usize),
-    PlaylistTracksRemoved(String, Vec<String>),
+    PlaylistTracksAppended(String),
+    PlaylistTracksRemoved(String),
     SearchUpdated,
     SearchResultsUpdated,
     ArtistDetailsUpdated(String),
diff --git a/src/app/state/playback_state.rs b/src/app/state/playback_state.rs
index c37fff99..75480b0d 100644
--- a/src/app/state/playback_state.rs
+++ b/src/app/state/playback_state.rs
@@ -1,13 +1,11 @@
-use crate::app::models::{InsertionRange, SongBatch, SongDescription, SongList};
+use crate::app::models::{SongBatch, SongDescription, SongListModel, SongListModelPending};
 use crate::app::state::{AppAction, AppEvent, UpdatableState};
 use crate::app::{BatchQuery, LazyRandomIndex, SongsSource};
 
-const RANGE_SIZE: usize = 25;
-
 #[derive(Debug)]
 pub struct PlaybackState {
     index: LazyRandomIndex,
-    songs: SongList,
+    songs: SongListModel,
     position: Option<usize>,
     source: Option<SongsSource>,
     repeat: RepeatMode,
@@ -16,6 +14,10 @@ pub struct PlaybackState {
 }
 
 impl PlaybackState {
+    pub fn songs(&self) -> &SongListModel {
+        &self.songs
+    }
+
     pub fn is_playing(&self) -> bool {
         self.is_playing && self.position.is_some()
     }
@@ -44,75 +46,62 @@ impl PlaybackState {
         }
     }
 
-    pub fn song(&self, id: &str) -> Option<&SongDescription> {
-        self.songs.get(id)
-    }
-
-    pub fn len(&self) -> usize {
-        self.songs.len()
-    }
-
-    pub fn songs(&self) -> impl Iterator<Item = &'_ SongDescription> + '_ {
-        self.songs.iter()
-    }
-
-    fn index(&self, i: usize) -> Option<&SongDescription> {
-        if self.is_shuffled {
+    fn index(&self, i: usize) -> Option<SongDescription> {
+        let song = if self.is_shuffled {
             self.songs.index(self.index.get(i)?)
         } else {
             self.songs.index(i)
-        }
+        };
+        Some(song?.into_description())
     }
 
-    pub fn current_song_id(&self) -> Option<&String> {
-        Some(&self.index(self.position?).as_ref()?.id)
+    pub fn current_song_id(&self) -> Option<String> {
+        Some(self.index(self.position?)?.id)
     }
 
-    pub fn current_song(&self) -> Option<&SongDescription> {
+    pub fn current_song(&self) -> Option<SongDescription> {
         self.index(self.position?)
     }
 
-    pub fn prev_song(&self) -> Option<&SongDescription> {
-        self.prev_index().and_then(|i| self.index(i))
-    }
-
-    pub fn next_song(&self) -> Option<&SongDescription> {
-        self.next_index().and_then(|i| self.index(i))
-    }
-
-    fn set_source(&mut self, source: Option<SongsSource>) {
-        self.songs = SongList::new_sized(2 * RANGE_SIZE);
+    fn clear(&mut self, source: Option<SongsSource>) -> SongListModelPending {
         self.source = source;
         self.index = Default::default();
         self.position = None;
+        self.songs.clear()
+    }
+
+    fn set_batch(&mut self, source: Option<SongsSource>, song_batch: SongBatch) -> bool {
+        let ok = self.clear(source).and(|s| s.add(song_batch)).commit();
+        self.index.resize(self.songs.len());
+        ok
     }
 
-    fn add_batch(&mut self, song_batch: SongBatch) -> Option<InsertionRange> {
-        let SongBatch { songs, batch } = song_batch;
-        let range = self.songs.add(SongBatch { songs, batch });
+    fn add_batch(&mut self, song_batch: SongBatch) -> bool {
+        let ok = self.songs.add(song_batch).commit();
         self.index.resize(self.songs.len());
-        range
+        ok
     }
 
-    pub fn queue(&mut self, track: SongDescription) {
-        self.songs.append(vec![track]);
+    pub fn set_queue(&mut self, tracks: Vec<SongDescription>) {
+        self.clear(None).and(|s| s.append(tracks)).commit();
         self.index.grow(self.songs.len());
     }
 
-    pub fn dequeue(&mut self, id: &str) {
-        let position = self.songs.find_index(id);
-        self.songs.remove(&[id.to_string()]);
-        let new_len = self.songs.len();
-        self.position = self
-            .position
-            .filter(|_| new_len > 0)
-            .and_then(|p| Some(if p > 0 && p >= position? { p - 1 } else { p }));
-        self.index.shrink(new_len);
+    pub fn queue(&mut self, tracks: Vec<SongDescription>) {
+        self.source = None;
+        self.songs.append(tracks).commit();
+        self.index.grow(self.songs.len());
     }
 
-    fn swap(&mut self, index: usize, other_index: usize) {
+    pub fn dequeue(&mut self, ids: &[String]) {
+        let current_id = self.current_song_id();
+        self.songs.remove(ids).commit();
+        self.position = current_id.and_then(|id| self.songs.find_index(&id));
+        self.index.shrink(self.songs.len());
+    }
+
+    fn swap_pos(&mut self, index: usize, other_index: usize) {
         let len = self.songs.len();
-        self.songs.swap(index, other_index);
         self.position = self
             .position
             .map(|position| match position {
@@ -125,13 +114,15 @@ impl PlaybackState {
 
     pub fn move_down(&mut self, id: &str) -> Option<usize> {
         let index = self.songs.find_index(id)?;
-        self.swap(index, index + 1);
+        self.songs.move_down(index).commit();
+        self.swap_pos(index + 1, index);
         Some(index)
     }
 
     pub fn move_up(&mut self, id: &str) -> Option<usize> {
         let index = self.songs.find_index(id).filter(|&index| index > 0)?;
-        self.swap(index - 1, index);
+        self.songs.move_up(index).commit();
+        self.swap_pos(index - 1, index);
         Some(index)
     }
 
@@ -160,18 +151,18 @@ impl PlaybackState {
         self.is_playing = false;
     }
 
-    fn play_index(&mut self, index: usize) -> Option<&String> {
+    fn play_index(&mut self, index: usize) -> Option<String> {
         self.is_playing = true;
         self.position.replace(index);
         self.index.next_until(index + 1);
         self.current_song_id()
     }
 
-    fn play_next(&mut self) -> Option<&String> {
+    fn play_next(&mut self) -> Option<String> {
         self.next_index().and_then(move |i| self.play_index(i))
     }
 
-    fn next_index(&self) -> Option<usize> {
+    pub fn next_index(&self) -> Option<usize> {
         let len = self.songs.len();
         self.position.and_then(|p| match self.repeat {
             RepeatMode::Song => Some(p),
@@ -181,11 +172,11 @@ impl PlaybackState {
         })
     }
 
-    fn play_prev(&mut self) -> Option<&String> {
+    fn play_prev(&mut self) -> Option<String> {
         self.prev_index().and_then(move |i| self.play_index(i))
     }
 
-    fn prev_index(&self) -> Option<usize> {
+    pub fn prev_index(&self) -> Option<usize> {
         let len = self.songs.len();
         self.position.and_then(|p| match self.repeat {
             RepeatMode::Song => Some(p),
@@ -215,7 +206,7 @@ impl Default for PlaybackState {
     fn default() -> Self {
         Self {
             index: LazyRandomIndex::default(),
-            songs: SongList::new_sized(2 * RANGE_SIZE),
+            songs: SongListModel::new(50),
             position: None,
             source: None,
             repeat: RepeatMode::None,
@@ -252,15 +243,6 @@ impl From<PlaybackAction> for AppAction {
     }
 }
 
-#[derive(Clone, Debug)]
-pub enum PlaylistChange {
-    Reset,
-    InsertedAt(usize, usize),
-    AppendedAt(usize),
-    MovedUp(usize),
-    MovedDown(usize),
-}
-
 #[derive(Clone, Debug)]
 pub enum PlaybackEvent {
     PlaybackPaused,
@@ -271,7 +253,7 @@ pub enum PlaybackEvent {
     VolumeSet(f64),
     TrackChanged(String),
     ShuffleChanged,
-    PlaylistChanged(PlaylistChange),
+    PlaylistChanged,
     PlaybackStopped,
 }
 
@@ -340,7 +322,7 @@ impl UpdatableState for PlaybackState {
                 vec![PlaybackEvent::ShuffleChanged]
             }
             PlaybackAction::Next => {
-                if let Some(id) = self.play_next().cloned() {
+                if let Some(id) = self.play_next() {
                     make_events(vec![
                         Some(PlaybackEvent::TrackChanged(id)),
                         Some(PlaybackEvent::PlaybackResumed),
@@ -355,7 +337,7 @@ impl UpdatableState for PlaybackState {
                 vec![PlaybackEvent::PlaybackStopped]
             }
             PlaybackAction::Previous => {
-                if let Some(id) = self.play_prev().cloned() {
+                if let Some(id) = self.play_prev() {
                     make_events(vec![
                         Some(PlaybackEvent::TrackChanged(id)),
                         Some(PlaybackEvent::PlaybackResumed),
@@ -374,20 +356,11 @@ impl UpdatableState for PlaybackState {
                     vec![]
                 }
             }
-            PlaybackAction::LoadSongs(tracks) => {
-                self.set_source(None);
-                for track in tracks {
-                    self.queue(track);
-                }
-                vec![PlaybackEvent::PlaylistChanged(PlaylistChange::Reset)]
-            }
             PlaybackAction::LoadPagedSongs(source, batch)
                 if Some(&source) == self.source.as_ref() =>
             {
-                if let Some(InsertionRange(a, b)) = self.add_batch(batch) {
-                    vec![PlaybackEvent::PlaylistChanged(PlaylistChange::InsertedAt(
-                        a, b,
-                    ))]
+                if self.add_batch(batch) {
+                    vec![PlaybackEvent::PlaylistChanged]
                 } else {
                     vec![]
                 }
@@ -395,23 +368,20 @@ impl UpdatableState for PlaybackState {
             PlaybackAction::LoadPagedSongs(source, batch)
                 if Some(&source) != self.source.as_ref() =>
             {
-                self.set_source(Some(source));
-                self.add_batch(batch);
-                vec![PlaybackEvent::PlaylistChanged(PlaylistChange::Reset)]
+                self.set_batch(Some(source), batch);
+                vec![PlaybackEvent::PlaylistChanged]
+            }
+            PlaybackAction::LoadSongs(tracks) => {
+                self.set_queue(tracks);
+                vec![PlaybackEvent::PlaylistChanged]
             }
             PlaybackAction::Queue(tracks) => {
-                let append_at = self.songs.partial_len();
-                self.source = None;
-                for track in tracks {
-                    self.queue(track);
-                }
-                vec![PlaybackEvent::PlaylistChanged(PlaylistChange::AppendedAt(
-                    append_at,
-                ))]
+                self.queue(tracks);
+                vec![PlaybackEvent::PlaylistChanged]
             }
             PlaybackAction::Dequeue(id) => {
-                self.dequeue(&id);
-                vec![PlaybackEvent::PlaylistChanged(PlaylistChange::Reset)]
+                self.dequeue(&[id]);
+                vec![PlaybackEvent::PlaylistChanged]
             }
             PlaybackAction::Seek(pos) => vec![PlaybackEvent::TrackSeeked(pos)],
             PlaybackAction::SyncSeek(pos) => vec![PlaybackEvent::SeekSynced(pos)],
@@ -448,12 +418,22 @@ mod tests {
             self.position
         }
 
-        fn song_ids(&self) -> Vec<&str> {
-            self.songs().map(|s| &s.id[..]).collect()
+        fn prev_id(&self) -> Option<String> {
+            self.prev_index()
+                .and_then(|i| Some(self.songs().index(i)?.description().id.clone()))
+        }
+
+        fn next_id(&self) -> Option<String> {
+            self.next_index()
+                .and_then(|i| Some(self.songs().index(i)?.description().id.clone()))
         }
 
-        fn song_id(&self) -> Option<&str> {
-            self.current_song().map(|s| &s.id[..])
+        fn song_ids(&self) -> Vec<String> {
+            self.songs()
+                .collect()
+                .iter()
+                .map(|s| s.id.clone())
+                .collect()
         }
     }
 
@@ -463,21 +443,21 @@ mod tests {
         assert!(!state.is_playing());
         assert!(!state.is_shuffled());
         assert!(state.current_song().is_none());
-        assert!(state.prev_song().is_none());
-        assert!(state.next_song().is_none());
+        assert!(state.prev_index().is_none());
+        assert!(state.next_index().is_none());
     }
 
     #[test]
     fn test_play_one() {
         let mut state = PlaybackState::default();
-        state.queue(song("foo"));
+        state.queue(vec![song("foo")]);
 
         state.play("foo");
         assert!(state.is_playing());
 
-        assert_eq!(state.song_id(), Some("foo"));
-        assert!(state.prev_song().is_none());
-        assert!(state.next_song().is_none());
+        assert_eq!(state.current_song_id(), Some("foo".to_string()));
+        assert!(state.prev_index().is_none());
+        assert!(state.next_index().is_none());
 
         state.toggle_play();
         assert!(!state.is_playing());
@@ -486,33 +466,29 @@ mod tests {
     #[test]
     fn test_queue() {
         let mut state = PlaybackState::default();
-        state.queue(song("1"));
-        state.queue(song("2"));
-        state.queue(song("3"));
+        state.queue(vec![song("1"), song("2"), song("3")]);
 
-        assert_eq!(state.songs().count(), 3);
+        assert_eq!(state.songs().len(), 3);
 
         state.play("2");
 
-        state.queue(song("4"));
-        assert_eq!(state.songs().count(), 4);
+        state.queue(vec![song("4")]);
+        assert_eq!(state.songs().len(), 4);
     }
 
     #[test]
     fn test_play_multiple() {
         let mut state = PlaybackState::default();
-        state.queue(song("1"));
-        state.queue(song("2"));
-        state.queue(song("3"));
-        assert_eq!(state.songs().count(), 3);
+        state.queue(vec![song("1"), song("2"), song("3")]);
+        assert_eq!(state.songs().len(), 3);
 
         state.play("2");
         assert!(state.is_playing());
 
         assert_eq!(state.current_position(), Some(1));
-        assert_eq!(state.prev_song().map(|s| &s.id[..]), Some("1"));
-        assert_eq!(state.song_id(), Some("2"));
-        assert_eq!(state.next_song().map(|s| &s.id[..]), Some("3"));
+        assert_eq!(state.prev_id(), Some("1".to_string()));
+        assert_eq!(state.current_song_id(), Some("2".to_string()));
+        assert_eq!(state.next_id(), Some("3".to_string()));
 
         state.toggle_play();
         assert!(!state.is_playing());
@@ -520,38 +496,35 @@ mod tests {
         state.play_next();
         assert!(state.is_playing());
         assert_eq!(state.current_position(), Some(2));
-        assert_eq!(state.prev_song().map(|s| &s.id[..]), Some("2"));
-        assert_eq!(state.song_id(), Some("3"));
-        assert!(state.next_song().is_none());
+        assert_eq!(state.prev_id(), Some("2".to_string()));
+        assert_eq!(state.current_song_id(), Some("3".to_string()));
+        assert!(state.next_index().is_none());
 
         state.play_next();
         assert!(state.is_playing());
         assert_eq!(state.current_position(), Some(2));
-        assert_eq!(state.song_id(), Some("3"));
+        assert_eq!(state.current_song_id(), Some("3".to_string()));
 
         state.play_prev();
         state.play_prev();
         assert!(state.is_playing());
         assert_eq!(state.current_position(), Some(0));
-        assert!(state.prev_song().is_none());
-        assert_eq!(state.song_id(), Some("1"));
-        assert_eq!(state.next_song().map(|s| &s.id[..]), Some("2"));
+        assert!(state.prev_index().is_none());
+        assert_eq!(state.current_song_id(), Some("1".to_string()));
+        assert_eq!(state.next_id(), Some("2".to_string()));
 
         state.play_prev();
         assert!(state.is_playing());
         assert_eq!(state.current_position(), Some(0));
-        assert_eq!(state.song_id(), Some("1"));
+        assert_eq!(state.current_song_id(), Some("1".to_string()));
     }
 
     #[test]
     fn test_shuffle() {
         let mut state = PlaybackState::default();
-        state.queue(song("1"));
-        state.queue(song("2"));
-        state.queue(song("3"));
-        state.queue(song("4"));
+        state.queue(vec![song("1"), song("2"), song("3"), song("4")]);
 
-        assert_eq!(state.songs().count(), 4);
+        assert_eq!(state.songs().len(), 4);
 
         state.play("2");
         assert_eq!(state.current_position(), Some(1));
@@ -567,103 +540,113 @@ mod tests {
         assert!(!state.is_shuffled());
 
         let ids = state.song_ids();
-        assert_eq!(ids, vec!["1", "2", "3", "4"]);
+        assert_eq!(
+            ids,
+            vec![
+                "1".to_string(),
+                "2".to_string(),
+                "3".to_string(),
+                "4".to_string()
+            ]
+        );
     }
 
     #[test]
     fn test_shuffle_queue() {
         let mut state = PlaybackState::default();
-        state.queue(song("1"));
-        state.queue(song("2"));
-        state.queue(song("3"));
+        state.queue(vec![song("1"), song("2"), song("3")]);
 
         state.toggle_shuffle();
         assert!(state.is_shuffled());
 
-        state.queue(song("4"));
+        state.queue(vec![song("4")]);
 
         state.toggle_shuffle();
         assert!(!state.is_shuffled());
 
         let ids = state.song_ids();
-        assert_eq!(ids, vec!["1", "2", "3", "4"]);
+        assert_eq!(
+            ids,
+            vec![
+                "1".to_string(),
+                "2".to_string(),
+                "3".to_string(),
+                "4".to_string()
+            ]
+        );
     }
 
     #[test]
     fn test_move() {
         let mut state = PlaybackState::default();
-        state.queue(song("1"));
-        state.queue(song("2"));
-        state.queue(song("3"));
+        state.queue(vec![song("1"), song("2"), song("3")]);
 
         state.play("2");
         assert!(state.is_playing());
 
         state.move_down("1");
-        assert_eq!(state.song_id(), Some("2"));
+        assert_eq!(state.current_song_id(), Some("2".to_string()));
         let ids = state.song_ids();
-        assert_eq!(ids, vec!["2", "1", "3"]);
+        assert_eq!(ids, vec!["2".to_string(), "1".to_string(), "3".to_string()]);
 
         state.move_down("2");
         state.move_down("2");
-        assert_eq!(state.song_id(), Some("2"));
+        assert_eq!(state.current_song_id(), Some("2".to_string()));
         let ids = state.song_ids();
-        assert_eq!(ids, vec!["1", "3", "2"]);
+        assert_eq!(ids, vec!["1".to_string(), "3".to_string(), "2".to_string()]);
 
         state.move_down("2");
-        assert_eq!(state.song_id(), Some("2"));
+        assert_eq!(state.current_song_id(), Some("2".to_string()));
         let ids = state.song_ids();
-        assert_eq!(ids, vec!["1", "3", "2"]);
+        assert_eq!(ids, vec!["1".to_string(), "3".to_string(), "2".to_string()]);
 
         state.move_up("2");
 
-        assert_eq!(state.song_id(), Some("2"));
+        assert_eq!(state.current_song_id(), Some("2".to_string()));
         let ids = state.song_ids();
-        assert_eq!(ids, vec!["1", "2", "3"]);
+        assert_eq!(ids, vec!["1".to_string(), "2".to_string(), "3".to_string()]);
     }
 
     #[test]
     fn test_dequeue_last() {
         let mut state = PlaybackState::default();
-        state.queue(song("1"));
-        state.queue(song("2"));
-        state.queue(song("3"));
+        state.queue(vec![song("1"), song("2"), song("3")]);
 
         state.play("3");
         assert!(state.is_playing());
 
-        state.dequeue("3");
-        assert_eq!(state.song_id(), Some("2"));
+        state.dequeue(&["3".to_string()]);
+        assert_eq!(state.current_song_id(), None);
     }
 
     #[test]
     fn test_dequeue_a_few_songs() {
         let mut state = PlaybackState::default();
-        state.queue(song("1"));
-        state.queue(song("2"));
-        state.queue(song("3"));
-        state.queue(song("4"));
-        state.queue(song("5"));
-        state.queue(song("6"));
+        state.queue(vec![
+            song("1"),
+            song("2"),
+            song("3"),
+            song("4"),
+            song("5"),
+            song("6"),
+        ]);
 
         state.play("5");
         assert!(state.is_playing());
 
-        state.dequeue("1");
-        state.dequeue("2");
-        state.dequeue("3");
-        assert_eq!(state.song_id(), Some("5"));
+        state.dequeue(&["1".to_string(), "2".to_string(), "3".to_string()]);
+        assert_eq!(state.current_song_id(), Some("5".to_string()));
     }
 
     #[test]
     fn test_dequeue_all() {
         let mut state = PlaybackState::default();
-        state.queue(song("3"));
+        state.queue(vec![song("3")]);
 
         state.play("3");
         assert!(state.is_playing());
 
-        state.dequeue("3");
-        assert_eq!(state.song_id(), None);
+        state.dequeue(&["3".to_string()]);
+        assert_eq!(state.current_song_id(), None);
     }
 }
diff --git a/src/app/state/screen_states.rs b/src/app/state/screen_states.rs
index 63f83c38..ee609a42 100644
--- a/src/app/state/screen_states.rs
+++ b/src/app/state/screen_states.rs
@@ -40,6 +40,7 @@ pub struct DetailsState {
     pub id: String,
     pub name: ScreenName,
     pub content: Option<AlbumFullDescription>,
+    pub songs: SongListModel,
 }
 
 impl DetailsState {
@@ -48,6 +49,7 @@ impl DetailsState {
             id: id.clone(),
             name: ScreenName::AlbumDetails(id),
             content: None,
+            songs: SongListModel::new(100),
         }
     }
 }
@@ -59,22 +61,14 @@ impl UpdatableState for DetailsState {
     fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
         match action {
             BrowserAction::SetAlbumDetails(album) if album.description.id == self.id => {
-                let id = album.description.id.clone();
+                let AlbumDescription { id, songs, .. } = album.description.clone();
+                self.songs.add(songs).commit();
                 self.content = Some(*album);
                 vec![BrowserEvent::AlbumDetailsLoaded(id)]
             }
             BrowserAction::AppendAlbumTracks(id, batch) if id == self.id => {
-                let offset = batch.batch.offset;
-                if self
-                    .content
-                    .as_mut()
-                    .and_then(|content| content.description.songs.add(*batch))
-                    .is_some()
-                {
-                    vec![BrowserEvent::AlbumTracksAppended(id, offset)]
-                } else {
-                    vec![]
-                }
+                self.songs.add(*batch).commit();
+                vec![BrowserEvent::AlbumTracksAppended(id)]
             }
             BrowserAction::SaveAlbum(album) if album.id == self.id => {
                 let id = album.id;
@@ -102,6 +96,7 @@ pub struct PlaylistDetailsState {
     pub id: String,
     pub name: ScreenName,
     pub playlist: Option<PlaylistDescription>,
+    pub songs: SongListModel,
 }
 
 impl PlaylistDetailsState {
@@ -110,6 +105,7 @@ impl PlaylistDetailsState {
             id: id.clone(),
             name: ScreenName::PlaylistDetails(id),
             playlist: None,
+            songs: SongListModel::new(100),
         }
     }
 }
@@ -121,31 +117,18 @@ impl UpdatableState for PlaylistDetailsState {
     fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
         match action {
             BrowserAction::SetPlaylistDetails(playlist) => {
-                let id = playlist.id.clone();
+                let PlaylistDescription { id, songs, .. } = *playlist.clone();
+                self.songs.add(songs).commit();
                 self.playlist = Some(*playlist);
                 vec![BrowserEvent::PlaylistDetailsLoaded(id)]
             }
             BrowserAction::AppendPlaylistTracks(id, song_batch) if id == self.id => {
-                let offset = song_batch.batch.offset;
-                if self
-                    .playlist
-                    .as_mut()
-                    .and_then(|playlist| playlist.songs.add(*song_batch))
-                    .is_some()
-                {
-                    vec![BrowserEvent::PlaylistTracksAppended(id, offset)]
-                } else {
-                    vec![]
-                }
+                self.songs.add(*song_batch).commit();
+                vec![BrowserEvent::PlaylistTracksAppended(id)]
             }
             BrowserAction::RemoveTracksFromPlaylist(uris) => {
-                if let Some(playlist) = self.playlist.as_mut() {
-                    let id = playlist.id.clone();
-                    playlist.songs.remove(&uris[..]);
-                    vec![BrowserEvent::PlaylistTracksRemoved(id, uris)]
-                } else {
-                    vec![]
-                }
+                self.songs.remove(&uris[..]).commit();
+                vec![BrowserEvent::PlaylistTracksRemoved(self.id.clone())]
             }
             _ => vec![],
         }
@@ -158,7 +141,7 @@ pub struct ArtistState {
     pub artist: Option<String>,
     pub next_page: Pagination<String>,
     pub albums: ListStore<AlbumModel>,
-    pub top_tracks: Vec<SongDescription>,
+    pub top_tracks: SongListModel,
 }
 
 impl ArtistState {
@@ -169,7 +152,7 @@ impl ArtistState {
             artist: None,
             next_page: Pagination::new(id, 20),
             albums: ListStore::new(),
-            top_tracks: vec![],
+            top_tracks: SongListModel::new(10),
         }
     }
 }
@@ -193,7 +176,7 @@ impl UpdatableState for ArtistState {
                 self.next_page.reset_count(self.albums.len());
 
                 top_tracks.truncate(5);
-                self.top_tracks = top_tracks;
+                self.top_tracks.append(top_tracks).commit();
 
                 vec![BrowserEvent::ArtistDetailsUpdated(id)]
             }
@@ -213,7 +196,7 @@ pub struct HomeState {
     pub albums: ListStore<AlbumModel>,
     pub next_playlists_page: Pagination<()>,
     pub playlists: ListStore<AlbumModel>,
-    pub saved_tracks: SongList,
+    pub saved_tracks: SongListModel,
 }
 
 impl Default for HomeState {
@@ -224,7 +207,7 @@ impl Default for HomeState {
             albums: ListStore::new(),
             next_playlists_page: Pagination::new((), 30),
             playlists: ListStore::new(),
-            saved_tracks: SongList::new_sized(50),
+            saved_tracks: SongListModel::new(50),
         }
     }
 }
@@ -236,10 +219,7 @@ impl UpdatableState for HomeState {
     fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
         match action {
             BrowserAction::SetLibraryContent(content) => {
-                if !self
-                    .albums
-                    .eq(&content, |a, b| a.uri().as_ref() == Some(&b.id))
-                {
+                if !self.albums.eq(&content, |a, b| a.uri() == b.id) {
                     self.albums
                         .replace_all(content.into_iter().map(|a| a.into()));
                     self.next_albums_page.reset_count(self.albums.len());
@@ -255,10 +235,7 @@ impl UpdatableState for HomeState {
             }
             BrowserAction::SaveAlbum(album) => {
                 let album_id = album.id.clone();
-                let already_present = self
-                    .albums
-                    .iter()
-                    .any(|a| a.uri().as_ref() == Some(&album_id));
+                let already_present = self.albums.iter().any(|a| a.uri() == album_id);
                 if already_present {
                     vec![]
                 } else {
@@ -268,10 +245,7 @@ impl UpdatableState for HomeState {
                 }
             }
             BrowserAction::UnsaveAlbum(id) => {
-                let position = self
-                    .albums
-                    .iter()
-                    .position(|a| a.uri().as_ref() == Some(&id));
+                let position = self.albums.iter().position(|a| a.uri() == id);
                 if let Some(position) = position {
                     self.albums.remove(position as u32);
                     self.next_albums_page.decrement();
@@ -281,10 +255,7 @@ impl UpdatableState for HomeState {
                 }
             }
             BrowserAction::SetPlaylistsContent(content) => {
-                if !self
-                    .playlists
-                    .eq(&content, |a, b| a.uri().as_ref() == Some(&b.id))
-                {
+                if !self.playlists.eq(&content, |a, b| a.uri() == b.id) {
                     self.playlists
                         .replace_all(content.into_iter().map(|a| a.into()));
                     self.next_playlists_page.reset_count(self.playlists.len());
@@ -300,7 +271,7 @@ impl UpdatableState for HomeState {
             }
             BrowserAction::AppendSavedTracks(song_batch) => {
                 let offset = song_batch.batch.offset;
-                if self.saved_tracks.add(*song_batch).is_some() {
+                if self.saved_tracks.add(*song_batch).commit() {
                     vec![BrowserEvent::SavedTracksAppended(offset)]
                 } else {
                     vec![]
@@ -428,7 +399,7 @@ mod tests {
             artists: vec![],
             release_date: Some("1970-01-01".to_owned()),
             art: Some("".to_owned()),
-            songs: SongList::new_sized(100),
+            songs: SongBatch::empty(),
             is_liked: false,
         };
         let mut artist_state = ArtistState::new("id".to_owned());
diff --git a/src/dbus/listener.rs b/src/dbus/listener.rs
index bda57021..9038cee3 100644
--- a/src/dbus/listener.rs
+++ b/src/dbus/listener.rs
@@ -39,36 +39,30 @@ impl AppPlaybackStateListener {
     }
 
     fn make_track_meta(&self) -> Option<TrackMetadata> {
-        self.app_model
-            .get_state()
-            .playback
-            .current_song()
-            .cloned()
-            .map(
-                |SongDescription {
-                     id,
-                     title,
-                     artists,
-                     album,
-                     duration,
-                     art,
-                     ..
-                 }| TrackMetadata {
-                    id: format!("/dev/alextren/Spot/Track/{}", id),
-                    length: 1000 * duration as u64,
-                    title,
-                    album: album.name,
-                    artist: artists.into_iter().map(|a| a.name).collect(),
-                    art,
-                },
-            )
+        let SongDescription {
+            id,
+            title,
+            artists,
+            album,
+            duration,
+            art,
+            ..
+        } = self.app_model.get_state().playback.current_song()?;
+        Some(TrackMetadata {
+            id: format!("/dev/alextren/Spot/Track/{}", id),
+            length: 1000 * duration as u64,
+            title,
+            album: album.name,
+            artist: artists.into_iter().map(|a| a.name).collect(),
+            art,
+        })
     }
 
     fn has_prev_next(&self) -> (bool, bool) {
         let state = self.app_model.get_state();
         (
-            state.playback.prev_song().is_some(),
-            state.playback.next_song().is_some(),
+            state.playback.prev_index().is_some(),
+            state.playback.next_index().is_some(),
         )
     }
 
diff --git a/src/main.rs b/src/main.rs
index 7dd0a5fb..b74a0087 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,7 +44,6 @@ fn main() {
     }
 
     let context = glib::MainContext::default();
-    context.push_thread_default();
 
     let dispatch_loop = DispatchLoop::new();
     let sender = dispatch_loop.make_dispatcher();
@@ -78,7 +77,7 @@ fn main() {
 fn startup(settings: &settings::SpotSettings) {
     gtk::init().unwrap_or_else(|_| panic!("Failed to initialize GTK"));
     libadwaita::init();
-    let manager = libadwaita::StyleManager::default().unwrap();
+    let manager = libadwaita::StyleManager::default();
 
     let res = gio::Resource::load(config::PKGDATADIR.to_owned() + "/spot.gresource")
         .expect("Could not load resources");
diff --git a/src/meson.build b/src/meson.build
index f48fdbb5..f0235a60 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -96,7 +96,12 @@ sources = files(
 './app/components/saved_tracks/saved_tracks.rs',
 './app/components/saved_tracks/saved_tracks_model.rs',
 './app/components/saved_tracks/mod.rs',
+'./app/components/sidebar_listbox/sidebar_item.rs',
+'./app/components/sidebar_listbox/sidebar_row.rs',
+'./app/components/sidebar_listbox/mod.rs',
+'./app/components/sidebar_listbox/sidebar_icon_widget.rs',
 './app/components/search/search_model.rs',
+'./app/components/search/search_button.rs',
 './app/components/search/mod.rs',
 './app/components/search/search.rs',
 './app/components/artist/mod.rs',
@@ -113,12 +118,9 @@ sources = files(
 './app/components/selection/widget.rs',
 './app/components/selection/component.rs',
 './app/components/selection/mod.rs',
-'./app/components/sidebar_listbox/mod.rs',
-'./app/components/sidebar_listbox/sidebar_item.rs',
-'./app/components/sidebar_listbox/sidebar_row.rs',
 './app/components/mod.rs',
-'./app/components/details/release_details.rs',
 './app/components/details/album_header.rs',
+'./app/components/details/release_details.rs',
 './app/components/details/mod.rs',
 './app/components/details/details.rs',
 './app/components/details/details_model.rs',
@@ -151,11 +153,12 @@ sources = files(
 './app/components/library/mod.rs',
 './app/components/library/library_model.rs',
 './app/loader.rs',
-'./app/models/core.rs',
-'./app/models/gtypes/artist_model.rs',
-'./app/models/gtypes/song_model.rs',
-'./app/models/gtypes/album_model.rs',
-'./app/models/gtypes/mod.rs',
+'./app/models/songs/support.rs',
+'./app/models/songs/song_list_model.rs',
+'./app/models/songs/song_model.rs',
+'./app/models/songs/mod.rs',
+'./app/models/artist_model.rs',
+'./app/models/album_model.rs',
 './app/models/main.rs',
 './app/models/mod.rs',
 './app/dispatch.rs',

From 0df413ac83b2982465ea8d6f01add2dee4512e08 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sat, 29 Jan 2022 17:40:50 +0000
Subject: [PATCH 11/33] Like tool (#457)

* initial work on saved tracks

* more work on saved tracks

* fix autoscroll well not really
---
 src/api/api_models.rs                         |  5 ++
 src/api/cached_client.rs                      | 22 ++++++++
 src/api/client.rs                             | 36 +++++++++++--
 src/app/batch_loader.rs                       |  2 +-
 src/app/components/mod.rs                     |  2 +-
 src/app/components/navigation/factory.rs      |  2 +-
 .../now_playing/now_playing_model.rs          |  2 +-
 src/app/components/playlist/playlist.rs       | 16 +++---
 .../saved_tracks/saved_tracks_model.rs        | 25 ++++-----
 src/app/components/selection/component.rs     | 45 ++++++++++++++++
 .../components/selection/selection_toolbar.ui | 51 ++++++++++++++++---
 src/app/components/selection/widget.rs        | 15 ++++++
 src/app/components/utils.rs                   | 13 +++++
 src/app/models/songs/song_list_model.rs       |  9 ++++
 src/app/models/songs/support.rs               | 22 ++++++++
 src/app/state/app_state.rs                    | 35 +++++++++++++
 src/app/state/browser_state.rs                | 16 ++++--
 src/app/state/screen_states.rs                | 23 ++++++++-
 src/app/state/selection_state.rs              |  1 +
 19 files changed, 302 insertions(+), 40 deletions(-)

diff --git a/src/api/api_models.rs b/src/api/api_models.rs
index 64bf2e5c..0e2f4672 100644
--- a/src/api/api_models.rs
+++ b/src/api/api_models.rs
@@ -13,6 +13,11 @@ pub struct Uris {
     pub uris: Vec<String>,
 }
 
+#[derive(Serialize)]
+pub struct Ids {
+    pub ids: Vec<String>,
+}
+
 pub enum SearchType {
     Artist,
     Album,
diff --git a/src/api/cached_client.rs b/src/api/cached_client.rs
index aa61856e..c7702cd8 100644
--- a/src/api/cached_client.rs
+++ b/src/api/cached_client.rs
@@ -43,8 +43,12 @@ pub trait SpotifyApiClient {
 
     fn save_album(&self, id: &str) -> BoxFuture<SpotifyResult<AlbumDescription>>;
 
+    fn save_tracks(&self, ids: Vec<String>) -> BoxFuture<SpotifyResult<()>>;
+
     fn remove_saved_album(&self, id: &str) -> BoxFuture<SpotifyResult<()>>;
 
+    fn remove_saved_tracks(&self, ids: Vec<String>) -> BoxFuture<SpotifyResult<()>>;
+
     fn get_saved_playlists(
         &self,
         offset: usize,
@@ -361,6 +365,14 @@ impl SpotifyApiClient for CachedSpotifyClient {
         })
     }
 
+    fn save_tracks(&self, ids: Vec<String>) -> BoxFuture<SpotifyResult<()>> {
+        Box::pin(async move {
+            let _ = self.cache.set_expired_pattern(&*ME_TRACKS_CACHE).await;
+            self.client.save_tracks(ids).send_no_response().await?;
+            Ok(())
+        })
+    }
+
     fn remove_saved_album(&self, id: &str) -> BoxFuture<SpotifyResult<()>> {
         let id = id.to_owned();
 
@@ -370,6 +382,16 @@ impl SpotifyApiClient for CachedSpotifyClient {
         })
     }
 
+    fn remove_saved_tracks(&self, ids: Vec<String>) -> BoxFuture<SpotifyResult<()>> {
+        Box::pin(async move {
+            let _ = self.cache.set_expired_pattern(&*ME_TRACKS_CACHE).await;
+            self.client
+                .remove_saved_tracks(ids)
+                .send_no_response()
+                .await
+        })
+    }
+
     fn get_album_tracks(
         &self,
         id: &str,
diff --git a/src/api/client.rs b/src/api/client.rs
index fda516e3..13022f50 100644
--- a/src/api/client.rs
+++ b/src/api/client.rs
@@ -152,8 +152,8 @@ pub enum SpotifyApiError {
     NoToken,
     #[error("No content from request")]
     NoContent,
-    #[error("Request failed with status {0}")]
-    BadStatus(u16),
+    #[error("Request failed ({0}): {1}")]
+    BadStatus(u16, String),
     #[error(transparent)]
     ClientError(#[from] isahc::Error),
     #[error(transparent)]
@@ -253,7 +253,13 @@ impl SpotifyClient {
                 max_age: cache_control.unwrap_or(10),
                 etag,
             }),
-            s => Err(SpotifyApiError::BadStatus(s.as_u16())),
+            s => Err(SpotifyApiError::BadStatus(
+                s.as_u16(),
+                result
+                    .text()
+                    .await
+                    .unwrap_or_else(|_| "(no details available)".to_string()),
+            )),
         }
     }
 
@@ -261,7 +267,7 @@ impl SpotifyClient {
     where
         B: Into<isahc::AsyncBody>,
     {
-        let result = self.client.send_async(request).await?;
+        let mut result = self.client.send_async(request).await?;
         match result.status() {
             StatusCode::UNAUTHORIZED => {
                 self.clear_token();
@@ -269,7 +275,13 @@ impl SpotifyClient {
             }
             StatusCode::NOT_MODIFIED => Ok(()),
             s if s.is_success() => Ok(()),
-            s => Err(SpotifyApiError::BadStatus(s.as_u16())),
+            s => Err(SpotifyApiError::BadStatus(
+                s.as_u16(),
+                result
+                    .text()
+                    .await
+                    .unwrap_or_else(|_| "(no details available)".to_string()),
+            )),
         }
     }
 }
@@ -323,6 +335,13 @@ impl SpotifyClient {
             .uri("/v1/me/albums".to_string(), Some(&query))
     }
 
+    pub(crate) fn save_tracks(&self, ids: Vec<String>) -> SpotifyRequest<'_, Vec<u8>, ()> {
+        self.request()
+            .method(Method::PUT)
+            .uri("/v1/me/tracks".to_string(), None)
+            .json_body(Ids { ids })
+    }
+
     pub(crate) fn remove_saved_album(&self, id: &str) -> SpotifyRequest<'_, (), ()> {
         let query = make_query_params().append_pair("ids", id).finish();
         self.request()
@@ -330,6 +349,13 @@ impl SpotifyClient {
             .uri("/v1/me/albums".to_string(), Some(&query))
     }
 
+    pub(crate) fn remove_saved_tracks(&self, ids: Vec<String>) -> SpotifyRequest<'_, Vec<u8>, ()> {
+        self.request()
+            .method(Method::DELETE)
+            .uri("/v1/me/tracks".to_string(), None)
+            .json_body(Ids { ids })
+    }
+
     pub(crate) fn get_album(&self, id: &str) -> SpotifyRequest<'_, (), FullAlbum> {
         self.request()
             .method(Method::GET)
diff --git a/src/app/batch_loader.rs b/src/app/batch_loader.rs
index 708ff8c9..71664f66 100644
--- a/src/app/batch_loader.rs
+++ b/src/app/batch_loader.rs
@@ -85,7 +85,7 @@ impl BatchLoader {
         match result {
             Ok(batch) => create_action(batch),
             Err(err) => {
-                error!("Error: {:?}", err);
+                error!("Spotify API error: {}", err);
                 AppAction::ShowNotification(gettext(
                     // translators: This notification is the default message for unhandled errors. Logs refer to console output.
                     "An error occured. Check logs for details!",
diff --git a/src/app/components/mod.rs b/src/app/components/mod.rs
index fc4304e8..a6817a8b 100644
--- a/src/app/components/mod.rs
+++ b/src/app/components/mod.rs
@@ -112,7 +112,7 @@ impl dyn ActionDispatcher {
                     retried
                 }
                 Err(err) => {
-                    error!("Error: {:?}", err);
+                    error!("Spotify API error: {}", err);
                     vec![AppAction::ShowNotification(gettext(
                         // translators: This notification is the default message for unhandled errors. Logs refer to console output.
                         "An error occured. Check logs for details!",
diff --git a/src/app/components/navigation/factory.rs b/src/app/components/navigation/factory.rs
index 1f844f7d..6d29d8bf 100644
--- a/src/app/components/navigation/factory.rs
+++ b/src/app/components/navigation/factory.rs
@@ -74,7 +74,7 @@ impl ScreenFactory {
     pub fn make_saved_tracks(&self) -> impl ListenerComponent {
         let screen_model = DefaultHeaderBarModel::new(
             Some(gettext("Saved tracks")),
-            Some(SelectionContext::Default),
+            Some(SelectionContext::SavedTracks),
             Rc::clone(&self.app_model),
             self.dispatcher.box_clone(),
         );
diff --git a/src/app/components/now_playing/now_playing_model.rs b/src/app/components/now_playing/now_playing_model.rs
index d6f94871..0e32558a 100644
--- a/src/app/components/now_playing/now_playing_model.rs
+++ b/src/app/components/now_playing/now_playing_model.rs
@@ -64,7 +64,7 @@ impl PlaylistModel for NowPlayingModel {
     }
 
     fn autoscroll_to_playing(&self) -> bool {
-        true
+        false // too buggy for now
     }
 
     fn actions_for(&self, id: &str) -> Option<gio::ActionGroup> {
diff --git a/src/app/components/playlist/playlist.rs b/src/app/components/playlist/playlist.rs
index 40d99578..6e7434d2 100644
--- a/src/app/components/playlist/playlist.rs
+++ b/src/app/components/playlist/playlist.rs
@@ -3,7 +3,7 @@ use gtk::prelude::*;
 use std::ops::Deref;
 use std::rc::Rc;
 
-use crate::app::components::utils::AnimatorDefault;
+use crate::app::components::utils::{ancestor, AnimatorDefault};
 use crate::app::components::{Component, EventListener, SongWidget};
 use crate::app::models::{SongListModel, SongModel, SongState};
 use crate::app::state::{PlaybackEvent, SelectionEvent, SelectionState};
@@ -145,16 +145,16 @@ where
     }
 
     fn autoscroll_to_playing(&self, index: usize) {
-        let len = 1f64; //self.model.song_list_model().len() as f64;
-        let adj = self
-            .listview
-            .parent()
-            .and_then(|p| p.downcast::<gtk::ScrolledWindow>().ok())
-            .map(|w| w.vadjustment());
+        let len = self.model.song_list_model().partial_len() as f64;
+        let scrolled_window: Option<gtk::ScrolledWindow> = ancestor(&self.listview);
+        let adj = scrolled_window.map(|w| w.vadjustment());
         if let Some(adj) = adj {
             let v = adj.value();
+            let v2 = v + 0.9 * adj.page_size();
             let pos = (index as f64) * adj.upper() / len;
-            if pos < v || pos > v + 0.9 * adj.page_size() {
+            debug!("estimated pos: {}", pos);
+            debug!("current window: {} -- {}", v, v2);
+            if pos < v || pos > v2 {
                 self.animator.animate(
                     20,
                     clone!(@weak adj => @default-return false, move |p| {
diff --git a/src/app/components/saved_tracks/saved_tracks_model.rs b/src/app/components/saved_tracks/saved_tracks_model.rs
index 6596ede0..5bc8349a 100644
--- a/src/app/components/saved_tracks/saved_tracks_model.rs
+++ b/src/app/components/saved_tracks/saved_tracks_model.rs
@@ -23,28 +23,28 @@ impl SavedTracksModel {
     }
 
     pub fn load_initial(&self) {
+        let loader = self.app_model.get_batch_loader();
         let query = BatchQuery {
             source: SongsSource::SavedTracks,
             batch: Batch::first_of_size(50),
         };
-
-        self.load_batch(query);
+        self.dispatcher.dispatch_async(Box::pin(async move {
+            let action = loader
+                .query(query, |song_batch| {
+                    BrowserAction::SetSavedTracks(Box::new(song_batch)).into()
+                })
+                .await;
+            Some(action)
+        }));
     }
 
     pub fn load_more(&self) -> Option<()> {
-        let last_batch = self.song_list_model().last_batch()?;
+        let loader = self.app_model.get_batch_loader();
+        let last_batch = self.song_list_model().last_batch()?.next()?;
         let query = BatchQuery {
             source: SongsSource::SavedTracks,
             batch: last_batch,
         };
-
-        self.load_batch(query.next()?);
-        Some(())
-    }
-
-    fn load_batch(&self, query: BatchQuery) {
-        let loader = self.app_model.get_batch_loader();
-
         self.dispatcher.dispatch_async(Box::pin(async move {
             let action = loader
                 .query(query, |song_batch| {
@@ -53,6 +53,7 @@ impl SavedTracksModel {
                 .await;
             Some(action)
         }));
+        Some(())
     }
 }
 
@@ -133,7 +134,7 @@ impl PlaylistModel for SavedTracksModel {
 
     fn enable_selection(&self) -> bool {
         self.dispatcher
-            .dispatch(AppAction::EnableSelection(SelectionContext::Default));
+            .dispatch(AppAction::EnableSelection(SelectionContext::SavedTracks));
         true
     }
 
diff --git a/src/app/components/selection/component.rs b/src/app/components/selection/component.rs
index 53feebe3..a9406e49 100644
--- a/src/app/components/selection/component.rs
+++ b/src/app/components/selection/component.rs
@@ -42,12 +42,43 @@ impl SelectionToolbarModel {
 
     pub fn remove_selection(&self) {
         match &self.selection().context {
+            SelectionContext::SavedTracks => self.remove_saved_tracks(),
             SelectionContext::Queue => self.dequeue_selection(),
             SelectionContext::EditablePlaylist(id) => self.remove_from_playlist(id),
             _ => {}
         }
     }
 
+    pub fn save_selection(&self) {
+        let api = self.app_model.get_spotify();
+        let ids: Vec<String> = self
+            .selection()
+            .peek_selection()
+            .map(|s| &s.id)
+            .cloned()
+            .collect();
+        self.dispatcher
+            .call_spotify_and_dispatch_many(move || async move {
+                api.save_tracks(ids).await?;
+                Ok(vec![AppAction::SaveSelection])
+            })
+    }
+
+    fn remove_saved_tracks(&self) {
+        let api = self.app_model.get_spotify();
+        let ids: Vec<String> = self
+            .selection()
+            .peek_selection()
+            .map(|s| &s.id)
+            .cloned()
+            .collect();
+        self.dispatcher
+            .call_spotify_and_dispatch_many(move || async move {
+                api.remove_saved_tracks(ids).await?;
+                Ok(vec![AppAction::UnsaveSelection])
+            })
+    }
+
     fn selection(&self) -> impl Deref<Target = SelectionState> + '_ {
         self.app_model.map_state(|s| &s.selection)
     }
@@ -108,6 +139,7 @@ impl SelectionToolbar {
         widget.connect_move_down(clone!(@weak model => move || model.move_down_selection()));
         widget.connect_queue(clone!(@weak model => move || model.queue_selection()));
         widget.connect_remove(clone!(@weak model => move || model.remove_selection()));
+        widget.connect_save(clone!(@weak model => move || model.save_selection()));
         Self { model, widget }
     }
 
@@ -120,6 +152,16 @@ impl SelectionToolbar {
                     .set_queue(SelectionToolState::Visible(count > 0));
                 self.widget.set_add(SelectionToolState::Visible(count > 0));
                 self.widget.set_remove(SelectionToolState::Hidden);
+                self.widget.set_save(SelectionToolState::Visible(count > 0));
+            }
+            SelectionContext::SavedTracks => {
+                self.widget.set_move(SelectionToolState::Hidden);
+                self.widget
+                    .set_queue(SelectionToolState::Visible(count > 0));
+                self.widget.set_add(SelectionToolState::Visible(count > 0));
+                self.widget
+                    .set_remove(SelectionToolState::Visible(count > 0));
+                self.widget.set_save(SelectionToolState::Hidden);
             }
             SelectionContext::Queue => {
                 self.widget
@@ -128,6 +170,7 @@ impl SelectionToolbar {
                 self.widget.set_add(SelectionToolState::Hidden);
                 self.widget
                     .set_remove(SelectionToolState::Visible(count > 0));
+                self.widget.set_save(SelectionToolState::Visible(count > 0));
             }
             SelectionContext::Playlist => {
                 self.widget.set_move(SelectionToolState::Hidden);
@@ -135,6 +178,7 @@ impl SelectionToolbar {
                     .set_queue(SelectionToolState::Visible(count > 0));
                 self.widget.set_add(SelectionToolState::Hidden);
                 self.widget.set_remove(SelectionToolState::Hidden);
+                self.widget.set_save(SelectionToolState::Hidden);
             }
             SelectionContext::EditablePlaylist(_) => {
                 self.widget.set_move(SelectionToolState::Hidden);
@@ -143,6 +187,7 @@ impl SelectionToolbar {
                 self.widget.set_add(SelectionToolState::Hidden);
                 self.widget
                     .set_remove(SelectionToolState::Visible(count > 0));
+                self.widget.set_save(SelectionToolState::Hidden);
             }
         };
     }
diff --git a/src/app/components/selection/selection_toolbar.ui b/src/app/components/selection/selection_toolbar.ui
index 3a058216..2290d191 100644
--- a/src/app/components/selection/selection_toolbar.ui
+++ b/src/app/components/selection/selection_toolbar.ui
@@ -32,9 +32,18 @@
             <property name="valign">center</property>
             <property name="has-frame">0</property>
             <child>
-              <object class="AdwButtonContent">
-                <property name="icon-name">music-queue-symbolic</property>
-                <property name="label" translatable="yes">Add to queue</property>
+              <object class="AdwSqueezer">
+                <child>
+                  <object class="AdwButtonContent">
+                    <property name="icon-name">music-queue-symbolic</property>
+                    <property name="label" translatable="yes">Add to queue</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwButtonContent">
+                    <property name="icon-name">music-queue-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -53,9 +62,39 @@
             <property name="valign">center</property>
             <property name="has-frame">0</property>
             <child>
-              <object class="AdwButtonContent">
-                <property name="icon-name">user-trash-symbolic</property>
-                <property name="label" translatable="yes">Remove</property>
+              <object class="AdwSqueezer">
+                <child>
+                  <object class="AdwButtonContent">
+                    <property name="icon-name">user-trash-symbolic</property>
+                    <property name="label" translatable="yes">Remove</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwButtonContent">
+                    <property name="icon-name">user-trash-symbolic</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkButton" id="save">
+            <property name="valign">center</property>
+            <property name="has-frame">0</property>
+            <child>
+              <object class="AdwSqueezer">
+                <child>
+                  <object class="AdwButtonContent">
+                    <property name="icon-name">star-new-symbolic</property>
+                    <property name="label" translatable="yes">Save to library</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwButtonContent">
+                    <property name="icon-name">star-new-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
diff --git a/src/app/components/selection/widget.rs b/src/app/components/selection/widget.rs
index 5a93d6c0..7f3c9f66 100644
--- a/src/app/components/selection/widget.rs
+++ b/src/app/components/selection/widget.rs
@@ -31,6 +31,9 @@ mod imp {
 
         #[template_child]
         pub queue: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub save: TemplateChild<gtk::Button>,
     }
 
     #[glib::object_subclass]
@@ -105,6 +108,13 @@ impl SelectionToolbarWidget {
         self.widget().queue.connect_clicked(move |_| f());
     }
 
+    pub fn connect_save<F>(&self, f: F)
+    where
+        F: Fn() + 'static,
+    {
+        self.widget().save.connect_clicked(move |_| f());
+    }
+
     pub fn connect_remove<F>(&self, f: F)
     where
         F: Fn() + 'static,
@@ -134,6 +144,11 @@ impl SelectionToolbarWidget {
         self.widget().remove.set_visible(state.visible());
     }
 
+    pub fn set_save(&self, state: SelectionToolState) {
+        self.widget().save.set_sensitive(state.sensitive());
+        self.widget().save.set_visible(state.visible());
+    }
+
     pub fn set_visible(&self, visible: bool) {
         gtk::Widget::set_visible(self.upcast_ref(), visible);
         self.widget().action_bar.set_revealed(visible);
diff --git a/src/app/components/utils.rs b/src/app/components/utils.rs
index 6ca2a1bb..2a58c9d9 100644
--- a/src/app/components/utils.rs
+++ b/src/app/components/utils.rs
@@ -124,6 +124,19 @@ where
     }
 }
 
+pub fn ancestor<Current, Ancestor>(widget: &Current) -> Option<Ancestor>
+where
+    Current: IsA<gtk::Widget>,
+    Ancestor: IsA<gtk::Widget>,
+{
+    widget.parent().and_then(|p| {
+        p.clone()
+            .downcast::<Ancestor>()
+            .ok()
+            .or_else(|| ancestor(&p))
+    })
+}
+
 pub fn wrap_flowbox_item<
     Model: glib::IsA<glib::Object>,
     Widget: gtk::glib::IsA<gtk::Widget>,
diff --git a/src/app/models/songs/song_list_model.rs b/src/app/models/songs/song_list_model.rs
index d50e181c..d1d5f1cf 100644
--- a/src/app/models/songs/song_list_model.rs
+++ b/src/app/models/songs/song_list_model.rs
@@ -124,6 +124,10 @@ impl SongListModel {
         self.inner().needed_batch_for(i)
     }
 
+    pub fn partial_len(&self) -> usize {
+        self.inner().partial_len()
+    }
+
     pub fn len(&self) -> usize {
         self.inner().len()
     }
@@ -133,6 +137,11 @@ impl SongListModel {
         SongListModelPending::new(Some(range), self)
     }
 
+    pub fn prepend(&mut self, songs: Vec<SongDescription>) -> SongListModelPending {
+        let range = self.inner_mut().prepend(songs);
+        SongListModelPending::new(Some(range), self)
+    }
+
     pub fn find_index(&self, song_id: &str) -> Option<usize> {
         self.inner().find_index(song_id)
     }
diff --git a/src/app/models/songs/support.rs b/src/app/models/songs/support.rs
index defe392c..3f5868bd 100644
--- a/src/app/models/songs/support.rs
+++ b/src/app/models/songs/support.rs
@@ -236,6 +236,28 @@ impl SongList {
         ListRangeUpdate::inserted(insertion_start, songs_len)
     }
 
+    pub fn prepend(&mut self, songs: Vec<SongDescription>) -> ListRangeUpdate {
+        let songs_len = songs.len();
+        let insertion_start = 0;
+
+        let mut batches = HashMap::<usize, Vec<String>>::default();
+        for song in songs {
+            Self::batches_add(&mut batches, self.batch_size, &song.id);
+            self.indexed_songs
+                .insert(song.id.clone(), SongModel::new(song));
+        }
+        self.iter_ids_from(0).for_each(|(_, next)| {
+            Self::batches_add(&mut batches, self.batch_size, next);
+        });
+
+        self.total = self.total.saturating_add(songs_len);
+        self.total_loaded = self.total_loaded.saturating_add(songs_len);
+        self.last_batch_key = batches.len().saturating_sub(1);
+        self.batches = batches;
+
+        ListRangeUpdate::inserted(insertion_start, songs_len)
+    }
+
     pub fn add(&mut self, song_batch: SongBatch) -> Option<ListRangeUpdate> {
         if song_batch.batch.batch_size != self.batch_size {
             song_batch
diff --git a/src/app/state/app_state.rs b/src/app/state/app_state.rs
index 99033014..2fe0b45a 100644
--- a/src/app/state/app_state.rs
+++ b/src/app/state/app_state.rs
@@ -21,6 +21,8 @@ pub enum AppAction {
     DequeueSelection,
     MoveUpSelection,
     MoveDownSelection,
+    SaveSelection,
+    UnsaveSelection,
     EnableSelection(SelectionContext),
     CancelSelection,
 }
@@ -126,6 +128,39 @@ impl AppState {
                     .map(|_| vec![PlaybackEvent::PlaylistChanged.into()])
                     .unwrap_or_else(Vec::new)
             }
+            AppAction::SaveSelection => {
+                let tracks = self.selection.take_selection();
+                let mut events: Vec<AppEvent> = self
+                    .browser
+                    .home_state_mut()
+                    .into_iter()
+                    .flat_map(move |home| {
+                        home.update_with(BrowserAction::SaveTracks(tracks.clone()))
+                    })
+                    .map(AppEvent::BrowserEvent)
+                    .collect();
+                events.push(SelectionEvent::SelectionModeChanged(false).into());
+                events
+            }
+            AppAction::UnsaveSelection => {
+                let tracks: Vec<String> = self
+                    .selection
+                    .take_selection()
+                    .into_iter()
+                    .map(|s| s.id)
+                    .collect();
+                let mut events: Vec<AppEvent> = self
+                    .browser
+                    .home_state_mut()
+                    .into_iter()
+                    .flat_map(move |home| {
+                        home.update_with(BrowserAction::RemoveSavedTracks(tracks.clone()))
+                    })
+                    .map(AppEvent::BrowserEvent)
+                    .collect();
+                events.push(SelectionEvent::SelectionModeChanged(false).into());
+                events
+            }
             AppAction::EnableSelection(context) => {
                 if let Some(active) = self.selection.set_mode(Some(context)) {
                     vec![SelectionEvent::SelectionModeChanged(active).into()]
diff --git a/src/app/state/browser_state.rs b/src/app/state/browser_state.rs
index 726712e1..7966b2c9 100644
--- a/src/app/state/browser_state.rs
+++ b/src/app/state/browser_state.rs
@@ -29,7 +29,10 @@ pub enum BrowserAction {
     UnsaveAlbum(String),
     SetUserDetails(Box<UserDescription>),
     AppendUserPlaylists(Vec<PlaylistDescription>),
+    SetSavedTracks(Box<SongBatch>),
     AppendSavedTracks(Box<SongBatch>),
+    SaveTracks(Vec<SongDescription>),
+    RemoveSavedTracks(Vec<String>),
 }
 
 impl From<BrowserAction> for AppAction {
@@ -69,7 +72,7 @@ pub enum BrowserEvent {
     AlbumSaved(String),
     AlbumUnsaved(String),
     UserDetailsUpdated(String),
-    SavedTracksAppended(usize),
+    SavedTracksUpdated,
 }
 
 pub enum BrowserScreen {
@@ -148,8 +151,8 @@ where
         Self(vec![initial])
     }
 
-    fn iter_mut(&mut self) -> std::slice::IterMut<'_, Screen> {
-        self.0.iter_mut()
+    fn iter_mut(&mut self) -> impl Iterator<Item = &mut Screen> {
+        self.0.iter_mut().rev()
     }
 
     fn iter_rev(&self) -> impl Iterator<Item = &Screen> {
@@ -258,6 +261,13 @@ impl BrowserState {
         extract_state!(&self, BrowserScreen::Home(s) => s)
     }
 
+    pub fn home_state_mut(&mut self) -> Option<&mut HomeState> {
+        self.navigation.iter_mut().find_map(|screen| match screen {
+            BrowserScreen::Home(s) => Some(&mut **s),
+            _ => None,
+        })
+    }
+
     pub fn details_state(&self, id: &str) -> Option<&DetailsState> {
         extract_state!(&self, BrowserScreen::AlbumDetails(state) if state.id == id => state)
     }
diff --git a/src/app/state/screen_states.rs b/src/app/state/screen_states.rs
index ee609a42..a0b77017 100644
--- a/src/app/state/screen_states.rs
+++ b/src/app/state/screen_states.rs
@@ -270,13 +270,32 @@ impl UpdatableState for HomeState {
                 vec![BrowserEvent::SavedPlaylistsUpdated]
             }
             BrowserAction::AppendSavedTracks(song_batch) => {
-                let offset = song_batch.batch.offset;
                 if self.saved_tracks.add(*song_batch).commit() {
-                    vec![BrowserEvent::SavedTracksAppended(offset)]
+                    vec![BrowserEvent::SavedTracksUpdated]
                 } else {
                     vec![]
                 }
             }
+            BrowserAction::SetSavedTracks(song_batch) => {
+                if self
+                    .saved_tracks
+                    .clear()
+                    .and(|s| s.add(*song_batch))
+                    .commit()
+                {
+                    vec![BrowserEvent::SavedTracksUpdated]
+                } else {
+                    vec![]
+                }
+            }
+            BrowserAction::SaveTracks(tracks) => {
+                self.saved_tracks.prepend(tracks).commit();
+                vec![BrowserEvent::SavedTracksUpdated]
+            }
+            BrowserAction::RemoveSavedTracks(tracks) => {
+                self.saved_tracks.remove(&tracks[..]).commit();
+                vec![BrowserEvent::SavedTracksUpdated]
+            }
             _ => vec![],
         }
     }
diff --git a/src/app/state/selection_state.rs b/src/app/state/selection_state.rs
index 41619d44..12e89d7b 100644
--- a/src/app/state/selection_state.rs
+++ b/src/app/state/selection_state.rs
@@ -33,6 +33,7 @@ pub enum SelectionContext {
     Queue,
     Playlist,
     EditablePlaylist(String),
+    SavedTracks,
     Default,
 }
 

From cccc9ad5a08b0ec1ea094032ffa393b32eab711a Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Wed, 2 Feb 2022 10:06:40 -0500
Subject: [PATCH 12/33] update POTFILES

---
 TRANSLATORS                               |  3 ++-
 po/POTFILES                               |  4 +++-
 po/spot.pot                               | 27 +++++++++++++----------
 src/app/components/selection/component.rs |  6 ++++-
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/TRANSLATORS b/TRANSLATORS
index 70d94a54..f08faa75 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -20,4 +20,5 @@ Tine Jozelj
 Ana Pika Šubic
 Amor Ali
 Seioo Inoue
-Dmitry
\ No newline at end of file
+Dmitry
+Francesco Babetto
\ No newline at end of file
diff --git a/po/POTFILES b/po/POTFILES
index a4204043..cf886a07 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,6 +1,5 @@
 # grep gettext src/**/*.rs | cut -d: -f1 | uniq
 src/app/batch_loader.rs
-src/app/components/details/release_details.rs
 src/app/components/labels.rs
 src/app/components/login/login_model.rs
 src/app/components/mod.rs
@@ -9,6 +8,7 @@ src/app/components/navigation/home.rs
 src/app/components/now_playing/now_playing_model.rs
 src/app/components/playback/playback_controls.rs
 src/app/components/playback/playback_info.rs
+src/app/components/selection/component.rs
 src/app/components/user_menu/user_menu.rs
 src/app/state/login_state.rs
 src/main.rs
@@ -18,10 +18,12 @@ src/window.ui.in
 src/app/components/saved_playlists/saved_playlists.ui
 src/app/components/artist_details/artist_details.ui
 src/app/components/saved_tracks/saved_tracks.ui
+src/app/components/sidebar_listbox/sidebar_icon_widget.ui
 src/app/components/search/search.ui
 src/app/components/artist/artist.ui
 src/app/components/user_details/user_details.ui
 src/app/components/selection/selection_toolbar.ui
+src/app/components/details/album_header.ui
 src/app/components/details/release_details.ui
 src/app/components/details/details.ui
 src/app/components/now_playing/now_playing.ui
diff --git a/po/spot.pot b/po/spot.pot
index e68de333..490ecda2 100644
--- a/po/spot.pot
+++ b/po/spot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-22 18:12+0100\n"
+"POT-Creation-Date: 2022-01-29 17:34-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgid "Unnamed playlist"
 msgstr ""
 
 #: src/app/components/navigation/home.rs:87
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr ""
 
@@ -118,6 +118,10 @@ msgstr ""
 msgid "No song playing"
 msgstr ""
 
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
 #. translators: This is a menu entry.
 #: src/app/components/user_menu/user_menu.rs:56
 msgid "About"
@@ -133,7 +137,7 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:109
 msgid "Connection restored"
 msgstr ""
 
@@ -153,7 +157,7 @@ msgid "Top tracks"
 msgstr ""
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr ""
 
@@ -178,14 +182,18 @@ msgid "Type to search."
 msgstr ""
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr ""
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr ""
 
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
 #. This refers to a music label
 #: src/app/components/details/release_details.ui:38
 msgid "Label"
@@ -201,12 +209,7 @@ msgstr ""
 msgid "Tracks"
 msgstr ""
 
-#. This refers to the duration of a release
 #: src/app/components/details/release_details.ui:68
-msgid "Duration"
-msgstr ""
-
-#: src/app/components/details/release_details.ui:78
 msgid "Copyright"
 msgstr ""
 
diff --git a/src/app/components/selection/component.rs b/src/app/components/selection/component.rs
index a9406e49..867a5ff9 100644
--- a/src/app/components/selection/component.rs
+++ b/src/app/components/selection/component.rs
@@ -1,3 +1,4 @@
+use gettextrs::gettext;
 use gtk::prelude::*;
 use std::ops::Deref;
 use std::rc::Rc;
@@ -60,7 +61,10 @@ impl SelectionToolbarModel {
         self.dispatcher
             .call_spotify_and_dispatch_many(move || async move {
                 api.save_tracks(ids).await?;
-                Ok(vec![AppAction::SaveSelection])
+                Ok(vec![
+                    AppAction::SaveSelection,
+                    AppAction::ShowNotification(gettext("Tracks saved!")),
+                ])
             })
     }
 

From 917fdee2aa9e2bb72fab5a4b459670eadbb0b618 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Mon, 7 Feb 2022 22:25:17 +0000
Subject: [PATCH 13/33] Uri handler (#465)

* Added spotify URI handler

* continue uri handler

* very slightly better error handling

* uh fix something?

* various state management fixes

Co-authored-by: bbb651 <bar.ye651@gmail.com>
---
 AUTHORS                                       |   3 +-
 data/dev.alextren.Spot.desktop                |   3 +-
 po/spot.pot                                   |   6 +-
 .../artist_details/artist_details_model.rs    |  15 ++-
 src/app/components/details/details_model.rs   |  13 +-
 src/app/components/mod.rs                     |   3 +-
 .../playlist_details_model.rs                 |  15 ++-
 src/app/components/selection/component.rs     |   2 +-
 .../user_details/user_details_model.rs        |   2 +-
 src/app/mod.rs                                |   8 +-
 src/app/state/app_state.rs                    |  98 ++++++++------
 src/app/state/browser_state.rs                |  96 +++++++-------
 src/app/state/login_state.rs                  |   5 +-
 src/app/state/mod.rs                          |   6 +-
 src/app/state/playback_state.rs               |   6 +-
 src/app/state/screen_states.rs                | 122 +++++++++---------
 src/app/state/selection_state.rs              |   5 +-
 src/main.rs                                   |  18 ++-
 18 files changed, 249 insertions(+), 177 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a898bc12..b7d53764 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,4 +15,5 @@ Niklas Sauter
 Nicolas Fella
 Fridolin Weisser
 Jan Przebor
-Warren Hu
\ No newline at end of file
+Warren Hu
+bbb651
\ No newline at end of file
diff --git a/data/dev.alextren.Spot.desktop b/data/dev.alextren.Spot.desktop
index d713ace3..6f1feed1 100644
--- a/data/dev.alextren.Spot.desktop
+++ b/data/dev.alextren.Spot.desktop
@@ -1,11 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=Spot
+Exec=spot %u
 GenericName=Music Player
-Exec=spot
 Icon=dev.alextren.Spot
 Terminal=false
 Type=Application
 Categories=GTK;GNOME;Music;AudioVideo;
+MimeType=x-scheme-handler/spotify;
 StartupNotify=true
 X-Purism-FormFactor=Workstation;Mobile;
diff --git a/po/spot.pot b/po/spot.pot
index 490ecda2..ee77ff7a 100644
--- a/po/spot.pot
+++ b/po/spot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-29 17:34-0500\n"
+"POT-Creation-Date: 2022-02-06 17:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -141,6 +141,10 @@ msgstr ""
 msgid "Connection restored"
 msgstr ""
 
+#: src/main.rs:77
+msgid "Failed to open link!"
+msgstr ""
+
 #. A title that is shown when the user has not saved any playlists.
 #: src/app/components/saved_playlists/saved_playlists.ui:26
 msgid "You have no saved playlists."
diff --git a/src/app/components/artist_details/artist_details_model.rs b/src/app/components/artist_details/artist_details_model.rs
index f4e542bf..c8ccecec 100644
--- a/src/app/components/artist_details/artist_details_model.rs
+++ b/src/app/components/artist_details/artist_details_model.rs
@@ -3,6 +3,7 @@ use gio::SimpleActionGroup;
 use std::ops::Deref;
 use std::rc::Rc;
 
+use crate::api::SpotifyApiError;
 use crate::app::components::SimpleHeaderBarModel;
 use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::*;
@@ -41,9 +42,15 @@ impl ArtistDetailsModel {
         let api = self.app_model.get_spotify();
         self.dispatcher
             .call_spotify_and_dispatch(move || async move {
-                api.get_artist(&id)
-                    .await
-                    .map(|artist| BrowserAction::SetArtistDetails(Box::new(artist)).into())
+                let artist = api.get_artist(&id).await;
+                match artist {
+                    Ok(artist) => Ok(BrowserAction::SetArtistDetails(Box::new(artist)).into()),
+                    Err(SpotifyApiError::BadStatus(400, _))
+                    | Err(SpotifyApiError::BadStatus(404, _)) => {
+                        Ok(BrowserAction::NavigationPop.into())
+                    }
+                    Err(e) => Err(e),
+                }
             });
     }
 
@@ -64,7 +71,7 @@ impl ArtistDetailsModel {
             .call_spotify_and_dispatch(move || async move {
                 api.get_artist_albums(&id, offset, batch_size)
                     .await
-                    .map(|albums| BrowserAction::AppendArtistReleases(albums).into())
+                    .map(|albums| BrowserAction::AppendArtistReleases(id, albums).into())
             });
 
         Some(())
diff --git a/src/app/components/details/details_model.rs b/src/app/components/details/details_model.rs
index e3598fb3..12d98315 100644
--- a/src/app/components/details/details_model.rs
+++ b/src/app/components/details/details_model.rs
@@ -4,6 +4,7 @@ use std::cell::Ref;
 use std::ops::Deref;
 use std::rc::Rc;
 
+use crate::api::SpotifyApiError;
 use crate::app::components::labels;
 use crate::app::components::HeaderBarModel;
 use crate::app::components::PlaylistModel;
@@ -56,9 +57,15 @@ impl DetailsModel {
         let api = self.app_model.get_spotify();
         self.dispatcher
             .call_spotify_and_dispatch(move || async move {
-                api.get_album(&id)
-                    .await
-                    .map(|album| BrowserAction::SetAlbumDetails(Box::new(album)).into())
+                let album = api.get_album(&id).await;
+                match album {
+                    Ok(album) => Ok(BrowserAction::SetAlbumDetails(Box::new(album)).into()),
+                    Err(SpotifyApiError::BadStatus(400, _))
+                    | Err(SpotifyApiError::BadStatus(404, _)) => {
+                        Ok(BrowserAction::NavigationPop.into())
+                    }
+                    Err(e) => Err(e),
+                }
             });
     }
 
diff --git a/src/app/components/mod.rs b/src/app/components/mod.rs
index a6817a8b..537a3dc8 100644
--- a/src/app/components/mod.rs
+++ b/src/app/components/mod.rs
@@ -103,7 +103,8 @@ impl dyn ActionDispatcher {
     {
         self.dispatch_many_async(Box::pin(async move {
             let first_call = call.clone();
-            match first_call().await {
+            let result = first_call().await;
+            match result {
                 Ok(actions) => actions,
                 Err(SpotifyApiError::NoToken) => vec![],
                 Err(SpotifyApiError::InvalidToken) => {
diff --git a/src/app/components/playlist_details/playlist_details_model.rs b/src/app/components/playlist_details/playlist_details_model.rs
index 62781748..9349f8a1 100644
--- a/src/app/components/playlist_details/playlist_details_model.rs
+++ b/src/app/components/playlist_details/playlist_details_model.rs
@@ -3,6 +3,7 @@ use gio::SimpleActionGroup;
 use std::ops::Deref;
 use std::rc::Rc;
 
+use crate::api::SpotifyApiError;
 use crate::app::components::SimpleHeaderBarModel;
 use crate::app::components::{labels, PlaylistModel};
 use crate::app::models::*;
@@ -46,9 +47,17 @@ impl PlaylistDetailsModel {
         let id = self.id.clone();
         self.dispatcher
             .call_spotify_and_dispatch(move || async move {
-                api.get_playlist(&id)
-                    .await
-                    .map(|playlist| BrowserAction::SetPlaylistDetails(Box::new(playlist)).into())
+                let playlist = api.get_playlist(&id).await;
+                match playlist {
+                    Ok(playlist) => {
+                        Ok(BrowserAction::SetPlaylistDetails(Box::new(playlist)).into())
+                    }
+                    Err(SpotifyApiError::BadStatus(400, _))
+                    | Err(SpotifyApiError::BadStatus(404, _)) => {
+                        Ok(BrowserAction::NavigationPop.into())
+                    }
+                    Err(e) => Err(e),
+                }
             });
     }
 
diff --git a/src/app/components/selection/component.rs b/src/app/components/selection/component.rs
index 867a5ff9..9fa467af 100644
--- a/src/app/components/selection/component.rs
+++ b/src/app/components/selection/component.rs
@@ -124,7 +124,7 @@ impl SelectionToolbarModel {
             .call_spotify_and_dispatch_many(move || async move {
                 api.remove_from_playlist(&id, uris.clone()).await?;
                 Ok(vec![
-                    BrowserAction::RemoveTracksFromPlaylist(uris).into(),
+                    BrowserAction::RemoveTracksFromPlaylist(id, uris).into(),
                     SelectionAction::Clear.into(),
                 ])
             })
diff --git a/src/app/components/user_details/user_details_model.rs b/src/app/components/user_details/user_details_model.rs
index d47a7549..45c63f09 100644
--- a/src/app/components/user_details/user_details_model.rs
+++ b/src/app/components/user_details/user_details_model.rs
@@ -55,7 +55,7 @@ impl UserDetailsModel {
             .call_spotify_and_dispatch(move || async move {
                 api.get_user_playlists(&id, offset, batch_size)
                     .await
-                    .map(|playlists| BrowserAction::AppendUserPlaylists(playlists).into())
+                    .map(|playlists| BrowserAction::AppendUserPlaylists(id, playlists).into())
             });
 
         Some(())
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 165f8025..656effb8 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -202,12 +202,14 @@ impl App {
     }
 
     fn handle(&mut self, message: AppAction) {
-        if let AppAction::Start = message {
-            self.add_ui_components();
-        }
+        let starting = matches!(&message, &AppAction::Start);
 
         let events = self.model.update_state(message);
 
+        if !events.is_empty() && starting {
+            self.add_ui_components();
+        }
+
         for event in events.iter() {
             for component in self.components.iter_mut() {
                 component.on_event(event);
diff --git a/src/app/state/app_state.rs b/src/app/state/app_state.rs
index 2fe0b45a..65f41918 100644
--- a/src/app/state/app_state.rs
+++ b/src/app/state/app_state.rs
@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use crate::app::state::{
     browser_state::{BrowserAction, BrowserEvent, BrowserState},
     login_state::{LoginAction, LoginEvent, LoginState},
@@ -28,6 +30,30 @@ pub enum AppAction {
 }
 
 impl AppAction {
+    #[allow(non_snake_case)]
+    pub fn OpenURI(uri: String) -> Option<Self> {
+        debug!("parsing {}", &uri);
+        let mut parts = uri.split(':');
+        if parts.next()? != "spotify" {
+            return None;
+        }
+
+        // Might start with /// because of https://gitlab.gnome.org/GNOME/glib/-/issues/1886/
+        let action = parts
+            .next()?
+            .strip_prefix("///")
+            .filter(|p| !p.is_empty())?;
+        let data = parts.next()?;
+
+        match action {
+            "album" => Some(Self::ViewAlbum(data.to_string())),
+            "artist" => Some(Self::ViewArtist(data.to_string())),
+            "playlist" => Some(Self::ViewPlaylist(data.to_string())),
+            "user" => Some(Self::ViewUser(data.to_string())),
+            _ => None,
+        }
+    }
+
     #[allow(non_snake_case)]
     pub fn ViewAlbum(id: String) -> Self {
         BrowserAction::NavigationPush(ScreenName::AlbumDetails(id)).into()
@@ -67,6 +93,7 @@ pub enum AppEvent {
 }
 
 pub struct AppState {
+    started: bool,
     pub playback: PlaybackState,
     pub browser: BrowserState,
     pub selection: SelectionState,
@@ -76,6 +103,7 @@ pub struct AppState {
 impl AppState {
     pub fn new() -> Self {
         Self {
+            started: false,
             playback: Default::default(),
             browser: BrowserState::new(),
             selection: Default::default(),
@@ -85,7 +113,10 @@ impl AppState {
 
     pub fn update_state(&mut self, message: AppAction) -> Vec<AppEvent> {
         match message {
-            AppAction::Start => vec![AppEvent::Started],
+            AppAction::Start if !self.started => {
+                self.started = true;
+                vec![AppEvent::Started]
+            }
             AppAction::ShowNotification(c) => vec![AppEvent::NotificationShown(c)],
             AppAction::ViewNowPlaying => vec![AppEvent::NowPlayingShown],
             AppAction::Raise => vec![AppEvent::Raised],
@@ -130,15 +161,10 @@ impl AppState {
             }
             AppAction::SaveSelection => {
                 let tracks = self.selection.take_selection();
-                let mut events: Vec<AppEvent> = self
-                    .browser
-                    .home_state_mut()
-                    .into_iter()
-                    .flat_map(move |home| {
-                        home.update_with(BrowserAction::SaveTracks(tracks.clone()))
-                    })
-                    .map(AppEvent::BrowserEvent)
-                    .collect();
+                let mut events: Vec<AppEvent> = forward_action(
+                    BrowserAction::SaveTracks(tracks),
+                    self.browser.home_state_mut().unwrap(),
+                );
                 events.push(SelectionEvent::SelectionModeChanged(false).into());
                 events
             }
@@ -149,15 +175,10 @@ impl AppState {
                     .into_iter()
                     .map(|s| s.id)
                     .collect();
-                let mut events: Vec<AppEvent> = self
-                    .browser
-                    .home_state_mut()
-                    .into_iter()
-                    .flat_map(move |home| {
-                        home.update_with(BrowserAction::RemoveSavedTracks(tracks.clone()))
-                    })
-                    .map(AppEvent::BrowserEvent)
-                    .collect();
+                let mut events: Vec<AppEvent> = forward_action(
+                    BrowserAction::RemoveSavedTracks(tracks),
+                    self.browser.home_state_mut().unwrap(),
+                );
                 events.push(SelectionEvent::SelectionModeChanged(false).into());
                 events
             }
@@ -175,25 +196,26 @@ impl AppState {
                     vec![]
                 }
             }
-            AppAction::PlaybackAction(a) => self
-                .playback
-                .update_with(a)
-                .into_iter()
-                .map(AppEvent::PlaybackEvent)
-                .collect(),
-            AppAction::BrowserAction(a) => self
-                .browser
-                .update_with(a)
-                .into_iter()
-                .map(AppEvent::BrowserEvent)
-                .collect(),
-            AppAction::SelectionAction(a) => self
-                .selection
-                .update_with(a)
-                .into_iter()
-                .map(AppEvent::SelectionEvent)
-                .collect(),
-            AppAction::LoginAction(a) => self.logged_user.update_with(a).into_iter().collect(),
+            AppAction::PlaybackAction(a) => forward_action(a, &mut self.playback),
+            AppAction::BrowserAction(a) => forward_action(a, &mut self.browser),
+            AppAction::SelectionAction(a) => forward_action(a, &mut self.selection),
+            AppAction::LoginAction(a) => forward_action(a, &mut self.logged_user),
+            _ => vec![],
         }
     }
 }
+
+fn forward_action<A, E>(
+    action: A,
+    target: &mut impl UpdatableState<Action = A, Event = E>,
+) -> Vec<AppEvent>
+where
+    A: Clone,
+    E: Into<AppEvent>,
+{
+    target
+        .update_with(Cow::Owned(action))
+        .into_iter()
+        .map(|e| e.into())
+        .collect()
+}
diff --git a/src/app/state/browser_state.rs b/src/app/state/browser_state.rs
index 7966b2c9..3daee3f0 100644
--- a/src/app/state/browser_state.rs
+++ b/src/app/state/browser_state.rs
@@ -1,9 +1,10 @@
 use super::{
-    ArtistState, DetailsState, HomeState, PlaylistDetailsState, ScreenName, SearchState,
+    AppEvent, ArtistState, DetailsState, HomeState, PlaylistDetailsState, ScreenName, SearchState,
     UpdatableState, UserState,
 };
 use crate::app::models::*;
 use crate::app::state::AppAction;
+use std::borrow::Cow;
 use std::iter::Iterator;
 
 #[derive(Clone, Debug)]
@@ -13,7 +14,7 @@ pub enum BrowserAction {
     AppendLibraryContent(Vec<AlbumDescription>),
     SetPlaylistsContent(Vec<PlaylistDescription>),
     AppendPlaylistsContent(Vec<PlaylistDescription>),
-    RemoveTracksFromPlaylist(Vec<String>),
+    RemoveTracksFromPlaylist(String, Vec<String>),
     SetAlbumDetails(Box<AlbumFullDescription>),
     AppendAlbumTracks(String, Box<SongBatch>),
     SetPlaylistDetails(Box<PlaylistDescription>),
@@ -21,14 +22,14 @@ pub enum BrowserAction {
     Search(String),
     SetSearchResults(Box<SearchResults>),
     SetArtistDetails(Box<ArtistDescription>),
-    AppendArtistReleases(Vec<AlbumDescription>),
+    AppendArtistReleases(String, Vec<AlbumDescription>),
     NavigationPush(ScreenName),
     NavigationPop,
     NavigationPopTo(ScreenName),
     SaveAlbum(Box<AlbumDescription>),
     UnsaveAlbum(String),
     SetUserDetails(Box<UserDescription>),
-    AppendUserPlaylists(Vec<PlaylistDescription>),
+    AppendUserPlaylists(String, Vec<PlaylistDescription>),
     SetSavedTracks(Box<SongBatch>),
     AppendSavedTracks(Box<SongBatch>),
     SaveTracks(Vec<SongDescription>),
@@ -41,18 +42,6 @@ impl From<BrowserAction> for AppAction {
     }
 }
 
-impl BrowserAction {
-    // additional screen names that should handle this action
-    fn additional_targets(&self) -> Vec<ScreenName> {
-        match self {
-            BrowserAction::SaveAlbum(_) | BrowserAction::UnsaveAlbum(_) => {
-                vec![ScreenName::Home]
-            }
-            _ => vec![],
-        }
-    }
-}
-
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub enum BrowserEvent {
     NavigationHidden(bool),
@@ -75,6 +64,12 @@ pub enum BrowserEvent {
     SavedTracksUpdated,
 }
 
+impl From<BrowserEvent> for AppEvent {
+    fn from(browser_event: BrowserEvent) -> Self {
+        Self::BrowserEvent(browser_event)
+    }
+}
+
 pub enum BrowserScreen {
     Home(Box<HomeState>),
     AlbumDetails(Box<DetailsState>),
@@ -245,10 +240,6 @@ impl BrowserState {
         self.navigation.current().name()
     }
 
-    pub fn find_screen_mut(&mut self, name: &ScreenName) -> Option<&mut BrowserScreen> {
-        self.navigation.iter_mut().find(|s| s.name() == name)
-    }
-
     pub fn can_pop(&self) -> bool {
         self.navigation.can_pop() || self.navigation_hidden
     }
@@ -310,8 +301,9 @@ impl UpdatableState for BrowserState {
     type Action = BrowserAction;
     type Event = BrowserEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
         let can_pop = self.navigation.can_pop();
+        let action = action.into_owned();
 
         match action {
             BrowserAction::SetNavigationHidden(navigation_hidden) => {
@@ -321,7 +313,11 @@ impl UpdatableState for BrowserState {
             BrowserAction::Search(_) => {
                 let mut events = self.push_if_needed(ScreenName::Search);
 
-                let mut update_events = self.navigation.current_mut().state().update_with(action);
+                let mut update_events = self
+                    .navigation
+                    .current_mut()
+                    .state()
+                    .update_with(Cow::Owned(action));
                 events.append(&mut update_events);
                 events
             }
@@ -338,25 +334,11 @@ impl UpdatableState for BrowserState {
                 self.navigation_hidden = false;
                 vec![BrowserEvent::NavigationHidden(false)]
             }
-            _ => {
-                let mut events: Vec<Self::Event> = vec![];
-                events.extend(
-                    action
-                        .additional_targets()
-                        .iter()
-                        .filter_map(|name| {
-                            Some(
-                                self.find_screen_mut(name)?
-                                    .state()
-                                    .update_with(action.clone()),
-                            )
-                        })
-                        .flatten()
-                        .collect::<Vec<Self::Event>>(),
-                );
-                events.extend(self.navigation.current_mut().state().update_with(action));
-                events
-            }
+            _ => self
+                .navigation
+                .iter_mut()
+                .flat_map(|s| s.state().update_with(Cow::Borrowed(&action)))
+                .collect(),
         }
     }
 }
@@ -374,7 +356,9 @@ pub mod tests {
         assert_eq!(state.count(), 1);
 
         let new_screen = ScreenName::Artist("some_id".to_string());
-        state.update_with(BrowserAction::NavigationPush(new_screen.clone()));
+        state.update_with(Cow::Owned(BrowserAction::NavigationPush(
+            new_screen.clone(),
+        )));
 
         assert_eq!(state.current_screen(), &new_screen);
         assert_eq!(state.count(), 2);
@@ -385,16 +369,18 @@ pub mod tests {
     fn test_navigation_pop() {
         let mut state = BrowserState::new();
         let new_screen = ScreenName::Artist("some_id".to_string());
-        state.update_with(BrowserAction::NavigationPush(new_screen.clone()));
+        state.update_with(Cow::Owned(BrowserAction::NavigationPush(
+            new_screen.clone(),
+        )));
 
         assert_eq!(state.current_screen(), &new_screen);
         assert_eq!(state.count(), 2);
 
-        state.update_with(BrowserAction::NavigationPop);
+        state.update_with(Cow::Owned(BrowserAction::NavigationPop));
         assert_eq!(state.current_screen(), &ScreenName::Home);
         assert_eq!(state.count(), 1);
 
-        let events = state.update_with(BrowserAction::NavigationPop);
+        let events = state.update_with(Cow::Owned(BrowserAction::NavigationPop));
         assert_eq!(state.current_screen(), &ScreenName::Home);
         assert_eq!(state.count(), 1);
         assert_eq!(events, vec![]);
@@ -404,12 +390,16 @@ pub mod tests {
     fn test_navigation_push_same_screen() {
         let mut state = BrowserState::new();
         let new_screen = ScreenName::Artist("some_id".to_string());
-        state.update_with(BrowserAction::NavigationPush(new_screen.clone()));
+        state.update_with(Cow::Owned(BrowserAction::NavigationPush(
+            new_screen.clone(),
+        )));
 
         assert_eq!(state.current_screen(), &new_screen);
         assert_eq!(state.count(), 2);
 
-        let events = state.update_with(BrowserAction::NavigationPush(new_screen.clone()));
+        let events = state.update_with(Cow::Owned(BrowserAction::NavigationPush(
+            new_screen.clone(),
+        )));
         assert_eq!(state.current_screen(), &new_screen);
         assert_eq!(state.count(), 2);
         assert_eq!(events, vec![]);
@@ -419,13 +409,19 @@ pub mod tests {
     fn test_navigation_push_same_screen_will_pop() {
         let mut state = BrowserState::new();
         let new_screen = ScreenName::Artist("some_id".to_string());
-        state.update_with(BrowserAction::NavigationPush(new_screen.clone()));
-        state.update_with(BrowserAction::NavigationPush(ScreenName::Search));
+        state.update_with(Cow::Owned(BrowserAction::NavigationPush(
+            new_screen.clone(),
+        )));
+        state.update_with(Cow::Owned(BrowserAction::NavigationPush(
+            ScreenName::Search,
+        )));
 
         assert_eq!(state.current_screen(), &ScreenName::Search);
         assert_eq!(state.count(), 3);
 
-        let events = state.update_with(BrowserAction::NavigationPush(new_screen.clone()));
+        let events = state.update_with(Cow::Owned(BrowserAction::NavigationPush(
+            new_screen.clone(),
+        )));
         assert_eq!(state.current_screen(), &new_screen);
         assert_eq!(state.count(), 2);
         assert_eq!(events, vec![BrowserEvent::NavigationPoppedTo(new_screen)]);
diff --git a/src/app/state/login_state.rs b/src/app/state/login_state.rs
index b2519288..ca609128 100644
--- a/src/app/state/login_state.rs
+++ b/src/app/state/login_state.rs
@@ -1,4 +1,5 @@
 use gettextrs::*;
+use std::borrow::Cow;
 use std::time::SystemTime;
 
 use crate::app::credentials::Credentials;
@@ -79,8 +80,8 @@ impl UpdatableState for LoginState {
     type Action = LoginAction;
     type Event = AppEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.into_owned() {
             LoginAction::TryLogin(TryLoginAction::Password { username, password }) => {
                 vec![
                     LoginEvent::LoginStarted(LoginStartedEvent::Password { username, password })
diff --git a/src/app/state/mod.rs b/src/app/state/mod.rs
index 8dfb4e90..3b9c85e2 100644
--- a/src/app/state/mod.rs
+++ b/src/app/state/mod.rs
@@ -7,6 +7,8 @@ mod playback_state;
 mod screen_states;
 mod selection_state;
 
+use std::borrow::Cow;
+
 pub use app_model::AppModel;
 pub use app_state::*;
 pub use browser_state::*;
@@ -17,8 +19,8 @@ pub use screen_states::*;
 pub use selection_state::*;
 
 pub trait UpdatableState {
-    type Action;
+    type Action: Clone;
     type Event;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event>;
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event>;
 }
diff --git a/src/app/state/playback_state.rs b/src/app/state/playback_state.rs
index 75480b0d..b17974e4 100644
--- a/src/app/state/playback_state.rs
+++ b/src/app/state/playback_state.rs
@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use crate::app::models::{SongBatch, SongDescription, SongListModel, SongListModelPending};
 use crate::app::state::{AppAction, AppEvent, UpdatableState};
 use crate::app::{BatchQuery, LazyRandomIndex, SongsSource};
@@ -278,8 +280,8 @@ impl UpdatableState for PlaybackState {
     type Action = PlaybackAction;
     type Event = PlaybackEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.into_owned() {
             PlaybackAction::TogglePlay => {
                 if let Some(playing) = self.toggle_play() {
                     if playing {
diff --git a/src/app/state/screen_states.rs b/src/app/state/screen_states.rs
index a0b77017..7adf66a8 100644
--- a/src/app/state/screen_states.rs
+++ b/src/app/state/screen_states.rs
@@ -58,20 +58,20 @@ impl UpdatableState for DetailsState {
     type Action = BrowserAction;
     type Event = BrowserEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.as_ref() {
             BrowserAction::SetAlbumDetails(album) if album.description.id == self.id => {
                 let AlbumDescription { id, songs, .. } = album.description.clone();
                 self.songs.add(songs).commit();
-                self.content = Some(*album);
+                self.content = Some(*album.clone());
                 vec![BrowserEvent::AlbumDetailsLoaded(id)]
             }
-            BrowserAction::AppendAlbumTracks(id, batch) if id == self.id => {
-                self.songs.add(*batch).commit();
-                vec![BrowserEvent::AlbumTracksAppended(id)]
+            BrowserAction::AppendAlbumTracks(id, batch) if id == &self.id => {
+                self.songs.add(*batch.clone()).commit();
+                vec![BrowserEvent::AlbumTracksAppended(id.clone())]
             }
             BrowserAction::SaveAlbum(album) if album.id == self.id => {
-                let id = album.id;
+                let id = album.id.clone();
                 if let Some(mut album) = self.content.as_mut() {
                     album.description.is_liked = true;
                     vec![BrowserEvent::AlbumSaved(id)]
@@ -79,10 +79,10 @@ impl UpdatableState for DetailsState {
                     vec![]
                 }
             }
-            BrowserAction::UnsaveAlbum(id) if id == self.id => {
+            BrowserAction::UnsaveAlbum(id) if id == &self.id => {
                 if let Some(mut album) = self.content.as_mut() {
                     album.description.is_liked = false;
-                    vec![BrowserEvent::AlbumUnsaved(id)]
+                    vec![BrowserEvent::AlbumUnsaved(id.clone())]
                 } else {
                     vec![]
                 }
@@ -114,19 +114,19 @@ impl UpdatableState for PlaylistDetailsState {
     type Action = BrowserAction;
     type Event = BrowserEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
-            BrowserAction::SetPlaylistDetails(playlist) => {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.as_ref() {
+            BrowserAction::SetPlaylistDetails(playlist) if playlist.id == self.id => {
                 let PlaylistDescription { id, songs, .. } = *playlist.clone();
                 self.songs.add(songs).commit();
-                self.playlist = Some(*playlist);
+                self.playlist = Some(*playlist.clone());
                 vec![BrowserEvent::PlaylistDetailsLoaded(id)]
             }
-            BrowserAction::AppendPlaylistTracks(id, song_batch) if id == self.id => {
-                self.songs.add(*song_batch).commit();
-                vec![BrowserEvent::PlaylistTracksAppended(id)]
+            BrowserAction::AppendPlaylistTracks(id, song_batch) if id == &self.id => {
+                self.songs.add(*song_batch.clone()).commit();
+                vec![BrowserEvent::PlaylistTracksAppended(id.clone())]
             }
-            BrowserAction::RemoveTracksFromPlaylist(uris) => {
+            BrowserAction::RemoveTracksFromPlaylist(id, uris) if id == &self.id => {
                 self.songs.remove(&uris[..]).commit();
                 vec![BrowserEvent::PlaylistTracksRemoved(self.id.clone())]
             }
@@ -161,15 +161,15 @@ impl UpdatableState for ArtistState {
     type Action = BrowserAction;
     type Event = BrowserEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
-            BrowserAction::SetArtistDetails(details) => {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.as_ref() {
+            BrowserAction::SetArtistDetails(details) if details.id == self.id => {
                 let ArtistDescription {
                     id,
                     name,
                     albums,
                     mut top_tracks,
-                } = *details;
+                } = *details.clone();
                 self.artist = Some(name);
                 self.albums
                     .replace_all(albums.into_iter().map(|a| a.into()));
@@ -180,9 +180,9 @@ impl UpdatableState for ArtistState {
 
                 vec![BrowserEvent::ArtistDetailsUpdated(id)]
             }
-            BrowserAction::AppendArtistReleases(albums) => {
+            BrowserAction::AppendArtistReleases(id, albums) if id == &self.id => {
                 self.next_page.set_loaded_count(albums.len());
-                self.albums.extend(albums.into_iter().map(|a| a.into()));
+                self.albums.extend(albums.iter().map(|a| a.into()));
                 vec![BrowserEvent::ArtistDetailsUpdated(self.id.clone())]
             }
             _ => vec![],
@@ -216,12 +216,11 @@ impl UpdatableState for HomeState {
     type Action = BrowserAction;
     type Event = BrowserEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.as_ref() {
             BrowserAction::SetLibraryContent(content) => {
-                if !self.albums.eq(&content, |a, b| a.uri() == b.id) {
-                    self.albums
-                        .replace_all(content.into_iter().map(|a| a.into()));
+                if !self.albums.eq(content, |a, b| a.uri() == b.id) {
+                    self.albums.replace_all(content.iter().map(|a| a.into()));
                     self.next_albums_page.reset_count(self.albums.len());
                     vec![BrowserEvent::LibraryUpdated]
                 } else {
@@ -230,7 +229,7 @@ impl UpdatableState for HomeState {
             }
             BrowserAction::AppendLibraryContent(content) => {
                 self.next_albums_page.set_loaded_count(content.len());
-                self.albums.extend(content.into_iter().map(|a| a.into()));
+                self.albums.extend(content.iter().map(|a| a.into()));
                 vec![BrowserEvent::LibraryUpdated]
             }
             BrowserAction::SaveAlbum(album) => {
@@ -239,13 +238,13 @@ impl UpdatableState for HomeState {
                 if already_present {
                     vec![]
                 } else {
-                    self.albums.insert(0, (*album).into());
+                    self.albums.insert(0, (*album.clone()).into());
                     self.next_albums_page.increment();
                     vec![BrowserEvent::LibraryUpdated]
                 }
             }
             BrowserAction::UnsaveAlbum(id) => {
-                let position = self.albums.iter().position(|a| a.uri() == id);
+                let position = self.albums.iter().position(|a| a.uri() == *id);
                 if let Some(position) = position {
                     self.albums.remove(position as u32);
                     self.next_albums_page.decrement();
@@ -255,9 +254,8 @@ impl UpdatableState for HomeState {
                 }
             }
             BrowserAction::SetPlaylistsContent(content) => {
-                if !self.playlists.eq(&content, |a, b| a.uri() == b.id) {
-                    self.playlists
-                        .replace_all(content.into_iter().map(|a| a.into()));
+                if !self.playlists.eq(content, |a, b| a.uri() == b.id) {
+                    self.playlists.replace_all(content.iter().map(|a| a.into()));
                     self.next_playlists_page.reset_count(self.playlists.len());
                     vec![BrowserEvent::SavedPlaylistsUpdated]
                 } else {
@@ -266,21 +264,22 @@ impl UpdatableState for HomeState {
             }
             BrowserAction::AppendPlaylistsContent(content) => {
                 self.next_playlists_page.set_loaded_count(content.len());
-                self.playlists.extend(content.into_iter().map(|p| p.into()));
+                self.playlists.extend(content.iter().map(|p| p.into()));
                 vec![BrowserEvent::SavedPlaylistsUpdated]
             }
             BrowserAction::AppendSavedTracks(song_batch) => {
-                if self.saved_tracks.add(*song_batch).commit() {
+                if self.saved_tracks.add(*song_batch.clone()).commit() {
                     vec![BrowserEvent::SavedTracksUpdated]
                 } else {
                     vec![]
                 }
             }
             BrowserAction::SetSavedTracks(song_batch) => {
+                let song_batch = *song_batch.clone();
                 if self
                     .saved_tracks
                     .clear()
-                    .and(|s| s.add(*song_batch))
+                    .and(|s| s.add(song_batch))
                     .commit()
                 {
                     vec![BrowserEvent::SavedTracksUpdated]
@@ -289,7 +288,7 @@ impl UpdatableState for HomeState {
                 }
             }
             BrowserAction::SaveTracks(tracks) => {
-                self.saved_tracks.prepend(tracks).commit();
+                self.saved_tracks.prepend(tracks.clone()).commit();
                 vec![BrowserEvent::SavedTracksUpdated]
             }
             BrowserAction::RemoveSavedTracks(tracks) => {
@@ -323,15 +322,15 @@ impl UpdatableState for SearchState {
     type Action = BrowserAction;
     type Event = BrowserEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
-            BrowserAction::Search(query) if query != self.query => {
-                self.query = query;
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.as_ref() {
+            BrowserAction::Search(query) if query != &self.query => {
+                self.query = query.clone();
                 vec![BrowserEvent::SearchUpdated]
             }
             BrowserAction::SetSearchResults(results) => {
-                self.album_results = results.albums;
-                self.artist_results = results.artists;
+                self.album_results = results.albums.clone();
+                self.artist_results = results.artists.clone();
                 vec![BrowserEvent::SearchResultsUpdated]
             }
             _ => vec![],
@@ -363,25 +362,24 @@ impl UpdatableState for UserState {
     type Action = BrowserAction;
     type Event = BrowserEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
-            BrowserAction::SetUserDetails(user) => {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.as_ref() {
+            BrowserAction::SetUserDetails(user) if user.id == self.id => {
                 let UserDescription {
                     id,
                     name,
                     playlists,
-                } = *user;
+                } = *user.clone();
                 self.user = Some(name);
                 self.playlists
-                    .replace_all(playlists.into_iter().map(|p| p.into()));
+                    .replace_all(playlists.iter().map(|p| p.into()));
                 self.next_page.reset_count(self.playlists.len());
 
                 vec![BrowserEvent::UserDetailsUpdated(id)]
             }
-            BrowserAction::AppendUserPlaylists(playlists) => {
+            BrowserAction::AppendUserPlaylists(id, playlists) if id == &self.id => {
                 self.next_page.set_loaded_count(playlists.len());
-                self.playlists
-                    .extend(playlists.into_iter().map(|p| p.into()));
+                self.playlists.extend(playlists.iter().map(|p| p.into()));
                 vec![BrowserEvent::UserDetailsUpdated(self.id.clone())]
             }
             _ => vec![],
@@ -397,14 +395,14 @@ mod tests {
     #[test]
     fn test_next_page_no_next() {
         let mut artist_state = ArtistState::new("id".to_owned());
-        artist_state.update_with(BrowserAction::SetArtistDetails(Box::new(
+        artist_state.update_with(Cow::Owned(BrowserAction::SetArtistDetails(Box::new(
             ArtistDescription {
-                id: "".to_owned(),
+                id: "id".to_owned(),
                 name: "Foo".to_owned(),
                 albums: vec![],
                 top_tracks: vec![],
             },
-        )));
+        ))));
 
         let next = artist_state.next_page;
         assert_eq!(None, next.next_offset);
@@ -421,20 +419,24 @@ mod tests {
             songs: SongBatch::empty(),
             is_liked: false,
         };
-        let mut artist_state = ArtistState::new("id".to_owned());
-        artist_state.update_with(BrowserAction::SetArtistDetails(Box::new(
+        let id = "id".to_string();
+        let mut artist_state = ArtistState::new(id.clone());
+        artist_state.update_with(Cow::Owned(BrowserAction::SetArtistDetails(Box::new(
             ArtistDescription {
-                id: "".to_owned(),
+                id: id.clone(),
                 name: "Foo".to_owned(),
                 albums: (0..20).map(|_| fake_album.clone()).collect(),
                 top_tracks: vec![],
             },
-        )));
+        ))));
 
         let next = &artist_state.next_page;
         assert_eq!(Some(20), next.next_offset);
 
-        artist_state.update_with(BrowserAction::AppendArtistReleases(vec![]));
+        artist_state.update_with(Cow::Owned(BrowserAction::AppendArtistReleases(
+            id.clone(),
+            vec![],
+        )));
 
         let next = &artist_state.next_page;
         assert_eq!(None, next.next_offset);
diff --git a/src/app/state/selection_state.rs b/src/app/state/selection_state.rs
index 12e89d7b..67719d10 100644
--- a/src/app/state/selection_state.rs
+++ b/src/app/state/selection_state.rs
@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::collections::HashSet;
 
 use crate::app::models::SongDescription;
@@ -117,8 +118,8 @@ impl UpdatableState for SelectionState {
     type Action = SelectionAction;
     type Event = SelectionEvent;
 
-    fn update_with(&mut self, action: Self::Action) -> Vec<Self::Event> {
-        match action {
+    fn update_with(&mut self, action: Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.into_owned() {
             SelectionAction::Select(tracks) => {
                 let changed = tracks
                     .into_iter()
diff --git a/src/main.rs b/src/main.rs
index b74a0087..edd3a3ee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,6 +8,7 @@ extern crate log;
 use futures::channel::mpsc::UnboundedSender;
 use gettextrs::*;
 use gio::prelude::*;
+use gio::ApplicationFlags;
 use gio::SimpleAction;
 use gtk::prelude::*;
 use libadwaita::ColorScheme;
@@ -33,7 +34,7 @@ fn main() {
 
     let settings = settings::SpotSettings::new_from_gsettings().unwrap_or_default();
     startup(&settings);
-    let gtk_app = gtk::Application::new(Some(config::APPID), Default::default());
+    let gtk_app = gtk::Application::new(Some(config::APPID), ApplicationFlags::HANDLES_OPEN);
     expose_widgets();
     let builder = gtk::Builder::from_resource("/dev/alextren/Spot/window.ui");
     let window: libadwaita::ApplicationWindow = builder.object("window").unwrap();
@@ -57,16 +58,29 @@ fn main() {
     );
     context.spawn_local(app.attach(dispatch_loop));
 
+    let sender_clone = sender.clone();
     gtk_app.connect_activate(move |gtk_app| {
+        debug!("activate");
         if let Some(existing_window) = gtk_app.active_window() {
             existing_window.present();
         } else {
             window.set_application(Some(gtk_app));
             gtk_app.add_window(&window);
-            sender.unbounded_send(AppAction::Start).unwrap();
+            sender_clone.unbounded_send(AppAction::Start).unwrap();
         }
     });
 
+    gtk_app.connect_open(move |gtk_app, targets, _| {
+        gtk_app.activate();
+
+        // There should only be one target because %u is used in desktop file
+        let target = &targets[0];
+        let uri = target.uri().to_string();
+        let action = AppAction::OpenURI(uri)
+            .unwrap_or_else(|| AppAction::ShowNotification(gettext("Failed to open link!")));
+        sender.unbounded_send(action).unwrap();
+    });
+
     context.invoke_local(move || {
         gtk_app.run();
     });

From b5f90290184bab44ef59cc9e06e115546d14c984 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Mon, 7 Feb 2022 18:18:19 -0500
Subject: [PATCH 14/33] update dependencies

---
 Cargo.lock         |  427 ++++++++-----------
 Cargo.toml         |   10 +-
 cargo-sources.json | 1011 ++++++++++++++++++--------------------------
 3 files changed, 600 insertions(+), 848 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ee8da10a..5cd84ac6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,6 +66,18 @@ dependencies = [
  "nix 0.20.0",
 ]
 
+[[package]]
+name = "alsa"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b"
+dependencies = [
+ "alsa-sys",
+ "bitflags",
+ "libc",
+ "nix 0.23.1",
+]
+
 [[package]]
 name = "alsa-sys"
 version = "0.3.1"
@@ -78,9 +90,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.52"
+version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
+checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
 
 [[package]]
 name = "async-broadcast"
@@ -211,9 +223,9 @@ dependencies = [
 
 [[package]]
 name = "async-task"
-version = "4.0.3"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
+checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8"
 
 [[package]]
 name = "async-trait"
@@ -245,9 +257,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "base64"
@@ -405,9 +417,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571"
+checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
 dependencies = [
  "smallvec",
 ]
@@ -448,9 +460,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90"
+checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21"
 dependencies = [
  "glob",
  "libc",
@@ -494,20 +506,20 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa"
+checksum = "ca4679a59dbd8c15f064c012dfe8c1163b9453224238b59bb9328c142b8b248b"
 dependencies = [
  "bindgen",
 ]
 
 [[package]]
 name = "cpal"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418"
+checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116"
 dependencies = [
- "alsa",
+ "alsa 0.6.0",
  "core-foundation-sys",
  "coreaudio-rs",
  "jni",
@@ -515,9 +527,9 @@ dependencies = [
  "lazy_static",
  "libc",
  "mach",
- "ndk 0.3.0",
- "ndk-glue 0.3.0",
- "nix 0.20.0",
+ "ndk",
+ "ndk-glue",
+ "nix 0.23.1",
  "oboe",
  "parking_lot",
  "stdweb",
@@ -537,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
 dependencies = [
  "cfg-if 1.0.0",
  "lazy_static",
@@ -615,38 +627,14 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "darling"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
-dependencies = [
- "darling_core 0.10.2",
- "darling_macro 0.10.2",
-]
-
 [[package]]
 name = "darling"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4"
 dependencies = [
- "darling_core 0.13.1",
- "darling_macro 0.13.1",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.9.3",
- "syn",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -659,18 +647,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
-dependencies = [
- "darling_core 0.10.2",
- "quote",
+ "strsim",
  "syn",
 ]
 
@@ -680,7 +657,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
 dependencies = [
- "darling_core 0.13.1",
+ "darling_core",
  "quote",
  "syn",
 ]
@@ -789,15 +766,15 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
+checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
 
 [[package]]
 name = "fastrand"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
 dependencies = [
  "instant",
 ]
@@ -830,9 +807,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
+checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -845,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -855,15 +832,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
+checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -872,9 +849,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
 
 [[package]]
 name = "futures-lite"
@@ -893,9 +870,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -904,21 +881,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
 
 [[package]]
 name = "futures-task"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-util"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -934,9 +911,9 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.15.1"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "172dfe1d9dfb62936bf7ad3ede2913a1b21b1e3db56990e46e00789201de9070"
+checksum = "73aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49"
 dependencies = [
  "bitflags",
  "gdk-pixbuf-sys",
@@ -960,9 +937,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "319c74160dbe3e29cc1bf36ae4a08b9072f352b751e9e3e5501b3aa3ca633f66"
+checksum = "d9df40006277ff44538fe758400fc671146f6f2665978b6b57d2408db3c2becf"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1043,9 +1020,9 @@ dependencies = [
 
 [[package]]
 name = "gio"
-version = "0.15.3"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f80391bd2ac4981a3433137691211775bbb37c5347f8cfb7c0980187e0300c5"
+checksum = "59105fa464928adf56b159c8d980cc11fbfbe414befb904caac5163d383049bf"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -1060,9 +1037,9 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.15.1"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04b57719ccaacf2a0d9c79f151be629f3a3ef3991658ee2af0bb66287e4ea86c"
+checksum = "4f0bc4cfc9ebcdd05cc5057bc51b99c32f8f9bf246274f6a556ffd27279f8fe3"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -1073,9 +1050,9 @@ dependencies = [
 
 [[package]]
 name = "glib"
-version = "0.15.3"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a703581e2538fe699c5476cf26b456d694c5272b6e999d3ab47711c5eaa2dd2"
+checksum = "41dcfbdb6cc6c02aee163339465d8a40d6f3f64c3a43f729a4195f0e153338b7"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -1098,7 +1075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e58b262ff65ef771003873cea8c10e0fe854f1c508d48d62a4111a1ff163f7d1"
 dependencies = [
  "anyhow",
- "heck 0.4.0",
+ "heck",
  "proc-macro-crate 1.1.0",
  "proc-macro-error",
  "proc-macro2",
@@ -1108,9 +1085,9 @@ dependencies = [
 
 [[package]]
 name = "glib-sys"
-version = "0.15.1"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c668102c6e15e0a7f6b99b59f602c2e806967bb86414f617b77e19b1de5b3fac"
+checksum = "fa1d4e1a63d8574541e5b92931e4e669ddc87ffa85d58e84e631dba13ad2e10c"
 dependencies = [
  "libc",
  "system-deps",
@@ -1124,22 +1101,21 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e"
+checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e"
 dependencies = [
  "futures-channel",
  "futures-core",
  "js-sys",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "gobject-sys"
-version = "0.15.1"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6edb1f0b3e4c08e2a0a490d1082ba9e902cdff8ff07091e85c6caec60d17e2ab"
+checksum = "df6859463843c20cf3837e3a9069b6ab2051aeeadf4c899d33344f4aea83189a"
 dependencies = [
  "glib-sys",
  "libc",
@@ -1171,9 +1147,9 @@ dependencies = [
 
 [[package]]
 name = "gsk4"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0672c63e4101e19d5e9cb4a0aed8b3278e9573529bd0b6a86d9c748c71bd9882"
+checksum = "1bf63d454e2f75abd92ee6de0ac9fc5aaf1018cd9c458aaf9de296c5cbab6bb9"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1203,9 +1179,9 @@ dependencies = [
 
 [[package]]
 name = "gtk4"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f9e36fb6db3d70edf5cea9f4a20928c1d08ed3f27697cfd2d21ca3d8ac4a2d"
+checksum = "9e841556e3fe55d8a43ada76b7b08a5f65570bbdfe3b8f72c333053b8832c626"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1265,9 +1241,9 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "headers"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0"
+checksum = "c84c647447a07ca16f5fbd05b633e535cc41a08d2d74ab1e08648df53be9cb89"
 dependencies = [
  "base64",
  "bitflags",
@@ -1288,15 +1264,6 @@ dependencies = [
  "http",
 ]
 
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.0"
@@ -1566,9 +1533,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1639,9 +1606,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
 
 [[package]]
 name = "libloading"
@@ -1655,9 +1622,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
+checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
 
 [[package]]
 name = "libmdns"
@@ -1883,7 +1850,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "188b252b690ae7387f84a481ff4211df1a5c21eb9bddfc25cbde48793f2e0ef2"
 dependencies = [
- "alsa",
+ "alsa 0.5.0",
  "byteorder",
  "cpal",
  "futures-executor",
@@ -1943,9 +1910,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
  "scopeguard",
 ]
@@ -2052,18 +2019,6 @@ dependencies = [
  "socket2",
 ]
 
-[[package]]
-name = "ndk"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
-dependencies = [
- "jni-sys",
- "ndk-sys 0.2.2",
- "num_enum",
- "thiserror",
-]
-
 [[package]]
 name = "ndk"
 version = "0.6.0"
@@ -2072,25 +2027,11 @@ checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
 dependencies = [
  "bitflags",
  "jni-sys",
- "ndk-sys 0.3.0",
+ "ndk-sys",
  "num_enum",
  "thiserror",
 ]
 
-[[package]]
-name = "ndk-glue"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "ndk 0.3.0",
- "ndk-macro 0.2.0",
- "ndk-sys 0.2.2",
-]
-
 [[package]]
 name = "ndk-glue"
 version = "0.6.0"
@@ -2100,22 +2041,9 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "ndk 0.6.0",
- "ndk-macro 0.3.0",
- "ndk-sys 0.3.0",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
-dependencies = [
- "darling 0.10.2",
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "quote",
- "syn",
+ "ndk",
+ "ndk-macro",
+ "ndk-sys",
 ]
 
 [[package]]
@@ -2124,19 +2052,13 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
 dependencies = [
- "darling 0.13.1",
+ "darling",
  "proc-macro-crate 1.1.0",
  "proc-macro2",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "ndk-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
-
 [[package]]
 name = "ndk-sys"
 version = "0.3.0"
@@ -2370,8 +2292,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2463c8f2e19b4e0d0710a21f8e4011501ff28db1c95d7a5482a553b2100502d2"
 dependencies = [
  "jni",
- "ndk 0.6.0",
- "ndk-glue 0.6.0",
+ "ndk",
+ "ndk-glue",
  "num-derive",
  "num-traits",
  "oboe-sys",
@@ -2644,24 +2566,24 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "2.25.2"
+version = "2.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754"
+checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96"
 
 [[package]]
 name = "protobuf-codegen"
-version = "2.25.2"
+version = "2.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3df8c98c08bd4d6653c2dbae00bd68c1d1d82a360265a5b0bbc73d48c63cb853"
+checksum = "aec1632b7c8f2e620343439a7dfd1f3c47b18906c4be58982079911482b5d707"
 dependencies = [
  "protobuf",
 ]
 
 [[package]]
 name = "protobuf-codegen-pure"
-version = "2.25.2"
+version = "2.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "394a73e2a819405364df8d30042c0f1174737a763e0170497ec9d36f8a2ea8f7"
+checksum = "9f8122fdb18e55190c796b088a16bdb70cd7acdcd48f7a8b796b58c62e532cc6"
 dependencies = [
  "protobuf",
  "protobuf-codegen",
@@ -2669,9 +2591,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
  "proc-macro2",
 ]
@@ -2709,9 +2631,9 @@ dependencies = [
 
 [[package]]
 name = "rand_distr"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
 dependencies = [
  "num-traits",
  "rand",
@@ -2807,7 +2729,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.4",
+ "semver 1.0.5",
 ]
 
 [[package]]
@@ -2878,9 +2800,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
+checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7"
 
 [[package]]
 name = "semver-parser"
@@ -2893,18 +2815,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.133"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.133"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2913,9 +2835,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.74"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
+checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085"
 dependencies = [
  "itoa 1.0.1",
  "ryu",
@@ -2948,9 +2870,18 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "sha2"
@@ -2976,9 +2907,9 @@ dependencies = [
 
 [[package]]
 name = "shell-words"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
 [[package]]
 name = "shlex"
@@ -3020,9 +2951,9 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "socket2"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 dependencies = [
  "libc",
  "winapi",
@@ -3057,8 +2988,8 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "zbus 2.0.1",
- "zvariant 3.0.0",
+ "zbus 2.1.1",
+ "zvariant 3.1.2",
 ]
 
 [[package]]
@@ -3073,12 +3004,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
 
-[[package]]
-name = "strsim"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -3093,9 +3018,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3116,12 +3041,12 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.0.0"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4"
+checksum = "ad3a97fdef3daf935d929b3e97e5a6a680cd4622e40c2941ca0875d6566416f8"
 dependencies = [
  "cfg-expr",
- "heck 0.3.3",
+ "heck",
  "pkg-config",
  "toml",
  "version-compare",
@@ -3203,9 +3128,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.15.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
+checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
 dependencies = [
  "bytes",
  "libc",
@@ -3272,9 +3197,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.29"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
+checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -3285,9 +3210,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
+checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3296,9 +3221,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
+checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23"
 dependencies = [
  "lazy_static",
 ]
@@ -3346,12 +3271,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
 [[package]]
 name = "unicode-width"
 version = "0.1.9"
@@ -3465,9 +3384,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -3475,9 +3394,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -3490,9 +3409,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
+checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -3502,9 +3421,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3512,9 +3431,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3525,15 +3444,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
 [[package]]
 name = "web-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3604,9 +3523,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ac8424f5aa1f239d2d7ecb32f9d5ffc6fcf5fb9298d2d524a7e7c8b258c3f80"
+checksum = "7bb86f3d4592e26a48b2719742aec94f8ae6238ebde20d98183ee185d1275e9a"
 dependencies = [
  "async-broadcast",
  "async-channel",
@@ -3624,6 +3543,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "hex",
+ "lazy_static",
  "nix 0.23.1",
  "once_cell",
  "ordered-stream",
@@ -3632,9 +3552,10 @@ dependencies = [
  "serde_repr",
  "sha1",
  "static_assertions",
- "zbus_macros 2.0.1",
+ "winapi",
+ "zbus_macros 2.1.1",
  "zbus_names",
- "zvariant 3.0.0",
+ "zvariant 3.1.2",
 ]
 
 [[package]]
@@ -3651,9 +3572,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e03af45fc15e2c977161c5ffea56c43c41f425a963affd7074bf91b5bf5a8cf"
+checksum = "36823cc10fddc3c6b19f048903262dacaf8274170e9a255784bdd8b4570a8040"
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2",
@@ -3670,7 +3591,7 @@ checksum = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1"
 dependencies = [
  "serde",
  "static_assertions",
- "zvariant 3.0.0",
+ "zvariant 3.1.2",
 ]
 
 [[package]]
@@ -3710,16 +3631,16 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "3.0.0"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a946c049b2eac1a253f98e9267a8ce7a3d93be274ea146e6dd7a0965232a911"
+checksum = "49ea5dc38b2058fae6a5b79009388143dadce1e91c26a67f984a0fc0381c8033"
 dependencies = [
  "byteorder",
  "enumflags2 0.7.3",
  "libc",
  "serde",
  "static_assertions",
- "zvariant_derive 3.0.0",
+ "zvariant_derive 3.1.2",
 ]
 
 [[package]]
@@ -3736,9 +3657,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "3.0.0"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990"
+checksum = "8c2cecc5a61c2a053f7f653a24cd15b3b0195d7f7ddb5042c837fb32e161fb7a"
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 356a565d..27b1a324 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ version = "^0.4.0"
 package = "gdk4"
 
 [dependencies.gio]
-version = "^0.15.2"
+version = "^0.15.5"
 features = ["v2_60"]
 
 [dependencies.glib]
@@ -37,11 +37,11 @@ package = "futures"
 version = "0.3.18"
 
 [dependencies.serde]
-version = "^1.0.130"
+version = "^1.0.136"
 features = ["derive"]
 
 [dependencies.serde_json]
-version = "^1.0.72"
+version = "^1.0.78"
 
 [dependencies.isahc]
 version = "^1.2.0"
@@ -57,14 +57,14 @@ features = ["gettext-system"]
 
 [dependencies]
 secret-service = "^2.0.1"
-gdk-pixbuf = "^0.15.1"
+gdk-pixbuf = "^0.15.4"
 libadwaita = "^0.1.0-beta-1"
 ref_filter_map = "^1.0.1"
 regex = "^1.4.6"
 async-std = "^1.10.0"
 form_urlencoded = "^1.0.1"
 zbus = "^2.0.1"
-zvariant = "^3.0.0"
+zvariant = "^3.1.2"
 thiserror = "^1.0.30"
 lazy_static = "^1.4.0"
 log = "0.4.14"
diff --git a/cargo-sources.json b/cargo-sources.json
index 5a4bcb03..20acd31e 100644
--- a/cargo-sources.json
+++ b/cargo-sources.json
@@ -77,6 +77,19 @@
         "dest": "cargo/vendor/alsa-0.5.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/alsa/alsa-0.6.0.crate",
+        "sha256": "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b",
+        "dest": "cargo/vendor",
+        "dest-filename": "alsa-0.6.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%225915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/alsa-0.6.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/alsa-sys/alsa-sys-0.3.1.crate",
@@ -92,15 +105,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/anyhow/anyhow-1.0.52.crate",
-        "sha256": "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3",
+        "url": "https://static.crates.io/crates/anyhow/anyhow-1.0.53.crate",
+        "sha256": "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0",
         "dest": "cargo/vendor",
-        "dest-filename": "anyhow-1.0.52.crate"
+        "dest-filename": "anyhow-1.0.53.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2284450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/anyhow-1.0.52",
+        "url": "data:%7B%22package%22%3A%20%2294a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/anyhow-1.0.53",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -222,15 +235,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/async-task/async-task-4.0.3.crate",
-        "sha256": "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0",
+        "url": "https://static.crates.io/crates/async-task/async-task-4.1.0.crate",
+        "sha256": "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8",
         "dest": "cargo/vendor",
-        "dest-filename": "async-task-4.0.3.crate"
+        "dest-filename": "async-task-4.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/async-task-4.0.3",
+        "url": "data:%7B%22package%22%3A%20%22677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/async-task-4.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -274,15 +287,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/autocfg/autocfg-1.0.1.crate",
-        "sha256": "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a",
+        "url": "https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate",
+        "sha256": "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa",
         "dest": "cargo/vendor",
-        "dest-filename": "autocfg-1.0.1.crate"
+        "dest-filename": "autocfg-1.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/autocfg-1.0.1",
+        "url": "data:%7B%22package%22%3A%20%22d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/autocfg-1.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -443,28 +456,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cairo-rs/cairo-rs-0.14.9.crate",
-        "sha256": "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482",
+        "url": "https://static.crates.io/crates/cairo-rs/cairo-rs-0.15.1.crate",
+        "sha256": "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a",
         "dest": "cargo/vendor",
-        "dest-filename": "cairo-rs-0.14.9.crate"
+        "dest-filename": "cairo-rs-0.15.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2233b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cairo-rs-0.14.9",
+        "url": "data:%7B%22package%22%3A%20%22b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cairo-rs-0.15.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cairo-sys-rs/cairo-sys-rs-0.14.9.crate",
-        "sha256": "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570",
+        "url": "https://static.crates.io/crates/cairo-sys-rs/cairo-sys-rs-0.15.1.crate",
+        "sha256": "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8",
         "dest": "cargo/vendor",
-        "dest-filename": "cairo-sys-rs-0.14.9.crate"
+        "dest-filename": "cairo-sys-rs-0.15.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cairo-sys-rs-0.14.9",
+        "url": "data:%7B%22package%22%3A%20%223c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cairo-sys-rs-0.15.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -521,28 +534,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cfg-expr/cfg-expr-0.8.1.crate",
-        "sha256": "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e",
+        "url": "https://static.crates.io/crates/cfg-expr/cfg-expr-0.9.1.crate",
+        "sha256": "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7",
         "dest": "cargo/vendor",
-        "dest-filename": "cfg-expr-0.8.1.crate"
+        "dest-filename": "cfg-expr-0.9.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cfg-expr-0.8.1",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/cfg-expr/cfg-expr-0.9.0.crate",
-        "sha256": "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571",
-        "dest": "cargo/vendor",
-        "dest-filename": "cfg-expr-0.9.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cfg-expr-0.9.0",
+        "url": "data:%7B%22package%22%3A%20%223431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cfg-expr-0.9.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -599,15 +599,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/clang-sys/clang-sys-1.3.0.crate",
-        "sha256": "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90",
+        "url": "https://static.crates.io/crates/clang-sys/clang-sys-1.3.1.crate",
+        "sha256": "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21",
         "dest": "cargo/vendor",
-        "dest-filename": "clang-sys-1.3.0.crate"
+        "dest-filename": "clang-sys-1.3.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/clang-sys-1.3.0",
+        "url": "data:%7B%22package%22%3A%20%224cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/clang-sys-1.3.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -664,28 +664,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/coreaudio-sys/coreaudio-sys-0.2.8.crate",
-        "sha256": "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa",
+        "url": "https://static.crates.io/crates/coreaudio-sys/coreaudio-sys-0.2.9.crate",
+        "sha256": "ca4679a59dbd8c15f064c012dfe8c1163b9453224238b59bb9328c142b8b248b",
         "dest": "cargo/vendor",
-        "dest-filename": "coreaudio-sys-0.2.8.crate"
+        "dest-filename": "coreaudio-sys-0.2.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/coreaudio-sys-0.2.8",
+        "url": "data:%7B%22package%22%3A%20%22ca4679a59dbd8c15f064c012dfe8c1163b9453224238b59bb9328c142b8b248b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/coreaudio-sys-0.2.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/cpal/cpal-0.13.4.crate",
-        "sha256": "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418",
+        "url": "https://static.crates.io/crates/cpal/cpal-0.13.5.crate",
+        "sha256": "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116",
         "dest": "cargo/vendor",
-        "dest-filename": "cpal-0.13.4.crate"
+        "dest-filename": "cpal-0.13.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2298f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/cpal-0.13.4",
+        "url": "data:%7B%22package%22%3A%20%2274117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/cpal-0.13.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -703,15 +703,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.6.crate",
-        "sha256": "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120",
+        "url": "https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.7.crate",
+        "sha256": "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6",
         "dest": "cargo/vendor",
-        "dest-filename": "crossbeam-utils-0.8.6.crate"
+        "dest-filename": "crossbeam-utils-0.8.7.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/crossbeam-utils-0.8.6",
+        "url": "data:%7B%22package%22%3A%20%22b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/crossbeam-utils-0.8.7",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -792,19 +792,6 @@
         "dest": "cargo/vendor/curl-sys-0.4.52+curl-7.81.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/darling/darling-0.10.2.crate",
-        "sha256": "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858",
-        "dest": "cargo/vendor",
-        "dest-filename": "darling-0.10.2.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%220d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/darling-0.10.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/darling/darling-0.13.1.crate",
@@ -818,19 +805,6 @@
         "dest": "cargo/vendor/darling-0.13.1",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/darling_core/darling_core-0.10.2.crate",
-        "sha256": "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b",
-        "dest": "cargo/vendor",
-        "dest-filename": "darling_core-0.10.2.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/darling_core-0.10.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/darling_core/darling_core-0.13.1.crate",
@@ -844,19 +818,6 @@
         "dest": "cargo/vendor/darling_core-0.13.1",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/darling_macro/darling_macro-0.10.2.crate",
-        "sha256": "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72",
-        "dest": "cargo/vendor",
-        "dest-filename": "darling_macro-0.10.2.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/darling_macro-0.10.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/darling_macro/darling_macro-0.13.1.crate",
@@ -909,19 +870,6 @@
         "dest": "cargo/vendor/easy-parallel-3.2.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/either/either-1.6.1.crate",
-        "sha256": "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457",
-        "dest": "cargo/vendor",
-        "dest-filename": "either-1.6.1.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/either-1.6.1",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.30.crate",
@@ -1015,28 +963,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/event-listener/event-listener-2.5.1.crate",
-        "sha256": "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59",
+        "url": "https://static.crates.io/crates/event-listener/event-listener-2.5.2.crate",
+        "sha256": "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71",
         "dest": "cargo/vendor",
-        "dest-filename": "event-listener-2.5.1.crate"
+        "dest-filename": "event-listener-2.5.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/event-listener-2.5.1",
+        "url": "data:%7B%22package%22%3A%20%2277f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/event-listener-2.5.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/fastrand/fastrand-1.6.0.crate",
-        "sha256": "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2",
+        "url": "https://static.crates.io/crates/fastrand/fastrand-1.7.0.crate",
+        "sha256": "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf",
         "dest": "cargo/vendor",
-        "dest-filename": "fastrand-1.6.0.crate"
+        "dest-filename": "fastrand-1.7.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/fastrand-1.6.0",
+        "url": "data:%7B%22package%22%3A%20%22c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/fastrand-1.7.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1080,67 +1028,67 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures/futures-0.3.19.crate",
-        "sha256": "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4",
+        "url": "https://static.crates.io/crates/futures/futures-0.3.21.crate",
+        "sha256": "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-0.3.19.crate"
+        "dest-filename": "futures-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2228560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%22f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-channel/futures-channel-0.3.19.crate",
-        "sha256": "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b",
+        "url": "https://static.crates.io/crates/futures-channel/futures-channel-0.3.21.crate",
+        "sha256": "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-channel-0.3.19.crate"
+        "dest-filename": "futures-channel-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-channel-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%22c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-channel-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-core/futures-core-0.3.19.crate",
-        "sha256": "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7",
+        "url": "https://static.crates.io/crates/futures-core/futures-core-0.3.21.crate",
+        "sha256": "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-core-0.3.19.crate"
+        "dest-filename": "futures-core-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-core-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%220c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-core-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-executor/futures-executor-0.3.19.crate",
-        "sha256": "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a",
+        "url": "https://static.crates.io/crates/futures-executor/futures-executor-0.3.21.crate",
+        "sha256": "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-executor-0.3.19.crate"
+        "dest-filename": "futures-executor-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2229d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-executor-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%229420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-executor-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-io/futures-io-0.3.19.crate",
-        "sha256": "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2",
+        "url": "https://static.crates.io/crates/futures-io/futures-io-0.3.21.crate",
+        "sha256": "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-io-0.3.19.crate"
+        "dest-filename": "futures-io-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-io-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%22fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-io-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1158,106 +1106,106 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-macro/futures-macro-0.3.19.crate",
-        "sha256": "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c",
+        "url": "https://static.crates.io/crates/futures-macro/futures-macro-0.3.21.crate",
+        "sha256": "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-macro-0.3.19.crate"
+        "dest-filename": "futures-macro-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-macro-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%2233c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-macro-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-sink/futures-sink-0.3.19.crate",
-        "sha256": "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508",
+        "url": "https://static.crates.io/crates/futures-sink/futures-sink-0.3.21.crate",
+        "sha256": "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-sink-0.3.19.crate"
+        "dest-filename": "futures-sink-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-sink-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%2221163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-sink-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-task/futures-task-0.3.19.crate",
-        "sha256": "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72",
+        "url": "https://static.crates.io/crates/futures-task/futures-task-0.3.21.crate",
+        "sha256": "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-task-0.3.19.crate"
+        "dest-filename": "futures-task-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-task-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%2257c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-task-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/futures-util/futures-util-0.3.19.crate",
-        "sha256": "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164",
+        "url": "https://static.crates.io/crates/futures-util/futures-util-0.3.21.crate",
+        "sha256": "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a",
         "dest": "cargo/vendor",
-        "dest-filename": "futures-util-0.3.19.crate"
+        "dest-filename": "futures-util-0.3.21.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/futures-util-0.3.19",
+        "url": "data:%7B%22package%22%3A%20%22d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/futures-util-0.3.21",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gdk-pixbuf/gdk-pixbuf-0.14.0.crate",
-        "sha256": "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f",
+        "url": "https://static.crates.io/crates/gdk-pixbuf/gdk-pixbuf-0.15.4.crate",
+        "sha256": "73aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49",
         "dest": "cargo/vendor",
-        "dest-filename": "gdk-pixbuf-0.14.0.crate"
+        "dest-filename": "gdk-pixbuf-0.15.4.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gdk-pixbuf-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%2273aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gdk-pixbuf-0.15.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gdk-pixbuf-sys/gdk-pixbuf-sys-0.14.0.crate",
-        "sha256": "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590",
+        "url": "https://static.crates.io/crates/gdk-pixbuf-sys/gdk-pixbuf-sys-0.15.1.crate",
+        "sha256": "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171",
         "dest": "cargo/vendor",
-        "dest-filename": "gdk-pixbuf-sys-0.14.0.crate"
+        "dest-filename": "gdk-pixbuf-sys-0.15.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gdk-pixbuf-sys-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%22413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gdk-pixbuf-sys-0.15.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gdk4/gdk4-0.3.1.crate",
-        "sha256": "f97a162c17214d1bf981af3f683156a0b1667dd1927057c4f0a68513251ecf0f",
+        "url": "https://static.crates.io/crates/gdk4/gdk4-0.4.6.crate",
+        "sha256": "d9df40006277ff44538fe758400fc671146f6f2665978b6b57d2408db3c2becf",
         "dest": "cargo/vendor",
-        "dest-filename": "gdk4-0.3.1.crate"
+        "dest-filename": "gdk4-0.4.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f97a162c17214d1bf981af3f683156a0b1667dd1927057c4f0a68513251ecf0f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gdk4-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%22d9df40006277ff44538fe758400fc671146f6f2665978b6b57d2408db3c2becf%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gdk4-0.4.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gdk4-sys/gdk4-sys-0.3.1.crate",
-        "sha256": "9498f4e06969fb96a4e4234dfe1d308a3ac6b120b3c6d93e3ec5c77fe88bc6d5",
+        "url": "https://static.crates.io/crates/gdk4-sys/gdk4-sys-0.4.2.crate",
+        "sha256": "48a39e34abe35ee2cf54a1e29dd983accecd113ad30bdead5050418fa92f2a1b",
         "dest": "cargo/vendor",
-        "dest-filename": "gdk4-sys-0.3.1.crate"
+        "dest-filename": "gdk4-sys-0.4.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%229498f4e06969fb96a4e4234dfe1d308a3ac6b120b3c6d93e3ec5c77fe88bc6d5%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gdk4-sys-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%2248a39e34abe35ee2cf54a1e29dd983accecd113ad30bdead5050418fa92f2a1b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gdk4-sys-0.4.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1327,67 +1275,67 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gio/gio-0.14.8.crate",
-        "sha256": "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0",
+        "url": "https://static.crates.io/crates/gio/gio-0.15.5.crate",
+        "sha256": "59105fa464928adf56b159c8d980cc11fbfbe414befb904caac5163d383049bf",
         "dest": "cargo/vendor",
-        "dest-filename": "gio-0.14.8.crate"
+        "dest-filename": "gio-0.15.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gio-0.14.8",
+        "url": "data:%7B%22package%22%3A%20%2259105fa464928adf56b159c8d980cc11fbfbe414befb904caac5163d383049bf%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gio-0.15.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gio-sys/gio-sys-0.14.0.crate",
-        "sha256": "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa",
+        "url": "https://static.crates.io/crates/gio-sys/gio-sys-0.15.5.crate",
+        "sha256": "4f0bc4cfc9ebcdd05cc5057bc51b99c32f8f9bf246274f6a556ffd27279f8fe3",
         "dest": "cargo/vendor",
-        "dest-filename": "gio-sys-0.14.0.crate"
+        "dest-filename": "gio-sys-0.15.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gio-sys-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%224f0bc4cfc9ebcdd05cc5057bc51b99c32f8f9bf246274f6a556ffd27279f8fe3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gio-sys-0.15.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/glib/glib-0.14.8.crate",
-        "sha256": "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4",
+        "url": "https://static.crates.io/crates/glib/glib-0.15.5.crate",
+        "sha256": "41dcfbdb6cc6c02aee163339465d8a40d6f3f64c3a43f729a4195f0e153338b7",
         "dest": "cargo/vendor",
-        "dest-filename": "glib-0.14.8.crate"
+        "dest-filename": "glib-0.15.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/glib-0.14.8",
+        "url": "data:%7B%22package%22%3A%20%2241dcfbdb6cc6c02aee163339465d8a40d6f3f64c3a43f729a4195f0e153338b7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/glib-0.15.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/glib-macros/glib-macros-0.14.1.crate",
-        "sha256": "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518",
+        "url": "https://static.crates.io/crates/glib-macros/glib-macros-0.15.3.crate",
+        "sha256": "e58b262ff65ef771003873cea8c10e0fe854f1c508d48d62a4111a1ff163f7d1",
         "dest": "cargo/vendor",
-        "dest-filename": "glib-macros-0.14.1.crate"
+        "dest-filename": "glib-macros-0.15.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/glib-macros-0.14.1",
+        "url": "data:%7B%22package%22%3A%20%22e58b262ff65ef771003873cea8c10e0fe854f1c508d48d62a4111a1ff163f7d1%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/glib-macros-0.15.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/glib-sys/glib-sys-0.14.0.crate",
-        "sha256": "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae",
+        "url": "https://static.crates.io/crates/glib-sys/glib-sys-0.15.5.crate",
+        "sha256": "fa1d4e1a63d8574541e5b92931e4e669ddc87ffa85d58e84e631dba13ad2e10c",
         "dest": "cargo/vendor",
-        "dest-filename": "glib-sys-0.14.0.crate"
+        "dest-filename": "glib-sys-0.15.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/glib-sys-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%22fa1d4e1a63d8574541e5b92931e4e669ddc87ffa85d58e84e631dba13ad2e10c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/glib-sys-0.15.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1405,119 +1353,119 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gloo-timers/gloo-timers-0.2.2.crate",
-        "sha256": "6f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e",
+        "url": "https://static.crates.io/crates/gloo-timers/gloo-timers-0.2.3.crate",
+        "sha256": "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e",
         "dest": "cargo/vendor",
-        "dest-filename": "gloo-timers-0.2.2.crate"
+        "dest-filename": "gloo-timers-0.2.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gloo-timers-0.2.2",
+        "url": "data:%7B%22package%22%3A%20%224d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gloo-timers-0.2.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gobject-sys/gobject-sys-0.14.0.crate",
-        "sha256": "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5",
+        "url": "https://static.crates.io/crates/gobject-sys/gobject-sys-0.15.5.crate",
+        "sha256": "df6859463843c20cf3837e3a9069b6ab2051aeeadf4c899d33344f4aea83189a",
         "dest": "cargo/vendor",
-        "dest-filename": "gobject-sys-0.14.0.crate"
+        "dest-filename": "gobject-sys-0.15.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gobject-sys-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%22df6859463843c20cf3837e3a9069b6ab2051aeeadf4c899d33344f4aea83189a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gobject-sys-0.15.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/graphene-rs/graphene-rs-0.14.8.crate",
-        "sha256": "e3380f132530ef9eb9e0a2bac180e30390aa5e49892d20294f822a974117a563",
+        "url": "https://static.crates.io/crates/graphene-rs/graphene-rs-0.15.1.crate",
+        "sha256": "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570",
         "dest": "cargo/vendor",
-        "dest-filename": "graphene-rs-0.14.8.crate"
+        "dest-filename": "graphene-rs-0.15.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e3380f132530ef9eb9e0a2bac180e30390aa5e49892d20294f822a974117a563%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/graphene-rs-0.14.8",
+        "url": "data:%7B%22package%22%3A%20%227c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/graphene-rs-0.15.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/graphene-sys/graphene-sys-0.14.8.crate",
-        "sha256": "9a9ac7450b3aa80792513a3c029920a2ede419de13fb5169a4e51b07a5685332",
+        "url": "https://static.crates.io/crates/graphene-sys/graphene-sys-0.15.1.crate",
+        "sha256": "03f311acb023cf7af5537f35de028e03706136eead7f25a31e8fd26f5011e0b3",
         "dest": "cargo/vendor",
-        "dest-filename": "graphene-sys-0.14.8.crate"
+        "dest-filename": "graphene-sys-0.15.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%229a9ac7450b3aa80792513a3c029920a2ede419de13fb5169a4e51b07a5685332%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/graphene-sys-0.14.8",
+        "url": "data:%7B%22package%22%3A%20%2203f311acb023cf7af5537f35de028e03706136eead7f25a31e8fd26f5011e0b3%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/graphene-sys-0.15.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gsk4/gsk4-0.3.1.crate",
-        "sha256": "eff59ca46c4fc5087fd7a0c3770a71ea4b6e94f8c24c12e2c2e8538f9f6fd764",
+        "url": "https://static.crates.io/crates/gsk4/gsk4-0.4.6.crate",
+        "sha256": "1bf63d454e2f75abd92ee6de0ac9fc5aaf1018cd9c458aaf9de296c5cbab6bb9",
         "dest": "cargo/vendor",
-        "dest-filename": "gsk4-0.3.1.crate"
+        "dest-filename": "gsk4-0.4.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22eff59ca46c4fc5087fd7a0c3770a71ea4b6e94f8c24c12e2c2e8538f9f6fd764%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gsk4-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%221bf63d454e2f75abd92ee6de0ac9fc5aaf1018cd9c458aaf9de296c5cbab6bb9%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gsk4-0.4.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gsk4-sys/gsk4-sys-0.3.1.crate",
-        "sha256": "13aa53ce70234da02f9954339d988d5ab853d746a8f47a4ae17735ff873545b5",
+        "url": "https://static.crates.io/crates/gsk4-sys/gsk4-sys-0.4.2.crate",
+        "sha256": "e31d21d7ce02ba261bb24c50c4ab238a10b41a2c97c32afffae29471b7cca69b",
         "dest": "cargo/vendor",
-        "dest-filename": "gsk4-sys-0.3.1.crate"
+        "dest-filename": "gsk4-sys-0.4.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2213aa53ce70234da02f9954339d988d5ab853d746a8f47a4ae17735ff873545b5%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gsk4-sys-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%22e31d21d7ce02ba261bb24c50c4ab238a10b41a2c97c32afffae29471b7cca69b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gsk4-sys-0.4.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gtk4/gtk4-0.3.1.crate",
-        "sha256": "58a04f421d1485ba4739e723199f5828bca05ab4e622ed39a96a342b6b1a6a3d",
+        "url": "https://static.crates.io/crates/gtk4/gtk4-0.4.6.crate",
+        "sha256": "9e841556e3fe55d8a43ada76b7b08a5f65570bbdfe3b8f72c333053b8832c626",
         "dest": "cargo/vendor",
-        "dest-filename": "gtk4-0.3.1.crate"
+        "dest-filename": "gtk4-0.4.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2258a04f421d1485ba4739e723199f5828bca05ab4e622ed39a96a342b6b1a6a3d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gtk4-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%229e841556e3fe55d8a43ada76b7b08a5f65570bbdfe3b8f72c333053b8832c626%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gtk4-0.4.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gtk4-macros/gtk4-macros-0.3.1.crate",
-        "sha256": "5068d4354af02454f44687adc613100aa98ae11e273cdcac84f89dc08be2b4a1",
+        "url": "https://static.crates.io/crates/gtk4-macros/gtk4-macros-0.4.3.crate",
+        "sha256": "573db42bb64973a4d5f718b73caa7204285a1a665308a23b11723d0ee56ec305",
         "dest": "cargo/vendor",
-        "dest-filename": "gtk4-macros-0.3.1.crate"
+        "dest-filename": "gtk4-macros-0.4.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%225068d4354af02454f44687adc613100aa98ae11e273cdcac84f89dc08be2b4a1%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gtk4-macros-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%22573db42bb64973a4d5f718b73caa7204285a1a665308a23b11723d0ee56ec305%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gtk4-macros-0.4.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gtk4-sys/gtk4-sys-0.3.1.crate",
-        "sha256": "e20a64c8f0ddcff8902ff04c130747f2fb7834a43530f75d03d6c71335733b49",
+        "url": "https://static.crates.io/crates/gtk4-sys/gtk4-sys-0.4.5.crate",
+        "sha256": "c47c075e8f795c38f6e9a47b51a73eab77b325f83c0154979ed4d4245c36490d",
         "dest": "cargo/vendor",
-        "dest-filename": "gtk4-sys-0.3.1.crate"
+        "dest-filename": "gtk4-sys-0.4.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e20a64c8f0ddcff8902ff04c130747f2fb7834a43530f75d03d6c71335733b49%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gtk4-sys-0.3.1",
+        "url": "data:%7B%22package%22%3A%20%22c47c075e8f795c38f6e9a47b51a73eab77b325f83c0154979ed4d4245c36490d%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gtk4-sys-0.4.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1535,15 +1483,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/headers/headers-0.3.5.crate",
-        "sha256": "a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0",
+        "url": "https://static.crates.io/crates/headers/headers-0.3.6.crate",
+        "sha256": "c84c647447a07ca16f5fbd05b633e535cc41a08d2d74ab1e08648df53be9cb89",
         "dest": "cargo/vendor",
-        "dest-filename": "headers-0.3.5.crate"
+        "dest-filename": "headers-0.3.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/headers-0.3.5",
+        "url": "data:%7B%22package%22%3A%20%22c84c647447a07ca16f5fbd05b633e535cc41a08d2d74ab1e08648df53be9cb89%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/headers-0.3.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1561,15 +1509,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/heck/heck-0.3.3.crate",
-        "sha256": "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c",
+        "url": "https://static.crates.io/crates/heck/heck-0.4.0.crate",
+        "sha256": "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9",
         "dest": "cargo/vendor",
-        "dest-filename": "heck-0.3.3.crate"
+        "dest-filename": "heck-0.4.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/heck-0.3.3",
+        "url": "data:%7B%22package%22%3A%20%222540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/heck-0.4.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1832,19 +1780,6 @@
         "dest": "cargo/vendor/isahc-1.6.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/itertools/itertools-0.10.3.crate",
-        "sha256": "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3",
-        "dest": "cargo/vendor",
-        "dest-filename": "itertools-0.10.3.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/itertools-0.10.3",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/itoa/itoa-0.4.8.crate",
@@ -1912,15 +1847,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/js-sys/js-sys-0.3.55.crate",
-        "sha256": "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84",
+        "url": "https://static.crates.io/crates/js-sys/js-sys-0.3.56.crate",
+        "sha256": "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04",
         "dest": "cargo/vendor",
-        "dest-filename": "js-sys-0.3.55.crate"
+        "dest-filename": "js-sys-0.3.56.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/js-sys-0.3.55",
+        "url": "data:%7B%22package%22%3A%20%22a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/js-sys-0.3.56",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1977,41 +1912,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libadwaita/libadwaita-0.1.0-beta-1.crate",
-        "sha256": "cef1e2d4b5490caff8a1d44648f68721ab917f765a7fa1d0226fcdac42d86552",
+        "url": "https://static.crates.io/crates/libadwaita/libadwaita-0.1.0.crate",
+        "sha256": "0d4b1d54d907dfa5d6663fdf4bdbe46c34747258b85c787adbf66187ccbaac81",
         "dest": "cargo/vendor",
-        "dest-filename": "libadwaita-0.1.0-beta-1.crate"
+        "dest-filename": "libadwaita-0.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22cef1e2d4b5490caff8a1d44648f68721ab917f765a7fa1d0226fcdac42d86552%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libadwaita-0.1.0-beta-1",
+        "url": "data:%7B%22package%22%3A%20%220d4b1d54d907dfa5d6663fdf4bdbe46c34747258b85c787adbf66187ccbaac81%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libadwaita-0.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libadwaita-sys/libadwaita-sys-0.1.0-beta-1.crate",
-        "sha256": "7a165d8c96824753ec072b70a9149790efa3d5abb07e130cda7eb04ef2006d4c",
+        "url": "https://static.crates.io/crates/libadwaita-sys/libadwaita-sys-0.1.0.crate",
+        "sha256": "f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8",
         "dest": "cargo/vendor",
-        "dest-filename": "libadwaita-sys-0.1.0-beta-1.crate"
+        "dest-filename": "libadwaita-sys-0.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227a165d8c96824753ec072b70a9149790efa3d5abb07e130cda7eb04ef2006d4c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libadwaita-sys-0.1.0-beta-1",
+        "url": "data:%7B%22package%22%3A%20%22f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libadwaita-sys-0.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libc/libc-0.2.112.crate",
-        "sha256": "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125",
+        "url": "https://static.crates.io/crates/libc/libc-0.2.117.crate",
+        "sha256": "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c",
         "dest": "cargo/vendor",
-        "dest-filename": "libc-0.2.112.crate"
+        "dest-filename": "libc-0.2.117.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libc-0.2.112",
+        "url": "data:%7B%22package%22%3A%20%22e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libc-0.2.117",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2029,15 +1964,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/libm/libm-0.2.1.crate",
-        "sha256": "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a",
+        "url": "https://static.crates.io/crates/libm/libm-0.2.2.crate",
+        "sha256": "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db",
         "dest": "cargo/vendor",
-        "dest-filename": "libm-0.2.1.crate"
+        "dest-filename": "libm-0.2.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/libm-0.2.1",
+        "url": "data:%7B%22package%22%3A%20%2233a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/libm-0.2.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2250,15 +2185,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/lock_api/lock_api-0.4.5.crate",
-        "sha256": "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109",
+        "url": "https://static.crates.io/crates/lock_api/lock_api-0.4.6.crate",
+        "sha256": "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b",
         "dest": "cargo/vendor",
-        "dest-filename": "lock_api-0.4.5.crate"
+        "dest-filename": "lock_api-0.4.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/lock_api-0.4.5",
+        "url": "data:%7B%22package%22%3A%20%2288943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/lock_api-0.4.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -2417,19 +2352,6 @@
         "dest": "cargo/vendor/nb-connect-1.2.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/ndk/ndk-0.3.0.crate",
-        "sha256": "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab",
-        "dest": "cargo/vendor",
-        "dest-filename": "ndk-0.3.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/ndk-0.3.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/ndk/ndk-0.6.0.crate",
@@ -2443,19 +2365,6 @@
         "dest": "cargo/vendor/ndk-0.6.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/ndk-glue/ndk-glue-0.3.0.crate",
-        "sha256": "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385",
-        "dest": "cargo/vendor",
-        "dest-filename": "ndk-glue-0.3.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/ndk-glue-0.3.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/ndk-glue/ndk-glue-0.6.0.crate",
@@ -2469,19 +2378,6 @@
         "dest": "cargo/vendor/ndk-glue-0.6.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/ndk-macro/ndk-macro-0.2.0.crate",
-        "sha256": "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d",
-        "dest": "cargo/vendor",
-        "dest-filename": "ndk-macro-0.2.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2205d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/ndk-macro-0.2.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/ndk-macro/ndk-macro-0.3.0.crate",
@@ -2495,19 +2391,6 @@
         "dest": "cargo/vendor/ndk-macro-0.3.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/ndk-sys/ndk-sys-0.2.2.crate",
-        "sha256": "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121",
-        "dest": "cargo/vendor",
-        "dest-filename": "ndk-sys-0.2.2.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/ndk-sys-0.2.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/ndk-sys/ndk-sys-0.3.0.crate",
@@ -2887,28 +2770,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/pango/pango-0.14.8.crate",
-        "sha256": "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581",
+        "url": "https://static.crates.io/crates/pango/pango-0.15.2.crate",
+        "sha256": "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94",
         "dest": "cargo/vendor",
-        "dest-filename": "pango-0.14.8.crate"
+        "dest-filename": "pango-0.15.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pango-0.14.8",
+        "url": "data:%7B%22package%22%3A%20%2279211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/pango-0.15.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/pango-sys/pango-sys-0.14.0.crate",
-        "sha256": "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe",
+        "url": "https://static.crates.io/crates/pango-sys/pango-sys-0.15.1.crate",
+        "sha256": "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2",
         "dest": "cargo/vendor",
-        "dest-filename": "pango-sys-0.14.0.crate"
+        "dest-filename": "pango-sys-0.15.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pango-sys-0.14.0",
+        "url": "data:%7B%22package%22%3A%20%227022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/pango-sys-0.15.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3173,54 +3056,54 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/protobuf/protobuf-2.25.2.crate",
-        "sha256": "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754",
+        "url": "https://static.crates.io/crates/protobuf/protobuf-2.27.1.crate",
+        "sha256": "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96",
         "dest": "cargo/vendor",
-        "dest-filename": "protobuf-2.25.2.crate"
+        "dest-filename": "protobuf-2.27.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2247c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/protobuf-2.25.2",
+        "url": "data:%7B%22package%22%3A%20%22cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/protobuf-2.27.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.25.2.crate",
-        "sha256": "3df8c98c08bd4d6653c2dbae00bd68c1d1d82a360265a5b0bbc73d48c63cb853",
+        "url": "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.27.1.crate",
+        "sha256": "aec1632b7c8f2e620343439a7dfd1f3c47b18906c4be58982079911482b5d707",
         "dest": "cargo/vendor",
-        "dest-filename": "protobuf-codegen-2.25.2.crate"
+        "dest-filename": "protobuf-codegen-2.27.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%223df8c98c08bd4d6653c2dbae00bd68c1d1d82a360265a5b0bbc73d48c63cb853%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/protobuf-codegen-2.25.2",
+        "url": "data:%7B%22package%22%3A%20%22aec1632b7c8f2e620343439a7dfd1f3c47b18906c4be58982079911482b5d707%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/protobuf-codegen-2.27.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/protobuf-codegen-pure/protobuf-codegen-pure-2.25.2.crate",
-        "sha256": "394a73e2a819405364df8d30042c0f1174737a763e0170497ec9d36f8a2ea8f7",
+        "url": "https://static.crates.io/crates/protobuf-codegen-pure/protobuf-codegen-pure-2.27.1.crate",
+        "sha256": "9f8122fdb18e55190c796b088a16bdb70cd7acdcd48f7a8b796b58c62e532cc6",
         "dest": "cargo/vendor",
-        "dest-filename": "protobuf-codegen-pure-2.25.2.crate"
+        "dest-filename": "protobuf-codegen-pure-2.27.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22394a73e2a819405364df8d30042c0f1174737a763e0170497ec9d36f8a2ea8f7%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/protobuf-codegen-pure-2.25.2",
+        "url": "data:%7B%22package%22%3A%20%229f8122fdb18e55190c796b088a16bdb70cd7acdcd48f7a8b796b58c62e532cc6%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/protobuf-codegen-pure-2.27.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/quote/quote-1.0.14.crate",
-        "sha256": "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d",
+        "url": "https://static.crates.io/crates/quote/quote-1.0.15.crate",
+        "sha256": "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145",
         "dest": "cargo/vendor",
-        "dest-filename": "quote-1.0.14.crate"
+        "dest-filename": "quote-1.0.15.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2247aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/quote-1.0.14",
+        "url": "data:%7B%22package%22%3A%20%22864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/quote-1.0.15",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3264,15 +3147,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/rand_distr/rand_distr-0.4.2.crate",
-        "sha256": "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f",
+        "url": "https://static.crates.io/crates/rand_distr/rand_distr-0.4.3.crate",
+        "sha256": "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31",
         "dest": "cargo/vendor",
-        "dest-filename": "rand_distr-0.4.2.crate"
+        "dest-filename": "rand_distr-0.4.3.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand_distr-0.4.2",
+        "url": "data:%7B%22package%22%3A%20%2232cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/rand_distr-0.4.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3511,15 +3394,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/semver/semver-1.0.4.crate",
-        "sha256": "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012",
+        "url": "https://static.crates.io/crates/semver/semver-1.0.5.crate",
+        "sha256": "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7",
         "dest": "cargo/vendor",
-        "dest-filename": "semver-1.0.4.crate"
+        "dest-filename": "semver-1.0.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/semver-1.0.4",
+        "url": "data:%7B%22package%22%3A%20%220486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/semver-1.0.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3537,41 +3420,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde/serde-1.0.133.crate",
-        "sha256": "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a",
+        "url": "https://static.crates.io/crates/serde/serde-1.0.136.crate",
+        "sha256": "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789",
         "dest": "cargo/vendor",
-        "dest-filename": "serde-1.0.133.crate"
+        "dest-filename": "serde-1.0.136.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2297565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde-1.0.133",
+        "url": "data:%7B%22package%22%3A%20%22ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde-1.0.136",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde_derive/serde_derive-1.0.133.crate",
-        "sha256": "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537",
+        "url": "https://static.crates.io/crates/serde_derive/serde_derive-1.0.136.crate",
+        "sha256": "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9",
         "dest": "cargo/vendor",
-        "dest-filename": "serde_derive-1.0.133.crate"
+        "dest-filename": "serde_derive-1.0.136.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde_derive-1.0.133",
+        "url": "data:%7B%22package%22%3A%20%2208597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde_derive-1.0.136",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.74.crate",
-        "sha256": "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142",
+        "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.78.crate",
+        "sha256": "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085",
         "dest": "cargo/vendor",
-        "dest-filename": "serde_json-1.0.74.crate"
+        "dest-filename": "serde_json-1.0.78.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde_json-1.0.74",
+        "url": "data:%7B%22package%22%3A%20%22d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde_json-1.0.78",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3602,15 +3485,28 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/sha1/sha1-0.6.0.crate",
-        "sha256": "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d",
+        "url": "https://static.crates.io/crates/sha1/sha1-0.6.1.crate",
+        "sha256": "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770",
         "dest": "cargo/vendor",
-        "dest-filename": "sha1-0.6.0.crate"
+        "dest-filename": "sha1-0.6.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/sha1-0.6.0",
+        "url": "data:%7B%22package%22%3A%20%22c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/sha1-0.6.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/sha1_smol/sha1_smol-1.0.0.crate",
+        "sha256": "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012",
+        "dest": "cargo/vendor",
+        "dest-filename": "sha1_smol-1.0.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%22ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/sha1_smol-1.0.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3641,15 +3537,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/shell-words/shell-words-1.0.0.crate",
-        "sha256": "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074",
+        "url": "https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate",
+        "sha256": "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde",
         "dest": "cargo/vendor",
-        "dest-filename": "shell-words-1.0.0.crate"
+        "dest-filename": "shell-words-1.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/shell-words-1.0.0",
+        "url": "data:%7B%22package%22%3A%20%2224188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/shell-words-1.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3719,15 +3615,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/socket2/socket2-0.4.2.crate",
-        "sha256": "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516",
+        "url": "https://static.crates.io/crates/socket2/socket2-0.4.4.crate",
+        "sha256": "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0",
         "dest": "cargo/vendor",
-        "dest-filename": "socket2-0.4.2.crate"
+        "dest-filename": "socket2-0.4.4.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%225dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/socket2-0.4.2",
+        "url": "data:%7B%22package%22%3A%20%2266d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/socket2-0.4.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3756,19 +3652,6 @@
         "dest": "cargo/vendor/stdweb-0.1.3",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/strsim/strsim-0.9.3.crate",
-        "sha256": "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c",
-        "dest": "cargo/vendor",
-        "dest-filename": "strsim-0.9.3.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%226446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/strsim-0.9.3",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/strsim/strsim-0.10.0.crate",
@@ -3782,32 +3665,6 @@
         "dest": "cargo/vendor/strsim-0.10.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/strum/strum-0.21.0.crate",
-        "sha256": "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2",
-        "dest": "cargo/vendor",
-        "dest-filename": "strum-0.21.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/strum-0.21.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/strum_macros/strum_macros-0.21.1.crate",
-        "sha256": "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec",
-        "dest": "cargo/vendor",
-        "dest-filename": "strum_macros-0.21.1.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/strum_macros-0.21.1",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/subtle/subtle-2.4.1.crate",
@@ -3823,15 +3680,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/syn/syn-1.0.85.crate",
-        "sha256": "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7",
+        "url": "https://static.crates.io/crates/syn/syn-1.0.86.crate",
+        "sha256": "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b",
         "dest": "cargo/vendor",
-        "dest-filename": "syn-1.0.85.crate"
+        "dest-filename": "syn-1.0.86.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/syn-1.0.85",
+        "url": "data:%7B%22package%22%3A%20%228a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/syn-1.0.86",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3849,28 +3706,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/system-deps/system-deps-3.2.0.crate",
-        "sha256": "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6",
-        "dest": "cargo/vendor",
-        "dest-filename": "system-deps-3.2.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/system-deps-3.2.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/system-deps/system-deps-5.0.0.crate",
-        "sha256": "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e",
+        "url": "https://static.crates.io/crates/system-deps/system-deps-6.0.1.crate",
+        "sha256": "ad3a97fdef3daf935d929b3e97e5a6a680cd4622e40c2941ca0875d6566416f8",
         "dest": "cargo/vendor",
-        "dest-filename": "system-deps-5.0.0.crate"
+        "dest-filename": "system-deps-6.0.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2218db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/system-deps-5.0.0",
+        "url": "data:%7B%22package%22%3A%20%22ad3a97fdef3daf935d929b3e97e5a6a680cd4622e40c2941ca0875d6566416f8%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/system-deps-6.0.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3979,15 +3823,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tokio/tokio-1.15.0.crate",
-        "sha256": "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838",
+        "url": "https://static.crates.io/crates/tokio/tokio-1.16.1.crate",
+        "sha256": "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a",
         "dest": "cargo/vendor",
-        "dest-filename": "tokio-1.15.0.crate"
+        "dest-filename": "tokio-1.16.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tokio-1.15.0",
+        "url": "data:%7B%22package%22%3A%20%220c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tokio-1.16.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4057,41 +3901,41 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tracing/tracing-0.1.29.crate",
-        "sha256": "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105",
+        "url": "https://static.crates.io/crates/tracing/tracing-0.1.30.crate",
+        "sha256": "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9",
         "dest": "cargo/vendor",
-        "dest-filename": "tracing-0.1.29.crate"
+        "dest-filename": "tracing-0.1.30.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tracing-0.1.29",
+        "url": "data:%7B%22package%22%3A%20%222d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tracing-0.1.30",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.18.crate",
-        "sha256": "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e",
+        "url": "https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.19.crate",
+        "sha256": "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716",
         "dest": "cargo/vendor",
-        "dest-filename": "tracing-attributes-0.1.18.crate"
+        "dest-filename": "tracing-attributes-0.1.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tracing-attributes-0.1.18",
+        "url": "data:%7B%22package%22%3A%20%228276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tracing-attributes-0.1.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tracing-core/tracing-core-0.1.21.crate",
-        "sha256": "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4",
+        "url": "https://static.crates.io/crates/tracing-core/tracing-core-0.1.22.crate",
+        "sha256": "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23",
         "dest": "cargo/vendor",
-        "dest-filename": "tracing-core-0.1.21.crate"
+        "dest-filename": "tracing-core-0.1.22.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tracing-core-0.1.21",
+        "url": "data:%7B%22package%22%3A%20%2203cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tracing-core-0.1.22",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4172,19 +4016,6 @@
         "dest": "cargo/vendor/unicode-normalization-0.1.19",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.8.0.crate",
-        "sha256": "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b",
-        "dest": "cargo/vendor",
-        "dest-filename": "unicode-segmentation-1.8.0.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/unicode-segmentation-1.8.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/unicode-width/unicode-width-0.1.9.crate",
@@ -4278,15 +4109,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/version-compare/version-compare-0.0.11.crate",
-        "sha256": "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b",
+        "url": "https://static.crates.io/crates/version-compare/version-compare-0.1.0.crate",
+        "sha256": "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73",
         "dest": "cargo/vendor",
-        "dest-filename": "version-compare-0.0.11.crate"
+        "dest-filename": "version-compare-0.1.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%221c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/version-compare-0.0.11",
+        "url": "data:%7B%22package%22%3A%20%22fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/version-compare-0.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4369,93 +4200,93 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.78.crate",
-        "sha256": "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce",
+        "url": "https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.79.crate",
+        "sha256": "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-0.2.78.crate"
+        "dest-filename": "wasm-bindgen-0.2.79.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-0.2.78",
+        "url": "data:%7B%22package%22%3A%20%2225f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-0.2.79",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.78.crate",
-        "sha256": "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b",
+        "url": "https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.79.crate",
+        "sha256": "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-backend-0.2.78.crate"
+        "dest-filename": "wasm-bindgen-backend-0.2.79.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-backend-0.2.78",
+        "url": "data:%7B%22package%22%3A%20%228b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-backend-0.2.79",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.28.crate",
-        "sha256": "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39",
+        "url": "https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.29.crate",
+        "sha256": "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-futures-0.4.28.crate"
+        "dest-filename": "wasm-bindgen-futures-0.4.29.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-futures-0.4.28",
+        "url": "data:%7B%22package%22%3A%20%222eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-futures-0.4.29",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.78.crate",
-        "sha256": "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9",
+        "url": "https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.79.crate",
+        "sha256": "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-macro-0.2.78.crate"
+        "dest-filename": "wasm-bindgen-macro-0.2.79.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-macro-0.2.78",
+        "url": "data:%7B%22package%22%3A%20%222f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-macro-0.2.79",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.78.crate",
-        "sha256": "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab",
+        "url": "https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.79.crate",
+        "sha256": "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-macro-support-0.2.78.crate"
+        "dest-filename": "wasm-bindgen-macro-support-0.2.79.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%227803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-macro-support-0.2.78",
+        "url": "data:%7B%22package%22%3A%20%22bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-macro-support-0.2.79",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.78.crate",
-        "sha256": "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc",
+        "url": "https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.79.crate",
+        "sha256": "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2",
         "dest": "cargo/vendor",
-        "dest-filename": "wasm-bindgen-shared-0.2.78.crate"
+        "dest-filename": "wasm-bindgen-shared-0.2.79.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%220237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/wasm-bindgen-shared-0.2.78",
+        "url": "data:%7B%22package%22%3A%20%223d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/wasm-bindgen-shared-0.2.79",
         "dest-filename": ".cargo-checksum.json"
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/web-sys/web-sys-0.3.55.crate",
-        "sha256": "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb",
+        "url": "https://static.crates.io/crates/web-sys/web-sys-0.3.56.crate",
+        "sha256": "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb",
         "dest": "cargo/vendor",
-        "dest-filename": "web-sys-0.3.55.crate"
+        "dest-filename": "web-sys-0.3.56.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2238eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/web-sys-0.3.55",
+        "url": "data:%7B%22package%22%3A%20%22c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/web-sys-0.3.56",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4538,15 +4369,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zbus/zbus-2.0.1.crate",
-        "sha256": "2ac8424f5aa1f239d2d7ecb32f9d5ffc6fcf5fb9298d2d524a7e7c8b258c3f80",
+        "url": "https://static.crates.io/crates/zbus/zbus-2.1.1.crate",
+        "sha256": "7bb86f3d4592e26a48b2719742aec94f8ae6238ebde20d98183ee185d1275e9a",
         "dest": "cargo/vendor",
-        "dest-filename": "zbus-2.0.1.crate"
+        "dest-filename": "zbus-2.1.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222ac8424f5aa1f239d2d7ecb32f9d5ffc6fcf5fb9298d2d524a7e7c8b258c3f80%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zbus-2.0.1",
+        "url": "data:%7B%22package%22%3A%20%227bb86f3d4592e26a48b2719742aec94f8ae6238ebde20d98183ee185d1275e9a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zbus-2.1.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4564,15 +4395,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zbus_macros/zbus_macros-2.0.1.crate",
-        "sha256": "3e03af45fc15e2c977161c5ffea56c43c41f425a963affd7074bf91b5bf5a8cf",
+        "url": "https://static.crates.io/crates/zbus_macros/zbus_macros-2.1.1.crate",
+        "sha256": "36823cc10fddc3c6b19f048903262dacaf8274170e9a255784bdd8b4570a8040",
         "dest": "cargo/vendor",
-        "dest-filename": "zbus_macros-2.0.1.crate"
+        "dest-filename": "zbus_macros-2.1.1.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%223e03af45fc15e2c977161c5ffea56c43c41f425a963affd7074bf91b5bf5a8cf%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zbus_macros-2.0.1",
+        "url": "data:%7B%22package%22%3A%20%2236823cc10fddc3c6b19f048903262dacaf8274170e9a255784bdd8b4570a8040%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zbus_macros-2.1.1",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4629,15 +4460,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zvariant/zvariant-3.0.0.crate",
-        "sha256": "4a946c049b2eac1a253f98e9267a8ce7a3d93be274ea146e6dd7a0965232a911",
+        "url": "https://static.crates.io/crates/zvariant/zvariant-3.1.2.crate",
+        "sha256": "49ea5dc38b2058fae6a5b79009388143dadce1e91c26a67f984a0fc0381c8033",
         "dest": "cargo/vendor",
-        "dest-filename": "zvariant-3.0.0.crate"
+        "dest-filename": "zvariant-3.1.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%224a946c049b2eac1a253f98e9267a8ce7a3d93be274ea146e6dd7a0965232a911%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zvariant-3.0.0",
+        "url": "data:%7B%22package%22%3A%20%2249ea5dc38b2058fae6a5b79009388143dadce1e91c26a67f984a0fc0381c8033%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zvariant-3.1.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -4655,15 +4486,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/zvariant_derive/zvariant_derive-3.0.0.crate",
-        "sha256": "28fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990",
+        "url": "https://static.crates.io/crates/zvariant_derive/zvariant_derive-3.1.2.crate",
+        "sha256": "8c2cecc5a61c2a053f7f653a24cd15b3b0195d7f7ddb5042c837fb32e161fb7a",
         "dest": "cargo/vendor",
-        "dest-filename": "zvariant_derive-3.0.0.crate"
+        "dest-filename": "zvariant_derive-3.1.2.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2228fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/zvariant_derive-3.0.0",
+        "url": "data:%7B%22package%22%3A%20%228c2cecc5a61c2a053f7f653a24cd15b3b0195d7f7ddb5042c837fb32e161fb7a%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/zvariant_derive-3.1.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {

From 3e714940f8effb3a7255fa91cf7d2b8c1c141ba4 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Mon, 7 Feb 2022 23:31:06 +0000
Subject: [PATCH 15/33] some doc (#466)

---
 doc/.latexmkrc |   4 ++
 doc/Dockerfile |   4 ++
 doc/Makefile   |  30 ++++++++
 doc/doc.pdf    | Bin 0 -> 44585 bytes
 doc/doc.tex    | 191 +++++++++++++++++++++++++++++++++++++++++++++++++
 doc/enter.sh   |   3 +
 6 files changed, 232 insertions(+)
 create mode 100644 doc/.latexmkrc
 create mode 100644 doc/Dockerfile
 create mode 100644 doc/Makefile
 create mode 100644 doc/doc.pdf
 create mode 100644 doc/doc.tex
 create mode 100755 doc/enter.sh

diff --git a/doc/.latexmkrc b/doc/.latexmkrc
new file mode 100644
index 00000000..96515912
--- /dev/null
+++ b/doc/.latexmkrc
@@ -0,0 +1,4 @@
+$pdf_mode = 1;
+$pdf_previewer = '';
+$pdflatex = 'lualatex -interaction=nonstopmode -synctex=1 -shell-escape %O %S';
+$out_dir = 'target';
\ No newline at end of file
diff --git a/doc/Dockerfile b/doc/Dockerfile
new file mode 100644
index 00000000..a7e83671
--- /dev/null
+++ b/doc/Dockerfile
@@ -0,0 +1,4 @@
+FROM atrendel/doxerlive:15-basic
+RUN apk add gettext py3-pygments
+ADD Makefile /var/doxerlive/
+RUN make install
\ No newline at end of file
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 00000000..9ef43293
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,30 @@
+all: install build
+
+build: doc.tex
+	latexmk -c doc.tex
+
+watch: doc.tex
+	latexmk -pvc doc.tex
+
+DEPENDENCIES = luatex $\
+	fontspec $\
+	lm $\
+	xcolor $\
+	xcolor-solarized $\
+	fontawesome $\
+	xifthen $\
+	ifmtarg $\
+	pgf $\
+	pgf-blur $\
+	ec $\
+	etoolbox $\
+	xkeyval $\
+	minted kvoptions fancyvrb fvextra upquote float ifplatform pdftexcmds xstring lineno framed catchfile
+
+install:
+	tlmgr update --self
+	tlmgr update texlive-scripts
+	tlmgr install $(DEPENDENCIES)
+
+clean:
+	latexmk -C
\ No newline at end of file
diff --git a/doc/doc.pdf b/doc/doc.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5c6f72086e7491ba8292a3b8a6a89d54e0b733d9
GIT binary patch
literal 44585
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

literal 0
HcmV?d00001

diff --git a/doc/doc.tex b/doc/doc.tex
new file mode 100644
index 00000000..3c9750f5
--- /dev/null
+++ b/doc/doc.tex
@@ -0,0 +1,191 @@
+\documentclass[12pt, a4paper]{article}
+\usepackage[margin=25mm]{geometry}
+\usepackage{tikz}
+\usepackage[outputdir=target]{minted}
+
+\usemintedstyle{lovelace}
+
+\renewcommand\familydefault{\sfdefault}
+
+\definecolor{spotifygreen}{HTML}{1DB954}
+
+\usetikzlibrary{calc}
+\usetikzlibrary{arrows.meta}
+\usetikzlibrary{decorations.pathreplacing}
+\usetikzlibrary{shapes}
+\usetikzlibrary{positioning}
+
+\tikzstyle{box}=[fill=black, solid, line width=0mm, text=white, rounded corners=2mm, font={\bfseries}, inner sep=3mm]    
+\tikzstyle{sizedbox}=[box, text width=3cm, anchor=north, align=center]
+\tikzstyle{link}=[->, >=latex, line width=.5mm, rounded corners, shorten >=1pt]
+\tikzstyle{smalllink}=[->, >=latex, line width=.2mm, rounded corners, shorten >=1pt, dashed, gray]
+
+
+\begin{document}
+
+\section{Data flow within Spot}
+
+\subsection{Overview}
+
+\paragraph{Single source of truth.} There is a single place that is considered the source of truth for anything that is related to the app state, and that is, well, the \texttt{AppState}. The app state aggregates the state of the UI, as well as the player state. This makes it easier to keep things in sync -- when possible, anything state-related should be read from the app state over some local, possibly out-of-date state.
+
+\paragraph{Centralized.} That state is centralized and unique. This allows various parts of the application to access any part of it, and conversely makes it easy to perform state updates that affect various and sometimes unrelated parts of the application.
+
+\paragraph{Controlled mutations.} There is only one way to modify the app state, and that is by dispatching \emph{actions} -- plain structs that represent a mutation to the state. Updates to the state produce \emph{events}, which \texttt{EventListeners} can use to update the UI. 
+
+\begin{figure}[!h]
+
+    \centering
+    
+    \begin{tikzpicture}
+
+    \node[box, fill=spotifygreen, minimum height=2cm] (model) at (0, 0) {\ttfamily AppModel};
+    \node[box] (ui) at (-4, -3) {Gtk widgets};
+    \node[box] (listeners) at (4, -3) {Listeners};
+
+    \draw[link] (ui) edge[bend left=20] node[above, sloped] {\footnotesize actions} (model);
+    \draw[link] (model) edge[bend left=10] node[above, sloped] {\footnotesize events} (listeners);
+    \draw[link] (listeners) edge[bend left=60] node[below, sloped] {\footnotesize update} (ui);
+    \draw[link, dashed] (listeners) edge[bend left=10] node[below, sloped] {\footnotesize read-only access} (model);
+
+    \end{tikzpicture}
+
+    \caption{The data flow and and its relation to the UI -- the \texttt{AppModel} enforces read-only access to the state.}
+    \label{fig:flow}
+
+\end{figure}
+
+This draws heavy inspiration from the Flux architecture\footnote{See https://facebook.github.io/flux/docs/in-depth-overview for instance}; the one big difference here is that there is no way to automatically find out which portion of the UI should be updated. Instead, listeners are responsible for figuring out the updates to apply based on the events.
+
+It should be noted that the app state is only readable from the main thread for simplicity. 
+
+\subsection{How actions are handled}
+
+Here is the relevant part of the code\footnote{Variables have been renamed for clarity...} related to handling actions and notifying listeners:
+
+\begin{minted}{rust}
+let events = self.model.update_state(action);
+
+for event in events.iter() {
+    for listener in self.listeners.iter_mut() { 
+        listener.on_event(event);
+    }
+}
+\end{minted}
+
+That first line is the only time that the app state is borrowed mutably -- to apply actions.
+
+On the technical side: all actions being dispatched, synchronous or not, are eventually sent through a \texttt{futures::channel::mpsc} channel. The consumer on the other end of the channel is a future that will be executed by GLib. This allows Gtk to process \emph{all actions} at its own pace, as part of its main loop.
+
+Note: futures are used a lot in the code to perform asynchronous operations such as calls to the Spotify API. To ease the use of futures, the dispatcher allows working with asynchronous actions, that is, futures that output one or more actions. Again, these futures are eventually handled in the main Gtk loop.
+
+\subsection{A listener: the player subsystem}
+
+Any element that wishes to update the state or react to changes from the state has to follow that same pattern. For instance, the ``player'' part of Spot receives \texttt{Commands} (mapped from events by a \texttt{PlayerNotifier}) to start playing music, and dispatches actions back the app through a \texttt{SpotifyPlayerDelegate} (see figure \ref{fig:player}). 
+
+These two extra elements add some indirection so that the player is not too strongly coupled to the rest of the app (it does not and should not care about most events, afterall!). Moreover, those commands are handled in a separate thread where the player lives.
+
+\begin{figure}[!ht]
+    \centering
+    
+    \begin{tikzpicture}
+
+    \node[box, fill=spotifygreen, minimum height=2cm] (model) at (0, 0) {\ttfamily AppModel};
+
+    \draw[smalllink] (-5, -3) node[sizedbox] (listeners) {Components}  
+        -- +(0, -1.5) node[right] {update}
+        -- +(0, -2) node[sizedbox] (ui) {Gtk widgets};
+
+    \draw[smalllink] (5, -3) node[sizedbox, fill=gray] (notifier) {\ttfamily PlayerNotifier}
+        -- +(0, -1.5) node[right] {command}
+        -- +(0, -2) node[sizedbox, fill=gray] (player) {\ttfamily SpotifyPlayer}
+        -- +(0, -3.5) node[right] {calls}
+        -- +(0, -4) node[sizedbox, fill=gray] (delegate) {\parbox{\textwidth}{\ttfamily SpotifyPlayer Delegate}};
+
+    \draw[link] (ui) edge[bend right=32] node[below, sloped] {\footnotesize actions} (model);
+    \draw[link] (model) edge[bend right=10] node[above, sloped] {\footnotesize events} (listeners);
+
+    \draw[link] (model) edge[bend left=10] node[above, sloped] {\footnotesize events} (notifier);
+    \draw[link] (delegate) edge[bend left=32] node[below, sloped] {\footnotesize actions} (model);
+
+    \draw[dashed, gray] ($(notifier.north west) + (-0.25, 0.25)$) rectangle ($(delegate.south east) + (0.25, -0.25)$);
+
+    \draw[dashed, gray] ($(listeners.north west) + (-0.25, 0.25)$) rectangle ($(ui.south east) + (0.25, -0.25)$);
+
+
+    \end{tikzpicture}
+
+    \caption{The player subsystem}
+    \label{fig:player}
+
+\end{figure}
+
+
+\subsection{Another listener: the MPRIS subsystem}
+
+Similarly, the MPRIS subsystem follows that same pattern. It spawns a small DBUS server that translates DBUS messages to actions, and an \texttt{AppPlaybackStateListener} listens to incoming events.
+
+One major difference is that the MPRIS server maintains its own state here, since the app state cannot be accessed from outside the main thread. To make sure this local state stays in sync, DBUS messages should not alter the local state directly -- instead, we should wait for a roundtrip through the app and incoming events.
+
+\section{Components}
+
+\subsection{Overview}
+
+Components are thin wrappers around Gtk widgets, dedicated to binding them so that they produce the right actions, and updating them when specific events occur by conforming to \texttt{EventListener}. 
+
+\subsection{Modeling interactions}
+
+Components should have some associated \texttt{struct} to model the interactions with the rest of the app. Let's consider the play/pause button as an example. Its behavior is defined in the \texttt{PlaybackModel}:
+
+\begin{minted}{rust}
+impl PlaybackModel {
+    fn is_playing(&self) -> bool { /**/ }
+    fn toggle_playback(&self) { /**/ }
+}
+\end{minted}
+
+What we need to make our button work is a way to know its current state (is a song playing?) and a way to change that state (toggling on activation). Note that it would be tempting to simply query the widget's state, which \emph{should} be in sync with the actual playback state, but what we should really do instead is query the app state, which is the one source of truth for anything state-related. 
+
+Why do this? First, toggling the playback might fail (e.g. if no song is playing), but more importantly something else could alter the playback state (e.g. a DBUS query).
+
+\begin{minted}{rust}
+fn is_playing(&self) -> bool { 
+    self.app_model.get_state().playback.is_playing()
+}
+\end{minted}
+
+As for toggling the playback, remember that we can only mutate the state through actions (the \mintinline{rust}|get_state| call above returns some \mintinline{rust}|Deref<Target = AppState>|). In other words, we express what kind of action we want to perform, with no guarantee that it'll succeed.
+
+\begin{minted}{rust}
+fn toggle_playback(&self) {
+    self.dispatcher.dispatch(PlaybackAction::TogglePlay.into());
+}
+\end{minted}
+
+\subsection{Binding the widget}
+
+All that's left is binding the widget to our model. By wrapping our model in an \texttt{Rc}, it becomes easy to clone it into the kind of \texttt{'static} closure Gtk needs.
+
+\begin{minted}{rust}
+// model is an Rc<PlaybackModel>
+widget.connect_play_pause(clone!(@weak model => move || model.toggle_playback()));
+\end{minted}
+
+Finally, we need our component to listen to relevant events, and update our widget accordingly.
+
+\begin{minted}{rust}
+impl EventListener for PlaybackControl {
+    fn on_event(&mut self, event: &AppEvent) {
+        match event {
+            AppEvent::PlaybackEvent(PlaybackEvent::PlaybackPaused)
+            | AppEvent::PlaybackEvent(PlaybackEvent::PlaybackResumed) => {
+                let is_playing = self.model.is_playing();
+                self.widget.set_playing(is_playing);
+            }
+            /**/
+        }
+    }
+}
+\end{minted}
+
+\end{document}
\ No newline at end of file
diff --git a/doc/enter.sh b/doc/enter.sh
new file mode 100755
index 00000000..59d5ed07
--- /dev/null
+++ b/doc/enter.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+docker build --network=host -t spot-doc .
+docker run --rm -it -e THEUID="$(id -u "$USER")" -v "$PWD":/var/doxerlive spot-doc ash

From 986e3d80ed4f44d40cd53d60146a41dd7ed0c4c6 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 20 Feb 2022 12:52:13 -0500
Subject: [PATCH 16/33] make sure window geometry is saved when quitting #424

---
 src/app/components/window/mod.rs | 1 +
 src/main.rs                      | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/app/components/window/mod.rs b/src/app/components/window/mod.rs
index 4c3b53f1..3bf10cfd 100644
--- a/src/app/components/window/mod.rs
+++ b/src/app/components/window/mod.rs
@@ -40,6 +40,7 @@ impl MainWindow {
         window.connect_maximized_notify(Self::save_window_geometry);
 
         window.connect_unrealize(|_| {
+            debug!("saving geometry");
             WINDOW_GEOMETRY.with(|g| g.borrow().save());
         });
 
diff --git a/src/main.rs b/src/main.rs
index edd3a3ee..b65d64f8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -116,6 +116,9 @@ fn startup(settings: &settings::SpotSettings) {
 fn register_actions(app: &gtk::Application, sender: UnboundedSender<AppAction>) {
     let quit = SimpleAction::new("quit", None);
     quit.connect_activate(clone!(@weak app => move |_, _| {
+        if let Some(existing_window) = app.active_window() {
+            existing_window.close();
+        }
         app.quit();
     }));
     app.add_action(&quit);

From 2ac769f7383b4227c6ba7b2b0a5dec5166de2852 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 20 Feb 2022 13:23:28 -0500
Subject: [PATCH 17/33] at long last... ^C f to search and fix focus #32

---
 src/app/components/navigation/navigation.rs | 11 ++++++++---
 src/app/components/search/search.rs         |  8 +++++++-
 src/app/components/search/search.ui         |  2 ++
 src/app/components/search/search_model.rs   |  2 +-
 src/main.rs                                 |  7 +++++++
 src/window.ui.in                            | 12 ++++++++----
 6 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/app/components/navigation/navigation.rs b/src/app/components/navigation/navigation.rs
index 6c11ffa3..44b95d5f 100644
--- a/src/app/components/navigation/navigation.rs
+++ b/src/app/components/navigation/navigation.rs
@@ -1,3 +1,4 @@
+use gtk::traits::WidgetExt;
 use libadwaita::NavigationDirection;
 use std::rc::Rc;
 
@@ -92,14 +93,18 @@ impl Navigation {
             ScreenName::User(id) => Box::new(self.screen_factory.make_user_details(id.to_owned())),
         };
 
-        let widget = component.get_root_widget();
+        let widget = component.get_root_widget().clone();
+        self.children.push(component);
 
         self.leaflet.navigate(NavigationDirection::Forward);
         self.navigation_stack
-            .add_named(widget, Some(name.identifier().as_ref()));
-        self.children.push(component);
+            .add_named(&widget, Some(name.identifier().as_ref()));
         self.navigation_stack
             .set_visible_child_name(name.identifier().as_ref());
+
+        glib::source::idle_add_local_once(move || {
+            widget.grab_focus();
+        });
     }
 
     fn pop(&mut self) {
diff --git a/src/app/components/search/search.rs b/src/app/components/search/search.rs
index 0d23727c..496ef87e 100644
--- a/src/app/components/search/search.rs
+++ b/src/app/components/search/search.rs
@@ -52,8 +52,13 @@ mod imp {
     }
 
     impl ObjectImpl for SearchResultsWidget {}
-    impl WidgetImpl for SearchResultsWidget {}
     impl BoxImpl for SearchResultsWidget {}
+
+    impl WidgetImpl for SearchResultsWidget {
+        fn grab_focus(&self, _: &Self::Type) -> bool {
+            self.search_entry.grab_focus()
+        }
+    }
 }
 
 glib::wrapper! {
@@ -222,6 +227,7 @@ impl EventListener for SearchResults {
     fn on_event(&mut self, app_event: &AppEvent) {
         match app_event {
             AppEvent::BrowserEvent(BrowserEvent::SearchUpdated) => {
+                self.get_root_widget().grab_focus();
                 self.update_search_query();
             }
             AppEvent::BrowserEvent(BrowserEvent::SearchResultsUpdated) => {
diff --git a/src/app/components/search/search.ui b/src/app/components/search/search.ui
index a93fdcf8..35a93571 100644
--- a/src/app/components/search/search.ui
+++ b/src/app/components/search/search.ui
@@ -3,6 +3,7 @@
   <requires lib="gtk" version="4.0" />
   <template class="SearchResultsWidget" parent="GtkBox">
     <property name="orientation">vertical</property>
+    <property name="can-focus">1</property>
     <child>
       <object class="AdwHeaderBar" id="main_header">
         <property name="show-end-title-buttons">1</property>
@@ -17,6 +18,7 @@
         <child type="title">
           <object class="GtkSearchEntry" id="search_entry">
             <property name="receives-default">1</property>
+            <property name="can-focus">1</property>
           </object>
         </child>
       </object>
diff --git a/src/app/components/search/search_model.rs b/src/app/components/search/search_model.rs
index 8184ec6c..f6289c63 100644
--- a/src/app/components/search/search_model.rs
+++ b/src/app/components/search/search_model.rs
@@ -30,7 +30,7 @@ impl SearchResultsModel {
 
     fn get_query(&self) -> Option<impl Deref<Target = String> + '_> {
         self.app_model
-            .map_state_opt(|s| Some(&s.browser.search_state()?.query))
+            .map_state_opt(|s| Some(&s.browser.search_state()?.query).filter(|s| !s.is_empty()))
     }
 
     pub fn fetch_results(&self) {
diff --git a/src/main.rs b/src/main.rs
index b65d64f8..d93633f7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,6 +5,7 @@ extern crate lazy_static;
 #[macro_use]
 extern crate log;
 
+use app::state::ScreenName;
 use futures::channel::mpsc::UnboundedSender;
 use gettextrs::*;
 use gio::prelude::*;
@@ -144,6 +145,12 @@ fn register_actions(app: &gtk::Application, sender: UnboundedSender<AppAction>)
     app.add_action(&make_action(
         "nav_pop",
         AppAction::BrowserAction(BrowserAction::NavigationPop),
+        sender.clone(),
+    ));
+
+    app.add_action(&make_action(
+        "search",
+        AppAction::BrowserAction(BrowserAction::NavigationPush(ScreenName::Search)),
         sender,
     ));
 }
diff --git a/src/window.ui.in b/src/window.ui.in
index ab7aba51..a0f0e4d0 100644
--- a/src/window.ui.in
+++ b/src/window.ui.in
@@ -25,13 +25,13 @@
             </child>
             <child>
               <object class="GtkShortcut">
-                <property name="trigger">&lt;Alt&gt;P</property>
+                <property name="trigger">P</property>
                 <property name="action">action(app.player_prev)</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcut">
-                <property name="trigger">&lt;Alt&gt;N</property>
+                <property name="trigger">N</property>
                 <property name="action">action(app.player_next)</property>
               </object>
             </child>
@@ -41,6 +41,12 @@
                 <property name="action">action(app.nav_pop)</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcut">
+                <property name="trigger">&lt;Ctrl&gt;F</property>
+                <property name="action">action(app.search)</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
@@ -59,7 +65,6 @@
                         </binding>
                         <child>
                           <object class="GtkButton" id="search_button">
-                            <property name="receives-default">1</property>
                             <property name="icon-name">system-search-symbolic</property>
                           </object>
                         </child>
@@ -70,7 +75,6 @@
                         </child>
                         <child type="end">
                           <object class="GtkMenuButton" id="user">
-                            <property name="receives-default">1</property>
                             <property name="icon-name">open-menu-symbolic</property>
                           </object>
                         </child>

From ef3309cecf3050ea46a2b714aa36b7ce0e8de549 Mon Sep 17 00:00:00 2001
From: sei0o inoue <sei0o@live.jp>
Date: Mon, 28 Feb 2022 11:34:08 +0900
Subject: [PATCH 18/33] GUI for GSettings (#467)

* Add settings window

* Remove unnecessary code

* Settings changes are reflected on startup

* Reflect changes on selecting a theme or closing the preferences window

* Fix UI issues in settings window

* Player stops when its settings changes

* Add missing comment for translators

* Improve UI for preferences

* Remove unnecessary code

* Put settings in the state

* Remove redundant action

* Fix unused imports

* Remove extra cloning

* Add paths for settings to meson.build
---
 src/app/components/mod.rs                     |   3 +
 src/app/components/player_notifier.rs         |   5 +-
 src/app/components/settings/mod.rs            |   5 +
 src/app/components/settings/settings.rs       | 250 ++++++++++++++++++
 src/app/components/settings/settings.ui       |  91 +++++++
 src/app/components/settings/settings_model.rs |  32 +++
 src/app/components/user_menu/user_menu.rs     |  13 +-
 src/app/mod.rs                                |   6 +-
 src/app/state/app_state.rs                    |   6 +
 src/app/state/mod.rs                          |   2 +
 src/app/state/settings_state.rs               |  53 ++++
 src/meson.build                               |   4 +
 src/player/mod.rs                             |   1 +
 src/player/player.rs                          |  31 ++-
 src/settings.rs                               |   3 +-
 src/spot.gresource.xml                        |   4 +-
 16 files changed, 496 insertions(+), 13 deletions(-)
 create mode 100644 src/app/components/settings/mod.rs
 create mode 100644 src/app/components/settings/settings.rs
 create mode 100644 src/app/components/settings/settings.ui
 create mode 100644 src/app/components/settings/settings_model.rs
 create mode 100644 src/app/state/settings_state.rs

diff --git a/src/app/components/mod.rs b/src/app/components/mod.rs
index 537a3dc8..86d4809e 100644
--- a/src/app/components/mod.rs
+++ b/src/app/components/mod.rs
@@ -25,6 +25,9 @@ pub use playlist::*;
 mod login;
 pub use login::*;
 
+mod settings;
+pub use settings::*;
+
 mod player_notifier;
 pub use player_notifier::PlayerNotifier;
 
diff --git a/src/app/components/player_notifier.rs b/src/app/components/player_notifier.rs
index c61ddfaf..e2e5aa35 100644
--- a/src/app/components/player_notifier.rs
+++ b/src/app/components/player_notifier.rs
@@ -2,7 +2,7 @@ use futures::channel::mpsc::UnboundedSender;
 use librespot::core::spotify_id::SpotifyId;
 
 use crate::app::components::EventListener;
-use crate::app::state::{LoginAction, LoginEvent, LoginStartedEvent, PlaybackEvent};
+use crate::app::state::{LoginAction, LoginEvent, LoginStartedEvent, PlaybackEvent, SettingsEvent};
 use crate::app::{AppAction, AppEvent};
 use crate::player::Command;
 
@@ -54,6 +54,9 @@ impl EventListener for PlayerNotifier {
             }),
             AppEvent::LoginEvent(LoginEvent::FreshTokenRequested) => Some(Command::RefreshToken),
             AppEvent::LoginEvent(LoginEvent::LogoutCompleted) => Some(Command::Logout),
+            AppEvent::SettingsEvent(SettingsEvent::PlayerSettingsChanged) => {
+                Some(Command::ReloadSettings)
+            }
             _ => None,
         };
 
diff --git a/src/app/components/settings/mod.rs b/src/app/components/settings/mod.rs
new file mode 100644
index 00000000..6d479c0b
--- /dev/null
+++ b/src/app/components/settings/mod.rs
@@ -0,0 +1,5 @@
+mod settings;
+mod settings_model;
+
+pub use settings::*;
+pub use settings_model::*;
diff --git a/src/app/components/settings/settings.rs b/src/app/components/settings/settings.rs
new file mode 100644
index 00000000..63eb0644
--- /dev/null
+++ b/src/app/components/settings/settings.rs
@@ -0,0 +1,250 @@
+use crate::app::components::EventListener;
+use crate::app::AppEvent;
+use crate::settings::SpotSettings;
+
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::CompositeTemplate;
+use libadwaita::prelude::*;
+
+use super::SettingsModel;
+
+const SETTINGS: &str = "dev.alextren.Spot";
+
+mod imp {
+
+    use super::*;
+    use libadwaita::subclass::prelude::*;
+
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(resource = "/dev/alextren/Spot/components/settings.ui")]
+    pub struct SettingsWindow {
+        #[template_child]
+        pub player_bitrate: TemplateChild<libadwaita::ComboRow>,
+
+        #[template_child]
+        pub alsa_device: TemplateChild<gtk::Entry>,
+
+        #[template_child]
+        pub alsa_device_row: TemplateChild<libadwaita::ActionRow>,
+
+        #[template_child]
+        pub audio_backend: TemplateChild<libadwaita::ComboRow>,
+
+        #[template_child]
+        pub ap_port: TemplateChild<gtk::Entry>,
+
+        #[template_child]
+        pub theme: TemplateChild<libadwaita::ComboRow>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for SettingsWindow {
+        const NAME: &'static str = "SettingsWindow";
+        type Type = super::SettingsWindow;
+        type ParentType = libadwaita::PreferencesWindow;
+
+        fn class_init(klass: &mut Self::Class) {
+            Self::bind_template(klass);
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for SettingsWindow {}
+    impl WidgetImpl for SettingsWindow {}
+    impl WindowImpl for SettingsWindow {}
+    impl AdwWindowImpl for SettingsWindow {}
+    impl PreferencesWindowImpl for SettingsWindow {}
+}
+
+glib::wrapper! {
+    pub struct SettingsWindow(ObjectSubclass<imp::SettingsWindow>) @extends gtk::Widget, gtk::Window, libadwaita::Window, libadwaita::PreferencesWindow;
+}
+
+impl SettingsWindow {
+    pub fn new() -> Self {
+        let window: Self =
+            glib::Object::new(&[]).expect("Failed to create an instance of SettingsWindow");
+
+        window.bind_backend_and_device();
+        window.bind_settings();
+        window.connect_theme_select();
+        window
+    }
+
+    fn bind_backend_and_device(&self) {
+        let widget = imp::SettingsWindow::from_instance(self);
+
+        let audio_backend = widget
+            .audio_backend
+            .downcast_ref::<libadwaita::ComboRow>()
+            .unwrap();
+        let alsa_device_row = widget
+            .alsa_device_row
+            .downcast_ref::<libadwaita::ActionRow>()
+            .unwrap();
+
+        audio_backend
+            .bind_property("selected", alsa_device_row, "visible")
+            .transform_to(|_, value| value.get::<u32>().ok().map(|u| (u == 1).to_value()))
+            .build();
+
+        if audio_backend.selected() == 0 {
+            alsa_device_row.set_visible(false);
+        }
+    }
+
+    fn bind_settings(&self) {
+        let widget = imp::SettingsWindow::from_instance(self);
+        let settings = gio::Settings::new(SETTINGS);
+
+        let player_bitrate = widget
+            .player_bitrate
+            .downcast_ref::<libadwaita::ComboRow>()
+            .unwrap();
+        settings
+            .bind("player-bitrate", player_bitrate, "selected")
+            .mapping(|variant, _| {
+                variant.str().map(|s| {
+                    match s {
+                        "96" => 0,
+                        "160" => 1,
+                        "320" => 2,
+                        _ => unreachable!(),
+                    }
+                    .to_value()
+                })
+            })
+            .set_mapping(|value, _| {
+                value.get::<u32>().ok().map(|u| {
+                    match u {
+                        0 => "96",
+                        1 => "160",
+                        2 => "320",
+                        _ => unreachable!(),
+                    }
+                    .to_variant()
+                })
+            })
+            .build();
+
+        let alsa_device = widget.alsa_device.downcast_ref::<gtk::Entry>().unwrap();
+        settings.bind("alsa-device", alsa_device, "text").build();
+
+        let audio_backend = widget
+            .audio_backend
+            .downcast_ref::<libadwaita::ComboRow>()
+            .unwrap();
+        settings
+            .bind("audio-backend", audio_backend, "selected")
+            .mapping(|variant, _| {
+                variant.str().map(|s| {
+                    match s {
+                        "pulseaudio" => 0,
+                        "alsa" => 1,
+                        _ => unreachable!(),
+                    }
+                    .to_value()
+                })
+            })
+            .set_mapping(|value, _| {
+                value.get::<u32>().ok().map(|u| {
+                    match u {
+                        0 => "pulseaudio",
+                        1 => "alsa",
+                        _ => unreachable!(),
+                    }
+                    .to_variant()
+                })
+            })
+            .build();
+
+        let ap_port = widget.ap_port.downcast_ref::<gtk::Entry>().unwrap();
+        settings
+            .bind("ap-port", ap_port, "text")
+            .mapping(|variant, _| variant.get::<u32>().map(|s| s.to_value()))
+            .set_mapping(|value, _| value.get::<u32>().ok().map(|u| u.to_variant()))
+            .build();
+
+        let theme = widget.theme.downcast_ref::<libadwaita::ComboRow>().unwrap();
+        settings
+            .bind("prefers-dark-theme", theme, "selected")
+            .mapping(|variant, _| {
+                variant
+                    .get::<bool>()
+                    .map(|prefer_dark| if prefer_dark { 1 } else { 0 }.to_value())
+            })
+            .set_mapping(|value, _| value.get::<u32>().ok().map(|u| (u == 1).to_variant()))
+            .build();
+    }
+
+    fn connect_theme_select(&self) {
+        let widget = imp::SettingsWindow::from_instance(self);
+        let theme = widget.theme.downcast_ref::<libadwaita::ComboRow>().unwrap();
+        theme.connect_selected_notify(|theme| {
+            let prefers_dark_theme = theme.selected() == 1;
+            let manager = libadwaita::StyleManager::default();
+
+            manager.set_color_scheme(if prefers_dark_theme {
+                libadwaita::ColorScheme::PreferDark
+            } else {
+                libadwaita::ColorScheme::PreferLight
+            });
+        });
+    }
+
+    fn connect_close<F>(&self, on_close: F)
+    where
+        F: Fn() + 'static,
+    {
+        let window = self.upcast_ref::<libadwaita::Window>();
+
+        window.connect_close_request(
+            clone!(@weak self as _self => @default-return gtk::Inhibit(false), move |_| {
+                on_close();
+                gtk::Inhibit(false)
+            }),
+        );
+    }
+}
+
+pub struct Settings {
+    parent: gtk::Window,
+    settings_window: SettingsWindow,
+}
+
+impl Settings {
+    pub fn new(parent: gtk::Window, model: SettingsModel) -> Self {
+        let settings_window = SettingsWindow::new();
+
+        settings_window.connect_close(move || {
+            let new_settings = SpotSettings::new_from_gsettings().unwrap_or_default();
+            if model.settings().player_settings != new_settings.player_settings {
+                model.stop_player();
+            }
+            model.set_settings();
+        });
+
+        Self {
+            parent,
+            settings_window,
+        }
+    }
+
+    fn window(&self) -> &libadwaita::Window {
+        self.settings_window.upcast_ref::<libadwaita::Window>()
+    }
+
+    pub fn show_self(&self) {
+        self.window().set_transient_for(Some(&self.parent));
+        self.window().set_modal(true);
+        self.window().show();
+    }
+}
+
+impl EventListener for Settings {
+    fn on_event(&mut self, _: &AppEvent) {}
+}
diff --git a/src/app/components/settings/settings.ui b/src/app/components/settings/settings.ui
new file mode 100644
index 00000000..10487e72
--- /dev/null
+++ b/src/app/components/settings/settings.ui
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0" />
+  <requires lib="libadwaita" version="1.0" />
+  <template class="SettingsWindow" parent="AdwPreferencesWindow">
+    <property name="default-width">600</property>
+    <property name="hide-on-close">1</property>
+    <property name="search-enabled">0</property>
+    <child>
+      <object class="AdwPreferencesPage">
+        <child>
+          <object class="AdwPreferencesGroup">
+            <property name="title" translatable="yes" comments="Header for a group of preference items regarding audio">Audio</property>
+            <child>
+              <object class="AdwComboRow" id="audio_backend">
+                <property name="title" translatable="yes" comments="Title for an item in preferences">Audio Backend</property>
+                <property name="model">
+                  <object class="GtkStringList">
+                    <items>
+                      <item>PulseAudio</item>
+                      <item>ALSA</item>
+                    </items>
+                  </object>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="AdwActionRow" id="alsa_device_row">
+                <property name="title" translatable="yes" comments="Title for an item in preferences">ALSA Device</property>
+                <property name="subtitle" translatable="yes" comments="Description for the item (ALSA Device) in preferences">Applied only if audio backend is ALSA</property>
+                <child>
+                  <object class="GtkEntry" id="alsa_device">
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="AdwComboRow" id="player_bitrate">
+                <property name="title" translatable="yes" comments="Title for an item in preferences">Audio Quality</property>
+                <property name="model">
+                  <object class="GtkStringList">
+                    <items>
+                      <item translatable="yes">Normal</item>
+                      <item translatable="yes">High</item>
+                      <item translatable="yes">Very high</item>
+                    </items>
+                  </object>
+                </property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwPreferencesGroup">
+            <property name="title" translatable="yes" comments="Header for a group of preference items regarding the application's appearance">Appearance</property>
+            <child>
+              <object class="AdwComboRow" id="theme">
+                <property name="title" translatable="yes" comments="Title for an item in preferences">Theme</property>
+                <property name="model">
+                  <object class="GtkStringList">
+                    <items>
+                      <item translatable="yes">Light</item>
+                      <item translatable="yes">Dark</item>
+                    </items>
+                  </object>
+                </property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwPreferencesGroup">
+            <property name="title" translatable="yes" comments="Header for a group of preference items regarding network">Network</property>
+            <child>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes" comments="Title for an item in preferences">Access Point Port</property>
+                <property name="subtitle" translatable="yes" comments="Longer description for an item (Access Point Port) in preferences">Port used for connections to Spotify's Access Point. Set to 0 if any port is fine.</property>
+                <child>
+                  <object class="GtkEntry" id="ap_port">
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/app/components/settings/settings_model.rs b/src/app/components/settings/settings_model.rs
new file mode 100644
index 00000000..4706497c
--- /dev/null
+++ b/src/app/components/settings/settings_model.rs
@@ -0,0 +1,32 @@
+use crate::app::state::{PlaybackAction, SettingsAction};
+use crate::app::{ActionDispatcher, AppModel};
+use crate::settings::SpotSettings;
+use std::rc::Rc;
+
+pub struct SettingsModel {
+    app_model: Rc<AppModel>,
+    dispatcher: Box<dyn ActionDispatcher>,
+}
+
+impl SettingsModel {
+    pub fn new(app_model: Rc<AppModel>, dispatcher: Box<dyn ActionDispatcher>) -> Self {
+        Self {
+            app_model,
+            dispatcher,
+        }
+    }
+
+    pub fn stop_player(&self) {
+        self.dispatcher.dispatch(PlaybackAction::Stop.into());
+    }
+
+    pub fn set_settings(&self) {
+        self.dispatcher
+            .dispatch(SettingsAction::ChangeSettings.into());
+    }
+
+    pub fn settings(&self) -> SpotSettings {
+        let state = self.app_model.get_state();
+        state.settings.settings.clone()
+    }
+}
diff --git a/src/app/components/user_menu/user_menu.rs b/src/app/components/user_menu/user_menu.rs
index 4e02a6c3..85d2b89b 100644
--- a/src/app/components/user_menu/user_menu.rs
+++ b/src/app/components/user_menu/user_menu.rs
@@ -4,7 +4,7 @@ use gtk::prelude::*;
 use std::rc::Rc;
 
 use super::UserMenuModel;
-use crate::app::components::EventListener;
+use crate::app::components::{EventListener, Settings};
 use crate::app::{state::LoginEvent, AppEvent};
 
 pub struct UserMenu {
@@ -15,6 +15,7 @@ pub struct UserMenu {
 impl UserMenu {
     pub fn new(
         user_button: gtk::MenuButton,
+        settings: Settings,
         about: gtk::AboutDialog,
         model: UserMenuModel,
     ) -> Self {
@@ -37,6 +38,14 @@ impl UserMenu {
             logout
         });
 
+        action_group.add_action(&{
+            let settings_action = SimpleAction::new("settings", None);
+            settings_action.connect_activate(clone!(@weak model => move |_, _| {
+                settings.show_self();
+            }));
+            settings_action
+        });
+
         action_group.add_action(&{
             let about_action = SimpleAction::new("about", None);
             about_action.connect_activate(clone!(@weak about => move |_, _| {
@@ -53,6 +62,8 @@ impl UserMenu {
     fn update_menu(&self) {
         let menu = gio::Menu::new();
         // translators: This is a menu entry.
+        menu.append(Some(&gettext("Preferences")), Some("menu.settings"));
+        // translators: This is a menu entry.
         menu.append(Some(&gettext("About")), Some("menu.about"));
         // translators: This is a menu entry.
         menu.append(Some(&gettext("Quit")), Some("app.quit"));
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 656effb8..7aed738f 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -189,10 +189,14 @@ impl App {
         app_model: Rc<AppModel>,
         dispatcher: Box<dyn ActionDispatcher>,
     ) -> Box<UserMenu> {
+        let parent: gtk::Window = builder.object("window").unwrap();
+        let settings_model = SettingsModel::new(app_model.clone(), dispatcher.box_clone());
+        let settings = Settings::new(parent, settings_model);
+
         let button: gtk::MenuButton = builder.object("user").unwrap();
         let about: gtk::AboutDialog = builder.object("about").unwrap();
         let model = UserMenuModel::new(app_model, dispatcher);
-        let user_menu = UserMenu::new(button, about, model);
+        let user_menu = UserMenu::new(button, settings, about, model);
         Box::new(user_menu)
     }
 
diff --git a/src/app/state/app_state.rs b/src/app/state/app_state.rs
index 65f41918..cfa72e26 100644
--- a/src/app/state/app_state.rs
+++ b/src/app/state/app_state.rs
@@ -5,6 +5,7 @@ use crate::app::state::{
     login_state::{LoginAction, LoginEvent, LoginState},
     playback_state::{PlaybackAction, PlaybackEvent, PlaybackState},
     selection_state::{SelectionAction, SelectionContext, SelectionEvent, SelectionState},
+    settings_state::{SettingsAction, SettingsEvent, SettingsState},
     ScreenName, UpdatableState,
 };
 
@@ -14,6 +15,7 @@ pub enum AppAction {
     BrowserAction(BrowserAction),
     SelectionAction(SelectionAction),
     LoginAction(LoginAction),
+    SettingsAction(SettingsAction),
     Start,
     Raise,
     ShowNotification(String),
@@ -90,6 +92,7 @@ pub enum AppEvent {
     Raised,
     NotificationShown(String),
     NowPlayingShown,
+    SettingsEvent(SettingsEvent),
 }
 
 pub struct AppState {
@@ -98,6 +101,7 @@ pub struct AppState {
     pub browser: BrowserState,
     pub selection: SelectionState,
     pub logged_user: LoginState,
+    pub settings: SettingsState,
 }
 
 impl AppState {
@@ -108,6 +112,7 @@ impl AppState {
             browser: BrowserState::new(),
             selection: Default::default(),
             logged_user: Default::default(),
+            settings: Default::default(),
         }
     }
 
@@ -200,6 +205,7 @@ impl AppState {
             AppAction::BrowserAction(a) => forward_action(a, &mut self.browser),
             AppAction::SelectionAction(a) => forward_action(a, &mut self.selection),
             AppAction::LoginAction(a) => forward_action(a, &mut self.logged_user),
+            AppAction::SettingsAction(a) => forward_action(a, &mut self.settings),
             _ => vec![],
         }
     }
diff --git a/src/app/state/mod.rs b/src/app/state/mod.rs
index 3b9c85e2..2ae01721 100644
--- a/src/app/state/mod.rs
+++ b/src/app/state/mod.rs
@@ -6,6 +6,7 @@ mod pagination;
 mod playback_state;
 mod screen_states;
 mod selection_state;
+mod settings_state;
 
 use std::borrow::Cow;
 
@@ -17,6 +18,7 @@ pub use pagination::*;
 pub use playback_state::*;
 pub use screen_states::*;
 pub use selection_state::*;
+pub use settings_state::*;
 
 pub trait UpdatableState {
     type Action: Clone;
diff --git a/src/app/state/settings_state.rs b/src/app/state/settings_state.rs
new file mode 100644
index 00000000..648c3292
--- /dev/null
+++ b/src/app/state/settings_state.rs
@@ -0,0 +1,53 @@
+use crate::{
+    app::state::{AppAction, AppEvent, UpdatableState},
+    settings::SpotSettings,
+};
+
+#[derive(Clone, Debug)]
+pub enum SettingsAction {
+    ChangeSettings,
+}
+
+impl From<SettingsAction> for AppAction {
+    fn from(settings_action: SettingsAction) -> Self {
+        Self::SettingsAction(settings_action)
+    }
+}
+
+#[derive(Clone, Debug)]
+pub enum SettingsEvent {
+    PlayerSettingsChanged,
+}
+
+impl From<SettingsEvent> for AppEvent {
+    fn from(settings_event: SettingsEvent) -> Self {
+        Self::SettingsEvent(settings_event)
+    }
+}
+
+#[derive(Default)]
+pub struct SettingsState {
+    pub settings: SpotSettings,
+}
+
+impl UpdatableState for SettingsState {
+    type Action = SettingsAction;
+    type Event = AppEvent;
+
+    fn update_with(&mut self, action: std::borrow::Cow<Self::Action>) -> Vec<Self::Event> {
+        match action.into_owned() {
+            SettingsAction::ChangeSettings => {
+                let old_settings = &self.settings;
+                let new_settings = SpotSettings::new_from_gsettings().unwrap_or_default();
+                let player_settings_changed =
+                    new_settings.player_settings != old_settings.player_settings;
+                self.settings = new_settings;
+                if player_settings_changed {
+                    vec![SettingsEvent::PlayerSettingsChanged.into()]
+                } else {
+                    vec![]
+                }
+            }
+        }
+    }
+}
diff --git a/src/meson.build b/src/meson.build
index f0235a60..755d8708 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -77,6 +77,7 @@ sources = files(
 './app/state/pagination.rs',
 './app/state/app_state.rs',
 './app/state/login_state.rs',
+'./app/state/settings_state.rs',
 './app/state/browser_state.rs',
 './app/state/playback_state.rs',
 './app/state/mod.rs',
@@ -131,6 +132,9 @@ sources = files(
 './app/components/login/login.rs',
 './app/components/login/mod.rs',
 './app/components/login/login_model.rs',
+'./app/components/settings/mod.rs',
+'./app/components/settings/settings_model.rs',
+'./app/components/settings/settings.rs',
 './app/components/playlist_details/playlist_details_model.rs',
 './app/components/playlist_details/mod.rs',
 './app/components/playlist_details/playlist_details.rs',
diff --git a/src/player/mod.rs b/src/player/mod.rs
index f91cb6c4..8d64551f 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -24,6 +24,7 @@ pub enum Command {
     PlayerSeek(u32),
     PlayerSetVolume(f64),
     RefreshToken,
+    ReloadSettings,
 }
 
 struct AppPlayerDelegate {
diff --git a/src/player/player.rs b/src/player/player.rs
index 1093b7f6..81894130 100644
--- a/src/player/player.rs
+++ b/src/player/player.rs
@@ -22,6 +22,7 @@ use std::time::{Duration, SystemTime};
 
 use super::Command;
 use crate::app::credentials;
+use crate::settings::SpotSettings;
 
 #[derive(Debug)]
 pub enum SpotifyError {
@@ -51,13 +52,13 @@ pub trait SpotifyPlayerDelegate {
     fn notify_playback_state(&self, position: u32);
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum AudioBackend {
     PulseAudio,
     Alsa(String),
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SpotifyPlayerSettings {
     pub bitrate: Bitrate,
     pub backend: AudioBackend,
@@ -75,7 +76,7 @@ impl Default for SpotifyPlayerSettings {
 }
 
 pub struct SpotifyPlayer {
-    settings: SpotifyPlayerSettings,
+    settings: RefCell<SpotifyPlayerSettings>,
     player: RefCell<Option<Player>>,
     mixer: RefCell<Option<Box<dyn Mixer>>>,
     session: RefCell<Option<Session>>,
@@ -85,7 +86,7 @@ pub struct SpotifyPlayer {
 impl SpotifyPlayer {
     pub fn new(settings: SpotifyPlayerSettings, delegate: Rc<dyn SpotifyPlayerDelegate>) -> Self {
         Self {
-            settings,
+            settings: RefCell::new(settings),
             mixer: RefCell::new(None),
             player: RefCell::new(None),
             session: RefCell::new(None),
@@ -144,7 +145,8 @@ impl SpotifyPlayer {
             }
             Command::PasswordLogin { username, password } => {
                 let credentials = Credentials::with_password(username, password.clone());
-                let new_session = create_session(credentials, self.settings.ap_port).await?;
+                let new_session =
+                    create_session(credentials, self.settings.borrow().ap_port).await?;
                 let (token, token_expiry_time) =
                     get_access_token_and_expiry_time(&new_session).await?;
                 let credentials = credentials::Credentials {
@@ -169,7 +171,8 @@ impl SpotifyPlayer {
                     auth_type: AuthenticationType::AUTHENTICATION_SPOTIFY_TOKEN,
                     auth_data: token.clone().into_bytes(),
                 };
-                let new_session = create_session(credentials, self.settings.ap_port).await?;
+                let new_session =
+                    create_session(credentials, self.settings.borrow().ap_port).await?;
                 self.delegate
                     .token_login_successful(new_session.username(), token);
 
@@ -178,16 +181,28 @@ impl SpotifyPlayer {
                 player.replace(new_player);
                 session.replace(new_session);
 
+                Ok(())
+            }
+            Command::ReloadSettings => {
+                let settings = SpotSettings::new_from_gsettings().unwrap_or_default();
+                self.settings.replace(settings.player_settings);
+
+                let session = session.as_ref().ok_or(SpotifyError::PlayerNotReady)?;
+                let (new_player, channel) = self.create_player(session.clone());
+                tokio::task::spawn_local(player_setup_delegate(channel, Rc::clone(&self.delegate)));
+                player.replace(new_player);
+
                 Ok(())
             }
         }
     }
 
     fn create_player(&self, session: Session) -> (Player, PlayerEventChannel) {
-        let backend = self.settings.backend.clone();
+        let settings = self.settings.borrow();
+        let backend = settings.backend.clone();
 
         let player_config = PlayerConfig {
-            bitrate: self.settings.bitrate,
+            bitrate: settings.bitrate,
             ..Default::default()
         };
         info!("bitrate: {:?}", &player_config.bitrate);
diff --git a/src/settings.rs b/src/settings.rs
index ea3005c0..a29621e2 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -4,7 +4,7 @@ use librespot::playback::config::Bitrate;
 
 const SETTINGS: &str = "dev.alextren.Spot";
 
-#[derive(Clone, Default)]
+#[derive(Clone, Debug, Default)]
 pub struct WindowGeometry {
     pub width: i32,
     pub height: i32,
@@ -71,6 +71,7 @@ impl SpotifyPlayerSettings {
     }
 }
 
+#[derive(Debug, Clone)]
 pub struct SpotSettings {
     pub prefers_dark_theme: bool,
     pub player_settings: SpotifyPlayerSettings,
diff --git a/src/spot.gresource.xml b/src/spot.gresource.xml
index a99d3655..2e9be3c1 100644
--- a/src/spot.gresource.xml
+++ b/src/spot.gresource.xml
@@ -5,6 +5,8 @@
     <file>app.css</file>
     <!-- login -->
     <file alias="components/login.ui">app/components/login/login.ui</file>
+    <!-- settings -->
+    <file alias="components/settings.ui">app/components/settings/settings.ui</file>
     <!-- search -->
     <file alias="components/search.ui">app/components/search/search.ui</file>
     <!-- album -->
@@ -55,4 +57,4 @@
     <file compressed="true" preprocess="xml-stripblanks" alias="playlist2-symbolic.svg">app/components/selection/icons/playlist2-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks" alias="library-music-symbolic.svg">app/components/sidebar_listbox/icons/library-music-symbolic.svg</file>
   </gresource>
-</gresources>
\ No newline at end of file
+</gresources>

From 1851ffdba2ad6636e43a21abbd3981568996faf4 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 13 Mar 2022 12:34:09 -0400
Subject: [PATCH 19/33] add ci to development, finally...

---
 .github/workflows/spot-development.yml | 22 ++++++++++++++++++++++
 .github/workflows/spot-snapshots.yml   |  6 +++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/spot-development.yml

diff --git a/.github/workflows/spot-development.yml b/.github/workflows/spot-development.yml
new file mode 100644
index 00000000..9a25fc1d
--- /dev/null
+++ b/.github/workflows/spot-development.yml
@@ -0,0 +1,22 @@
+name: spot-development
+
+on:
+  pull_request:
+    branches: [development]
+  workflow_dispatch:
+
+jobs:
+  flatpak-builder:
+    name: "Flatpak Builder"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v2
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+      with:
+        bundle: "spot.flatpak"
+        manifest-path: "dev.alextren.Spot.development.json"
+        cache-key: flatpak-builder-${{ github.sha }}
+        run-tests: true
diff --git a/.github/workflows/spot-snapshots.yml b/.github/workflows/spot-snapshots.yml
index 5062beb2..46899bfb 100644
--- a/.github/workflows/spot-snapshots.yml
+++ b/.github/workflows/spot-snapshots.yml
@@ -2,9 +2,9 @@ name: spot-snapshots
 
 on:
   push:
-    branches: [master, gtk4/main]
+    branches: [master]
   pull_request:
-    branches: [master, gtk4/main]
+    branches: [master]
   workflow_dispatch:
 
 jobs:
@@ -16,7 +16,7 @@ jobs:
       options: --privileged
     steps:
     - uses: actions/checkout@v2
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
       with:
         bundle: "spot.flatpak"
         manifest-path: "dev.alextren.Spot.snapshots.json"

From 51b349042a0f555d49c5f7db7f9edc35be1f5b3d Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 13 Mar 2022 12:36:21 -0400
Subject: [PATCH 20/33] fixes #381 (#484)

---
 src/app/components/details/details.rs     |  3 ++-
 src/app/components/headerbar/component.rs |  7 ++++++-
 src/app/components/headerbar/headerbar.ui |  3 ++-
 src/app/components/headerbar/widget.rs    | 11 +++++++++++
 src/app/components/navigation/factory.rs  | 14 ++++++++++++--
 src/app/components/search/search.rs       | 18 +++++++++++++++++-
 src/app/mod.rs                            |  8 ++++++--
 7 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/app/components/details/details.rs b/src/app/components/details/details.rs
index 93b4feaf..fcb36c33 100644
--- a/src/app/components/details/details.rs
+++ b/src/app/components/details/details.rs
@@ -207,7 +207,7 @@ pub struct Details {
 }
 
 impl Details {
-    pub fn new(model: Rc<DetailsModel>, worker: Worker) -> Self {
+    pub fn new(model: Rc<DetailsModel>, worker: Worker, leaflet: &libadwaita::Leaflet) -> Self {
         if model.get_album_info().is_none() {
             model.load_album_info();
         }
@@ -221,6 +221,7 @@ impl Details {
         ));
 
         let headerbar_widget = widget.headerbar_widget();
+        headerbar_widget.bind_to_leaflet(leaflet);
         let headerbar = Box::new(HeaderBarComponent::new(
             headerbar_widget.clone(),
             model.to_headerbar_model(),
diff --git a/src/app/components/headerbar/component.rs b/src/app/components/headerbar/component.rs
index a230d6e3..3aaaf699 100644
--- a/src/app/components/headerbar/component.rs
+++ b/src/app/components/headerbar/component.rs
@@ -248,9 +248,14 @@ impl<Model> StandardScreen<Model>
 where
     Model: HeaderBarModel + 'static,
 {
-    pub fn new(wrapped: impl ListenerComponent + 'static, model: Rc<Model>) -> Self {
+    pub fn new(
+        wrapped: impl ListenerComponent + 'static,
+        leaflet: &libadwaita::Leaflet,
+        model: Rc<Model>,
+    ) -> Self {
         let widget = HeaderBarWidget::new();
         common::bind_headerbar(&widget, &model);
+        widget.bind_to_leaflet(leaflet);
 
         let root = gtk::Box::builder()
             .orientation(gtk::Orientation::Vertical)
diff --git a/src/app/components/headerbar/headerbar.ui b/src/app/components/headerbar/headerbar.ui
index f220d584..57238c61 100644
--- a/src/app/components/headerbar/headerbar.ui
+++ b/src/app/components/headerbar/headerbar.ui
@@ -34,6 +34,7 @@
         <child type="overlay">
           <object class="AdwHeaderBar" id="selection_header">
             <property name="show-end-title-buttons">0</property>
+            <property name="show-start-title-buttons">0</property>
             <property name="visible">0</property>
             <style>
               <class name="selection-mode" />
@@ -62,4 +63,4 @@
       </object>
     </child>
   </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/src/app/components/headerbar/widget.rs b/src/app/components/headerbar/widget.rs
index 760eb61e..2b90a0b6 100644
--- a/src/app/components/headerbar/widget.rs
+++ b/src/app/components/headerbar/widget.rs
@@ -121,6 +121,17 @@ impl HeaderBarWidget {
         self.widget().go_back.connect_clicked(move |_| f());
     }
 
+    pub fn bind_to_leaflet(&self, leaflet: &libadwaita::Leaflet) {
+        leaflet
+            .bind_property(
+                "folded",
+                &*self.widget().main_header,
+                "show-start-title-buttons",
+            )
+            .build();
+        leaflet.notify("folded");
+    }
+
     pub fn set_can_go_back(&self, can_go_back: bool) {
         self.widget().go_back.set_visible(can_go_back);
     }
diff --git a/src/app/components/navigation/factory.rs b/src/app/components/navigation/factory.rs
index 6d29d8bf..7d7cbc7b 100644
--- a/src/app/components/navigation/factory.rs
+++ b/src/app/components/navigation/factory.rs
@@ -8,6 +8,7 @@ pub struct ScreenFactory {
     app_model: Rc<AppModel>,
     dispatcher: Box<dyn ActionDispatcher>,
     worker: Worker,
+    leaflet: libadwaita::Leaflet,
 }
 
 impl ScreenFactory {
@@ -15,11 +16,13 @@ impl ScreenFactory {
         app_model: Rc<AppModel>,
         dispatcher: Box<dyn ActionDispatcher>,
         worker: Worker,
+        leaflet: libadwaita::Leaflet,
     ) -> Self {
         Self {
             app_model,
             dispatcher,
             worker,
+            leaflet,
         }
     }
 
@@ -33,6 +36,7 @@ impl ScreenFactory {
         );
         StandardScreen::new(
             Library::new(self.worker.clone(), model),
+            &self.leaflet,
             Rc::new(screen_model),
         )
     }
@@ -51,6 +55,7 @@ impl ScreenFactory {
         );
         StandardScreen::new(
             SavedPlaylists::new(self.worker.clone(), model),
+            &self.leaflet,
             Rc::new(screen_model),
         )
     }
@@ -67,6 +72,7 @@ impl ScreenFactory {
         );
         StandardScreen::new(
             NowPlaying::new(model, self.worker.clone()),
+            &self.leaflet,
             Rc::new(screen_model),
         )
     }
@@ -84,6 +90,7 @@ impl ScreenFactory {
         ));
         StandardScreen::new(
             SavedTracks::new(model, self.worker.clone()),
+            &self.leaflet,
             Rc::new(screen_model),
         )
     }
@@ -94,13 +101,13 @@ impl ScreenFactory {
             Rc::clone(&self.app_model),
             self.dispatcher.box_clone(),
         ));
-        Details::new(model, self.worker.clone())
+        Details::new(model, self.worker.clone(), &self.leaflet)
     }
 
     pub fn make_search_results(&self) -> impl ListenerComponent {
         let model =
             SearchResultsModel::new(Rc::clone(&self.app_model), self.dispatcher.box_clone());
-        SearchResults::new(model, self.worker.clone())
+        SearchResults::new(model, self.worker.clone(), &self.leaflet)
     }
 
     pub fn make_artist_details(&self, id: String) -> impl ListenerComponent {
@@ -116,6 +123,7 @@ impl ScreenFactory {
         );
         StandardScreen::new(
             ArtistDetails::new(model, self.worker.clone()),
+            &self.leaflet,
             Rc::new(screen_model),
         )
     }
@@ -133,6 +141,7 @@ impl ScreenFactory {
         );
         StandardScreen::new(
             PlaylistDetails::new(model, self.worker.clone()),
+            &self.leaflet,
             Rc::new(screen_model),
         )
     }
@@ -148,6 +157,7 @@ impl ScreenFactory {
             UserDetailsModel::new(id, Rc::clone(&self.app_model), self.dispatcher.box_clone());
         StandardScreen::new(
             UserDetails::new(model, self.worker.clone()),
+            &self.leaflet,
             Rc::new(screen_model),
         )
     }
diff --git a/src/app/components/search/search.rs b/src/app/components/search/search.rs
index 496ef87e..46d516e4 100644
--- a/src/app/components/search/search.rs
+++ b/src/app/components/search/search.rs
@@ -17,6 +17,9 @@ mod imp {
     #[derive(Debug, Default, CompositeTemplate)]
     #[template(resource = "/dev/alextren/Spot/components/search.ui")]
     pub struct SearchResultsWidget {
+        #[template_child]
+        pub main_header: TemplateChild<libadwaita::HeaderBar>,
+
         #[template_child]
         pub go_back: TemplateChild<gtk::Button>,
 
@@ -74,6 +77,17 @@ impl SearchResultsWidget {
         imp::SearchResultsWidget::from_instance(self)
     }
 
+    pub fn bind_to_leaflet(&self, leaflet: &libadwaita::Leaflet) {
+        leaflet
+            .bind_property(
+                "folded",
+                &*self.widget().main_header,
+                "show-start-title-buttons",
+            )
+            .build();
+        leaflet.notify("folded");
+    }
+
     pub fn connect_go_back<F>(&self, f: F)
     where
         F: Fn() + 'static,
@@ -144,13 +158,15 @@ pub struct SearchResults {
 }
 
 impl SearchResults {
-    pub fn new(model: SearchResultsModel, worker: Worker) -> Self {
+    pub fn new(model: SearchResultsModel, worker: Worker, leaflet: &libadwaita::Leaflet) -> Self {
         let model = Rc::new(model);
         let widget = SearchResultsWidget::new();
 
         let album_results_model = gio::ListStore::new(AlbumModel::static_type());
         let artist_results_model = gio::ListStore::new(ArtistModel::static_type());
 
+        widget.bind_to_leaflet(leaflet);
+
         widget.connect_go_back(clone!(@weak model => move || {
             model.go_back();
         }));
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 7aed738f..db0cefa3 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -132,8 +132,12 @@ impl App {
         let home_list_store = gio::ListStore::new(SideBarItem::static_type());
         let home_listbox = build_sidebar_listbox(builder, &home_list_store);
         let model = NavigationModel::new(Rc::clone(&app_model), dispatcher.box_clone());
-        let screen_factory =
-            ScreenFactory::new(Rc::clone(&app_model), dispatcher.box_clone(), worker);
+        let screen_factory = ScreenFactory::new(
+            Rc::clone(&app_model),
+            dispatcher.box_clone(),
+            worker,
+            leaflet.clone(),
+        );
         Box::new(Navigation::new(
             model,
             leaflet,

From cfd94c94608e3c5c6891567fd145944fe2db6b92 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 13 Mar 2022 12:39:46 -0400
Subject: [PATCH 21/33] update rand / serde / tokio

---
 Cargo.lock         | 27 ++++++++---------------
 Cargo.toml         |  4 ++--
 cargo-sources.json | 53 +++++++++++++++++-----------------------------
 3 files changed, 31 insertions(+), 53 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5cd84ac6..7399e0ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1980,9 +1980,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
 name = "mio"
-version = "0.7.14"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
 dependencies = [
  "libc",
  "log",
@@ -2600,14 +2600,13 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha",
  "rand_core",
- "rand_hc",
 ]
 
 [[package]]
@@ -2639,15 +2638,6 @@ dependencies = [
  "rand",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.10"
@@ -2835,9 +2825,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085"
+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
 dependencies = [
  "itoa 1.0.1",
  "ryu",
@@ -3128,9 +3118,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.16.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
 dependencies = [
  "bytes",
  "libc",
@@ -3140,6 +3130,7 @@ dependencies = [
  "once_cell",
  "pin-project-lite",
  "signal-hook-registry",
+ "socket2",
  "tokio-macros",
  "winapi",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 27b1a324..31945ab8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,14 +41,14 @@ version = "^1.0.136"
 features = ["derive"]
 
 [dependencies.serde_json]
-version = "^1.0.78"
+version = "^1.0.79"
 
 [dependencies.isahc]
 version = "^1.2.0"
 features = ["json"]
 
 [dependencies.rand]
-version = "^0.8.4"
+version = "^0.8.5"
 features = ["small_rng"]
 
 [dependencies.gettext-rs]
diff --git a/cargo-sources.json b/cargo-sources.json
index 20acd31e..895e076b 100644
--- a/cargo-sources.json
+++ b/cargo-sources.json
@@ -2302,15 +2302,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/mio/mio-0.7.14.crate",
-        "sha256": "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc",
+        "url": "https://static.crates.io/crates/mio/mio-0.8.0.crate",
+        "sha256": "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2",
         "dest": "cargo/vendor",
-        "dest-filename": "mio-0.7.14.crate"
+        "dest-filename": "mio-0.8.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%228067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/mio-0.7.14",
+        "url": "data:%7B%22package%22%3A%20%22ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/mio-0.8.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3108,15 +3108,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/rand/rand-0.8.4.crate",
-        "sha256": "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8",
+        "url": "https://static.crates.io/crates/rand/rand-0.8.5.crate",
+        "sha256": "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404",
         "dest": "cargo/vendor",
-        "dest-filename": "rand-0.8.4.crate"
+        "dest-filename": "rand-0.8.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%222e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand-0.8.4",
+        "url": "data:%7B%22package%22%3A%20%2234af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/rand-0.8.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3158,19 +3158,6 @@
         "dest": "cargo/vendor/rand_distr-0.4.3",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "file",
-        "url": "https://static.crates.io/crates/rand_hc/rand_hc-0.3.1.crate",
-        "sha256": "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7",
-        "dest": "cargo/vendor",
-        "dest-filename": "rand_hc-0.3.1.crate"
-    },
-    {
-        "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/rand_hc-0.3.1",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.10.crate",
@@ -3446,15 +3433,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.78.crate",
-        "sha256": "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085",
+        "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.79.crate",
+        "sha256": "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95",
         "dest": "cargo/vendor",
-        "dest-filename": "serde_json-1.0.78.crate"
+        "dest-filename": "serde_json-1.0.79.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/serde_json-1.0.78",
+        "url": "data:%7B%22package%22%3A%20%228e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/serde_json-1.0.79",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3823,15 +3810,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/tokio/tokio-1.16.1.crate",
-        "sha256": "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a",
+        "url": "https://static.crates.io/crates/tokio/tokio-1.17.0.crate",
+        "sha256": "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee",
         "dest": "cargo/vendor",
-        "dest-filename": "tokio-1.16.1.crate"
+        "dest-filename": "tokio-1.17.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%220c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/tokio-1.16.1",
+        "url": "data:%7B%22package%22%3A%20%222af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/tokio-1.17.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {

From a9805a42e2c17b62226bfbd8ddb4529e3560bbd3 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 13 Mar 2022 12:51:00 -0400
Subject: [PATCH 22/33] update gio / glib

---
 Cargo.lock         |  8 ++++----
 Cargo.toml         |  4 ++--
 cargo-sources.json | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7399e0ed..075f3d19 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1020,9 +1020,9 @@ dependencies = [
 
 [[package]]
 name = "gio"
-version = "0.15.5"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59105fa464928adf56b159c8d980cc11fbfbe414befb904caac5163d383049bf"
+checksum = "96efd8a1c00d890f6b45671916e165b5e43ccec61957d443aff6d7e44f62d348"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -1050,9 +1050,9 @@ dependencies = [
 
 [[package]]
 name = "glib"
-version = "0.15.5"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dcfbdb6cc6c02aee163339465d8a40d6f3f64c3a43f729a4195f0e153338b7"
+checksum = "aa570813c504bdf7539a9400180c2dd4b789a819556fb86da7226d7d1b037b49"
 dependencies = [
  "bitflags",
  "futures-channel",
diff --git a/Cargo.toml b/Cargo.toml
index 31945ab8..aafcfde2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,11 +13,11 @@ version = "^0.4.0"
 package = "gdk4"
 
 [dependencies.gio]
-version = "^0.15.5"
+version = "^0.15.6"
 features = ["v2_60"]
 
 [dependencies.glib]
-version = "^0.15.2"
+version = "^0.15.6"
 features = ["v2_60"]
 
 [dependencies.librespot]
diff --git a/cargo-sources.json b/cargo-sources.json
index 895e076b..c7b9a9e0 100644
--- a/cargo-sources.json
+++ b/cargo-sources.json
@@ -1275,15 +1275,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gio/gio-0.15.5.crate",
-        "sha256": "59105fa464928adf56b159c8d980cc11fbfbe414befb904caac5163d383049bf",
+        "url": "https://static.crates.io/crates/gio/gio-0.15.6.crate",
+        "sha256": "96efd8a1c00d890f6b45671916e165b5e43ccec61957d443aff6d7e44f62d348",
         "dest": "cargo/vendor",
-        "dest-filename": "gio-0.15.5.crate"
+        "dest-filename": "gio-0.15.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2259105fa464928adf56b159c8d980cc11fbfbe414befb904caac5163d383049bf%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gio-0.15.5",
+        "url": "data:%7B%22package%22%3A%20%2296efd8a1c00d890f6b45671916e165b5e43ccec61957d443aff6d7e44f62d348%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gio-0.15.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1301,15 +1301,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/glib/glib-0.15.5.crate",
-        "sha256": "41dcfbdb6cc6c02aee163339465d8a40d6f3f64c3a43f729a4195f0e153338b7",
+        "url": "https://static.crates.io/crates/glib/glib-0.15.6.crate",
+        "sha256": "aa570813c504bdf7539a9400180c2dd4b789a819556fb86da7226d7d1b037b49",
         "dest": "cargo/vendor",
-        "dest-filename": "glib-0.15.5.crate"
+        "dest-filename": "glib-0.15.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2241dcfbdb6cc6c02aee163339465d8a40d6f3f64c3a43f729a4195f0e153338b7%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/glib-0.15.5",
+        "url": "data:%7B%22package%22%3A%20%22aa570813c504bdf7539a9400180c2dd4b789a819556fb86da7226d7d1b037b49%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/glib-0.15.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {

From 4405d5ea08a3a2e392b5ea61b33b1001c6e99474 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 13 Mar 2022 13:01:13 -0400
Subject: [PATCH 23/33] update translations

---
 po/LINGUAS  |   2 +-
 po/POTFILES |   1 +
 po/bn.po    | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/spot.pot | 109 ++++++++++++++++---
 po/uk.po    | 260 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 663 insertions(+), 17 deletions(-)
 create mode 100644 po/bn.po
 create mode 100644 po/uk.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 8f638355..96adb403 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-en ru fr nl de ca cs pl es pt tr id pt-br fi eu ia nb sl ja ar it
+en ru fr nl de ca cs pl es pt tr id pt-br fi eu ia nb sl ja ar it uk bn
diff --git a/po/POTFILES b/po/POTFILES
index cf886a07..7842c63a 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -20,6 +20,7 @@ src/app/components/artist_details/artist_details.ui
 src/app/components/saved_tracks/saved_tracks.ui
 src/app/components/sidebar_listbox/sidebar_icon_widget.ui
 src/app/components/search/search.ui
+src/app/components/settings/settings.ui
 src/app/components/artist/artist.ui
 src/app/components/user_details/user_details.ui
 src/app/components/selection/selection_toolbar.ui
diff --git a/po/bn.po b/po/bn.po
new file mode 100644
index 00000000..beb7fc9a
--- /dev/null
+++ b/po/bn.po
@@ -0,0 +1,308 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Spot\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
+#: src/app/components/labels.rs:5
+#, fuzzy
+msgid "View album"
+msgstr "অ্যালবাম দেখুন"
+
+#. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
+#: src/app/components/labels.rs:8
+#, fuzzy
+msgid "Copy link"
+msgstr "লিংক কপি করুন"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
+#, fuzzy
+msgid "Add to queue"
+msgstr "সারিতে যোগ করুন"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
+#: src/app/components/labels.rs:14
+#, fuzzy
+msgid "Remove from queue"
+msgstr "সারি থেকে সরান"
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:21
+#, fuzzy
+msgid "Add to {}"
+msgstr "{} তে যোগ করুন"
+
+#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+#: src/app/components/login/login_model.rs:56
+#, fuzzy
+msgid "Could not save password. Make sure the session keyring is unlocked."
+msgstr "পাসওয়ার্ড সেভ করা যায়নি। সেশন কীরিং আনলক করা আছে কিনা নিশ্চিত করুন।"
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#, fuzzy
+msgid "An error occured. Check logs for details!"
+msgstr "একটি ত্রুটি ঘটেছে। বিস্তারিত জানতে লগ চেক করুন!"
+
+#. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
+#: src/app/components/navigation/home.rs:36
+#, fuzzy
+msgid "Library"
+msgstr "লাইব্রেরী"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
+#: src/app/components/navigation/home.rs:42
+#, fuzzy
+msgid "Playlists"
+msgstr "প্লেলিস্ট"
+
+#. This is the visible name for the play queue. It appears in the sidebar as well.
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
+#, fuzzy
+msgid "Now playing"
+msgstr "এখন প্লে হচ্ছে"
+
+#. translators: Short text displayed instead of a song title when nothing plays
+#. Short text displayed instead of a song title when nothing plays
+#: src/app/components/playback/playback_info.rs:58
+#: src/app/components/playback/playback_info.ui:32
+#, fuzzy
+msgid "No song playing"
+msgstr "কোনো গান প্লে হচ্ছেনা"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:56
+#, fuzzy
+msgid "About"
+msgstr "অ্যাবাউট"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:58
+#, fuzzy
+msgid "Quit"
+msgstr "প্রস্থান করুন"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:63
+#, fuzzy
+msgid "Log out"
+msgstr "লগ আউট"
+
+#: src/app/state/login_state.rs:117
+#, fuzzy
+msgid "Connection restored"
+msgstr "সংযোগ পুনরুদ্ধার করা হয়েছে"
+
+#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
+#: src/app/components/artist_details/artist_details.ui:26
+#, fuzzy
+msgid "Top tracks"
+msgstr "টপ ট্র্যাকগুলি"
+
+#. Title of the sections that contains all releases from an artist (both singles and albums).
+#: src/app/components/artist_details/artist_details.ui:55
+#, fuzzy
+msgid "Releases"
+msgstr "রিলিজ"
+
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+#, fuzzy
+msgid "Login to Spotify Premium"
+msgstr "স্পটিফাই প্রিমিয়ামে লগইন করুন"
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:64
+#, fuzzy
+msgid "Username"
+msgstr "ইউজারনেম"
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:72
+#, fuzzy
+msgid "Password"
+msgstr "পাসওয়ার্ড"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
+#, fuzzy
+msgid "Authentication failed!"
+msgstr "অথেন্টিকেশন ব্যর্থ হয়েছে!"
+
+#. Log in button label
+#: src/app/components/login/login.ui:141
+#, fuzzy
+msgid "Log in"
+msgstr "লগ ইন"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+#, fuzzy
+msgid "Albums"
+msgstr "অ্যালবাম"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+#, fuzzy
+msgid "Artists"
+msgstr "আর্টিস্ট"
+
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+#, fuzzy
+msgid "Saved tracks"
+msgstr "সেভ করা ট্র্যাকগুলি"
+
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+#, fuzzy
+msgid "Caps Lock is enabled!"
+msgstr "ক্যাপস লক সক্রিয় আছে!"
+
+#: src/app/components/playback/playback_controls.rs:64
+#, fuzzy
+msgid "Pause"
+msgstr "পজ"
+
+#: src/app/components/playback/playback_controls.rs:66
+#, fuzzy
+msgid "Play"
+msgstr "প্লে"
+
+#: src/app/components/playback/playback_controls.ui:17
+#, fuzzy
+msgid "Shuffle"
+msgstr "শাফল"
+
+#: src/app/components/playback/playback_controls.ui:27
+#, fuzzy
+msgid "Previous"
+msgstr "পূর্ববর্তী"
+
+#: src/app/components/playback/playback_controls.ui:50
+#, fuzzy
+msgid "Next"
+msgstr "পরবর্তী"
+
+#: src/app/components/playback/playback_controls.ui:60
+#, fuzzy
+msgid "Repeat"
+msgstr "রিপিট"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+#, fuzzy
+msgid "You have no saved playlists."
+msgstr "আপনার কোনো সেভ করা প্লেলিস্ট নেই।"
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+#, fuzzy
+msgid "Your playlists will be shown here."
+msgstr "আপনার প্লেলিস্ট এখানে দেখানো হবে।"
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+#, fuzzy
+msgid "You have no saved albums."
+msgstr "আপনার কোনো সেভ করা অ্যালবাম নেই।"
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+#, fuzzy
+msgid "Your library will be shown here."
+msgstr "আপনার লাইব্রেরী এখানে দেখানো হবে।"
+
+#: src/app/components/labels.rs:30
+#, fuzzy
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} টি গান সিলেক্ট করা হয়েছে"
+msgstr[1] "{} টি গান সিলেক্ট করা হয়েছে"
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+#, fuzzy
+msgid "Search Spotify."
+msgstr "স্পটিফাইয়ে খুঁজুন।"
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+#, fuzzy
+msgid "Type to search."
+msgstr "খোঁজার জন্য এখানে টাইপ করুন।"
+
+#: src/app/components/selection/selection_toolbar.ui:58
+#, fuzzy
+msgid "Remove"
+msgstr "রিমুভ করুন"
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+#, fuzzy
+msgid "Add to playlist..."
+msgstr "প্লেলিস্টে যোগ করুন..."
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+#, fuzzy
+msgid "Cancel"
+msgstr "বাতিল করুন"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+#, fuzzy
+msgid "Select all"
+msgstr "সবকিছু সিলেক্ট করুন"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+#, fuzzy
+msgid "More from {}"
+msgstr "{} -র থেকে আরও"
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+#, fuzzy
+msgid "Label"
+msgstr "লেবেল"
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+#, fuzzy
+msgid "Released"
+msgstr "রিলিজ হয়েছে"
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+#, fuzzy
+msgid "Tracks"
+msgstr "ট্র্যাক গুলি"
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+#, fuzzy
+msgid "Duration"
+msgstr "সময়"
+
+#: src/app/components/details/release_details.ui:78
+#, fuzzy
+msgid "Copyright"
+msgstr "কপিরাইট"
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+#, fuzzy
+msgid "{} by {}"
+msgstr "{} বাই {}"
+
diff --git a/po/spot.pot b/po/spot.pot
index ee77ff7a..fbd6f1aa 100644
--- a/po/spot.pot
+++ b/po/spot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: spot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-06 17:30-0500\n"
+"POT-Creation-Date: 2022-03-13 13:00-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:118
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr ""
 
@@ -72,19 +72,19 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr ""
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
+#: src/app/components/navigation/factory.rs:32
 #: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr ""
 
 #. translators: This is a sidebar entry that marks that the entries below are playlists.
-#: src/app/components/navigation/factory.rs:47
+#: src/app/components/navigation/factory.rs:51
 #: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr ""
 
 #. translators: This is a sidebar entry to browse to saved tracks.
-#: src/app/components/navigation/factory.rs:76
+#: src/app/components/navigation/factory.rs:82
 #: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr ""
@@ -123,25 +123,30 @@ msgid "Tracks saved!"
 msgstr ""
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr ""
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr ""
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr ""
 
-#: src/app/state/login_state.rs:109
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr ""
 
-#: src/main.rs:77
+#: src/main.rs:81
 msgid "Failed to open link!"
 msgstr ""
 
@@ -166,25 +171,97 @@ msgid "Releases"
 msgstr ""
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr ""
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr ""
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr ""
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr ""
 
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid ""
+"Port used for connections to Spotify's Access Point. Set to 0 if any port is "
+"fine."
+msgstr ""
+
 #. <property name="icon-name">playlist2-symbolic</property>
 #: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
@@ -248,12 +325,12 @@ msgid "Log in"
 msgstr ""
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr ""
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
new file mode 100644
index 00000000..a3700155
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,260 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Spot\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
+#: src/app/components/labels.rs:5
+msgid "View album"
+msgstr "Подивитися альбом"
+
+#. translators: This is part of a contextual menu attached to a single track; the intent is to copy the link (public URL) to a specific track.
+#: src/app/components/labels.rs:8
+msgid "Copy link"
+msgstr "Копіювати посилання"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
+#: src/app/components/labels.rs:11
+#: src/app/components/selection/selection_toolbar.ui:37
+msgid "Add to queue"
+msgstr "Додати в чергу"
+
+#. translators: This is part of a contextual menu attached to a single track; this entry removes a track from the play queue.
+#: src/app/components/labels.rs:14
+msgid "Remove from queue"
+msgstr "Видалити з черги"
+
+#. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
+#: src/app/components/labels.rs:21
+msgid "Add to {}"
+msgstr "Додати в {}"
+
+#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
+#: src/app/components/login/login_model.rs:56
+msgid "Could not save password. Make sure the session keyring is unlocked."
+msgstr "Не вдалося зберегти пароль. Переконайтесь, що зв'язка ключів сеансу розблокована."
+
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+msgid "An error occured. Check logs for details!"
+msgstr "Сталася помилка. Перевірте журнал для детальної інформації!"
+
+#. translators: This is a sidebar entry to browse to saved albums.
+#: src/app/components/navigation/factory.rs:29
+#: src/app/components/navigation/home.rs:36
+msgid "Library"
+msgstr "Бібліотека"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/factory.rs:44
+#: src/app/components/navigation/home.rs:42
+msgid "Playlists"
+msgstr "Плейлисти"
+
+#. This is the visible name for the play queue. It appears in the sidebar as well.
+#: src/app/components/navigation/home.rs:53
+#: src/app/components/now_playing/now_playing_model.rs:152
+msgid "Now playing"
+msgstr "Відтворюється зараз"
+
+#. translators: Short text displayed instead of a song title when nothing plays
+#. Short text displayed instead of a song title when nothing plays
+#: src/app/components/playback/playback_info.rs:58
+#: src/app/components/playback/playback_info.ui:32
+msgid "No song playing"
+msgstr "Пісня зараз не грає"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:56
+msgid "About"
+msgstr "Про Spot"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:58
+msgid "Quit"
+msgstr "Вийти з програми"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:63
+msgid "Log out"
+msgstr "Вийти з аккаунту"
+
+#: src/app/state/login_state.rs:117
+msgid "Connection restored"
+msgstr "З'єднання відновлено"
+
+#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
+#: src/app/components/artist_details/artist_details.ui:26
+msgid "Top tracks"
+msgstr "Топ треків"
+
+#. Title of the sections that contains all releases from an artist (both singles and albums).
+#: src/app/components/artist_details/artist_details.ui:55
+msgid "Releases"
+msgstr "Релізи"
+
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+msgid "Login to Spotify Premium"
+msgstr "Увійти в Spotify Premium"
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:64
+msgid "Username"
+msgstr "Логін"
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:72
+msgid "Password"
+msgstr "Пароль"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
+msgid "Authentication failed!"
+msgstr "Помилка входу!"
+
+#. Log in button label
+#: src/app/components/login/login.ui:141
+msgid "Log in"
+msgstr "Увійти"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:70
+msgid "Albums"
+msgstr "Альбоми"
+
+#. This is the title of a section of the search results
+#: src/app/components/search/search.ui:103
+msgid "Artists"
+msgstr "Виконавці"
+
+#: src/app/components/navigation/factory.rs:73
+#: src/app/components/navigation/home.rs:48
+msgid "Saved tracks"
+msgstr ""
+
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr ""
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr ""
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr ""
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr ""
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr ""
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr ""
+
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. Title for the empty search page (initial state).
+#: src/app/components/search/search.ui:114
+msgid "Search Spotify."
+msgstr ""
+
+#. Subtitle for the empty search page (initial state).
+#: src/app/components/search/search.ui:115
+msgid "Type to search."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:58
+msgid "Remove"
+msgstr ""
+
+#. <property name="icon-name">playlist2-symbolic</property>
+#: src/app/components/selection/selection_toolbar.ui:47
+msgid "Add to playlist..."
+msgstr ""
+
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:46
+msgid "Cancel"
+msgstr ""
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:57
+msgid "Select all"
+msgstr ""
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr ""
+
+#. This refers to a music label
+#: src/app/components/details/release_details.ui:38
+msgid "Label"
+msgstr ""
+
+#. This refers to a release date
+#: src/app/components/details/release_details.ui:48
+msgid "Released"
+msgstr ""
+
+#. This refers to a number of tracks
+#: src/app/components/details/release_details.ui:58
+msgid "Tracks"
+msgstr ""
+
+#. This refers to the duration of a release
+#: src/app/components/details/release_details.ui:68
+msgid "Duration"
+msgstr ""
+
+#: src/app/components/details/release_details.ui:78
+msgid "Copyright"
+msgstr ""
+
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr ""
+

From 1f68c1e73cee7d700bbf3267abfb6935add99088 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 13 Mar 2022 13:07:53 -0400
Subject: [PATCH 24/33] Bump gio / glib / gdk pixbuf

---
 Cargo.lock         | 12 ++++++------
 Cargo.toml         |  6 +++---
 cargo-sources.json | 30 +++++++++++++++---------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 075f3d19..c7545f98 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -911,9 +911,9 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.15.4"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49"
+checksum = "d8750501d75f318c2ec0314701bc8403901303210def80bafd13f6b6059a3f45"
 dependencies = [
  "bitflags",
  "gdk-pixbuf-sys",
@@ -1020,9 +1020,9 @@ dependencies = [
 
 [[package]]
 name = "gio"
-version = "0.15.6"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96efd8a1c00d890f6b45671916e165b5e43ccec61957d443aff6d7e44f62d348"
+checksum = "bb50e113645fba48bc36c8abaee1fe5e43d353e8763966e29dfe69660514e461"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -1050,9 +1050,9 @@ dependencies = [
 
 [[package]]
 name = "glib"
-version = "0.15.6"
+version = "0.15.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa570813c504bdf7539a9400180c2dd4b789a819556fb86da7226d7d1b037b49"
+checksum = "89528258cfdc79b1e54591202705be67896ad254f99e3cc2ea3710e0307148f2"
 dependencies = [
  "bitflags",
  "futures-channel",
diff --git a/Cargo.toml b/Cargo.toml
index aafcfde2..e2acb0d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,11 +13,11 @@ version = "^0.4.0"
 package = "gdk4"
 
 [dependencies.gio]
-version = "^0.15.6"
+version = "^0.15.7"
 features = ["v2_60"]
 
 [dependencies.glib]
-version = "^0.15.6"
+version = "^0.15.9"
 features = ["v2_60"]
 
 [dependencies.librespot]
@@ -57,7 +57,7 @@ features = ["gettext-system"]
 
 [dependencies]
 secret-service = "^2.0.1"
-gdk-pixbuf = "^0.15.4"
+gdk-pixbuf = "^0.15.6"
 libadwaita = "^0.1.0-beta-1"
 ref_filter_map = "^1.0.1"
 regex = "^1.4.6"
diff --git a/cargo-sources.json b/cargo-sources.json
index c7b9a9e0..dea66154 100644
--- a/cargo-sources.json
+++ b/cargo-sources.json
@@ -1158,15 +1158,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gdk-pixbuf/gdk-pixbuf-0.15.4.crate",
-        "sha256": "73aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49",
+        "url": "https://static.crates.io/crates/gdk-pixbuf/gdk-pixbuf-0.15.6.crate",
+        "sha256": "d8750501d75f318c2ec0314701bc8403901303210def80bafd13f6b6059a3f45",
         "dest": "cargo/vendor",
-        "dest-filename": "gdk-pixbuf-0.15.4.crate"
+        "dest-filename": "gdk-pixbuf-0.15.6.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2273aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gdk-pixbuf-0.15.4",
+        "url": "data:%7B%22package%22%3A%20%22d8750501d75f318c2ec0314701bc8403901303210def80bafd13f6b6059a3f45%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gdk-pixbuf-0.15.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1275,15 +1275,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/gio/gio-0.15.6.crate",
-        "sha256": "96efd8a1c00d890f6b45671916e165b5e43ccec61957d443aff6d7e44f62d348",
+        "url": "https://static.crates.io/crates/gio/gio-0.15.7.crate",
+        "sha256": "bb50e113645fba48bc36c8abaee1fe5e43d353e8763966e29dfe69660514e461",
         "dest": "cargo/vendor",
-        "dest-filename": "gio-0.15.6.crate"
+        "dest-filename": "gio-0.15.7.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%2296efd8a1c00d890f6b45671916e165b5e43ccec61957d443aff6d7e44f62d348%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/gio-0.15.6",
+        "url": "data:%7B%22package%22%3A%20%22bb50e113645fba48bc36c8abaee1fe5e43d353e8763966e29dfe69660514e461%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/gio-0.15.7",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1301,15 +1301,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/glib/glib-0.15.6.crate",
-        "sha256": "aa570813c504bdf7539a9400180c2dd4b789a819556fb86da7226d7d1b037b49",
+        "url": "https://static.crates.io/crates/glib/glib-0.15.9.crate",
+        "sha256": "89528258cfdc79b1e54591202705be67896ad254f99e3cc2ea3710e0307148f2",
         "dest": "cargo/vendor",
-        "dest-filename": "glib-0.15.6.crate"
+        "dest-filename": "glib-0.15.9.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22aa570813c504bdf7539a9400180c2dd4b789a819556fb86da7226d7d1b037b49%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/glib-0.15.6",
+        "url": "data:%7B%22package%22%3A%20%2289528258cfdc79b1e54591202705be67896ad254f99e3cc2ea3710e0307148f2%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/glib-0.15.9",
         "dest-filename": ".cargo-checksum.json"
     },
     {

From f3808b9d638bf8274b82ba8bd19961e24abd6539 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 13 Mar 2022 13:09:13 -0400
Subject: [PATCH 25/33] Bump isahc / regex

---
 Cargo.lock         |  8 ++++----
 Cargo.toml         |  4 ++--
 cargo-sources.json | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c7545f98..2f90ad5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1463,9 +1463,9 @@ dependencies = [
 
 [[package]]
 name = "isahc"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d140e84730d325378912ede32d7cd53ef1542725503b3353e5ec8113c7c6f588"
+checksum = "437f8808009c031df3c1d532c8fd7e3d73239dfe522ebf0b94b5e34d5d01044b"
 dependencies = [
  "async-channel",
  "castaway",
@@ -2655,9 +2655,9 @@ checksum = "2b5ceb840e4009da4841ed22a15eb49f64fdd00a2138945c5beacf506b2fb5ed"
 
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index e2acb0d9..0673cbf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,7 +44,7 @@ features = ["derive"]
 version = "^1.0.79"
 
 [dependencies.isahc]
-version = "^1.2.0"
+version = "^1.7.0"
 features = ["json"]
 
 [dependencies.rand]
@@ -60,7 +60,7 @@ secret-service = "^2.0.1"
 gdk-pixbuf = "^0.15.6"
 libadwaita = "^0.1.0-beta-1"
 ref_filter_map = "^1.0.1"
-regex = "^1.4.6"
+regex = "^1.5.5"
 async-std = "^1.10.0"
 form_urlencoded = "^1.0.1"
 zbus = "^2.0.1"
diff --git a/cargo-sources.json b/cargo-sources.json
index dea66154..bcd8e811 100644
--- a/cargo-sources.json
+++ b/cargo-sources.json
@@ -1769,15 +1769,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/isahc/isahc-1.6.0.crate",
-        "sha256": "d140e84730d325378912ede32d7cd53ef1542725503b3353e5ec8113c7c6f588",
+        "url": "https://static.crates.io/crates/isahc/isahc-1.7.0.crate",
+        "sha256": "437f8808009c031df3c1d532c8fd7e3d73239dfe522ebf0b94b5e34d5d01044b",
         "dest": "cargo/vendor",
-        "dest-filename": "isahc-1.6.0.crate"
+        "dest-filename": "isahc-1.7.0.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d140e84730d325378912ede32d7cd53ef1542725503b3353e5ec8113c7c6f588%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/isahc-1.6.0",
+        "url": "data:%7B%22package%22%3A%20%22437f8808009c031df3c1d532c8fd7e3d73239dfe522ebf0b94b5e34d5d01044b%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/isahc-1.7.0",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -3186,15 +3186,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/regex/regex-1.5.4.crate",
-        "sha256": "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461",
+        "url": "https://static.crates.io/crates/regex/regex-1.5.5.crate",
+        "sha256": "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286",
         "dest": "cargo/vendor",
-        "dest-filename": "regex-1.5.4.crate"
+        "dest-filename": "regex-1.5.5.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/regex-1.5.4",
+        "url": "data:%7B%22package%22%3A%20%221a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/regex-1.5.5",
         "dest-filename": ".cargo-checksum.json"
     },
     {

From 5801ca70a042224d7e7e333bb77d154a4ea89101 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 13 Mar 2022 13:38:32 -0400
Subject: [PATCH 26/33] offline build for devlp

---
 dev.alextren.Spot.development.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev.alextren.Spot.development.json b/dev.alextren.Spot.development.json
index 8fa7e565..129b9bcc 100644
--- a/dev.alextren.Spot.development.json
+++ b/dev.alextren.Spot.development.json
@@ -42,15 +42,16 @@
             "builddir": true,
             "buildsystem": "meson",
             "config-opts": [
-                "-Doffline=false",
+                "-Doffline=true",
                 "-Dbuildtype=debug"
             ],
             "sources": [
                 {
                     "type": "dir",
                     "path": "."
-                }
+                },
+                "cargo-sources.json"
             ]
         }
     ]
-}
+}
\ No newline at end of file

From 621f0a90b6d4c5b74fd051e0f7b3ec0a0418f5e6 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Tue, 22 Mar 2022 08:51:55 -0400
Subject: [PATCH 27/33] fix clippy warnings

---
 src/api/api_models.rs          |  2 +-
 src/app/state/browser_state.rs | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/api/api_models.rs b/src/api/api_models.rs
index 0e2f4672..b96f1592 100644
--- a/src/api/api_models.rs
+++ b/src/api/api_models.rs
@@ -119,7 +119,7 @@ impl<T> IntoIterator for Page<T> {
     type IntoIter = IntoIter<Self::Item>;
 
     fn into_iter(self) -> Self::IntoIter {
-        self.items.unwrap_or_else(Vec::new).into_iter()
+        self.items.unwrap_or_default().into_iter()
     }
 }
 
diff --git a/src/app/state/browser_state.rs b/src/app/state/browser_state.rs
index 3daee3f0..4a008bbf 100644
--- a/src/app/state/browser_state.rs
+++ b/src/app/state/browser_state.rs
@@ -249,7 +249,7 @@ impl BrowserState {
     }
 
     pub fn home_state(&self) -> Option<&HomeState> {
-        extract_state!(&self, BrowserScreen::Home(s) => s)
+        extract_state!(self, BrowserScreen::Home(s) => s)
     }
 
     pub fn home_state_mut(&mut self) -> Option<&mut HomeState> {
@@ -260,23 +260,23 @@ impl BrowserState {
     }
 
     pub fn details_state(&self, id: &str) -> Option<&DetailsState> {
-        extract_state!(&self, BrowserScreen::AlbumDetails(state) if state.id == id => state)
+        extract_state!(self, BrowserScreen::AlbumDetails(state) if state.id == id => state)
     }
 
     pub fn search_state(&self) -> Option<&SearchState> {
-        extract_state!(&self, BrowserScreen::Search(s) => s)
+        extract_state!(self, BrowserScreen::Search(s) => s)
     }
 
     pub fn artist_state(&self, id: &str) -> Option<&ArtistState> {
-        extract_state!(&self, BrowserScreen::Artist(state) if state.id == id => state)
+        extract_state!(self, BrowserScreen::Artist(state) if state.id == id => state)
     }
 
     pub fn playlist_details_state(&self, id: &str) -> Option<&PlaylistDetailsState> {
-        extract_state!(&self, BrowserScreen::PlaylistDetails(state) if state.id == id => state)
+        extract_state!(self, BrowserScreen::PlaylistDetails(state) if state.id == id => state)
     }
 
     pub fn user_state(&self, id: &str) -> Option<&UserState> {
-        extract_state!(&self, BrowserScreen::User(state) if state.id == id => state)
+        extract_state!(self, BrowserScreen::User(state) if state.id == id => state)
     }
 
     fn push_if_needed(&mut self, name: ScreenName) -> Vec<BrowserEvent> {

From ac8f2385c224c9abbe431d587d9c1df89c79325d Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 27 Mar 2022 17:43:07 -0400
Subject: [PATCH 28/33] update translations

---
 po/ar.po    | 145 +++++++++++++++++++----
 po/bn.po    | 145 +++++++++++++++++++----
 po/ca.po    | 156 ++++++++++++++++++++-----
 po/cs.po    | 145 +++++++++++++++++++----
 po/de.po    | 145 +++++++++++++++++++----
 po/en.po    | 330 +++++++++++++++++++++++++++++++++-------------------
 po/es.po    | 145 +++++++++++++++++++----
 po/eu.po    | 145 +++++++++++++++++++----
 po/fi.po    | 145 +++++++++++++++++++----
 po/fr.po    | 145 +++++++++++++++++++----
 po/ia.po    | 145 +++++++++++++++++++----
 po/id.po    | 145 +++++++++++++++++++----
 po/ja.po    | 145 +++++++++++++++++++----
 po/nb.po    | 145 +++++++++++++++++++----
 po/nl.po    | 145 +++++++++++++++++++----
 po/pl.po    | 147 +++++++++++++++++++----
 po/pt-br.po | 145 +++++++++++++++++++----
 po/pt.po    | 145 +++++++++++++++++++----
 po/ru.po    | 145 +++++++++++++++++++----
 po/sl.po    | 145 +++++++++++++++++++----
 po/tr.po    | 145 +++++++++++++++++++----
 po/uk.po    | 145 +++++++++++++++++++----
 22 files changed, 2757 insertions(+), 631 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 8fc56e79..8ebf7ccd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -20,7 +20,7 @@ msgstr "نسخ الرابط"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "أضف إلى الصف"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "لايمكن حفظ كلمة المرور. تحقق من أن ال Session Keyring مفتوح."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "حدث خطأ. تحقق من الlog لمزيد التفاصيل!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "مكتبة"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "قائمة أغاني"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "يشتغل الأن"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "لا توجد أغنية طور التشغيل"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "عن"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "غادر"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "تسجيل الخروج"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "إعادة الاتصال"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "أفضل الأغاني"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "أصدارات"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "تسجيل دخول"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "ألبومات"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "الفنانين"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "أغاني محفوظة"
 
@@ -187,6 +187,7 @@ msgstr "ليس لديك ألبومات مسجلة."
 msgid "Your library will be shown here."
 msgstr "المكتبة خاصتك ستظهر هنا."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -198,31 +199,31 @@ msgstr[4] "{} تم تحديد عديد الأغاني"
 msgstr[5] "{} الأغاني الأخرى المحددة"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "أبحث في Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "أكتب للبجث."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "أحدف"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "أضف إلى قائمة التشغيل..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "ألغاء"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "اختر الكل"
 
@@ -252,7 +253,7 @@ msgstr "الأغاني"
 msgid "Duration"
 msgstr "المدة"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "حقوق النشر"
 
@@ -261,3 +262,99 @@ msgstr "حقوق النشر"
 msgid "{} by {}"
 msgstr "{}بواسطة {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/bn.po b/po/bn.po
index beb7fc9a..d0632f42 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -22,7 +22,7 @@ msgstr "লিংক কপি করুন"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 #, fuzzy
 msgid "Add to queue"
 msgstr "সারিতে যোগ করুন"
@@ -46,28 +46,28 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "পাসওয়ার্ড সেভ করা যায়নি। সেশন কীরিং আনলক করা আছে কিনা নিশ্চিত করুন।"
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 #, fuzzy
 msgid "An error occured. Check logs for details!"
 msgstr "একটি ত্রুটি ঘটেছে। বিস্তারিত জানতে লগ চেক করুন!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 #, fuzzy
 msgid "Library"
 msgstr "লাইব্রেরী"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 #, fuzzy
 msgid "Playlists"
 msgstr "প্লেলিস্ট"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 #, fuzzy
 msgid "Now playing"
 msgstr "এখন প্লে হচ্ছে"
@@ -81,24 +81,24 @@ msgid "No song playing"
 msgstr "কোনো গান প্লে হচ্ছেনা"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 #, fuzzy
 msgid "About"
 msgstr "অ্যাবাউট"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 #, fuzzy
 msgid "Quit"
 msgstr "প্রস্থান করুন"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 #, fuzzy
 msgid "Log out"
 msgstr "লগ আউট"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 #, fuzzy
 msgid "Connection restored"
 msgstr "সংযোগ পুনরুদ্ধার করা হয়েছে"
@@ -110,7 +110,7 @@ msgid "Top tracks"
 msgstr "টপ ট্র্যাকগুলি"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 #, fuzzy
 msgid "Releases"
 msgstr "রিলিজ"
@@ -146,19 +146,19 @@ msgid "Log in"
 msgstr "লগ ইন"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 #, fuzzy
 msgid "Albums"
 msgstr "অ্যালবাম"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 #, fuzzy
 msgid "Artists"
 msgstr "আর্টিস্ট"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 #, fuzzy
 msgid "Saved tracks"
 msgstr "সেভ করা ট্র্যাকগুলি"
@@ -223,6 +223,7 @@ msgstr "আপনার কোনো সেভ করা অ্যালবা
 msgid "Your library will be shown here."
 msgstr "আপনার লাইব্রেরী এখানে দেখানো হবে।"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 #, fuzzy
 msgid "{} song selected"
@@ -231,36 +232,36 @@ msgstr[0] "{} টি গান সিলেক্ট করা হয়েছ
 msgstr[1] "{} টি গান সিলেক্ট করা হয়েছে"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 #, fuzzy
 msgid "Search Spotify."
 msgstr "স্পটিফাইয়ে খুঁজুন।"
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 #, fuzzy
 msgid "Type to search."
 msgstr "খোঁজার জন্য এখানে টাইপ করুন।"
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 #, fuzzy
 msgid "Remove"
 msgstr "রিমুভ করুন"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 #, fuzzy
 msgid "Add to playlist..."
 msgstr "প্লেলিস্টে যোগ করুন..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 #, fuzzy
 msgid "Cancel"
 msgstr "বাতিল করুন"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 #, fuzzy
 msgid "Select all"
 msgstr "সবকিছু সিলেক্ট করুন"
@@ -295,7 +296,7 @@ msgstr "ট্র্যাক গুলি"
 msgid "Duration"
 msgstr "সময়"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 #, fuzzy
 msgid "Copyright"
 msgstr "কপিরাইট"
@@ -306,3 +307,99 @@ msgstr "কপিরাইট"
 msgid "{} by {}"
 msgstr "{} বাই {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/ca.po b/po/ca.po
index e5c68109..b04a788b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,16 +1,12 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Spot\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Spot\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
@@ -24,7 +20,7 @@ msgstr "Copia l'enllaç"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Afegeix a la cua"
 
@@ -44,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "No s'ha pogut desar la sessió. Assegura't que l'anell de claus de la sessió està desbloquejat."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Ha ocorregut un error. Comprova els registres per més detalls!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Biblioteca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Llistes de reproducció"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "S'està reproduïnt"
 
@@ -74,21 +70,21 @@ msgid "No song playing"
 msgstr "Cap cançó en reproducció"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Quant a"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Surt"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Tanca la sessió"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Connexió restablerta"
 
@@ -98,7 +94,7 @@ msgid "Top tracks"
 msgstr "Millors pistes"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Llançaments"
 
@@ -128,17 +124,17 @@ msgid "Log in"
 msgstr "Inicia sessió"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Àlbums"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artistes"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Pistes desades"
 
@@ -191,6 +187,7 @@ msgstr "No teniu àlbums desats."
 msgid "Your library will be shown here."
 msgstr "Aquí es mostrarà la vostra biblioteca."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -198,31 +195,31 @@ msgstr[0] "{} cançó seleccionada"
 msgstr[1] "{} cançons seleccionades"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Cerca a Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Escriu per començar a buscar."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Elimina"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Afegeix a la llista..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
@@ -253,7 +250,7 @@ msgstr "Millors pistes"
 msgid "Duration"
 msgstr "Duració"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -261,3 +258,100 @@ msgstr "Copyright"
 #: src/app/components/labels.rs:48
 msgid "{} by {}"
 msgstr "{} per {}"
+
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/cs.po b/po/cs.po
index 86d466b4..52e70fe0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgstr "Zkopírovat odkaz"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Přidat do fronty"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Heslo nelze uložit. Zkontrolujte, že je klíčenka (session keyring) odemčená."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Došlo k chybě. Podrobnosti najdete v protokolu."
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Knihovna"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Playlisty"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Právě hraje"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Nic nehraje"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "O aplikaci"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Konec"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Odhlásit se"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Připojení obnoveno"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Populární"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Diskografie"
 
@@ -124,20 +124,20 @@ msgid "Log in"
 msgstr "Přihlásit se"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Alba"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Umělci"
 
 #. Where is this text displayed?
 #. I see it is supposed to be in `src/app/components/navigation/home.rs:47`, but that does not seem to be the case: https://github.com/xou816/spot/blob/1b96cd07129f27c7f3f3a2e66299c44a52e489d4/src/app/components/navigation/home.rs
 #. Maybe it is something that has not been commited yet (2021-10-02T10:42:52+02:00), but @xou816 has it locally and has generated pot / po files from it in https://github.com/xou816/spot/commit/86414c03d207cdf4e2c1cbddd47c7ca5629d1303
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Uložené skladby"
 
@@ -190,6 +190,7 @@ msgstr "Nemáte žádná uložená alba."
 msgid "Your library will be shown here."
 msgstr "Tady bude zobrazena vaše knihovna."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -198,31 +199,31 @@ msgstr[1] "{} skladby vybrány"
 msgstr[2] "{} skladeb vybráno"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Hledat na Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Zadejte a vyhledejte."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Odstranit"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Přidat do playlistu..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Zrušit"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Vybrat vše"
 
@@ -251,7 +252,7 @@ msgstr "Počet skladeb"
 msgid "Duration"
 msgstr "Délka"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -260,3 +261,99 @@ msgstr "Copyright"
 msgid "{} by {}"
 msgstr "{} od {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr "Playlist bez názvu"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr "Všechny playlisty"
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr "Skladby uloženy!"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr "Nepodařilo se otevřít odkaz!"
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr "Zvuk"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr "Zvukový backend"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr "ALSA zařízení"
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr "Použito pouze pokud zvukový backend je ALSA"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr "Kvalita zvuku"
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr "Normální"
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr "Vysoká"
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr "Velmi vysoká"
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr "Vzhled"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr "Téma"
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr "Světlé"
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr "Tmavé"
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr "Síť"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr "Port Access Pointu"
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr "Port používaný pro připojení ke Spotify Access Point. Nastavte na 0 pokud lze použít libovolný port."
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr "Uložit do knihovny"
+
diff --git a/po/de.po b/po/de.po
index a6df08b8..86f0cd5a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,7 +20,7 @@ msgstr "Link kopieren"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Zur Warteschlange hinzufügen"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Das Passwort konnte nicht gespeichert werden. Stellen Sie sicher, dass der Sitzungs-Schlüsselbund entsperrt ist."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Es ist ein Fehler aufgetreten. Überprüfen Sie die Protokolle für Details!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Bibliothek"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Playlists"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Es läuft"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Es wird kein Titel gespielt"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Info"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Beenden"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Abmelden"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Verbindung wiederhergestellt"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Beliebte Titel"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Diskografie"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Anmelden"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Alben"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Künstler"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Gespeicherte Titel"
 
@@ -187,6 +187,7 @@ msgstr "Keine gespeicherten Alben vorhanden."
 msgid "Your library will be shown here."
 msgstr "Die Bibliothek wird hier angezeigt."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} Titel ausgewählt"
 msgstr[1] "{} Titel ausgewählt"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Auf Spotify suchen."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Tippe um zu suchen."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Entfernen"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Zur Playlist hinzufügen..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Alle auswählen"
 
@@ -247,7 +248,7 @@ msgstr "Titel"
 msgid "Duration"
 msgstr "Dauer"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -256,3 +257,99 @@ msgstr "Copyright"
 msgid "{} by {}"
 msgstr "{} von {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr "Unbenannte Playlist"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr "Alle Playlist"
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr "Titel gespeichert!"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr "Öffnen des Links fehlgschlagen!"
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr "Audio"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr "Audio Backend"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr "ALSA Gerät"
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr "Wird nur angewendet, wenn das Audio-Backend ALSA ist"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr "Audio Qualität"
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr "Normal"
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr "Hoch"
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr "Sehr hoch"
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr "Aussehen"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr "Thema"
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr "Hell"
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr "Dunkel"
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr "Netzwerk"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr "Access Point Port"
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr "Port, der für Verbindungen mit dem Spotify Access Point verwendet wird. Setze  den Wert auf 0 für einen beliebigen Port."
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr "Speichere in Bibliothek"
+
diff --git a/po/en.po b/po/en.po
index 281f6dac..5fe7d6c2 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,20 +1,13 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Spot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 09:46-0500\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
+"Project-Id-Version: Spot\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
-msgid "An error occured. Check logs for details!"
-msgstr "An error occured. Check logs for details!"
-
 #. translators: This is part of a contextual menu attached to a single track; this entry allows viewing the album containing a specific track.
 #: src/app/components/labels.rs:5
 msgid "View album"
@@ -27,7 +20,7 @@ msgstr "Copy link"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Add to queue"
 
@@ -41,59 +34,34 @@ msgstr "Remove from queue"
 msgid "Add to {}"
 msgstr "Add to {}"
 
-#. translators: This shows up when in selection mode. This text should be as short as possible.
-#: src/app/components/labels.rs:30
-msgid "{} song selected"
-msgid_plural "{} songs selected"
-msgstr[0] "{} song selected"
-msgstr[1] "{} songs selected"
-
-#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
-#: src/app/components/labels.rs:39
-msgid "More from {}"
-msgstr "More from {}"
-
-#. translators: This is part of a larger label that reads "<Album> by <Artist>"
-#: src/app/components/labels.rs:48
-msgid "{} by {}"
-msgstr ""
-
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
 msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Could not save password. Make sure the session keyring is unlocked."
 
+#. translators: This notification is the default message for unhandled errors. Logs refer to console output.
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
+msgid "An error occured. Check logs for details!"
+msgstr "An error occured. Check logs for details!"
+
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Library"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Playlists"
 
-#. translators: This is a sidebar entry to browse to saved tracks.
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
-msgid "Saved tracks"
-msgstr ""
-
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#. This is the visible name for the play queue. It appears in the sidebar as well.
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Now playing"
 
-#: src/app/components/playback/playback_controls.rs:64
-msgid "Pause"
-msgstr ""
-
-#: src/app/components/playback/playback_controls.rs:66
-msgid "Play"
-msgstr ""
-
 #. translators: Short text displayed instead of a song title when nothing plays
 #. Short text displayed instead of a song title when nothing plays
 #: src/app/components/playback/playback_info.rs:58
@@ -102,72 +70,163 @@ msgid "No song playing"
 msgstr "No song playing"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "About"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Quit"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Log out"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Connection restored"
 
-#. A title that is shown when the user has not saved any playlists.
-#: src/app/components/saved_playlists/saved_playlists.ui:26
-msgid "You have no saved playlists."
-msgstr ""
-
-#. A description of what happens when the user has saved playlists.
-#: src/app/components/saved_playlists/saved_playlists.ui:27
-msgid "Your playlists will be shown here."
-msgstr ""
-
 #. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
 #: src/app/components/artist_details/artist_details.ui:26
 msgid "Top tracks"
 msgstr "Top tracks"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Releases"
 
+#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
+#: src/app/components/login/login.ui:45
+msgid "Login to Spotify Premium"
+msgstr "Login to Spotify Premium"
+
+#. Placeholder for the username field
+#: src/app/components/login/login.ui:64
+msgid "Username"
+msgstr "Username"
+
+#. Placeholder for the password field
+#: src/app/components/login/login.ui:72
+msgid "Password"
+msgstr "Password"
+
+#. This error is shown when authentication fails.
+#: src/app/components/login/login.ui:126
+msgid "Authentication failed!"
+msgstr "Authentication failed!"
+
+#. Log in button label
+#: src/app/components/login/login.ui:141
+msgid "Log in"
+msgstr "Log in"
+
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albums"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artists"
 
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
+msgid "Saved tracks"
+msgstr "Saved Tracks"
+
+#. This information is shown when Caps Lock is enabled.
+#: src/app/components/login/login.ui:95
+msgid "Caps Lock is enabled!"
+msgstr "Caps Lock is enabled!"
+
+#: src/app/components/playback/playback_controls.rs:64
+msgid "Pause"
+msgstr "Pause"
+
+#: src/app/components/playback/playback_controls.rs:66
+msgid "Play"
+msgstr "Play"
+
+#: src/app/components/playback/playback_controls.ui:17
+msgid "Shuffle"
+msgstr "Shuffle"
+
+#: src/app/components/playback/playback_controls.ui:27
+msgid "Previous"
+msgstr "Previous"
+
+#: src/app/components/playback/playback_controls.ui:50
+msgid "Next"
+msgstr "Next"
+
+#: src/app/components/playback/playback_controls.ui:60
+msgid "Repeat"
+msgstr "Repeat"
+
+#. A title that is shown when the user has not saved any playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:26
+msgid "You have no saved playlists."
+msgstr "You have no saved playlists."
+
+#. A description of what happens when the user has saved playlists.
+#: src/app/components/saved_playlists/saved_playlists.ui:27
+msgid "Your playlists will be shown here."
+msgstr "Your playlists will be shown here."
+
+#. A title that is shown when the user has not saved any albums.
+#: src/app/components/library/library.ui:26
+msgid "You have no saved albums."
+msgstr "You have no saved albums."
+
+#. A description of what happens when the user has saved albums.
+#: src/app/components/library/library.ui:27
+msgid "Your library will be shown here."
+msgstr "Your library will be shown here."
+
+#. translators: This shows up when in selection mode. This text should be as short as possible.
+#: src/app/components/labels.rs:30
+msgid "{} song selected"
+msgid_plural "{} songs selected"
+msgstr[0] "{} song selected"
+msgstr[1] "{} songs selected"
+
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
-msgstr ""
+msgstr "Search Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
-msgstr ""
+msgstr "Type to search."
+
+#: src/app/components/selection/selection_toolbar.ui:69
+msgid "Remove"
+msgstr "Remove"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
-msgstr ""
+msgstr "Add to playlist..."
 
-#: src/app/components/selection/selection_toolbar.ui:58
-msgid "Remove"
-msgstr ""
+#. Button label. Exits selection mode.
+#: src/app/components/headerbar/headerbar.ui:47
+msgid "Cancel"
+msgstr "Cancel"
+
+#. Button label. Selects all visible songs.
+#: src/app/components/headerbar/headerbar.ui:58
+msgid "Select all"
+msgstr "Select all"
+
+#. translators: This is part of a contextual menu attached to a single track; the full text is "More from <artist>".
+#: src/app/components/labels.rs:39
+msgid "More from {}"
+msgstr "More from {}"
 
 #. This refers to a music label
 #: src/app/components/details/release_details.ui:38
@@ -189,75 +248,108 @@ msgstr "Tracks"
 msgid "Duration"
 msgstr "Duration"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
-#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
-#: src/app/components/login/login.ui:45
-msgid "Login to Spotify Premium"
-msgstr "Login to Spotify Premium"
+#. translators: This is part of a larger label that reads "<Album> by <Artist>"
+#: src/app/components/labels.rs:48
+msgid "{} by {}"
+msgstr "{} by {}"
 
-#. Placeholder for the username field
-#: src/app/components/login/login.ui:64
-msgid "Username"
-msgstr "Username"
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
 
-#. Placeholder for the password field
-#: src/app/components/login/login.ui:72
-msgid "Password"
-msgstr "Password"
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
 
-#. This information is shown when Caps Lock is enabled.
-#: src/app/components/login/login.ui:95
-msgid "Caps Lock is enabled!"
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
 msgstr ""
 
-#. This error is shown when authentication fails.
-#: src/app/components/login/login.ui:126
-msgid "Authentication failed!"
-msgstr "Authentication failed!"
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
 
-#. Log in button label
-#: src/app/components/login/login.ui:141
-msgid "Log in"
-msgstr "Log in"
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
 
-#. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
-msgid "Cancel"
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
 msgstr ""
 
-#. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
-msgid "Select all"
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
 msgstr ""
 
-#: src/app/components/playback/playback_controls.ui:17
-msgid "Shuffle"
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
 msgstr ""
 
-#: src/app/components/playback/playback_controls.ui:27
-msgid "Previous"
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
 msgstr ""
 
-#: src/app/components/playback/playback_controls.ui:50
-msgid "Next"
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
 msgstr ""
 
-#: src/app/components/playback/playback_controls.ui:60
-msgid "Repeat"
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
 msgstr ""
 
-#. A title that is shown when the user has not saved any albums.
-#: src/app/components/library/library.ui:26
-msgid "You have no saved albums."
+#: src/app/components/settings/settings.ui:45
+msgid "High"
 msgstr ""
 
-#. A description of what happens when the user has saved albums.
-#: src/app/components/library/library.ui:27
-msgid "Your library will be shown here."
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
 msgstr ""
 
-#~ msgid "by"
-#~ msgstr "by"
diff --git a/po/es.po b/po/es.po
index 527181d0..d029224c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -20,7 +20,7 @@ msgstr "Copiar enlace"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Añadir a la cola"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "No se pudo guardar la contraseña. Asegúrate de que el anillo de claves esta desbloqueado."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Ha ocurrido un error. ¡Revisa los logs para más detalles!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Biblioteca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Lista de reproducción"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Reproduciendo ahora"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Ninguna canción en reproducción"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Acerca de"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Salir"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Conexión restaurada"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Mejores canciones"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Lanzamientos"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Iniciar sesión"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Álbumes"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artistas"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Pistas guardadas"
 
@@ -187,6 +187,7 @@ msgstr "No tienes álbumes guardados."
 msgid "Your library will be shown here."
 msgstr "Tu biblioteca se mostrará aquí."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} canción seleccionada"
 msgstr[1] "{} canciones seleccionadas"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Buscar en Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Escribe para buscar."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Retirar"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Añadir a la lista de reproducción..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Seleccionar todo"
 
@@ -247,7 +248,7 @@ msgstr "Canciones"
 msgid "Duration"
 msgstr "Duración"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -256,3 +257,99 @@ msgstr "Copyright"
 msgid "{} by {}"
 msgstr "{} de {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr "Lista de reproducción sin nombre"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr "Todas las listas de reproducción"
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr "¡Pistas guardadas!"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr "¡No se ha podido abrir el enlace!"
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr "Sonido"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr "Backend de audio"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr "Dispositivo ALSA"
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr "Sólo se aplica si el backend de audio es ALSA"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr "Calidad de sonido"
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr "Normal"
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr "Alta"
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr "Muy alta"
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr "Apariencia"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr "Tema"
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr "Claro"
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr "Oscuro"
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr "Red"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr "Puerto del punto de acceso"
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr "Puerto utilizado para las conexiones con el punto de acceso de Spotify. Poner a 0 si cualquier puerto está bien."
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr "Guardar en la biblioteca"
+
diff --git a/po/eu.po b/po/eu.po
index 9cdf8861..0e081bb1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -20,7 +20,7 @@ msgstr "Kopiatu esteka"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Gehitu isatsari"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Ezin izan da pasahitza gorde. Ziurtatu saioko giltzatakoa desblokeatuta dagoela."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Errore bat gertatu da. Egiaztatu xehetasunak erregistroetan!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Biblioteka"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Erreprodukzio-zerrendak"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Orain erreproduzitzen"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Ez da abestirik erreproduzitzen ari"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Honi buruz"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Utzi"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Saioa itxi"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Konexioa leheneratu da"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Pista nagusiak"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Jaurtiketak"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Hasi saioa"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albumak"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artistak"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Gordetako pistak"
 
@@ -187,6 +187,7 @@ msgstr "Ez duzu albumik gordeta."
 msgid "Your library will be shown here."
 msgstr "Zure liburutegia hemen agertuko da."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} Aukeratutako abesti bat"
 msgstr[1] "{} Aukeratutako abestiak"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Bilatu Spotifyn."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Idatzi bilatzeko."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Ezabatu"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Erreprodukzio-zerrendara gehitu..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Ezeztatu"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Hautatu dena"
 
@@ -247,7 +248,7 @@ msgstr "Pistak"
 msgid "Duration"
 msgstr "Iraupena"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Egile-eskubideak"
 
@@ -256,3 +257,99 @@ msgstr "Egile-eskubideak"
 msgid "{} by {}"
 msgstr "{} {} -ek eginda"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/fi.po b/po/fi.po
index 8e8168e8..4cd28e5d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -20,7 +20,7 @@ msgstr "Kopioi linkki"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Lisää jonoon"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Salasanaa ei voitu tallentaa. Varmista että avainnippua ei ole lukittu."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Tapahti virhe. Katso lisätiedot lokista!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Kirjasto"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Soittolistat"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Nyt toistetaan"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Ei toistettavaa kappaletta"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Tietoja"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Lopeta"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Yhteys palautunut"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Suosituimmat kappaleet"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Julkaisut"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Kirjaudu sisään"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albumit"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Esittäjät"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Tallennetut kappaleet"
 
@@ -187,6 +187,7 @@ msgstr "Ei tallennettuja albumeja."
 msgid "Your library will be shown here."
 msgstr "Kirjastosi näytetään täällä."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} kappale valittu"
 msgstr[1] "{} kappaletta valittu"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Etsi Spotifysta."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Kirjoita etsiäksesi."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Poista"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Lisää soittolistaan..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Peru"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Valitse kaikki"
 
@@ -247,7 +248,7 @@ msgstr "Kappaleita"
 msgid "Duration"
 msgstr "Kesto"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Tekijänoikeus"
 
@@ -256,3 +257,99 @@ msgstr "Tekijänoikeus"
 msgid "{} by {}"
 msgstr "{} tehnyt {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr "Nimetön soittolista"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr "Kaikki soittolistat"
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr "Kappaleet tallennettu!"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr "Linkin avaaminen epäonnistui!"
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr "Ääni"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr "Äänen taustaosa"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr "ALSA-laite"
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr "Sovelletaan vain jos äänen taustaosa on ALSA"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr "Äänenlaatu"
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr "Normaali"
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr "Korkea"
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr "Hyvin korkea"
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr "Ulkoasu"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr "Teema"
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr "Vaalea"
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr "Tumma"
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr "Verkko"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr "Access Pointin portti"
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr "Spotifyn Access Pointiin tuleviin yhteyksiin käytettävä portti. Aseta arvoksi 0, jos mikä tahansa portti kelpaa."
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr "Tallenna kirjastoon"
+
diff --git a/po/fr.po b/po/fr.po
index e16bfc88..758df8a2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -20,7 +20,7 @@ msgstr "Copier le lien"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Ajouter à la file d'attente"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Le mot de passe n'a pu être enregistré, assurez-vous que le Trousseau de session est déverouillé."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Une erreur est survenue. Consultez les journaux de débogage pour plus d'information."
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Bibliothèque"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Listes de lecture"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "En cours de lecture"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Aucune lecture en cours"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "À propos"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Quitter"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Déconnexion"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Connexion rétablie"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Morceaux populaires"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Discographie"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Connexion"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albums"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artistes"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Titres aimés"
 
@@ -187,6 +187,7 @@ msgstr "Aucun album dans votre bibliothèque."
 msgid "Your library will be shown here."
 msgstr "Vos albums apparaîtrons ici."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} morceau sélectionné"
 msgstr[1] "{} morceaux sélectionnés"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Rechercher dans Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Saisissez un terme à rechercher."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Retirer"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Ajouter à..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Annuler"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Tout sélectionner"
 
@@ -247,7 +248,7 @@ msgstr "Morceaux"
 msgid "Duration"
 msgstr "Durée"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -256,3 +257,99 @@ msgstr "Copyright"
 msgid "{} by {}"
 msgstr "{} de {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/ia.po b/po/ia.po
index 5291af89..e0cbded5 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -20,7 +20,7 @@ msgstr "Copiar ligamine"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Adder al cauda"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Non poteva salvar le contrasigno. Assecura te qui le magazin de claves es disblocate."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Ocurreva un error. Verifica le registros pro detalios!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Bibliotheca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Listas de reproduction"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Ora in reproduction"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Nulle canto in reproduction"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "A proposito de"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Quitar"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Clauder le session"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Connexion restabilite"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Melior tracias"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Lanciamentos"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Initiar session"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albumes"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artistas"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Tracias salvate"
 
@@ -187,6 +187,7 @@ msgstr "Tu ha nulle albumes salvate."
 msgid "Your library will be shown here."
 msgstr "Tu bibliotheca essera monstrate ci."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} canto seligite"
 msgstr[1] "{} cantos seligite"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Cercar Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Scribe pro cercar."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Remover"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Adder al lista de reproduction..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Cancellar"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Seliger toto"
 
@@ -247,7 +248,7 @@ msgstr "Tracias"
 msgid "Duration"
 msgstr "Duration"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -256,3 +257,99 @@ msgstr "Copyright"
 msgid "{} by {}"
 msgstr "{} per {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/id.po b/po/id.po
index 1f13697b..51745116 100644
--- a/po/id.po
+++ b/po/id.po
@@ -20,7 +20,7 @@ msgstr "Salin tautan"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Tambah ke Antrian"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Tak bisa menyimpan sandi. Pastikan bahwa kunci sesi tidak terkunci."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Timbul galat. Periksa log untuk detailnya!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Pustaka"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Daftar putar"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Sedang memutar"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Tidak ada lagu yang diputar"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Tentang"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Keluar"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Log keluar"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Sambungan dipulihkan"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Trek teratas"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Rilis"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Log masuk"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Album"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artis"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Trek yang disimpan"
 
@@ -187,37 +187,38 @@ msgstr "Anda tidak memiliki album yang disimpan."
 msgid "Your library will be shown here."
 msgstr "Pustaka Anda akan ditampilkan di sini."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
 msgstr[0] "{} lagu dipilih"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Cari Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Ketik untuk mencari."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Buang"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Tambah ke daftar putar…"
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Batal"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Pilih semua"
 
@@ -246,7 +247,7 @@ msgstr "Trek"
 msgid "Duration"
 msgstr "Durasi"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Hak Cipta"
 
@@ -255,3 +256,99 @@ msgstr "Hak Cipta"
 msgid "{} by {}"
 msgstr "{} oleh {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/ja.po b/po/ja.po
index 1d67c790..8d14b9c3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgstr "リンクをコピー"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "キューに追加"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "パスワードを保存できませんでした。セッションキーリングのロックを解除してください。"
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "エラーが発生しました。詳細はログを確認してください。"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "ライブラリ"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "プレイリスト"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "再生中"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "再生中の曲はありません"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "このアプリについて"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "終了"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "ログアウト"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "再接続しました"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "人気のトラック"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "作品"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "ログイン"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "アルバム"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "アーティスト"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "お気に入り"
 
@@ -187,37 +187,38 @@ msgstr "保存したアルバムがありません。"
 msgid "Your library will be shown here."
 msgstr "ライブラリはここに表示されます。"
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
 msgstr[0] "{}曲選択中"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "検索する。"
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "検索ワードを入力してください。"
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "削除"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "プレイリストに追加…"
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "選択解除"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "すべて選択"
 
@@ -247,7 +248,7 @@ msgstr "曲数"
 msgid "Duration"
 msgstr "再生時間"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "著作権表示"
 
@@ -256,3 +257,99 @@ msgstr "著作権表示"
 msgid "{} by {}"
 msgstr "{} から {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/nb.po b/po/nb.po
index 7fb00e5c..28c509c4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -20,7 +20,7 @@ msgstr "Kopier lenke"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Legg til i køen"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Kunne ikke lagre passordet. Sørg for at nøkkelringen til sesjonen er låst opp."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "En feil oppstod. Sjekk logger for detaljer!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Bibliotek"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Spillelister"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Nå spiller"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Ingen sang spilles"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Om"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Avslutt"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Logg ut"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Tilkoblingen er gjenopprettet"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Topp spor"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Utgivelser"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Logg inn"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Album"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artister"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Lagrede spor"
 
@@ -187,6 +187,7 @@ msgstr "Du har ingen lagrede album."
 msgid "Your library will be shown here."
 msgstr "Biblioteket ditt vises her."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 #, fuzzy
 msgid "{} song selected"
@@ -195,31 +196,31 @@ msgstr[0] "{} sang valgt"
 msgstr[1] "{} sanger valgt"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Søk Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Skriv for å søke."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Fjern"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Legg til spilleliste..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Velg alle"
 
@@ -248,7 +249,7 @@ msgstr "Spor"
 msgid "Duration"
 msgstr "Varighet"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Opphavsrett"
 
@@ -257,3 +258,99 @@ msgstr "Opphavsrett"
 msgid "{} by {}"
 msgstr "{} av {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/nl.po b/po/nl.po
index 7a2e0aca..d94a3cf8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -20,7 +20,7 @@ msgstr "Link kopiëren"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Toevoegen aan wachtrij"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Het wachtwoord kan niet worden opgeslagen - zorg dat de sessiesleutelhanger ontgrendeld is."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Er is een fout opgetreden - bekijk het logboek!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Verzameling"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Afspeellijsten"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Je luistert naar"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Er wordt niks afgespeeld"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Over"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Afsluiten"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Uitloggen"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "De verbinding is hersteld"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Topnummers"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Uitgaven"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Inloggen"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albums"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artiesten"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Opgeslagen nummers"
 
@@ -187,6 +187,7 @@ msgstr "Je hebt nog geen opgeslagen albums."
 msgid "Your library will be shown here."
 msgstr "Je verzameling wordt hier getoond."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} nummer geselecteerd"
 msgstr[1] "{} nummers geselecteerd"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Doorzoek Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Typ om te zoeken"
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Toevoegen aan afspeellijst…"
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Alles selecteren"
 
@@ -247,7 +248,7 @@ msgstr "Nummers"
 msgid "Duration"
 msgstr "Duur"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -256,3 +257,99 @@ msgstr "Copyright"
 msgid "{} by {}"
 msgstr "{} van {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr "Naamloze afspeellijst"
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr "Alle afspeellijsten"
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr "De nummers zijn opgeslagen!"
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr "De link kan niet worden geopend!"
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr "Audio"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr "Audiobackend"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr "ALSA-apparaat"
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr "Alleen van toepassing als het audiobackend is ingesteld op ALSA"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr "Audiokwaliteit"
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr "Normaal"
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr "Hoog"
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr "Hoogst"
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr "Vormgeving"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr "Thema"
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr "Licht"
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr "Donker"
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr "Netwerk"
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr "Poort van toegangspunt"
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr "De poort die wordt gebruikt om verbinding te maken met Spotify's toegangspunt. 0 = elke poort."
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr "Opslaan in verzameling"
+
diff --git a/po/pl.po b/po/pl.po
index 4dbe2720..8c43a628 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -20,7 +20,7 @@ msgstr "Skopiuj link"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Dodaj do kolejki"
 
@@ -32,7 +32,7 @@ msgstr "Usuń z kolejki"
 #. translators: This is part of a larger text that says "Add to <playlist name>". This text should be as short as possible.
 #: src/app/components/labels.rs:21
 msgid "Add to {}"
-msgstr "Dodaj do {}"
+msgstr "Dodaj do"
 
 #. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
 #: src/app/components/login/login_model.rs:56
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Nie można zapisać hasła. Upewnij się że narzędzie zarządzające kluczami jest odblokowane."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Wystąpił błąd. Sprawdź logi po więcej informacji!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Biblioteka"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Playlisty"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Aktualnie odtwarzane"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Aktualnie nie gra żadna piosenka"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "O programie"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Wyjdź"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Wyloguj się"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Odzyskano połączenie"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Najlepsze piosenki"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Premiery"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Zaloguj"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albumy"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artyści"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Zachowane piosenki"
 
@@ -187,6 +187,7 @@ msgstr "Nie masz zapisanych albumów."
 msgid "Your library will be shown here."
 msgstr "Twoja biblioteka będzie tu pokazana."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -196,31 +197,31 @@ msgstr[2] "{} wybranych piosenek"
 msgstr[3] ""
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr ""
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr ""
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr ""
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr ""
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr ""
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr ""
 
@@ -249,7 +250,7 @@ msgstr "Najlepsze piosenki"
 msgid "Duration"
 msgstr "Długość"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
@@ -258,3 +259,99 @@ msgstr "Prawa autorskie"
 msgid "{} by {}"
 msgstr ""
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/pt-br.po b/po/pt-br.po
index e1d083f5..6529d167 100644
--- a/po/pt-br.po
+++ b/po/pt-br.po
@@ -20,7 +20,7 @@ msgstr "Copiar link"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Adicionar a fila"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Não foi possível salvar a senha. Verifique se o seu chaveiro de sessão está desbloqueado."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Ocorreu um erro. Verifique os logs para mais detalhes!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Biblioteca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Listas de reprodução"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Tocando agora"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Nenhum música sendo executada"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Sobre"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Fechar"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Sair"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Conexão reestabelecida"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Melhores faixas"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Lançamentos"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Entrar"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Álbuns"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artistas"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr ""
 
@@ -187,6 +187,7 @@ msgstr ""
 msgid "Your library will be shown here."
 msgstr ""
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} música selecionada"
 msgstr[1] "{} músicas selecionadas"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr ""
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr ""
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr ""
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr ""
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr ""
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgstr "Faixas"
 msgid "Duration"
 msgstr "Duração"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -256,3 +257,99 @@ msgstr "Copyright"
 msgid "{} by {}"
 msgstr ""
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/pt.po b/po/pt.po
index 29a040b6..9173087c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgstr "Copiar ligação"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Adicionar à fila"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Não foi possível guardar a palavra-passe. Garanta que o chaveiro da sessão está desbloqueado."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Ocorreu um erro! Verifique os logs para mais detalhes!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Biblioteca"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Listas de reprodução"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "A reproduzir"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Nenhuma canção a ser reproduzida"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Sobre"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Sair"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Terminar sessão"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Conexão restaurada"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Melhores faixas"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Lançamentos"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Autenticar"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Álbums"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Artistas"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr ""
 
@@ -187,6 +187,7 @@ msgstr ""
 msgid "Your library will be shown here."
 msgstr ""
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} canção selecionada"
 msgstr[1] "{} canções selecionadas"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr ""
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr ""
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr ""
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr ""
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr ""
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgstr "Faixas"
 msgid "Duration"
 msgstr "Duração"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -256,3 +257,99 @@ msgstr "Copyright"
 msgid "{} by {}"
 msgstr ""
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/ru.po b/po/ru.po
index acd27569..140c34fe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgstr "Скопировать ссылку"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Добавить в очередь"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Не удалось сохранить пароль. Убедитесь, что связка ключей сеанса разблокирована."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Произошла ошибка. Смотрите подробности в логах!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Фонотека"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Плейлисты"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Воспроизводится сейчас"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Песня сейчас не играет"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "О Spot"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Выйти из программы"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Выйти из аккаунта"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Подключение восстановлено"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Топ треков"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Релизы"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Войти"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Альбомы"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Исполнители"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Сохраненные треки"
 
@@ -187,6 +187,7 @@ msgstr "У вас нет сохраненных альбомов."
 msgid "Your library will be shown here."
 msgstr "Здесь будет показана ваша фонотека."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -196,31 +197,31 @@ msgstr[2] "{} композиций выбрано"
 msgstr[3] ""
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Поиск в Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Введите для поиска."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Удалить"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Добавить в плейлист..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Отменить"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Выбрать все"
 
@@ -249,7 +250,7 @@ msgstr "Треки"
 msgid "Duration"
 msgstr "Продолжительность"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Авторское право"
 
@@ -258,3 +259,99 @@ msgstr "Авторское право"
 msgid "{} by {}"
 msgstr "{} в исполнении {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/sl.po b/po/sl.po
index ad275997..fa55a402 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -20,7 +20,7 @@ msgstr "Kopiraj povezavo"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Dodaj v vrsto"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Gesla ni bilo mogoče shraniti. Preveri, da je session keyring odklenjen."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Napaka! Poglej v dnevnik od programa za podrobnosti."
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Moja zbirka"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Seznami predvajanja"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Se predvaja"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Ni skladb za predvajanje"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "O programu"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Izhod"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Odjava"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Povezava ponovno vzpovstavljena"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Priljubljene skladbe"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Izdaje"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Prijava"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albumi"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Izvajalci"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr "Shranjene skladbe"
 
@@ -187,6 +187,7 @@ msgstr "Nimaš shranjenih albumov."
 msgid "Your library will be shown here."
 msgstr "Tvoja zbirka bo prikazana tukaj."
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -196,31 +197,31 @@ msgstr[2] "{} izbrane skladbe"
 msgstr[3] "{} izbranih skladb"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr "Razišči Spotify."
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr "Napiši za iskanje."
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr "Odstrani"
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr "Dodaj na seznam predvajanja..."
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr "Prekliči"
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr "Izberi vse"
 
@@ -249,7 +250,7 @@ msgstr "Skladbe"
 msgid "Duration"
 msgstr "Trajanje"
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr "Avtorska pravica"
 
@@ -258,3 +259,99 @@ msgstr "Avtorska pravica"
 msgid "{} by {}"
 msgstr "{} od {}"
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/tr.po b/po/tr.po
index e06dae69..5637788d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgstr "Bağlantıyı kopyala"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Sıraya ekle"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Şifreniz kaydedilemedi. Oturum anahtarlığınızın kilidinin açık olduğundan emin olun."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Bir hata meydana geldi. Günlükleri kontrol edin."
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Kütüphane"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Oynatma listesi"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Şu an oynatılıyor"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Herhangi bir şarkı oynatılmıyor"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Hakkında"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Çıkış"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Oturumdan çık"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "Bağlantı geri yüklendi."
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "En çok dinlenenler"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Parçalar"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Giriş yap"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Albümler"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Sanatçılar"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr ""
 
@@ -187,6 +187,7 @@ msgstr ""
 msgid "Your library will be shown here."
 msgstr ""
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -194,31 +195,31 @@ msgstr[0] "{} seçildi"
 msgstr[1] "{} seçildi"
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr ""
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr ""
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr ""
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr ""
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr ""
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr ""
 
@@ -249,7 +250,7 @@ msgstr "En çok dinlenenler"
 msgid "Duration"
 msgstr ""
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr ""
 
@@ -258,3 +259,99 @@ msgstr ""
 msgid "{} by {}"
 msgstr ""
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+
diff --git a/po/uk.po b/po/uk.po
index a3700155..ec336439 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -20,7 +20,7 @@ msgstr "Копіювати посилання"
 
 #. translators: This is part of a contextual menu attached to a single track; this entry adds a track at the end of the play queue.
 #: src/app/components/labels.rs:11
-#: src/app/components/selection/selection_toolbar.ui:37
+#: src/app/components/selection/selection_toolbar.ui:39
 msgid "Add to queue"
 msgstr "Додати в чергу"
 
@@ -40,25 +40,25 @@ msgid "Could not save password. Make sure the session keyring is unlocked."
 msgstr "Не вдалося зберегти пароль. Переконайтесь, що зв'язка ключів сеансу розблокована."
 
 #. translators: This notification is the default message for unhandled errors. Logs refer to console output.
-#: src/app/batch_loader.rs:91 src/app/components/mod.rs:117
+#: src/app/batch_loader.rs:91 src/app/components/mod.rs:122
 msgid "An error occured. Check logs for details!"
 msgstr "Сталася помилка. Перевірте журнал для детальної інформації!"
 
 #. translators: This is a sidebar entry to browse to saved albums.
-#: src/app/components/navigation/factory.rs:29
-#: src/app/components/navigation/home.rs:36
+#: src/app/components/navigation/factory.rs:32
+#: src/app/components/navigation/home.rs:68
 msgid "Library"
 msgstr "Бібліотека"
 
 #. translators: This is a sidebar entry to browse to saved playlists.
-#: src/app/components/navigation/factory.rs:44
-#: src/app/components/navigation/home.rs:42
+#: src/app/components/navigation/factory.rs:51
+#: src/app/components/navigation/home.rs:94
 msgid "Playlists"
 msgstr "Плейлисти"
 
 #. This is the visible name for the play queue. It appears in the sidebar as well.
-#: src/app/components/navigation/home.rs:53
-#: src/app/components/now_playing/now_playing_model.rs:152
+#: src/app/components/navigation/home.rs:87
+#: src/app/components/now_playing/now_playing_model.rs:134
 msgid "Now playing"
 msgstr "Відтворюється зараз"
 
@@ -70,21 +70,21 @@ msgid "No song playing"
 msgstr "Пісня зараз не грає"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:56
+#: src/app/components/user_menu/user_menu.rs:67
 msgid "About"
 msgstr "Про Spot"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:58
+#: src/app/components/user_menu/user_menu.rs:69
 msgid "Quit"
 msgstr "Вийти з програми"
 
 #. translators: This is a menu entry.
-#: src/app/components/user_menu/user_menu.rs:63
+#: src/app/components/user_menu/user_menu.rs:74
 msgid "Log out"
 msgstr "Вийти з аккаунту"
 
-#: src/app/state/login_state.rs:117
+#: src/app/state/login_state.rs:110
 msgid "Connection restored"
 msgstr "З'єднання відновлено"
 
@@ -94,7 +94,7 @@ msgid "Top tracks"
 msgstr "Топ треків"
 
 #. Title of the sections that contains all releases from an artist (both singles and albums).
-#: src/app/components/artist_details/artist_details.ui:55
+#: src/app/components/artist_details/artist_details.ui:53
 msgid "Releases"
 msgstr "Релізи"
 
@@ -124,17 +124,17 @@ msgid "Log in"
 msgstr "Увійти"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:70
+#: src/app/components/search/search.ui:72
 msgid "Albums"
 msgstr "Альбоми"
 
 #. This is the title of a section of the search results
-#: src/app/components/search/search.ui:103
+#: src/app/components/search/search.ui:105
 msgid "Artists"
 msgstr "Виконавці"
 
-#: src/app/components/navigation/factory.rs:73
-#: src/app/components/navigation/home.rs:48
+#: src/app/components/navigation/factory.rs:82
+#: src/app/components/navigation/home.rs:78
 msgid "Saved tracks"
 msgstr ""
 
@@ -187,6 +187,7 @@ msgstr ""
 msgid "Your library will be shown here."
 msgstr ""
 
+#. translators: This shows up when in selection mode. This text should be as short as possible.
 #: src/app/components/labels.rs:30
 msgid "{} song selected"
 msgid_plural "{} songs selected"
@@ -196,31 +197,31 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. Title for the empty search page (initial state).
-#: src/app/components/search/search.ui:114
+#: src/app/components/search/search.ui:116
 msgid "Search Spotify."
 msgstr ""
 
 #. Subtitle for the empty search page (initial state).
-#: src/app/components/search/search.ui:115
+#: src/app/components/search/search.ui:117
 msgid "Type to search."
 msgstr ""
 
-#: src/app/components/selection/selection_toolbar.ui:58
+#: src/app/components/selection/selection_toolbar.ui:69
 msgid "Remove"
 msgstr ""
 
 #. <property name="icon-name">playlist2-symbolic</property>
-#: src/app/components/selection/selection_toolbar.ui:47
+#: src/app/components/selection/selection_toolbar.ui:56
 msgid "Add to playlist..."
 msgstr ""
 
 #. Button label. Exits selection mode.
-#: src/app/components/headerbar/headerbar.ui:46
+#: src/app/components/headerbar/headerbar.ui:47
 msgid "Cancel"
 msgstr ""
 
 #. Button label. Selects all visible songs.
-#: src/app/components/headerbar/headerbar.ui:57
+#: src/app/components/headerbar/headerbar.ui:58
 msgid "Select all"
 msgstr ""
 
@@ -249,7 +250,7 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
-#: src/app/components/details/release_details.ui:78
+#: src/app/components/details/release_details.ui:68
 msgid "Copyright"
 msgstr ""
 
@@ -258,3 +259,99 @@ msgstr ""
 msgid "{} by {}"
 msgstr ""
 
+#: src/app/components/navigation/home.rs:32
+msgid "Unnamed playlist"
+msgstr ""
+
+#. translators: This is a sidebar entry to browse to saved playlists.
+#: src/app/components/navigation/home.rs:104
+msgid "All Playlists"
+msgstr ""
+
+#: src/app/components/selection/component.rs:66
+msgid "Tracks saved!"
+msgstr ""
+
+#. translators: This is a menu entry.
+#: src/app/components/user_menu/user_menu.rs:65
+msgid "Preferences"
+msgstr ""
+
+#: src/main.rs:81
+msgid "Failed to open link!"
+msgstr ""
+
+#. Header for a group of preference items regarding audio
+#: src/app/components/settings/settings.ui:13
+msgid "Audio"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:16
+msgid "Audio Backend"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:29
+msgid "ALSA Device"
+msgstr ""
+
+#. Description for the item (ALSA Device) in preferences
+#: src/app/components/settings/settings.ui:30
+msgid "Applied only if audio backend is ALSA"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:40
+msgid "Audio Quality"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:44
+msgid "Normal"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:45
+msgid "High"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:46
+msgid "Very high"
+msgstr ""
+
+#. Header for a group of preference items regarding the application's appearance
+#: src/app/components/settings/settings.ui:56
+msgid "Appearance"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:59
+msgid "Theme"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:63
+msgid "Light"
+msgstr ""
+
+#: src/app/components/settings/settings.ui:64
+msgid "Dark"
+msgstr ""
+
+#. Header for a group of preference items regarding network
+#: src/app/components/settings/settings.ui:74
+msgid "Network"
+msgstr ""
+
+#. Title for an item in preferences
+#: src/app/components/settings/settings.ui:77
+msgid "Access Point Port"
+msgstr ""
+
+#. Longer description for an item (Access Point Port) in preferences
+#: src/app/components/settings/settings.ui:78
+msgid "Port used for connections to Spotify's Access Point. Set to 0 if any port is fine."
+msgstr ""
+
+#: src/app/components/selection/selection_toolbar.ui:90
+msgid "Save to library"
+msgstr ""
+

From 7707709c8778ef5199a5ba26682f9247f5bb1ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20R=C3=BCberg?=
 <22551563+Toorero@users.noreply.github.com>
Date: Sun, 27 Mar 2022 23:43:27 +0200
Subject: [PATCH 29/33] Added translator (#500)

---
 TRANSLATORS | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/TRANSLATORS b/TRANSLATORS
index f08faa75..452864bf 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -21,4 +21,6 @@ Ana Pika Šubic
 Amor Ali
 Seioo Inoue
 Dmitry
-Francesco Babetto
\ No newline at end of file
+Julius Rüberg
+Francesco Babetto
+

From b12d865e4f77301aef855a2c6b7d65b73334a4b8 Mon Sep 17 00:00:00 2001
From: Tobias Bernard <bertob@users.noreply.github.com>
Date: Sun, 27 Mar 2022 23:43:56 +0200
Subject: [PATCH 30/33] icon: new spotlight metaphor, add symbolic, add source
 file (#483)

* icon: new spotlight metaphor, add symbolic, add source file

* move icons to expected locations, add artists credits

Co-authored-by: Alexandre Trendel <trendel.alexandre@gmail.com>
---
 ARTISTS                                       |    1 +
 data/dev.alextren.Spot.Source.svg             | 1033 +++++++++++++++++
 .../128x128/apps/dev.alextren.Spot.png        |  Bin 11417 -> 0 bytes
 data/hicolor/64x64/apps/dev.alextren.Spot.png |  Bin 11417 -> 0 bytes
 .../scalable/apps/dev.alextren.Spot.svg       |  313 ++---
 .../apps/dev.alextren.Spot-symbolic.svg       |   21 +
 src/meson.build                               |    5 +
 src/window.ui.in                              |    1 +
 8 files changed, 1144 insertions(+), 230 deletions(-)
 create mode 100644 ARTISTS
 create mode 100644 data/dev.alextren.Spot.Source.svg
 delete mode 100644 data/hicolor/128x128/apps/dev.alextren.Spot.png
 delete mode 100644 data/hicolor/64x64/apps/dev.alextren.Spot.png
 create mode 100644 data/hicolor/symbolic/apps/dev.alextren.Spot-symbolic.svg

diff --git a/ARTISTS b/ARTISTS
new file mode 100644
index 00000000..e1bcafc1
--- /dev/null
+++ b/ARTISTS
@@ -0,0 +1 @@
+Tobias Bernard
\ No newline at end of file
diff --git a/data/dev.alextren.Spot.Source.svg b/data/dev.alextren.Spot.Source.svg
new file mode 100644
index 00000000..2ac66012
--- /dev/null
+++ b/data/dev.alextren.Spot.Source.svg
@@ -0,0 +1,1033 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="Template.png"
+   width="192"
+   height="152"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="1.1-rc (52f87abb86, 2021-05-02)"
+   sodipodi:docname="dev.alextren.Spot.Source.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline;enable-background:new"
+   viewBox="0 0 192 152"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title4162">Adwaita Icon Template</title>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient1420">
+      <stop
+         id="stop1414"
+         offset="0"
+         style="stop-color:#3d3846;stop-opacity:1" />
+      <stop
+         id="stop1416"
+         offset="0.5"
+         style="stop-color:#9a9996;stop-opacity:1" />
+      <stop
+         id="stop1418"
+         offset="1"
+         style="stop-color:#5e5c64;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient91872">
+      <stop
+         id="stop91866"
+         offset="0"
+         style="stop-color:#9a9996;stop-opacity:1" />
+      <stop
+         id="stop91868"
+         offset="0.58781421"
+         style="stop-color:#c0bfbc;stop-opacity:1" />
+      <stop
+         id="stop91870"
+         offset="1"
+         style="stop-color:#9a9996;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient85296">
+      <stop
+         id="stop85290"
+         offset="0"
+         style="stop-color:#9a9996;stop-opacity:1" />
+      <stop
+         id="stop85292"
+         offset="0.5"
+         style="stop-color:#9a9996;stop-opacity:1" />
+      <stop
+         id="stop85294"
+         offset="1"
+         style="stop-color:#3d3846;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14027">
+      <stop
+         id="stop14021"
+         offset="0"
+         style="stop-color:#3d3846;stop-opacity:1" />
+      <stop
+         id="stop14023"
+         offset="0.5"
+         style="stop-color:#77767b;stop-opacity:1" />
+      <stop
+         id="stop14025"
+         offset="1"
+         style="stop-color:#5e5c64;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10902">
+      <stop
+         style="stop-color:#8ff0a4;stop-opacity:1;"
+         offset="0"
+         id="stop10898" />
+      <stop
+         style="stop-color:#33d17a;stop-opacity:1"
+         offset="1"
+         id="stop10900" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient7081"
+       x1="40"
+       y1="74"
+       x2="104"
+       y2="74"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1249999,0,0,1.1249999,-16.999988,147.49999)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10902"
+       id="linearGradient10904"
+       x1="72"
+       y1="120"
+       x2="72"
+       y2="88"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0666663,0,0,-1.0666663,-12.799976,372.79996)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14027"
+       id="linearGradient13997"
+       x1="34"
+       y1="268"
+       x2="94"
+       y2="268"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0666663,0,0,1.0666663,-132.26664,-549.86657)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient85296"
+       id="linearGradient48828"
+       x1="-232.63071"
+       y1="187.42563"
+       x2="-160.63071"
+       y2="187.42563"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14027"
+       id="linearGradient67425"
+       x1="27.798828"
+       y1="242"
+       x2="27.798828"
+       y2="236"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient91872"
+       id="linearGradient68725"
+       x1="24.000004"
+       y1="224.55428"
+       x2="62.55785"
+       y2="174.02551"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#ef2929"
+     fill="#f57900"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="161.48551"
+     inkscape:cy="28.461048"
+     inkscape:current-layer="g105025"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     width="400px"
+     height="300px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     objecttolerance="7"
+     gridtolerance="12"
+     guidetolerance="13"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:locked="false"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:object-nodes="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     showborder="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-text-baseline="true"
+     borderlayer="true"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5883"
+       spacingx="2"
+       spacingy="2"
+       enabled="true"
+       visible="true"
+       empspacing="4"
+       originx="8"
+       originy="8" />
+    <sodipodi:guide
+       position="72,16"
+       orientation="0,1"
+       id="guide1073"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="20,72"
+       orientation="1,0"
+       id="guide1075"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="72,112"
+       orientation="0,1"
+       id="guide1099"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="72,136"
+       orientation="0,1"
+       id="guide993"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="112,72"
+       orientation="1,0"
+       id="guide995"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8.0000001,72"
+       orientation="1,0"
+       id="guide867"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="128,72"
+       orientation="1,0"
+       id="guide869"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="72,124"
+       orientation="0,1"
+       id="guide871"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid873"
+       spacingx="1"
+       spacingy="1"
+       empspacing="8"
+       color="#000000"
+       opacity="0.49019608"
+       empcolor="#000000"
+       empopacity="0.08627451"
+       dotted="true"
+       originx="8"
+       originy="8" />
+    <sodipodi:guide
+       position="32,72"
+       orientation="1,0"
+       id="guide877"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="124,72"
+       orientation="1,0"
+       id="guide879"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="72,128"
+       orientation="0,1"
+       id="guide881"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="72,20"
+       orientation="0,1"
+       id="guide883"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="16,72"
+       orientation="1,0"
+       id="guide885"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="136,72"
+       orientation="1,0"
+       id="guide887"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="72,8"
+       orientation="0,1"
+       id="guide897"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="72,32"
+       orientation="0,1"
+       id="guide899"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="264,264"
+       orientation="-0.70710678,0.70710678"
+       id="guide950"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="72,72"
+       orientation="0.70710678,0.70710678"
+       id="guide952"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>GNOME Design Team</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:title>Adwaita Icon Template</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <dc:date />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier />
+        <dc:relation />
+        <dc:language />
+        <dc:coverage />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="App Icon"
+     inkscape:groupmode="layer"
+     style="display:inline"
+     transform="translate(8,-156)">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="template"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         inkscape:label="0"
+         y="172"
+         x="9.2651362e-08"
+         height="128"
+         width="128"
+         id="hicolor"
+         style="display:inline;overflow:visible;visibility:visible;fill:#f0f0f0;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate" />
+      <rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#f0f0f0;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate"
+         id="symbolic"
+         width="16"
+         height="16"
+         x="160"
+         y="172"
+         inkscape:label="0" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="baseplate"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <g
+         style="display:inline;fill:#000000;enable-background:new"
+         transform="matrix(7.9911709,0,0,8.0036407,-167.7909,-4846.0776)"
+         id="g12027"
+         inkscape:export-xdpi="12"
+         inkscape:export-ydpi="12" />
+      <rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate"
+         id="128"
+         width="128"
+         height="128"
+         x="9.2651362e-08"
+         y="172"
+         inkscape:label="0" />
+      <g
+         id="g883"
+         style="fill:none;fill-opacity:0.25098;stroke:#a579b3;stroke-opacity:1"
+         transform="translate(-24,24)" />
+      <g
+         id="g900"
+         style="fill:none;fill-opacity:0.25098;stroke:#a579b3;stroke-opacity:1"
+         transform="translate(-24,24)" />
+      <rect
+         inkscape:label=""
+         y="172"
+         x="160"
+         height="16"
+         width="16"
+         id="16"
+         style="display:inline;overflow:visible;visibility:visible;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.332649;enable-background:new"
+         x="0"
+         y="167"
+         id="text863"
+         inkscape:label="icon-name"><tspan
+           style="font-size:4px;stroke-width:0.332649"
+           sodipodi:role="line"
+           id="tspan861"
+           x="0"
+           y="167">Hicolor</tspan></text>
+      <text
+         inkscape:label="icon-name"
+         id="text867"
+         y="167"
+         x="160"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.332649;enable-background:new"
+         xml:space="preserve"><tspan
+           y="167"
+           x="160"
+           id="tspan865"
+           sodipodi:role="line"
+           style="font-size:4px;stroke-width:0.332649">Symbolic</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer9"
+       inkscape:label="icons"
+       style="display:inline">
+      <rect
+         style="fill:url(#linearGradient67425);stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:26.4;fill-opacity:1"
+         id="rect3414"
+         width="92"
+         height="6"
+         x="18"
+         y="236"
+         rx="3"
+         ry="3" />
+      <path
+         id="path1237"
+         style="fill:url(#linearGradient7081);fill-opacity:1;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:26.4"
+         d="m 64.000003,184 c -19.882246,0 -35.999996,16.11774 -35.999996,35.99999 V 264 H 100 V 219.99999 C 100,200.11774 83.88225,184 64.000003,184 Z"
+         sodipodi:nodetypes="ssccss" />
+      <g
+         id="g5472-3"
+         transform="translate(0,-2)"
+         style="display:inline;enable-background:new" />
+      <circle
+         style="fill:url(#linearGradient48828);fill-opacity:1.0;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:26.4"
+         id="circle1341"
+         cx="-196.63071"
+         cy="187.42563"
+         r="36"
+         transform="rotate(-60)" />
+      <circle
+         style="fill:url(#linearGradient13997);fill-opacity:1;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:26.4"
+         id="circle7471"
+         cx="-64"
+         cy="-264"
+         r="31.99999"
+         transform="scale(-1)" />
+      <path
+         id="circle10401"
+         style="fill:url(#linearGradient10904);fill-opacity:1;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:26.4"
+         d="M 63.999998,285.33332 A 31.99999,31.99999 0 0 1 32.493759,258.66667 31.99999,31.99999 0 0 1 63.999998,232 31.99999,31.99999 0 0 1 95.52707,258.76459 31.99999,31.99999 0 0 1 63.999998,285.33332 Z" />
+      <path
+         style="fill:none;stroke:url(#linearGradient68725);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 24,244 5e-6,-30.00001 C 24.000014,191.9086 41.908616,174 63.999996,174 c 22.091379,0 39.999984,17.9086 39.999994,39.99999 L 104,244"
+         id="path24945"
+         sodipodi:nodetypes="ccscc" />
+      <g
+         id="g60034"
+         transform="translate(0,-2)">
+        <circle
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="path54823"
+           cx="64"
+           cy="194"
+           r="1.5" />
+        <circle
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="circle54949"
+           cx="57.668438"
+           cy="194.55498"
+           r="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="circle55475"
+           cx="51.54501"
+           cy="196.21275"
+           rx="1.3919088"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="circle55477"
+           cx="46.370708"
+           cy="198.60464"
+           rx="1.2621114"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.99999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.99999, 1.99999;stroke-dashoffset:0;stroke-opacity:1"
+           id="circle55479"
+           cx="41.886765"
+           cy="201.5901"
+           rx="1.2796253"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse57022"
+           cx="38.158634"
+           cy="204.93558"
+           rx="1.1464466"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse57026"
+           cx="34.768345"
+           cy="208.98325"
+           rx="1.0473255"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse57028"
+           cx="32.141216"
+           cy="213.22084"
+           rx="0.85469854"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse57030"
+           cx="30.058434"
+           cy="217.97186"
+           rx="0.7117542"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse57034"
+           cx="28.717325"
+           cy="222.81386"
+           rx="0.50814092"
+           ry="1.5" />
+        <g
+           id="g59993"
+           transform="matrix(-1,0,0,1,128,0)">
+          <circle
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="circle59965"
+             cx="57.668438"
+             cy="194.55498"
+             r="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse59967"
+             cx="51.54501"
+             cy="196.21275"
+             rx="1.3919088"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse59969"
+             cx="46.370708"
+             cy="198.60464"
+             rx="1.2621114"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.99999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.99999, 1.99999;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse59971"
+             cx="41.886765"
+             cy="201.5901"
+             rx="1.2796253"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse59973"
+             cx="38.158634"
+             cy="204.93558"
+             rx="1.1464466"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse59975"
+             cx="34.768345"
+             cy="208.98325"
+             rx="1.0473255"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse59977"
+             cx="32.141216"
+             cy="213.22084"
+             rx="0.85469854"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse59979"
+             cx="30.058434"
+             cy="217.97186"
+             rx="0.7117542"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse59981"
+             cx="28.717325"
+             cy="222.81386"
+             rx="0.50814092"
+             ry="1.5" />
+        </g>
+      </g>
+      <g
+         id="g60096"
+         transform="translate(0,3)">
+        <circle
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="circle60054"
+           cx="64"
+           cy="194"
+           r="1.5" />
+        <circle
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="circle60056"
+           cx="57.668438"
+           cy="194.55498"
+           r="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse60058"
+           cx="51.54501"
+           cy="196.21275"
+           rx="1.3919088"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse60060"
+           cx="46.370708"
+           cy="198.60464"
+           rx="1.2621114"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.99999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.99999, 1.99999;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse60062"
+           cx="41.886765"
+           cy="201.5901"
+           rx="1.2796253"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse60064"
+           cx="38.158634"
+           cy="204.93558"
+           rx="1.1464466"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse60066"
+           cx="34.768345"
+           cy="208.98325"
+           rx="1.0473255"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse60068"
+           cx="32.141216"
+           cy="213.22084"
+           rx="0.85469854"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse60070"
+           cx="30.058434"
+           cy="217.97186"
+           rx="0.7117542"
+           ry="1.5" />
+        <ellipse
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+           id="ellipse60072"
+           cx="28.717325"
+           cy="222.81386"
+           rx="0.50814092"
+           ry="1.5" />
+        <g
+           id="g60094"
+           transform="matrix(-1,0,0,1,128,0)">
+          <circle
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="circle60076"
+             cx="57.668438"
+             cy="194.55498"
+             r="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse60078"
+             cx="51.54501"
+             cy="196.21275"
+             rx="1.3919088"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse60080"
+             cx="46.370708"
+             cy="198.60464"
+             rx="1.2621114"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.99999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.99999, 1.99999;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse60082"
+             cx="41.886765"
+             cy="201.5901"
+             rx="1.2796253"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse60084"
+             cx="38.158634"
+             cy="204.93558"
+             rx="1.1464466"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse60086"
+             cx="34.768345"
+             cy="208.98325"
+             rx="1.0473255"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse60088"
+             cx="32.141216"
+             cy="213.22084"
+             rx="0.85469854"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse60090"
+             cx="30.058434"
+             cy="217.97186"
+             rx="0.7117542"
+             ry="1.5" />
+          <ellipse
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
+             id="ellipse60092"
+             cx="28.717325"
+             cy="222.81386"
+             rx="0.50814092"
+             ry="1.5" />
+        </g>
+      </g>
+      <path
+         id="path82100"
+         style="opacity:0.3;fill:#241f31;fill-opacity:1;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:26.4"
+         d="m 64,222 c -19.882246,0 -36,16.11775 -36,36 v 2 c 0,-19.88225 16.117754,-36 36,-36 19.88225,0 36,16.11775 36,36 v -2 c 0,-19.88225 -16.11775,-36 -36,-36 z"
+         sodipodi:nodetypes="sscscss" />
+      <g
+         id="g105025"
+         transform="rotate(-60,192.09808,218.54294)">
+        <path
+           id="rect105019"
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 171,19.855469 -2.84375,4.925781 c -0.22993,0.398253 -0.0936,0.904834 0.30469,1.134766 l 7.9414,4.583984 4,-6.927734 L 176,21.029297 v 4.140625 C 176,26.166492 175.16649,27 174.16992,27 h -1.33984 C 171.83351,27 171,26.166492 171,25.169922 Z m 10.26758,4.216797 -4,6.927734 1.01367,0.585938 c 0.39825,0.229931 0.90483,0.09357 1.13477,-0.304688 l 3.16992,-5.490234 c 0.22993,-0.398254 0.0936,-0.904834 -0.30469,-1.134766 z"
+           transform="rotate(60,60.998117,133.61474)"
+           sodipodi:nodetypes="ccccccsssscccccccc" />
+      </g>
+      <rect
+         style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect104246"
+         width="8"
+         height="13"
+         x="9.3127747"
+         y="-346.01334"
+         rx="0.83007801"
+         ry="0.83007801"
+         transform="rotate(120)" />
+      <g
+         id="rect104250" />
+      <path
+         id="rect103998"
+         style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 164.83008,172 C 164.37021,172 164,172.37021 164,172.83008 v 8.33984 c 0,0.45986 0.37021,0.83008 0.83008,0.83008 h 1.33984 C 166.62979,182 167,181.62978 167,181.16992 v -8.33984 C 167,172.37021 166.62979,172 166.16992,172 Z m 0.66992,7.5 c 0.27614,0 0.5,0.22386 0.5,0.5 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 z"
+         sodipodi:nodetypes="ssssssssssssss" />
+      <rect
+         style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect104248"
+         width="8"
+         height="13"
+         x="298"
+         y="172"
+         rx="0.83007801"
+         ry="0.83007801" />
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect104915"
+         width="8"
+         height="1"
+         x="298"
+         y="182" />
+      <g
+         id="g106816"
+         transform="rotate(-60,237.09808,140.60069)">
+        <rect
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect106812"
+           width="8"
+           height="13"
+           x="208"
+           y="172"
+           rx="0.83007801"
+           ry="0.83007801" />
+        <rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect106814"
+           width="8"
+           height="1"
+           x="208"
+           y="182" />
+      </g>
+      <rect
+         style="opacity:1;fill:#241f31;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect106818"
+         width="3"
+         height="10"
+         x="254"
+         y="172"
+         rx="0.83007801"
+         ry="0.83007801" />
+      <rect
+         style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect106820"
+         width="3"
+         height="9"
+         x="254"
+         y="173"
+         rx="0.83007801"
+         ry="0.83007801" />
+      <circle
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="circle106822"
+         cx="255.5"
+         cy="180"
+         r="0.5" />
+      <g
+         id="g107657">
+        <g
+           id="g107651"
+           transform="translate(70)">
+          <g
+             id="g107644"
+             transform="rotate(-60,192.09808,218.54294)">
+            <path
+               id="path107642"
+               style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               d="M 173,19.296875 V 25 h 1 v -5.125 z m -2,0.558594 -2.84375,4.925781 c -0.22993,0.398253 -0.0936,0.904834 0.30469,1.134766 l 7.9414,4.583984 4,-6.927734 L 176,21.029297 v 4.140625 C 176,26.166492 175.16649,27 174.16992,27 h -1.33984 C 171.83351,27 171,26.166492 171,25.169922 Z m 10.26758,4.216797 -4,6.927734 1.01367,0.585938 c 0.39825,0.229931 0.90483,0.09357 1.13477,-0.304688 l 3.16992,-5.490234 c 0.22993,-0.398254 0.0936,-0.904834 -0.30469,-1.134766 z"
+               transform="rotate(60,60.998117,133.61474)" />
+          </g>
+          <path
+             id="path107646"
+             style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             d="M 172.83008,17 C 172.37021,17 172,17.370215 172,17.830078 v 7.339844 C 172,25.629785 172.37021,26 172.83008,26 h 1.33984 C 174.62979,26 175,25.629785 175,25.169922 V 17.830078 C 175,17.370215 174.62979,17 174.16992,17 Z M 173.5,23.5 a 0.5,0.5 0 0 1 0.5,0.5 0.5,0.5 0 0 1 -0.5,0.5 0.5,0.5 0 0 1 -0.5,-0.5 0.5,0.5 0 0 1 0.5,-0.5 z"
+             transform="translate(-8,156)" />
+        </g>
+      </g>
+      <g
+         id="g116652"
+         transform="rotate(-60,219.77758,130.60069)">
+        <rect
+           style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect116648"
+           width="8"
+           height="13"
+           x="208"
+           y="172"
+           rx="0.83007801"
+           ry="0.83007801" />
+        <rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect116650"
+           width="8"
+           height="1"
+           x="208"
+           y="182" />
+      </g>
+      <rect
+         style="opacity:1;fill:#241f31;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect116654"
+         width="2"
+         height="10"
+         x="254"
+         y="151"
+         rx="0.83007795"
+         ry="0.83007801" />
+      <rect
+         style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:0.999996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect116656"
+         width="2"
+         height="9"
+         x="254"
+         y="152"
+         rx="0.83007795"
+         ry="0.83007801" />
+      <circle
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="circle116658"
+         cx="255"
+         cy="159"
+         r="0.5" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="grid"
+       style="display:none"
+       sodipodi:insensitive="true">
+      <circle
+         cx="64.000031"
+         cy="236"
+         r="59.504131"
+         id="circle2892"
+         style="display:inline;opacity:0.1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.99, 0.99;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
+      <rect
+         ry="7.9292889"
+         rx="8.701004"
+         y="180.49496"
+         x="20.495007"
+         height="111.01005"
+         width="87.009987"
+         id="rect2894"
+         style="display:inline;opacity:0.1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.99, 0.99;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
+      <rect
+         ry="7.9238095"
+         rx="7.9238095"
+         y="184.49524"
+         x="12.495266"
+         height="103.00952"
+         width="103.00952"
+         id="rect2896"
+         style="display:inline;opacity:0.1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.99, 0.99;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
+      <rect
+         ry="8.701005"
+         rx="7.9292889"
+         y="200.49496"
+         x="8.4950066"
+         height="87.010048"
+         width="111.01004"
+         id="rect2898"
+         style="display:inline;opacity:0.1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.99, 0.99;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2900"
+         d="M 2.6203015e-5,288.99999 H 128.00003"
+         style="display:inline;fill:none;stroke:#62a0ea;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new" />
+    </g>
+  </g>
+</svg>
diff --git a/data/hicolor/128x128/apps/dev.alextren.Spot.png b/data/hicolor/128x128/apps/dev.alextren.Spot.png
deleted file mode 100644
index 54c9f237e6404df0d35c9cb75f0d80193cdf5699..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11417
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

diff --git a/data/hicolor/64x64/apps/dev.alextren.Spot.png b/data/hicolor/64x64/apps/dev.alextren.Spot.png
deleted file mode 100644
index 54c9f237e6404df0d35c9cb75f0d80193cdf5699..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11417
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

diff --git a/data/hicolor/scalable/apps/dev.alextren.Spot.svg b/data/hicolor/scalable/apps/dev.alextren.Spot.svg
index 8d382040..71f857d9 100644
--- a/data/hicolor/scalable/apps/dev.alextren.Spot.svg
+++ b/data/hicolor/scalable/apps/dev.alextren.Spot.svg
@@ -1,236 +1,89 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128mm"
-   height="128mm"
-   viewBox="0 0 128 128"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)"
-   sodipodi:docname="dev.alextren.Spot.svg"
-   inkscape:export-filename="/home/alexandre/Dev/spot/data/hicolor/64x64/apps/dev.alextren.Spot.png"
-   inkscape:export-xdpi="25.4"
-   inkscape:export-ydpi="25.4">
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2757">
-      <stop
-         style="stop-color:#74ec6e;stop-opacity:1;"
-         offset="0"
-         id="stop2753" />
-      <stop
-         style="stop-color:#46b940;stop-opacity:0.93995589"
-         offset="1"
-         id="stop2755" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <linearGradient id="a" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#3d3846"/>
+        <stop offset="0.5" stop-color="#77767b"/>
+        <stop offset="1" stop-color="#5e5c64"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2749">
-      <stop
-         style="stop-color:#27271c;stop-opacity:1;"
-         offset="0"
-         id="stop2745" />
-      <stop
-         style="stop-color:#70704c;stop-opacity:1"
-         offset="1"
-         id="stop2747" />
+    <linearGradient id="b" x1="27.798828" x2="27.798828" xlink:href="#a" y1="70" y2="64"/>
+    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="28.000011" x2="100.000011" y1="58.749985" y2="58.749985">
+        <stop offset="0" stop-color="#3d3846"/>
+        <stop offset="0.5" stop-color="#9a9996"/>
+        <stop offset="1" stop-color="#5e5c64"/>
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2749"
-       id="radialGradient2751"
-       cx="719.96484"
-       cy="1029.8739"
-       fx="719.96484"
-       fy="1029.8739"
-       r="287.72656"
-       gradientTransform="matrix(2.7228205,0.4517848,-0.58137939,3.5038621,-641.62275,-2903.9314)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2757"
-       id="radialGradient2759"
-       cx="263.27335"
-       cy="203.27173"
-       fx="263.27335"
-       fy="203.27173"
-       r="48.027206"
-       gradientTransform="matrix(1.5287854,0.25776481,-0.29598443,1.7554634,-79.049834,-221.42695)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter2781"
-       x="-4.235661e-06"
-       width="1.0000085"
-       y="-5.5378346e-06"
-       height="1.0000111">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.00027303362"
-         id="feGaussianBlur2783" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2749"
-       id="radialGradient3765"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7228205,0.4517848,-0.58137939,3.5038621,-641.62275,-2903.9314)"
-       cx="719.96484"
-       cy="1029.8739"
-       fx="719.96484"
-       fy="1029.8739"
-       r="287.72656" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter3777">
-      <feFlood
-         flood-opacity="1"
-         flood-color="rgb(51,51,45)"
-         result="flood"
-         id="feFlood3767" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite3769" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0"
-         result="blur"
-         id="feGaussianBlur3771" />
-      <feOffset
-         dx="20"
-         dy="-5"
-         result="offset"
-         id="feOffset3773" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite3775" />
+    <linearGradient id="d" gradientTransform="matrix(0.5 -0.866025 0.866025 0.5 0 -172)" gradientUnits="userSpaceOnUse" x1="-232.630707" x2="-160.630707" y1="187.425629" y2="187.425629">
+        <stop offset="0" stop-color="#9a9996"/>
+        <stop offset="0.5" stop-color="#9a9996"/>
+        <stop offset="1" stop-color="#3d3846"/>
+    </linearGradient>
+    <linearGradient id="e" gradientTransform="matrix(-1.066666 0 0 -1.066666 132.266647 377.866577)" x1="34" x2="94" xlink:href="#a" y1="268" y2="268"/>
+    <linearGradient id="f" gradientTransform="matrix(1.066666 0 0 -1.066666 -12.799976 200.799957)" gradientUnits="userSpaceOnUse" x1="72" x2="72" y1="120" y2="88">
+        <stop offset="0" stop-color="#8ff0a4"/>
+        <stop offset="1" stop-color="#33d17a"/>
+    </linearGradient>
+    <linearGradient id="g" gradientUnits="userSpaceOnUse" x1="24.000004" x2="62.55785" y1="224.554276" y2="174.025513">
+        <stop offset="0" stop-color="#9a9996"/>
+        <stop offset="0.587814" stop-color="#c0bfbc"/>
+        <stop offset="1" stop-color="#9a9996"/>
+    </linearGradient>
+    <filter id="h" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
     </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.1763764"
-     inkscape:cx="253.23296"
-     inkscape:cy="261.40225"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g3763"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-others="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-nodes="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1695"
-       transform="translate(47.436559,58.89443)">
-      <g
-         id="g3763"
-         transform="matrix(1.5380555,0,0,1.5380555,-44.184687,-135.21164)">
-        <g
-           id="g2094"
-           transform="matrix(0.22230233,0,0,0.22230233,2.7225519,36.749734)">
-          <path
-             id="path1821"
-             style="fill:#27271c;fill-opacity:1;stroke-width:0.247182"
-             d="m 75.843925,385.39779 v 8.63264 c 0,0.009 0.0051,0.0159 0.0051,0.0245 a 38.440977,20.564752 0 0 0 -0.0051,0.31784 38.440977,20.564752 0 0 0 38.441275,20.56418 38.440977,20.564752 0 0 0 38.44061,-20.56418 38.440977,20.564752 0 0 0 -0.005,-0.31916 c 5.8e-4,-0.008 0.005,-0.0149 0.005,-0.0232 v -8.63264 z" />
-          <ellipse
-             style="fill:#3d3d36;fill-opacity:1;stroke-width:0.247182"
-             id="path1821-5"
-             cx="114.28486"
-             cy="386.13379"
-             rx="38.440979"
-             ry="20.564751" />
+    <mask id="i">
+        <g filter="url(#h)">
+            <rect fill-opacity="0.3" height="128" width="128"/>
         </g>
-        <rect
-           style="fill:#27271c;fill-opacity:1;stroke:#27271c;stroke-width:3.33454;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect2136"
-           width="2.5495186"
-           height="9.7392559"
-           x="26.853582"
-           y="112.47221"
-           ry="0.030315619" />
-        <g
-           id="g1861"
-           transform="matrix(0.11115117,-0.19251947,0.19251947,0.11115117,-33.241108,127.98037)"
-           style="stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none">
-          <path
-             id="path1731"
-             style="fill:url(#radialGradient3765);fill-opacity:1;stroke:none;stroke-width:3.77953;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3777)"
-             d="m 771.58594,689.7168 a 340.15748,340.15748 0 0 0 -339.34766,340.1582 340.15748,340.15748 0 0 0 340.15625,340.1562 340.15748,340.15748 0 0 0 84.98438,-10.7871 187.97788,336.18897 0 0 0 150.31249,-329.3711 187.97788,336.18897 0 0 0 -150.29492,-329.36323 340.15748,340.15748 0 0 0 -85.00195,-10.79297 340.15748,340.15748 0 0 0 -0.80859,0 z m 48.47265,18.89843 a 179.63038,321.25984 0 0 1 0.33594,0 A 179.63038,321.25984 0 0 1 1000.0254,1029.875 179.63038,321.25984 0 0 1 820.39453,1351.1348 179.63038,321.25984 0 0 1 640.76562,1029.875 179.63038,321.25984 0 0 1 820.05859,708.61523 Z"
-             transform="matrix(0.26458333,0,0,0.26458333,46.391047,-69.215736)" />
-          <path
-             id="path2110-6"
-             style="fill:#74ec6e;fill-opacity:0.457366;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-             d="m 444.11277,98.398085 -180.90089,22.103365 -12.22043,162.50978 175.59965,44.7941 c 22.24629,5.8872 85.75188,-131.16439 17.52167,-229.407245 z"
-             sodipodi:nodetypes="ccccc" />
-          <ellipse
-             style="opacity:0.995;fill:url(#radialGradient2759);fill-opacity:1;stroke:#444444;stroke-width:3.25086;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2781)"
-             id="path1733-6"
-             cx="263.27335"
-             cy="203.27173"
-             rx="47.527206"
-             ry="85.000008" />
-        </g>
-        <g
-           id="g2083"
-           transform="matrix(2.0191768,-0.04672569,0.04672569,2.0191768,-37.688795,123.81905)">
-          <g
-             fill="#212121"
-             id="g2068"
-             transform="matrix(1.0078735,0.58189605,-0.58189605,1.0078735,38.538128,-40.856893)">
-            <path
-               d="m 16.872,17.656 v 0.001 c -0.203,0 -0.329,-0.063 -0.518,-0.174 -3.019,-1.82 -6.532,-1.896 -10.002,-1.185 -0.189,0.049 -0.436,0.126 -0.576,0.126 -0.47,0 -0.765,-0.373 -0.765,-0.765 0,-0.499 0.295,-0.736 0.659,-0.813 3.963,-0.875 8.013,-0.798 11.467,1.268 0.295,0.189 0.47,0.358 0.47,0.798 0,0.438 -0.344,0.744 -0.735,0.744 z"
-               id="path2062" />
-            <path
-               d="m 18.175,14.483 h -0.001 c -0.252,0 -0.421,-0.111 -0.596,-0.203 -3.025,-1.79 -7.533,-2.512 -11.545,-1.423 -0.232,0.063 -0.358,0.126 -0.576,0.126 -0.518,0 -0.938,-0.421 -0.938,-0.938 0,-0.517 0.252,-0.861 0.75,-1.001 1.345,-0.378 2.719,-0.659 4.732,-0.659 3.14,0 6.174,0.779 8.565,2.202 0.392,0.232 0.547,0.533 0.547,0.953 -0.005,0.521 -0.411,0.943 -0.938,0.943 z"
-               id="path2064" />
-            <path
-               d="m 4.548,6.998 c 1.703,-0.499 3.61,-0.735 5.686,-0.735 3.532,0 7.234,0.735 9.939,2.313 0.378,0.218 0.624,0.518 0.624,1.093 0,0.658 -0.533,1.127 -1.122,1.127 l -0.001,-10e-4 c -0.252,0 -0.407,-0.063 -0.625,-0.189 C 15.605,8.55 9.444,8.057 5.458,9.17 5.283,9.218 5.065,9.295 4.833,9.295 4.194,9.295 3.706,8.796 3.706,8.153 3.706,7.496 4.113,7.124 4.548,6.998 Z"
-               id="path2066" />
-          </g>
-        </g>
-      </g>
+    </mask>
+    <clipPath id="j">
+        <rect height="152" width="192"/>
+    </clipPath>
+    <path d="m 21 64 h 86 c 1.65625 0 3 1.34375 3 3 s -1.34375 3 -3 3 h -86 c -1.65625 0 -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 z m 0 0" fill="url(#b)"/>
+    <path d="m 64 12 c -19.882812 0 -36 16.117188 -36 36 v 44 h 72 v -44 c 0 -19.882812 -16.117188 -36 -36 -36 z m 0 0" fill="url(#c)"/>
+    <path d="m 82 60.824219 c 17.21875 9.941406 23.117188 31.957031 13.175781 49.175781 c -9.941406 17.21875 -31.957031 23.117188 -49.175781 13.175781 c -17.21875 -9.941406 -23.117188 -31.957031 -13.175781 -49.175781 c 9.941406 -17.21875 31.957031 -23.117188 49.175781 -13.175781 z m 0 0" fill="url(#d)"/>
+    <path d="m 32 92 c 0 -17.671875 14.328125 -32 32 -32 s 32 14.328125 32 32 s -14.328125 32 -32 32 s -32 -14.328125 -32 -32 z m 0 0" fill="url(#e)"/>
+    <path d="m 64 113.332031 c -15.597656 -0.019531 -28.90625 -11.285156 -31.507812 -26.664062 c 2.601562 -15.378907 15.910156 -26.644531 31.507812 -26.667969 c 15.636719 0.019531 28.96875 11.339844 31.527344 26.765625 c -2.644532 15.347656 -15.953125 26.5625 -31.527344 26.566406 z m 0 0" fill="url(#f)"/>
+    <path d="m 24 244 v -30 c 0 -22.089844 17.910156 -40 40 -40 s 40 17.910156 40 40 v 30" fill="none" stroke="url(#g)" stroke-linecap="round" stroke-width="4" transform="matrix(1 0 0 1 0 -172)"/>
+    <g fill="#241f31">
+        <path d="m 65.5 20 c 0 0.828125 -0.671875 1.5 -1.5 1.5 s -1.5 -0.671875 -1.5 -1.5 s 0.671875 -1.5 1.5 -1.5 s 1.5 0.671875 1.5 1.5 z m 0 0"/>
+        <path d="m 59.167969 20.554688 c 0 0.828124 -0.671875 1.5 -1.5 1.5 s -1.5 -0.671876 -1.5 -1.5 c 0 -0.828126 0.671875 -1.5 1.5 -1.5 s 1.5 0.671874 1.5 1.5 z m 0 0"/>
+        <path d="m 52.9375 22.210938 c 0 0.832031 -0.625 1.5 -1.390625 1.5 c -0.769531 0 -1.394531 -0.667969 -1.394531 -1.5 c 0 -0.828126 0.625 -1.5 1.394531 -1.5 c 0.765625 0 1.390625 0.671874 1.390625 1.5 z m 0 0"/>
+        <path d="m 47.632812 24.605469 c 0 0.828125 -0.566406 1.5 -1.261718 1.5 c -0.699219 0 -1.261719 -0.671875 -1.261719 -1.5 s 0.5625 -1.5 1.261719 -1.5 c 0.695312 0 1.261718 0.671875 1.261718 1.5 z m 0 0"/>
+        <path d="m 43.167969 27.589844 c 0 0.828125 -0.574219 1.5 -1.28125 1.5 s -1.28125 -0.671875 -1.28125 -1.5 s 0.574219 -1.5 1.28125 -1.5 s 1.28125 0.671875 1.28125 1.5 z m 0 0"/>
+        <path d="m 39.304688 30.9375 c 0 0.828125 -0.511719 1.5 -1.144532 1.5 c -0.632812 0 -1.148437 -0.671875 -1.148437 -1.5 c 0 -0.832031 0.515625 -1.5 1.148437 -1.5 c 0.632813 0 1.144532 0.667969 1.144532 1.5 z m 0 0"/>
+        <path d="m 35.816406 34.984375 c 0 0.828125 -0.46875 1.5 -1.046875 1.5 s -1.046875 -0.671875 -1.046875 -1.5 s 0.46875 -1.5 1.046875 -1.5 s 1.046875 0.671875 1.046875 1.5 z m 0 0"/>
+        <path d="m 32.996094 39.222656 c 0 0.828125 -0.382813 1.5 -0.855469 1.5 s -0.855469 -0.671875 -0.855469 -1.5 c 0 -0.832031 0.382813 -1.5 0.855469 -1.5 s 0.855469 0.667969 0.855469 1.5 z m 0 0"/>
+        <path d="m 30.769531 43.972656 c 0 0.828125 -0.316406 1.5 -0.710937 1.5 c -0.394532 0 -0.710938 -0.671875 -0.710938 -1.5 s 0.316406 -1.5 0.710938 -1.5 c 0.394531 0 0.710937 0.671875 0.710937 1.5 z m 0 0"/>
+        <path d="m 29.226562 48.8125 c 0 0.828125 -0.230468 1.5 -0.507812 1.5 c -0.28125 0 -0.507812 -0.671875 -0.507812 -1.5 s 0.226562 -1.5 0.507812 -1.5 c 0.277344 0 0.507812 0.671875 0.507812 1.5 z m 0 0"/>
+        <path d="m 68.832031 20.554688 c 0 0.828124 0.671875 1.5 1.5 1.5 s 1.5 -0.671876 1.5 -1.5 c 0 -0.828126 -0.671875 -1.5 -1.5 -1.5 s -1.5 0.671874 -1.5 1.5 z m 0 0"/>
+        <path d="m 75.0625 22.210938 c 0 0.832031 0.625 1.5 1.390625 1.5 c 0.769531 0 1.394531 -0.667969 1.394531 -1.5 c 0 -0.828126 -0.625 -1.5 -1.394531 -1.5 c -0.765625 0 -1.390625 0.671874 -1.390625 1.5 z m 0 0"/>
+        <path d="m 80.367188 24.605469 c 0 0.828125 0.566406 1.5 1.261718 1.5 c 0.699219 0 1.261719 -0.671875 1.261719 -1.5 s -0.5625 -1.5 -1.261719 -1.5 c -0.695312 0 -1.261718 0.671875 -1.261718 1.5 z m 0 0"/>
+        <path d="m 84.832031 27.589844 c 0 0.828125 0.574219 1.5 1.28125 1.5 s 1.28125 -0.671875 1.28125 -1.5 s -0.574219 -1.5 -1.28125 -1.5 s -1.28125 0.671875 -1.28125 1.5 z m 0 0"/>
+        <path d="m 88.695312 30.9375 c 0 0.828125 0.511719 1.5 1.144532 1.5 c 0.632812 0 1.148437 -0.671875 1.148437 -1.5 c 0 -0.832031 -0.515625 -1.5 -1.148437 -1.5 c -0.632813 0 -1.144532 0.667969 -1.144532 1.5 z m 0 0"/>
+        <path d="m 92.183594 34.984375 c 0 0.828125 0.46875 1.5 1.046875 1.5 s 1.046875 -0.671875 1.046875 -1.5 s -0.46875 -1.5 -1.046875 -1.5 s -1.046875 0.671875 -1.046875 1.5 z m 0 0"/>
+        <path d="m 95.003906 39.222656 c 0 0.828125 0.382813 1.5 0.855469 1.5 s 0.855469 -0.671875 0.855469 -1.5 c 0 -0.832031 -0.382813 -1.5 -0.855469 -1.5 s -0.855469 0.667969 -0.855469 1.5 z m 0 0"/>
+        <path d="m 97.230469 43.972656 c 0 0.828125 0.316406 1.5 0.710937 1.5 c 0.394532 0 0.710938 -0.671875 0.710938 -1.5 s -0.316406 -1.5 -0.710938 -1.5 c -0.394531 0 -0.710937 0.671875 -0.710937 1.5 z m 0 0"/>
+        <path d="m 98.773438 48.8125 c 0 0.828125 0.230468 1.5 0.507812 1.5 c 0.28125 0 0.507812 -0.671875 0.507812 -1.5 s -0.226562 -1.5 -0.507812 -1.5 c -0.277344 0 -0.507812 0.671875 -0.507812 1.5 z m 0 0"/>
+        <path d="m 65.5 25 c 0 0.828125 -0.671875 1.5 -1.5 1.5 s -1.5 -0.671875 -1.5 -1.5 s 0.671875 -1.5 1.5 -1.5 s 1.5 0.671875 1.5 1.5 z m 0 0"/>
+        <path d="m 59.167969 25.554688 c 0 0.828124 -0.671875 1.5 -1.5 1.5 s -1.5 -0.671876 -1.5 -1.5 c 0 -0.828126 0.671875 -1.5 1.5 -1.5 s 1.5 0.671874 1.5 1.5 z m 0 0"/>
+        <path d="m 52.9375 27.210938 c 0 0.832031 -0.625 1.5 -1.390625 1.5 c -0.769531 0 -1.394531 -0.667969 -1.394531 -1.5 c 0 -0.828126 0.625 -1.5 1.394531 -1.5 c 0.765625 0 1.390625 0.671874 1.390625 1.5 z m 0 0"/>
+        <path d="m 47.632812 29.605469 c 0 0.828125 -0.566406 1.5 -1.261718 1.5 c -0.699219 0 -1.261719 -0.671875 -1.261719 -1.5 s 0.5625 -1.5 1.261719 -1.5 c 0.695312 0 1.261718 0.671875 1.261718 1.5 z m 0 0"/>
+        <path d="m 43.167969 32.589844 c 0 0.828125 -0.574219 1.5 -1.28125 1.5 s -1.28125 -0.671875 -1.28125 -1.5 s 0.574219 -1.5 1.28125 -1.5 s 1.28125 0.671875 1.28125 1.5 z m 0 0"/>
+        <path d="m 39.304688 35.9375 c 0 0.828125 -0.511719 1.5 -1.144532 1.5 c -0.632812 0 -1.148437 -0.671875 -1.148437 -1.5 c 0 -0.832031 0.515625 -1.5 1.148437 -1.5 c 0.632813 0 1.144532 0.667969 1.144532 1.5 z m 0 0"/>
+        <path d="m 35.816406 39.984375 c 0 0.828125 -0.46875 1.5 -1.046875 1.5 s -1.046875 -0.671875 -1.046875 -1.5 s 0.46875 -1.5 1.046875 -1.5 s 1.046875 0.671875 1.046875 1.5 z m 0 0"/>
+        <path d="m 32.996094 44.222656 c 0 0.828125 -0.382813 1.5 -0.855469 1.5 s -0.855469 -0.671875 -0.855469 -1.5 c 0 -0.832031 0.382813 -1.5 0.855469 -1.5 s 0.855469 0.667969 0.855469 1.5 z m 0 0"/>
+        <path d="m 30.769531 48.972656 c 0 0.828125 -0.316406 1.5 -0.710937 1.5 c -0.394532 0 -0.710938 -0.671875 -0.710938 -1.5 s 0.316406 -1.5 0.710938 -1.5 c 0.394531 0 0.710937 0.671875 0.710937 1.5 z m 0 0"/>
+        <path d="m 29.226562 53.8125 c 0 0.828125 -0.230468 1.5 -0.507812 1.5 c -0.28125 0 -0.507812 -0.671875 -0.507812 -1.5 s 0.226562 -1.5 0.507812 -1.5 c 0.277344 0 0.507812 0.671875 0.507812 1.5 z m 0 0"/>
+        <path d="m 68.832031 25.554688 c 0 0.828124 0.671875 1.5 1.5 1.5 s 1.5 -0.671876 1.5 -1.5 c 0 -0.828126 -0.671875 -1.5 -1.5 -1.5 s -1.5 0.671874 -1.5 1.5 z m 0 0"/>
+        <path d="m 75.0625 27.210938 c 0 0.832031 0.625 1.5 1.390625 1.5 c 0.769531 0 1.394531 -0.667969 1.394531 -1.5 c 0 -0.828126 -0.625 -1.5 -1.394531 -1.5 c -0.765625 0 -1.390625 0.671874 -1.390625 1.5 z m 0 0"/>
+        <path d="m 80.367188 29.605469 c 0 0.828125 0.566406 1.5 1.261718 1.5 c 0.699219 0 1.261719 -0.671875 1.261719 -1.5 s -0.5625 -1.5 -1.261719 -1.5 c -0.695312 0 -1.261718 0.671875 -1.261718 1.5 z m 0 0"/>
+        <path d="m 84.832031 32.589844 c 0 0.828125 0.574219 1.5 1.28125 1.5 s 1.28125 -0.671875 1.28125 -1.5 s -0.574219 -1.5 -1.28125 -1.5 s -1.28125 0.671875 -1.28125 1.5 z m 0 0"/>
+        <path d="m 88.695312 35.9375 c 0 0.828125 0.511719 1.5 1.144532 1.5 c 0.632812 0 1.148437 -0.671875 1.148437 -1.5 c 0 -0.832031 -0.515625 -1.5 -1.148437 -1.5 c -0.632813 0 -1.144532 0.667969 -1.144532 1.5 z m 0 0"/>
+        <path d="m 92.183594 39.984375 c 0 0.828125 0.46875 1.5 1.046875 1.5 s 1.046875 -0.671875 1.046875 -1.5 s -0.46875 -1.5 -1.046875 -1.5 s -1.046875 0.671875 -1.046875 1.5 z m 0 0"/>
+        <path d="m 95.003906 44.222656 c 0 0.828125 0.382813 1.5 0.855469 1.5 s 0.855469 -0.671875 0.855469 -1.5 c 0 -0.832031 -0.382813 -1.5 -0.855469 -1.5 s -0.855469 0.667969 -0.855469 1.5 z m 0 0"/>
+        <path d="m 97.230469 48.972656 c 0 0.828125 0.316406 1.5 0.710937 1.5 c 0.394532 0 0.710938 -0.671875 0.710938 -1.5 s -0.316406 -1.5 -0.710938 -1.5 c -0.394531 0 -0.710937 0.671875 -0.710937 1.5 z m 0 0"/>
+        <path d="m 98.773438 53.8125 c 0 0.828125 0.230468 1.5 0.507812 1.5 c 0.28125 0 0.507812 -0.671875 0.507812 -1.5 s -0.226562 -1.5 -0.507812 -1.5 c -0.277344 0 -0.507812 0.671875 -0.507812 1.5 z m 0 0"/>
+    </g>
+    <g clip-path="url(#j)" mask="url(#i)" transform="matrix(1 0 0 1 -8 -16)">
+        <path d="m 72 66 c -19.882812 0 -36 16.117188 -36 36 v 2 c 0 -19.882812 16.117188 -36 36 -36 s 36 16.117188 36 36 v -2 c 0 -19.882812 -16.117188 -36 -36 -36 z m 0 0" fill="#241f31"/>
     </g>
-  </g>
 </svg>
diff --git a/data/hicolor/symbolic/apps/dev.alextren.Spot-symbolic.svg b/data/hicolor/symbolic/apps/dev.alextren.Spot-symbolic.svg
new file mode 100644
index 00000000..b4029bc0
--- /dev/null
+++ b/data/hicolor/symbolic/apps/dev.alextren.Spot-symbolic.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <filter id="a" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="b">
+        <g filter="url(#a)">
+            <rect fill-opacity="0.3" height="16" width="16"/>
+        </g>
+    </mask>
+    <clipPath id="c">
+        <rect height="152" width="192"/>
+    </clipPath>
+    <g clip-path="url(#c)" mask="url(#b)" transform="matrix(1 0 0 1 -168 -16)">
+        <path d="m 72 66 c -19.882812 0 -36 16.117188 -36 36 v 2 c 0 -19.882812 16.117188 -36 36 -36 s 36 16.117188 36 36 v -2 c 0 -19.882812 -16.117188 -36 -36 -36 z m 0 0" fill="#241f31"/>
+    </g>
+    <g fill="#241f31">
+        <path d="m 3 3.855469 l -2.84375 4.925781 c -0.2304688 0.398438 -0.09375 0.90625 0.304688 1.132812 l 7.941406 4.585938 l 4 -6.929688 l -4.402344 -2.542968 v 4.140625 c 0 1 -0.832031 1.832031 -1.828125 1.832031 h -1.339844 c -1 0 -1.832031 -0.832031 -1.832031 -1.832031 z m 10.269531 4.214843 l -4 6.929688 l 1.011719 0.585938 c 0.398438 0.230468 0.90625 0.09375 1.136719 -0.304688 l 3.167969 -5.492188 c 0.230468 -0.394531 0.09375 -0.902343 -0.304688 -1.132812 z m 0 0"/>
+        <path d="m 4.832031 0 c -0.460937 0 -0.832031 0.371094 -0.832031 0.832031 v 8.335938 c 0 0.460937 0.371094 0.832031 0.832031 0.832031 h 1.335938 c 0.460937 0 0.832031 -0.371094 0.832031 -0.832031 v -8.335938 c 0 -0.460937 -0.371094 -0.832031 -0.832031 -0.832031 z m 0.667969 7.5 c 0.277344 0 0.5 0.222656 0.5 0.5 s -0.222656 0.5 -0.5 0.5 s -0.5 -0.222656 -0.5 -0.5 s 0.222656 -0.5 0.5 -0.5 z m 0 0"/>
+    </g>
+</svg>
diff --git a/src/meson.build b/src/meson.build
index 755d8708..61339caf 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,6 +25,11 @@ authors = run_command(
 ).stdout().strip()
 conf.set('AUTHORS', authors)
 
+artists = run_command(
+  'cat', meson.source_root() / 'ARTISTS',
+).stdout().strip()
+conf.set('ARTISTS', artists)
+
 if get_option('buildtype') == 'debug'
   conf.set_quoted('APPID', 'dev.alextren.Spot.Devel')
   conf.set('VERSION', meson.project_version() + '-dev')
diff --git a/src/window.ui.in b/src/window.ui.in
index a0f0e4d0..aea463e2 100644
--- a/src/window.ui.in
+++ b/src/window.ui.in
@@ -155,6 +155,7 @@
     <property name="version">@VERSION@</property>
     <property name="website">https://github.com/xou816/spot</property>
     <property name="authors">@AUTHORS@</property>
+    <property name="artists">@ARTISTS@</property>
     <property name="translator-credits">@TRANSLATORS@</property>
     <property name="logo-icon-name">dev.alextren.Spot</property>
     <property name="license-type">mit-x11</property>

From 33024b1fd4e31a9d9060f8dace7ae244b8a396a5 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 27 Mar 2022 17:46:48 -0400
Subject: [PATCH 31/33] update credits

---
 ARTISTS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ARTISTS b/ARTISTS
index e1bcafc1..fa7759e7 100644
--- a/ARTISTS
+++ b/ARTISTS
@@ -1 +1,2 @@
-Tobias Bernard
\ No newline at end of file
+Tobias Bernard
+Noëlle
\ No newline at end of file

From a0a2e25a59dc0c9a28ed821135c62702c17432b3 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 27 Mar 2022 17:47:41 -0400
Subject: [PATCH 32/33] GNOME 42 runtime

---
 dev.alextren.Spot.snapshots.json | 41 +-------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/dev.alextren.Spot.snapshots.json b/dev.alextren.Spot.snapshots.json
index 61be3326..b6c57b4a 100644
--- a/dev.alextren.Spot.snapshots.json
+++ b/dev.alextren.Spot.snapshots.json
@@ -1,7 +1,7 @@
 {
     "app-id": "dev.alextren.Spot",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "41",
+    "runtime-version": "42",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable"
@@ -40,45 +40,6 @@
         "*.a"
     ],
     "modules": [
-        {
-            "name": "libadwaita",
-            "buildsystem": "meson",
-            "config-opts": [
-                "-Dexamples=false",
-                "-Dtests=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/libadwaita.git",
-                    "branch": "1.0.0.alpha.4"
-                }
-            ],
-            "modules": [
-                {
-                    "name": "libsass",
-                    "buildsystem": "meson",
-                    "sources": [
-                        {
-                            "type": "git",
-                            "url": "https://github.com/lazka/libsass.git",
-                            "branch": "meson"
-                        }
-                    ]
-                },
-                {
-                    "name": "sassc",
-                    "buildsystem": "meson",
-                    "sources": [
-                        {
-                            "type": "git",
-                            "url": "https://github.com/lazka/sassc.git",
-                            "branch": "meson"
-                        }
-                    ]
-                }
-            ]
-        },
         {
             "name": "spot",
             "builddir": true,

From cd8d2c44b358a5ac9f6ba58ae4853fe216d23819 Mon Sep 17 00:00:00 2001
From: Alexandre Trendel <trendel.alexandre@gmail.com>
Date: Sun, 27 Mar 2022 17:56:07 -0400
Subject: [PATCH 33/33] version 0.3.2

---
 Cargo.lock                         |  2 +-
 Cargo.toml                         |  2 +-
 data/dev.alextren.Spot.appdata.xml | 17 +++++++++++++++++
 meson.build                        |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2f90ad5e..b632f01c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2951,7 +2951,7 @@ dependencies = [
 
 [[package]]
 name = "spot"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "async-std",
  "env_logger 0.9.0",
diff --git a/Cargo.toml b/Cargo.toml
index 0673cbf9..f5058235 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spot"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2018"
 license = "MIT"
 
diff --git a/data/dev.alextren.Spot.appdata.xml b/data/dev.alextren.Spot.appdata.xml
index b0f52ab8..b3e399db 100644
--- a/data/dev.alextren.Spot.appdata.xml
+++ b/data/dev.alextren.Spot.appdata.xml
@@ -50,6 +50,23 @@
       <image>https://raw.githubusercontent.com/xou816/spot/master/data/appstream/3.png</image>
     </screenshot>
   </screenshots>
+  <release version="0.3.2" date="2022-03-27">
+    <description>
+      <p>
+        New features:
+      </p>
+      <ul>
+        <li>save tracks to library</li>
+        <li>basic Spotify URI handling (thanks @bbb651!)</li>
+        <li>settings dialog (thanks @sei0o!)</li>
+        <li>brand new icon (thanks @bertob!)</li>
+        <li>bug fixes</li>
+      </ul>
+      <p>
+        Thank you to everyone involved in this release!
+      </p>
+    </description>
+  </release>
   <releases>
     <release version="0.3.1" date="2022-01-23">
       <description>
diff --git a/meson.build b/meson.build
index 2c9f7a5a..e1d6d9d3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
   'spot',
-  version: '0.3.1',
+  version: '0.3.2',
   meson_version: '>= 0.50.0',
   default_options: ['warning_level=2', 'buildtype=release'],
 )