diff --git a/Cargo.lock b/Cargo.lock
index b32d567..60a6ee8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -754,10 +754,6 @@ dependencies = [
 [[package]]
 name = "build_helpers"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "cfg_aliases",
 ]
@@ -1073,10 +1069,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "1.0.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1097,10 +1089,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "1.0.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "quote",
  "syn 2.0.119",
@@ -1193,10 +1181,6 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "1.0.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "almost",
  "configparser",
@@ -2577,10 +2561,6 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "build_helpers",
  "dnd",
@@ -2602,10 +2582,6 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -2614,10 +2590,6 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "bitflags 2.13.1",
  "build_helpers",
@@ -2643,10 +2615,6 @@ dependencies = [
 [[package]]
 name = "iced_debug"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2656,10 +2624,6 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "futures",
  "iced_core",
@@ -2673,10 +2637,6 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "bitflags 2.13.1",
  "bytemuck",
@@ -2697,10 +2657,6 @@ dependencies = [
 [[package]]
 name = "iced_program"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -2709,10 +2665,6 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2724,10 +2676,6 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "build_helpers",
  "bytes",
@@ -2743,10 +2691,6 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -2763,10 +2707,6 @@ dependencies = [
 [[package]]
 name = "iced_video_player"
 version = "0.6.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/wash2/iced_video_player.git?branch=iced-rebase#2e82b6b08d1751924b7b21b8c56683cdbc57bc33"
->>>>>>> epoch-1.8.0
 dependencies = [
  "glib",
  "gstreamer",
@@ -2784,10 +2724,6 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "bitflags 2.13.1",
  "build_helpers",
@@ -2816,10 +2752,6 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.14.2"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "build_helpers",
  "cosmic-client-toolkit",
@@ -2838,10 +2770,6 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.14.0"
-<<<<<<< HEAD
-=======
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "build_helpers",
  "cosmic-client-toolkit",
@@ -3448,14 +3376,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
 
 [[package]]
-<<<<<<< HEAD
 name = "libcosmic-yoda"
 version = "0.1.0-yoda.2"
-=======
-name = "libcosmic"
-version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9cc82abd9ca5601bb0341edd12a9acbc97e77801"
->>>>>>> epoch-1.8.0
 dependencies = [
  "apply",
  "ashpd 0.12.3",
@@ -4249,9 +4171,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "open"
-version = "5.4.2"
+version = "5.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade3be4664bc1ef537ce133015f04c176b737815c2ba9fd60edf212d6e90dd55"
+checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc"
 dependencies = [
  "is-wsl",
  "libc",