diff --git a/dev/Styles/Account.less b/dev/Styles/Account.less
index ab3eb7945..f233b3c39 100644
--- a/dev/Styles/Account.less
+++ b/dev/Styles/Account.less
@@ -1,6 +1,4 @@
-#rl-popups {
-	.b-account-add-content {
-		.modal-header {
-		}
+.b-account-add-content {
+	.modal-header {
 	}
 }
diff --git a/dev/Styles/AdminPlugin.less b/dev/Styles/AdminPlugin.less
index 48f34b7a8..94b45b005 100644
--- a/dev/Styles/AdminPlugin.less
+++ b/dev/Styles/AdminPlugin.less
@@ -2,10 +2,10 @@
 
 	&.modal {
 		width: 660px;
+	}
 
-		.modal-body {
-			overflow: auto;
-		}
+	.modal-body {
+		overflow: auto;
 	}
 
 	.information {
diff --git a/dev/Styles/AdvancedSearch.less b/dev/Styles/AdvancedSearch.less
index aa5de0071..5ffb11241 100644
--- a/dev/Styles/AdvancedSearch.less
+++ b/dev/Styles/AdvancedSearch.less
@@ -1,13 +1,11 @@
-#rl-popups {
-	.b-advanced-search-content {
-		&.modal {
-			width: 780px;
-			.control-label {
-				width: 110px;
-			}
-			.span4 {
-				width: 360px;
-			}
-		}
+.b-advanced-search-content {
+	&.modal {
+		width: 780px;
+	}
+	.control-label {
+		width: 110px;
+	}
+	.span4 {
+		width: 360px;
 	}
 }
diff --git a/dev/Styles/Ask.less b/dev/Styles/Ask.less
index 0f10638af..1f678163b 100644
--- a/dev/Styles/Ask.less
+++ b/dev/Styles/Ask.less
@@ -1,12 +1,10 @@
-#rl-popups {
-	.b-ask-content {
+.b-ask-content {
 
-		.modal-body {
-			text-align: center;
-		}
+	.modal-body {
+		text-align: center;
+	}
 
-		.desc-place {
-			font-size: 18px;
-		}
+	.desc-place {
+		font-size: 18px;
 	}
 }
diff --git a/dev/Styles/Compose.less b/dev/Styles/Compose.less
index f4167f1d8..186d858a9 100644
--- a/dev/Styles/Compose.less
+++ b/dev/Styles/Compose.less
@@ -5,10 +5,10 @@
 		width: 98%;
 		max-width: 1000px;
 		min-height: calc(100% - 52px);
+	}
 
-		.modal-body {
-			padding: 0;
-		}
+	.modal-body {
+		padding: 0;
 	}
 
 	.textAreaParent, .attachmentAreaParent {
diff --git a/dev/Styles/Contacts.less b/dev/Styles/Contacts.less
index 5ed728a9d..c89b32c5d 100644
--- a/dev/Styles/Contacts.less
+++ b/dev/Styles/Contacts.less
@@ -25,13 +25,12 @@
 		max-width: 900px;
 		min-height: 300px;
 		max-height: 700px;
+	}
 
-		.modal-body {
-			overflow: auto;
-			height: calc(100% - 49px);
-			padding: 0;
-		}
-
+	.modal-body {
+		overflow: auto;
+		height: calc(100% - 49px);
+		padding: 0;
 	}
 
 	.b-list-toolbar {
diff --git a/dev/Styles/Filter.less b/dev/Styles/Filter.less
index ef6896dbd..b0914440a 100644
--- a/dev/Styles/Filter.less
+++ b/dev/Styles/Filter.less
@@ -1,15 +1,13 @@
-#rl-popups {
-	.b-filter-content {
+.b-filter-content {
 
-		width: 750px;
+	width: 750px;
 
-		.button-delete {
-			cursor: pointer;
-		}
+	.button-delete {
+		cursor: pointer;
+	}
 
-		.setRecipientsBtn {
-			margin-top: -2px;
-			margin-left: 5px;
-		}
+	.setRecipientsBtn {
+		margin-top: -2px;
+		margin-left: 5px;
 	}
 }
diff --git a/dev/Styles/FolderClear.less b/dev/Styles/FolderClear.less
index 5705454f1..8089f0de6 100644
--- a/dev/Styles/FolderClear.less
+++ b/dev/Styles/FolderClear.less
@@ -1,6 +1,4 @@
-#rl-popups {
-	.b-folder-clear-content {
-		.modal-header {
-		}
+.b-folder-clear-content {
+	.modal-header {
 	}
 }
diff --git a/dev/Styles/FolderCreate.less b/dev/Styles/FolderCreate.less
index 3828c4625..2b2be8b48 100644
--- a/dev/Styles/FolderCreate.less
+++ b/dev/Styles/FolderCreate.less
@@ -1,6 +1,4 @@
-#rl-popups {
-	.b-folder-create-content {
-		.modal-header {
-		}
+.b-folder-create-content {
+	.modal-header {
 	}
 }
diff --git a/dev/Styles/FolderSystem.less b/dev/Styles/FolderSystem.less
index f9fd95732..4a5f64d25 100644
--- a/dev/Styles/FolderSystem.less
+++ b/dev/Styles/FolderSystem.less
@@ -1,6 +1,4 @@
-#rl-popups {
-	.b-folder-system-content {
-		.modal-header {
-		}
+.b-folder-system-content {
+	.modal-header {
 	}
 }
diff --git a/dev/Styles/Identity.less b/dev/Styles/Identity.less
index 456911fb5..2d1b25209 100644
--- a/dev/Styles/Identity.less
+++ b/dev/Styles/Identity.less
@@ -1,23 +1,21 @@
-#rl-popups {
-	.b-identity-content {
+.b-identity-content {
 
-		&.modal {
-			width: 770px;
-		}
+	&.modal {
+		width: 770px;
+	}
 
-		.modal-body {
-			overflow: hidden;
-		}
+	.modal-body {
+		overflow: hidden;
+	}
 
-		.e-signature-place {
-			border: 1px solid #ccc;
-			border-radius: 3px;
-			height: 200px;
-		}
+	.e-signature-place {
+		border: 1px solid #ccc;
+		border-radius: 3px;
+		height: 200px;
+	}
 
-		.textEmail {
-			margin-top: 5px;
-			font-weight: bold;
-		}
+	.textEmail {
+		margin-top: 5px;
+		font-weight: bold;
 	}
 }
diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less
index 29b61d1a3..2ca18a290 100644
--- a/dev/Styles/Languages.less
+++ b/dev/Styles/Languages.less
@@ -1,40 +1,38 @@
-#rl-popups {
-	.b-languages-content {
+.b-languages-content {
 
-		&.modal {
-			width: 700px;
+	&.modal {
+		width: 700px;
+	}
+
+	.lang-item {
+		display: inline-block;
+		padding: 5px 15px;
+		margin: 2px 5px;
+		width: 180px;
+		background-color: #fff;
+		text-align: left;
+		border: 1px solid transparent;
+		border-radius: 3px;
+		position: relative;
+
+		&.user {
+			background-color: #ffd;
+			border-color: #ff5;
 		}
-
-		.lang-item {
-			display: inline-block;
-			padding: 5px 15px;
-			margin: 2px 5px;
-			width: 180px;
-			background-color: #fff;
-			text-align: left;
-			border: 1px solid transparent;
-			border-radius: 3px;
-			position: relative;
-
-			&.user {
-				background-color: #ffd;
-				border-color: #ff5;
-			}
-			&.selected {
-				background-color: #efe;
-				border-color: #9c9;
-			}
-			&.selected::after {
-				content: "✔";
-				color: #080;
-				position: absolute;
-				right: 4px;
-				font-family: snappymail;
-			}
-			&:hover {
-				background-color: #eee;
-				border-color: #ccc;
-			}
+		&.selected {
+			background-color: #efe;
+			border-color: #9c9;
+		}
+		&.selected::after {
+			content: "✔";
+			color: #080;
+			position: absolute;
+			right: 4px;
+			font-family: snappymail;
+		}
+		&:hover {
+			background-color: #eee;
+			border-color: #ccc;
 		}
 	}
 }
diff --git a/dev/Styles/OpenPgpKey.less b/dev/Styles/OpenPgpKey.less
index a66266003..886fdac84 100644
--- a/dev/Styles/OpenPgpKey.less
+++ b/dev/Styles/OpenPgpKey.less
@@ -1,152 +1,150 @@
-#rl-popups {
-	.b-open-pgp-key-view-content, .b-open-pgp-key-generate-content {
-		&.modal {
-			width: 570px;
-		}
+.b-open-pgp-key-view-content, .b-open-pgp-key-generate-content {
+	&.modal {
+		width: 570px;
+	}
+}
+
+.b-open-pgp-key-view-content, .b-open-pgp-key-generate-content, .b-open-pgp-key-add-content, .b-compose-open-pgp-content, .b-message-open-pgp-content {
+
+	.inputKey {
+		font-family: var(--fontMono);
 	}
 
-	.b-open-pgp-key-view-content, .b-open-pgp-key-generate-content, .b-open-pgp-key-add-content, .b-compose-open-pgp-content, .b-message-open-pgp-content {
+	.key-viewer {
+		max-height: 500px;
+		overflow: auto;
+	}
+}
 
-		.inputKey {
-			font-family: var(--fontMono);
-		}
-
-		.key-viewer {
-			max-height: 500px;
-			overflow: auto;
-		}
+.b-compose-open-pgp-content {
+	&.modal {
+		width: 800px;
 	}
 
-	.b-compose-open-pgp-content {
-		&.modal {
-			width: 800px;
+	.key-list {
+
+		background-color: #f9f9f9;
+		border-radius: 5px;
+		padding: 10px 15px;
+
+		&-wrp {
+
+			&:hover {
+				overflow: auto;
+			}
+
+			&:hover .key-list__item-name {
+				overflow: visible;
+			}
+
+			&.empty {
+				text-align: center;
+				padding-top: 10px;
+				color: #aaa;
+				font-size: 16px;
+			}
 		}
 
-		.key-list {
+		&__item {
 
-			background-color: #f9f9f9;
-			border-radius: 5px;
-			padding: 10px 15px;
+			color: #333;
+			white-space: nowrap;
+			padding-bottom: 4px;
+			display: flex;
 
-			&-wrp {
+			&:last-child {
+				padding-bottom: 0;
+			}
 
-				&:hover {
-					overflow: auto;
+			&-delete {
+				cursor: pointer;
+
+				&.disabled {
+					cursor: not-allowed;
 				}
+			}
 
-				&:hover .key-list__item-name {
-					overflow: visible;
-				}
+			&-names {
+				color: #333;
+				width: 80%;
 
 				&.empty {
-					text-align: center;
-					padding-top: 10px;
-					color: #aaa;
-					font-size: 16px;
-				}
-			}
-
-			&__item {
-
-				color: #333;
-				white-space: nowrap;
-				padding-bottom: 4px;
-				display: flex;
-
-				&:last-child {
-					padding-bottom: 0;
-				}
-
-				&-delete {
-					cursor: pointer;
-
-					&.disabled {
-						cursor: not-allowed;
-					}
-				}
-
-				&-names {
-					color: #333;
-					width: 80%;
-
-					&.empty {
-						color: red;
-					}
-				}
-
-				&-name {
-					overflow: hidden;
-					text-overflow: ellipsis;
-				}
-
-				&-error {
 					color: red;
-					width: 80%;
-				}
-
-				&-hash {
-					color: #aaa;
-					width: 20%;
 				}
 			}
-		}
 
-		.key-actions {
-			margin-top: 10px;
-			min-height: 40px;
-
-			select option.even {
-				background-color: #f5f5f5;
-			}
-		}
-	}
-
-	.b-message-open-pgp-content {
-		&.modal {
-			width: 700px;
-		}
-
-		.key-list {
-
-			margin-top: 5px;
-			overflow: hidden;
-
-			&__item {
-
-				color: #555;
-				cursor: pointer;
+			&-name {
+				overflow: hidden;
 				text-overflow: ellipsis;
-				white-space: nowrap;
+			}
 
-				&__radio {
-					padding: 3px 5px 0 0;
-					vertical-align: top;
-				}
+			&-error {
+				color: red;
+				width: 80%;
+			}
 
-				&__name {
-					border-bottom: 1px solid transparent;
-				}
-
-				&__names {
-					display: inline-block;
-
-					&:hover .key-list__item__name {
-						border-bottom: 1px dashed #555;
-					}
-				}
+			&-hash {
+				color: #aaa;
+				width: 20%;
 			}
 		}
 	}
 
-	.b-open-pgp-key-add-content {
-		&.modal {
+	.key-actions {
+		margin-top: 10px;
+		min-height: 40px;
 
-			width: 645px;
+		select option.even {
+			background-color: #f5f5f5;
+		}
+	}
+}
 
-			.inputKey {
-				width: 600px;
+.b-message-open-pgp-content {
+	&.modal {
+		width: 700px;
+	}
 
+	.key-list {
+
+		margin-top: 5px;
+		overflow: hidden;
+
+		&__item {
+
+			color: #555;
+			cursor: pointer;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+
+			&__radio {
+				padding: 3px 5px 0 0;
+				vertical-align: top;
+			}
+
+			&__name {
+				border-bottom: 1px solid transparent;
+			}
+
+			&__names {
+				display: inline-block;
+
+				&:hover .key-list__item__name {
+					border-bottom: 1px dashed #555;
+				}
 			}
 		}
 	}
 }
+
+.b-open-pgp-key-add-content {
+	&.modal {
+
+		width: 645px;
+
+		.inputKey {
+			width: 600px;
+
+		}
+	}
+}
diff --git a/dev/Styles/SquireUI.less b/dev/Styles/SquireUI.less
index 94d58d584..1e79d40fd 100644
--- a/dev/Styles/SquireUI.less
+++ b/dev/Styles/SquireUI.less
@@ -169,8 +169,8 @@ Secondly, we can't rely on MUA's what to do with :empty
 	right: 0;
 }
 
-.rl-mobile #rl-popups .b-compose.modal,
-.rl-mobile #rl-popups .b-identity-content.modal {
+.rl-mobile .b-compose.modal,
+.rl-mobile .b-identity-content.modal {
 	margin-bottom: 50px;
 }
 .rl-mobile .b-compose.modal {
diff --git a/dev/Styles/Template.less b/dev/Styles/Template.less
index 7686d447b..331dae1cf 100644
--- a/dev/Styles/Template.less
+++ b/dev/Styles/Template.less
@@ -1,12 +1,10 @@
-#rl-popups {
-	.b-template-add-content {
+.b-template-add-content {
 
-		&.modal {
-			width: 750px;
-		}
+	&.modal {
+		width: 750px;
+	}
 
-		.e-template-place {
-			height: 300px;
-		}
+	.e-template-place {
+		height: 300px;
 	}
 }
diff --git a/dev/Styles/TwoFactor.less b/dev/Styles/TwoFactor.less
index f4746cc6a..b2954f915 100644
--- a/dev/Styles/TwoFactor.less
+++ b/dev/Styles/TwoFactor.less
@@ -1,12 +1,8 @@
-#rl-popups {
+.b-two-factor-content {
 
-	.b-two-factor-content {
+	width: 750px;
 
-		width: 750px;
-
-		.modal-body {
-			min-height: 100px;
-		}
+	.modal-body {
+		min-height: 100px;
 	}
-
 }
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
index 17accdb9f..325ea7032 100644
--- a/dev/Styles/_BootstrapFix.less
+++ b/dev/Styles/_BootstrapFix.less
@@ -97,7 +97,7 @@ label.inline, span.inline {
 /* mobile and tablet */
 @media screen and (max-width: 999px) {
 
-	#rl-popups .modal {
+	.modal {
 		width: calc(~'100% - 20px') !important;
 	}
 
diff --git a/vendors/normalize.css/normalize.css b/vendors/normalize.css/normalize.css
index 5d5124f13..7d73fe13c 100644
--- a/vendors/normalize.css/normalize.css
+++ b/vendors/normalize.css/normalize.css
@@ -1,4 +1,4 @@
-/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+/* normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 
 /* Text-level semantics
    ========================================================================== */