diff --git a/Cargo.toml b/Cargo.toml
index d94127c..59d64bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,48 +4,63 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-default = []
-desktop = ["dioxus/desktop"]
-web = ["dioxus/web"]
+default = ["web"]
+desktop = ["dioxus/desktop", "tracing-subscriber/time"]
+web = ["dioxus/web", "matrix-sdk/js"]
 
 [dependencies]
-dioxus = "0.5.*"
-dioxus-sdk = { version = "0.5.*", features = ["utils"] }
-dioxus-free-icons = { version = "0.8.*", features = ["ionicons", "font-awesome-solid", "material-design-icons-navigation"] }
-modx = "0.1.2"
-
-# matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", branch = "main", default-features = false, features = ["js", "rustls-tls"] }
-matrix-sdk = { version = "0.7.*", default-features = false, features = ["js", "rustls-tls"] }
-
+# Errors
 anyhow = "1.0.75"
-url = "2.5.0"
-dirs = "5.0.1"
-ctrlc-async = "3.2.2"
 thiserror = "1.0.50"
-turf = "0.8.*"
-tokio = { version = "1.34.0", default-features = false, features = ["rt", "sync"] }
-log = "0.4.20"
-futures-util = "0.3.29"
-futures = "0.3.29"
-rand = "0.8.5"
-reqwest = "0.11.24"
-validator = { version = "0.17.0", features = ["derive"] }
-const_format = "0.2.32"
-zxcvbn = "2.2.2"
-async-std = "1.12.0"
-tracing = "0.1.40"
-tracing-web = "0.1.3"
-tracing-subscriber = "0.3.18"
-git-version = "0.3.9"
-async-trait = "0.1.80"
-tokio-stream = "0.1.15"
-image = "0.25.1"
 
+# Async
+async-std = "1.12.0"
+async-trait = "0.1.80"
+futures = "0.3.29"
+futures-util = "0.3.29"
+tokio = { version = "1.34.0", default-features = false, features = ["rt", "sync"] }
+tokio-stream = "0.1.15"
+
+# Utils
+base64 = "0.22.0"
+const_format = "0.2.32"
+rand = "0.8.5"
+validator = { version = "0.17.0", features = ["derive"] }
+# Http client
+reqwest = "0.11.24"
+# Password strength estimation
+zxcvbn = "2.2.2"
+# Image processing/conversion
+image = "0.25.1"
+# Get the application version
+git-version = "0.3.9"
+# Conditional compilation
+cfg-if = "1.0.0"
+
+# Logging/tracing
+tracing = "0.1.40"
+tracing-subscriber = "0.3.18"
+
+# SCSS -> CSS + usage in rust code
+turf = "0.8.0"
+
+# Matrix
+matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", default-features = false, features = ["rustls-tls"] }
+
+# Dioxus
+dioxus = { git = "https://github.com/ASR-ASU/dioxus.git", branch = "asr/add-scrolling-attributes" }
+dioxus-free-icons = { git = "https://github.com/ASR-ASU/dioxus-free-icons.git", features = ["ionicons", "font-awesome-solid"] }
+modx = "0.1.2"
 [target.'cfg(target_family = "wasm")'.dependencies]
 web-sys = "0.3.69"
+tracing-web = "0.1.3"
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+time = "0.3.36"
 
 [build-dependencies]
 regex = "1.10.3"
+
 [package.metadata.turf]
 minify = true
 
diff --git a/src/base.rs b/src/base.rs
index c906966..0cc57e1 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -2,7 +2,7 @@ use std::rc::Rc;
 
 use dioxus::prelude::*;
 use futures_util::stream::StreamExt;
-use log::{debug, error, warn};
+use tracing::{debug, error, warn};
 
 use crate::domain::model::account::Account;
 use crate::domain::model::messaging_interface::AccountMessagingProviderInterface;
diff --git a/src/infrastructure/services/random_svg_generators.rs b/src/infrastructure/services/random_svg_generators.rs
index 0132010..dd4faf3 100644
--- a/src/infrastructure/services/random_svg_generators.rs
+++ b/src/infrastructure/services/random_svg_generators.rs
@@ -3,9 +3,9 @@ use std::future::Future;
 use std::sync::OnceLock;
 use std::{collections::HashMap, future::IntoFuture};
 
-use log::error;
 use rand::distributions::{Alphanumeric, DistString};
 use reqwest::Result as RequestResult;
+use tracing::error;
 
 #[cfg(feature = "desktop")]
 use tokio::fs::read_to_string;
diff --git a/src/ui/components/login.rs b/src/ui/components/login.rs
index 2f68653..012654c 100644
--- a/src/ui/components/login.rs
+++ b/src/ui/components/login.rs
@@ -5,7 +5,7 @@ use std::rc::Rc;
 
 use const_format::formatcp;
 use dioxus::prelude::*;
-use log::{debug, error, warn};
+use tracing::{debug, error, warn};
 use validator::{Validate, ValidateArgs, ValidateEmail, ValidationError, ValidationErrors};
 use zxcvbn::zxcvbn;