diff --git a/Cargo.lock b/Cargo.lock
index c37f2ce..827d5e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -293,7 +293,6 @@ dependencies = [
 [[package]]
 name = "cosmic-dbus-a11y"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
 dependencies = [
  "zbus",
 ]
@@ -1885,3 +1884,63 @@ dependencies = [
  "syn",
  "winnow",
 ]
+
+[[patch.unused]]
+name = "smithay-clipboard"
+version = "0.8.0"
+
+[[patch.unused]]
+name = "dpi"
+version = "0.1.2"
+
+[[patch.unused]]
+name = "winit"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-android"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-appkit"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-common"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-core"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-orbital"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-uikit"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-wayland"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-web"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-win32"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "winit-x11"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "cosmic-freedesktop-icons"
+version = "0.4.0"
+
+[[patch.unused]]
+name = "softbuffer"
+version = "0.4.1"
diff --git a/Cargo.toml b/Cargo.toml
index 136af09..7445a7b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 [dependencies]
 color-eyre = "0.6"
 futures-util = "0.3"
-cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" }
+cosmic-dbus-a11y = { path = "../dbus-settings-bindings/a11y" }
 freedesktop-desktop-entry = { version = "0.8", optional = true }
 shell-words = { version = "1.1.1", optional = true }
 dirs = { version = "6.0.0", optional = true }
diff --git a/data/cosmic-mimeapps.list b/data/cosmic-mimeapps.list
index 8637e9b..bf748a7 100644
--- a/data/cosmic-mimeapps.list
+++ b/data/cosmic-mimeapps.list
@@ -160,20 +160,21 @@ application/vnd.debian.binary-package=com.system76.CosmicStore.desktop
 application/vnd.flatpak.ref=com.system76.CosmicStore.desktop
 x-scheme-handler/appstream=com.system76.CosmicStore.desktop
 x-scheme-handler/mime=com.system76.CosmicStore.desktop
-image/bmp=org.gnome.eog.desktop
-image/gif=org.gnome.eog.desktop
-image/jpeg=org.gnome.eog.desktop
-image/jpg=org.gnome.eog.desktop
-image/pjpeg=org.gnome.eog.desktop
-image/png=org.gnome.eog.desktop
-image/svg+xml=org.gnome.eog.desktop
+image/bmp=org.codeberg.wfx.Noctua.desktop
+image/gif=org.codeberg.wfx.Noctua.desktop
+image/jpeg=org.codeberg.wfx.Noctua.desktop
+image/jpg=org.codeberg.wfx.Noctua.desktop
+image/pjpeg=org.codeberg.wfx.Noctua.desktop
+image/png=org.codeberg.wfx.Noctua.desktop
+image/svg+xml=org.codeberg.wfx.Noctua.desktop
 image/svg+xml-compressed=org.gnome.eog.desktop
-image/x-bmp=org.gnome.eog.desktop
+image/webp=org.codeberg.wfx.Noctua.desktop
+image/x-bmp=org.codeberg.wfx.Noctua.desktop
 image/x-gray=org.gnome.eog.desktop
 image/x-icb=org.gnome.eog.desktop
 image/x-ico=org.gnome.eog.desktop
 image/x-pcx=org.gnome.eog.desktop
-image/x-png=org.gnome.eog.desktop
+image/x-png=org.codeberg.wfx.Noctua.desktop
 image/x-portable-anymap=org.gnome.eog.desktop
 image/x-portable-bitmap=org.gnome.eog.desktop
 image/x-portable-graymap=org.gnome.eog.desktop
@@ -191,7 +192,7 @@ image/x-sun-raster=gimp.desktop
 image/x-tga=gimp.desktop
 image/x-xcf=gimp.desktop
 image/x-xwindowdump=gimp.desktop
-application/pdf=org.gnome.Evince.desktop
+application/pdf=org.codeberg.wfx.Noctua.desktop
 application/x-bzpdf=org.gnome.Evince.desktop
 application/x-gzpdf=org.gnome.Evince.desktop
 application/postscript=org.gnome.Evince.desktop
@@ -204,7 +205,7 @@ application/x-dvi=org.gnome.Evince.desktop
 application/x-bzdvi=org.gnome.Evince.desktop
 application/x-gzdvi=org.gnome.Evince.desktop
 image/vnd.djvu=org.gnome.Evince.desktop
-image/tiff=org.gnome.Evince.desktop
+image/tiff=org.codeberg.wfx.Noctua.desktop
 application/x-cbr=org.gnome.Evince.desktop
 application/x-cbz=org.gnome.Evince.desktop
 application/x-cb7=org.gnome.Evince.desktop
diff --git a/debian/control b/debian/control
index 3fa9fb1..e8d41e0 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Depends:
   xwayland,
 Recommends:
   cosmic-edit,
+  cosmic-monitor,
   cosmic-player,
   cosmic-store,
   cosmic-term,
diff --git a/src/main.rs b/src/main.rs
index 07461b8..0f2c00f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -229,6 +229,7 @@ async fn start(
 		.start(
 			Process::new()
 				.with_executable("cosmic-settings-daemon")
+				.with_env(env_vars.iter().cloned())
 				.with_on_stdout(move |_, _, line| {
 					let stdout_span = stdout_span.clone();
 					async move {