diff --git a/libs/lib-core.sh b/libs/lib-core.sh
index 3b297e2b..a7db5f95 100755
--- a/libs/lib-core.sh
+++ b/libs/lib-core.sh
@@ -4,7 +4,7 @@
 # WARNING: Don't use "cd" in this shell, use it in a subshell instead,
 # for example ( cd blabla && do_blabla ) or $( cd .. && do_blabla )
 
-set -o pipefail
+set -Eeo pipefail
 
 if [[ ! "${REPO_DIR}" ]]; then
   echo "Please define 'REPODIR' variable"; exit 1
diff --git a/other/firefox/common/pages/common.css b/other/firefox/common/pages/common.css
index 0368c83e..dbbdf7e8 100644
--- a/other/firefox/common/pages/common.css
+++ b/other/firefox/common/pages/common.css
@@ -39,6 +39,33 @@
   }
 }
 
+@media (prefers-color-scheme: dark) {
+  @media not (forced-colors) {
+    html|dialog,
+    .dialogBox {
+      --in-content-page-background: var(--gnome-content-page-dialog-background) !important;
+    }
+  }
+}
+
+/* Dialog */
+.dialogBox {
+	margin: 0 !important;
+	background-color: var(--gnome-content-page-dialog-background) !important;
+	border-radius: 12px !important;
+	border: none !important;
+	box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08) !important;
+}
+
+.dialogBox window, .dialogBox dialog {
+	background: none !important;
+}
+
+.close-icon {
+	border-radius: 100px !important;
+	list-style-image: url("../icons/window-close-symbolic.svg") !important;
+}
+
 .toggle-button {
   --toggle-background-color: var(--gnome-switch-background) !important;
   --toggle-background-color-hover: var(--gnome-switch-hover-background) !important;
@@ -50,3 +77,35 @@
   --toggle-dot-background-color: var(--gnome-switch-slider-background) !important;
   --toggle-dot-background-color-on-pressed: var(--gnome-switch-slider-background) !important;
 }
+
+:host {
+  --input-text-min-height: var(--button-min-height);
+  --input-text-border-color: var(--gnome-urlbar-border-color) !important;
+  --input-text-border-color-disabled: var(--gnome-inactive-urlbar-border-color) !important;
+  --input-text-border: var(--border-width) solid var(--input-text-border-color);
+  --input-text-border-radius: 8px !important;
+  --input-text-background-color: var(--gnome-urlbar-background) !important;
+  --input-text-color: FieldText;
+  --input-text-background-color-disabled: var(--gnome-inactive-urlbar-background) !important;
+  --input-text-opacity-disabled: var(--button-opacity-disabled);
+}
+
+#input:not(.toggle-button) {
+  border: 1px solid var(--gnome-hover-urlbar-border-color) !important;
+  border-radius: 8px !important;
+  box-sizing: border-box;
+  background-color: var(--gnome-urlbar-background) !important;
+  outline: 2px solid transparent  !important;
+  outline-offset: -2px  !important;
+
+  &:focus {
+    border: 1px solid transparent !important;
+    border-radius: 8px !important;
+    outline: 2px solid var(--gnome-focused-urlbar-border-color) !important;
+  }
+
+  &:disabled {
+    border-color: var(--gnome-inactive-urlbar-border-color) !important;
+    background-color: var(--gnome-inactive-urlbar-background) !important;
+  }
+}
diff --git a/other/firefox/common/parts/dialogs.css b/other/firefox/common/parts/dialogs.css
index 3d410194..fc689c72 100644
--- a/other/firefox/common/parts/dialogs.css
+++ b/other/firefox/common/parts/dialogs.css
@@ -28,8 +28,11 @@ window {
 
 /* Dialog */
 .dialogBox {
-	border-radius: 12px !important;
 	margin: 0 !important;
+	background-color: var(--gnome-popover-background) !important;
+	border-radius: 12px !important;
+	border: none !important;
+	box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08) !important;
 }
 
 window[role="dialog"] {
@@ -50,7 +53,7 @@ dialog#handling {
 dialog[subdialog] {
 	background-color: var(--gnome-popover-background) !important;
 	border-radius: 12px !important;
-	border: none !important;
+	border: 1px solid var(--gnome-menu-border-color) !important;
 	box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08) !important;
 }
 
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index ffffc3ca..f6e31c8d 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -4912,6 +4912,15 @@ window.background.messagedialog {
   }
 }
 
+dialog.alert {
+  .compact.response-area {
+    button {
+      min-height: 24px;
+      padding: $container_padding;
+    }
+  }
+}
+
 window.aboutdialog image.large-icons {
   -gtk-icon-size: 128px;
 }
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index 46a0c003..1b829500 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -1666,4 +1666,26 @@ window.background.chromium {
     background-color: gtkalpha(currentColor, 0.1);
     color: $chrome_fg_color;
   }
+}
+
+//
+// Rnote
+//
+
+.colorpad {
+  background-color: gtkcolor(colorpad_color);
+  color: gtkcolor(colorpad_fg_color);
+}
+
+.colorsetter {
+  &, &:hover, &:focus, &:active {
+    background-color: gtkcolor(colorsetter_color);
+    color: gtkcolor(colorsetter_fg_color);
+  }
+
+  &:checked {
+    background-color: gtkcolor(colorsetter_color);
+    color: gtkcolor(colorsetter_fg_color);
+    box-shadow: inset 0 -3px gtkcolor(colorsetter_fg_color);
+  }
 }
\ No newline at end of file