From 46fa4efdb2964fa61bf24fec2d89f5474b25e1b7 Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Tue, 15 Aug 2023 15:55:18 +0100
Subject: [PATCH 01/11] Update all dependencies

---
 Cargo.lock                            | 3459 +++++++++++++++++--------
 crates/core/Cargo.toml                |   44 +-
 crates/core/src/theme/button.rs       |   14 +-
 crates/core/src/theme/mod.rs          |   44 +-
 crates/core/src/wallet/mod.rs         |    2 +-
 crates/widgets/Cargo.toml             |   14 +-
 crates/widgets/src/style/table_row.rs |    2 +-
 crates/widgets/src/widget/header.rs   |    2 +-
 8 files changed, 2448 insertions(+), 1133 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 286879d..5b234ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.19"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5568a4aa5ba8adf5175c5c460b030e27d8893412976cc37bef0e4fbc16cfbba"
+checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
 dependencies = [
  "gimli",
 ]
@@ -45,7 +45,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -98,20 +98,73 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+dependencies = [
+ "cfg-if 1.0.0",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
+[[package]]
+name = "android-activity"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
+dependencies = [
+ "android-properties",
+ "bitflags 1.3.2",
+ "cc",
+ "jni-sys",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "num_enum 0.6.1",
+]
+
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -132,9 +185,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.68"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "f768393e7fabd388fe8409b13faa4d93ab0fef35db1508438dfdb066918bcf38"
 
 [[package]]
 name = "approx"
@@ -142,7 +195,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
 dependencies = [
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -159,9 +212,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
 
 [[package]]
 name = "arrayref"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
@@ -190,24 +243,30 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "ascii"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
 
 [[package]]
 name = "ash"
-version = "0.37.2+1.3.238"
+version = "0.37.3+1.3.251"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
 dependencies = [
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
 name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -216,14 +275,14 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
 dependencies = [
  "async-lock",
  "async-task",
  "concurrent-queue",
- "fastrand",
+ "fastrand 1.9.0",
  "futures-lite",
  "slab",
 ]
@@ -245,39 +304,38 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
 dependencies = [
  "async-lock",
  "autocfg 1.1.0",
+ "cfg-if 1.0.0",
  "concurrent-queue",
  "futures-lite",
- "libc",
  "log",
  "parking",
  "polling",
+ "rustix 0.37.23",
  "slab",
- "socket2 0.4.7",
+ "socket2 0.4.9",
  "waker-fn",
- "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
  "event-listener",
- "futures-lite",
 ]
 
 [[package]]
 name = "async-process"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4"
+checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
 dependencies = [
  "async-io",
  "async-lock",
@@ -286,9 +344,9 @@ dependencies = [
  "cfg-if 1.0.0",
  "event-listener",
  "futures-lite",
- "libc",
+ "rustix 0.37.23",
  "signal-hook",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -312,7 +370,7 @@ dependencies = [
  "log",
  "memchr",
  "once_cell",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.12",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -320,9 +378,9 @@ dependencies = [
 
 [[package]]
 name = "async-task"
-version = "4.3.0"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
+checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "atk-sys"
@@ -338,9 +396,9 @@ dependencies = [
 
 [[package]]
 name = "atomic-waker"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
 
 [[package]]
 name = "atty"
@@ -370,15 +428,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide 0.6.2",
+ "miniz_oxide 0.7.1",
  "object",
  "rustc-demangle",
 ]
@@ -411,11 +469,17 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
+[[package]]
+name = "base64"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+
 [[package]]
 name = "base64ct"
-version = "1.5.3"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "bech32"
@@ -444,8 +508,8 @@ dependencies = [
  "lazycell",
  "log",
  "peeking_take_while",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "regex",
  "rustc-hash",
  "shlex",
@@ -479,6 +543,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+
 [[package]]
 name = "blake2-rfc"
 version = "0.2.18"
@@ -524,16 +594,16 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -545,18 +615,38 @@ dependencies = [
  "byte-tools",
 ]
 
+[[package]]
+name = "block-sys"
+version = "0.1.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
+dependencies = [
+ "objc-sys",
+]
+
+[[package]]
+name = "block2"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
+dependencies = [
+ "block-sys",
+ "objc2-encode",
+]
+
 [[package]]
 name = "blocking"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8"
+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
 dependencies = [
  "async-channel",
  "async-lock",
  "async-task",
  "atomic-waker",
- "fastrand",
+ "fastrand 1.9.0",
  "futures-lite",
+ "log",
 ]
 
 [[package]]
@@ -565,18 +655,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
 
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
 [[package]]
 name = "built"
 version = "0.4.4"
@@ -589,9 +667,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "byte-tools"
@@ -601,22 +679,22 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
-version = "1.12.3"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4"
+checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -643,9 +721,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
 [[package]]
 name = "bytes"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "bzip2"
@@ -680,10 +758,11 @@ dependencies = [
 
 [[package]]
 name = "calloop"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192"
+checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
 dependencies = [
+ "bitflags 1.3.2",
  "log",
  "nix 0.25.1",
  "slotmap",
@@ -699,7 +778,7 @@ checksum = "8504b63dd1249fd1745b7b4ef9b6f7b107ddeb3c95370043c7dbcc38653a2679"
 dependencies = [
  "semver 0.9.0",
  "serde",
- "toml",
+ "toml 0.5.11",
  "url",
 ]
 
@@ -711,11 +790,12 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -724,7 +804,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
 dependencies = [
- "nom 5.1.2",
+ "nom 5.1.3",
 ]
 
 [[package]]
@@ -790,16 +870,16 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.23"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
  "serde",
- "time",
+ "time 0.1.45",
  "wasm-bindgen",
  "winapi 0.3.9",
 ]
@@ -810,18 +890,18 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "clang-sys"
-version = "1.4.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
@@ -878,7 +958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921"
 dependencies = [
  "thiserror",
- "x11rb",
+ "x11rb 0.9.0",
 ]
 
 [[package]]
@@ -892,9 +972,9 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.49"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
 dependencies = [
  "cc",
 ]
@@ -917,9 +997,9 @@ dependencies = [
 
 [[package]]
 name = "cocoa-foundation"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
+checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"
 dependencies = [
  "bitflags 1.3.2",
  "block",
@@ -946,20 +1026,26 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
 [[package]]
 name = "concurrent-queue"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "const_panic"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58baae561b85ca19b3122a9ddd35c8ec40c3bcd14fe89921824eae73f7baffbf"
+checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
 
 [[package]]
 name = "constant_time_eq"
@@ -989,7 +1075,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
  "libc",
 ]
 
@@ -1001,9 +1087,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "core-graphics"
@@ -1020,13 +1106,12 @@ dependencies = [
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation 0.9.3",
- "foreign-types 0.3.2",
  "libc",
 ]
 
@@ -1042,11 +1127,31 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cosmic-text"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9"
+dependencies = [
+ "aliasable",
+ "fontdb",
+ "libm",
+ "log",
+ "rangemap",
+ "rustybuzz",
+ "swash",
+ "sys-locale",
+ "unicode-bidi",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
 dependencies = [
  "libc",
 ]
@@ -1084,9 +1189,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -1094,9 +1199,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch",
@@ -1105,22 +1210,22 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
 dependencies = [
  "autocfg 1.1.0",
  "cfg-if 1.0.0",
  "crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.9.0",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1133,7 +1238,7 @@ checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45"
 dependencies = [
  "cocoa",
  "core-foundation 0.9.3",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
  "core-graphics",
  "core-text",
  "dwrote",
@@ -1148,13 +1253,19 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
  "typenum",
 ]
 
@@ -1164,19 +1275,18 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
  "subtle",
 ]
 
 [[package]]
 name = "csv"
-version = "1.1.6"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
+checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
 dependencies = [
- "bstr",
  "csv-core",
- "itoa 0.4.8",
+ "itoa 1.0.9",
  "ryu",
  "serde",
 ]
@@ -1199,16 +1309,6 @@ dependencies = [
  "sct",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
 [[package]]
 name = "cty"
 version = "0.2.2"
@@ -1226,15 +1326,15 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.4.7",
+ "socket2 0.4.9",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.59+curl-7.86.0"
+version = "0.4.65+curl-8.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407"
+checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986"
 dependencies = [
  "cc",
  "libc",
@@ -1273,57 +1373,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "cxx"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "scratch",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.86"
+name = "d3d12"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
+checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "bitflags 1.3.2",
+ "libloading 0.7.4",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "d3d12"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
+checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
 dependencies = [
  "bitflags 1.3.2",
- "libloading",
+ "libloading 0.7.4",
  "winapi 0.3.9",
 ]
 
@@ -1345,10 +1412,10 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "strsim 0.10.0",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1358,28 +1425,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core",
- "quote 1.0.23",
- "syn 1.0.107",
+ "quote 1.0.32",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.4.0"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
 dependencies = [
  "cfg-if 1.0.0",
- "hashbrown",
- "lock_api 0.4.9",
+ "hashbrown 0.14.0",
+ "lock_api 0.4.10",
  "once_cell",
- "parking_lot_core 0.9.6",
+ "parking_lot_core 0.9.8",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 [[package]]
 name = "deflate"
@@ -1391,6 +1458,12 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
+
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -1406,16 +1479,16 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "digest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
  "crypto-common",
  "subtle",
 ]
@@ -1500,30 +1573,24 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
 [[package]]
 name = "displaydoc"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "dlib"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading",
+ "libloading 0.8.0",
 ]
 
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
 [[package]]
 name = "downcast-rs"
 version = "1.2.0"
@@ -1594,9 +1661,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "embed-resource"
@@ -1606,7 +1673,7 @@ checksum = "e62abb876c07e4754fae5c14cafa77937841f01740637e17d78dc04352f32a5e"
 dependencies = [
  "cc",
  "rustc_version 0.4.0",
- "toml",
+ "toml 0.5.11",
  "vswhom",
  "winreg 0.10.1",
 ]
@@ -1619,7 +1686,7 @@ checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9"
 dependencies = [
  "const_panic",
  "encase_derive",
- "glam",
+ "glam 0.21.3",
  "thiserror",
 ]
 
@@ -1638,22 +1705,22 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "encode_unicode"
-version = "0.3.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1680,6 +1747,33 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "error-code"
 version = "2.3.1"
@@ -1690,13 +1784,23 @@ dependencies = [
  "str-buf",
 ]
 
+[[package]]
+name = "etagere"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644"
+dependencies = [
+ "euclid",
+ "svg_fmt",
+]
+
 [[package]]
 name = "euclid"
-version = "0.22.7"
+version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade"
+checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
 dependencies = [
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -1731,25 +1835,46 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "fast-srgb8"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
+
 [[package]]
 name = "fastrand"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
 [[package]]
 name = "filetime"
-version = "0.2.19"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.2.16",
- "windows-sys 0.42.0",
+ "redox_syscall 0.3.5",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1758,17 +1883,17 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
 dependencies = [
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.6.2",
+ "miniz_oxide 0.7.1",
 ]
 
 [[package]]
@@ -1783,7 +1908,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632"
 dependencies = [
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -1872,6 +1997,19 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "fontdb"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e"
+dependencies = [
+ "log",
+ "memmap2 0.6.2",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser 0.19.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1893,13 +2031,13 @@ dependencies = [
 
 [[package]]
 name = "foreign-types-macros"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -1916,9 +2054,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
 dependencies = [
  "percent-encoding",
 ]
@@ -1995,9 +2133,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2010,9 +2148,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2020,15 +2158,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2038,53 +2176,53 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
 
 [[package]]
 name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
  "futures-core",
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.12",
  "waker-fn",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
 
 [[package]]
 name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
 
 [[package]]
 name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2093,7 +2231,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.12",
  "pin-utils",
  "slab",
 ]
@@ -2163,9 +2301,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
@@ -2194,9 +2332,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -2213,11 +2351,21 @@ dependencies = [
  "weezl",
 ]
 
+[[package]]
+name = "gif"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
 [[package]]
 name = "gimli"
-version = "0.27.0"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gio-sys"
@@ -2262,6 +2410,12 @@ version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815"
 
+[[package]]
+name = "glam"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
+
 [[package]]
 name = "glib-sys"
 version = "0.14.0"
@@ -2280,9 +2434,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c4a8d6391675c6b2ee1a6c8d06e8e2d03605c44cec1270675985a4c2a5500b"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2302,6 +2456,18 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "glow"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
+dependencies = [
+ "js-sys",
+ "slotmap",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "glow_glyph"
 version = "0.5.1"
@@ -2309,7 +2475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f4e62c64947b9a24fe20e2bba9ad819ecb506ef5c8df7ffc4737464c6df9510"
 dependencies = [
  "bytemuck",
- "glow",
+ "glow 0.11.2",
  "glyph_brush",
  "log",
 ]
@@ -2327,17 +2493,17 @@ dependencies = [
  "glutin_gles2_sys",
  "glutin_glx_sys",
  "glutin_wgl_sys",
- "libloading",
+ "libloading 0.7.4",
  "log",
  "objc",
  "once_cell",
  "osmesa-sys",
  "parking_lot 0.12.1",
- "raw-window-handle 0.5.0",
- "wayland-client",
+ "raw-window-handle 0.5.2",
+ "wayland-client 0.29.5",
  "wayland-egl",
  "winapi 0.3.9",
- "winit",
+ "winit 0.27.5",
 ]
 
 [[package]]
@@ -2381,14 +2547,13 @@ dependencies = [
 
 [[package]]
 name = "glyph_brush"
-version = "0.7.5"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac02497410cdb5062cc056a33f2e1e19ff69fbf26a4be9a02bf29d6e17ea105b"
+checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d"
 dependencies = [
  "glyph_brush_draw_cache",
  "glyph_brush_layout",
- "log",
- "ordered-float 3.4.0",
+ "ordered-float 3.7.0",
  "rustc-hash",
  "twox-hash",
 ]
@@ -2418,6 +2583,18 @@ dependencies = [
  "xi-unicode",
 ]
 
+[[package]]
+name = "glyphon"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a"
+dependencies = [
+ "cosmic-text",
+ "etagere",
+ "lru",
+ "wgpu 0.16.3",
+]
+
 [[package]]
 name = "gobject-sys"
 version = "0.14.0"
@@ -2431,9 +2608,9 @@ dependencies = [
 
 [[package]]
 name = "gpu-alloc"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d"
+checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
 dependencies = [
  "bitflags 1.3.2",
  "gpu-alloc-types",
@@ -2448,6 +2625,19 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "gpu-allocator"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+dependencies = [
+ "backtrace",
+ "log",
+ "thiserror",
+ "winapi 0.3.9",
+ "windows 0.44.0",
+]
+
 [[package]]
 name = "gpu-descriptor"
 version = "0.2.3"
@@ -2456,7 +2646,7 @@ checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
 dependencies = [
  "bitflags 1.3.2",
  "gpu-descriptor-types",
- "hashbrown",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -2476,15 +2666,15 @@ dependencies = [
  "async-std",
  "chrono",
  "embed-resource",
- "futures 0.3.25",
+ "futures 0.3.28",
  "fuzzy-matcher",
  "grin-gui-core",
  "grin-gui-widgets",
- "iced",
- "iced_aw",
- "iced_futures",
- "iced_native",
- "iced_style",
+ "iced 0.7.0",
+ "iced_aw 0.6.0 (git+https://github.com/iced-rs/iced_aw.git)",
+ "iced_futures 0.5.1",
+ "iced_native 0.8.0",
+ "iced_style 0.6.0",
  "image 0.23.14",
  "isahc 0.9.14",
  "isolang",
@@ -2493,7 +2683,7 @@ dependencies = [
  "log",
  "log-panics",
  "native-dialog 0.5.8",
- "native-dialog 0.6.3",
+ "native-dialog 0.6.4",
  "num-format",
  "once_cell",
  "open",
@@ -2502,7 +2692,7 @@ dependencies = [
  "plotters-backend",
  "plotters-iced",
  "rand 0.8.5",
- "reqwest 0.11.13",
+ "reqwest 0.11.18",
  "rfd",
  "serde",
  "serde_json",
@@ -2525,7 +2715,7 @@ dependencies = [
  "dirs-next 2.0.0",
  "fancy-regex",
  "flate2",
- "futures 0.3.25",
+ "futures 0.3.28",
  "glob",
  "grin-gui-widgets",
  "grin_chain",
@@ -2541,15 +2731,15 @@ dependencies = [
  "grin_wallet_impls",
  "grin_wallet_libwallet",
  "grin_wallet_util",
- "iced",
- "iced_aw",
- "iced_core",
- "iced_futures",
- "iced_glow",
- "iced_graphics",
- "iced_native",
- "iced_style",
- "iced_wgpu",
+ "iced 0.10.0",
+ "iced_aw 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iced_core 0.10.0",
+ "iced_futures 0.7.0",
+ "iced_glow 0.8.0",
+ "iced_graphics 0.9.0",
+ "iced_native 0.10.3",
+ "iced_style 0.9.0",
+ "iced_wgpu 0.11.1",
  "isahc 1.7.2",
  "lazy_static",
  "log",
@@ -2576,23 +2766,23 @@ dependencies = [
 name = "grin-gui-widgets"
 version = "0.1.0"
 dependencies = [
- "iced",
- "iced_core",
- "iced_glow",
- "iced_graphics",
- "iced_native",
- "iced_style",
- "iced_wgpu",
+ "iced 0.10.0",
+ "iced_core 0.10.0",
+ "iced_glow 0.8.0",
+ "iced_graphics 0.9.0",
+ "iced_native 0.10.3",
+ "iced_style 0.9.0",
+ "iced_wgpu 0.11.1",
 ]
 
 [[package]]
 name = "grin_api"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "bytes 0.5.6",
  "easy-jsonrpc-mw",
- "futures 0.3.25",
+ "futures 0.3.28",
  "grin_chain",
  "grin_core",
  "grin_p2p",
@@ -2619,8 +2809,8 @@ dependencies = [
 
 [[package]]
 name = "grin_chain"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "bit-vec",
  "bitflags 1.3.2",
@@ -2642,8 +2832,8 @@ dependencies = [
 
 [[package]]
 name = "grin_config"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
@@ -2653,13 +2843,13 @@ dependencies = [
  "rand 0.6.5",
  "serde",
  "serde_derive",
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
 name = "grin_core"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -2684,8 +2874,8 @@ dependencies = [
 
 [[package]]
 name = "grin_keychain"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -2706,8 +2896,8 @@ dependencies = [
 
 [[package]]
 name = "grin_p2p"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "bitflags 1.3.2",
  "bytes 0.5.6",
@@ -2728,8 +2918,8 @@ dependencies = [
 
 [[package]]
 name = "grin_pool"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "blake2-rfc",
  "chrono",
@@ -2745,9 +2935,9 @@ dependencies = [
 
 [[package]]
 name = "grin_secp256k1zkp"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af3c4c4829b3e2e7ee1d9a542833e4244912fbb887fabe44682558159b068a7"
+checksum = "b04798e32404c0af082b6a209ad4df1ab1d9ec3a5a5056f284cfa32f74e59ce6"
 dependencies = [
  "arrayvec 0.3.25",
  "cc",
@@ -2761,12 +2951,12 @@ dependencies = [
 
 [[package]]
 name = "grin_servers"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "chrono",
  "fs2",
- "futures 0.3.25",
+ "futures 0.3.28",
  "grin_api",
  "grin_chain",
  "grin_core",
@@ -2791,8 +2981,8 @@ dependencies = [
 
 [[package]]
 name = "grin_store"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "byteorder",
  "croaring",
@@ -2810,8 +3000,8 @@ dependencies = [
 
 [[package]]
 name = "grin_util"
-version = "5.2.0-alpha.2"
-source = "git+https://github.com/mimblewimble/grin?branch=master#684f0a387ae1ac47e34e68aae2cf94514b86aaf4"
+version = "5.2.0-beta.3"
+source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
 dependencies = [
  "backtrace",
  "base64 0.12.3",
@@ -2831,8 +3021,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet"
-version = "5.2.0-alpha.1"
-source = "git+https://github.com/mimblewimble/grin-wallet?branch=master#270321c701f7652164dd01e81d7eb6b8efdae70b"
+version = "5.2.0-beta.1"
+source = "git+https://github.com/mimblewimble/grin-wallet?branch=contracts#008d2a8c9a7a9966cd8fb4a9aafbdb649fdfabed"
 dependencies = [
  "built",
  "clap",
@@ -2858,8 +3048,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_api"
-version = "5.2.0-alpha.1"
-source = "git+https://github.com/mimblewimble/grin-wallet?branch=master#270321c701f7652164dd01e81d7eb6b8efdae70b"
+version = "5.2.0-beta.1"
+source = "git+https://github.com/mimblewimble/grin-wallet?branch=contracts#008d2a8c9a7a9966cd8fb4a9aafbdb649fdfabed"
 dependencies = [
  "base64 0.12.3",
  "chrono",
@@ -2883,8 +3073,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_config"
-version = "5.2.0-alpha.1"
-source = "git+https://github.com/mimblewimble/grin-wallet?branch=master#270321c701f7652164dd01e81d7eb6b8efdae70b"
+version = "5.2.0-beta.1"
+source = "git+https://github.com/mimblewimble/grin-wallet?branch=contracts#008d2a8c9a7a9966cd8fb4a9aafbdb649fdfabed"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
@@ -2893,17 +3083,17 @@ dependencies = [
  "rand 0.6.5",
  "serde",
  "serde_derive",
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
 name = "grin_wallet_controller"
-version = "5.2.0-alpha.1"
-source = "git+https://github.com/mimblewimble/grin-wallet?branch=master#270321c701f7652164dd01e81d7eb6b8efdae70b"
+version = "5.2.0-beta.1"
+source = "git+https://github.com/mimblewimble/grin-wallet?branch=contracts#008d2a8c9a7a9966cd8fb4a9aafbdb649fdfabed"
 dependencies = [
  "chrono",
  "easy-jsonrpc-mw",
- "futures 0.3.25",
+ "futures 0.3.28",
  "grin_api",
  "grin_core",
  "grin_keychain",
@@ -2932,8 +3122,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_impls"
-version = "5.2.0-alpha.1"
-source = "git+https://github.com/mimblewimble/grin-wallet?branch=master#270321c701f7652164dd01e81d7eb6b8efdae70b"
+version = "5.2.0-beta.1"
+source = "git+https://github.com/mimblewimble/grin-wallet?branch=contracts#008d2a8c9a7a9966cd8fb4a9aafbdb649fdfabed"
 dependencies = [
  "base64 0.12.3",
  "blake2-rfc",
@@ -2941,7 +3131,7 @@ dependencies = [
  "chrono",
  "data-encoding",
  "ed25519-dalek",
- "futures 0.3.25",
+ "futures 0.3.28",
  "grin_api",
  "grin_chain",
  "grin_core",
@@ -2971,8 +3161,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_libwallet"
-version = "5.2.0-alpha.1"
-source = "git+https://github.com/mimblewimble/grin-wallet?branch=master#270321c701f7652164dd01e81d7eb6b8efdae70b"
+version = "5.2.0-beta.1"
+source = "git+https://github.com/mimblewimble/grin-wallet?branch=contracts#008d2a8c9a7a9966cd8fb4a9aafbdb649fdfabed"
 dependencies = [
  "age",
  "base64 0.9.3",
@@ -2998,6 +3188,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "serde_with",
  "sha2 0.8.2",
  "strum 0.18.0",
  "strum_macros 0.18.0",
@@ -3008,8 +3199,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_util"
-version = "5.2.0-alpha.1"
-source = "git+https://github.com/mimblewimble/grin-wallet?branch=master#270321c701f7652164dd01e81d7eb6b8efdae70b"
+version = "5.2.0-beta.1"
+source = "git+https://github.com/mimblewimble/grin-wallet?branch=contracts#008d2a8c9a7a9966cd8fb4a9aafbdb649fdfabed"
 dependencies = [
  "data-encoding",
  "ed25519-dalek",
@@ -3061,7 +3252,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 1.9.3",
  "slab",
  "tokio 0.2.25",
  "tokio-util 0.3.1",
@@ -3071,30 +3262,65 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.15"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
 dependencies = [
- "bytes 1.3.0",
+ "bytes 1.4.0",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 1.9.3",
  "slab",
- "tokio 1.24.2",
- "tokio-util 0.7.4",
+ "tokio 1.31.0",
+ "tokio-util 0.7.8",
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crunchy",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash",
+ "ahash 0.7.6",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+dependencies = [
+ "ahash 0.8.3",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hassle-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+dependencies = [
+ "bitflags 1.3.2",
+ "com-rs",
+ "libc",
+ "libloading 0.7.4",
+ "thiserror",
+ "widestring",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3117,12 +3343,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "hexf-parse"
@@ -3156,18 +3379,18 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
- "bytes 1.3.0",
+ "bytes 1.4.0",
  "fnv",
- "itoa 1.0.5",
+ "itoa 1.0.9",
 ]
 
 [[package]]
@@ -3186,9 +3409,9 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
- "bytes 1.3.0",
+ "bytes 1.4.0",
  "http",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.12",
 ]
 
 [[package]]
@@ -3205,9 +3428,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
@@ -3250,23 +3473,23 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.23"
+version = "0.14.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
- "bytes 1.3.0",
+ "bytes 1.4.0",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.15",
+ "h2 0.3.20",
  "http",
  "http-body 0.4.5",
  "httparse",
- "httpdate 1.0.2",
- "itoa 1.0.5",
- "pin-project-lite 0.2.9",
- "socket2 0.4.7",
- "tokio 1.24.2",
+ "httpdate 1.0.3",
+ "itoa 1.0.9",
+ "pin-project-lite 0.2.12",
+ "socket2 0.4.9",
+ "tokio 1.31.0",
  "tower-service",
  "tracing",
  "want",
@@ -3337,32 +3560,32 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.3.0",
- "hyper 0.14.23",
+ "bytes 1.4.0",
+ "hyper 0.14.27",
  "native-tls",
- "tokio 1.24.2",
+ "tokio 1.31.0",
  "tokio-native-tls",
 ]
 
 [[package]]
 name = "i18n-config"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d9f93ceee6543011739bc81699b5e0cf1f23f3a80364649b6d80de8636bc8df"
+checksum = "b987084cadad6e2f2b1e6ea62c44123591a3c044793a1beabf71a8356ea768d5"
 dependencies = [
  "log",
  "serde",
  "serde_derive",
  "thiserror",
- "toml",
+ "toml 0.7.6",
  "unic-langid",
 ]
 
 [[package]]
 name = "i18n-embed"
-version = "0.13.8"
+version = "0.13.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2653dd1a8be0726315603f1c180b29f90e5b2a58f8b943d949d5170d9ad81101"
+checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa"
 dependencies = [
  "arc-swap 1.6.0",
  "fluent",
@@ -3381,9 +3604,9 @@ dependencies = [
 
 [[package]]
 name = "i18n-embed-fl"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a425b9bbdc2e4cd797a2a79528662cb61894bd36db582e48da2c56c28eb727cd"
+checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395"
 dependencies = [
  "dashmap",
  "find-crate",
@@ -3393,48 +3616,47 @@ dependencies = [
  "i18n-embed",
  "lazy_static",
  "proc-macro-error",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "strsim 0.10.0",
- "syn 1.0.107",
+ "syn 2.0.28",
  "unic-langid",
 ]
 
 [[package]]
 name = "i18n-embed-impl"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db2330e035808eb064afb67e6743ddce353763af3e0f2bdfc2476e00ce76136"
+checksum = "e9a95d065e6be4499e50159172395559a388d20cf13c84c77e4a1e341786f219"
 dependencies = [
  "find-crate",
  "i18n-config",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
 dependencies = [
  "android_system_properties",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "winapi 0.3.9",
+ "windows 0.48.0",
 ]
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
 ]
 
 [[package]]
@@ -3443,26 +3665,50 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df71e87f8211b57a439d0764131d2c421a9195036dd4b6608033b05f2f16c196"
 dependencies = [
- "iced_core",
- "iced_futures",
- "iced_glow",
+ "iced_core 0.7.0",
+ "iced_futures 0.5.1",
+ "iced_glow 0.6.0",
  "iced_glutin",
- "iced_graphics",
- "iced_native",
- "iced_wgpu",
- "iced_winit",
+ "iced_graphics 0.6.0",
+ "iced_native 0.8.0",
+ "iced_wgpu 0.8.0",
+ "iced_winit 0.7.0",
+ "thiserror",
+]
+
+[[package]]
+name = "iced"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c708807ec86f99dd729dc4d42db5239acf118cec14d3c5f57679dcfdbbc472b1"
+dependencies = [
+ "iced_core 0.10.0",
+ "iced_futures 0.7.0",
+ "iced_renderer",
+ "iced_widget",
+ "iced_winit 0.10.0",
  "thiserror",
 ]
 
 [[package]]
 name = "iced_aw"
-version = "0.3.0"
-source = "git+https://github.com/iced-rs/iced_aw.git#120087c0bbeee4e0059652d09c879452e82d7397"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "842ee223a09cf7f874b9e2d6f5a1aa54f3642c31f7ff5e26c43f1546232b127b"
+dependencies = [
+ "iced_widget",
+]
+
+[[package]]
+name = "iced_aw"
+version = "0.6.0"
+source = "git+https://github.com/iced-rs/iced_aw.git#d2c04418bb35b5534f07381179aa657026c65a81"
 dependencies = [
- "iced_graphics",
- "iced_native",
- "iced_style",
- "num-traits 0.2.15",
+ "chrono",
+ "iced_widget",
+ "num-traits 0.2.16",
+ "once_cell",
+ "time 0.3.25",
 ]
 
 [[package]]
@@ -3473,7 +3719,32 @@ checksum = "6ade666613eb8b621971a59cfae9e11ec051f32afc5ed4d8e8915d5abfaf2cee"
 dependencies = [
  "bitflags 1.3.2",
  "instant",
- "palette",
+ "palette 0.6.1",
+]
+
+[[package]]
+name = "iced_core"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11e1942e28dedee756cc27e67e7a838cdc1e59fb6bf9627ec9f709ab3b135782"
+dependencies = [
+ "bitflags 1.3.2",
+ "instant",
+ "palette 0.6.1",
+]
+
+[[package]]
+name = "iced_core"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64d0bc4fbf018576d08d93f838e6058cc6f10bbc05e04ae249a2a44dffb4ebc8"
+dependencies = [
+ "bitflags 1.3.2",
+ "instant",
+ "log",
+ "palette 0.7.3",
+ "thiserror",
+ "twox-hash",
 ]
 
 [[package]]
@@ -3483,9 +3754,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cc3a9fd79b857228dde2a3e923a04ade4095abeda33248c6230e8c909749366"
 dependencies = [
  "async-std",
- "futures 0.3.25",
+ "futures 0.3.28",
+ "log",
+ "tokio 1.31.0",
+ "wasm-bindgen-futures",
+ "wasm-timer",
+]
+
+[[package]]
+name = "iced_futures"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "215d51fa4f70dbb63775d7141243c4d98d4d525d8949695601f8fbac7dcbc04e"
+dependencies = [
+ "futures 0.3.28",
+ "log",
+ "wasm-bindgen-futures",
+ "wasm-timer",
+]
+
+[[package]]
+name = "iced_futures"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dab0054a9c7a1cbce227a8cd9ee4a094497b3d06094551ac6c1488d563802e"
+dependencies = [
+ "async-std",
+ "futures 0.3.28",
+ "iced_core 0.10.0",
  "log",
- "tokio 1.24.2",
  "wasm-bindgen-futures",
  "wasm-timer",
 ]
@@ -3498,11 +3795,27 @@ checksum = "95755f62fec2ec2c8f8bc2c0be5072b1d0dfed8db250686059ddcce5da530acf"
 dependencies = [
  "bytemuck",
  "euclid",
- "glow",
+ "glow 0.11.2",
+ "glow_glyph",
+ "glyph_brush",
+ "iced_graphics 0.6.0",
+ "iced_native 0.8.0",
+ "log",
+]
+
+[[package]]
+name = "iced_glow"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc5b081015f5c75777c96ad75e2288916e7d444c97396d6d136517877ef9129"
+dependencies = [
+ "bytemuck",
+ "euclid",
+ "glow 0.11.2",
  "glow_glyph",
  "glyph_brush",
- "iced_graphics",
- "iced_native",
+ "iced_graphics 0.8.0",
+ "iced_native 0.10.3",
  "log",
 ]
 
@@ -3513,9 +3826,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccd8dd58586541b300b280b6fe8605add7a90283dfb8e622adc96cc545f5fa61"
 dependencies = [
  "glutin",
- "iced_graphics",
- "iced_native",
- "iced_winit",
+ "iced_graphics 0.6.0",
+ "iced_native 0.8.0",
+ "iced_winit 0.7.0",
  "log",
 ]
 
@@ -3528,146 +3841,323 @@ dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
  "font-kit",
- "glam",
- "iced_native",
- "iced_style",
+ "glam 0.21.3",
+ "iced_native 0.8.0",
+ "iced_style 0.6.0",
  "log",
  "lyon",
- "raw-window-handle 0.5.0",
+ "raw-window-handle 0.5.2",
  "thiserror",
 ]
 
 [[package]]
-name = "iced_native"
+name = "iced_graphics"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d57c8e8672e90c55d4f9f55511b03e5a74af9d296be9693e9c07cd9eed4563"
+checksum = "338a6aff7db906537074ad0fe8b720cfdb9512cdfea43c628c76bd1cf50fdcc0"
 dependencies = [
- "iced_core",
- "iced_futures",
- "iced_style",
- "num-traits 0.2.15",
- "twox-hash",
- "unicode-segmentation",
+ "bitflags 1.3.2",
+ "bytemuck",
+ "glam 0.21.3",
+ "iced_native 0.10.3",
+ "iced_style 0.8.0",
+ "log",
+ "raw-window-handle 0.5.2",
+ "thiserror",
 ]
 
 [[package]]
-name = "iced_style"
-version = "0.6.0"
+name = "iced_graphics"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b992f5e1828c61af3661fc0e7bf141ef5284007a41fa6667c5e79d047a03daf4"
+checksum = "67ff14447a221e9e9205a13d84d7bbdf0636a3b1daa02cfca690ed09689c4d2b"
 dependencies = [
- "iced_core",
- "once_cell",
- "palette",
+ "bitflags 1.3.2",
+ "bytemuck",
+ "glam 0.24.1",
+ "half",
+ "iced_core 0.10.0",
+ "log",
+ "lyon_path",
+ "raw-window-handle 0.5.2",
+ "thiserror",
 ]
 
 [[package]]
-name = "iced_wgpu"
+name = "iced_native"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4bb296363d1b18d4f57e1c69bb19591405e61d47764e43078bba31c6689fca5"
+checksum = "79d57c8e8672e90c55d4f9f55511b03e5a74af9d296be9693e9c07cd9eed4563"
 dependencies = [
- "bitflags 1.3.2",
- "bytemuck",
- "encase",
- "futures 0.3.25",
- "glam",
- "glyph_brush",
- "guillotiere",
- "iced_graphics",
- "iced_native",
- "log",
- "raw-window-handle 0.5.0",
- "wgpu",
- "wgpu_glyph",
+ "iced_core 0.7.0",
+ "iced_futures 0.5.1",
+ "iced_style 0.6.0",
+ "num-traits 0.2.16",
+ "twox-hash",
+ "unicode-segmentation",
 ]
 
 [[package]]
-name = "iced_winit"
-version = "0.7.0"
+name = "iced_native"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d528f882781c5594cb3d2416fe18787b4364e0cdd39f03d077ccc0becac1f9bd"
+checksum = "d012eb06da490fe46a695b39721c20da9643f35cf2ecb9d30618fdeb96170616"
 dependencies = [
- "iced_futures",
- "iced_graphics",
- "iced_native",
- "log",
+ "iced_core 0.9.0",
+ "iced_futures 0.6.0",
+ "iced_style 0.8.0",
+ "num-traits 0.2.16",
  "thiserror",
- "web-sys",
- "winapi 0.3.9",
- "window_clipboard",
- "winit",
+ "twox-hash",
+ "unicode-segmentation",
 ]
 
 [[package]]
-name = "ident_case"
-version = "1.0.1"
+name = "iced_renderer"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+checksum = "1033385b0db0099a0d13178c9ff93c1ce11e7d0177522acf578bf79febdb2af8"
+dependencies = [
+ "iced_graphics 0.9.0",
+ "iced_tiny_skia",
+ "iced_wgpu 0.11.1",
+ "log",
+ "raw-window-handle 0.5.2",
+ "thiserror",
+]
 
 [[package]]
-name = "idna"
-version = "0.3.0"
+name = "iced_runtime"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7c6c89853e1250c6fac82c5015fa2144517be9b33d4b8e456f10e198b23e28bd"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "iced_core 0.10.0",
+ "iced_futures 0.7.0",
+ "thiserror",
 ]
 
 [[package]]
-name = "image"
-version = "0.23.14"
+name = "iced_style"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
+checksum = "b992f5e1828c61af3661fc0e7bf141ef5284007a41fa6667c5e79d047a03daf4"
 dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "gif",
- "jpeg-decoder 0.1.22",
- "num-iter",
- "num-rational 0.3.2",
- "num-traits 0.2.15",
- "png 0.16.8",
- "scoped_threadpool",
- "tiff",
+ "iced_core 0.7.0",
+ "once_cell",
+ "palette 0.6.1",
 ]
 
 [[package]]
-name = "image"
-version = "0.24.5"
+name = "iced_style"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+checksum = "0e37333dc2991201140302cd0d4cea051bd37ca3671d5008ec85df86d232ff30"
 dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "jpeg-decoder 0.3.0",
- "num-rational 0.4.1",
- "num-traits 0.2.15",
- "png 0.17.7",
+ "iced_core 0.9.0",
+ "once_cell",
+ "palette 0.6.1",
 ]
 
 [[package]]
-name = "indexmap"
-version = "1.9.2"
+name = "iced_style"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "d85c47d9d13e2281f75ddf98c865daf2101632bd2b855c401dd0b1c8b81a31a0"
 dependencies = [
- "autocfg 1.1.0",
- "hashbrown",
+ "iced_core 0.10.0",
+ "once_cell",
+ "palette 0.7.3",
 ]
 
 [[package]]
-name = "instant"
-version = "0.1.12"
+name = "iced_tiny_skia"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "c7715f6222c9470bbbd75a39f70478fa0d1bdfb81a377a34fd1b090ffccc480b"
 dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
+ "bytemuck",
+ "cosmic-text",
+ "iced_graphics 0.9.0",
+ "kurbo",
+ "log",
+ "raw-window-handle 0.5.2",
+ "rustc-hash",
+ "softbuffer",
+ "tiny-skia 0.10.0",
+ "twox-hash",
+]
+
+[[package]]
+name = "iced_wgpu"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4bb296363d1b18d4f57e1c69bb19591405e61d47764e43078bba31c6689fca5"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "encase",
+ "futures 0.3.28",
+ "glam 0.21.3",
+ "glyph_brush",
+ "guillotiere",
+ "iced_graphics 0.6.0",
+ "iced_native 0.8.0",
+ "log",
+ "raw-window-handle 0.5.2",
+ "wgpu 0.14.2",
+ "wgpu_glyph",
+]
+
+[[package]]
+name = "iced_wgpu"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f7c5de46b997ed7b18e05ec67059dcdf3beeac51e917c21071b021bb848b9"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "futures 0.3.28",
+ "glam 0.24.1",
+ "glyphon",
+ "guillotiere",
+ "iced_graphics 0.9.0",
+ "log",
+ "lyon",
+ "once_cell",
+ "raw-window-handle 0.5.2",
+ "rustc-hash",
+ "twox-hash",
+ "wgpu 0.16.3",
+]
+
+[[package]]
+name = "iced_widget"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a177219ae51c3ba08f228ab932354b360cc669e94aec50c01e7c9b675f074c7c"
+dependencies = [
+ "iced_renderer",
+ "iced_runtime",
+ "iced_style 0.9.0",
+ "num-traits 0.2.16",
+ "thiserror",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "iced_winit"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d528f882781c5594cb3d2416fe18787b4364e0cdd39f03d077ccc0becac1f9bd"
+dependencies = [
+ "iced_futures 0.5.1",
+ "iced_graphics 0.6.0",
+ "iced_native 0.8.0",
+ "log",
+ "thiserror",
+ "web-sys",
+ "winapi 0.3.9",
+ "window_clipboard 0.2.4",
+ "winit 0.27.5",
+]
+
+[[package]]
+name = "iced_winit"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ecea26fcc8074373f6011d2193d63445617d900a428eb4df66c0e5658408fb6"
+dependencies = [
+ "iced_graphics 0.9.0",
+ "iced_runtime",
+ "iced_style 0.9.0",
+ "log",
+ "raw-window-handle 0.5.2",
+ "thiserror",
+ "web-sys",
+ "winapi 0.3.9",
+ "window_clipboard 0.3.0",
+ "winit 0.28.6",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "image"
+version = "0.23.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "gif 0.11.4",
+ "jpeg-decoder 0.1.22",
+ "num-iter",
+ "num-rational 0.3.2",
+ "num-traits 0.2.16",
+ "png 0.16.8",
+ "scoped_threadpool",
+ "tiff",
+]
+
+[[package]]
+name = "image"
+version = "0.24.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "jpeg-decoder 0.3.0",
+ "num-rational 0.4.1",
+ "num-traits 0.2.16",
+ "png 0.17.9",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg 1.1.0",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -3691,6 +4181,17 @@ dependencies = [
  "unic-langid",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.2",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -3702,9 +4203,20 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.7.1"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+dependencies = [
+ "hermit-abi 0.3.2",
+ "rustix 0.38.8",
+ "windows-sys 0.48.0",
+]
 
 [[package]]
 name = "isahc"
@@ -3789,9 +4301,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jni-sys"
@@ -3801,9 +4313,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
 dependencies = [
  "libc",
 ]
@@ -3825,9 +4337,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
 
 [[package]]
 name = "js-sys"
-version = "0.3.60"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3858,9 +4370,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
 dependencies = [
  "cpufeatures",
 ]
@@ -3882,7 +4394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
 dependencies = [
  "libc",
- "libloading",
+ "libloading 0.7.4",
  "pkg-config",
 ]
 
@@ -3892,6 +4404,15 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
+[[package]]
+name = "kurbo"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
+dependencies = [
+ "arrayvec 0.7.4",
+]
+
 [[package]]
 name = "kv-log-macro"
 version = "1.0.7"
@@ -3915,9 +4436,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libgit2-sys"
@@ -3951,17 +4472,27 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "libm"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
 
 [[package]]
 name = "libnghttp2-sys"
-version = "0.1.7+1.45.0"
+version = "0.1.8+1.55.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
+checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340"
 dependencies = [
  "cc",
  "libc",
@@ -3969,9 +4500,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.8"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
 dependencies = [
  "cc",
  "libc",
@@ -3990,21 +4521,24 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+
 [[package]]
 name = "lmdb-zero"
 version = "0.4.4"
@@ -4028,9 +4562,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg 1.1.0",
  "scopeguard",
@@ -4038,11 +4572,10 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 dependencies = [
- "cfg-if 1.0.0",
  "serde",
  "value-bag",
 ]
@@ -4088,6 +4621,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "lru"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
+dependencies = [
+ "hashbrown 0.14.0",
+]
+
 [[package]]
 name = "lru-cache"
 version = "0.1.2"
@@ -4109,12 +4651,12 @@ dependencies = [
 
 [[package]]
 name = "lyon_algorithms"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb7a1845c15729d73d25d42cb650b647f73c3494453a5c3cd3aae0df3ac5c6c"
+checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e"
 dependencies = [
  "lyon_path",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4123,26 +4665,26 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "euclid",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
 name = "lyon_path"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8358c012e5651e4619cfd0b5b75c0f77866181a01b0909aab4bae14adf660"
+checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45"
 dependencies = [
  "lyon_geom",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
 name = "lyon_tessellation"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e48a1d4a9cef1075ebe0afbf16521db6c7942e6563c136fb15676dafc5135d7"
+checksum = "7d2124218d5428149f9e09520b9acc024334a607e671f032d06567b61008977c"
 dependencies = [
  "float_next_after",
  "lyon_path",
@@ -4176,9 +4718,18 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.5.8"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memmap2"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
+checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872"
 dependencies = [
  "libc",
 ]
@@ -4201,6 +4752,15 @@ dependencies = [
  "autocfg 1.1.0",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg 1.1.0",
+]
+
 [[package]]
 name = "metal"
 version = "0.24.0"
@@ -4217,9 +4777,9 @@ dependencies = [
 
 [[package]]
 name = "mime"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
@@ -4258,11 +4818,12 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -4286,14 +4847,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4342,13 +4903,13 @@ dependencies = [
 
 [[package]]
 name = "mortal"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b281c45a2dbb0609b854de9df94694fb77eab2fa2933c07d07001dcb29377"
+checksum = "2c624fa1b7aab6bd2aff6e9b18565cc0363b6d45cbcd7465c9ed5e3740ebf097"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "libc",
- "nix 0.23.2",
+ "nix 0.26.2",
  "smallstr",
  "terminfo",
  "unicode-normalization",
@@ -4358,17 +4919,37 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.10.0"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bb1a241901d94de4725d638a5295187b046ceb89ed8b2be368038654d9c81d"
+dependencies = [
+ "bit-set",
+ "bitflags 1.3.2",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap 1.9.3",
+ "log",
+ "num-traits 0.2.16",
+ "rustc-hash",
+ "spirv",
+ "termcolor",
+ "thiserror",
+ "unicode-xid 0.2.4",
+]
+
+[[package]]
+name = "naga"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707"
+checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
 dependencies = [
  "bit-set",
  "bitflags 1.3.2",
  "codespan-reporting",
  "hexf-parse",
- "indexmap",
+ "indexmap 1.9.3",
  "log",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
  "rustc-hash",
  "spirv",
  "termcolor",
@@ -4391,16 +4972,17 @@ dependencies = [
  "raw-window-handle 0.3.4",
  "thiserror",
  "wfd",
- "which 4.3.0",
+ "which 4.4.0",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "native-dialog"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab637f328b31bd0855c43bd38a4a4455e74324d9e74e0aac6a803422f43abc6"
+checksum = "1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b"
 dependencies = [
+ "ascii",
  "block",
  "cocoa",
  "dirs-next 2.0.0",
@@ -4411,7 +4993,7 @@ dependencies = [
  "raw-window-handle 0.4.3",
  "thiserror",
  "wfd",
- "which 4.3.0",
+ "which 4.4.0",
  "winapi 0.3.9",
 ]
 
@@ -4428,8 +5010,8 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.7.0",
- "security-framework-sys 2.6.1",
+ "security-framework 2.9.2",
+ "security-framework-sys 2.9.1",
  "tempfile",
 ]
 
@@ -4442,8 +5024,8 @@ dependencies = [
  "bitflags 1.3.2",
  "jni-sys",
  "ndk-sys",
- "num_enum",
- "raw-window-handle 0.5.0",
+ "num_enum 0.5.11",
+ "raw-window-handle 0.5.2",
  "thiserror",
 ]
 
@@ -4477,9 +5059,9 @@ checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
 dependencies = [
  "darling",
  "proc-macro-crate",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4493,9 +5075,9 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.38"
+version = "0.2.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631"
+checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -4529,12 +5111,11 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.23.2"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
  "bitflags 1.3.2",
- "cc",
  "cfg-if 1.0.0",
  "libc",
  "memoffset 0.6.5",
@@ -4542,10 +5123,11 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.24.3"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
 dependencies = [
+ "autocfg 1.1.0",
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
  "libc",
@@ -4554,15 +5136,16 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.25.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
 dependencies = [
- "autocfg 1.1.0",
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
  "libc",
- "memoffset 0.6.5",
+ "memoffset 0.7.1",
+ "pin-utils",
+ "static_assertions",
 ]
 
 [[package]]
@@ -4573,9 +5156,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
 [[package]]
 name = "nom"
-version = "5.1.2"
+version = "5.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b"
 dependencies = [
  "memchr",
  "version_check",
@@ -4593,9 +5176,9 @@ dependencies = [
 
 [[package]]
 name = "ntapi"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
 dependencies = [
  "winapi 0.3.9",
 ]
@@ -4611,7 +5194,7 @@ dependencies = [
  "num-integer",
  "num-iter",
  "num-rational 0.2.4",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4622,7 +5205,7 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
  "autocfg 1.1.0",
  "num-integer",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4632,7 +5215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
 dependencies = [
  "autocfg 1.1.0",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4641,8 +5224,8 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.2",
- "itoa 1.0.5",
+ "arrayvec 0.7.4",
+ "itoa 1.0.9",
 ]
 
 [[package]]
@@ -4652,7 +5235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
  "autocfg 1.1.0",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4663,7 +5246,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 dependencies = [
  "autocfg 1.1.0",
  "num-integer",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4675,7 +5258,7 @@ dependencies = [
  "autocfg 1.1.0",
  "num-bigint",
  "num-integer",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4686,7 +5269,7 @@ checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
 dependencies = [
  "autocfg 1.1.0",
  "num-integer",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4697,7 +5280,7 @@ checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
 dependencies = [
  "autocfg 1.1.0",
  "num-integer",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4706,14 +5289,14 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 dependencies = [
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg 1.1.0",
  "libm",
@@ -4721,33 +5304,63 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.2",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.5.7"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
- "num_enum_derive",
+ "num_enum_derive 0.5.11",
 ]
 
 [[package]]
-name = "num_enum_derive"
-version = "0.5.7"
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive 0.6.1",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
 ]
 
 [[package]]
@@ -4771,6 +5384,32 @@ dependencies = [
  "objc_id",
 ]
 
+[[package]]
+name = "objc-sys"
+version = "0.2.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
+
+[[package]]
+name = "objc2"
+version = "0.3.0-beta.3.patch-leaks.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
+dependencies = [
+ "block2",
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "2.0.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
+dependencies = [
+ "objc-sys",
+]
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -4791,9 +5430,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.30.2"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
 dependencies = [
  "memchr",
 ]
@@ -4806,9 +5445,9 @@ checksum = "4eae0151b9dacf24fcc170d9995e511669a082856a91f958a2fe380bfab3fb22"
 
 [[package]]
 name = "once_cell"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "opaque-debug"
@@ -4843,9 +5482,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.45"
+version = "0.10.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
@@ -4858,13 +5497,13 @@ dependencies = [
 
 [[package]]
 name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -4875,33 +5514,41 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
 dependencies = [
- "autocfg 1.1.0",
  "cc",
  "libc",
  "pkg-config",
  "vcpkg",
 ]
 
+[[package]]
+name = "orbclient"
+version = "0.3.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
+dependencies = [
+ "redox_syscall 0.3.5",
+]
+
 [[package]]
 name = "ordered-float"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
 dependencies = [
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
 name = "ordered-float"
-version = "3.4.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d84eb1409416d254e4a9c8fa56cc24701755025b458f0fcd8e59e1f5f40c23bf"
+checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213"
 dependencies = [
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -4915,11 +5562,11 @@ dependencies = [
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5f3c7ca08b6879e7965fb25e24d1f5eeb32ea73f9ad99b3854778a38c57e93"
+checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4"
 dependencies = [
- "ttf-parser 0.18.1",
+ "ttf-parser 0.19.1",
 ]
 
 [[package]]
@@ -4929,9 +5576,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49"
 dependencies = [
  "approx",
- "num-traits 0.2.15",
- "palette_derive",
- "phf 0.11.1",
+ "num-traits 0.2.16",
+ "palette_derive 0.6.1",
+ "phf 0.11.2",
+]
+
+[[package]]
+name = "palette"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc"
+dependencies = [
+ "approx",
+ "fast-srgb8",
+ "palette_derive 0.7.3",
+ "phf 0.11.2",
 ]
 
 [[package]]
@@ -4941,9 +5600,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427"
 dependencies = [
  "find-crate",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "palette_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a"
+dependencies = [
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -4960,9 +5630,9 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
 
 [[package]]
 name = "parking_lot"
@@ -4981,7 +5651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
- "lock_api 0.4.9",
+ "lock_api 0.4.10",
  "parking_lot_core 0.8.6",
 ]
 
@@ -4991,8 +5661,8 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
- "lock_api 0.4.9",
- "parking_lot_core 0.9.6",
+ "lock_api 0.4.10",
+ "parking_lot_core 0.9.8",
 ]
 
 [[package]]
@@ -5025,15 +5695,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.6"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.3.5",
  "smallvec",
- "windows-sys 0.42.0",
+ "windows-targets 0.48.2",
 ]
 
 [[package]]
@@ -5097,7 +5767,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -5108,15 +5778,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.5.3"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a"
+checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -5133,12 +5803,12 @@ dependencies = [
 
 [[package]]
 name = "phf"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
 dependencies = [
  "phf_macros",
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
 ]
 
 [[package]]
@@ -5153,12 +5823,12 @@ dependencies = [
 
 [[package]]
 name = "phf_codegen"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
 dependencies = [
- "phf_generator 0.11.1",
- "phf_shared 0.11.1",
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
 ]
 
 [[package]]
@@ -5173,25 +5843,25 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
  "rand 0.8.5",
 ]
 
 [[package]]
 name = "phf_macros"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
 dependencies = [
- "phf_generator 0.11.1",
- "phf_shared 0.11.1",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -5205,31 +5875,31 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
 dependencies = [
  "siphasher 0.3.10",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.0.12"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -5240,9 +5910,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
 
 [[package]]
 name = "pin-utils"
@@ -5252,9 +5922,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "plotters"
@@ -5266,7 +5936,7 @@ dependencies = [
  "font-kit",
  "image 0.23.14",
  "lazy_static",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
  "pathfinder_geometry",
  "plotters-backend",
  "plotters-bitmap",
@@ -5278,18 +5948,18 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
 
 [[package]]
 name = "plotters-bitmap"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4a1f21490a6cf4a84c272ad20bd7844ed99a3178187a4c5ab7f2051295beef"
+checksum = "0cebbe1f70205299abc69e8b295035bb52a6a70ee35474ad10011f0a4efb8543"
 dependencies = [
- "gif",
- "image 0.24.5",
+ "gif 0.12.0",
+ "image 0.24.7",
  "plotters-backend",
 ]
 
@@ -5299,17 +5969,17 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ae63a3ff1c23d2f3c9f67bb940494d64efd4e0ece410fe9ff01d8584b11ac6b"
 dependencies = [
- "iced_graphics",
- "iced_native",
+ "iced_graphics 0.6.0",
+ "iced_native 0.8.0",
  "plotters",
  "plotters-backend",
 ]
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
 dependencies = [
  "plotters-backend",
 ]
@@ -5328,28 +5998,31 @@ dependencies = [
 
 [[package]]
 name = "png"
-version = "0.17.7"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
+ "fdeflate",
  "flate2",
- "miniz_oxide 0.6.2",
+ "miniz_oxide 0.7.1",
 ]
 
 [[package]]
 name = "polling"
-version = "2.5.2"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
 dependencies = [
  "autocfg 1.1.0",
+ "bitflags 1.3.2",
  "cfg-if 1.0.0",
+ "concurrent-queue",
  "libc",
  "log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite 0.2.12",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5371,27 +6044,26 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "prettytable-rs"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e"
+checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
 dependencies = [
- "atty",
  "csv",
  "encode_unicode",
+ "is-terminal",
  "lazy_static",
- "term 0.5.2",
+ "term 0.7.0",
  "unicode-width",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.2.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "thiserror",
- "toml",
+ "toml_edit",
 ]
 
 [[package]]
@@ -5401,9 +6073,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
  "version_check",
 ]
 
@@ -5413,8 +6085,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "version_check",
 ]
 
@@ -5429,18 +6101,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.50"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df"
+checksum = "46b2164ebdb1dfeec5e337be164292351e11daf63a05174c6776b2f47460f0c9"
 
 [[package]]
 name = "qr_code"
@@ -5454,6 +6126,15 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
+[[package]]
+name = "quick-xml"
+version = "0.28.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "0.6.13"
@@ -5465,11 +6146,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
- "proc-macro2 1.0.50",
+ "proc-macro2 1.0.66",
 ]
 
 [[package]]
@@ -5588,7 +6269,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -5664,9 +6345,15 @@ dependencies = [
 
 [[package]]
 name = "range-alloc"
-version = "0.1.2"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
+
+[[package]]
+name = "rangemap"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6"
+checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263"
 
 [[package]]
 name = "raw-window-handle"
@@ -5689,18 +6376,15 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
-dependencies = [
- "cty",
-]
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
 [[package]]
 name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
 dependencies = [
  "either",
  "rayon-core",
@@ -5708,9 +6392,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -5742,6 +6426,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.3.5"
@@ -5759,48 +6452,51 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
  "redox_syscall 0.2.16",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
 dependencies = [
  "aho-corasick",
  "memchr",
+ "regex-automata",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
-name = "remove_dir_all"
-version = "0.5.3"
+name = "renderdoc-sys"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
+checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
 
 [[package]]
 name = "renderdoc-sys"
-version = "0.7.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
+checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
 
 [[package]]
 name = "reqwest"
@@ -5826,7 +6522,7 @@ dependencies = [
  "mime_guess",
  "native-tls",
  "percent-encoding",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.12",
  "rustls 0.18.1",
  "serde",
  "serde_urlencoded",
@@ -5844,19 +6540,19 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.13"
+version = "0.11.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
 dependencies = [
- "base64 0.13.1",
- "bytes 1.3.0",
+ "base64 0.21.2",
+ "bytes 1.4.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.15",
+ "h2 0.3.20",
  "http",
  "http-body 0.4.5",
- "hyper 0.14.23",
+ "hyper 0.14.27",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -5865,11 +6561,11 @@ dependencies = [
  "native-tls",
  "once_cell",
  "percent-encoding",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.12",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.24.2",
+ "tokio 1.31.0",
  "tokio-native-tls",
  "tower-service",
  "url",
@@ -5961,9 +6657,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "6.4.2"
+version = "6.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "283ffe2f866869428c92e0d61c2f35dfb4355293cdfdc48f49e895c15f1333d1"
+checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -5972,32 +6668,32 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "6.3.1"
+version = "6.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ab23d42d71fb9be1b643fe6765d292c5e14d46912d13f3ae2815ca048ea04d"
+checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "rust-embed-utils",
- "syn 1.0.107",
+ "syn 2.0.28",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-utils"
-version = "7.3.0"
+version = "7.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1669d81dfabd1b5f8e2856b8bbe146c6192b0ba22162edc738ac0a5de18f054"
+checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74"
 dependencies = [
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "walkdir",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
@@ -6026,7 +6722,34 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.16",
+ "semver 1.0.18",
+]
+
+[[package]]
+name = "rustix"
+version = "0.37.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
+dependencies = [
+ "bitflags 2.4.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.5",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6067,6 +6790,29 @@ dependencies = [
  "security-framework 0.4.4",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "rustybuzz"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "libm",
+ "smallvec",
+ "ttf-parser 0.19.1",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-general-category",
+ "unicode-script",
+]
+
 [[package]]
 name = "rustyline"
 version = "6.3.0"
@@ -6088,9 +6834,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "safe_arch"
@@ -6127,11 +6873,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6148,15 +6894,9 @@ checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scrypt"
@@ -6167,7 +6907,7 @@ dependencies = [
  "hmac 0.12.1",
  "pbkdf2 0.10.1",
  "salsa20",
- "sha2 0.10.6",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -6189,7 +6929,20 @@ dependencies = [
  "crossfont",
  "log",
  "smithay-client-toolkit",
- "tiny-skia",
+ "tiny-skia 0.7.0",
+]
+
+[[package]]
+name = "sctk-adwaita"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09"
+dependencies = [
+ "ab_glyph",
+ "log",
+ "memmap2 0.5.10",
+ "smithay-client-toolkit",
+ "tiny-skia 0.8.4",
 ]
 
 [[package]]
@@ -6225,15 +6978,15 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.7.0"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation 0.9.3",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
  "libc",
- "security-framework-sys 2.6.1",
+ "security-framework-sys 2.9.1",
 ]
 
 [[package]]
@@ -6248,11 +7001,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.6.1"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
  "libc",
 ]
 
@@ -6292,9 +7045,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.16"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 
 [[package]]
 name = "semver-parser"
@@ -6313,9 +7066,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
 dependencies = [
  "serde_derive",
 ]
@@ -6332,26 +7085,35 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.91"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
 dependencies = [
- "itoa 1.0.5",
+ "itoa 1.0.9",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -6359,18 +7121,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.5",
+ "itoa 1.0.9",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_with"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
+dependencies = [
+ "chrono",
+ "serde",
+ "serde_with_macros",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
+dependencies = [
+ "darling",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "serde_yaml"
 version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
- "indexmap",
+ "indexmap 1.9.3",
  "ryu",
  "serde",
  "yaml-rust 0.4.5",
@@ -6424,13 +7209,13 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -6464,9 +7249,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.14"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -6474,9 +7259,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
 dependencies = [
  "libc",
 ]
@@ -6487,6 +7272,12 @@ version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "siphasher"
 version = "0.2.3"
@@ -6501,9 +7292,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
 
 [[package]]
 name = "slab"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
 dependencies = [
  "autocfg 1.1.0",
 ]
@@ -6539,9 +7330,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -6554,10 +7345,10 @@ dependencies = [
  "dlib",
  "lazy_static",
  "log",
- "memmap2",
+ "memmap2 0.5.10",
  "nix 0.24.3",
  "pkg-config",
- "wayland-client",
+ "wayland-client 0.29.5",
  "wayland-cursor",
  "wayland-protocols",
 ]
@@ -6569,7 +7360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8"
 dependencies = [
  "smithay-client-toolkit",
- "wayland-client",
+ "wayland-client 0.29.5",
 ]
 
 [[package]]
@@ -6585,14 +7376,52 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
 dependencies = [
  "libc",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "softbuffer"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2b953f6ba7285f0af131eb748aabd8ddaf53e0b81dda3ba5d803b0847d6559f"
+dependencies = [
+ "bytemuck",
+ "cfg_aliases",
+ "cocoa",
+ "core-graphics",
+ "fastrand 1.9.0",
+ "foreign-types 0.3.2",
+ "log",
+ "nix 0.26.2",
+ "objc",
+ "raw-window-handle 0.5.2",
+ "redox_syscall 0.3.5",
+ "thiserror",
+ "wasm-bindgen",
+ "wayland-backend",
+ "wayland-client 0.30.2",
+ "wayland-sys 0.30.1",
+ "web-sys",
+ "windows-sys 0.48.0",
+ "x11-dl",
+ "x11rb 0.11.1",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -6601,11 +7430,11 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spinning_top"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c"
+checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0"
 dependencies = [
- "lock_api 0.4.9",
+ "lock_api 0.4.10",
 ]
 
 [[package]]
@@ -6615,7 +7444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
 dependencies = [
  "bitflags 1.3.2",
- "num-traits 0.2.15",
+ "num-traits 0.2.16",
 ]
 
 [[package]]
@@ -6636,6 +7465,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b278b244ef7aa5852b277f52dd0c6cac3a109919e1f6d699adde63251227a30f"
 
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -6667,9 +7502,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -6691,9 +7526,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
 dependencies = [
  "heck",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -6703,9 +7538,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
 dependencies = [
  "heck",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -6726,6 +7561,16 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
 
+[[package]]
+name = "swash"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f"
+dependencies = [
+ "yazi",
+ "zeno",
+]
+
 [[package]]
 name = "syn"
 version = "0.15.44"
@@ -6739,35 +7584,44 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "unicode-ident",
 ]
 
 [[package]]
-name = "synstructure"
-version = "0.12.6"
+name = "syn"
+version = "2.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
- "unicode-xid 0.2.4",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "sysinfo"
-version = "0.14.15"
+name = "sys-locale"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2983daff11a197c7c406b130579bc362177aa54cf2cc1f34d6ac88fccaa6a5e1"
+checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f"
 dependencies = [
- "cfg-if 0.1.10",
- "doc-comment",
+ "libc",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "sysinfo"
+version = "0.29.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d10ed79c22663a35a255d289a7fdcb43559fc77ff15df5ce6c341809e7867528"
+dependencies = [
+ "cfg-if 1.0.0",
+ "core-foundation-sys 0.8.4",
  "libc",
  "ntapi",
  "once_cell",
@@ -6789,15 +7643,15 @@ dependencies = [
  "strum 0.21.0",
  "strum_macros 0.21.1",
  "thiserror",
- "toml",
+ "toml 0.5.11",
  "version-compare",
 ]
 
 [[package]]
 name = "tar"
-version = "0.4.38"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
+checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
 dependencies = [
  "filetime",
  "libc",
@@ -6806,36 +7660,35 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
 dependencies = [
  "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall 0.2.16",
- "remove_dir_all",
- "winapi 0.3.9",
+ "fastrand 2.0.0",
+ "redox_syscall 0.3.5",
+ "rustix 0.38.8",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "term"
-version = "0.5.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
+checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5"
 dependencies = [
- "byteorder",
- "dirs 1.0.5",
+ "dirs 2.0.2",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "term"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
 dependencies = [
- "dirs 2.0.2",
+ "dirs-next 2.0.0",
+ "rustversion",
  "winapi 0.3.9",
 ]
 
@@ -6850,15 +7703,15 @@ dependencies = [
 
 [[package]]
 name = "terminfo"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585"
+checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f"
 dependencies = [
  "dirs 4.0.0",
  "fnv",
- "nom 5.1.2",
- "phf 0.11.1",
- "phf_codegen 0.11.1",
+ "nom 7.1.3",
+ "phf 0.11.2",
+ "phf_codegen 0.11.2",
 ]
 
 [[package]]
@@ -6872,22 +7725,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "dedd246497092a89beedfe2c9f176d44c1b672ea6090edc20544ade01fbb7ea0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "7d7b1fadccbbc7e19ea64708629f9d8dccd007c260d66485f20a6d41bc1cf4b3"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -6903,10 +7756,11 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.4"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
+ "cfg-if 1.0.0",
  "once_cell",
 ]
 
@@ -6932,6 +7786,25 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
+dependencies = [
+ "deranged",
+ "libc",
+ "num_threads",
+ "serde",
+ "time-core",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
 [[package]]
 name = "timeago"
 version = "0.2.2"
@@ -6961,9 +7834,38 @@ dependencies = [
  "arrayvec 0.5.2",
  "bytemuck",
  "cfg-if 1.0.0",
- "png 0.17.7",
+ "png 0.17.9",
  "safe_arch",
- "tiny-skia-path",
+ "tiny-skia-path 0.7.0",
+]
+
+[[package]]
+name = "tiny-skia"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.4",
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "png 0.17.9",
+ "tiny-skia-path 0.8.4",
+]
+
+[[package]]
+name = "tiny-skia"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.4",
+ "bytemuck",
+ "cfg-if 1.0.0",
+ "log",
+ "png 0.17.9",
+ "tiny-skia-path 0.10.0",
 ]
 
 [[package]]
@@ -6976,11 +7878,33 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "tiny-skia-path"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
 [[package]]
 name = "tinystr"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2"
+checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
 dependencies = [
  "displaydoc",
 ]
@@ -6996,9 +7920,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
@@ -7026,19 +7950,18 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.24.2"
+version = "1.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
+checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
 dependencies = [
- "autocfg 1.1.0",
- "bytes 1.3.0",
+ "backtrace",
+ "bytes 1.4.0",
  "libc",
- "memchr",
- "mio 0.8.5",
+ "mio 0.8.8",
  "num_cpus",
- "pin-project-lite 0.2.9",
- "socket2 0.4.7",
- "windows-sys 0.42.0",
+ "pin-project-lite 0.2.12",
+ "socket2 0.5.3",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -7057,19 +7980,19 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "tokio-native-tls"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
- "tokio 1.24.2",
+ "tokio 1.31.0",
 ]
 
 [[package]]
@@ -7104,7 +8027,7 @@ checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539"
 dependencies = [
  "bytes 0.4.12",
  "either",
- "futures 0.3.25",
+ "futures 0.3.28",
  "thiserror",
  "tokio 0.2.25",
 ]
@@ -7149,25 +8072,59 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.4"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
 dependencies = [
- "bytes 1.3.0",
+ "bytes 1.4.0",
  "futures-core",
  "futures-sink",
- "pin-project-lite 0.2.9",
- "tokio 1.24.2",
+ "pin-project-lite 0.2.12",
+ "tokio 1.31.0",
  "tracing",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.10"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
@@ -7184,27 +8141,27 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.12",
  "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
  "once_cell",
 ]
@@ -7239,9 +8196,9 @@ checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6"
 
 [[package]]
 name = "ttf-parser"
-version = "0.18.1"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
+checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33"
 
 [[package]]
 name = "twox-hash"
@@ -7280,9 +8237,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "unic-langid"
@@ -7314,15 +8271,39 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694"
+
+[[package]]
+name = "unicode-ccc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
+
+[[package]]
+name = "unicode-general-category"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
 [[package]]
 name = "unicode-normalization"
@@ -7333,11 +8314,17 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-script"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
+
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
@@ -7363,7 +8350,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
  "subtle",
 ]
 
@@ -7384,9 +8371,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -7395,9 +8382,9 @@ dependencies = [
 
 [[package]]
 name = "utf8parse"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
@@ -7405,19 +8392,15 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
  "serde",
 ]
 
 [[package]]
 name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
 
 [[package]]
 name = "vcpkg"
@@ -7471,22 +8454,20 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
 dependencies = [
  "same-file",
- "winapi 0.3.9",
  "winapi-util",
 ]
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
@@ -7510,9 +8491,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -7522,24 +8503,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.33"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -7549,32 +8530,32 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
- "quote 1.0.23",
+ "quote 1.0.32",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-timer"
@@ -7582,7 +8563,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.25",
+ "futures 0.3.28",
  "js-sys",
  "parking_lot 0.11.2",
  "pin-utils",
@@ -7591,6 +8572,21 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "io-lifetimes",
+ "nix 0.26.2",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys 0.30.1",
+]
+
 [[package]]
 name = "wayland-client"
 version = "0.29.5"
@@ -7603,8 +8599,20 @@ dependencies = [
  "nix 0.24.3",
  "scoped-tls",
  "wayland-commons",
- "wayland-scanner",
- "wayland-sys",
+ "wayland-scanner 0.29.5",
+ "wayland-sys 0.29.5",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.30.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8"
+dependencies = [
+ "bitflags 1.3.2",
+ "nix 0.26.2",
+ "wayland-backend",
+ "wayland-scanner 0.30.1",
 ]
 
 [[package]]
@@ -7616,7 +8624,7 @@ dependencies = [
  "nix 0.24.3",
  "once_cell",
  "smallvec",
- "wayland-sys",
+ "wayland-sys 0.29.5",
 ]
 
 [[package]]
@@ -7626,7 +8634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
 dependencies = [
  "nix 0.24.3",
- "wayland-client",
+ "wayland-client 0.29.5",
  "xcursor",
 ]
 
@@ -7636,8 +8644,8 @@ version = "0.29.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d"
 dependencies = [
- "wayland-client",
- "wayland-sys",
+ "wayland-client 0.29.5",
+ "wayland-sys 0.29.5",
 ]
 
 [[package]]
@@ -7647,9 +8655,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
 dependencies = [
  "bitflags 1.3.2",
- "wayland-client",
+ "wayland-client 0.29.5",
  "wayland-commons",
- "wayland-scanner",
+ "wayland-scanner 0.29.5",
 ]
 
 [[package]]
@@ -7658,11 +8666,22 @@ version = "0.29.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "xml-rs",
 ]
 
+[[package]]
+name = "wayland-scanner"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e"
+dependencies = [
+ "proc-macro2 1.0.66",
+ "quick-xml",
+ "quote 1.0.32",
+]
+
 [[package]]
 name = "wayland-sys"
 version = "0.29.5"
@@ -7674,11 +8693,23 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "wayland-sys"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06"
+dependencies = [
+ "dlib",
+ "lazy_static",
+ "log",
+ "pkg-config",
+]
+
 [[package]]
 name = "web-sys"
-version = "0.3.60"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7709,15 +8740,6 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "wfd"
 version = "0.1.7"
@@ -7734,20 +8756,44 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "js-sys",
  "log",
- "naga",
+ "naga 0.10.1",
  "parking_lot 0.12.1",
- "raw-window-handle 0.5.0",
+ "raw-window-handle 0.5.2",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu-core",
- "wgpu-hal",
- "wgpu-types",
+ "wgpu-core 0.14.2",
+ "wgpu-hal 0.14.1",
+ "wgpu-types 0.14.1",
+]
+
+[[package]]
+name = "wgpu"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
+dependencies = [
+ "arrayvec 0.7.4",
+ "cfg-if 1.0.0",
+ "js-sys",
+ "log",
+ "naga 0.12.3",
+ "parking_lot 0.12.1",
+ "profiling",
+ "raw-window-handle 0.5.2",
+ "smallvec",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core 0.16.1",
+ "wgpu-hal 0.16.2",
+ "wgpu-types 0.16.1",
 ]
 
 [[package]]
@@ -7756,22 +8802,45 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "bit-vec",
  "bitflags 1.3.2",
  "cfg_aliases",
  "codespan-reporting",
  "fxhash",
  "log",
- "naga",
+ "naga 0.10.1",
+ "parking_lot 0.12.1",
+ "profiling",
+ "raw-window-handle 0.5.2",
+ "smallvec",
+ "thiserror",
+ "web-sys",
+ "wgpu-hal 0.14.1",
+ "wgpu-types 0.14.1",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
+dependencies = [
+ "arrayvec 0.7.4",
+ "bit-vec",
+ "bitflags 2.4.0",
+ "codespan-reporting",
+ "log",
+ "naga 0.12.3",
  "parking_lot 0.12.1",
  "profiling",
- "raw-window-handle 0.5.0",
+ "raw-window-handle 0.5.2",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "web-sys",
- "wgpu-hal",
- "wgpu-types",
+ "wgpu-hal 0.16.2",
+ "wgpu-types 0.16.1",
 ]
 
 [[package]]
@@ -7781,35 +8850,77 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f"
 dependencies = [
  "android_system_properties",
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "ash",
  "bit-set",
  "bitflags 1.3.2",
  "block",
  "core-graphics-types",
- "d3d12",
+ "d3d12 0.5.0",
  "foreign-types 0.3.2",
  "fxhash",
- "glow",
+ "glow 0.11.2",
  "gpu-alloc",
  "gpu-descriptor",
  "js-sys",
  "khronos-egl",
- "libloading",
+ "libloading 0.7.4",
  "log",
  "metal",
- "naga",
+ "naga 0.10.1",
  "objc",
  "parking_lot 0.12.1",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.5.0",
- "renderdoc-sys",
+ "raw-window-handle 0.5.2",
+ "renderdoc-sys 0.7.1",
  "smallvec",
  "thiserror",
  "wasm-bindgen",
  "web-sys",
- "wgpu-types",
+ "wgpu-types 0.14.1",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+dependencies = [
+ "android_system_properties",
+ "arrayvec 0.7.4",
+ "ash",
+ "bit-set",
+ "bitflags 2.4.0",
+ "block",
+ "core-graphics-types",
+ "d3d12 0.6.0",
+ "foreign-types 0.3.2",
+ "glow 0.12.3",
+ "gpu-alloc",
+ "gpu-allocator",
+ "gpu-descriptor",
+ "hassle-rs",
+ "js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading 0.8.0",
+ "log",
+ "metal",
+ "naga 0.12.3",
+ "objc",
+ "parking_lot 0.12.1",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle 0.5.2",
+ "renderdoc-sys 1.0.0",
+ "rustc-hash",
+ "smallvec",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu-types 0.16.1",
  "winapi 0.3.9",
 ]
 
@@ -7822,6 +8933,17 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "wgpu-types"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
+dependencies = [
+ "bitflags 2.4.0",
+ "js-sys",
+ "web-sys",
+]
+
 [[package]]
 name = "wgpu_glyph"
 version = "0.18.0"
@@ -7831,7 +8953,7 @@ dependencies = [
  "bytemuck",
  "glyph_brush",
  "log",
- "wgpu",
+ "wgpu 0.14.2",
 ]
 
 [[package]]
@@ -7845,15 +8967,21 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.3.0"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
 dependencies = [
  "either",
  "libc",
  "once_cell",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -7920,6 +9048,38 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "window_clipboard"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d"
+dependencies = [
+ "clipboard-win",
+ "clipboard_macos",
+ "clipboard_wayland",
+ "clipboard_x11",
+ "raw-window-handle 0.5.2",
+ "thiserror",
+]
+
+[[package]]
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.2",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.36.1"
@@ -7935,24 +9095,63 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.42.0"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows-targets 0.48.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1eeca1c172a285ee6c2c84c341ccea837e7c01b12fbb2d0fe3c9e550ce49ec8"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.2",
+ "windows_aarch64_msvc 0.48.2",
+ "windows_i686_gnu 0.48.2",
+ "windows_i686_msvc 0.48.2",
+ "windows_x86_64_gnu 0.48.2",
+ "windows_x86_64_gnullvm 0.48.2",
+ "windows_x86_64_msvc 0.48.2",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -7962,9 +9161,15 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -7974,9 +9179,15 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -7986,9 +9197,15 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -7998,15 +9215,27 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea99ff3f8b49fb7a8e0d305e5aec485bd068c2ba691b6e277d29eaeac945868a"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -8016,9 +9245,15 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9"
 
 [[package]]
 name = "winit"
@@ -8034,7 +9269,7 @@ dependencies = [
  "instant",
  "libc",
  "log",
- "mio 0.8.5",
+ "mio 0.8.8",
  "ndk",
  "ndk-glue",
  "objc",
@@ -8042,17 +9277,61 @@ dependencies = [
  "parking_lot 0.12.1",
  "percent-encoding",
  "raw-window-handle 0.4.3",
- "raw-window-handle 0.5.0",
- "sctk-adwaita",
+ "raw-window-handle 0.5.2",
+ "sctk-adwaita 0.4.3",
  "smithay-client-toolkit",
  "wasm-bindgen",
- "wayland-client",
+ "wayland-client 0.29.5",
  "wayland-protocols",
  "web-sys",
  "windows-sys 0.36.1",
  "x11-dl",
 ]
 
+[[package]]
+name = "winit"
+version = "0.28.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196"
+dependencies = [
+ "android-activity",
+ "bitflags 1.3.2",
+ "cfg_aliases",
+ "core-foundation 0.9.3",
+ "core-graphics",
+ "dispatch",
+ "instant",
+ "libc",
+ "log",
+ "mio 0.8.8",
+ "ndk",
+ "objc2",
+ "once_cell",
+ "orbclient",
+ "percent-encoding",
+ "raw-window-handle 0.5.2",
+ "redox_syscall 0.3.5",
+ "sctk-adwaita 0.5.4",
+ "smithay-client-toolkit",
+ "wasm-bindgen",
+ "wayland-client 0.29.5",
+ "wayland-commons",
+ "wayland-protocols",
+ "wayland-scanner 0.29.5",
+ "web-sys",
+ "windows-sys 0.45.0",
+ "x11-dl",
+]
+
+[[package]]
+name = "winnow"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5504cc7644f4b593cbc05c4a55bf9bd4e94b867c3c0bd440934174d50482427d"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.7.0"
@@ -8092,12 +9371,12 @@ dependencies = [
 
 [[package]]
 name = "x11-dl"
-version = "2.20.1"
+version = "2.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
 dependencies = [
- "lazy_static",
  "libc",
+ "once_cell",
  "pkg-config",
 ]
 
@@ -8113,6 +9392,31 @@ dependencies = [
  "winapi-wsapoll",
 ]
 
+[[package]]
+name = "x11rb"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617"
+dependencies = [
+ "gethostname",
+ "libc",
+ "libloading 0.7.4",
+ "nix 0.25.1",
+ "once_cell",
+ "winapi 0.3.9",
+ "winapi-wsapoll",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56"
+dependencies = [
+ "nix 0.25.1",
+]
+
 [[package]]
 name = "x25519-dalek"
 version = "0.6.0"
@@ -8137,9 +9441,9 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "0.2.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
+checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
 dependencies = [
  "libc",
 ]
@@ -8161,9 +9465,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.4"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
+checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
 
 [[package]]
 name = "yaml-rust"
@@ -8180,25 +9484,36 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "yazi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
+
+[[package]]
+name = "zeno"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701"
+
 [[package]]
 name = "zeroize"
-version = "1.5.7"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.3.3"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
- "proc-macro2 1.0.50",
- "quote 1.0.23",
- "syn 1.0.107",
- "synstructure",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -8212,7 +9527,7 @@ dependencies = [
  "crc32fast",
  "flate2",
  "thiserror",
- "time",
+ "time 0.1.45",
 ]
 
 [[package]]
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index 7fa66a9..407c153 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -23,21 +23,21 @@ built = { version = "0.4", features = ["git2"] }
 
 ############ Release ################
 ### Node
-grin_config = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_servers = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
-grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+grin_config = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
+grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
+grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
+grin_servers = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
+grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
+grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
 
 ### Wallet
-grin_wallet = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
-grin_wallet_config = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
-grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
-grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
-grin_wallet_api = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
-grin_wallet_impls = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
-grin_wallet_libwallet = { git = "https://github.com/mimblewimble/grin-wallet", branch = "master" }
+grin_wallet = { git = "https://github.com/mimblewimble/grin-wallet", branch = "contracts" }
+grin_wallet_config = { git = "https://github.com/mimblewimble/grin-wallet", branch = "contracts" }
+grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", branch = "contracts" }
+grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", branch = "contracts" }
+grin_wallet_api = { git = "https://github.com/mimblewimble/grin-wallet", branch = "contracts" }
+grin_wallet_impls = { git = "https://github.com/mimblewimble/grin-wallet", branch = "contracts" }
+grin_wallet_libwallet = { git = "https://github.com/mimblewimble/grin-wallet", branch = "contracts" }
 grin-gui-widgets = { path = "../widgets" }
 
 
@@ -92,16 +92,16 @@ log4rs = { version = "0.12", features = [
 backtrace = "0.3"
 lazy_static = "1"
 
-iced = { version = "0.7.0", default-features = false, features = ["default"] }
-iced_futures = { version = "0.5", features = ["async-std"] }
-iced_core = { version = "0.7.0" }
-iced_style = "0.6.0"
-iced_graphics = { version = "0.6.0" }
-iced_native = { version = "0.8.0", optional = true }
-iced_aw = { git = "https://github.com/iced-rs/iced_aw.git" }
+iced = { version = "0.10", default-features = false, features = ["default"] }
+iced_futures = { version = "0.7", features = ["async-std"] }
+iced_core = { version = "0.10" }
+iced_style = "0.9"
+iced_graphics = { version = "0.9" }
+iced_native = { version = "0.10", optional = true }
+iced_aw = { version = "0.6", default-features = false, features = ["card", "modal"]}
 
-iced_wgpu = { version = "0.8.0", optional = true }
-iced_glow = { version = "0.6.0", optional = true }
+iced_wgpu = { version = "0.11", optional = true }
+iced_glow = { version = "0.8", optional = true }
 
 [dev-dependencies]
 tempfile = "3.2.0"
diff --git a/crates/core/src/theme/button.rs b/crates/core/src/theme/button.rs
index 13fed44..ce665f2 100644
--- a/crates/core/src/theme/button.rs
+++ b/crates/core/src/theme/button.rs
@@ -1,5 +1,5 @@
 use iced::widget::button;
-use iced::{Background, Color};
+use iced::{Color, Background};
 
 use super::Theme;
 
@@ -27,24 +27,24 @@ impl button::StyleSheet for Theme {
                     ..self.palette.normal.primary
                 },
                 border_width: 1.0,
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 text_color: self.palette.bright.primary,
                 ..button::Appearance::default()
             },
             ButtonStyle::Primary => button::Appearance {
                 text_color: self.palette.bright.primary,
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 ..Default::default()
             },
             ButtonStyle::Selected => button::Appearance {
                 background: Some(Background::Color(self.palette.normal.primary)),
                 text_color: self.palette.bright.primary,
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 ..button::Appearance::default()
             },
             ButtonStyle::NormalText =>  button::Appearance {
                 text_color: self.palette.normal.surface,
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 ..button::Appearance::default()
             },
             ButtonStyle::SelectedColumn => button::Appearance {
@@ -52,7 +52,7 @@ impl button::StyleSheet for Theme {
                 text_color: Color {
                     ..self.palette.bright.primary
                 },
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 ..button::Appearance::default()
             },
             ButtonStyle::ColumnHeader => button::Appearance {
@@ -60,7 +60,7 @@ impl button::StyleSheet for Theme {
                 text_color: Color {
                     ..self.palette.bright.surface
                 },
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 ..button::Appearance::default()
             },
         }
diff --git a/crates/core/src/theme/mod.rs b/crates/core/src/theme/mod.rs
index 73264ab..d16e57f 100644
--- a/crates/core/src/theme/mod.rs
+++ b/crates/core/src/theme/mod.rs
@@ -57,7 +57,7 @@ pub type Button<'a, Message> = iced::widget::Button<'a, Message, Renderer>;
 pub type Scrollable<'a, Message> = iced::widget::Scrollable<'a, Message, Renderer>;
 pub type PickList<'a, T, Message> = iced::widget::PickList<'a, T, Message, Renderer>;
 pub type Card<'a, Message> = iced_aw::native::Card<'a, Message, Renderer>;
-pub type Modal<'a, Content, Message> = iced_aw::modal::Modal<'a, Content, Message, Renderer, Theme>;
+pub type Modal<'a, Content, Message> = iced_aw::modal::Modal<'a, Content, Message>;
 pub type Header<'a, Message> = grin_gui_widgets::widget::header::Header<'a, Message, Renderer>;
 pub type TableRow<'a, Message> = grin_gui_widgets::widget::table_row::TableRow<'a, Message, Renderer>;
 
@@ -65,33 +65,33 @@ pub type TableRow<'a, Message> = grin_gui_widgets::widget::table_row::TableRow<'
 #[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
 pub struct BaseColors {
     #[serde(with = "serde_color")]
-    pub background: iced_native::Color,
+    pub background: iced::Color,
     #[serde(with = "serde_color")]
-    pub foreground: iced_native::Color,
+    pub foreground: iced::Color,
 }
 
 #[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
 pub struct NormalColors {
     #[serde(with = "serde_color")]
-    pub primary: iced_native::Color,
+    pub primary: iced::Color,
     #[serde(with = "serde_color")]
-    pub secondary: iced_native::Color,
+    pub secondary: iced::Color,
     #[serde(with = "serde_color")]
-    pub surface: iced_native::Color,
+    pub surface: iced::Color,
     #[serde(with = "serde_color")]
-    pub error: iced_native::Color,
+    pub error: iced::Color,
 }
 
 #[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
 pub struct BrightColors {
     #[serde(with = "serde_color")]
-    pub primary: iced_native::Color,
+    pub primary: iced::Color,
     #[serde(with = "serde_color")]
-    pub secondary: iced_native::Color,
+    pub secondary: iced::Color,
     #[serde(with = "serde_color")]
-    pub surface: iced_native::Color,
+    pub surface: iced::Color,
     #[serde(with = "serde_color")]
-    pub error: iced_native::Color,
+    pub error: iced::Color,
 }
 
 #[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
@@ -483,7 +483,7 @@ impl Theme {
     }
 }
 
-fn hex_to_color(hex: &str) -> Option<iced_native::Color> {
+fn hex_to_color(hex: &str) -> Option<iced::Color> {
     if hex.len() == 7 {
         let hash = &hex[0..1];
         let r = u8::from_str_radix(&hex[1..3], 16);
@@ -491,7 +491,7 @@ fn hex_to_color(hex: &str) -> Option<iced_native::Color> {
         let b = u8::from_str_radix(&hex[5..7], 16);
 
         return match (hash, r, g, b) {
-            ("#", Ok(r), Ok(g), Ok(b)) => Some(iced_native::Color {
+            ("#", Ok(r), Ok(g), Ok(b)) => Some(iced::Color {
                 r: r as f32 / 255.0,
                 g: g as f32 / 255.0,
                 b: b as f32 / 255.0,
@@ -504,10 +504,10 @@ fn hex_to_color(hex: &str) -> Option<iced_native::Color> {
     None
 }
 
-fn color_to_hex(color: &iced_native::Color) -> String {
+fn color_to_hex(color: &iced::Color) -> String {
     let mut color_str = String::from("#");
 
-    let iced_native::Color { r, g, b, .. } = color;
+    let iced::Color { r, g, b, .. } = color;
     color_str.push_str(&format!("{:02X}", (r * 255.0) as u8));
     color_str.push_str(&format!("{:02X}", (g * 255.0) as u8));
     color_str.push_str(&format!("{:02X}", (b * 255.0) as u8));
@@ -536,7 +536,7 @@ impl Ord for Theme {
 }
 
 // Newtype on iced::Color so we can impl Deserialzer for it
-struct Color(iced_native::Color);
+struct Color(iced::Color);
 
 mod serde_color {
     use super::{color_to_hex, hex_to_color, Color};
@@ -544,7 +544,7 @@ mod serde_color {
     use serde::ser;
     use std::fmt;
 
-    pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<iced_native::Color, D::Error>
+    pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<iced::Color, D::Error>
     where
         D: de::Deserializer<'de>,
     {
@@ -573,7 +573,7 @@ mod serde_color {
         deserializer.deserialize_any(ColorVisitor).map(|c| c.0)
     }
 
-    pub(crate) fn serialize<S>(color: &iced_native::Color, serializer: S) -> Result<S::Ok, S::Error>
+    pub(crate) fn serialize<S>(color: &iced::Color, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: ser::Serializer,
     {
@@ -609,10 +609,10 @@ mod tests {
     #[test]
     fn test_hex_color_ser() {
         let color = super::NormalColors {
-            primary: iced_native::Color::from_rgb(1.0, 1.0, 1.0),
-            secondary: iced_native::Color::from_rgb(0.5, 0.6, 0.75789),
-            surface: iced_native::Color::from_rgb(0.1, 0.2, 0.3),
-            error: iced_native::Color::from_rgb(0.0, 0.0, 0.0),
+            primary: iced::Color::from_rgb(1.0, 1.0, 1.0),
+            secondary: iced::Color::from_rgb(0.5, 0.6, 0.75789),
+            surface: iced::Color::from_rgb(0.1, 0.2, 0.3),
+            error: iced::Color::from_rgb(0.0, 0.0, 0.0),
         };
 
         let ser = serde_yaml::to_string(&color).unwrap();
diff --git a/crates/core/src/wallet/mod.rs b/crates/core/src/wallet/mod.rs
index f4782fa..90c8291 100644
--- a/crates/core/src/wallet/mod.rs
+++ b/crates/core/src/wallet/mod.rs
@@ -130,7 +130,7 @@ pub fn parse_abs_tx_amount_fee(tx: &TxLogEntry, subtract_fee_from_amt: bool) ->
 
 impl<L, C> WalletInterface<L, C>
 where
-    L: WalletLCProvider<'static, C, keychain::ExtKeychain>,
+    L: WalletLCProvider<'static, C, grin_keychain::keychain::ExtKeychain>,
     C: NodeClient + 'static + Clone,
 {
     pub fn new(node_client: C) -> Self {
diff --git a/crates/widgets/Cargo.toml b/crates/widgets/Cargo.toml
index faf4c0e..e179017 100644
--- a/crates/widgets/Cargo.toml
+++ b/crates/widgets/Cargo.toml
@@ -14,10 +14,10 @@ wgpu = ["iced_wgpu"]
 opengl = ["iced_glow"]
 
 [dependencies]
-iced = { version = "0.7.0", default-features = false, features = ["default"] }
-iced_native = { version = "0.8.0" }
-iced_graphics = { version = "0.6.0" }
-iced_core = { version = "0.7.0" }
-iced_wgpu = { version = "0.8.0", optional = true }
-iced_glow = { version = "0.6.0", optional = true }
-iced_style = "0.6.0"
+iced = { version = "0.10", default-features = false, features = ["default"] }
+iced_native = { version = "0.10" }
+iced_graphics = { version = "0.9" }
+iced_core = { version = "0.10" }
+iced_wgpu = { version = "0.11", optional = true }
+iced_glow = { version = "0.8", optional = true }
+iced_style = "0.9"
diff --git a/crates/widgets/src/style/table_row.rs b/crates/widgets/src/style/table_row.rs
index 726718d..466395b 100644
--- a/crates/widgets/src/style/table_row.rs
+++ b/crates/widgets/src/style/table_row.rs
@@ -1,4 +1,4 @@
-use iced_core::{Background, Color};
+use iced::{Background, Color};
 
 /// The appearance of a table row.
 #[derive(Debug, Clone, Copy, Default)]
diff --git a/crates/widgets/src/widget/header.rs b/crates/widgets/src/widget/header.rs
index da0a78a..6c8a97d 100644
--- a/crates/widgets/src/widget/header.rs
+++ b/crates/widgets/src/widget/header.rs
@@ -41,7 +41,7 @@ where
         right_margin: Option<Length>,
     ) -> Self
     where
-        <Renderer as iced_native::Renderer>::Theme: iced_style::container::StyleSheet,
+        <Renderer as iced_native::Renderer>::Theme: iced_native::widget::container::StyleSheet,
     {
         let mut names = vec![];
         let mut left = false;

From c89b47dafce1ceb78abcfe3ce2479dadff2057e1 Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Wed, 16 Aug 2023 15:08:56 +0100
Subject: [PATCH 02/11] update fixes to widgets

---
 Cargo.lock                                | 871 +++-------------------
 Cargo.toml                                |  19 +-
 crates/widgets/Cargo.toml                 |  10 +-
 crates/widgets/src/widget/header.rs       |  37 +-
 crates/widgets/src/widget/header/state.rs |   2 +-
 crates/widgets/src/widget/table_row.rs    |  34 +-
 6 files changed, 139 insertions(+), 834 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5b234ac..2a16045 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -834,15 +834,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
-[[package]]
-name = "cgl"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "chacha20"
 version = "0.8.2"
@@ -879,7 +870,7 @@ dependencies = [
  "js-sys",
  "num-traits 0.2.16",
  "serde",
- "time 0.1.45",
+ "time",
  "wasm-bindgen",
  "winapi 0.3.9",
 ]
@@ -990,7 +981,7 @@ dependencies = [
  "cocoa-foundation",
  "core-foundation 0.9.3",
  "core-graphics",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
  "objc",
 ]
@@ -1005,7 +996,7 @@ dependencies = [
  "block",
  "core-foundation 0.9.3",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
  "objc",
 ]
@@ -1041,12 +1032,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "const_panic"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
-
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -1100,7 +1085,7 @@ dependencies = [
  "bitflags 1.3.2",
  "core-foundation 0.9.3",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
 ]
 
@@ -1123,7 +1108,7 @@ checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
 dependencies = [
  "core-foundation 0.9.3",
  "core-graphics",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
 ]
 
@@ -1230,29 +1215,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "crossfont"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45"
-dependencies = [
- "cocoa",
- "core-foundation 0.9.3",
- "core-foundation-sys 0.8.4",
- "core-graphics",
- "core-text",
- "dwrote",
- "foreign-types 0.5.0",
- "freetype-rs",
- "libc",
- "log",
- "objc",
- "once_cell",
- "pkg-config",
- "servo-fontconfig",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -1372,17 +1334,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "d3d12"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
-dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.4",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "d3d12"
 version = "0.6.0"
@@ -1458,12 +1409,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "deranged"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
-
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -1605,8 +1550,6 @@ checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
 dependencies = [
  "lazy_static",
  "libc",
- "serde",
- "serde_derive",
  "winapi 0.3.9",
  "wio",
 ]
@@ -1630,7 +1573,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6368dbd2c6685fb84fc6e6a4749917ddc98905793fd06341c7e11a2504f2724"
 dependencies = [
- "heck",
+ "heck 0.3.3",
  "proc-macro2 0.4.30",
  "quote 0.6.13",
  "syn 0.15.44",
@@ -1678,38 +1621,6 @@ dependencies = [
  "winreg 0.10.1",
 ]
 
-[[package]]
-name = "encase"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9"
-dependencies = [
- "const_panic",
- "encase_derive",
- "glam 0.21.3",
- "thiserror",
-]
-
-[[package]]
-name = "encase_derive"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22"
-dependencies = [
- "encase_derive_impl",
-]
-
-[[package]]
-name = "encase_derive_impl"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf"
-dependencies = [
- "proc-macro2 1.0.66",
- "quote 1.0.32",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "encode_unicode"
 version = "1.0.0"
@@ -2016,28 +1927,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared 0.3.1",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2 1.0.66",
- "quote 1.0.32",
- "syn 2.0.28",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -2046,12 +1936,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@@ -2071,17 +1955,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "freetype-rs"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb"
-dependencies = [
- "bitflags 1.3.2",
- "freetype-sys",
- "libc",
-]
-
 [[package]]
 name = "freetype-sys"
 version = "0.13.1"
@@ -2245,15 +2118,6 @@ dependencies = [
  "thread_local",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "gcc"
 version = "0.3.55"
@@ -2393,17 +2257,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "gl_generator"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
-dependencies = [
- "khronos_api",
- "log",
- "xml-rs",
-]
-
 [[package]]
 name = "glam"
 version = "0.21.3"
@@ -2480,71 +2333,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "glutin"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713"
-dependencies = [
- "cgl",
- "cocoa",
- "core-foundation 0.9.3",
- "glutin_egl_sys",
- "glutin_gles2_sys",
- "glutin_glx_sys",
- "glutin_wgl_sys",
- "libloading 0.7.4",
- "log",
- "objc",
- "once_cell",
- "osmesa-sys",
- "parking_lot 0.12.1",
- "raw-window-handle 0.5.2",
- "wayland-client 0.29.5",
- "wayland-egl",
- "winapi 0.3.9",
- "winit 0.27.5",
-]
-
-[[package]]
-name = "glutin_egl_sys"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d"
-dependencies = [
- "gl_generator",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "glutin_gles2_sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103"
-dependencies = [
- "gl_generator",
- "objc",
-]
-
-[[package]]
-name = "glutin_glx_sys"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468"
-dependencies = [
- "gl_generator",
- "x11-dl",
-]
-
-[[package]]
-name = "glutin_wgl_sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696"
-dependencies = [
- "gl_generator",
-]
-
 [[package]]
 name = "glyph_brush"
 version = "0.7.7"
@@ -2592,7 +2380,7 @@ dependencies = [
  "cosmic-text",
  "etagere",
  "lru",
- "wgpu 0.16.3",
+ "wgpu",
 ]
 
 [[package]]
@@ -2670,11 +2458,11 @@ dependencies = [
  "fuzzy-matcher",
  "grin-gui-core",
  "grin-gui-widgets",
- "iced 0.7.0",
- "iced_aw 0.6.0 (git+https://github.com/iced-rs/iced_aw.git)",
- "iced_futures 0.5.1",
- "iced_native 0.8.0",
- "iced_style 0.6.0",
+ "iced",
+ "iced_aw",
+ "iced_futures 0.7.0",
+ "iced_native",
+ "iced_style 0.9.0",
  "image 0.23.14",
  "isahc 0.9.14",
  "isolang",
@@ -2731,15 +2519,15 @@ dependencies = [
  "grin_wallet_impls",
  "grin_wallet_libwallet",
  "grin_wallet_util",
- "iced 0.10.0",
- "iced_aw 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iced",
+ "iced_aw",
  "iced_core 0.10.0",
  "iced_futures 0.7.0",
- "iced_glow 0.8.0",
+ "iced_glow",
  "iced_graphics 0.9.0",
- "iced_native 0.10.3",
+ "iced_native",
  "iced_style 0.9.0",
- "iced_wgpu 0.11.1",
+ "iced_wgpu",
  "isahc 1.7.2",
  "lazy_static",
  "log",
@@ -2766,13 +2554,11 @@ dependencies = [
 name = "grin-gui-widgets"
 version = "0.1.0"
 dependencies = [
- "iced 0.10.0",
+ "iced",
  "iced_core 0.10.0",
- "iced_glow 0.8.0",
  "iced_graphics 0.9.0",
- "iced_native 0.10.3",
  "iced_style 0.9.0",
- "iced_wgpu 0.11.1",
+ "iced_wgpu",
 ]
 
 [[package]]
@@ -3332,6 +3118,12 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -3659,23 +3451,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "iced"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df71e87f8211b57a439d0764131d2c421a9195036dd4b6608033b05f2f16c196"
-dependencies = [
- "iced_core 0.7.0",
- "iced_futures 0.5.1",
- "iced_glow 0.6.0",
- "iced_glutin",
- "iced_graphics 0.6.0",
- "iced_native 0.8.0",
- "iced_wgpu 0.8.0",
- "iced_winit 0.7.0",
- "thiserror",
-]
-
 [[package]]
 name = "iced"
 version = "0.10.0"
@@ -3686,7 +3461,7 @@ dependencies = [
  "iced_futures 0.7.0",
  "iced_renderer",
  "iced_widget",
- "iced_winit 0.10.0",
+ "iced_winit",
  "thiserror",
 ]
 
@@ -3699,29 +3474,6 @@ dependencies = [
  "iced_widget",
 ]
 
-[[package]]
-name = "iced_aw"
-version = "0.6.0"
-source = "git+https://github.com/iced-rs/iced_aw.git#d2c04418bb35b5534f07381179aa657026c65a81"
-dependencies = [
- "chrono",
- "iced_widget",
- "num-traits 0.2.16",
- "once_cell",
- "time 0.3.25",
-]
-
-[[package]]
-name = "iced_core"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ade666613eb8b621971a59cfae9e11ec051f32afc5ed4d8e8915d5abfaf2cee"
-dependencies = [
- "bitflags 1.3.2",
- "instant",
- "palette 0.6.1",
-]
-
 [[package]]
 name = "iced_core"
 version = "0.9.0"
@@ -3747,20 +3499,6 @@ dependencies = [
  "twox-hash",
 ]
 
-[[package]]
-name = "iced_futures"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc3a9fd79b857228dde2a3e923a04ade4095abeda33248c6230e8c909749366"
-dependencies = [
- "async-std",
- "futures 0.3.28",
- "log",
- "tokio 1.31.0",
- "wasm-bindgen-futures",
- "wasm-timer",
-]
-
 [[package]]
 name = "iced_futures"
 version = "0.6.0"
@@ -3783,26 +3521,11 @@ dependencies = [
  "futures 0.3.28",
  "iced_core 0.10.0",
  "log",
+ "tokio 1.31.0",
  "wasm-bindgen-futures",
  "wasm-timer",
 ]
 
-[[package]]
-name = "iced_glow"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95755f62fec2ec2c8f8bc2c0be5072b1d0dfed8db250686059ddcce5da530acf"
-dependencies = [
- "bytemuck",
- "euclid",
- "glow 0.11.2",
- "glow_glyph",
- "glyph_brush",
- "iced_graphics 0.6.0",
- "iced_native 0.8.0",
- "log",
-]
-
 [[package]]
 name = "iced_glow"
 version = "0.8.0"
@@ -3815,41 +3538,10 @@ dependencies = [
  "glow_glyph",
  "glyph_brush",
  "iced_graphics 0.8.0",
- "iced_native 0.10.3",
- "log",
-]
-
-[[package]]
-name = "iced_glutin"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd8dd58586541b300b280b6fe8605add7a90283dfb8e622adc96cc545f5fa61"
-dependencies = [
- "glutin",
- "iced_graphics 0.6.0",
- "iced_native 0.8.0",
- "iced_winit 0.7.0",
+ "iced_native",
  "log",
 ]
 
-[[package]]
-name = "iced_graphics"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54177b85fdae36a8a1a4f052a5c65c5006565dc27f1feead13eeeed10fd0975a"
-dependencies = [
- "bitflags 1.3.2",
- "bytemuck",
- "font-kit",
- "glam 0.21.3",
- "iced_native 0.8.0",
- "iced_style 0.6.0",
- "log",
- "lyon",
- "raw-window-handle 0.5.2",
- "thiserror",
-]
-
 [[package]]
 name = "iced_graphics"
 version = "0.8.0"
@@ -3859,7 +3551,7 @@ dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
  "glam 0.21.3",
- "iced_native 0.10.3",
+ "iced_native",
  "iced_style 0.8.0",
  "log",
  "raw-window-handle 0.5.2",
@@ -3883,20 +3575,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "iced_native"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d57c8e8672e90c55d4f9f55511b03e5a74af9d296be9693e9c07cd9eed4563"
-dependencies = [
- "iced_core 0.7.0",
- "iced_futures 0.5.1",
- "iced_style 0.6.0",
- "num-traits 0.2.16",
- "twox-hash",
- "unicode-segmentation",
-]
-
 [[package]]
 name = "iced_native"
 version = "0.10.3"
@@ -3920,7 +3598,7 @@ checksum = "1033385b0db0099a0d13178c9ff93c1ce11e7d0177522acf578bf79febdb2af8"
 dependencies = [
  "iced_graphics 0.9.0",
  "iced_tiny_skia",
- "iced_wgpu 0.11.1",
+ "iced_wgpu",
  "log",
  "raw-window-handle 0.5.2",
  "thiserror",
@@ -3937,17 +3615,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "iced_style"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b992f5e1828c61af3661fc0e7bf141ef5284007a41fa6667c5e79d047a03daf4"
-dependencies = [
- "iced_core 0.7.0",
- "once_cell",
- "palette 0.6.1",
-]
-
 [[package]]
 name = "iced_style"
 version = "0.8.0"
@@ -3988,27 +3655,6 @@ dependencies = [
  "twox-hash",
 ]
 
-[[package]]
-name = "iced_wgpu"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4bb296363d1b18d4f57e1c69bb19591405e61d47764e43078bba31c6689fca5"
-dependencies = [
- "bitflags 1.3.2",
- "bytemuck",
- "encase",
- "futures 0.3.28",
- "glam 0.21.3",
- "glyph_brush",
- "guillotiere",
- "iced_graphics 0.6.0",
- "iced_native 0.8.0",
- "log",
- "raw-window-handle 0.5.2",
- "wgpu 0.14.2",
- "wgpu_glyph",
-]
-
 [[package]]
 name = "iced_wgpu"
 version = "0.11.1"
@@ -4028,7 +3674,7 @@ dependencies = [
  "raw-window-handle 0.5.2",
  "rustc-hash",
  "twox-hash",
- "wgpu 0.16.3",
+ "wgpu",
 ]
 
 [[package]]
@@ -4041,27 +3687,11 @@ dependencies = [
  "iced_runtime",
  "iced_style 0.9.0",
  "num-traits 0.2.16",
+ "ouroboros",
  "thiserror",
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "iced_winit"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d528f882781c5594cb3d2416fe18787b4364e0cdd39f03d077ccc0becac1f9bd"
-dependencies = [
- "iced_futures 0.5.1",
- "iced_graphics 0.6.0",
- "iced_native 0.8.0",
- "log",
- "thiserror",
- "web-sys",
- "winapi 0.3.9",
- "window_clipboard 0.2.4",
- "winit 0.27.5",
-]
-
 [[package]]
 name = "iced_winit"
 version = "0.10.0"
@@ -4076,8 +3706,8 @@ dependencies = [
  "thiserror",
  "web-sys",
  "winapi 0.3.9",
- "window_clipboard 0.3.0",
- "winit 0.28.6",
+ "window_clipboard",
+ "winit",
 ]
 
 [[package]]
@@ -4398,12 +4028,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "khronos_api"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
-
 [[package]]
 name = "kurbo"
 version = "0.9.5"
@@ -4770,7 +4394,7 @@ dependencies = [
  "bitflags 1.3.2",
  "block",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types",
  "log",
  "objc",
 ]
@@ -4917,26 +4541,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "naga"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bb1a241901d94de4725d638a5295187b046ceb89ed8b2be368038654d9c81d"
-dependencies = [
- "bit-set",
- "bitflags 1.3.2",
- "codespan-reporting",
- "hexf-parse",
- "indexmap 1.9.3",
- "log",
- "num-traits 0.2.16",
- "rustc-hash",
- "spirv",
- "termcolor",
- "thiserror",
- "unicode-xid 0.2.4",
-]
-
 [[package]]
 name = "naga"
 version = "0.12.3"
@@ -5030,39 +4634,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-glue"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
-dependencies = [
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-macro",
- "ndk-sys",
- "once_cell",
- "parking_lot 0.12.1",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
+name = "ndk-context"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling",
- "proc-macro-crate",
- "proc-macro2 1.0.66",
- "quote 1.0.32",
- "syn 1.0.109",
-]
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
 [[package]]
 name = "ndk-sys"
@@ -5354,15 +4929,6 @@ dependencies = [
  "syn 2.0.28",
 ]
 
-[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -5488,7 +5054,7 @@ checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -5552,12 +5118,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "osmesa-sys"
-version = "0.1.2"
+name = "ouroboros"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
+checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
 dependencies = [
- "shared_library",
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -5965,12 +5546,13 @@ dependencies = [
 
 [[package]]
 name = "plotters-iced"
-version = "0.6.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ae63a3ff1c23d2f3c9f67bb940494d64efd4e0ece410fe9ff01d8584b11ac6b"
+checksum = "b533be9c5ba7d80b7fd619fd5226c58bcae53db2c24b447fa82be25865c117e6"
 dependencies = [
- "iced_graphics 0.6.0",
- "iced_native 0.8.0",
+ "iced_graphics 0.9.0",
+ "iced_widget",
+ "once_cell",
  "plotters",
  "plotters-backend",
 ]
@@ -6486,12 +6068,6 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
-[[package]]
-name = "renderdoc-sys"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
-
 [[package]]
 name = "renderdoc-sys"
 version = "1.0.0"
@@ -6838,15 +6414,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
-[[package]]
-name = "safe_arch"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "safemem"
 version = "0.3.3"
@@ -6920,18 +6487,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "sctk-adwaita"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339"
-dependencies = [
- "crossfont",
- "log",
- "smithay-client-toolkit",
- "tiny-skia 0.7.0",
-]
-
 [[package]]
 name = "sctk-adwaita"
 version = "0.5.4"
@@ -7231,16 +6786,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "shared_library"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
-dependencies = [
- "lazy_static",
- "libc",
-]
-
 [[package]]
 name = "shlex"
 version = "0.1.1"
@@ -7405,7 +6950,7 @@ dependencies = [
  "cocoa",
  "core-graphics",
  "fastrand 1.9.0",
- "foreign-types 0.3.2",
+ "foreign-types",
  "log",
  "nix 0.26.2",
  "objc",
@@ -7500,7 +7045,7 @@ version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
- "heck",
+ "heck 0.3.3",
  "proc-macro-error",
  "proc-macro2 1.0.66",
  "quote 1.0.32",
@@ -7525,7 +7070,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
 dependencies = [
- "heck",
+ "heck 0.3.3",
  "proc-macro2 1.0.66",
  "quote 1.0.32",
  "syn 1.0.109",
@@ -7537,7 +7082,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
 dependencies = [
- "heck",
+ "heck 0.3.3",
  "proc-macro2 1.0.66",
  "quote 1.0.32",
  "syn 1.0.109",
@@ -7637,7 +7182,7 @@ checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
 dependencies = [
  "anyhow",
  "cfg-expr",
- "heck",
+ "heck 0.3.3",
  "itertools",
  "pkg-config",
  "strum 0.21.0",
@@ -7786,25 +7331,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "time"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
-dependencies = [
- "deranged",
- "libc",
- "num_threads",
- "serde",
- "time-core",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
-
 [[package]]
 name = "timeago"
 version = "0.2.2"
@@ -7824,21 +7350,6 @@ dependencies = [
  "chrono",
 ]
 
-[[package]]
-name = "tiny-skia"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "bytemuck",
- "cfg-if 1.0.0",
- "png 0.17.9",
- "safe_arch",
- "tiny-skia-path 0.7.0",
-]
-
 [[package]]
 name = "tiny-skia"
 version = "0.8.4"
@@ -7868,16 +7379,6 @@ dependencies = [
  "tiny-skia-path 0.10.0",
 ]
 
-[[package]]
-name = "tiny-skia-path"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c"
-dependencies = [
- "arrayref",
- "bytemuck",
-]
-
 [[package]]
 name = "tiny-skia-path"
 version = "0.8.4"
@@ -8638,16 +8139,6 @@ dependencies = [
  "xcursor",
 ]
 
-[[package]]
-name = "wayland-egl"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d"
-dependencies = [
- "wayland-client 0.29.5",
- "wayland-sys 0.29.5",
-]
-
 [[package]]
 name = "wayland-protocols"
 version = "0.29.5"
@@ -8750,28 +8241,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "wgpu"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937"
-dependencies = [
- "arrayvec 0.7.4",
- "js-sys",
- "log",
- "naga 0.10.1",
- "parking_lot 0.12.1",
- "raw-window-handle 0.5.2",
- "smallvec",
- "static_assertions",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core 0.14.2",
- "wgpu-hal 0.14.1",
- "wgpu-types 0.14.1",
-]
-
 [[package]]
 name = "wgpu"
 version = "0.16.3"
@@ -8782,7 +8251,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
  "log",
- "naga 0.12.3",
+ "naga",
  "parking_lot 0.12.1",
  "profiling",
  "raw-window-handle 0.5.2",
@@ -8791,33 +8260,9 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu-core 0.16.1",
- "wgpu-hal 0.16.2",
- "wgpu-types 0.16.1",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca"
-dependencies = [
- "arrayvec 0.7.4",
- "bit-vec",
- "bitflags 1.3.2",
- "cfg_aliases",
- "codespan-reporting",
- "fxhash",
- "log",
- "naga 0.10.1",
- "parking_lot 0.12.1",
- "profiling",
- "raw-window-handle 0.5.2",
- "smallvec",
- "thiserror",
- "web-sys",
- "wgpu-hal 0.14.1",
- "wgpu-types 0.14.1",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -8831,7 +8276,7 @@ dependencies = [
  "bitflags 2.4.0",
  "codespan-reporting",
  "log",
- "naga 0.12.3",
+ "naga",
  "parking_lot 0.12.1",
  "profiling",
  "raw-window-handle 0.5.2",
@@ -8839,47 +8284,8 @@ dependencies = [
  "smallvec",
  "thiserror",
  "web-sys",
- "wgpu-hal 0.16.2",
- "wgpu-types 0.16.1",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f"
-dependencies = [
- "android_system_properties",
- "arrayvec 0.7.4",
- "ash",
- "bit-set",
- "bitflags 1.3.2",
- "block",
- "core-graphics-types",
- "d3d12 0.5.0",
- "foreign-types 0.3.2",
- "fxhash",
- "glow 0.11.2",
- "gpu-alloc",
- "gpu-descriptor",
- "js-sys",
- "khronos-egl",
- "libloading 0.7.4",
- "log",
- "metal",
- "naga 0.10.1",
- "objc",
- "parking_lot 0.12.1",
- "profiling",
- "range-alloc",
- "raw-window-handle 0.5.2",
- "renderdoc-sys 0.7.1",
- "smallvec",
- "thiserror",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types 0.14.1",
- "winapi 0.3.9",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -8895,8 +8301,8 @@ dependencies = [
  "bitflags 2.4.0",
  "block",
  "core-graphics-types",
- "d3d12 0.6.0",
- "foreign-types 0.3.2",
+ "d3d12",
+ "foreign-types",
  "glow 0.12.3",
  "gpu-alloc",
  "gpu-allocator",
@@ -8908,31 +8314,22 @@ dependencies = [
  "libloading 0.8.0",
  "log",
  "metal",
- "naga 0.12.3",
+ "naga",
  "objc",
  "parking_lot 0.12.1",
  "profiling",
  "range-alloc",
  "raw-window-handle 0.5.2",
- "renderdoc-sys 1.0.0",
+ "renderdoc-sys",
  "rustc-hash",
  "smallvec",
  "thiserror",
  "wasm-bindgen",
  "web-sys",
- "wgpu-types 0.16.1",
+ "wgpu-types",
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "wgpu-types"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "wgpu-types"
 version = "0.16.1"
@@ -8944,18 +8341,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wgpu_glyph"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cafb82773e0f124a33674dab5de4dff73175aeb921949047ab014efb58fb446"
-dependencies = [
- "bytemuck",
- "glyph_brush",
- "log",
- "wgpu 0.14.2",
-]
-
 [[package]]
 name = "which"
 version = "3.1.1"
@@ -9034,20 +8419,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "window_clipboard"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d"
-dependencies = [
- "clipboard-win",
- "clipboard_macos",
- "clipboard_wayland",
- "clipboard_x11",
- "raw-window-handle 0.3.4",
- "thiserror",
-]
-
 [[package]]
 name = "window_clipboard"
 version = "0.3.0"
@@ -9080,19 +8451,6 @@ dependencies = [
  "windows-targets 0.48.2",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -9153,12 +8511,6 @@ version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -9171,12 +8523,6 @@ version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -9189,12 +8535,6 @@ version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -9207,12 +8547,6 @@ version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -9237,12 +8571,6 @@ version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -9255,39 +8583,6 @@ version = "0.48.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9"
 
-[[package]]
-name = "winit"
-version = "0.27.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
-dependencies = [
- "bitflags 1.3.2",
- "cocoa",
- "core-foundation 0.9.3",
- "core-graphics",
- "dispatch",
- "instant",
- "libc",
- "log",
- "mio 0.8.8",
- "ndk",
- "ndk-glue",
- "objc",
- "once_cell",
- "parking_lot 0.12.1",
- "percent-encoding",
- "raw-window-handle 0.4.3",
- "raw-window-handle 0.5.2",
- "sctk-adwaita 0.4.3",
- "smithay-client-toolkit",
- "wasm-bindgen",
- "wayland-client 0.29.5",
- "wayland-protocols",
- "web-sys",
- "windows-sys 0.36.1",
- "x11-dl",
-]
-
 [[package]]
 name = "winit"
 version = "0.28.6"
@@ -9311,7 +8606,7 @@ dependencies = [
  "percent-encoding",
  "raw-window-handle 0.5.2",
  "redox_syscall 0.3.5",
- "sctk-adwaita 0.5.4",
+ "sctk-adwaita",
  "smithay-client-toolkit",
  "wasm-bindgen",
  "wayland-client 0.29.5",
@@ -9527,7 +8822,7 @@ dependencies = [
  "crc32fast",
  "flate2",
  "thiserror",
- "time 0.1.45",
+ "time",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index c894f97..34b1bc6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-default = ["opengl"]
-wgpu = [ "iced/wgpu", "iced/default_system_font"]
-opengl = [ "iced/glow"]
+#default = ["opengl"]
+wgpu = [ "iced/wgpu" ]
+#opengl = [ "iced/glow"]
 no-self-update = ["grin-gui-core/no-self-update"]
 debug = ["iced/debug"]
 
@@ -14,12 +14,13 @@ debug = ["iced/debug"]
 grin-gui-core = { version = "0.1.0", path = "crates/core", features=['gui'] }
 grin-gui-widgets = { version = "0.1.0", path = "crates/widgets" }
 
-iced = { version = "0.7.0", features = ["canvas", "tokio", "default_system_font"] }
-iced_futures = { version = "0.5", features = ["async-std"] }
-iced_style = {version = "0.6.0"}
-iced_native = { version = "0.8.0" }
-iced_aw = { git = "https://github.com/iced-rs/iced_aw.git" }
-plotters-iced = "0.6.0"
+iced = { version = "0.10", features = ["canvas", "tokio"]  }
+iced_futures = { version = "0.7", features = ["async-std"] }
+iced_style = {version = "0.9"}
+iced_native = { version = "0.10" }
+iced_aw = { version = "0.6", default-features = false, features = ["card", "modal"]}
+
+plotters-iced = "0.9.0"
 plotters="0.3"
 plotters-backend = "0.3"
 rand = "0.8.3"
diff --git a/crates/widgets/Cargo.toml b/crates/widgets/Cargo.toml
index e179017..15ed24f 100644
--- a/crates/widgets/Cargo.toml
+++ b/crates/widgets/Cargo.toml
@@ -9,15 +9,15 @@ repository = "https://github.com/mimblewimble/grin-gui"
 edition = "2018"
 
 [features]
-default = ["opengl"]
+#default = ["opengl"]
 wgpu = ["iced_wgpu"]
-opengl = ["iced_glow"]
+#opengl = ["iced_glow"]
 
 [dependencies]
-iced = { version = "0.10", default-features = false, features = ["default"] }
-iced_native = { version = "0.10" }
+iced = { version = "0.10", features = ["advanced", "lazy", "tokio"] }
+#iced_native = { version = "0.10" }
 iced_graphics = { version = "0.9" }
 iced_core = { version = "0.10" }
 iced_wgpu = { version = "0.11", optional = true }
-iced_glow = { version = "0.8", optional = true }
+#iced_glow = { version = "0.8", optional = true }
 iced_style = "0.9"
diff --git a/crates/widgets/src/widget/header.rs b/crates/widgets/src/widget/header.rs
index 6c8a97d..21b7ffa 100644
--- a/crates/widgets/src/widget/header.rs
+++ b/crates/widgets/src/widget/header.rs
@@ -1,17 +1,19 @@
 #![allow(clippy::type_complexity)]
 use crate::style::header::StyleSheet;
-use iced_native::{
+use iced_core::{
     event, layout, mouse,
-    widget::{self, space::Space, Container, Tree},
-    Alignment, Clipboard, Element, Event, Layout, Length, Padding, Point, Rectangle, Shell, Widget,
+    widget::{self, Tree},
+    Alignment, Clipboard, Element, Event, Layout, Length, Padding, Rectangle, Shell, Widget,
 };
 
+use iced::widget::{space::Space, Container};
+
 mod state;
 pub use state::State;
 
 pub struct Header<'a, Message, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
+    Renderer: 'a + iced_core::Renderer,
     Renderer::Theme: StyleSheet,
     Message: 'a,
 {
@@ -30,7 +32,7 @@ where
 
 impl<'a, Message, Renderer> Header<'a, Message, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
+    Renderer: 'a + iced_core::Renderer,
     Renderer::Theme: StyleSheet,
     Message: 'a,
 {
@@ -41,7 +43,7 @@ where
         right_margin: Option<Length>,
     ) -> Self
     where
-        <Renderer as iced_native::Renderer>::Theme: iced_native::widget::container::StyleSheet,
+        <Renderer as iced_core::Renderer>::Theme: iced::widget::container::StyleSheet,
     {
         let mut names = vec![];
         let mut left = false;
@@ -133,7 +135,7 @@ where
 
 impl<'a, Message, Renderer> Widget<Message, Renderer> for Header<'a, Message, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
+    Renderer: 'a + iced_core::Renderer,
     Renderer::Theme: StyleSheet,
     Message: 'a,
 {
@@ -172,11 +174,13 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
+        viewport: &Rectangle,
     ) -> event::Status {
+        let cursor_position = cursor.position().unwrap_or_default();
         let in_bounds = layout.bounds().contains(cursor_position);
 
         if self.state.resizing || in_bounds {
@@ -284,10 +288,11 @@ where
                     state,
                     event.clone(),
                     layout,
-                    cursor_position,
+                    cursor,
                     renderer,
                     clipboard,
                     shell,
+                    viewport
                 )
             })
             .fold(event::Status::Ignored, event::Status::merge)
@@ -298,12 +303,11 @@ where
         tree: &Tree,
         renderer: &mut Renderer,
         theme: &Renderer::Theme,
-        style: &iced_native::renderer::Style,
+        style: &iced_core::renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
-
         for ((child, state), layout) in self
             .children
             .iter()
@@ -316,7 +320,7 @@ where
                 theme,
                 style,
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
             );
         }
@@ -326,11 +330,12 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         let bounds = layout.bounds();
+        let cursor_position = cursor.position().unwrap_or_default();
         let is_mouse_over = bounds.contains(cursor_position);
 
         if is_mouse_over {
@@ -361,8 +366,8 @@ where
 
 impl<'a, Message, Renderer> From<Header<'a, Message, Renderer>> for Element<'a, Message, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
-    Renderer::Theme: StyleSheet + widget::container::StyleSheet + widget::text::StyleSheet,
+    Renderer: 'a + iced_core::Renderer,
+    Renderer::Theme: StyleSheet + iced::widget::container::StyleSheet + widget::text::StyleSheet,
     Message: 'a,
 {
     fn from(header: Header<'a, Message, Renderer>) -> Element<'a, Message, Renderer> {
diff --git a/crates/widgets/src/widget/header/state.rs b/crates/widgets/src/widget/header/state.rs
index cdfe0a0..c3ea9a3 100644
--- a/crates/widgets/src/widget/header/state.rs
+++ b/crates/widgets/src/widget/header/state.rs
@@ -1,4 +1,4 @@
-use iced_native::Point;
+use iced_core::Point;
 
 #[derive(Clone, Debug, Default)]
 pub struct State {
diff --git a/crates/widgets/src/widget/table_row.rs b/crates/widgets/src/widget/table_row.rs
index 3bc4b79..6b466d6 100644
--- a/crates/widgets/src/widget/table_row.rs
+++ b/crates/widgets/src/widget/table_row.rs
@@ -1,7 +1,6 @@
 #![allow(clippy::type_complexity)]
 use crate::style::table_row::StyleSheet;
-use iced::{Background, Color};
-use iced_native::{
+use iced_core::{
     event, layout, mouse, overlay, renderer, widget, widget::Tree, Alignment, Clipboard, Element,
     Event, Layout, Length, Padding, Point, Rectangle, Shell, Widget,
 };
@@ -9,7 +8,7 @@ use iced_native::{
 #[allow(missing_debug_implementations)]
 pub struct TableRow<'a, Message, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
+    Renderer: 'a + iced_core::Renderer,
     Renderer::Theme: StyleSheet,
     Message: 'a,
 {
@@ -28,7 +27,7 @@ where
 
 impl<'a, Message, Renderer> TableRow<'a, Message, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
+    Renderer: 'a + iced_core::Renderer,
     Renderer::Theme: StyleSheet,
     Message: 'a,
 {
@@ -129,7 +128,7 @@ where
 
 impl<'a, Message, Renderer> Widget<Message, Renderer> for TableRow<'a, Message, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
+    Renderer: 'a + iced_core::Renderer,
     Renderer::Theme: StyleSheet,
     Message: 'a,
 {
@@ -168,9 +167,10 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
+        let cursor_position = cursor.position().unwrap_or_default();
         let bounds = layout.bounds();
         let mut custom_bounds = layout.bounds();
         let tree = Tree::new(&self.content);
@@ -189,7 +189,7 @@ where
             theme.appearance(&self.style)
         };
 
-        let background = iced_native::renderer::Quad {
+        let background = iced_core::renderer::Quad {
             bounds: Rectangle {
                 x: bounds.x + appearance.offset_left as f32,
                 y: bounds.y,
@@ -204,8 +204,8 @@ where
         renderer.fill_quad(
             background.into(),
             appearance
-                .background
-                .unwrap_or(Background::Color(Color::TRANSPARENT)),
+                .background.unwrap()
+                //.unwrap_or(Background::Color(Color::TRANSPARENT)),
         );
 
         self.content.as_widget().draw(
@@ -214,7 +214,7 @@ where
             theme,
             style,
             content_layout,
-            cursor_position,
+            cursor,
             viewport,
         );
     }
@@ -223,10 +223,11 @@ where
         &self,
         _tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
+        let cursor_position = cursor.position().unwrap_or_default();
         let bounds = layout.bounds();
         let is_mouse_over = bounds.contains(cursor_position);
 
@@ -273,20 +274,23 @@ where
         _tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
+        viewport: &Rectangle,
     ) -> event::Status {
+        let cursor_position = cursor.position().unwrap_or_default();
         let mut tree = Tree::new(&self.content);
         let status_from_content = self.content.as_widget_mut().on_event(
             &mut tree,
             event.clone(),
             layout.children().next().unwrap(),
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             shell,
+            viewport,
         );
         match status_from_content {
             event::Status::Ignored => {
@@ -325,8 +329,8 @@ where
 
 impl<'a, Message, Renderer> From<TableRow<'a, Message, Renderer>> for Element<'a, Message, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
-    Renderer::Theme: StyleSheet + widget::container::StyleSheet + widget::text::StyleSheet,
+    Renderer: 'a + iced_core::Renderer,
+    Renderer::Theme: StyleSheet + iced::widget::container::StyleSheet + widget::text::StyleSheet,
     Message: 'a,
 {
     fn from(table_row: TableRow<'a, Message, Renderer>) -> Element<'a, Message, Renderer> {

From 8c0805c37bb22c19af4a6c8948b323d030d9364a Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Wed, 16 Aug 2023 15:42:09 +0100
Subject: [PATCH 03/11] updated all dependencies/code in crates/core and
 crates/widgets

---
 Cargo.lock                          | 139 +++-------------------------
 Cargo.toml                          |   2 +-
 crates/core/Cargo.toml              |  13 ++-
 crates/core/src/node/subscriber.rs  |  10 +-
 crates/core/src/theme/checkbox.rs   |   8 +-
 crates/core/src/theme/container.rs  |   6 +-
 crates/core/src/theme/mod.rs        |   5 +-
 crates/core/src/theme/picklist.rs   |   4 +-
 crates/core/src/theme/scrollable.rs |  12 +--
 crates/core/src/theme/text_input.rs |  20 +++-
 10 files changed, 60 insertions(+), 159 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2a16045..84f7aa4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2257,12 +2257,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "glam"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815"
-
 [[package]]
 name = "glam"
 version = "0.24.1"
@@ -2297,18 +2291,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "glow"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "glow"
 version = "0.12.3"
@@ -2321,56 +2303,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "glow_glyph"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4e62c64947b9a24fe20e2bba9ad819ecb506ef5c8df7ffc4737464c6df9510"
-dependencies = [
- "bytemuck",
- "glow 0.11.2",
- "glyph_brush",
- "log",
-]
-
-[[package]]
-name = "glyph_brush"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d"
-dependencies = [
- "glyph_brush_draw_cache",
- "glyph_brush_layout",
- "ordered-float 3.7.0",
- "rustc-hash",
- "twox-hash",
-]
-
-[[package]]
-name = "glyph_brush_draw_cache"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610"
-dependencies = [
- "ab_glyph",
- "crossbeam-channel",
- "crossbeam-deque",
- "linked-hash-map",
- "rayon",
- "rustc-hash",
-]
-
-[[package]]
-name = "glyph_brush_layout"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38"
-dependencies = [
- "ab_glyph",
- "approx",
- "xi-unicode",
-]
-
 [[package]]
 name = "glyphon"
 version = "0.3.0"
@@ -2523,9 +2455,7 @@ dependencies = [
  "iced_aw",
  "iced_core 0.10.0",
  "iced_futures 0.7.0",
- "iced_glow",
- "iced_graphics 0.9.0",
- "iced_native",
+ "iced_graphics",
  "iced_style 0.9.0",
  "iced_wgpu",
  "isahc 1.7.2",
@@ -2556,7 +2486,7 @@ version = "0.1.0"
 dependencies = [
  "iced",
  "iced_core 0.10.0",
- "iced_graphics 0.9.0",
+ "iced_graphics",
  "iced_style 0.9.0",
  "iced_wgpu",
 ]
@@ -3526,38 +3456,6 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "iced_glow"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc5b081015f5c75777c96ad75e2288916e7d444c97396d6d136517877ef9129"
-dependencies = [
- "bytemuck",
- "euclid",
- "glow 0.11.2",
- "glow_glyph",
- "glyph_brush",
- "iced_graphics 0.8.0",
- "iced_native",
- "log",
-]
-
-[[package]]
-name = "iced_graphics"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338a6aff7db906537074ad0fe8b720cfdb9512cdfea43c628c76bd1cf50fdcc0"
-dependencies = [
- "bitflags 1.3.2",
- "bytemuck",
- "glam 0.21.3",
- "iced_native",
- "iced_style 0.8.0",
- "log",
- "raw-window-handle 0.5.2",
- "thiserror",
-]
-
 [[package]]
 name = "iced_graphics"
 version = "0.9.0"
@@ -3566,7 +3464,7 @@ checksum = "67ff14447a221e9e9205a13d84d7bbdf0636a3b1daa02cfca690ed09689c4d2b"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
- "glam 0.24.1",
+ "glam",
  "half",
  "iced_core 0.10.0",
  "log",
@@ -3596,7 +3494,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1033385b0db0099a0d13178c9ff93c1ce11e7d0177522acf578bf79febdb2af8"
 dependencies = [
- "iced_graphics 0.9.0",
+ "iced_graphics",
  "iced_tiny_skia",
  "iced_wgpu",
  "log",
@@ -3645,7 +3543,7 @@ checksum = "c7715f6222c9470bbbd75a39f70478fa0d1bdfb81a377a34fd1b090ffccc480b"
 dependencies = [
  "bytemuck",
  "cosmic-text",
- "iced_graphics 0.9.0",
+ "iced_graphics",
  "kurbo",
  "log",
  "raw-window-handle 0.5.2",
@@ -3664,10 +3562,10 @@ dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
  "futures 0.3.28",
- "glam 0.24.1",
+ "glam",
  "glyphon",
  "guillotiere",
- "iced_graphics 0.9.0",
+ "iced_graphics",
  "log",
  "lyon",
  "once_cell",
@@ -3698,7 +3596,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ecea26fcc8074373f6011d2193d63445617d900a428eb4df66c0e5658408fb6"
 dependencies = [
- "iced_graphics 0.9.0",
+ "iced_graphics",
  "iced_runtime",
  "iced_style 0.9.0",
  "log",
@@ -5108,15 +5006,6 @@ dependencies = [
  "num-traits 0.2.16",
 ]
 
-[[package]]
-name = "ordered-float"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213"
-dependencies = [
- "num-traits 0.2.16",
-]
-
 [[package]]
 name = "ouroboros"
 version = "0.17.2"
@@ -5550,7 +5439,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b533be9c5ba7d80b7fd619fd5226c58bcae53db2c24b447fa82be25865c117e6"
 dependencies = [
- "iced_graphics 0.9.0",
+ "iced_graphics",
  "iced_widget",
  "once_cell",
  "plotters",
@@ -6634,7 +6523,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a65a7291a8a568adcae4c10a677ebcedbc6c9cec91c054dee2ce40b0e3290eb"
 dependencies = [
- "ordered-float 1.1.1",
+ "ordered-float",
  "serde",
 ]
 
@@ -8303,7 +8192,7 @@ dependencies = [
  "core-graphics-types",
  "d3d12",
  "foreign-types",
- "glow 0.12.3",
+ "glow",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
@@ -8752,12 +8641,6 @@ dependencies = [
  "nom 7.1.3",
 ]
 
-[[package]]
-name = "xi-unicode"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
-
 [[package]]
 name = "xml-rs"
 version = "0.8.16"
diff --git a/Cargo.toml b/Cargo.toml
index 34b1bc6..fe02131 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ no-self-update = ["grin-gui-core/no-self-update"]
 debug = ["iced/debug"]
 
 [dependencies]
-grin-gui-core = { version = "0.1.0", path = "crates/core", features=['gui'] }
+grin-gui-core = { version = "0.1.0", path = "crates/core", features = ["gui"]}
 grin-gui-widgets = { version = "0.1.0", path = "crates/widgets" }
 
 iced = { version = "0.10", features = ["canvas", "tokio"]  }
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index 407c153..1249ecf 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -10,11 +10,11 @@ edition = "2018"
 build = "src/build/build.rs"
 
 [features]
-default = ["opengl", "gui"]
-gui = ['iced_native']
+default = ["gui"]
+gui = ['default']
 no-self-update = []
 wgpu = ["iced_wgpu"]
-opengl = ["iced_glow"]
+#opengl = ["iced_core"]
 
 [build-dependencies]
 built = { version = "0.4", features = ["git2"] }
@@ -92,16 +92,15 @@ log4rs = { version = "0.12", features = [
 backtrace = "0.3"
 lazy_static = "1"
 
-iced = { version = "0.10", default-features = false, features = ["default"] }
+iced = { version = "0.10", features = ["advanced", "tokio"] }
 iced_futures = { version = "0.7", features = ["async-std"] }
 iced_core = { version = "0.10" }
 iced_style = "0.9"
 iced_graphics = { version = "0.9" }
-iced_native = { version = "0.10", optional = true }
+#iced_native = { version = "0.10", optional = true }
 iced_aw = { version = "0.6", default-features = false, features = ["card", "modal"]}
-
 iced_wgpu = { version = "0.11", optional = true }
-iced_glow = { version = "0.8", optional = true }
+#iced_glow = { version = "0.8", optional = true }
 
 [dev-dependencies]
 tempfile = "3.2.0"
diff --git a/crates/core/src/node/subscriber.rs b/crates/core/src/node/subscriber.rs
index c546938..f7a8bf7 100644
--- a/crates/core/src/node/subscriber.rs
+++ b/crates/core/src/node/subscriber.rs
@@ -1,7 +1,8 @@
 use iced_futures::{
     self,
-    futures::{channel::mpsc, stream::StreamExt},
+    futures::{channel::mpsc, stream::StreamExt}, subscription,
 };
+use iced_core::Hasher;
 use std::hash::Hash;
 
 pub use grin_servers::ServerStats;
@@ -30,14 +31,13 @@ pub struct NodeSubscriber<I> {
     id: I,
 }
 
-impl<H, I, T> iced_native::subscription::Recipe<H, I> for NodeSubscriber<T>
+impl<T> iced_futures::subscription::Recipe for NodeSubscriber<T>
 where
     T: 'static + Hash + Copy + Send,
-    H: std::hash::Hasher,
 {
     type Output = (T, UIMessage, Option<mpsc::Sender<UIMessage>>);
 
-    fn hash(&self, state: &mut H) {
+    fn hash(&self, state: &mut Hasher) {
         struct Marker;
         std::any::TypeId::of::<Marker>().hash(state);
         self.id.hash(state);
@@ -45,7 +45,7 @@ where
 
     fn stream(
         self: Box<Self>,
-        _input: futures::stream::BoxStream<'static, I>,
+        _input: subscription::EventStream,
     ) -> futures::stream::BoxStream<'static, Self::Output> {
         let id = self.id;
         Box::pin(futures::stream::unfold(
diff --git a/crates/core/src/theme/checkbox.rs b/crates/core/src/theme/checkbox.rs
index 7f6c892..17726b7 100644
--- a/crates/core/src/theme/checkbox.rs
+++ b/crates/core/src/theme/checkbox.rs
@@ -16,8 +16,8 @@ impl checkbox::StyleSheet for Theme {
         match style {
             CheckboxStyle::Normal =>  checkbox::Appearance {
                 background: Background::Color(self.palette.base.background),
-                checkmark_color: self.palette.bright.primary,
-                border_radius: 2.0,
+                icon_color: self.palette.bright.primary,
+                border_radius: 2.0.into(),
                 border_width: 1.0,
                 border_color: self.palette.normal.primary,
                 text_color: Some(self.palette.normal.surface),
@@ -30,8 +30,8 @@ impl checkbox::StyleSheet for Theme {
         match style {
             CheckboxStyle::Normal => checkbox::Appearance {
                 background: Background::Color(self.palette.base.foreground),
-                checkmark_color: self.palette.bright.primary,
-                border_radius: 2.0,
+                icon_color: self.palette.bright.primary,
+                border_radius: 2.0.into(),
                 border_width: 2.0,
                 border_color: self.palette.bright.primary,
                 text_color: Some(self.palette.normal.surface),
diff --git a/crates/core/src/theme/container.rs b/crates/core/src/theme/container.rs
index 938adf1..fc7918e 100644
--- a/crates/core/src/theme/container.rs
+++ b/crates/core/src/theme/container.rs
@@ -45,7 +45,7 @@ impl container::StyleSheet for Theme {
                 ..container::Appearance::default()
             },
             ContainerStyle::Segmented => container::Appearance {
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 border_width: 1.0,
                 border_color: Color {
                     a: 0.5,
@@ -71,14 +71,14 @@ impl container::StyleSheet for Theme {
             ContainerStyle::PanelForeground => container::Appearance {
                 background: Some(Background::Color(self.palette.base.foreground)),
                 text_color: Some(self.palette.bright.primary),
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 border_width: 0.0,
                 border_color: Color::TRANSPARENT,
             },
             ContainerStyle::PanelBordered => container::Appearance {
                 background: Some(Background::Color(Color::TRANSPARENT)),
                 text_color: Some(self.palette.bright.primary),
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 border_width: 1.0,
                 border_color: Color {
                     a: 0.5,
diff --git a/crates/core/src/theme/mod.rs b/crates/core/src/theme/mod.rs
index d16e57f..adb4ce6 100644
--- a/crates/core/src/theme/mod.rs
+++ b/crates/core/src/theme/mod.rs
@@ -1,6 +1,8 @@
 use crate::fs;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
+#[cfg(feature = "gui")]
+use iced_core::Renderer as IRenderer;
 
 #[cfg(feature = "wgpu")]
 use iced_wgpu::Renderer as IRenderer;
@@ -42,11 +44,12 @@ pub async fn load_user_themes() -> Vec<Theme> {
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 pub struct Theme {
+
     pub name: String,
     pub palette: ColorPalette,
 }
 
-pub type Renderer = IRenderer<Theme>;
+pub type Renderer = dyn IRenderer<Theme = Theme>;
 pub type Element<'a, Message> = iced::Element<'a, Message, Renderer>;
 pub type Container<'a, Message> = iced::widget::Container<'a, Message, Renderer>;
 pub type Column<'a, Message> = iced::widget::Column<'a, Message, Renderer>;
diff --git a/crates/core/src/theme/picklist.rs b/crates/core/src/theme/picklist.rs
index 278cf21..4e78e75 100644
--- a/crates/core/src/theme/picklist.rs
+++ b/crates/core/src/theme/picklist.rs
@@ -24,7 +24,7 @@ impl pick_list::StyleSheet for Theme {
                     a: 0.5,
                     ..self.palette.normal.primary
                 },
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 handle_color: Color {
                     a: 0.5,
                     ..self.palette.normal.primary
@@ -63,7 +63,7 @@ impl menu::StyleSheet for Theme {
                 text_color: self.palette.bright.surface,
                 background: Background::Color(self.palette.base.foreground),
                 border_width: 1.0,
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 border_color: self.palette.base.background,
                 selected_background: Background::Color(Color {
                     a: 0.15,
diff --git a/crates/core/src/theme/scrollable.rs b/crates/core/src/theme/scrollable.rs
index 9e8d04d..d613a51 100644
--- a/crates/core/src/theme/scrollable.rs
+++ b/crates/core/src/theme/scrollable.rs
@@ -16,12 +16,12 @@ impl scrollable::StyleSheet for Theme {
         match style {
             ScrollableStyle::Default => scrollable::Scrollbar {
                 background: Some(Background::Color(Color::TRANSPARENT)),
-                border_radius: 0.0,
+                border_radius: 0.0.into(),
                 border_width: 0.0,
                 border_color: Color::TRANSPARENT,
                 scroller: scrollable::Scroller {
                     color: Color::TRANSPARENT,
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 },
@@ -29,12 +29,12 @@ impl scrollable::StyleSheet for Theme {
 
             ScrollableStyle::Primary =>  scrollable::Scrollbar {
                 background: Some(Background::Color(self.palette.base.background)),
-                border_radius: 0.0,
+                border_radius: 0.0.into(),
                 border_width: 0.0,
                 border_color: Color::TRANSPARENT,
                 scroller: scrollable::Scroller {
                     color: self.palette.base.foreground,
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 },
@@ -42,7 +42,7 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered(&self, style: &Self::Style, _is_mouse_over_scrollbar: bool) -> scrollable::Scrollbar {
         let active = self.active(style);
         scrollable::Scrollbar {
             scroller: scrollable::Scroller { ..active.scroller },
@@ -51,7 +51,7 @@ impl scrollable::StyleSheet for Theme {
     }
 
     fn dragging(&self, style: &Self::Style) -> scrollable::Scrollbar {
-        let hovered = self.hovered(style);
+        let hovered = self.hovered(style, true);
         scrollable::Scrollbar {
             scroller: scrollable::Scroller { ..hovered.scroller },
             ..hovered
diff --git a/crates/core/src/theme/text_input.rs b/crates/core/src/theme/text_input.rs
index 77b8445..e8e6753 100644
--- a/crates/core/src/theme/text_input.rs
+++ b/crates/core/src/theme/text_input.rs
@@ -17,9 +17,10 @@ impl text_input::StyleSheet for Theme {
         match style {
             TextInputStyle::AddonsQuery => text_input::Appearance {
                 background: Background::Color(self.palette.base.foreground),
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 border_width: 1.0,
                 border_color: self.palette.base.foreground,
+                icon_color: self.palette.base.foreground,
             },
             _ => todo!("default"),
         }
@@ -30,12 +31,16 @@ impl text_input::StyleSheet for Theme {
         match style {
             TextInputStyle::AddonsQuery => text_input::Appearance {
                 background: Background::Color(self.palette.base.foreground),
-                border_radius: 2.0,
+                border_radius: 2.0.into(),
                 border_width: 1.0,
                 border_color: Color {
                     a: 0.5,
                     ..self.palette.normal.primary
                 },
+                icon_color: Color {
+                    a: 1.0,
+                    ..self.palette.normal.primary
+                }
             },
             _ => todo!("default"),
         }
@@ -62,6 +67,17 @@ impl text_input::StyleSheet for Theme {
         }
     }
 
+    fn disabled_color(&self, style: &Self::Style) -> Color {
+        match style {
+            TextInputStyle::AddonsQuery => self.palette.normal.secondary, 
+            _ => todo!("default"),
+        }
+    }
+
+    fn disabled(&self, style: &Self::Style) -> text_input::Appearance {
+        self.disabled(style)
+    }
+
     /// Produces the style of an hovered text input.
     fn hovered(&self, style: &Self::Style) -> text_input::Appearance {
         self.focused(style)

From b250bcd755f520890466a65fc208d3c55401f8f4 Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 17 Aug 2023 12:35:17 +0100
Subject: [PATCH 04/11] fix renderer imports

---
 Cargo.lock                          |  3 ++-
 Cargo.toml                          |  8 ++++----
 crates/core/Cargo.toml              | 10 +++-------
 crates/core/src/fs/mod.rs           |  4 ++--
 crates/core/src/theme/mod.rs        |  6 ++----
 crates/core/src/theme/text_input.rs |  2 +-
 crates/widgets/Cargo.toml           |  2 +-
 7 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 84f7aa4..4a33545 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2394,6 +2394,7 @@ dependencies = [
  "iced_aw",
  "iced_futures 0.7.0",
  "iced_native",
+ "iced_renderer",
  "iced_style 0.9.0",
  "image 0.23.14",
  "isahc 0.9.14",
@@ -2456,8 +2457,8 @@ dependencies = [
  "iced_core 0.10.0",
  "iced_futures 0.7.0",
  "iced_graphics",
+ "iced_renderer",
  "iced_style 0.9.0",
- "iced_wgpu",
  "isahc 1.7.2",
  "lazy_static",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index fe02131..930ef98 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,20 +4,20 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-#default = ["opengl"]
-wgpu = [ "iced/wgpu" ]
-#opengl = [ "iced/glow"]
+default = ["wgpu"]
+wgpu = [ "iced_renderer/wgpu" ]
 no-self-update = ["grin-gui-core/no-self-update"]
 debug = ["iced/debug"]
 
 [dependencies]
-grin-gui-core = { version = "0.1.0", path = "crates/core", features = ["gui"]}
+grin-gui-core = { version = "0.1.0", path = "crates/core", features = ["wgpu"]}
 grin-gui-widgets = { version = "0.1.0", path = "crates/widgets" }
 
 iced = { version = "0.10", features = ["canvas", "tokio"]  }
 iced_futures = { version = "0.7", features = ["async-std"] }
 iced_style = {version = "0.9"}
 iced_native = { version = "0.10" }
+iced_renderer = { version = "0.1" }
 iced_aw = { version = "0.6", default-features = false, features = ["card", "modal"]}
 
 plotters-iced = "0.9.0"
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index 1249ecf..f5cd156 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -10,11 +10,9 @@ edition = "2018"
 build = "src/build/build.rs"
 
 [features]
-default = ["gui"]
-gui = ['default']
+default = ["wgpu"]
 no-self-update = []
-wgpu = ["iced_wgpu"]
-#opengl = ["iced_core"]
+wgpu = ["iced_renderer/wgpu"]
 
 [build-dependencies]
 built = { version = "0.4", features = ["git2"] }
@@ -97,10 +95,8 @@ iced_futures = { version = "0.7", features = ["async-std"] }
 iced_core = { version = "0.10" }
 iced_style = "0.9"
 iced_graphics = { version = "0.9" }
-#iced_native = { version = "0.10", optional = true }
+iced_renderer = { version = "0.1", features = ["wgpu"] }
 iced_aw = { version = "0.6", default-features = false, features = ["card", "modal"]}
-iced_wgpu = { version = "0.11", optional = true }
-#iced_glow = { version = "0.8", optional = true }
 
 [dev-dependencies]
 tempfile = "3.2.0"
diff --git a/crates/core/src/fs/mod.rs b/crates/core/src/fs/mod.rs
index f8f7b82..d016e37 100644
--- a/crates/core/src/fs/mod.rs
+++ b/crates/core/src/fs/mod.rs
@@ -9,11 +9,11 @@ use std::sync::Mutex;
 
 pub mod backup;
 mod save;
-#[cfg(feature = "gui")]
+#[cfg(feature = "default")]
 mod theme;
 
 pub use save::PersistentData;
-#[cfg(feature = "gui")]
+#[cfg(feature = "default")]
 pub use theme::{import_theme, load_user_themes};
 
 pub static CONFIG_DIR: Lazy<Mutex<PathBuf>> = Lazy::new(|| {
diff --git a/crates/core/src/theme/mod.rs b/crates/core/src/theme/mod.rs
index adb4ce6..d1e117f 100644
--- a/crates/core/src/theme/mod.rs
+++ b/crates/core/src/theme/mod.rs
@@ -1,11 +1,9 @@
 use crate::fs;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
-#[cfg(feature = "gui")]
-use iced_core::Renderer as IRenderer;
 
 #[cfg(feature = "wgpu")]
-use iced_wgpu::Renderer as IRenderer;
+use iced_renderer::Renderer as IRenderer;
 
 #[cfg(feature = "opengl")]
 use iced_glow::Renderer as IRenderer;
@@ -49,7 +47,7 @@ pub struct Theme {
     pub palette: ColorPalette,
 }
 
-pub type Renderer = dyn IRenderer<Theme = Theme>;
+pub type Renderer = IRenderer<Theme>;
 pub type Element<'a, Message> = iced::Element<'a, Message, Renderer>;
 pub type Container<'a, Message> = iced::widget::Container<'a, Message, Renderer>;
 pub type Column<'a, Message> = iced::widget::Column<'a, Message, Renderer>;
diff --git a/crates/core/src/theme/text_input.rs b/crates/core/src/theme/text_input.rs
index e8e6753..3dbdb5f 100644
--- a/crates/core/src/theme/text_input.rs
+++ b/crates/core/src/theme/text_input.rs
@@ -75,7 +75,7 @@ impl text_input::StyleSheet for Theme {
     }
 
     fn disabled(&self, style: &Self::Style) -> text_input::Appearance {
-        self.disabled(style)
+        todo!("default")
     }
 
     /// Produces the style of an hovered text input.
diff --git a/crates/widgets/Cargo.toml b/crates/widgets/Cargo.toml
index 15ed24f..97c8099 100644
--- a/crates/widgets/Cargo.toml
+++ b/crates/widgets/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/mimblewimble/grin-gui"
 edition = "2018"
 
 [features]
-#default = ["opengl"]
+default = ["wgpu"]
 wgpu = ["iced_wgpu"]
 #opengl = ["iced_glow"]
 

From e196f1246d055652f8cd8da9046f63dace555ab1 Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 17 Aug 2023 12:39:55 +0100
Subject: [PATCH 05/11] search and replace fest

---
 src/gui/element/about.rs                      |   8 +-
 src/gui/element/menu.rs                       |   4 +-
 src/gui/element/mod.rs                        |   6 +-
 src/gui/element/modal.rs                      |   6 +-
 src/gui/element/node/embedded/summary.rs      |  10 +-
 src/gui/element/node/mod.rs                   |   2 +-
 src/gui/element/settings/general.rs           |  48 +++---
 src/gui/element/settings/node.rs              |   8 +-
 src/gui/element/settings/wallet.rs            |   8 +-
 src/gui/element/wallet/mod.rs                 |   2 +-
 .../element/wallet/operation/action_menu.rs   |   6 +-
 src/gui/element/wallet/operation/apply_tx.rs  |  36 ++---
 .../wallet/operation/apply_tx_confirm.rs      |   8 +-
 src/gui/element/wallet/operation/create_tx.rs |  30 ++--
 src/gui/element/wallet/operation/home.rs      |  28 ++--
 src/gui/element/wallet/operation/open.rs      |  20 +--
 .../wallet/operation/show_slatepack.rs        |  16 +-
 src/gui/element/wallet/operation/tx_detail.rs |  32 ++--
 src/gui/element/wallet/operation/tx_done.rs   |  12 +-
 src/gui/element/wallet/operation/tx_list.rs   | 148 +++++++++---------
 .../wallet/operation/tx_list_display.rs       |   6 +-
 src/gui/element/wallet/setup/init.rs          |  10 +-
 src/gui/element/wallet/setup/wallet_list.rs   |   8 +-
 src/gui/element/wallet/setup/wallet_setup.rs  |  38 ++---
 .../element/wallet/setup/wallet_success.rs    |  12 +-
 src/gui/mod.rs                                |  16 +-
 26 files changed, 264 insertions(+), 264 deletions(-)

diff --git a/src/gui/element/about.rs b/src/gui/element/about.rs
index b33005b..d5f8dee 100644
--- a/src/gui/element/about.rs
+++ b/src/gui/element/about.rs
@@ -69,11 +69,11 @@ pub fn data_container<'a>(
     let column = Column::new()
         .spacing(1)
         .push(grin_gui_title_container)
-        .push(Space::new(Length::Units(0), Length::Units(DEFAULT_PADDING)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(DEFAULT_PADDING)))
         .push(button_row)
-        .push(Space::new(Length::Units(0), Length::Units(DEFAULT_PADDING)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(DEFAULT_PADDING)))
         .push(changelog_title_container)
-        .push(Space::new(Length::Units(0), Length::Units(5)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
         .push(changelog_text_container);
 
     let mut scrollable = Scrollable::new(column)
@@ -82,7 +82,7 @@ pub fn data_container<'a>(
 
     let col = Column::new().push(scrollable);
     let row = Row::new()
-        .push(Space::new(Length::Units(DEFAULT_PADDING), Length::Units(0)))
+        .push(Space::new(Length::Fixed(DEFAULT_PADDING), Length::Fixed(0.0)))
         .push(col);
 
     // Returns the final container.
diff --git a/src/gui/element/menu.rs b/src/gui/element/menu.rs
index 05f7be9..990c6bf 100644
--- a/src/gui/element/menu.rs
+++ b/src/gui/element/menu.rs
@@ -165,7 +165,7 @@ pub fn data_container<'a>(
         let error_detail_button: Element<Interaction> = error_detail_button.into();
 
         error_column = Column::with_children(vec![
-            Space::with_height(Length::Units(5)).into(),
+            Space::with_height(Length::Fixed(5.0)).into(),
             error_text.into(),
             error_detail_button.map(Message::Interaction),
         ])
@@ -218,7 +218,7 @@ pub fn data_container<'a>(
 
     let settings_row = Row::with_children(vec![
         segmented_addon_container.into(),
-        Space::with_width(Length::Units(DEFAULT_PADDING)).into(),
+        Space::with_width(Length::Fixed(DEFAULT_PADDING)).into(),
         error_container.into(),
         version_container.into(),
         segmented_mode_control_container.into(),
diff --git a/src/gui/element/mod.rs b/src/gui/element/mod.rs
index 19fe60c..845d289 100644
--- a/src/gui/element/mod.rs
+++ b/src/gui/element/mod.rs
@@ -10,7 +10,7 @@ pub static SMALLER_FONT_SIZE: u16 = 12;
 pub static DEFAULT_FONT_SIZE: u16 = 14;
 pub static DEFAULT_HEADER_FONT_SIZE: u16 = 24;
 pub static DEFAULT_SUB_HEADER_FONT_SIZE: u16 = 18;
-pub static DEFAULT_PADDING: u16 = 10;
+pub static DEFAULT_PADDING: f32 = 10.0;
 
-pub static BUTTON_WIDTH: u16 = 84;
-pub static BUTTON_HEIGHT: u16 = 16;
\ No newline at end of file
+pub static BUTTON_WIDTH: f32 = 84.0;
+pub static BUTTON_HEIGHT: f32 = 16.0;
\ No newline at end of file
diff --git a/src/gui/element/modal.rs b/src/gui/element/modal.rs
index e119e02..e1b9321 100644
--- a/src/gui/element/modal.rs
+++ b/src/gui/element/modal.rs
@@ -26,8 +26,8 @@ impl Default for StateContainer {
 }
 
 pub fn exit_card() -> Card<'static, Message> {
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let yes_button_label =
         Container::new(Text::new(localized_string("yes")).size(DEFAULT_FONT_SIZE))
@@ -70,7 +70,7 @@ pub fn exit_card() -> Card<'static, Message> {
 
     let button_row = Row::new()
         .push(yes_container)
-        .push(Space::new(Length::Units(unit_spacing), Length::Units(0)))
+        .push(Space::new(Length::Fixed(unit_spacing), Length::Fixed(0.0)))
         .push(cancel_container);
 
     Card::new(
diff --git a/src/gui/element/node/embedded/summary.rs b/src/gui/element/node/embedded/summary.rs
index a1289b4..68206d2 100644
--- a/src/gui/element/node/embedded/summary.rs
+++ b/src/gui/element/node/embedded/summary.rs
@@ -197,9 +197,9 @@ pub fn data_container<'a>(
 
         Column::new()
             .push(line_label_container)
-            .push(Space::new(Length::Fill, Length::Units(2)))
+            .push(Space::new(Length::Fill, Length::Fixed(2)))
             .push(line_value_container)
-            .push(Space::new(Length::Fill, Length::Units(10)))
+            .push(Space::new(Length::Fill, Length::Fixed(10.0)))
             .align_items(Alignment::Center)
     }
     // Basic Info "Box"
@@ -217,9 +217,9 @@ pub fn data_container<'a>(
                 .align_items(Alignment::Center);
 
             let status_line_row = Row::new()
-                .push(Space::new(Length::Fill, Length::Units(0)))
+                .push(Space::new(Length::Fill, Length::Fixed(0.0)))
                 .push(status_line_column)
-                .push(Space::new(Length::Fill, Length::Units(0)))
+                .push(Space::new(Length::Fill, Length::Fixed(0.0)))
                 .align_items(Alignment::Center);
 
             let status_line_title = match chain_type {
@@ -393,7 +393,7 @@ pub fn data_container<'a>(
         None => Container::new(Column::new()),
     };
 
-    let stats_info_container = stats_info_container.width(Length::Units(600));
+    let stats_info_container = stats_info_container.width(Length::Fixed(600));
     let scrollable = Scrollable::new(stats_info_container)
         //.align_items(Alignment::Center)
         .height(Length::Fill)
diff --git a/src/gui/element/node/mod.rs b/src/gui/element/node/mod.rs
index 49ef9d4..73434ff 100644
--- a/src/gui/element/node/mod.rs
+++ b/src/gui/element/node/mod.rs
@@ -41,7 +41,7 @@ pub fn data_container<'a>(
     };
 
     let column = Column::new()
-        //.push(Space::new(Length::Units(0), Length::Units(20)))
+        //.push(Space::new(Length::Fixed(0.0), Length::Fixed(20)))
         .push(content);
 
     Container::new(column)
diff --git a/src/gui/element/settings/general.rs b/src/gui/element/settings/general.rs
index 013e6fd..2abe70f 100644
--- a/src/gui/element/settings/general.rs
+++ b/src/gui/element/settings/general.rs
@@ -264,17 +264,17 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             ))
         })
         .text_size(14)
-        .width(Length::Units(120))
+        .width(Length::Fixed(120))
         .style(grin_gui_core::theme::PickListStyle::Primary);
 
         let container = Container::new(pick_list)
             .center_y()
-            .width(Length::Units(120))
+            .width(Length::Fixed(120))
             .style(grin_gui_core::theme::ContainerStyle::NormalBackground);
 
         Column::new()
             .push(title)
-            .push(Space::new(Length::Units(0), Length::Units(5)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
             .push(container)
     };
 
@@ -288,17 +288,17 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             ))
         })
         .text_size(14)
-        .width(Length::Units(120))
+        .width(Length::Fixed(120))
         .style(grin_gui_core::theme::PickListStyle::Primary);
 
         let container = Container::new(pick_list)
             .center_y()
-            .width(Length::Units(120))
+            .width(Length::Fixed(120))
             .style(grin_gui_core::theme::ContainerStyle::NormalBackground);
 
         Column::new()
             .push(title)
-            .push(Space::new(Length::Units(0), Length::Units(5)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
             .push(container)
     };
 
@@ -325,18 +325,18 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             },
         )
         .text_size(DEFAULT_FONT_SIZE)
-        .width(Length::Units(120))
+        .width(Length::Fixed(120))
         .style(grin_gui_core::theme::PickListStyle::Primary);
 
         // Data row for theme picker list.
         let theme_data_row = Row::new()
             .push(theme_pick_list)
             .align_items(Alignment::Center)
-            .height(Length::Units(26));
+            .height(Length::Fixed(26));
 
         Column::new()
             .push(title_container)
-            .push(Space::new(Length::Units(0), Length::Units(5)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
             .push(theme_data_row)
     };
 
@@ -380,11 +380,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             .push(current_scale_container)
             .push(scale_up_button.map(Message::Interaction))
             .align_items(Alignment::Center)
-            .height(Length::Units(26));
+            .height(Length::Fixed(26));
 
         Column::new()
             .push(scale_title_row)
-            .push(Space::new(Length::Units(0), Length::Units(5)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
             .push(scale_buttons_row)
     };
 
@@ -400,7 +400,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
         )
         .size(DEFAULT_FONT_SIZE)
         .padding(6)
-        .width(Length::Units(185))
+        .width(Length::Fixed(185))
         .style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
         let theme_input: Element<Interaction> = theme_input.into();
@@ -424,11 +424,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             .push(import_button.map(Message::Interaction))
             .spacing(DEFAULT_PADDING)
             .align_items(Alignment::Center)
-            .height(Length::Units(26));
+            .height(Length::Fixed(26));
 
         Column::new()
             .push(title_container)
-            .push(Space::new(Length::Units(0), Length::Units(5)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
             .push(theme_input_row)
     };
 
@@ -447,7 +447,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
         Row::new()
             .push(open_button.map(Message::Interaction))
             .align_items(Alignment::Center)
-            .height(Length::Units(26))
+            .height(Length::Fixed(26))
     };
 
     let theme_scale_row = Row::new()
@@ -513,11 +513,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
     let mut column = Column::new()
         .spacing(1)
         .push(language_container)
-        .push(Space::new(Length::Units(0), Length::Units(10)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(currency_container)
-        .push(Space::new(Length::Units(0), Length::Units(10)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(theme_scale_row)
-        .push(Space::new(Length::Units(0), Length::Units(10)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(open_theme_row)
         .spacing(1);
 
@@ -525,11 +525,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
     #[cfg(target_os = "windows")]
     {
         column = column
-            .push(Space::new(Length::Units(0), Length::Units(10)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
             .push(close_to_tray_column)
-            .push(Space::new(Length::Units(0), Length::Units(10)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
             .push(start_closed_to_tray_column)
-            .push(Space::new(Length::Units(0), Length::Units(10)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
             .push(toggle_autostart_column);
     }
 
@@ -541,11 +541,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
     //scrollable = scrollable.height(Length::Fill);
 
     let col = Column::new()
-        .push(Space::new(Length::Units(0), Length::Units(10)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(scrollable)
-        .push(Space::new(Length::Units(0), Length::Units(20)));
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20)));
     let row = Row::new()
-        .push(Space::new(Length::Units(5), Length::Units(0)))
+        .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
         .push(col);
 
     // Returns the final container.
diff --git a/src/gui/element/settings/node.rs b/src/gui/element/settings/node.rs
index 276d8cf..8977310 100644
--- a/src/gui/element/settings/node.rs
+++ b/src/gui/element/settings/node.rs
@@ -55,7 +55,7 @@ pub fn data_container<'a>(
 
         Column::new()
             .push(title)
-            .push(Space::new(Length::Units(0), Length::Units(5)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
     };
 
     // Colum wrapping all the settings content.
@@ -64,11 +64,11 @@ pub fn data_container<'a>(
         .style(grin_gui_core::theme::ScrollableStyle::Primary);
 
     let col = Column::new()
-        .push(Space::new(Length::Units(0), Length::Units(10)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(scrollable)
-        .push(Space::new(Length::Units(0), Length::Units(20)));
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20)));
     let row = Row::new()
-        .push(Space::new(Length::Units(5), Length::Units(0)))
+        .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
         .push(col);
 
     // Returns the final container.
diff --git a/src/gui/element/settings/wallet.rs b/src/gui/element/settings/wallet.rs
index a5c17cd..2256b39 100644
--- a/src/gui/element/settings/wallet.rs
+++ b/src/gui/element/settings/wallet.rs
@@ -61,7 +61,7 @@ pub fn data_container<'a>(
 
         Column::new()
             .push(title)
-            .push(Space::new(Length::Units(0), Length::Units(5)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
     };
 
     let scrollable = Scrollable::new(language_container)
@@ -69,11 +69,11 @@ pub fn data_container<'a>(
     .style(grin_gui_core::theme::ScrollableStyle::Primary);
 
     let col = Column::new()
-        .push(Space::new(Length::Units(0), Length::Units(10)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(scrollable)
-        .push(Space::new(Length::Units(0), Length::Units(20)));
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20)));
     let row = Row::new()
-        .push(Space::new(Length::Units(5), Length::Units(0)))
+        .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
         .push(col);
 
     // Returns the final container.
diff --git a/src/gui/element/wallet/mod.rs b/src/gui/element/wallet/mod.rs
index 4654f18..7f910c5 100644
--- a/src/gui/element/wallet/mod.rs
+++ b/src/gui/element/wallet/mod.rs
@@ -66,7 +66,7 @@ pub fn data_container<'a>(
     };
 
     let column = Column::new()
-        //.push(Space::new(Length::Units(0), Length::Units(20)))
+        //.push(Space::new(Length::Fixed(0.0), Length::Fixed(20)))
         .push(content);
 
     Container::new(column)
diff --git a/src/gui/element/wallet/operation/action_menu.rs b/src/gui/element/wallet/operation/action_menu.rs
index 2b303df..9d7ae90 100644
--- a/src/gui/element/wallet/operation/action_menu.rs
+++ b/src/gui/element/wallet/operation/action_menu.rs
@@ -92,7 +92,7 @@ pub fn data_container<'a>(
     state: &'a StateContainer,
     home_state: &'a super::home::StateContainer,
 ) -> Container<'a, Message> {
-    let button_width = Length::Units(70);
+    let button_width = Length::Fixed(70);
 
     let description = Text::new(localized_string("tx-transact"))
         .size(DEFAULT_FONT_SIZE)
@@ -157,9 +157,9 @@ pub fn data_container<'a>(
 
     let menu_column = Row::new()
         .push(description_container)
-        .push(Space::with_width(Length::Units(DEFAULT_PADDING)))
+        .push(Space::with_width(Length::Fixed(DEFAULT_PADDING)))
         .push(create_container)
-        .push(Space::with_width(Length::Units(DEFAULT_PADDING)))
+        .push(Space::with_width(Length::Fixed(DEFAULT_PADDING)))
         .push(apply_container);
 
     Container::new(menu_column).padding(iced::Padding::from([
diff --git a/src/gui/element/wallet/operation/apply_tx.rs b/src/gui/element/wallet/operation/apply_tx.rs
index 5fa7ccc..a4aeeb4 100644
--- a/src/gui/element/wallet/operation/apply_tx.rs
+++ b/src/gui/element/wallet/operation/apply_tx.rs
@@ -229,8 +229,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let show_slate_label_container = Container::new(
             Text::new(localized_string("tx-show-full-slatepack")).size(SMALLER_FONT_SIZE),
         )
-        .height(Length::Units(14))
-        .width(Length::Units(60))
+        .height(Length::Fixed(14))
+        .width(Length::Fixed(60))
         .center_y()
         .center_x();
 
@@ -245,8 +245,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let paste_again_label_container = Container::new(
             Text::new(localized_string("tx-paste-again")).size(SMALLER_FONT_SIZE),
         )
-        .height(Length::Units(14))
-        .width(Length::Units(60))
+        .height(Length::Fixed(14))
+        .width(Length::Fixed(60))
         .center_y()
         .center_x();
 
@@ -257,9 +257,9 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
             .into();
 
         instruction_row = instruction_row
-            .push(Space::with_width(Length::Units(2)))
+            .push(Space::with_width(Length::Fixed(2)))
             .push(show_slate_button.map(Message::Interaction))
-            .push(Space::with_width(Length::Units(2)))
+            .push(Space::with_width(Length::Fixed(2)))
             .push(paste_again_button.map(Message::Interaction));
     }
 
@@ -273,7 +273,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
             .style(grin_gui_core::theme::ContainerStyle::BrightBackground);
         instruction_col = instruction_col
             .push(pasted_tx_label_container)
-            .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
     }
 
     instruction_col = instruction_col.push(instruction_row);
@@ -286,7 +286,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let decrypted_tx_label_container = Container::new(decrypted_tx_label)
             .style(grin_gui_core::theme::ContainerStyle::BrightBackground);
         instruction_col = instruction_col
-            .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
             .push(decrypted_tx_label_container)
     }
 
@@ -301,8 +301,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let slatepack_area_container = Container::new(slatepack_area);
 
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let submit_button_label_container =
         Container::new(Text::new(localized_string("tx-paste")).size(DEFAULT_FONT_SIZE))
@@ -366,27 +366,27 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let mut button_row = Row::new();
     if !state.can_continue {
         button_row = button_row.push(submit_container)
-        .push(Space::new(Length::Units(unit_spacing), Length::Units(0)));
+        .push(Space::new(Length::Fixed(unit_spacing), Length::Fixed(0.0)));
     } else {
         button_row = button_row
             .push(continue_container)
-            .push(Space::new(Length::Units(unit_spacing), Length::Units(0)))
+            .push(Space::new(Length::Fixed(unit_spacing), Length::Fixed(0.0)))
     }
 
     button_row = button_row.push(cancel_container);
 
     let column = Column::new()
         .push(header_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(instruction_col)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(slatepack_area_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(button_row)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 10),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 10),
         ));
 
     let form_container = Container::new(column)
diff --git a/src/gui/element/wallet/operation/apply_tx_confirm.rs b/src/gui/element/wallet/operation/apply_tx_confirm.rs
index 914ad50..18f4ba7 100644
--- a/src/gui/element/wallet/operation/apply_tx_confirm.rs
+++ b/src/gui/element/wallet/operation/apply_tx_confirm.rs
@@ -284,7 +284,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         .style(grin_gui_core::theme::ContainerStyle::NormalBackground);
 
     let sender_address = Text::new(sp_sending_address).size(DEFAULT_FONT_SIZE);
-    //.width(Length::Units(400))
+    //.width(Length::Fixed(400))
     //.style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
     let sender_address_container = Container::new(sender_address)
@@ -310,11 +310,11 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let column = Column::new()
         .push(state_row)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(sender_address_row)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(instruction_label_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(instruction_label_container_2);
 
     let wrapper_column = Column::new().height(Length::Fill).push(column);
diff --git a/src/gui/element/wallet/operation/create_tx.rs b/src/gui/element/wallet/operation/create_tx.rs
index 579a860..dfe4231 100644
--- a/src/gui/element/wallet/operation/create_tx.rs
+++ b/src/gui/element/wallet/operation/create_tx.rs
@@ -226,7 +226,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     })
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
-    .width(Length::Units(400))
+    .width(Length::Fixed(400))
     .style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
     let recipient_address_input: Element<Interaction> = recipient_address_input.into();
@@ -254,7 +254,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     )
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
-    .width(Length::Units(100))
+    .width(Length::Fixed(100))
     .style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
     let amount_input: Element<Interaction> = amount_input.into();
@@ -275,8 +275,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let address_instruction_container =
         Container::new(address_instruction_container).style(ContainerStyle::NormalBackground);
 
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let submit_button_label_container =
         Container::new(Text::new(localized_string("tx-create-submit")).size(DEFAULT_FONT_SIZE))
@@ -322,41 +322,41 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let unit_spacing = 15;
     let button_row = Row::new()
         .push(submit_container)
-        .push(Space::new(Length::Units(unit_spacing), Length::Units(0)))
+        .push(Space::new(Length::Fixed(unit_spacing), Length::Fixed(0.0)))
         .push(cancel_container);
 
     let mut column = Column::new()
         .push(recipient_address_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(address_instruction_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(recipient_address_input.map(Message::Interaction))
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)));
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)));
 
     if state.slatepack_address_error {
         column = column
             .push(address_error_container)
-            .push(Space::new(Length::Units(0), Length::Units(unit_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)));
     }
 
     column = column
         .push(amount_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(amount_input.map(Message::Interaction))
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)));
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)));
 
     if state.amount_error {
         column = column
             .push(amount_error_container)
-            .push(Space::new(Length::Units(0), Length::Units(unit_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)));
     }
 
     column = column
         .push(button_row)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 10),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 10),
         ));
 
     let form_container = Container::new(column)
diff --git a/src/gui/element/wallet/operation/home.rs b/src/gui/element/wallet/operation/home.rs
index c5e9b0b..c2d1786 100644
--- a/src/gui/element/wallet/operation/home.rs
+++ b/src/gui/element/wallet/operation/home.rs
@@ -521,8 +521,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let close_wallet_label_container =
         Container::new(Text::new(localized_string("close")).size(SMALLER_FONT_SIZE))
-            .height(Length::Units(14))
-            .width(Length::Units(30))
+            .height(Length::Fixed(14))
+            .width(Length::Fixed(30))
             .center_y()
             .center_x();
 
@@ -536,7 +536,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let subtitle_row = Row::new()
         .push(subtitle_container)
-        .push(Space::with_width(Length::Units(2)))
+        .push(Space::with_width(Length::Fixed(2)))
         .push(close_wallet_button.map(Message::Interaction));
 
     let address_label = Text::new(format!(
@@ -578,8 +578,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let copy_address_label_container =
         Container::new(Text::new(localized_string("copy-to-clipboard")).size(SMALLER_FONT_SIZE))
-            .height(Length::Units(14))
-            .width(Length::Units(30))
+            .height(Length::Fixed(14))
+            .width(Length::Fixed(30))
             .center_y()
             .center_x();
 
@@ -591,9 +591,9 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let address_row = Row::new()
         .push(address_label_container)
-        .push(Space::with_width(Length::Units(2)))
+        .push(Space::with_width(Length::Fixed(2)))
         .push(address_container)
-        .push(Space::with_width(Length::Units(2)))
+        .push(Space::with_width(Length::Fixed(2)))
         .push(copy_address_button.map(Message::Interaction));
 
     let title_container = Container::new(
@@ -719,7 +719,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         .spacing(7);
 
     let wallet_info_card_container = Container::new(info_column)
-        .width(Length::Units(240))
+        .width(Length::Fixed(240))
         .padding(iced::Padding::from([
             DEFAULT_PADDING, // top
             DEFAULT_PADDING, // right
@@ -729,7 +729,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let mut first_row_container = Row::new()
         .push(wallet_info_card_container)
-        .height(Length::Units(120));
+        .height(Length::Fixed(120));
 
     // if there is transaction data, display the balance chart
     let mut balance_data = state.tx_list_display_state.balance_data.clone();
@@ -797,18 +797,18 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         .vertical_alignment(alignment::Vertical::Center);
 
     let status_container_contents = Row::new()
-        .push(Space::new(Length::Units(DEFAULT_PADDING), Length::Units(0)))
+        .push(Space::new(Length::Fixed(DEFAULT_PADDING), Length::Fixed(0.0)))
         .push(status_container_node_state_label_text)
         .push(status_container_node_state_text)
         .push(Space::new(Length::Fill, Length::Fill))
         .push(status_container_label_text)
         .push(status_container_separator_text)
         .push(status_container_status_text)
-        .push(Space::new(Length::Units(DEFAULT_PADDING), Length::Units(0)));
+        .push(Space::new(Length::Fixed(DEFAULT_PADDING), Length::Fixed(0.0)));
 
     let status_container = Container::new(status_container_contents)
         .style(grin_gui_core::theme::ContainerStyle::BrightForeground)
-        .height(Length::Units(25))
+        .height(Length::Fixed(25))
         .width(Length::Fill);
 
     let status_row = Row::new()
@@ -824,9 +824,9 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let column = Column::new()
         .push(header_container)
         .push(first_row_container)
-        .push(Space::with_height(Length::Units(DEFAULT_PADDING * 3)))
+        .push(Space::with_height(Length::Fixed(DEFAULT_PADDING * 3)))
         .push(tx_list_display)
-        .push(Space::with_height(Length::Units(DEFAULT_PADDING)))
+        .push(Space::with_height(Length::Fixed(DEFAULT_PADDING)))
         .push(status_row)
         .height(Length::Fill);
 
diff --git a/src/gui/element/wallet/operation/open.rs b/src/gui/element/wallet/operation/open.rs
index 00bfe7a..cca747d 100644
--- a/src/gui/element/wallet/operation/open.rs
+++ b/src/gui/element/wallet/operation/open.rs
@@ -219,15 +219,15 @@ pub fn data_container<'a>(
         .horizontal_alignment(alignment::Horizontal::Center);
 
     let description_container = Container::new(description)
-        .width(Length::Units(INPUT_WIDTH))
+        .width(Length::Fixed(INPUT_WIDTH))
         .style(grin_gui_core::theme::ContainerStyle::NormalBackground).padding(6);
 
     let submit_button_label_container =
         Container::new(Text::new(localized_string("open")).size(DEFAULT_FONT_SIZE))
             .center_x()
             .center_y()
-            .width(Length::Units(BUTTON_WIDTH))
-            .height(Length::Units(BUTTON_HEIGHT))
+            .width(Length::Fixed(BUTTON_WIDTH))
+            .height(Length::Fixed(BUTTON_HEIGHT))
             .align_x(alignment::Horizontal::Center);
 
     let mut submit_button = Button::new(submit_button_label_container)
@@ -243,8 +243,8 @@ pub fn data_container<'a>(
         Container::new(Text::new(localized_string("cancel")).size(DEFAULT_FONT_SIZE))
             .center_x()
             .center_y()
-            .width(Length::Units(BUTTON_WIDTH))
-            .height(Length::Units(BUTTON_HEIGHT))
+            .width(Length::Fixed(BUTTON_WIDTH))
+            .height(Length::Fixed(BUTTON_HEIGHT))
             .align_x(alignment::Horizontal::Center);
 
     let mut cancel_button = Button::new(
@@ -272,24 +272,24 @@ pub fn data_container<'a>(
 
     let button_row = Row::new()
         .push(submit_container)
-        .push(Space::with_width(Length::Units(UNIT_SPACE)))
+        .push(Space::with_width(Length::Fixed(UNIT_SPACE)))
         .push(cancel_container);
 
     let input_container = Container::new(
         Column::new()
             .push(description_container)
-            .push(Space::with_height(Length::Units(UNIT_SPACE/2)))
+            .push(Space::with_height(Length::Fixed(UNIT_SPACE/2)))
             .push(password_column),
     )
-    .width(Length::Units(INPUT_WIDTH));
+    .width(Length::Fixed(INPUT_WIDTH));
 
     let column = Column::new()
         .push(display_name_container)
-        .push(Space::with_height(Length::Units(
+        .push(Space::with_height(Length::Fixed(
             UNIT_SPACE,
         )))
         .push(input_container)
-        .push(Space::with_height(Length::Units(
+        .push(Space::with_height(Length::Fixed(
             UNIT_SPACE + DEFAULT_PADDING,
         )))
         .push(button_row)
diff --git a/src/gui/element/wallet/operation/show_slatepack.rs b/src/gui/element/wallet/operation/show_slatepack.rs
index ea252ef..a76d824 100644
--- a/src/gui/element/wallet/operation/show_slatepack.rs
+++ b/src/gui/element/wallet/operation/show_slatepack.rs
@@ -138,8 +138,8 @@ pub fn data_container<'a>(
 
     let unit_spacing = 15;
 
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let cancel_button_label_container =
         Container::new(Text::new(localized_string("ok-caps")).size(DEFAULT_FONT_SIZE))
@@ -167,18 +167,18 @@ pub fn data_container<'a>(
     let column = Column::new()
         .push(description_container)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 5),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 5),
         ))
         .push(encrypted_slate_card)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 10),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 10),
         ))
         .push(button_row)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 10),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 10),
         ));
 
     let form_container = Container::new(column)
diff --git a/src/gui/element/wallet/operation/tx_detail.rs b/src/gui/element/wallet/operation/tx_detail.rs
index 1de5578..12722a6 100644
--- a/src/gui/element/wallet/operation/tx_detail.rs
+++ b/src/gui/element/wallet/operation/tx_detail.rs
@@ -104,8 +104,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let unit_spacing = 15;
     let row_spacing = 5;
 
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let mut column = Column::new();
 
@@ -129,7 +129,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
         column = column
             .push(id_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Tx Type
         let tx_type_label = Text::new(format!("{}:  ", localized_string("tx-type")))
@@ -150,7 +150,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
         column = column
             .push(tx_type_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
 
         // UUID
@@ -177,7 +177,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
         column = column
             .push(shared_tx_id_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Creation Time
         let tx_creation_time_label = Text::new(format!("{}:  ", localized_string("tx-creation-time")))
@@ -198,7 +198,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
         column = column
             .push(tx_creation_time_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // TTL Cutoff Height
         let ttl_cutoff_label = Text::new(format!("{}:  ", localized_string("tx-ttl-cutoff")))
@@ -224,7 +224,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
         column = column
             .push(ttl_cutoff_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Confirmed
         let confirmed_label = Text::new(format!("{}:  ", localized_string("tx-is-confirmed")))
@@ -245,7 +245,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
         column = column
             .push(confirmed_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Confirmation Time
         let tx_confirmation_time_label = Text::new(format!("{}:  ", localized_string("tx-confirmation-time")))
@@ -270,7 +270,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let tx_confirmation_time_row = Row::new().push(tx_confirmation_time_label_container).push(tx_confirmation_time_value_container);
         column = column
             .push(tx_confirmation_time_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Number of Inputs
         let tx_num_inputs_label = Text::new(format!("{}:  ", localized_string("tx-num-inputs")))
@@ -290,7 +290,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let tx_num_inputs_row = Row::new().push(tx_num_inputs_label_container).push(tx_num_inputs_value_container);
         column = column
             .push(tx_num_inputs_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Number of Outputs
         let tx_num_outputs_label = Text::new(format!("{}:  ", localized_string("tx-num-outputs")))
@@ -310,7 +310,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let tx_num_outputs_row = Row::new().push(tx_num_outputs_label_container).push(tx_num_outputs_value_container);
         column = column
             .push(tx_num_outputs_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Amount Credited
         let tx_amount_credited_label = Text::new(format!("{}:  ", localized_string("tx-amount-credited")))
@@ -330,7 +330,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let tx_amount_credited_row = Row::new().push(tx_amount_credited_label_container).push(tx_amount_credited_value_container);
         column = column
             .push(tx_amount_credited_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Amount Debited
         let tx_amount_debited_label = Text::new(format!("{}:  ", localized_string("tx-amount-debited")))
@@ -350,7 +350,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let tx_amount_debited_row = Row::new().push(tx_amount_debited_label_container).push(tx_amount_debited_value_container);
         column = column
             .push(tx_amount_debited_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Fee
         let tx_fee_label = Text::new(format!("{}:  ", localized_string("tx-fee")))
@@ -375,7 +375,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let tx_fee_row = Row::new().push(tx_fee_label_container).push(tx_fee_value_container);
         column = column
             .push(tx_fee_row)
-            .push(Space::new(Length::Units(0), Length::Units(row_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(row_spacing)));
 
         // Net Difference
         let tx_net_difference_label = Text::new(format!("{}:  ", localized_string("tx-net-difference")))
@@ -404,7 +404,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let tx_net_difference_row = Row::new().push(tx_net_difference_label_container).push(tx_net_difference_value_container);
         column = column
             .push(tx_net_difference_row)
-            .push(Space::new(Length::Units(0), Length::Units(unit_spacing)));
+            .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)));
 
     }
 
@@ -430,7 +430,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let button_row = Row::new()
         .push(cancel_container)
-        .push(Space::new(Length::Units(unit_spacing), Length::Units(0)));
+        .push(Space::new(Length::Fixed(unit_spacing), Length::Fixed(0.0)));
 
     column = column.push(button_row);
 
diff --git a/src/gui/element/wallet/operation/tx_done.rs b/src/gui/element/wallet/operation/tx_done.rs
index dc64909..86f4bdf 100644
--- a/src/gui/element/wallet/operation/tx_done.rs
+++ b/src/gui/element/wallet/operation/tx_done.rs
@@ -81,8 +81,8 @@ pub fn data_container<'a>(
 
     let unit_spacing = 15;
 
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let cancel_button_label_container =
         Container::new(Text::new(localized_string("ok-caps")).size(DEFAULT_FONT_SIZE))
@@ -110,13 +110,13 @@ pub fn data_container<'a>(
     let column = Column::new()
         .push(description_container)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 5),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 5),
         ))
         .push(button_row)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 10),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 10),
         ));
 
     let form_container = Container::new(column)
diff --git a/src/gui/element/wallet/operation/tx_list.rs b/src/gui/element/wallet/operation/tx_list.rs
index d5951a5..a3fa7e8 100644
--- a/src/gui/element/wallet/operation/tx_list.rs
+++ b/src/gui/element/wallet/operation/tx_list.rs
@@ -267,126 +267,126 @@ impl Default for HeaderState {
                 ColumnState {
                     key: ColumnKey::Id,
                     // btn_state: Default::default(),
-                    width: Length::Units(20),
+                    width: Length::Fixed(20),
                     hidden: true,
                     order: 0,
                 },
                 ColumnState {
                     key: ColumnKey::NetDifference,
                     // btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: false,
                     order: 1,
                 },
                 ColumnState {
                     key: ColumnKey::CreationTime,
                     // btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: false,
                     order: 2,
                 },
                 ColumnState {
                     key: ColumnKey::Status,
                     // btn_state: Default::default(),
-                    width: Length::Units(300),
+                    width: Length::Fixed(300),
                     hidden: false,
                     order: 3,
                 },
                 ColumnState {
                     key: ColumnKey::ConfirmationTime,
                     // btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 4,
                 },
                 ColumnState {
                     key: ColumnKey::Type,
                     // btn_state: Default::default(),
-                    width: Length::Units(150),
+                    width: Length::Fixed(150),
                     hidden: true,
                     order: 5,
                 },
                 ColumnState {
                     key: ColumnKey::SharedTransactionId,
                     // btn_state: Default::default(),
-                    width: Length::Units(150),
+                    width: Length::Fixed(150),
                     hidden: true,
                     order: 6,
                 },
                 ColumnState {
                     key: ColumnKey::TTLCutoff,
                     // btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 7,
                 },
                 ColumnState {
                     key: ColumnKey::Height,
                     // btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 8,
                 },
                 ColumnState {
                     key: ColumnKey::IsConfirmed,
                     // btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 9,
                 },
                 ColumnState {
                     key: ColumnKey::NumInputs,
                     // btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 10,
                 },
                 ColumnState {
                     key: ColumnKey::NumOutputs,
                     //  btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 11,
                 },
                 ColumnState {
                     key: ColumnKey::AmountCredited,
                     //  btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 12,
                 },
                 ColumnState {
                     key: ColumnKey::AmountDebited,
                     //  btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 13,
                 },
                 ColumnState {
                     key: ColumnKey::Fee,
                     //  btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 14,
                 },
                 ColumnState {
                     key: ColumnKey::PaymentProof,
                     //  btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 15,
                 },
                 ColumnState {
                     key: ColumnKey::Kernel,
                     //  btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 16,
                 },
                 ColumnState {
                     key: ColumnKey::TxData,
                     //  btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: true,
                     order: 17,
                 },
@@ -627,126 +627,126 @@ impl Default for TxListHeaderState {
                 TxListColumnState {
                     key: ColumnKey::Id,
                     //  btn_state: Default::default(),
-                    width: Length::Units(20),
+                    width: Length::Fixed(20),
                     hidden: false,
                     order: 0,
                 },
                 TxListColumnState {
                     key: ColumnKey::NetDifference,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 1,
                 },
                 TxListColumnState {
                     key: ColumnKey::CreationTime,
                     //  btn_state: Default::default(),
-                    width: Length::Units(105),
+                    width: Length::Fixed(105),
                     hidden: true,
                     order: 2,
                 },
                 TxListColumnState {
                     key: ColumnKey::Status,
                     //  btn_state: Default::default(),
-                    width: Length::Units(105),
+                    width: Length::Fixed(105),
                     hidden: false,
                     order: 3,
                 },
                 TxListColumnState {
                     key: ColumnKey::ConfirmationTime,
                     //  btn_state: Default::default(),
-                    width: Length::Units(105),
+                    width: Length::Fixed(105),
                     hidden: false,
                     order: 4,
                 },
                 TxListColumnState {
                     key: ColumnKey::Type,
                     //  btn_state: Default::default(),
-                    width: Length::Units(150),
+                    width: Length::Fixed(150),
                     hidden: true,
                     order: 5,
                 },
                 TxListColumnState {
                     key: ColumnKey::SharedTransactionId,
                     //  btn_state: Default::default(),
-                    width: Length::Units(110),
+                    width: Length::Fixed(110),
                     hidden: false,
                     order: 6,
                 },
                 TxListColumnState {
                     key: ColumnKey::TTLCutoff,
                     //  btn_state: Default::default(),
-                    width: Length::Units(105),
+                    width: Length::Fixed(105),
                     hidden: true,
                     order: 7,
                 },
                 TxListColumnState {
                     key: ColumnKey::Height,
                     //  btn_state: Default::default(),
-                    width: Length::Units(105),
+                    width: Length::Fixed(105),
                     hidden: false,
                     order: 8,
                 },
                 TxListColumnState {
                     key: ColumnKey::IsConfirmed,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: false,
                     order: 9,
                 },
                 TxListColumnState {
                     key: ColumnKey::NumInputs,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 10,
                 },
                 TxListColumnState {
                     key: ColumnKey::NumOutputs,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 11,
                 },
                 TxListColumnState {
                     key: ColumnKey::AmountCredited,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 12,
                 },
                 TxListColumnState {
                     key: ColumnKey::AmountDebited,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 13,
                 },
                 TxListColumnState {
                     key: ColumnKey::Fee,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 14,
                 },
                 TxListColumnState {
                     key: ColumnKey::PaymentProof,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 15,
                 },
                 TxListColumnState {
                     key: ColumnKey::Kernel,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 16,
                 },
                 TxListColumnState {
                     key: ColumnKey::TxData,
                     //  btn_state: Default::default(),
-                    width: Length::Units(85),
+                    width: Length::Fixed(85),
                     hidden: true,
                     order: 17,
                 },
@@ -946,13 +946,13 @@ pub fn titles_row_header<'a>(
     Header::new(
         header_state.clone(),
         row_titles,
-        // Some(Length::Units(DEFAULT_PADDING)),
-        // Some(Length::Units(DEFAULT_PADDING + 5)),
+        // Some(Length::Fixed(DEFAULT_PADDING)),
+        // Some(Length::Fixed(DEFAULT_PADDING + 5)),
         None,
         None,
     )
     .spacing(1)
-    .height(Length::Units(25))
+    .height(Length::Fixed(25))
     /* .on_resize(3, |event| {
         //TODO
         //Message::Interaction(Interaction::ResizeColumn(Mode::Catalog, event))
@@ -979,7 +979,7 @@ pub fn data_row_container<'a, 'b>(
     pending_confirmation: &Option<Confirm>,
     node_synched: bool,
 ) -> Container<'a, Message> {
-    let default_height = Length::Units(26);
+    let default_height = Length::Fixed(26);
     let mut default_row_height = 26;
 
     let mut row_containers = vec![];
@@ -1495,8 +1495,8 @@ pub fn data_row_container<'a, 'b>(
         row_containers.push((idx, update_button_container));
     }*/
 
-    let left_spacer = Space::new(Length::Units(DEFAULT_PADDING), Length::Units(0));
-    let right_spacer = Space::new(Length::Units(DEFAULT_PADDING + 5), Length::Units(0));
+    let left_spacer = Space::new(Length::Fixed(DEFAULT_PADDING), Length::Fixed(0.0));
+    let right_spacer = Space::new(Length::Fixed(DEFAULT_PADDING + 5), Length::Fixed(0.0));
 
     //let mut row = Row::new().push(left_spacer).spacing(1);
     let mut row = Row::new().spacing(1);
@@ -1515,7 +1515,7 @@ pub fn data_row_container<'a, 'b>(
     if is_tx_expanded {
         match expand_type {
             ExpandType::Details(_) => {
-                let button_width = Length::Units(BUTTON_WIDTH);
+                let button_width = Length::Fixed(BUTTON_WIDTH);
 
                 // ID
                 let id_title_text =
@@ -1529,7 +1529,7 @@ pub fn data_row_container<'a, 'b>(
 
                 let id_row = Row::new()
                     .push(id_title_container)
-                    .push(Space::new(Length::Units(5), Length::Units(0)))
+                    .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
                     .push(id_text_container);
 
                 // UUID
@@ -1544,7 +1544,7 @@ pub fn data_row_container<'a, 'b>(
 
                 let uuid_row = Row::new()
                     .push(uuid_title_container)
-                    .push(Space::new(Length::Units(5), Length::Units(0)))
+                    .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
                     .push(uuid_text_container);
 
                 // Transaction type
@@ -1559,14 +1559,14 @@ pub fn data_row_container<'a, 'b>(
 
                 let type_row = Row::new()
                     .push(type_title_container)
-                    .push(Space::new(Length::Units(5), Length::Units(0)))
+                    .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
                     .push(type_text_container);
 
                 /*let notes = notes.unwrap_or_else(|| localized_string("no-addon-description"));
                 let author = author.unwrap_or_else(|| "-".to_string());*/
-                let left_spacer = Space::new(Length::Units(DEFAULT_PADDING), Length::Units(0));
-                let space = Space::new(Length::Units(0), Length::Units(DEFAULT_PADDING * 2));
-                let bottom_space = Space::new(Length::Units(0), Length::Units(4));
+                let left_spacer = Space::new(Length::Fixed(DEFAULT_PADDING), Length::Fixed(0.0));
+                let space = Space::new(Length::Fixed(0.0), Length::Fixed(DEFAULT_PADDING * 2));
+                let bottom_space = Space::new(Length::Fixed(0.0), Length::Fixed(4));
 
                 let confirmed = tx_cloned.tx.confirmed;
 
@@ -1578,7 +1578,7 @@ pub fn data_row_container<'a, 'b>(
                 .align_x(alignment::Horizontal::Center);
 
                 let tx_details_button: Element<Interaction> = Button::new(tx_details_container)
-                    .width(Length::Units(BUTTON_WIDTH))
+                    .width(Length::Fixed(BUTTON_WIDTH))
                     .style(grin_gui_core::theme::ButtonStyle::Primary)
                     .on_press(Interaction::WalletOperationHomeViewInteraction(
                         super::home::LocalViewInteraction::TxDetails(tx_cloned),
@@ -1593,24 +1593,24 @@ pub fn data_row_container<'a, 'b>(
 
                 action_button_row = Row::new()
                     .push(Space::new(
-                        Length::Units(DEFAULT_PADDING * 3),
-                        Length::Units(0),
+                        Length::Fixed(DEFAULT_PADDING * 3),
+                        Length::Fixed(0.0),
                     ))
                     .push(tx_details_wrap)
-                    .push(Space::with_width(Length::Units(DEFAULT_PADDING)));
+                    .push(Space::with_width(Length::Fixed(DEFAULT_PADDING)));
 
                 if !confirmed {
                     // Re-fetch the slate representing the last saved state
                     let tx_reload_slate_container = Container::new(
                         Text::new(localized_string("tx-reload-slate")).size(DEFAULT_FONT_SIZE),
                     )
-                    .width(Length::Units(BUTTON_WIDTH * 2))
+                    .width(Length::Fixed(BUTTON_WIDTH * 2))
                     .align_y(alignment::Vertical::Center)
                     .align_x(alignment::Horizontal::Center);
 
                     let tx_reload_slate_button: Element<Interaction> =
                         Button::new(tx_reload_slate_container)
-                            .width(Length::Units(BUTTON_WIDTH * 2))
+                            .width(Length::Fixed(BUTTON_WIDTH * 2))
                             .style(grin_gui_core::theme::ButtonStyle::Primary)
                             .on_press(Interaction::WalletOperationHomeViewInteraction(
                                 super::home::LocalViewInteraction::ReloadTxSlate(
@@ -1634,7 +1634,7 @@ pub fn data_row_container<'a, 'b>(
                     .align_x(alignment::Horizontal::Center);
 
                     let mut tx_cancel_button = Button::new(tx_button_cancel_container)
-                        .width(Length::Units(BUTTON_WIDTH))
+                        .width(Length::Fixed(BUTTON_WIDTH))
                         .style(grin_gui_core::theme::ButtonStyle::Primary);
 
                     if node_synched {
@@ -1657,7 +1657,7 @@ pub fn data_row_container<'a, 'b>(
 
                     action_button_row = action_button_row
                         .push(tx_reload_slate_wrap)
-                        .push(Space::with_width(Length::Units(DEFAULT_PADDING)))
+                        .push(Space::with_width(Length::Fixed(DEFAULT_PADDING)))
                         .push(tx_cancel_wrap)
                 }
 
@@ -1702,7 +1702,7 @@ pub fn data_row_container<'a, 'b>(
                     Message::ReleaseChannelSelected,
                 )
                 .text_size(14)
-                .width(Length::Units(100))
+                .width(Length::Fixed(100))
                 .style(style::PickList);
 
                 let mut website_button = Button::new(
@@ -1802,30 +1802,30 @@ pub fn data_row_container<'a, 'b>(
                 .push(release_date_text_container);*/
 
                 /*let button_row = Row::new()
-                .push(Space::new(Length::Fill, Length::Units(0)))
+                .push(Space::new(Length::Fill, Length::Fixed(0.0)))
                 .push(website_button.map(Message::Interaction))
-                .push(Space::new(Length::Units(5), Length::Units(0)))
+                .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
                 .push(changelog_button.map(Message::Interaction))
-                .push(Space::new(Length::Units(5), Length::Units(0)))
+                .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
                 .push(ignore_button.map(Message::Interaction))
-                .push(Space::new(Length::Units(5), Length::Units(0)))
+                .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
                 .push(delete_savedvariables_button.map(Message::Interaction))
-                .push(Space::new(Length::Units(5), Length::Units(0)))
+                .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
                 .push(delete_button.map(Message::Interaction))
                 .width(Length::Fill);*/
                 let column = Column::new()
                     .push(id_row)
-                    .push(Space::new(Length::Units(0), Length::Units(3)))
+                    .push(Space::new(Length::Fixed(0.0), Length::Fixed(3)))
                     .push(uuid_row)
-                    .push(Space::new(Length::Units(0), Length::Units(3)))
+                    .push(Space::new(Length::Fixed(0.0), Length::Fixed(3)))
                     .push(type_row);
-                //.push(Space::new(Length::Units(0), Length::Units(3)))
+                //.push(Space::new(Length::Fixed(0.0), Length::Fixed(3)))
                 /* .push(notes_title_container)
-                .push(Space::new(Length::Units(0), Length::Units(3)))
+                .push(Space::new(Length::Fixed(0.0), Length::Fixed(3)))
                 .push(notes_text)
-                .push(Space::new(Length::Units(0), Length::Units(15)))
+                .push(Space::new(Length::Fixed(0.0), Length::Fixed(15)))
                 .push(release_channel_title_container)
-                .push(Space::new(Length::Units(0), Length::Units(3)))
+                .push(Space::new(Length::Fixed(0.0), Length::Fixed(3)))
                 .push(test_row)
                 .push(space)
                 .push(button_row)*/
@@ -1839,12 +1839,12 @@ pub fn data_row_container<'a, 'b>(
                     .push(left_spacer)
                     .push(details_container)
                     .push(Space::new(
-                        Length::Units(DEFAULT_PADDING + 5),
-                        Length::Units(0),
+                        Length::Fixed(DEFAULT_PADDING + 5),
+                        Length::Fixed(0.0),
                     ))
                     .spacing(1);
                 tx_column = tx_column
-                    .push(Space::new(Length::FillPortion(1), Length::Units(1)))
+                    .push(Space::new(Length::FillPortion(1), Length::Fixed(1)))
                     .push(row);
             }
             ExpandType::None => {}
@@ -1873,8 +1873,8 @@ pub fn data_row_container<'a, 'b>(
 
     if is_tx_expanded {
         return_column = return_column.push(Space::new(
-            Length::Units(0),
-            Length::Units(DEFAULT_PADDING * 2),
+            Length::Fixed(0.0),
+            Length::Fixed(DEFAULT_PADDING * 2),
         ));
     }
 
diff --git a/src/gui/element/wallet/operation/tx_list_display.rs b/src/gui/element/wallet/operation/tx_list_display.rs
index aa6f845..2153bc6 100644
--- a/src/gui/element/wallet/operation/tx_list_display.rs
+++ b/src/gui/element/wallet/operation/tx_list_display.rs
@@ -236,8 +236,8 @@ pub fn handle_message<'a>(
 }
 
 pub fn data_container<'a>(config: &'a Config, home_state: &'a super::home::StateContainer, state: &'a StateContainer) -> Container<'a, Message> {
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let title = Text::new(localized_string("tx-list")).size(DEFAULT_HEADER_FONT_SIZE);
     let title_container = Container::new(title)
@@ -305,7 +305,7 @@ pub fn data_container<'a>(config: &'a Config, home_state: &'a super::home::State
     // add additional buttons here
     let button_row = Row::new()
         .push(latest_container_wrap)
-        .push(Space::with_width(Length::Units(DEFAULT_PADDING)))
+        .push(Space::with_width(Length::Fixed(DEFAULT_PADDING)))
         .push(outstanding_container_wrap);
 
     /*let segmented_mode_container = Container::new(button_row).padding(1);
diff --git a/src/gui/element/wallet/setup/init.rs b/src/gui/element/wallet/setup/init.rs
index c2b8f78..4a2e727 100644
--- a/src/gui/element/wallet/setup/init.rs
+++ b/src/gui/element/wallet/setup/init.rs
@@ -152,18 +152,18 @@ pub fn data_container<'a>() -> Container<'a, Message> {
 
     let select_column = Column::new()
         .push(create_default_wallet_button.map(Message::Interaction))
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(or_text_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(select_wallet_button_container)
         .align_items(Alignment::Center);
 
     let column = Column::new()
-        .push(Space::new(Length::Units(0), Length::Units(20)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20)))
         .push(title_row)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(description_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(select_column)
         .align_items(Alignment::Center);
 
diff --git a/src/gui/element/wallet/setup/wallet_list.rs b/src/gui/element/wallet/setup/wallet_list.rs
index 62efe79..375f68b 100644
--- a/src/gui/element/wallet/setup/wallet_list.rs
+++ b/src/gui/element/wallet/setup/wallet_list.rs
@@ -149,8 +149,8 @@ fn validate_directory(_d: PathBuf) -> Result<bool, DirectoryValidationError> {
 }
 
 pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Container<'a, Message> {
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let title = Text::new(localized_string("wallet-list")).size(DEFAULT_HEADER_FONT_SIZE);
     let title_container = Container::new(title)
@@ -366,7 +366,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 
     let button_row = Row::new()
         .push(load_container)
-        .push(Space::with_width(Length::Units(DEFAULT_PADDING)))
+        .push(Space::with_width(Length::Fixed(DEFAULT_PADDING)))
         .push(select_container)
         .height(Length::Shrink);
 
@@ -382,7 +382,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
     let row = Row::new().push(
         Column::new()
             .push(table_container)
-            .push(Space::with_height(Length::Units(DEFAULT_PADDING)))
+            .push(Space::with_height(Length::Fixed(DEFAULT_PADDING)))
             .push(button_row),
     );
 
diff --git a/src/gui/element/wallet/setup/wallet_setup.rs b/src/gui/element/wallet/setup/wallet_setup.rs
index c28ecc8..4ac399a 100644
--- a/src/gui/element/wallet/setup/wallet_setup.rs
+++ b/src/gui/element/wallet/setup/wallet_setup.rs
@@ -316,7 +316,7 @@ pub fn data_container<'a>(
         ))
         .size(DEFAULT_FONT_SIZE)
         .padding(6)
-        .width(Length::Units(200))
+        .width(Length::Fixed(200))
         .style(grin_gui_core::theme::TextInputStyle::AddonsQuery)
         .password();
 
@@ -336,7 +336,7 @@ pub fn data_container<'a>(
         ))
         .size(DEFAULT_FONT_SIZE)
         .padding(6)
-        .width(Length::Units(200))
+        .width(Length::Fixed(200))
         .style(grin_gui_core::theme::TextInputStyle::AddonsQuery)
         .password();
 
@@ -423,7 +423,7 @@ pub fn data_container<'a>(
     })
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
-    .width(Length::Units(200))
+    .width(Length::Fixed(200))
     .style(grin_gui_core::theme::TextInputStyle::AddonsQuery)
     .into();
 
@@ -431,7 +431,7 @@ pub fn data_container<'a>(
 
     if state.restore_from_seed {
         restore_from_seed_column = restore_from_seed_column
-            .push(Space::with_height(Length::Units(DEFAULT_PADDING)))
+            .push(Space::with_height(Length::Fixed(DEFAULT_PADDING)))
             .push(seed_column);
     }
 
@@ -453,7 +453,7 @@ pub fn data_container<'a>(
     )
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
-    .width(Length::Units(200))
+    .width(Length::Fixed(200))
     .style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
     let tld = Text::new(localized_string("top-level-domain"))
@@ -483,12 +483,12 @@ pub fn data_container<'a>(
         Container::new(current_tld).style(grin_gui_core::theme::ContainerStyle::NormalBackground);
 
     let current_tld_column = Column::new()
-        .push(Space::new(Length::Units(0), Length::Units(5)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
         .push(current_tld_container);
 
     let folder_select_row = Row::new()
         .push(folder_select_button.map(Message::Interaction))
-        .push(Space::new(Length::Units(DEFAULT_PADDING), Length::Units(0)))
+        .push(Space::new(Length::Fixed(DEFAULT_PADDING), Length::Fixed(0.0)))
         .push(current_tld_column);
 
     let display_name_input: Element<Interaction> = display_name_input.into();
@@ -508,20 +508,20 @@ pub fn data_container<'a>(
     let advanced_options_column = Column::new()
         .push(display_name_container)
         .push(display_name_input.map(Message::Interaction))
-        .push(Space::new(Length::Units(0), Length::Units(5)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
         .push(tld_container)
         .spacing(DEFAULT_PADDING)
         .push(folder_select_row)
         .spacing(DEFAULT_PADDING)
-        .push(Space::new(Length::Units(0), Length::Units(5)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(5.0)))
         .push(is_testnet_row)
         .push(restore_from_seed_column)
         .align_items(Alignment::Start);
 
     // ** end hideable advanced options
 
-    let button_height = Length::Units(BUTTON_HEIGHT);
-    let button_width = Length::Units(BUTTON_WIDTH);
+    let button_height = Length::Fixed(BUTTON_HEIGHT);
+    let button_width = Length::Fixed(BUTTON_WIDTH);
 
     let submit_button_label_container = Container::new(
         Text::new(localized_string("setup-grin-create-wallet")).size(DEFAULT_FONT_SIZE),
@@ -577,25 +577,25 @@ pub fn data_container<'a>(
     let unit_spacing = 15;
     let button_row = Row::new()
         .push(submit_container)
-        .push(Space::new(Length::Units(unit_spacing), Length::Units(0)))
+        .push(Space::new(Length::Fixed(unit_spacing), Length::Fixed(0.0)))
         .push(cancel_container);
 
     let mut column = Column::new()
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(description_container)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(password_column)
-        .push(Space::new(Length::Units(0), Length::Units(unit_spacing)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(show_advanced_options_column)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 10),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 10),
         ));
 
     if state.show_advanced_options {
         column = column.push(advanced_options_column).push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 10),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 10),
         ));
     }
 
diff --git a/src/gui/element/wallet/setup/wallet_success.rs b/src/gui/element/wallet/setup/wallet_success.rs
index c314823..5b31e45 100644
--- a/src/gui/element/wallet/setup/wallet_success.rs
+++ b/src/gui/element/wallet/setup/wallet_success.rs
@@ -109,18 +109,18 @@ pub fn data_container<'a>(
     let colum = Column::new()
         .push(title_row)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 5),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 5),
         ))
         .push(description_container)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 5),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 5),
         ))
         .push(recovery_phrase_card)
         .push(Space::new(
-            Length::Units(0),
-            Length::Units(unit_spacing + 10),
+            Length::Fixed(0.0),
+            Length::Fixed(unit_spacing + 10),
         ))
         .push(next_button.map(Message::Interaction))
         .align_items(Alignment::Center);
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index 7895df0..585702b 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -226,7 +226,7 @@ impl Application for GrinGui {
         ));
 
         // Spacer between menu and content.
-        //content = content.push(Space::new(Length::Units(0), Length::Units(DEFAULT_PADDING)));
+        //content = content.push(Space::new(Length::Fixed(0.0), Length::Fixed(DEFAULT_PADDING)));
         match menu_state.mode {
             element::menu::Mode::Wallet => {
                 let setup_container = element::wallet::data_container(
@@ -488,21 +488,21 @@ fn apply_config(grin_gui: &mut GrinGui, mut config: Config) {
                 .get_mut(1)
                 .as_mut()
                 .unwrap()
-                .width = Length::Units(*local_version_width);
+                .width = Length::Fixed(*local_version_width);
             grin_gui
                 .header_state
                 .columns
                 .get_mut(2)
                 .as_mut()
                 .unwrap()
-                .width = Length::Units(*remote_version_width);
+                .width = Length::Fixed(*remote_version_width);
             grin_gui
                 .header_state
                 .columns
                 .get_mut(3)
                 .as_mut()
                 .unwrap()
-                .width = Length::Units(*status_width);
+                .width = Length::Fixed(*status_width);
         }
         ColumnConfig::V2 { columns } => {
             grin_gui.header_state.columns.iter_mut().for_each(|a| {
@@ -518,7 +518,7 @@ fn apply_config(grin_gui: &mut GrinGui, mut config: Config) {
                     })
                     .next()
                 {
-                    a.width = column.width.map_or(Length::Fill, Length::Units);
+                    a.width = column.width.map_or(Length::Fill, Length::Fixed);
                     a.hidden = column.hidden;
                     a.order = idx;
                 }
@@ -571,7 +571,7 @@ fn apply_config(grin_gui: &mut GrinGui, mut config: Config) {
                     a.width = if a.key == ColumnKey::Title {
                         Length::Fill
                     } else {
-                        column.width.map_or(Length::Fill, Length::Units)
+                        column.width.map_or(Length::Fill, Length::Fixed)
                     };
 
                     a.hidden = column.hidden;
@@ -639,7 +639,7 @@ fn apply_config(grin_gui: &mut GrinGui, mut config: Config) {
                     a.width = if a.key == CatalogColumnKey::Title {
                         Length::Fill
                     } else {
-                        column.width.map_or(Length::Fill, Length::Units)
+                        column.width.map_or(Length::Fill, Length::Fixed)
                     };
 
                     a.hidden = column.hidden;
@@ -669,7 +669,7 @@ fn apply_config(grin_gui: &mut GrinGui, mut config: Config) {
                     a.width = if a.key == AuraColumnKey::Title {
                         Length::Fill
                     } else {
-                        column.width.map_or(Length::Fill, Length::Units)
+                        column.width.map_or(Length::Fill, Length::Fixed)
                     };
                 }
             });

From 5685c4658c3e655b915774fe0ba4087b0df7126f Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 17 Aug 2023 12:53:16 +0100
Subject: [PATCH 06/11] more number conversions

---
 src/gui/element/modal.rs                      |  6 +-
 src/gui/element/node/embedded/summary.rs      |  2 +-
 src/gui/element/wallet/operation/apply_tx.rs  |  2 +-
 .../wallet/operation/apply_tx_confirm.rs      |  2 +-
 src/gui/element/wallet/operation/create_tx.rs |  2 +-
 .../wallet/operation/show_slatepack.rs        | 12 +--
 src/gui/element/wallet/operation/tx_detail.rs |  6 +-
 src/gui/element/wallet/operation/tx_done.rs   |  8 +-
 src/gui/element/wallet/operation/tx_list.rs   | 98 +++++++++----------
 .../wallet/operation/tx_list_display.rs       |  4 +-
 src/gui/element/wallet/setup/init.rs          |  4 +-
 src/gui/element/wallet/setup/wallet_setup.rs  | 16 +--
 .../element/wallet/setup/wallet_success.rs    | 10 +-
 13 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/src/gui/element/modal.rs b/src/gui/element/modal.rs
index e1b9321..a29ddc5 100644
--- a/src/gui/element/modal.rs
+++ b/src/gui/element/modal.rs
@@ -56,7 +56,7 @@ pub fn exit_card() -> Card<'static, Message> {
             .on_press(Interaction::ExitCancel)
             .into();
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
 
     // button lipstick
     let yes_container = Container::new(yes_button.map(Message::Interaction)).padding(1);
@@ -87,7 +87,7 @@ pub fn exit_card() -> Card<'static, Message> {
             .align_items(Alignment::Center)
             .push(button_row),
     )
-    .max_width(500)
+    .max_width(500.0)
     .on_close(Message::Interaction(Interaction::ExitCancel))
     .style(grin_gui_core::theme::CardStyle::Normal)
 }
@@ -126,7 +126,7 @@ pub fn error_card(
                 ))),
             ),
     )
-    .max_width(500)
+    .max_width(500.0)
     .on_close(Message::Interaction(Interaction::CloseErrorModal))
     .style(grin_gui_core::theme::CardStyle::Normal)
 }
diff --git a/src/gui/element/node/embedded/summary.rs b/src/gui/element/node/embedded/summary.rs
index 68206d2..21c1f53 100644
--- a/src/gui/element/node/embedded/summary.rs
+++ b/src/gui/element/node/embedded/summary.rs
@@ -393,7 +393,7 @@ pub fn data_container<'a>(
         None => Container::new(Column::new()),
     };
 
-    let stats_info_container = stats_info_container.width(Length::Fixed(600));
+    let stats_info_container = stats_info_container.width(Length::Fixed(600.0));
     let scrollable = Scrollable::new(stats_info_container)
         //.align_items(Alignment::Center)
         .height(Length::Fill)
diff --git a/src/gui/element/wallet/operation/apply_tx.rs b/src/gui/element/wallet/operation/apply_tx.rs
index a4aeeb4..3297036 100644
--- a/src/gui/element/wallet/operation/apply_tx.rs
+++ b/src/gui/element/wallet/operation/apply_tx.rs
@@ -150,7 +150,7 @@ pub fn handle_message<'a>(
 }
 
 pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Container<'a, Message> {
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
     let mut title_key = localized_string("apply-tx");
 
     // Just display Signing... and return while signing futures are being called
diff --git a/src/gui/element/wallet/operation/apply_tx_confirm.rs b/src/gui/element/wallet/operation/apply_tx_confirm.rs
index 18f4ba7..83fd350 100644
--- a/src/gui/element/wallet/operation/apply_tx_confirm.rs
+++ b/src/gui/element/wallet/operation/apply_tx_confirm.rs
@@ -226,7 +226,7 @@ fn parse_info_strings(in_str: &str, amount: &str) -> String {
 }
 
 pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Container<'a, Message> {
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
 
     if state.slatepack_parsed.is_none() {
         return Container::new(Text::new(
diff --git a/src/gui/element/wallet/operation/create_tx.rs b/src/gui/element/wallet/operation/create_tx.rs
index dfe4231..a52947c 100644
--- a/src/gui/element/wallet/operation/create_tx.rs
+++ b/src/gui/element/wallet/operation/create_tx.rs
@@ -319,7 +319,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         .style(grin_gui_core::theme::ContainerStyle::Segmented)
         .padding(1);
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
     let button_row = Row::new()
         .push(submit_container)
         .push(Space::new(Length::Fixed(unit_spacing), Length::Fixed(0.0)))
diff --git a/src/gui/element/wallet/operation/show_slatepack.rs b/src/gui/element/wallet/operation/show_slatepack.rs
index a76d824..e2d2653 100644
--- a/src/gui/element/wallet/operation/show_slatepack.rs
+++ b/src/gui/element/wallet/operation/show_slatepack.rs
@@ -133,10 +133,10 @@ pub fn data_container<'a>(
                 ))),
             ),
     )
-    .max_width(400)
+    .max_width(400.0)
     .style(grin_gui_core::theme::CardStyle::Normal);
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
 
     let button_height = Length::Fixed(BUTTON_HEIGHT);
     let button_width = Length::Fixed(BUTTON_WIDTH);
@@ -161,24 +161,24 @@ pub fn data_container<'a>(
         .style(grin_gui_core::theme::ContainerStyle::Segmented)
         .padding(1);
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
     let button_row = Row::new().push(cancel_container);
 
     let column = Column::new()
         .push(description_container)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 5),
+            Length::Fixed(unit_spacing + 5.0),
         ))
         .push(encrypted_slate_card)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 10),
+            Length::Fixed(unit_spacing + 10.0),
         ))
         .push(button_row)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 10),
+            Length::Fixed(unit_spacing + 10.0),
         ));
 
     let form_container = Container::new(column)
diff --git a/src/gui/element/wallet/operation/tx_detail.rs b/src/gui/element/wallet/operation/tx_detail.rs
index 12722a6..117de9b 100644
--- a/src/gui/element/wallet/operation/tx_detail.rs
+++ b/src/gui/element/wallet/operation/tx_detail.rs
@@ -97,12 +97,12 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
-    let unit_spacing = 15;
-    let row_spacing = 5;
+    let unit_spacing = 15.0;
+    let row_spacing = 5.0;
 
     let button_height = Length::Fixed(BUTTON_HEIGHT);
     let button_width = Length::Fixed(BUTTON_WIDTH);
diff --git a/src/gui/element/wallet/operation/tx_done.rs b/src/gui/element/wallet/operation/tx_done.rs
index 86f4bdf..bf984c9 100644
--- a/src/gui/element/wallet/operation/tx_done.rs
+++ b/src/gui/element/wallet/operation/tx_done.rs
@@ -79,7 +79,7 @@ pub fn data_container<'a>(
     let description_container =
         Container::new(description).style(grin_gui_core::theme::ContainerStyle::NormalBackground);
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
 
     let button_height = Length::Fixed(BUTTON_HEIGHT);
     let button_width = Length::Fixed(BUTTON_WIDTH);
@@ -104,19 +104,19 @@ pub fn data_container<'a>(
         .style(grin_gui_core::theme::ContainerStyle::Segmented)
         .padding(1);
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
     let button_row = Row::new().push(cancel_container);
 
     let column = Column::new()
         .push(description_container)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 5),
+            Length::Fixed(unit_spacing + 5.0),
         ))
         .push(button_row)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 10),
+            Length::Fixed(unit_spacing + 10.0),
         ));
 
     let form_container = Container::new(column)
diff --git a/src/gui/element/wallet/operation/tx_list.rs b/src/gui/element/wallet/operation/tx_list.rs
index a3fa7e8..39aba1b 100644
--- a/src/gui/element/wallet/operation/tx_list.rs
+++ b/src/gui/element/wallet/operation/tx_list.rs
@@ -267,126 +267,126 @@ impl Default for HeaderState {
                 ColumnState {
                     key: ColumnKey::Id,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(20),
+                    width: Length::Fixed(20.0),
                     hidden: true,
                     order: 0,
                 },
                 ColumnState {
                     key: ColumnKey::NetDifference,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: false,
                     order: 1,
                 },
                 ColumnState {
                     key: ColumnKey::CreationTime,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: false,
                     order: 2,
                 },
                 ColumnState {
                     key: ColumnKey::Status,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(300),
+                    width: Length::Fixed(300.0),
                     hidden: false,
                     order: 3,
                 },
                 ColumnState {
                     key: ColumnKey::ConfirmationTime,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 4,
                 },
                 ColumnState {
                     key: ColumnKey::Type,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(150),
+                    width: Length::Fixed(150.0),
                     hidden: true,
                     order: 5,
                 },
                 ColumnState {
                     key: ColumnKey::SharedTransactionId,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(150),
+                    width: Length::Fixed(150.0),
                     hidden: true,
                     order: 6,
                 },
                 ColumnState {
                     key: ColumnKey::TTLCutoff,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 7,
                 },
                 ColumnState {
                     key: ColumnKey::Height,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 8,
                 },
                 ColumnState {
                     key: ColumnKey::IsConfirmed,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 9,
                 },
                 ColumnState {
                     key: ColumnKey::NumInputs,
                     // btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 10,
                 },
                 ColumnState {
                     key: ColumnKey::NumOutputs,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 11,
                 },
                 ColumnState {
                     key: ColumnKey::AmountCredited,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 12,
                 },
                 ColumnState {
                     key: ColumnKey::AmountDebited,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 13,
                 },
                 ColumnState {
                     key: ColumnKey::Fee,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 14,
                 },
                 ColumnState {
                     key: ColumnKey::PaymentProof,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 15,
                 },
                 ColumnState {
                     key: ColumnKey::Kernel,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 16,
                 },
                 ColumnState {
                     key: ColumnKey::TxData,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: true,
                     order: 17,
                 },
@@ -627,126 +627,126 @@ impl Default for TxListHeaderState {
                 TxListColumnState {
                     key: ColumnKey::Id,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(20),
+                    width: Length::Fixed(20.0),
                     hidden: false,
                     order: 0,
                 },
                 TxListColumnState {
                     key: ColumnKey::NetDifference,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 1,
                 },
                 TxListColumnState {
                     key: ColumnKey::CreationTime,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(105),
+                    width: Length::Fixed(105.0),
                     hidden: true,
                     order: 2,
                 },
                 TxListColumnState {
                     key: ColumnKey::Status,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(105),
+                    width: Length::Fixed(105.0),
                     hidden: false,
                     order: 3,
                 },
                 TxListColumnState {
                     key: ColumnKey::ConfirmationTime,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(105),
+                    width: Length::Fixed(105.0),
                     hidden: false,
                     order: 4,
                 },
                 TxListColumnState {
                     key: ColumnKey::Type,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(150),
+                    width: Length::Fixed(150.0),
                     hidden: true,
                     order: 5,
                 },
                 TxListColumnState {
                     key: ColumnKey::SharedTransactionId,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(110),
+                    width: Length::Fixed(110.0),
                     hidden: false,
                     order: 6,
                 },
                 TxListColumnState {
                     key: ColumnKey::TTLCutoff,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(105),
+                    width: Length::Fixed(105.0),
                     hidden: true,
                     order: 7,
                 },
                 TxListColumnState {
                     key: ColumnKey::Height,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(105),
+                    width: Length::Fixed(105.0),
                     hidden: false,
                     order: 8,
                 },
                 TxListColumnState {
                     key: ColumnKey::IsConfirmed,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: false,
                     order: 9,
                 },
                 TxListColumnState {
                     key: ColumnKey::NumInputs,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 10,
                 },
                 TxListColumnState {
                     key: ColumnKey::NumOutputs,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 11,
                 },
                 TxListColumnState {
                     key: ColumnKey::AmountCredited,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 12,
                 },
                 TxListColumnState {
                     key: ColumnKey::AmountDebited,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 13,
                 },
                 TxListColumnState {
                     key: ColumnKey::Fee,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 14,
                 },
                 TxListColumnState {
                     key: ColumnKey::PaymentProof,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 15,
                 },
                 TxListColumnState {
                     key: ColumnKey::Kernel,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 16,
                 },
                 TxListColumnState {
                     key: ColumnKey::TxData,
                     //  btn_state: Default::default(),
-                    width: Length::Fixed(85),
+                    width: Length::Fixed(85.0),
                     hidden: true,
                     order: 17,
                 },
@@ -979,7 +979,7 @@ pub fn data_row_container<'a, 'b>(
     pending_confirmation: &Option<Confirm>,
     node_synched: bool,
 ) -> Container<'a, Message> {
-    let default_height = Length::Fixed(26);
+    let default_height = Length::Fixed(26.0);
     let mut default_row_height = 26;
 
     let mut row_containers = vec![];
@@ -1496,7 +1496,7 @@ pub fn data_row_container<'a, 'b>(
     }*/
 
     let left_spacer = Space::new(Length::Fixed(DEFAULT_PADDING), Length::Fixed(0.0));
-    let right_spacer = Space::new(Length::Fixed(DEFAULT_PADDING + 5), Length::Fixed(0.0));
+    let right_spacer = Space::new(Length::Fixed(DEFAULT_PADDING + 5.0), Length::Fixed(0.0));
 
     //let mut row = Row::new().push(left_spacer).spacing(1);
     let mut row = Row::new().spacing(1);
@@ -1565,8 +1565,8 @@ pub fn data_row_container<'a, 'b>(
                 /*let notes = notes.unwrap_or_else(|| localized_string("no-addon-description"));
                 let author = author.unwrap_or_else(|| "-".to_string());*/
                 let left_spacer = Space::new(Length::Fixed(DEFAULT_PADDING), Length::Fixed(0.0));
-                let space = Space::new(Length::Fixed(0.0), Length::Fixed(DEFAULT_PADDING * 2));
-                let bottom_space = Space::new(Length::Fixed(0.0), Length::Fixed(4));
+                let space = Space::new(Length::Fixed(0.0), Length::Fixed(DEFAULT_PADDING * 2.0));
+                let bottom_space = Space::new(Length::Fixed(0.0), Length::Fixed(4.0));
 
                 let confirmed = tx_cloned.tx.confirmed;
 
@@ -1586,14 +1586,14 @@ pub fn data_row_container<'a, 'b>(
                     .into();
 
                 let tx_details_wrap =
-                    Container::new(tx_details_button.map(Message::Interaction)).padding(1);
+                    Container::new(tx_details_button.map(Message::Interaction)).padding(1.0);
                 let tx_details_wrap = Container::new(tx_details_wrap)
                     .style(grin_gui_core::theme::ContainerStyle::Segmented)
                     .padding(1);
 
                 action_button_row = Row::new()
                     .push(Space::new(
-                        Length::Fixed(DEFAULT_PADDING * 3),
+                        Length::Fixed(DEFAULT_PADDING * 3.0),
                         Length::Fixed(0.0),
                     ))
                     .push(tx_details_wrap)
@@ -1604,13 +1604,13 @@ pub fn data_row_container<'a, 'b>(
                     let tx_reload_slate_container = Container::new(
                         Text::new(localized_string("tx-reload-slate")).size(DEFAULT_FONT_SIZE),
                     )
-                    .width(Length::Fixed(BUTTON_WIDTH * 2))
+                    .width(Length::Fixed(BUTTON_WIDTH * 2.0))
                     .align_y(alignment::Vertical::Center)
                     .align_x(alignment::Horizontal::Center);
 
                     let tx_reload_slate_button: Element<Interaction> =
                         Button::new(tx_reload_slate_container)
-                            .width(Length::Fixed(BUTTON_WIDTH * 2))
+                            .width(Length::Fixed(BUTTON_WIDTH * 2.0))
                             .style(grin_gui_core::theme::ButtonStyle::Primary)
                             .on_press(Interaction::WalletOperationHomeViewInteraction(
                                 super::home::LocalViewInteraction::ReloadTxSlate(
@@ -1815,9 +1815,9 @@ pub fn data_row_container<'a, 'b>(
                 .width(Length::Fill);*/
                 let column = Column::new()
                     .push(id_row)
-                    .push(Space::new(Length::Fixed(0.0), Length::Fixed(3)))
+                    .push(Space::new(Length::Fixed(0.0), Length::Fixed(3.0)))
                     .push(uuid_row)
-                    .push(Space::new(Length::Fixed(0.0), Length::Fixed(3)))
+                    .push(Space::new(Length::Fixed(0.0), Length::Fixed(3.0)))
                     .push(type_row);
                 //.push(Space::new(Length::Fixed(0.0), Length::Fixed(3)))
                 /* .push(notes_title_container)
@@ -1839,12 +1839,12 @@ pub fn data_row_container<'a, 'b>(
                     .push(left_spacer)
                     .push(details_container)
                     .push(Space::new(
-                        Length::Fixed(DEFAULT_PADDING + 5),
+                        Length::Fixed(DEFAULT_PADDING + 5.0),
                         Length::Fixed(0.0),
                     ))
                     .spacing(1);
                 tx_column = tx_column
-                    .push(Space::new(Length::FillPortion(1), Length::Fixed(1)))
+                    .push(Space::new(Length::FillPortion(1), Length::Fixed(1.0)))
                     .push(row);
             }
             ExpandType::None => {}
@@ -1874,7 +1874,7 @@ pub fn data_row_container<'a, 'b>(
     if is_tx_expanded {
         return_column = return_column.push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(DEFAULT_PADDING * 2),
+            Length::Fixed(DEFAULT_PADDING * 2.0),
         ));
     }
 
diff --git a/src/gui/element/wallet/operation/tx_list_display.rs b/src/gui/element/wallet/operation/tx_list_display.rs
index 2153bc6..73bcb42 100644
--- a/src/gui/element/wallet/operation/tx_list_display.rs
+++ b/src/gui/element/wallet/operation/tx_list_display.rs
@@ -322,7 +322,7 @@ pub fn data_container<'a>(config: &'a Config, home_state: &'a super::home::State
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
@@ -342,7 +342,7 @@ pub fn data_container<'a>(config: &'a Config, home_state: &'a super::home::State
 
     let table_header_container = Container::new(table_header_row).padding(iced::Padding::from([
         0,                   // top
-        DEFAULT_PADDING * 3, // right - should roughly match width of content scroll bar to align table headers
+        DEFAULT_PADDING as u16 * 3, // right - should roughly match width of content scroll bar to align table headers
         0,                   // bottom
         0,                   // left
     ]));
diff --git a/src/gui/element/wallet/setup/init.rs b/src/gui/element/wallet/setup/init.rs
index 4a2e727..e1a32a8 100644
--- a/src/gui/element/wallet/setup/init.rs
+++ b/src/gui/element/wallet/setup/init.rs
@@ -148,7 +148,7 @@ pub fn data_container<'a>() -> Container<'a, Message> {
         Column::new().push(checkbox_container)
     };*/
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
 
     let select_column = Column::new()
         .push(create_default_wallet_button.map(Message::Interaction))
@@ -159,7 +159,7 @@ pub fn data_container<'a>() -> Container<'a, Message> {
         .align_items(Alignment::Center);
 
     let column = Column::new()
-        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20)))
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20.0)))
         .push(title_row)
         .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(description_container)
diff --git a/src/gui/element/wallet/setup/wallet_setup.rs b/src/gui/element/wallet/setup/wallet_setup.rs
index 4ac399a..3dd1f2b 100644
--- a/src/gui/element/wallet/setup/wallet_setup.rs
+++ b/src/gui/element/wallet/setup/wallet_setup.rs
@@ -297,7 +297,7 @@ pub fn data_container<'a>(
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
@@ -316,7 +316,7 @@ pub fn data_container<'a>(
         ))
         .size(DEFAULT_FONT_SIZE)
         .padding(6)
-        .width(Length::Fixed(200))
+        .width(Length::Fixed(200.0))
         .style(grin_gui_core::theme::TextInputStyle::AddonsQuery)
         .password();
 
@@ -336,7 +336,7 @@ pub fn data_container<'a>(
         ))
         .size(DEFAULT_FONT_SIZE)
         .padding(6)
-        .width(Length::Fixed(200))
+        .width(Length::Fixed(200.0))
         .style(grin_gui_core::theme::TextInputStyle::AddonsQuery)
         .password();
 
@@ -423,7 +423,7 @@ pub fn data_container<'a>(
     })
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
-    .width(Length::Fixed(200))
+    .width(Length::Fixed(200.0))
     .style(grin_gui_core::theme::TextInputStyle::AddonsQuery)
     .into();
 
@@ -453,7 +453,7 @@ pub fn data_container<'a>(
     )
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
-    .width(Length::Fixed(200))
+    .width(Length::Fixed(200.0))
     .style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
     let tld = Text::new(localized_string("top-level-domain"))
@@ -574,7 +574,7 @@ pub fn data_container<'a>(
         .style(grin_gui_core::theme::ContainerStyle::Segmented)
         .padding(1);
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
     let button_row = Row::new()
         .push(submit_container)
         .push(Space::new(Length::Fixed(unit_spacing), Length::Fixed(0.0)))
@@ -589,13 +589,13 @@ pub fn data_container<'a>(
         .push(show_advanced_options_column)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 10),
+            Length::Fixed(unit_spacing + 10.0),
         ));
 
     if state.show_advanced_options {
         column = column.push(advanced_options_column).push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 10),
+            Length::Fixed(unit_spacing + 10.0),
         ));
     }
 
diff --git a/src/gui/element/wallet/setup/wallet_success.rs b/src/gui/element/wallet/setup/wallet_success.rs
index 5b31e45..c99fae5 100644
--- a/src/gui/element/wallet/setup/wallet_success.rs
+++ b/src/gui/element/wallet/setup/wallet_success.rs
@@ -88,7 +88,7 @@ pub fn data_container<'a>(
                 ))),
             ),
     )
-    .max_width(400)
+    .max_width(400.0)
     .style(grin_gui_core::theme::CardStyle::Normal);
 
     let submit_button_label_container =
@@ -104,23 +104,23 @@ pub fn data_container<'a>(
 
     let next_button: Element<Interaction> = next_button.into();
 
-    let unit_spacing = 15;
+    let unit_spacing = 15.0;
 
     let colum = Column::new()
         .push(title_row)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 5),
+            Length::Fixed(unit_spacing + 5.0),
         ))
         .push(description_container)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 5),
+            Length::Fixed(unit_spacing + 5.0),
         ))
         .push(recovery_phrase_card)
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 10),
+            Length::Fixed(unit_spacing + 10.0),
         ))
         .push(next_button.map(Message::Interaction))
         .align_items(Alignment::Center);

From 6544b597210d6f5b51211c54d3e5593907bcabc7 Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 17 Aug 2023 13:01:19 +0100
Subject: [PATCH 07/11] more numerical errors

---
 src/gui/element/node/embedded/summary.rs      |  2 +-
 src/gui/element/settings/general.rs           | 22 ++++++++---------
 src/gui/element/settings/node.rs              |  2 +-
 src/gui/element/settings/wallet.rs            |  2 +-
 .../element/wallet/operation/action_menu.rs   |  2 +-
 src/gui/element/wallet/operation/apply_tx.rs  | 16 ++++++-------
 src/gui/element/wallet/operation/create_tx.rs |  8 +++----
 src/gui/element/wallet/operation/home.rs      | 24 +++++++++----------
 src/gui/element/wallet/operation/open.rs      |  6 ++---
 src/gui/element/wallet/operation/tx_done.rs   |  2 +-
 src/gui/element/wallet/operation/tx_list.rs   |  2 +-
 src/gui/element/wallet/setup/wallet_list.rs   |  4 ++--
 12 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/gui/element/node/embedded/summary.rs b/src/gui/element/node/embedded/summary.rs
index 21c1f53..b204b5a 100644
--- a/src/gui/element/node/embedded/summary.rs
+++ b/src/gui/element/node/embedded/summary.rs
@@ -197,7 +197,7 @@ pub fn data_container<'a>(
 
         Column::new()
             .push(line_label_container)
-            .push(Space::new(Length::Fill, Length::Fixed(2)))
+            .push(Space::new(Length::Fill, Length::Fixed(2.0)))
             .push(line_value_container)
             .push(Space::new(Length::Fill, Length::Fixed(10.0)))
             .align_items(Alignment::Center)
diff --git a/src/gui/element/settings/general.rs b/src/gui/element/settings/general.rs
index 2abe70f..f9d130b 100644
--- a/src/gui/element/settings/general.rs
+++ b/src/gui/element/settings/general.rs
@@ -264,12 +264,12 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             ))
         })
         .text_size(14)
-        .width(Length::Fixed(120))
+        .width(Length::Fixed(120.0))
         .style(grin_gui_core::theme::PickListStyle::Primary);
 
         let container = Container::new(pick_list)
             .center_y()
-            .width(Length::Fixed(120))
+            .width(Length::Fixed(120.0))
             .style(grin_gui_core::theme::ContainerStyle::NormalBackground);
 
         Column::new()
@@ -288,12 +288,12 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             ))
         })
         .text_size(14)
-        .width(Length::Fixed(120))
+        .width(Length::Fixed(120.0))
         .style(grin_gui_core::theme::PickListStyle::Primary);
 
         let container = Container::new(pick_list)
             .center_y()
-            .width(Length::Fixed(120))
+            .width(Length::Fixed(120.0))
             .style(grin_gui_core::theme::ContainerStyle::NormalBackground);
 
         Column::new()
@@ -325,14 +325,14 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             },
         )
         .text_size(DEFAULT_FONT_SIZE)
-        .width(Length::Fixed(120))
+        .width(Length::Fixed(120.0))
         .style(grin_gui_core::theme::PickListStyle::Primary);
 
         // Data row for theme picker list.
         let theme_data_row = Row::new()
             .push(theme_pick_list)
             .align_items(Alignment::Center)
-            .height(Length::Fixed(26));
+            .height(Length::Fixed(26.0));
 
         Column::new()
             .push(title_container)
@@ -380,7 +380,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             .push(current_scale_container)
             .push(scale_up_button.map(Message::Interaction))
             .align_items(Alignment::Center)
-            .height(Length::Fixed(26));
+            .height(Length::Fixed(26.0));
 
         Column::new()
             .push(scale_title_row)
@@ -400,7 +400,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
         )
         .size(DEFAULT_FONT_SIZE)
         .padding(6)
-        .width(Length::Fixed(185))
+        .width(Length::Fixed(185.0))
         .style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
         let theme_input: Element<Interaction> = theme_input.into();
@@ -424,7 +424,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
             .push(import_button.map(Message::Interaction))
             .spacing(DEFAULT_PADDING)
             .align_items(Alignment::Center)
-            .height(Length::Fixed(26));
+            .height(Length::Fixed(26.0));
 
         Column::new()
             .push(title_container)
@@ -447,7 +447,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
         Row::new()
             .push(open_button.map(Message::Interaction))
             .align_items(Alignment::Center)
-            .height(Length::Fixed(26))
+            .height(Length::Fixed(26.0))
     };
 
     let theme_scale_row = Row::new()
@@ -543,7 +543,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
     let col = Column::new()
         .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(scrollable)
-        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20)));
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20.0)));
     let row = Row::new()
         .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
         .push(col);
diff --git a/src/gui/element/settings/node.rs b/src/gui/element/settings/node.rs
index 8977310..f79edc1 100644
--- a/src/gui/element/settings/node.rs
+++ b/src/gui/element/settings/node.rs
@@ -66,7 +66,7 @@ pub fn data_container<'a>(
     let col = Column::new()
         .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(scrollable)
-        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20)));
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20.0)));
     let row = Row::new()
         .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
         .push(col);
diff --git a/src/gui/element/settings/wallet.rs b/src/gui/element/settings/wallet.rs
index 2256b39..522a50a 100644
--- a/src/gui/element/settings/wallet.rs
+++ b/src/gui/element/settings/wallet.rs
@@ -71,7 +71,7 @@ pub fn data_container<'a>(
     let col = Column::new()
         .push(Space::new(Length::Fixed(0.0), Length::Fixed(10.0)))
         .push(scrollable)
-        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20)));
+        .push(Space::new(Length::Fixed(0.0), Length::Fixed(20.0)));
     let row = Row::new()
         .push(Space::new(Length::Fixed(5.0), Length::Fixed(0.0)))
         .push(col);
diff --git a/src/gui/element/wallet/operation/action_menu.rs b/src/gui/element/wallet/operation/action_menu.rs
index 9d7ae90..5d7181f 100644
--- a/src/gui/element/wallet/operation/action_menu.rs
+++ b/src/gui/element/wallet/operation/action_menu.rs
@@ -92,7 +92,7 @@ pub fn data_container<'a>(
     state: &'a StateContainer,
     home_state: &'a super::home::StateContainer,
 ) -> Container<'a, Message> {
-    let button_width = Length::Fixed(70);
+    let button_width = Length::Fixed(70.0);
 
     let description = Text::new(localized_string("tx-transact"))
         .size(DEFAULT_FONT_SIZE)
diff --git a/src/gui/element/wallet/operation/apply_tx.rs b/src/gui/element/wallet/operation/apply_tx.rs
index 3297036..ca66881 100644
--- a/src/gui/element/wallet/operation/apply_tx.rs
+++ b/src/gui/element/wallet/operation/apply_tx.rs
@@ -178,7 +178,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
@@ -229,8 +229,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let show_slate_label_container = Container::new(
             Text::new(localized_string("tx-show-full-slatepack")).size(SMALLER_FONT_SIZE),
         )
-        .height(Length::Fixed(14))
-        .width(Length::Fixed(60))
+        .height(Length::Fixed(14.0))
+        .width(Length::Fixed(60.0))
         .center_y()
         .center_x();
 
@@ -245,8 +245,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         let paste_again_label_container = Container::new(
             Text::new(localized_string("tx-paste-again")).size(SMALLER_FONT_SIZE),
         )
-        .height(Length::Fixed(14))
-        .width(Length::Fixed(60))
+        .height(Length::Fixed(14.0))
+        .width(Length::Fixed(60.0))
         .center_y()
         .center_x();
 
@@ -257,9 +257,9 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
             .into();
 
         instruction_row = instruction_row
-            .push(Space::with_width(Length::Fixed(2)))
+            .push(Space::with_width(Length::Fixed(2.0)))
             .push(show_slate_button.map(Message::Interaction))
-            .push(Space::with_width(Length::Fixed(2)))
+            .push(Space::with_width(Length::Fixed(2.0)))
             .push(paste_again_button.map(Message::Interaction));
     }
 
@@ -386,7 +386,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 10),
+            Length::Fixed(unit_spacing + 10.0),
         ));
 
     let form_container = Container::new(column)
diff --git a/src/gui/element/wallet/operation/create_tx.rs b/src/gui/element/wallet/operation/create_tx.rs
index a52947c..742ff0f 100644
--- a/src/gui/element/wallet/operation/create_tx.rs
+++ b/src/gui/element/wallet/operation/create_tx.rs
@@ -208,7 +208,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
@@ -226,7 +226,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     })
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
-    .width(Length::Fixed(400))
+    .width(Length::Fixed(400.0))
     .style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
     let recipient_address_input: Element<Interaction> = recipient_address_input.into();
@@ -254,7 +254,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     )
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
-    .width(Length::Fixed(100))
+    .width(Length::Fixed(100.0))
     .style(grin_gui_core::theme::TextInputStyle::AddonsQuery);
 
     let amount_input: Element<Interaction> = amount_input.into();
@@ -356,7 +356,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         .push(Space::new(Length::Fixed(0.0), Length::Fixed(unit_spacing)))
         .push(Space::new(
             Length::Fixed(0.0),
-            Length::Fixed(unit_spacing + 10),
+            Length::Fixed(unit_spacing + 10.0),
         ));
 
     let form_container = Container::new(column)
diff --git a/src/gui/element/wallet/operation/home.rs b/src/gui/element/wallet/operation/home.rs
index c2d1786..f6866e6 100644
--- a/src/gui/element/wallet/operation/home.rs
+++ b/src/gui/element/wallet/operation/home.rs
@@ -522,7 +522,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let close_wallet_label_container =
         Container::new(Text::new(localized_string("close")).size(SMALLER_FONT_SIZE))
             .height(Length::Fixed(14))
-            .width(Length::Fixed(30))
+            .width(Length::Fixed(30.0))
             .center_y()
             .center_x();
 
@@ -536,7 +536,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let subtitle_row = Row::new()
         .push(subtitle_container)
-        .push(Space::with_width(Length::Fixed(2)))
+        .push(Space::with_width(Length::Fixed(2.0)))
         .push(close_wallet_button.map(Message::Interaction));
 
     let address_label = Text::new(format!(
@@ -578,8 +578,8 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let copy_address_label_container =
         Container::new(Text::new(localized_string("copy-to-clipboard")).size(SMALLER_FONT_SIZE))
-            .height(Length::Fixed(14))
-            .width(Length::Fixed(30))
+            .height(Length::Fixed(14.0))
+            .width(Length::Fixed(30.0))
             .center_y()
             .center_x();
 
@@ -591,9 +591,9 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let address_row = Row::new()
         .push(address_label_container)
-        .push(Space::with_width(Length::Fixed(2)))
+        .push(Space::with_width(Length::Fixed(2.0)))
         .push(address_container)
-        .push(Space::with_width(Length::Fixed(2)))
+        .push(Space::with_width(Length::Fixed(2.0)))
         .push(copy_address_button.map(Message::Interaction));
 
     let title_container = Container::new(
@@ -617,7 +617,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
@@ -719,17 +719,17 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         .spacing(7);
 
     let wallet_info_card_container = Container::new(info_column)
-        .width(Length::Fixed(240))
+        .width(Length::Fixed(240.0))
         .padding(iced::Padding::from([
             DEFAULT_PADDING, // top
             DEFAULT_PADDING, // right
             DEFAULT_PADDING, // bottom
-            5,               // left
+            5.0,               // left
         ]));
 
     let mut first_row_container = Row::new()
         .push(wallet_info_card_container)
-        .height(Length::Fixed(120));
+        .height(Length::Fixed(120.0));
 
     // if there is transaction data, display the balance chart
     let mut balance_data = state.tx_list_display_state.balance_data.clone();
@@ -808,7 +808,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let status_container = Container::new(status_container_contents)
         .style(grin_gui_core::theme::ContainerStyle::BrightForeground)
-        .height(Length::Fixed(25))
+        .height(Length::Fixed(25.0))
         .width(Length::Fill);
 
     let status_row = Row::new()
@@ -824,7 +824,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let column = Column::new()
         .push(header_container)
         .push(first_row_container)
-        .push(Space::with_height(Length::Fixed(DEFAULT_PADDING * 3)))
+        .push(Space::with_height(Length::Fixed(DEFAULT_PADDING * 3.0)))
         .push(tx_list_display)
         .push(Space::with_height(Length::Fixed(DEFAULT_PADDING)))
         .push(status_row)
diff --git a/src/gui/element/wallet/operation/open.rs b/src/gui/element/wallet/operation/open.rs
index cca747d..54b1656 100644
--- a/src/gui/element/wallet/operation/open.rs
+++ b/src/gui/element/wallet/operation/open.rs
@@ -23,8 +23,8 @@ use {
     std::sync::{Arc, RwLock},
 };
 
-static INPUT_WIDTH: u16 = 212;
-static UNIT_SPACE: u16 = 15;
+static INPUT_WIDTH: f32 = 212.0;
+static UNIT_SPACE: f32 = 15.0;
 
 pub struct StateContainer {
     pub password_state: PasswordState,
@@ -278,7 +278,7 @@ pub fn data_container<'a>(
     let input_container = Container::new(
         Column::new()
             .push(description_container)
-            .push(Space::with_height(Length::Fixed(UNIT_SPACE/2)))
+            .push(Space::with_height(Length::Fixed(UNIT_SPACE/2.0)))
             .push(password_column),
     )
     .width(Length::Fixed(INPUT_WIDTH));
diff --git a/src/gui/element/wallet/operation/tx_done.rs b/src/gui/element/wallet/operation/tx_done.rs
index bf984c9..cc77af6 100644
--- a/src/gui/element/wallet/operation/tx_done.rs
+++ b/src/gui/element/wallet/operation/tx_done.rs
@@ -69,7 +69,7 @@ pub fn data_container<'a>(
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
diff --git a/src/gui/element/wallet/operation/tx_list.rs b/src/gui/element/wallet/operation/tx_list.rs
index 39aba1b..c7f3d01 100644
--- a/src/gui/element/wallet/operation/tx_list.rs
+++ b/src/gui/element/wallet/operation/tx_list.rs
@@ -952,7 +952,7 @@ pub fn titles_row_header<'a>(
         None,
     )
     .spacing(1)
-    .height(Length::Fixed(25))
+    .height(Length::Fixed(25.0))
     /* .on_resize(3, |event| {
         //TODO
         //Message::Interaction(Interaction::ResizeColumn(Mode::Catalog, event))
diff --git a/src/gui/element/wallet/setup/wallet_list.rs b/src/gui/element/wallet/setup/wallet_list.rs
index 375f68b..42055c3 100644
--- a/src/gui/element/wallet/setup/wallet_list.rs
+++ b/src/gui/element/wallet/setup/wallet_list.rs
@@ -191,7 +191,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
@@ -227,7 +227,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
     let table_header_container = Container::new(table_header_row)
         .padding(iced::Padding::from([
             9,               // top
-            DEFAULT_PADDING, // right - should roughly match width of content scroll bar to align table headers
+            DEFAULT_PADDING as u16, // right - should roughly match width of content scroll bar to align table headers
             9,               // bottom
             9,               // left
         ]))

From 2aa87d5ee33f307abc27c4598ed44411c531ed2b Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 17 Aug 2023 13:08:41 +0100
Subject: [PATCH 08/11] cursor package change

---
 Cargo.lock                                    | 113 ++++--------------
 Cargo.toml                                    |   2 +-
 crates/widgets/Cargo.toml                     |   2 -
 src/gui/element/settings/general.rs           |   2 +-
 .../element/wallet/operation/action_menu.rs   |   2 +-
 src/gui/element/wallet/operation/apply_tx.rs  |   2 +-
 .../wallet/operation/apply_tx_confirm.rs      |   2 +-
 src/gui/element/wallet/operation/chart.rs     |  12 +-
 src/gui/element/wallet/operation/create_tx.rs |   2 +-
 src/gui/element/wallet/operation/home.rs      |   4 +-
 src/gui/element/wallet/operation/open.rs      |   1 -
 src/gui/element/wallet/operation/tx_detail.rs |   2 +-
 src/gui/element/wallet/operation/tx_list.rs   |   2 +-
 .../wallet/operation/tx_list_display.rs       |   2 +-
 src/gui/element/wallet/setup/wallet_setup.rs  |   5 +-
 src/gui/mod.rs                                |   6 +-
 src/gui/time.rs                               |   2 +-
 src/gui/update.rs                             |  16 +--
 18 files changed, 50 insertions(+), 129 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4a33545..eae231e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2392,10 +2392,10 @@ dependencies = [
  "grin-gui-widgets",
  "iced",
  "iced_aw",
- "iced_futures 0.7.0",
- "iced_native",
+ "iced_core",
+ "iced_futures",
  "iced_renderer",
- "iced_style 0.9.0",
+ "iced_style",
  "image 0.23.14",
  "isahc 0.9.14",
  "isolang",
@@ -2454,11 +2454,11 @@ dependencies = [
  "grin_wallet_util",
  "iced",
  "iced_aw",
- "iced_core 0.10.0",
- "iced_futures 0.7.0",
+ "iced_core",
+ "iced_futures",
  "iced_graphics",
  "iced_renderer",
- "iced_style 0.9.0",
+ "iced_style",
  "isahc 1.7.2",
  "lazy_static",
  "log",
@@ -2486,9 +2486,9 @@ name = "grin-gui-widgets"
 version = "0.1.0"
 dependencies = [
  "iced",
- "iced_core 0.10.0",
+ "iced_core",
  "iced_graphics",
- "iced_style 0.9.0",
+ "iced_style",
  "iced_wgpu",
 ]
 
@@ -3388,8 +3388,8 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c708807ec86f99dd729dc4d42db5239acf118cec14d3c5f57679dcfdbbc472b1"
 dependencies = [
- "iced_core 0.10.0",
- "iced_futures 0.7.0",
+ "iced_core",
+ "iced_futures",
  "iced_renderer",
  "iced_widget",
  "iced_winit",
@@ -3405,17 +3405,6 @@ dependencies = [
  "iced_widget",
 ]
 
-[[package]]
-name = "iced_core"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11e1942e28dedee756cc27e67e7a838cdc1e59fb6bf9627ec9f709ab3b135782"
-dependencies = [
- "bitflags 1.3.2",
- "instant",
- "palette 0.6.1",
-]
-
 [[package]]
 name = "iced_core"
 version = "0.10.0"
@@ -3425,23 +3414,11 @@ dependencies = [
  "bitflags 1.3.2",
  "instant",
  "log",
- "palette 0.7.3",
+ "palette",
  "thiserror",
  "twox-hash",
 ]
 
-[[package]]
-name = "iced_futures"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "215d51fa4f70dbb63775d7141243c4d98d4d525d8949695601f8fbac7dcbc04e"
-dependencies = [
- "futures 0.3.28",
- "log",
- "wasm-bindgen-futures",
- "wasm-timer",
-]
-
 [[package]]
 name = "iced_futures"
 version = "0.7.0"
@@ -3450,7 +3427,7 @@ checksum = "14dab0054a9c7a1cbce227a8cd9ee4a094497b3d06094551ac6c1488d563802e"
 dependencies = [
  "async-std",
  "futures 0.3.28",
- "iced_core 0.10.0",
+ "iced_core",
  "log",
  "tokio 1.31.0",
  "wasm-bindgen-futures",
@@ -3467,28 +3444,13 @@ dependencies = [
  "bytemuck",
  "glam",
  "half",
- "iced_core 0.10.0",
+ "iced_core",
  "log",
  "lyon_path",
  "raw-window-handle 0.5.2",
  "thiserror",
 ]
 
-[[package]]
-name = "iced_native"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d012eb06da490fe46a695b39721c20da9643f35cf2ecb9d30618fdeb96170616"
-dependencies = [
- "iced_core 0.9.0",
- "iced_futures 0.6.0",
- "iced_style 0.8.0",
- "num-traits 0.2.16",
- "thiserror",
- "twox-hash",
- "unicode-segmentation",
-]
-
 [[package]]
 name = "iced_renderer"
 version = "0.1.0"
@@ -3509,31 +3471,20 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c6c89853e1250c6fac82c5015fa2144517be9b33d4b8e456f10e198b23e28bd"
 dependencies = [
- "iced_core 0.10.0",
- "iced_futures 0.7.0",
+ "iced_core",
+ "iced_futures",
  "thiserror",
 ]
 
-[[package]]
-name = "iced_style"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e37333dc2991201140302cd0d4cea051bd37ca3671d5008ec85df86d232ff30"
-dependencies = [
- "iced_core 0.9.0",
- "once_cell",
- "palette 0.6.1",
-]
-
 [[package]]
 name = "iced_style"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d85c47d9d13e2281f75ddf98c865daf2101632bd2b855c401dd0b1c8b81a31a0"
 dependencies = [
- "iced_core 0.10.0",
+ "iced_core",
  "once_cell",
- "palette 0.7.3",
+ "palette",
 ]
 
 [[package]]
@@ -3584,7 +3535,7 @@ checksum = "a177219ae51c3ba08f228ab932354b360cc669e94aec50c01e7c9b675f074c7c"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
- "iced_style 0.9.0",
+ "iced_style",
  "num-traits 0.2.16",
  "ouroboros",
  "thiserror",
@@ -3599,7 +3550,7 @@ checksum = "0ecea26fcc8074373f6011d2193d63445617d900a428eb4df66c0e5658408fb6"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
- "iced_style 0.9.0",
+ "iced_style",
  "log",
  "raw-window-handle 0.5.2",
  "thiserror",
@@ -5040,18 +4991,6 @@ dependencies = [
  "ttf-parser 0.19.1",
 ]
 
-[[package]]
-name = "palette"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49"
-dependencies = [
- "approx",
- "num-traits 0.2.16",
- "palette_derive 0.6.1",
- "phf 0.11.2",
-]
-
 [[package]]
 name = "palette"
 version = "0.7.3"
@@ -5060,22 +4999,10 @@ checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc"
 dependencies = [
  "approx",
  "fast-srgb8",
- "palette_derive 0.7.3",
+ "palette_derive",
  "phf 0.11.2",
 ]
 
-[[package]]
-name = "palette_derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427"
-dependencies = [
- "find-crate",
- "proc-macro2 1.0.66",
- "quote 1.0.32",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "palette_derive"
 version = "0.7.3"
diff --git a/Cargo.toml b/Cargo.toml
index 930ef98..4e119a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,8 +16,8 @@ grin-gui-widgets = { version = "0.1.0", path = "crates/widgets" }
 iced = { version = "0.10", features = ["canvas", "tokio"]  }
 iced_futures = { version = "0.7", features = ["async-std"] }
 iced_style = {version = "0.9"}
-iced_native = { version = "0.10" }
 iced_renderer = { version = "0.1" }
+iced_core = { version = "0.10" }
 iced_aw = { version = "0.6", default-features = false, features = ["card", "modal"]}
 
 plotters-iced = "0.9.0"
diff --git a/crates/widgets/Cargo.toml b/crates/widgets/Cargo.toml
index 97c8099..80ea321 100644
--- a/crates/widgets/Cargo.toml
+++ b/crates/widgets/Cargo.toml
@@ -15,9 +15,7 @@ wgpu = ["iced_wgpu"]
 
 [dependencies]
 iced = { version = "0.10", features = ["advanced", "lazy", "tokio"] }
-#iced_native = { version = "0.10" }
 iced_graphics = { version = "0.9" }
 iced_core = { version = "0.10" }
 iced_wgpu = { version = "0.11", optional = true }
-#iced_glow = { version = "0.8", optional = true }
 iced_style = "0.9"
diff --git a/src/gui/element/settings/general.rs b/src/gui/element/settings/general.rs
index f9d130b..5e12803 100644
--- a/src/gui/element/settings/general.rs
+++ b/src/gui/element/settings/general.rs
@@ -369,7 +369,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 
         let current_scale_text = Text::new(format!("  {:.2}  ", state.scale_state.scale))
             .size(DEFAULT_FONT_SIZE)
-            .vertical_alignment(iced_native::alignment::Vertical::Center);
+            .vertical_alignment(iced_core::alignment::Vertical::Center);
         let current_scale_container = Container::new(current_scale_text)
             .height(Length::Fill)
             .center_y()
diff --git a/src/gui/element/wallet/operation/action_menu.rs b/src/gui/element/wallet/operation/action_menu.rs
index 5d7181f..9f0eea9 100644
--- a/src/gui/element/wallet/operation/action_menu.rs
+++ b/src/gui/element/wallet/operation/action_menu.rs
@@ -9,7 +9,7 @@ use grin_gui_core::{
 //use grin_gui_core::widgets::widget::header;
 use iced::alignment;
 use iced_aw::Card;
-use iced_native::Widget;
+use iced_core::Widget;
 use std::path::PathBuf;
 
 use super::tx_list::{HeaderState, TxList};
diff --git a/src/gui/element/wallet/operation/apply_tx.rs b/src/gui/element/wallet/operation/apply_tx.rs
index ca66881..d06c0a4 100644
--- a/src/gui/element/wallet/operation/apply_tx.rs
+++ b/src/gui/element/wallet/operation/apply_tx.rs
@@ -7,7 +7,7 @@ use grin_gui_core::{
 };
 use grin_gui_widgets::widget::header;
 use iced_aw::Card;
-use iced_native::Widget;
+use iced_core::Widget;
 use std::path::PathBuf;
 
 use super::tx_list::{HeaderState, TxList};
diff --git a/src/gui/element/wallet/operation/apply_tx_confirm.rs b/src/gui/element/wallet/operation/apply_tx_confirm.rs
index 83fd350..20795e0 100644
--- a/src/gui/element/wallet/operation/apply_tx_confirm.rs
+++ b/src/gui/element/wallet/operation/apply_tx_confirm.rs
@@ -7,7 +7,7 @@ use grin_gui_core::{
 };
 use grin_gui_widgets::widget::header;
 use iced_aw::Card;
-use iced_native::Widget;
+use iced_core::Widget;
 use std::fs::{self, File};
 use std::io::Write;
 use std::path::PathBuf;
diff --git a/src/gui/element/wallet/operation/chart.rs b/src/gui/element/wallet/operation/chart.rs
index 4e010d1..8b41095 100644
--- a/src/gui/element/wallet/operation/chart.rs
+++ b/src/gui/element/wallet/operation/chart.rs
@@ -11,11 +11,13 @@ use iced::{
     alignment::{Horizontal, Vertical},
     executor,
     widget::{
-        canvas::{self, event, Cache, Cursor, Frame, Geometry},
+        canvas::{self, event, Cache, Frame, Geometry},
         Space,
     },
+    mouse::Cursor,
     Alignment, Command, Font, Length, Point, Settings, Size, Subscription,
 };
+
 use plotters::{
     coord::{types::RangedCoordf32, ReverseCoordTranslate},
     prelude::*,
@@ -97,8 +99,8 @@ impl Chart<Message> for BalanceChart {
         _state: &mut Self::State,
         event: canvas::Event,
         bounds: iced::Rectangle,
-        cursor: canvas::Cursor,
-    ) -> (iced_native::event::Status, Option<Message>) {
+        cursor: Cursor,
+    ) -> (iced_core::event::Status, Option<Message>) {
         if let Cursor::Available(point) = cursor {
             match event {
                 canvas::Event::Mouse(_evt) if bounds.contains(point) => {
@@ -126,7 +128,7 @@ impl Chart<Message> for BalanceChart {
                     }
 
                     return (
-                        iced_native::event::Status::Captured,
+                        iced_core::event::Status::Captured,
                         Some(Message::Interaction(
                             crate::gui::Interaction::WalletOperationHomeViewInteraction(
                                 super::home::LocalViewInteraction::MouseIndex(cursor_index, caption_index),
@@ -136,7 +138,7 @@ impl Chart<Message> for BalanceChart {
                 }
                 _ => {
                     return (
-                        iced_native::event::Status::Captured,
+                        iced_core::event::Status::Captured,
                         Some(Message::Interaction(
                             crate::gui::Interaction::WalletOperationHomeViewInteraction(
                                 super::home::LocalViewInteraction::MouseExit,
diff --git a/src/gui/element/wallet/operation/create_tx.rs b/src/gui/element/wallet/operation/create_tx.rs
index 742ff0f..982244c 100644
--- a/src/gui/element/wallet/operation/create_tx.rs
+++ b/src/gui/element/wallet/operation/create_tx.rs
@@ -8,7 +8,7 @@ use grin_gui_core::{
 };
 use grin_gui_widgets::widget::header;
 use iced_aw::Card;
-use iced_native::Widget;
+use iced_core::Widget;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::PathBuf;
diff --git a/src/gui/element/wallet/operation/home.rs b/src/gui/element/wallet/operation/home.rs
index f6866e6..dfa7d0e 100644
--- a/src/gui/element/wallet/operation/home.rs
+++ b/src/gui/element/wallet/operation/home.rs
@@ -15,7 +15,7 @@ use grin_gui_core::{
 use grin_gui_widgets::widget::header;
 use iced::Point;
 use iced_aw::Card;
-use iced_native::Widget;
+use iced_core::Widget;
 use plotters::{
     coord::{types::RangedCoordf32, ReverseCoordTranslate},
     prelude::*,
@@ -521,7 +521,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
 
     let close_wallet_label_container =
         Container::new(Text::new(localized_string("close")).size(SMALLER_FONT_SIZE))
-            .height(Length::Fixed(14))
+            .height(Length::Fixed(14.0))
             .width(Length::Fixed(30.0))
             .center_y()
             .center_x();
diff --git a/src/gui/element/wallet/operation/open.rs b/src/gui/element/wallet/operation/open.rs
index 54b1656..2e35e2c 100644
--- a/src/gui/element/wallet/operation/open.rs
+++ b/src/gui/element/wallet/operation/open.rs
@@ -1,7 +1,6 @@
 use crate::gui::element::{self, BUTTON_HEIGHT, BUTTON_WIDTH};
 use crate::log_error;
 //use iced::button::StyleSheet;
-//use iced_native::Widget;
 //use std::path::PathBuf;
 
 use {
diff --git a/src/gui/element/wallet/operation/tx_detail.rs b/src/gui/element/wallet/operation/tx_detail.rs
index 117de9b..b99a5a4 100644
--- a/src/gui/element/wallet/operation/tx_detail.rs
+++ b/src/gui/element/wallet/operation/tx_detail.rs
@@ -8,7 +8,7 @@ use grin_gui_core::{
 };
 use grin_gui_widgets::widget::header;
 use iced_aw::Card;
-use iced_native::Widget;
+use iced_core::Widget;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::PathBuf;
diff --git a/src/gui/element/wallet/operation/tx_list.rs b/src/gui/element/wallet/operation/tx_list.rs
index c7f3d01..5596c13 100644
--- a/src/gui/element/wallet/operation/tx_list.rs
+++ b/src/gui/element/wallet/operation/tx_list.rs
@@ -1,6 +1,6 @@
 use std::borrow::Borrow;
 
-use iced_native::Widget;
+use iced_core::Widget;
 
 use {
     super::super::super::{BUTTON_WIDTH, DEFAULT_FONT_SIZE, DEFAULT_PADDING, SMALLER_FONT_SIZE},
diff --git a/src/gui/element/wallet/operation/tx_list_display.rs b/src/gui/element/wallet/operation/tx_list_display.rs
index 73bcb42..f69efc7 100644
--- a/src/gui/element/wallet/operation/tx_list_display.rs
+++ b/src/gui/element/wallet/operation/tx_list_display.rs
@@ -8,7 +8,7 @@ use grin_gui_core::{
 };
 use grin_gui_widgets::widget::header;
 use iced_aw::Card;
-use iced_native::Widget;
+use iced_core::Widget;
 use std::{borrow::Borrow, path::PathBuf, str::FromStr};
 
 use super::tx_list::{HeaderState, TxList, TxLogEntryWrap};
diff --git a/src/gui/element/wallet/setup/wallet_setup.rs b/src/gui/element/wallet/setup/wallet_setup.rs
index 3dd1f2b..d058fdc 100644
--- a/src/gui/element/wallet/setup/wallet_setup.rs
+++ b/src/gui/element/wallet/setup/wallet_setup.rs
@@ -1,8 +1,5 @@
 use crate::{gui::element, log_error};
-use iced_native::Widget;
-//use futures::future::OrElse;
-//use iced::button::StyleSheet;
-//use iced_native::Widget;
+use iced_core::Widget;
 use native_dialog::FileDialog;
 use std::path::PathBuf;
 
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index 585702b..c34ef06 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -21,8 +21,6 @@ use iced::widget::{
     button, pick_list, scrollable, text_input, Checkbox, Space, TextInput,
 };
 
-//use iced_native::alignment;
-
 use iced_aw::{modal, Card, Modal};
 
 use iced_futures::futures::channel::mpsc;
@@ -129,7 +127,7 @@ pub enum Message {
     SendNodeMessage((usize, UIMessage, Option<mpsc::Sender<UIMessage>>)),
     Interaction(Interaction),
     Tick(chrono::DateTime<chrono::Local>),
-    RuntimeEvent(iced_native::Event),
+    RuntimeEvent(iced::iced_core::Event),
     None(()),
 }
 
@@ -201,7 +199,7 @@ impl Application for GrinGui {
     }*/
 
     fn subscription(&self) -> Subscription<Message> {
-        let runtime_subscription = iced_native::subscription::events().map(Message::RuntimeEvent);
+        let runtime_subscription = iced_futures::subscription::events().map(Message::RuntimeEvent);
         let tick_subscription = time::every(std::time::Duration::from_millis(1000)).map(Message::Tick);
         let node_subscription = subscriber::subscriber(0).map(|e| 
             Message::SendNodeMessage(e)
diff --git a/src/gui/time.rs b/src/gui/time.rs
index 3d6c049..9fd27f6 100644
--- a/src/gui/time.rs
+++ b/src/gui/time.rs
@@ -6,7 +6,7 @@ pub fn every(duration: std::time::Duration) -> iced::Subscription<chrono::DateTi
 
 struct Every(std::time::Duration);
 
-impl<H, I> iced_native::subscription::Recipe<H, I> for Every
+impl<H, I> iced_futures::subscription::Recipe<H, I> for Every
 where
     H: std::hash::Hasher,
 {
diff --git a/src/gui/update.rs b/src/gui/update.rs
index 72e717a..b059347 100644
--- a/src/gui/update.rs
+++ b/src/gui/update.rs
@@ -243,8 +243,8 @@ pub fn handle_message(grin_gui: &mut GrinGui, message: Message) -> Result<Comman
             }
             grin_gui.error = err;
         }
-        Message::RuntimeEvent(iced_native::Event::Window(
-            iced_native::window::Event::Resized { width, height },
+        Message::RuntimeEvent(iced_core::Event::Window(
+            iced_core::window::Event::Resized { width, height },
         )) => {
             let width = (width as f64 * grin_gui.general_settings_state.scale_state.scale) as u32;
             let height = (height as f64 * grin_gui.general_settings_state.scale_state.scale) as u32;
@@ -259,16 +259,16 @@ pub fn handle_message(grin_gui: &mut GrinGui, message: Message) -> Result<Comman
 
         #[cfg(target_os = "macos")]
         // Application shutdown
-        Message::RuntimeEvent(iced_native::Event::Window(
-            iced_native::window::Event::CloseRequested,
+        Message::RuntimeEvent(iced_core::Event::Window(
+            iced_core::window::Event::CloseRequested,
         )) => {
             log::debug!("Message::RuntimeEvent(CloseRequested)");
             grin_gui.show_exit(true);
         }
 
         #[cfg(target_os = "windows")]
-        Message::RuntimeEvent(iced_native::Event::Window(
-            iced_native::window::Event::CloseRequested,
+        Message::RuntimeEvent(iced_core::Event::Window(
+            iced_core::window::Event::CloseRequested,
         )) => {
             log::debug!("Message::RuntimeEvent(CloseRequested)");
 
@@ -280,8 +280,8 @@ pub fn handle_message(grin_gui: &mut GrinGui, message: Message) -> Result<Comman
                 }
             }
         }
-        Message::RuntimeEvent(iced_native::Event::Keyboard(
-            iced_native::keyboard::Event::KeyReleased {
+        Message::RuntimeEvent(iced_core::Event::Keyboard(
+            iced_core::keyboard::Event::KeyReleased {
                 key_code,
                 modifiers,
             },

From 27010e659bf2ee0a47cf239a2e67c995541be154 Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 17 Aug 2023 13:24:52 +0100
Subject: [PATCH 09/11] type and argument errors

---
 crates/core/src/lib.rs                           |  2 +-
 src/gui/element/settings/general.rs              |  2 +-
 src/gui/element/wallet/operation/create_tx.rs    |  6 +++---
 src/gui/element/wallet/operation/open.rs         |  4 ++--
 .../element/wallet/operation/show_slatepack.rs   |  2 +-
 src/gui/mod.rs                                   |  2 +-
 src/gui/time.rs                                  | 16 ++++++++++------
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
index e6201d1..bbddbc0 100644
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -11,7 +11,7 @@ pub mod error;
 pub mod fs;
 pub mod theme;
 pub mod network;
-#[cfg(feature = "gui")]
+#[cfg(feature = "wgpu")]
 pub mod utility;
 
 #[macro_use]
diff --git a/src/gui/element/settings/general.rs b/src/gui/element/settings/general.rs
index 5e12803..0decc44 100644
--- a/src/gui/element/settings/general.rs
+++ b/src/gui/element/settings/general.rs
@@ -396,7 +396,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
         let theme_input = TextInput::new(
             &localized_string("paste-url")[..],
             &state.theme_state.input_url,
-            |s| Interaction::GeneralSettingsViewInteraction(LocalViewInteraction::ThemeUrlInput(s)),
+            //|s| Interaction::GeneralSettingsViewInteraction(LocalViewInteraction::ThemeUrlInput(s)),
         )
         .size(DEFAULT_FONT_SIZE)
         .padding(6)
diff --git a/src/gui/element/wallet/operation/create_tx.rs b/src/gui/element/wallet/operation/create_tx.rs
index 982244c..65105c1 100644
--- a/src/gui/element/wallet/operation/create_tx.rs
+++ b/src/gui/element/wallet/operation/create_tx.rs
@@ -219,11 +219,11 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
     let recipient_address_container = Container::new(recipient_address)
         .style(grin_gui_core::theme::ContainerStyle::NormalBackground);
 
-    let recipient_address_input = TextInput::new("", &state.recipient_address_value, |s| {
+    let recipient_address_input = TextInput::new("", &state.recipient_address_value,/*  |s| {
         Interaction::WalletOperationCreateTxViewInteraction(LocalViewInteraction::RecipientAddress(
             s,
         ))
-    })
+    }*/)
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
     .width(Length::Fixed(400.0))
@@ -250,7 +250,7 @@ pub fn data_container<'a>(config: &'a Config, state: &'a StateContainer) -> Cont
         // &mut state.amount_input_state,
         "",
         &state.amount_value,
-        |s| Interaction::WalletOperationCreateTxViewInteraction(LocalViewInteraction::Amount(s)),
+        //|s| Interaction::WalletOperationCreateTxViewInteraction(LocalViewInteraction::Amount(s)),
     )
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
diff --git a/src/gui/element/wallet/operation/open.rs b/src/gui/element/wallet/operation/open.rs
index 2e35e2c..7678e08 100644
--- a/src/gui/element/wallet/operation/open.rs
+++ b/src/gui/element/wallet/operation/open.rs
@@ -189,11 +189,11 @@ pub fn data_container<'a>(
             // &mut state.password_state.input_state,
             &localized_string("password")[..],
             &state.password_state.input_value,
-            |s| {
+            /*|s| {
                 Interaction::WalletOperationOpenViewInteraction(
                     LocalViewInteraction::PasswordInput(s),
                 )
-            },
+            }*/
         )
         .on_submit(Interaction::WalletOperationOpenViewInteraction(
             LocalViewInteraction::PasswordInputEnterPressed,
diff --git a/src/gui/element/wallet/operation/show_slatepack.rs b/src/gui/element/wallet/operation/show_slatepack.rs
index e2d2653..45c78ed 100644
--- a/src/gui/element/wallet/operation/show_slatepack.rs
+++ b/src/gui/element/wallet/operation/show_slatepack.rs
@@ -95,7 +95,7 @@ pub fn data_container<'a>(
     let header_container = Container::new(header_row).padding(iced::Padding::from([
         0,               // top
         0,               // right
-        DEFAULT_PADDING, // bottom
+        DEFAULT_PADDING as u16, // bottom
         0,               // left
     ]));
 
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index c34ef06..dfe0a90 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -127,7 +127,7 @@ pub enum Message {
     SendNodeMessage((usize, UIMessage, Option<mpsc::Sender<UIMessage>>)),
     Interaction(Interaction),
     Tick(chrono::DateTime<chrono::Local>),
-    RuntimeEvent(iced::iced_core::Event),
+    RuntimeEvent(iced_core::Event),
     None(()),
 }
 
diff --git a/src/gui/time.rs b/src/gui/time.rs
index 9fd27f6..59587fc 100644
--- a/src/gui/time.rs
+++ b/src/gui/time.rs
@@ -1,4 +1,10 @@
-use iced::futures;
+use iced_futures::{
+    self,
+    subscription
+};
+
+use iced_core::Hasher;
+use std::hash::Hash;
 
 pub fn every(duration: std::time::Duration) -> iced::Subscription<chrono::DateTime<chrono::Local>> {
     iced::Subscription::from_recipe(Every(duration))
@@ -6,13 +12,11 @@ pub fn every(duration: std::time::Duration) -> iced::Subscription<chrono::DateTi
 
 struct Every(std::time::Duration);
 
-impl<H, I> iced_futures::subscription::Recipe<H, I> for Every
-where
-    H: std::hash::Hasher,
+impl iced_futures::subscription::Recipe for Every
 {
     type Output = chrono::DateTime<chrono::Local>;
 
-    fn hash(&self, state: &mut H) {
+    fn hash(&self, state: &mut Hasher) {
         use std::hash::Hash;
 
         std::any::TypeId::of::<Self>().hash(state);
@@ -21,7 +25,7 @@ where
 
     fn stream(
         self: Box<Self>,
-        _input: futures::stream::BoxStream<'static, I>,
+        _input: subscription::EventStream,
     ) -> futures::stream::BoxStream<'static, Self::Output> {
         use futures::stream::StreamExt;
 

From ebabfbc929a7e50b5289c04f80dcae26a97e7925 Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 17 Aug 2023 13:38:22 +0100
Subject: [PATCH 10/11] fix modal widget

---
 src/gui/element/wallet/setup/wallet_setup.rs | 14 +++++++-------
 src/gui/mod.rs                               | 11 ++++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/gui/element/wallet/setup/wallet_setup.rs b/src/gui/element/wallet/setup/wallet_setup.rs
index d058fdc..8b88623 100644
--- a/src/gui/element/wallet/setup/wallet_setup.rs
+++ b/src/gui/element/wallet/setup/wallet_setup.rs
@@ -302,11 +302,11 @@ pub fn data_container<'a>(
         let password_input = TextInput::new(
             &localized_string("password")[..],
             &state.password_state.input_value,
-            |s| {
+            /*|s| {
                 Interaction::WalletSetupWalletViewInteraction(LocalViewInteraction::PasswordInput(
                     s,
                 ))
-            },
+            },*/
         )
         .on_submit(Interaction::WalletSetupWalletViewInteraction(
             LocalViewInteraction::PasswordInputEnterPressed,
@@ -322,11 +322,11 @@ pub fn data_container<'a>(
         let repeat_password_input = TextInput::new(
             &localized_string("password-repeat")[..],
             &state.password_state.repeat_input_value,
-            |s| {
+            /*|s| {
                 Interaction::WalletSetupWalletViewInteraction(
                     LocalViewInteraction::PasswordRepeatInput(s),
                 )
-            },
+            },*/
         )
         .on_submit(Interaction::WalletSetupWalletViewInteraction(
             LocalViewInteraction::PasswordRepeatInputEnterPressed,
@@ -415,9 +415,9 @@ pub fn data_container<'a>(
     };
 
     // ** start hideable restore from seed section
-    let seed_input: Element<Interaction> = TextInput::new("seed", &state.seed_input_value, |s| {
+    let seed_input: Element<Interaction> = TextInput::new("seed", &state.seed_input_value/*, |s| {
         Interaction::WalletSetupWalletViewInteraction(LocalViewInteraction::SeedInput(s))
-    })
+    }*/)
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
     .width(Length::Fixed(200.0))
@@ -446,7 +446,7 @@ pub fn data_container<'a>(
     let display_name_input = TextInput::new(
         default_display_name,
         &state.advanced_options_state.display_name_value,
-        |s| Interaction::WalletSetupWalletViewInteraction(LocalViewInteraction::DisplayName(s)),
+        /*|s| Interaction::WalletSetupWalletViewInteraction(LocalViewInteraction::DisplayName(s)),*/
     )
     .size(DEFAULT_FONT_SIZE)
     .padding(6)
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index dfe0a90..d71ab67 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -260,7 +260,7 @@ impl Application for GrinGui {
             }
         }
  
-        let content: Element<Message> = 
+        let underlay: Element<Message> = 
         // Wraps everything in a container.
         Container::new(content)
             .width(Length::Fill)
@@ -268,7 +268,7 @@ impl Application for GrinGui {
             .style(grin_gui_core::theme::ContainerStyle::NormalBackground)
             .into();
 
-        Modal::new(self.show_modal, content, move|| {
+        let content: Element<Message> =
             match self.modal_type {
                 ModalType::Exit => element::modal::exit_card().into(),
                 ModalType::Error => {
@@ -278,8 +278,9 @@ impl Application for GrinGui {
 
                     element::modal::error_card(error_cause.clone()).into()
                 }
-            }
-        })
+            };
+
+        Modal::new(self.show_modal, underlay, content)
         .on_esc(Message::Interaction(Interaction::CloseErrorModal))
         .style(grin_gui_core::theme::ModalStyle::Normal)
         .into()
@@ -337,7 +338,7 @@ pub fn run(opts: Opts, config: Config) {
         .expect("loading icon")
         .to_rgba8();
     let (width, height) = image.dimensions();
-    let icon = iced::window::Icon::from_rgba(image.into_raw(), width, height);
+    let icon = iced_core::window::icon::from_rgba(image.into_raw(), width, height);
     settings.window.icon = Some(icon.unwrap());
 
     settings.flags = config;

From dc1836d91f4c51c8bd3c49cdace06e45356d88ac Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 17 Aug 2023 13:45:58 +0100
Subject: [PATCH 11/11] building but core dumping

---
 src/gui/element/wallet/operation/chart.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/element/wallet/operation/chart.rs b/src/gui/element/wallet/operation/chart.rs
index 8b41095..93d217e 100644
--- a/src/gui/element/wallet/operation/chart.rs
+++ b/src/gui/element/wallet/operation/chart.rs
@@ -30,7 +30,7 @@ use std::{borrow::Borrow, collections::VecDeque};
 const CHART_CAPTION_HEAD: u16 = 20;
 const CHART_CAPTION_SUB: u16 = 12;
 
-const FONT_REGULAR: Font = Font::External {
+/*const FONT_REGULAR: Font = Font::External {
     name: "sans-serif-regular",
     bytes: include_bytes!("../../../../../fonts/notosans-regular.ttf"),
 };
@@ -38,7 +38,7 @@ const FONT_REGULAR: Font = Font::External {
 const FONT_BOLD: Font = Font::External {
     name: "sans-serif-bold",
     bytes: include_bytes!("../../../../../fonts/notosans-bold.ttf"),
-};
+};*/
 
 #[derive(Default)]
 pub struct BalanceChart {
@@ -70,14 +70,14 @@ impl BalanceChart {
                 .width(Length::Fill)
                 .height(Length::Fill)
                 .spacing(5)
-                .push(
+                /* .push(
                     ChartWidget::new(chart).height(Length::Fill).resolve_font(
                         |_, style| match style {
                             plotters_backend::FontStyle::Bold => FONT_BOLD,
                             _ => FONT_REGULAR,
                         },
                     ),
-                ),
+                ),*/
         )
         .width(Length::Fill)
         .height(Length::Fill)