diff --git a/assets/themes/rose-pine-dawn.json b/assets/themes/rose-pine-dawn.json
index 04caab1..e30cc2a 100644
--- a/assets/themes/rose-pine-dawn.json
+++ b/assets/themes/rose-pine-dawn.json
@@ -2,7 +2,7 @@
   "id": "rose-pine-dawn",
   "name": "Rosé Pine Dawn",
   "author": "Rosé Pine",
-  "url": "https://rosepinetheme.com",
+  "url": "https://rosepinetheme.com/",
   "light": {
     "background": "#faf4ed",
     "surface_background": "#fffaf3",
@@ -10,48 +10,48 @@
     "panel_background": "#faf4ed",
     "overlay": "#5752791a",
     "title_bar": "#fffaf3",
-    "title_bar_inactive": "#faf4ed",
+    "title_bar_inactive": "#f2e9e1",
     "window_border": "#cecacd",
     "border": "#dfdad9",
     "border_variant": "#f4ede8",
     "border_focused": "#907aa9",
     "border_selected": "#907aa9",
     "border_transparent": "#00000000",
-    "border_disabled": "#9893a5",
+    "border_disabled": "#f2e9e1",
     "ring": "#907aa9",
     "text": "#575279",
     "text_muted": "#797593",
     "text_placeholder": "#9893a5",
     "text_accent": "#907aa9",
-    "icon": "#575279",
-    "icon_muted": "#797593",
+    "icon": "#797593",
+    "icon_muted": "#9893a5",
     "icon_accent": "#907aa9",
     "element_foreground": "#faf4ed",
     "element_background": "#907aa9",
     "element_hover": "#907aa9e6",
-    "element_active": "#826e98",
-    "element_selected": "#746287",
+    "element_active": "#826b95",
+    "element_selected": "#745c81",
     "element_disabled": "#907aa94d",
-    "secondary_foreground": "#746287",
+    "secondary_foreground": "#745c81",
     "secondary_background": "#fffaf3",
-    "secondary_hover": "#907aa933",
+    "secondary_hover": "#907aa91a",
     "secondary_active": "#f2e9e1",
     "secondary_selected": "#f2e9e1",
     "secondary_disabled": "#907aa94d",
     "danger_foreground": "#faf4ed",
     "danger_background": "#b4637a",
-    "danger_hover": "#b4637ae6",
-    "danger_active": "#a2596e",
-    "danger_selected": "#904f62",
+    "danger_hover": "#a7586e",
+    "danger_active": "#9a4d62",
+    "danger_selected": "#8d4256",
     "danger_disabled": "#b4637a4d",
     "warning_foreground": "#575279",
     "warning_background": "#ea9d34",
-    "warning_hover": "#ea9d34e6",
-    "warning_active": "#d38d2f",
-    "warning_selected": "#bc7d2a",
+    "warning_hover": "#d98e2f",
+    "warning_active": "#c87f2a",
+    "warning_selected": "#b77025",
     "warning_disabled": "#ea9d344d",
     "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#f4ede8",
+    "ghost_element_background_alt": "#f2e9e1",
     "ghost_element_hover": "#5752791a",
     "ghost_element_active": "#dfdad9",
     "ghost_element_selected": "#dfdad9",
@@ -65,10 +65,10 @@
     "scrollbar_thumb_hover_background": "#5752794d",
     "scrollbar_thumb_border": "#00000000",
     "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#f4ede8",
+    "scrollbar_track_border": "#dfdad9",
     "drop_target_background": "#907aa91a",
-    "cursor": "#56949f",
-    "selection": "#56949f40"
+    "cursor": "#907aa9",
+    "selection": "#907aa940"
   },
   "dark": {
     "background": "#faf4ed",
@@ -77,48 +77,48 @@
     "panel_background": "#faf4ed",
     "overlay": "#5752791a",
     "title_bar": "#fffaf3",
-    "title_bar_inactive": "#faf4ed",
+    "title_bar_inactive": "#f2e9e1",
     "window_border": "#cecacd",
     "border": "#dfdad9",
     "border_variant": "#f4ede8",
     "border_focused": "#907aa9",
     "border_selected": "#907aa9",
     "border_transparent": "#00000000",
-    "border_disabled": "#9893a5",
+    "border_disabled": "#f2e9e1",
     "ring": "#907aa9",
     "text": "#575279",
     "text_muted": "#797593",
     "text_placeholder": "#9893a5",
     "text_accent": "#907aa9",
-    "icon": "#575279",
-    "icon_muted": "#797593",
+    "icon": "#797593",
+    "icon_muted": "#9893a5",
     "icon_accent": "#907aa9",
     "element_foreground": "#faf4ed",
     "element_background": "#907aa9",
     "element_hover": "#907aa9e6",
-    "element_active": "#826e98",
-    "element_selected": "#746287",
+    "element_active": "#826b95",
+    "element_selected": "#745c81",
     "element_disabled": "#907aa94d",
-    "secondary_foreground": "#746287",
+    "secondary_foreground": "#745c81",
     "secondary_background": "#fffaf3",
-    "secondary_hover": "#907aa933",
+    "secondary_hover": "#907aa91a",
     "secondary_active": "#f2e9e1",
     "secondary_selected": "#f2e9e1",
     "secondary_disabled": "#907aa94d",
     "danger_foreground": "#faf4ed",
     "danger_background": "#b4637a",
-    "danger_hover": "#b4637ae6",
-    "danger_active": "#a2596e",
-    "danger_selected": "#904f62",
+    "danger_hover": "#a7586e",
+    "danger_active": "#9a4d62",
+    "danger_selected": "#8d4256",
     "danger_disabled": "#b4637a4d",
     "warning_foreground": "#575279",
     "warning_background": "#ea9d34",
-    "warning_hover": "#ea9d34e6",
-    "warning_active": "#d38d2f",
-    "warning_selected": "#bc7d2a",
+    "warning_hover": "#d98e2f",
+    "warning_active": "#c87f2a",
+    "warning_selected": "#b77025",
     "warning_disabled": "#ea9d344d",
     "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#f4ede8",
+    "ghost_element_background_alt": "#f2e9e1",
     "ghost_element_hover": "#5752791a",
     "ghost_element_active": "#dfdad9",
     "ghost_element_selected": "#dfdad9",
@@ -132,9 +132,9 @@
     "scrollbar_thumb_hover_background": "#5752794d",
     "scrollbar_thumb_border": "#00000000",
     "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#f4ede8",
+    "scrollbar_track_border": "#dfdad9",
     "drop_target_background": "#907aa91a",
-    "cursor": "#56949f",
-    "selection": "#56949f40"
+    "cursor": "#907aa9",
+    "selection": "#907aa940"
   }
 }
diff --git a/assets/themes/rose-pine-moon.json b/assets/themes/rose-pine-moon.json
index f7a9fda..37b8ef6 100644
--- a/assets/themes/rose-pine-moon.json
+++ b/assets/themes/rose-pine-moon.json
@@ -2,7 +2,7 @@
   "id": "rose-pine-moon",
   "name": "Rosé Pine Moon",
   "author": "Rosé Pine",
-  "url": "https://rosepinetheme.com",
+  "url": "https://rosepinetheme.com/",
   "light": {
     "background": "#232136",
     "surface_background": "#2a273f",
@@ -10,49 +10,49 @@
     "panel_background": "#232136",
     "overlay": "#e0def41a",
     "title_bar": "#2a273f",
-    "title_bar_inactive": "#232136",
+    "title_bar_inactive": "#393552",
     "window_border": "#56526e",
     "border": "#44415a",
-    "border_variant": "#2a283e",
+    "border_variant": "#393552",
     "border_focused": "#c4a7e7",
     "border_selected": "#c4a7e7",
     "border_transparent": "#00000000",
-    "border_disabled": "#6e6a86",
+    "border_disabled": "#393552",
     "ring": "#c4a7e7",
     "text": "#e0def4",
     "text_muted": "#908caa",
     "text_placeholder": "#6e6a86",
     "text_accent": "#c4a7e7",
-    "icon": "#e0def4",
-    "icon_muted": "#908caa",
+    "icon": "#908caa",
+    "icon_muted": "#6e6a86",
     "icon_accent": "#c4a7e7",
     "element_foreground": "#232136",
     "element_background": "#c4a7e7",
     "element_hover": "#c4a7e7e6",
-    "element_active": "#b097d0",
-    "element_selected": "#9d87b9",
+    "element_active": "#b296d6",
+    "element_selected": "#a085c5",
     "element_disabled": "#c4a7e74d",
-    "secondary_foreground": "#9d87b9",
-    "secondary_background": "#2a273f",
-    "secondary_hover": "#c4a7e733",
-    "secondary_active": "#393552",
-    "secondary_selected": "#393552",
+    "secondary_foreground": "#a085c5",
+    "secondary_background": "#393552",
+    "secondary_hover": "#c4a7e71a",
+    "secondary_active": "#44415a",
+    "secondary_selected": "#44415a",
     "secondary_disabled": "#c4a7e74d",
     "danger_foreground": "#232136",
     "danger_background": "#eb6f92",
-    "danger_hover": "#eb6f92e6",
-    "danger_active": "#d46483",
-    "danger_selected": "#bd5974",
+    "danger_hover": "#e55a82",
+    "danger_active": "#df4572",
+    "danger_selected": "#d93062",
     "danger_disabled": "#eb6f924d",
     "warning_foreground": "#232136",
     "warning_background": "#f6c177",
-    "warning_hover": "#f6c177e6",
-    "warning_active": "#ddae6b",
-    "warning_selected": "#c49b5f",
+    "warning_hover": "#f4b35e",
+    "warning_active": "#f2a545",
+    "warning_selected": "#f0972c",
     "warning_disabled": "#f6c1774d",
     "ghost_element_background": "#00000000",
     "ghost_element_background_alt": "#393552",
-    "ghost_element_hover": "#e0def433",
+    "ghost_element_hover": "#e0def41a",
     "ghost_element_active": "#44415a",
     "ghost_element_selected": "#44415a",
     "ghost_element_disabled": "#e0def40d",
@@ -65,10 +65,10 @@
     "scrollbar_thumb_hover_background": "#e0def44d",
     "scrollbar_thumb_border": "#00000000",
     "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#2a283e",
+    "scrollbar_track_border": "#44415a",
     "drop_target_background": "#c4a7e71a",
-    "cursor": "#9ccfd8",
-    "selection": "#9ccfd840"
+    "cursor": "#c4a7e7",
+    "selection": "#c4a7e740"
   },
   "dark": {
     "background": "#232136",
@@ -77,49 +77,49 @@
     "panel_background": "#232136",
     "overlay": "#e0def41a",
     "title_bar": "#2a273f",
-    "title_bar_inactive": "#232136",
+    "title_bar_inactive": "#393552",
     "window_border": "#56526e",
     "border": "#44415a",
-    "border_variant": "#2a283e",
+    "border_variant": "#393552",
     "border_focused": "#c4a7e7",
     "border_selected": "#c4a7e7",
     "border_transparent": "#00000000",
-    "border_disabled": "#6e6a86",
+    "border_disabled": "#393552",
     "ring": "#c4a7e7",
     "text": "#e0def4",
     "text_muted": "#908caa",
     "text_placeholder": "#6e6a86",
     "text_accent": "#c4a7e7",
-    "icon": "#e0def4",
-    "icon_muted": "#908caa",
+    "icon": "#908caa",
+    "icon_muted": "#6e6a86",
     "icon_accent": "#c4a7e7",
     "element_foreground": "#232136",
     "element_background": "#c4a7e7",
     "element_hover": "#c4a7e7e6",
-    "element_active": "#b097d0",
-    "element_selected": "#9d87b9",
+    "element_active": "#b296d6",
+    "element_selected": "#a085c5",
     "element_disabled": "#c4a7e74d",
-    "secondary_foreground": "#9d87b9",
-    "secondary_background": "#2a273f",
-    "secondary_hover": "#c4a7e733",
-    "secondary_active": "#393552",
-    "secondary_selected": "#393552",
+    "secondary_foreground": "#a085c5",
+    "secondary_background": "#393552",
+    "secondary_hover": "#c4a7e71a",
+    "secondary_active": "#44415a",
+    "secondary_selected": "#44415a",
     "secondary_disabled": "#c4a7e74d",
     "danger_foreground": "#232136",
     "danger_background": "#eb6f92",
-    "danger_hover": "#eb6f92e6",
-    "danger_active": "#d46483",
-    "danger_selected": "#bd5974",
+    "danger_hover": "#e55a82",
+    "danger_active": "#df4572",
+    "danger_selected": "#d93062",
     "danger_disabled": "#eb6f924d",
     "warning_foreground": "#232136",
     "warning_background": "#f6c177",
-    "warning_hover": "#f6c177e6",
-    "warning_active": "#ddae6b",
-    "warning_selected": "#c49b5f",
+    "warning_hover": "#f4b35e",
+    "warning_active": "#f2a545",
+    "warning_selected": "#f0972c",
     "warning_disabled": "#f6c1774d",
     "ghost_element_background": "#00000000",
     "ghost_element_background_alt": "#393552",
-    "ghost_element_hover": "#e0def433",
+    "ghost_element_hover": "#e0def41a",
     "ghost_element_active": "#44415a",
     "ghost_element_selected": "#44415a",
     "ghost_element_disabled": "#e0def40d",
@@ -132,9 +132,9 @@
     "scrollbar_thumb_hover_background": "#e0def44d",
     "scrollbar_thumb_border": "#00000000",
     "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#2a283e",
+    "scrollbar_track_border": "#44415a",
     "drop_target_background": "#c4a7e71a",
-    "cursor": "#9ccfd8",
-    "selection": "#9ccfd840"
+    "cursor": "#c4a7e7",
+    "selection": "#c4a7e740"
   }
 }
diff --git a/assets/themes/rose-pine.json b/assets/themes/rose-pine.json
index 2299ae0..703fa5c 100644
--- a/assets/themes/rose-pine.json
+++ b/assets/themes/rose-pine.json
@@ -2,7 +2,7 @@
   "id": "rose-pine",
   "name": "Rosé Pine",
   "author": "Rosé Pine",
-  "url": "https://rosepinetheme.com",
+  "url": "https://rosepinetheme.com/",
   "light": {
     "background": "#191724",
     "surface_background": "#1f1d2e",
@@ -10,49 +10,49 @@
     "panel_background": "#191724",
     "overlay": "#e0def41a",
     "title_bar": "#1f1d2e",
-    "title_bar_inactive": "#191724",
+    "title_bar_inactive": "#26233a",
     "window_border": "#524f67",
     "border": "#403d52",
-    "border_variant": "#21202e",
+    "border_variant": "#26233a",
     "border_focused": "#c4a7e7",
     "border_selected": "#c4a7e7",
     "border_transparent": "#00000000",
-    "border_disabled": "#6e6a86",
+    "border_disabled": "#26233a",
     "ring": "#c4a7e7",
     "text": "#e0def4",
     "text_muted": "#908caa",
     "text_placeholder": "#6e6a86",
     "text_accent": "#c4a7e7",
-    "icon": "#e0def4",
-    "icon_muted": "#908caa",
+    "icon": "#908caa",
+    "icon_muted": "#6e6a86",
     "icon_accent": "#c4a7e7",
     "element_foreground": "#191724",
     "element_background": "#c4a7e7",
     "element_hover": "#c4a7e7e6",
-    "element_active": "#b097d0",
-    "element_selected": "#9d87b9",
+    "element_active": "#b296d6",
+    "element_selected": "#a085c5",
     "element_disabled": "#c4a7e74d",
-    "secondary_foreground": "#9d87b9",
-    "secondary_background": "#1f1d2e",
-    "secondary_hover": "#c4a7e733",
-    "secondary_active": "#26233a",
-    "secondary_selected": "#26233a",
+    "secondary_foreground": "#a085c5",
+    "secondary_background": "#26233a",
+    "secondary_hover": "#c4a7e71a",
+    "secondary_active": "#403d52",
+    "secondary_selected": "#403d52",
     "secondary_disabled": "#c4a7e74d",
     "danger_foreground": "#191724",
     "danger_background": "#eb6f92",
-    "danger_hover": "#eb6f92e6",
-    "danger_active": "#d46483",
-    "danger_selected": "#bd5974",
+    "danger_hover": "#e55a82",
+    "danger_active": "#df4572",
+    "danger_selected": "#d93062",
     "danger_disabled": "#eb6f924d",
     "warning_foreground": "#191724",
     "warning_background": "#f6c177",
-    "warning_hover": "#f6c177e6",
-    "warning_active": "#ddae6b",
-    "warning_selected": "#c49b5f",
+    "warning_hover": "#f4b35e",
+    "warning_active": "#f2a545",
+    "warning_selected": "#f0972c",
     "warning_disabled": "#f6c1774d",
     "ghost_element_background": "#00000000",
     "ghost_element_background_alt": "#26233a",
-    "ghost_element_hover": "#e0def433",
+    "ghost_element_hover": "#e0def41a",
     "ghost_element_active": "#403d52",
     "ghost_element_selected": "#403d52",
     "ghost_element_disabled": "#e0def40d",
@@ -65,10 +65,10 @@
     "scrollbar_thumb_hover_background": "#e0def44d",
     "scrollbar_thumb_border": "#00000000",
     "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#21202e",
+    "scrollbar_track_border": "#403d52",
     "drop_target_background": "#c4a7e71a",
-    "cursor": "#9ccfd8",
-    "selection": "#9ccfd840"
+    "cursor": "#c4a7e7",
+    "selection": "#c4a7e740"
   },
   "dark": {
     "background": "#191724",
@@ -77,49 +77,49 @@
     "panel_background": "#191724",
     "overlay": "#e0def41a",
     "title_bar": "#1f1d2e",
-    "title_bar_inactive": "#191724",
+    "title_bar_inactive": "#26233a",
     "window_border": "#524f67",
     "border": "#403d52",
-    "border_variant": "#21202e",
+    "border_variant": "#26233a",
     "border_focused": "#c4a7e7",
     "border_selected": "#c4a7e7",
     "border_transparent": "#00000000",
-    "border_disabled": "#6e6a86",
+    "border_disabled": "#26233a",
     "ring": "#c4a7e7",
     "text": "#e0def4",
     "text_muted": "#908caa",
     "text_placeholder": "#6e6a86",
     "text_accent": "#c4a7e7",
-    "icon": "#e0def4",
-    "icon_muted": "#908caa",
+    "icon": "#908caa",
+    "icon_muted": "#6e6a86",
     "icon_accent": "#c4a7e7",
     "element_foreground": "#191724",
     "element_background": "#c4a7e7",
     "element_hover": "#c4a7e7e6",
-    "element_active": "#b097d0",
-    "element_selected": "#9d87b9",
+    "element_active": "#b296d6",
+    "element_selected": "#a085c5",
     "element_disabled": "#c4a7e74d",
-    "secondary_foreground": "#9d87b9",
-    "secondary_background": "#1f1d2e",
-    "secondary_hover": "#c4a7e733",
-    "secondary_active": "#26233a",
-    "secondary_selected": "#26233a",
+    "secondary_foreground": "#a085c5",
+    "secondary_background": "#26233a",
+    "secondary_hover": "#c4a7e71a",
+    "secondary_active": "#403d52",
+    "secondary_selected": "#403d52",
     "secondary_disabled": "#c4a7e74d",
     "danger_foreground": "#191724",
     "danger_background": "#eb6f92",
-    "danger_hover": "#eb6f92e6",
-    "danger_active": "#d46483",
-    "danger_selected": "#bd5974",
+    "danger_hover": "#e55a82",
+    "danger_active": "#df4572",
+    "danger_selected": "#d93062",
     "danger_disabled": "#eb6f924d",
     "warning_foreground": "#191724",
     "warning_background": "#f6c177",
-    "warning_hover": "#f6c177e6",
-    "warning_active": "#ddae6b",
-    "warning_selected": "#c49b5f",
+    "warning_hover": "#f4b35e",
+    "warning_active": "#f2a545",
+    "warning_selected": "#f0972c",
     "warning_disabled": "#f6c1774d",
     "ghost_element_background": "#00000000",
     "ghost_element_background_alt": "#26233a",
-    "ghost_element_hover": "#e0def433",
+    "ghost_element_hover": "#e0def41a",
     "ghost_element_active": "#403d52",
     "ghost_element_selected": "#403d52",
     "ghost_element_disabled": "#e0def40d",
@@ -132,9 +132,9 @@
     "scrollbar_thumb_hover_background": "#e0def44d",
     "scrollbar_thumb_border": "#00000000",
     "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#21202e",
+    "scrollbar_track_border": "#403d52",
     "drop_target_background": "#c4a7e71a",
-    "cursor": "#9ccfd8",
-    "selection": "#9ccfd840"
+    "cursor": "#c4a7e7",
+    "selection": "#c4a7e740"
   }
 }
diff --git a/crates/coop/src/sidebar/mod.rs b/crates/coop/src/sidebar/mod.rs
index a07ad17..be74034 100644
--- a/crates/coop/src/sidebar/mod.rs
+++ b/crates/coop/src/sidebar/mod.rs
@@ -499,7 +499,7 @@ impl Render for Sidebar {
                 h_flex()
                     .h(TABBAR_HEIGHT)
                     .border_b_1()
-                    .border_color(cx.theme().border_variant)
+                    .border_color(cx.theme().border)
                     .bg(cx.theme().elevated_surface_background)
                     .child(
                         TextInput::new(&self.find_input)
diff --git a/crates/title_bar/src/lib.rs b/crates/title_bar/src/lib.rs
index de7f670..388ff07 100644
--- a/crates/title_bar/src/lib.rs
+++ b/crates/title_bar/src/lib.rs
@@ -106,7 +106,7 @@ impl Render for TitleBar {
             })
             .bg(color)
             .border_b_1()
-            .border_color(cx.theme().border_variant)
+            .border_color(cx.theme().border)
             .content_stretch()
             .child(
                 h_flex()
diff --git a/crates/ui/src/resizable/resize_handle.rs b/crates/ui/src/resizable/resize_handle.rs
index c4dd409..b84354d 100644
--- a/crates/ui/src/resizable/resize_handle.rs
+++ b/crates/ui/src/resizable/resize_handle.rs
@@ -115,7 +115,7 @@ impl<T: 'static, E: 'static + Render> Element for ResizeHandle<T, E> {
             let bg_color = if state.is_active() {
                 cx.theme().border_selected
             } else {
-                cx.theme().border_variant
+                cx.theme().border
             };
 
             let mut el = div()