diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 57c3f1ca5..4e5b241ae 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -11,6 +11,10 @@
 	}
 }
 
+@glass-color: #fff !important;
+@glass-error-color: #f76260 !important;
+@glass-m-color: rgba(255, 255, 255, .8) !important;
+
 .b-login-content {
 
 	.loginFormWrapper {
@@ -28,16 +32,17 @@
 		}
 
 		.loginForm {
-			background-color: var(--login-bg-color, #efefef);
+			background-color: var(--login-bg-color, rgba(0, 0, 0, .5));
+			border: var(--login-border, 1px solid rgba(255, 255, 255, .2));
 			border-radius: var(--login-border-radius);
 			box-shadow: var(--login-box-shadow);
-			color: var(--login-color, #333);
-			border: var(--login-border);
 			margin: 0;
+		}
 
-			.g-ui-link {
-				color: var(--login-color);
-			}
+		.input-append .add-on i,
+		.loginForm, .legend, .e-checkbox-icon, .g-ui-link, .language-button {
+			color: var(--login-color, @glass-m-color);
+			text-shadow: none !important;
 		}
 
 		.controls, .control-group {
@@ -59,6 +64,55 @@
 			.inputEmail, .inputPassword {
 				padding-right: 35px;
 			}
+
+			input {
+				border: 1px solid none !important;
+				background: none !important;
+				outline: none !important;
+				text-shadow: none !important;
+				box-shadow: none !important;
+
+				color: @glass-color;
+				border-color: @glass-m-color;
+
+				&:placeholder {
+					color: @glass-color;
+					text-shadow: none !important;
+				}
+
+				&:focus, &:hover {
+					border-color: @glass-color;
+				}
+			}
+
+			.btn {
+				border: 1px solid none !important;
+				background: none !important;
+				outline: none !important;
+				text-shadow: none !important;
+				box-shadow: none !important;
+
+				color: @glass-color;
+				border-color: @glass-m-color;
+
+				text-transform: uppercase;
+				font-size: 13px;
+
+				&:hover, &:active{
+					border-color: @glass-color;
+				}
+			}
+
+			&.error {
+				.input-append .add-on i {
+					color: @glass-error-color;
+				}
+
+				input {
+					color: @glass-error-color;
+					border-color: @glass-error-color;
+				}
+			}
 		}
 
 		.signMeLabel .e-checkbox {
@@ -77,7 +131,8 @@
 		.input-append .add-on i {
 			font-size: 17px;
 			line-height: 29px;
-			color: #999;
+			outline: none !important;
+			box-shadow: none !important;
 
 			&.login-submit-icon{
 				font-size: 24px;
@@ -111,7 +166,6 @@
 	}
 
 	.language-button {
-		color: inherit;
 		padding: 5px;
 		outline: none;
 	}
@@ -185,88 +239,3 @@
 	outline: none;
 	cursor: pointer;
 }
-
-// glass style
-html.glass {
-
-	@glass-color: #fff !important;
-	@glass-p-color: #aaa !important;
-	@glass-error-color: #f76260 !important;
-	@glass-m-color: rgba(255, 255, 255, .8) !important;
-
-	.thm-login {
-		background: none !important;
-		background: rgba(0, 0, 0, .5) !important;
-		box-shadow: none !important;
-
-		border: none !important;
-		border: 1px solid rgba(255, 255, 255, .2) !important;
-
-		.controls {
-			.input-append .add-on i {
-				color: @glass-m-color;
-				text-shadow: none !important;
-				outline: none !important;
-				box-shadow: none !important;
-			}
-
-			input {
-				border: 1px solid none !important;
-				background: none !important;
-				outline: none !important;
-				text-shadow: none !important;
-				box-shadow: none !important;
-
-				color: @glass-color;
-				border-color: @glass-m-color;
-
-				&:placeholder {
-					color: @glass-color;
-					text-shadow: none !important;
-				}
-
-				&:focus, &:hover {
-					border-color: @glass-color;
-				}
-			}
-			.btn {
-				border: 1px solid none !important;
-				background: none !important;
-				outline: none !important;
-				text-shadow: none !important;
-				box-shadow: none !important;
-
-				color: @glass-color;
-				border-color: @glass-m-color;
-
-				text-transform: uppercase;
-				font-size: 13px;
-
-				&:hover, &:active{
-					border-color: @glass-color;
-				}
-			}
-
-			&.error {
-				.input-append .add-on i {
-					color: @glass-error-color;
-				}
-
-				input {
-					color: @glass-error-color;
-					border-color: @glass-error-color;
-				}
-			}
-		}
-	}
-
-	.thm-login-text {
-		color: @glass-m-color;
-		text-shadow: none !important;
-
-		.legend, .e-checkbox-icon, .g-ui-link, .language-button {
-			color: @glass-m-color;
-			text-shadow: none !important;
-		}
-	}
-}
diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less
index bf1dbc638..4fffcac54 100644
--- a/dev/Styles/_End.less
+++ b/dev/Styles/_End.less
@@ -81,13 +81,11 @@
 	}
 }
 
-html.glass {
-	input:-webkit-autofill,
-	input:-webkit-autofill:hover,
-	input:-webkit-autofill:focus,
-	input:-webkit-autofill:active {
-		transition: color 9999s ease-out, background-color 9999s ease-out;
-	}
+input:-webkit-autofill,
+input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
+input:-webkit-autofill:active {
+	transition: color 9999s ease-out, background-color 9999s ease-out;
 }
 
 /*
diff --git a/snappymail/v/0.0.0/app/templates/Error.html b/snappymail/v/0.0.0/app/templates/Error.html
index 65700c288..4d593cdb9 100644
--- a/snappymail/v/0.0.0/app/templates/Error.html
+++ b/snappymail/v/0.0.0/app/templates/Error.html
@@ -37,7 +37,7 @@
 
 		</style>
 	</head>
-	<body class="content thm-body">
+	<body class="content">
 		<div class="error-header">
 			{{ErrorHeader}}
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Index.html b/snappymail/v/0.0.0/app/templates/Index.html
index c5749c528..40e631ace 100644
--- a/snappymail/v/0.0.0/app/templates/Index.html
+++ b/snappymail/v/0.0.0/app/templates/Index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="rl-started-trigger glass" dir="{{BaseDir}}">
+<html class="rl-started-trigger" dir="{{BaseDir}}">
 
 <head>
 	<noscript>
@@ -20,7 +20,7 @@
 	<script>document.append||document.location.replace('./?/BadBrowser');</script>
 </head>
 
-<body class="thm-body">
+<body>
 	<div id="rl-app" data-boot='{{RainloopBootData}}'>
 		<div id="rl-loading">
 			<div id="rl-loading-desc">{{LoadingDescriptionEsc}}</div>
diff --git a/snappymail/v/0.0.0/app/templates/Themes/template.less b/snappymail/v/0.0.0/app/templates/Themes/template.less
index c3502b190..212cc57eb 100644
--- a/snappymail/v/0.0.0/app/templates/Themes/template.less
+++ b/snappymail/v/0.0.0/app/templates/Themes/template.less
@@ -60,7 +60,7 @@
 	--settings-menu-selected-color: @settings-menu-selected-color;
 }
 
-.thm-login {
+.loginForm {
 	.thm-linear-gradient-mixin(@login-gradient-start, @login-gradient-end);
 }
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index 79173317e..fa0526818 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -5,7 +5,7 @@
 			<span data-bind="text: submitError"></span>
 		</div>
 		<div class="wrapper-parent">
-			<form class="wrapper submitting-pane loginForm thm-login thm-login-text" action="#/" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
+			<form class="wrapper submitting-pane loginForm" action="#/" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
 				<div class="controls" data-bind="css: {'error': loginError, 'animated': loginErrorAnimation}">
 					<div class="input-append">
 						<input type="text" class="input-block-level inputLogin"
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
index 673634bbb..9318832e5 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
@@ -6,7 +6,7 @@
             </a>
         </div>
 	</div>
-	<div class="b-content thm-settings-menu opacity-on-panel-disabled">
+	<div class="b-content opacity-on-panel-disabled">
 		<div class="b-admin-menu" data-bind="foreach: menu">
 			<!-- ko if: disabled -->
 			<span class="e-item disabled">
@@ -21,4 +21,4 @@
 		</div>
 	</div>
     <div class="b-content show-on-panel-disabled" data-bind="click: function () { leftPanelDisabled(false); }"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index 3be6bbce0..ef773846f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -13,7 +13,7 @@
 			</div>
 		</div>
 		<div class="wrapper-parent">
-			<form class="wrapper submitting-pane loginForm thm-login thm-login-text" action="#/"
+			<form class="wrapper submitting-pane loginForm" action="#/"
 				data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
 				<div class="controls plugin-mark-Login-TopControlGroup"
 					data-bind="css: {'error': emailError, 'animated': emailErrorAnimation}">
@@ -92,14 +92,14 @@
 				</div>
 				<div class="controls clearfix"
 					data-bind="visible: '' !== forgotPasswordLinkUrl || '' !== registrationLinkUrl">
-					<div class="forgot-link thm-forgot pull-left" data-bind="visible: '' !== forgotPasswordLinkUrl"
+					<div class="forgot-link pull-left" data-bind="visible: '' !== forgotPasswordLinkUrl"
 						style="text-align: center">
 						<a href="#" target="_blank" class="g-ui-link"
 							data-bind="attr: {href: forgotPasswordLinkUrl}, css: {'pull-right': '' !== registrationLinkUrl}"><span
 								class="i18n" data-i18n="LOGIN/LABEL_FORGOT_PASSWORD"></span></a>
 					</div>
 					&nbsp;
-					<div class="registration-link thm-registration pull-right"
+					<div class="registration-link pull-right"
 						data-bind="visible: '' !== registrationLinkUrl" style="text-align: center">
 						<a href="#" target="_blank" class="g-ui-link"
 							data-bind="attr: {href: registrationLinkUrl}, css: {'pull-left': '' !== forgotPasswordLinkUrl}"><span
@@ -108,7 +108,7 @@
 				</div>
 			</form>
 		</div>
-		<div class="e-mobile-switcher thm-mobile-switcher">
+		<div class="e-mobile-switcher">
 			<span data-bind="visible: !mobile">
 				<i class="fontastic">📱</i>
 				&nbsp;
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index 4d1018163..ee655da48 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -1,4 +1,4 @@
-<div class="b-folders g-ui-user-select-none thm-folders" data-bind="css: {'focused': folderListFocused, 'single-root-inbox': foldersListWithSingleInboxRootFolder, 'inbox-is-starred': isInboxStarred}">
+<div class="b-folders g-ui-user-select-none" data-bind="css: {'focused': folderListFocused, 'single-root-inbox': foldersListWithSingleInboxRootFolder, 'inbox-is-starred': isInboxStarred}">
 	<div class="b-toolbar btn-toolbar hide-on-mobile">
 		<a class="btn buttonCompose" data-bind="visible: allowComposer, click: composeClick, tooltip: 'FOLDER_LIST/BUTTON_NEW_MESSAGE', css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}">
 			<i class="icon-paper-plane"></i>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 4776e66e2..50a189087 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -39,7 +39,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="b-content b-message-view-wrapper thm-message-view-background-color">
+		<div class="b-content b-message-view-wrapper">
 			<div style="height: 100%">
 				<div class="b-message-view-backdrop" data-bind="visible: moveAction">
 					<div class="backdrop-message-wrp">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
index b9501e0b2..4c7b76d44 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
@@ -1,5 +1,5 @@
 <div class="b-settins-left g-ui-user-select-none">
-	<div class="b-content thm-settings-menu opacity-on-panel-disabled">
+	<div class="b-content opacity-on-panel-disabled">
 		<div class="b-settings-menu" data-bind="foreach: menu">
 			<!-- ko if: disabled -->
 			<span class="e-item disabled">