diff --git a/theme/colors/light.css b/theme/colors/light.css
index dced828..d164d54 100644
--- a/theme/colors/light.css
+++ b/theme/colors/light.css
@@ -101,4 +101,3 @@
 	/* Private browsing info box */
 	--gnome-private-text-primary-color: #15141A;
 }
-
diff --git a/theme/parts/buttons.css b/theme/parts/buttons.css
index 8eb6ff6..2dc141e 100644
--- a/theme/parts/buttons.css
+++ b/theme/parts/buttons.css
@@ -63,8 +63,7 @@ button.close,
 .close-icon:not(.tab-close-button),
 button.close,
 #protections-popup-info-button,
-.permission-popup-permission-remove-button,
-#item-choose button {
+.permission-popup-permission-remove-button {
 	background: transparent !important;
 }
 
@@ -145,8 +144,8 @@ menulist:hover,
 .panel-footer button:hover,
 #downloadsPanel-mainView .download-state .downloadButton:hover,
 #appMenu-popup .panel-banner-item:hover,
-#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label):not([disabled]):hover,
-#context-navigation menuitem:not([disabled]):hover,
+#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label):not([disabled="true"]):hover,
+#context-navigation menuitem:not([disabled="true"]):hover,
 .identity-popup-preferences-button:not(#hack):hover,
 .findbar-container toolbarbutton:hover,
 .findbar-closebutton .toolbarbutton-icon:hover,
@@ -159,7 +158,7 @@ menulist:hover .menulist-label-box,
 .tracking-protection-button:hover,
 .dialog-button:hover,
 .autocomplete-richlistitem[type="loginsFooter"]:hover,
-.dialog-button-box button:not([disabled]):hover,
+.dialog-button-box button:not([disabled="true"]):hover,
 .searchbar-engine-one-off-item:hover,
 .button.connect-device:hover,
 #editBMPanel_newFolderButton:hover {
@@ -168,7 +167,7 @@ menulist:hover .menulist-label-box,
 }
 
 /* Hover flat buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled]):not([checked]):hover,
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled="true"]):not([checked]):hover,
 .close-icon:not(.tab-close-button):hover,
 button.close:hover,
 #protections-popup-info-button:hover,
@@ -184,8 +183,8 @@ menulist[open],
 .panel-footer button:active,
 #downloadsPanel-mainView .download-state .downloadButton:active,
 #appMenu-popup .panel-banner-item:active,
-#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not([disabled]):not(#appMenu-fxa-label):active,
-#context-navigation menuitem:active:not([disabled]),
+#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not([disabled="true"]):not(#appMenu-fxa-label):active,
+#context-navigation menuitem:active:not([disabled="true"]),
 .identity-popup-preferences-button:not(#hack):active,
 .findbar-container toolbarbutton[checked],
 .findbar-container toolbarbutton:active,
@@ -198,16 +197,16 @@ menulist[open] .menulist-label-box,
 .tracking-protection-button:active,
 .dialog-button:active,
 .autocomplete-richlistitem[type="loginsFooter"]:active,
-.dialog-button-box button:not([disabled]):active,
+.dialog-button-box button:not([disabled="true"]):active,
 .button.connect-device:active,
 #editBMPanel_newFolderButton:active {
 	background: var(--gnome-button-active-background) !important;
 }
 
 /* Active flat buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled]):not(#hack):active,
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.subviewbutton):not([disabled])[open],
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled])[checked],
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled="true"]):not(#hack):active,
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.subviewbutton):not([disabled="true"])[open],
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled="true"])[checked],
 .close-icon:not(.tab-close-button):active,
 button.close:active,
 #protections-popup-info-button:not(#hack):active,
@@ -218,10 +217,10 @@ button.close:active,
 }
 
 /* Disabled buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],
-#appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled],
-#context-navigation menuitem[disabled],
-.dialog-button-box button[disabled] {
+#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled="true"],
+#appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled="true"],
+#context-navigation menuitem[disabled="true"],
+.dialog-button-box button[disabled="true"] {
 	opacity: .5 !important;
 }
 
diff --git a/theme/parts/dialogs.css b/theme/parts/dialogs.css
index b97560d..a75364d 100644
--- a/theme/parts/dialogs.css
+++ b/theme/parts/dialogs.css
@@ -7,25 +7,29 @@ window {
 }
 
 /* Browser dialog prompts center */
-.content-prompt {
-    display: flex !important;
-    align-items: center;
-    justify-content: center;
+.dialogOverlay {
+    display: grid;
+	place-content: center;
+	 justify-content: center;
+	grid-auto-rows: min(90%, var(--doc-height-px));
+}
+.dialogOverlay[topmost="true"], #window-modal-dialog::backdrop {
+	background-color: rgba(0, 0, 0, .5) !important;
 }
 
 /* Dialog */
 .dialogBox {
-	border-radius: 9px !important;
+	border-radius: 12px !important;
 	margin-top: 0 !important;
 }
 
-dialog[subdialog] {
+window[role="dialog"] {
 	background: var(--gnome-popover-background) !important;
 	border: 0 !important;
 	box-shadow: var(--gnome-popover-shadow) !important;
 	padding: 0 !important;
 }
-dialog {
+dialog {	
 	padding: 0 !important;
 }
 
diff --git a/theme/parts/lists.css b/theme/parts/lists.css
index 0bd24fd..584f930 100644
--- a/theme/parts/lists.css
+++ b/theme/parts/lists.css
@@ -6,13 +6,21 @@
 /* List container */
 #permission-popup-permission-list,
 richlistbox#items {
+	--in-content-item-selected: var(--gnome-accent-bg) !important;
+	--in-content-item-selected-text: #fff !important;
 	background: var(--gnome-menu-background) !important;
 	border: 1px solid var(--gnome-button-border-color) !important;
-	border-radius: 9px !important;
+	border-radius: 12px !important;
 	padding: 0 !important;
 	overflow: hidden;
 }
 
+richlistbox#items {
+	box-shadow: 0 0 0 1px rgba(0, 0, 0, .03),
+                0 1px 3px 1px rgba(0, 0, 0, .07),
+                0 2px 6px 2px rgba(0, 0, 0, .03);
+}
+
 /* List item */
 .permission-popup-permission-list-anchor,
 richlistbox#items richlistitem {
@@ -21,7 +29,7 @@ richlistbox#items richlistitem {
 }
 .permission-popup-permission-list-anchor:not(:last-child),
 richlistbox#items richlistitem:not(:last-child) {
-	border-bottom: 1px solid var(--gnome-button-border-color);
+	border-bottom: 1px solid var(--gnome-menu-separator-color);
 }
 
 /* Fix list buttons on selected state */