diff --git a/images/sprites-light.png b/images/sprites-light.png
new file mode 100644
index 00000000..8154b68a
Binary files /dev/null and b/images/sprites-light.png differ
diff --git a/src/css/layout.css b/src/css/layout.css
index 8c8ef2d2..e98e43ff 100644
--- a/src/css/layout.css
+++ b/src/css/layout.css
@@ -43,6 +43,9 @@
 .grey{
 	color:grey;
 }
+.text_muted{
+	color: var(--text-color-muted);
+}
 .external{
 	padding-right: 15px;
 }
@@ -52,7 +55,7 @@
 	width:10px;
 	height:10px;
 	margin-left: 5px;
-	background: url(images/sprites.png) no-repeat -700px 0;
+	background: var(--sprites-url) no-repeat -700px 0;
 	opacity: 0.3;
 }
 .noselect {
@@ -66,7 +69,7 @@
 .block{
 	position: relative;
 	background-color: rgba(255, 255, 255, 0.2);
-	background-color: var(--background-color-area);
+	background-color: var(--area-background-color);
 	border: 1px solid rgba(0, 0, 0, 0.5);
 	border: 1px solid var(--border-color);
 	margin-bottom: 10px;
@@ -74,7 +77,7 @@
 }
 .sidebar_right .block{
 	background-color: #68727b;
-	background-color: var(--background-color-section);
+	background-color: var(--area-background-color);
 }
 .block:last-child{
 	margin-bottom: 0;
@@ -85,7 +88,7 @@
 	margin: 0;
 	font-size: 110%;
 	background-color: rgba(255, 255, 255, 0.3);
-	background-color: var(--background-color-header);
+	background-color: var(--header-background-color);
 	border-bottom: #555;
 }
 .block.toggled h2, .block h2.toggled:after{
@@ -100,13 +103,13 @@
 	right: 10px;
 	top: 10px;
 	border-style: solid;
-	border-width: 0 5px 6px 5px;
-	border-color: transparent transparent #333333 transparent;
+	border-width: 0 4px 5px 4px;
+	border-color: transparent transparent var(--text-color-muted) transparent;
 }
 .block h2.toggled:before{
 	/* icon */
-	border-width: 6px 5px 0 5px;
-	border-color: #333333 transparent transparent transparent;
+	border-width: 5px 4px 0 4px;
+	border-color: var(--text-color-muted) transparent transparent transparent;
 }
 .block .content{
 	padding:5px;
@@ -152,7 +155,7 @@ body .sp-preview{
 	top: 0;
 	width: 31px;
 	height: 30px;
-	background: url(images/sprites.png) -50px -100px no-repeat;
+	background: var(--sprites-url) -50px -100px no-repeat;
 }
 .logo:hover:after{
 	animation: shake 0.82s cubic-bezier(0.36, 0.07, 0.19, 0.97);
@@ -191,7 +194,7 @@ body .sp-preview{
 	flex-direction: row;
 	align-items: center;
 	background-color: rgba(255, 255, 255, 0.2);
-	background-color: var(--background-color-section);
+	background-color: var(--section-background-color);
 	overflow: hidden;
 	margin-bottom: 5px;
 }
@@ -217,9 +220,8 @@ body .sp-preview{
 .attributes button{
 	display: inline-block;
 	padding: 3px 10px;
-	border: 1px solid #444;
-	border-color: var(--border-color);
-	background-color: var(--background-color-button);
+	border: 1px solid var(--border-color);
+	background-color: var(--button-background-color);
 	margin-right: 5px;
 }
 .attributes button:hover{
@@ -229,6 +231,7 @@ body .sp-preview{
 .attributes button.active{
 	background-color: #419147;
 	background-color: var(--background-color-active);
+	color: var(--text-color-active);
 }
 
 /* ========== left sidebar ================================================== */
@@ -240,7 +243,7 @@ body .sp-preview{
 	display: flex;
 	flex-direction: row;
 	flex-wrap: wrap;
-	background-color: var(--background-color-section);
+	background-color: var(--section-background-color);
 	padding: 0 5px 5px 0;
 	margin-right: 5px;
 	overflow: hidden;
@@ -252,8 +255,8 @@ body .sp-preview{
 .sidebar_left .item{
 	display:block;
 	background-color: rgba(255, 255, 255, 0.2);
-	background-color: var(--background-color-area);
-	background-image: url(images/sprites.png);
+	background-color: var(--area-background-color);
+	background-image: var(--sprites-url);
 	background-repeat: no-repeat;
 	height: 25px;
 	width: 30px;
@@ -266,8 +269,9 @@ body .sp-preview{
 	background-color: var(--background-color-hover);
 }
 .sidebar_left .item.active{
-	background-color: #419147;
 	background-color: var(--background-color-active);
+	background-image: var(--sprites-url-active);
+	color: var(--text-color-active);
 }
 
 .sidebar_left .select{ background-position: -342px 2px; }
@@ -374,10 +378,10 @@ body .sp-preview{
 .main_color_rgb input{
 	width: 70px;
 }
-.main_color_rgb .red{ color:#aa0000; }
-.main_color_rgb .green{ color:#00aa00; }
-.main_color_rgb .blue{ color:#0000aa; }
-.main_color_rgb .alpha{ color: #333333; }
+.main_color_rgb .red{ color: var(--text-color-red); }
+.main_color_rgb .green{ color: var(--text-color-green); }
+.main_color_rgb .blue{ color: var(--text-color-blue); }
+.main_color_rgb .alpha{ color: var(--text-color-muted); }
 
 .color_hex{
 	width: calc(100% - 60px);
@@ -399,7 +403,7 @@ body .sp-preview{
 	border:1px solid #444;
 	border-color: var(--border-color);
 	text-decoration:none;
-	color:#000000;
+	color:var(--text-color);
 	font-size:12px;
 }
 .layer_add{
@@ -409,6 +413,7 @@ body .sp-preview{
 	background-color: var(--background-color-active);
 	border:1px solid #444;
 	border-color: var(--border-color);
+	color: var(--text-color-active);
 	cursor:pointer;
 	text-decoration:none;
 }
@@ -421,19 +426,19 @@ body .sp-preview{
 	height:19px;
 	overflow:hidden;
 	background-color:#989898;
-	background-color: var(--background-color-area);
+	background-color: var(--area-background-color);
 	border:1px solid #393939;
 	border-color: var(--border-color);
 	border-radius:3px;
 	cursor:pointer;
 	overflow:hidden;
 	font-size: 12px;
-	color:#333333;
+	color:var(--text-color);
 	white-space: nowrap;
 }
 .layers_list .item.active .layer_name{
-	background-color: #419147;
 	background-color: var(--background-color-active);
+	color: var(--text-color-active);
 }
 .layers_list .visibility{
 	float:left;
@@ -442,7 +447,7 @@ body .sp-preview{
 	margin-right: 5px;
 	width:20px;
 	height:19px;
-	background: url('images/sprites.png') no-repeat -148px -99px;
+	background: var(--sprites-url) no-repeat -148px -99px;
 	opacity:0.1;
 	filter: drop-shadow(0px 0px 2px white);
 }
@@ -454,7 +459,7 @@ body .sp-preview{
 	width:12px;
 	height:19px;
 	margin-left: 5px;
-	background: url('images/sprites.png') no-repeat -100px -96px;
+	background: var(--sprites-url) no-repeat -100px -96px;
 }
 /* filters */
 .layers_list .filters{
@@ -502,14 +507,15 @@ body .sp-preview{
 .block.details button.reset{
 	width: 25px;
 	overflow: hidden;
-	opacity: 0.3;
-	background-image: url(images/sprites.png);
+	opacity: 0.5;
+	background-image: var(--sprites-url);
 	background-repeat: no-repeat;
 	background-position: -747px 2px;
 	color: transparent;
 }
 .block.details button.active{
-	background-color:  var(--background-color-active);
+	background-color: var(--background-color-active);
+	color: var(--text-color-active);
 }
 
 @media screen and (max-width:700px){
diff --git a/src/css/menu.css b/src/css/menu.css
index f5836ecc..50c42bcb 100644
--- a/src/css/menu.css
+++ b/src/css/menu.css
@@ -1,9 +1,9 @@
 :root {
 	--menu-dropdown-background-color: #ffffff;
-	--menu-dropdown-border-color: #5680C1;
+	--menu-dropdown-border-color: #49844d;
 	--menu-dropdown-text-color: #2d2b2b;
 	--menu-dropdown-text-muted-color: #aaaaaa;
-	--menu-dropdown-hover-background-color: #E4EBF8;
+	--menu-dropdown-hover-background-color: #d6f4d8;
 	--menu-dropdown-hover-text-color: #2d2d2d;
 	--menu-dropdown-divider-color: #e5e5e5;
 }
@@ -34,7 +34,7 @@
 	margin: 0;
 	height: 30px;
 	padding-left: 10px;
-	background: var(--background-color-menu);
+	background: var(--menu-background-color);
 }
 .main_menu > ul.menu_bar > li {
 	padding: 0;
@@ -45,7 +45,7 @@
 	display: flex;
 	align-items: center;
 	font-size: 12px;
-	color: var(--text-color-menu);
+	color: var(--menu-text-color);
 	text-decoration: none;
 	padding: 0 10px;
 	height: 100%;
@@ -140,7 +140,7 @@
 	width: 10px;
 	height: 10px;
 	margin-left: 5px;
-	background: url(images/sprites.png) no-repeat -700px 0;
+	background: var(--sprites-url) no-repeat -700px 0;
 	opacity: 0.3;
 }
 .main_menu > ul.menu_dropdown > li > a > * {
@@ -167,14 +167,14 @@
 	position: absolute;
 	width: 50px;
 	height: 50px;
-	background: url("images/sprites.png") no-repeat 11px -86px;
-	filter: invert(1);
+	background: var(--sprites-url) no-repeat 11px -86px;
 	display: block;
 	top: 0;
 	z-index: 200;
 	border: 0;
 	outline: 0;
 	cursor: pointer;
+	filter: var(--mobile-menu-toggle-filter);
 }
 .left_mobile_menu { left:0; }
 .right_mobile_menu { right:0; }
diff --git a/src/css/popup.css b/src/css/popup.css
index 8c355a54..92abd9cb 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -5,7 +5,7 @@
 	left: calc(100vw / 2);
 	transform: translate(-50%, 0);
 	background-color: #7A838B;
-	background-color: var(--background-color-section);
+	background-color: var(--area-background-color);
 	border: 1px solid rgba(0, 0, 0, 0.5);
 	border: 1px solid var(--border-color);
 	width: 90vw;
@@ -13,7 +13,7 @@
 	max-height: calc(80vh);
 	margin:0px auto 0px auto;
 	padding:10px;
-	box-shadow: 0 0 20px rgba(0,0,0,0.5);
+	box-shadow: 0 0 0 4000px rgba(0,0,0,0.3), 0 0 20px rgba(0,0,0,0.5);
 	z-index: 100;
 	overflow-y: auto;
 	font-size: 13px;
@@ -23,14 +23,14 @@
 	max-width: 800px;
 }
 #popup a{
-	color: #000080;
+	color: var(--link-color);
 }
 #popup h2{
 	margin: -10px -10px 5px -10px;
 	padding: 6px 10px;
 	font-size: 18px;
 	background-color: rgba(255, 255, 255, 0.3);
-	background-color: var(--background-color-header);
+	background-color: var(--header-background-color);
 	/*cursor:move;*/
 }
 #popup .buttons{
@@ -68,7 +68,7 @@
 #popup .button{
 	margin: 0 3px;
 	background-color: rgba(255, 255, 255, 0.2);
-	background-color: var(--background-color-button);
+	background-color: var(--button-background-color);
 	min-width:60px;
 	border:1px solid rgba(0, 0, 0, 0.5);
 	border:1px solid var(--border-color);
@@ -84,11 +84,11 @@
 	margin-left: 0;
 }
 #popup label span{
-	color:#444444;
+	color:var(--text-color-muted);
 }
 #popup .checkbox label{
 	margin-top: 5px;
-	color:#444444;
+	color:var(--text-color-muted);
 }
 @media screen and (max-width:500px){
 	#canvas_preview_container{
diff --git a/src/css/reset.css b/src/css/reset.css
index 080b05d3..947d3c36 100644
--- a/src/css/reset.css
+++ b/src/css/reset.css
@@ -4,45 +4,86 @@
 }
 :root {
 	/* original - default */
-	--background: #424F5A;
-	--text-color: #000000;
-	--background-color-section: #68727b;
-	--background-color-area: #868e95;
-	--background-color-header: #a2a8ae;
-	--background-color-button: #959ca2;
-	--background-color-menu: #2D2D2D;
-	--text-color-menu: #cccccc;
-	--background-color-active: #419147;
-	--background-color-hover: #b4b9bd;
-	--border-color: #3c3c3c;
+	--background: radial-gradient(circle, #aaa 0%, #4d5355 100%);
+	--text-color: #f4f3f3;
+	--text-color-muted: #c1c1c1;
+	--text-color-red: #e38282;
+	--text-color-green: #8bdb8b;
+	--text-color-blue: #a4a4ff;
+	--link-color: #9ffda5;
+	--section-background-color: #323a3c;
+	--area-background-color: #464d4f;
+	--header-background-color: #373d3f;
+	--button-background-color: #2f3739;
+	--input-background-color: #2f3739;
+	--input-text-color: #f4f3f3;
+	--input-border-color: #0f0f0f;
+	--menu-background-color: #222;
+	--menu-text-color: #cccccc;
+	--background-color-active: #adecab;
+	--background-color-hover: #575f62;
+	--text-color-active: #215b2a;
+	--border-color: #727677;
+	--scrollbar-track-color: #464d4f;
+	--scrollbar-thumb-color: #2f3739;
+	--sprites-url: url(images/sprites-light.png);
+	--sprites-url-active: url(images/sprites.png);
+	--mobile-menu-toggle-filter: none;
 }
 body.theme-light{
 	/* light */
 	--background: #f9f9fa;
 	--text-color: #0c0c0d;
-	--background-color-section: #f1f1f1;
-	--background-color-area: #ccc;
-	--background-color-header: #dcdcdc;
-	--background-color-button: #f9f9fa;
-	--background-color-menu: #f1f1f1;
-	--text-color-menu: #333333;
-	--background-color-active: #0a84ff;
-	--background-color-hover: #e1e1e2;
+	--text-color-muted: #444444;
+	--text-color-red: #bb2424;
+	--text-color-green: #2b882b;
+	--text-color-blue: #5454ca;
+	--link-color: #000080;
+	--section-background-color: #eaeaea;
+	--area-background-color: #d9d9d9;
+	--header-background-color: #c8c8c8;
+	--button-background-color: #f9f9fa;
+	--input-background-color: #ffffff;
+	--input-text-color: #0c0c0d;
+	--input-border-color: #ccc;
+	--menu-background-color: #eaeaea;
+	--menu-text-color: #333333;
+	--menu-dropdown-hover-background-color: #a3dbf7;
+	--menu-dropdown-border-color: #15439b;
+	--background-color-active: #a3dbf7;
+	--background-color-hover: #c4c4c4;
+	--text-color-active: #15439b;
 	--border-color: #c1c1c1;
+	--scrollbar-track-color: #f9f9fa;
+	--scrollbar-thumb-color: #919090;
+	--sprites-url: url(images/sprites.png);
+	--sprites-url-active: url(images/sprites.png);
+	--mobile-menu-toggle-filter: none;
 }
 body.theme-green{
 	/* green */
 	--background: #050702;
 	--text-color: #acc3a9;
-	--background-color-section: #1c2e04;
-	--background-color-area: #3b5f11;
-	--background-color-header: #2b460f;
-	--background-color-button: #2e4a0d;
-	--background-color-menu: #1c2e04;
-	--text-color-menu: #acc3a9;
+	--text-color-muted: #80937d;
+	--link-color: #9ffda5;
+	--section-background-color: #1c2e04;
+	--area-background-color: #3b5f11;
+	--header-background-color: #2b460f;
+	--button-background-color: #2e4a0d;
+	--input-background-color: #ffffff;
+	--input-text-color: #0c0c0d;
+	--input-border-color: #ccc;
+	--menu-background-color: #1c2e04;
+	--menu-text-color: #acc3a9;
 	--background-color-active: #58960e;
 	--background-color-hover: #58960e;
+	--text-color-active: #acc3a9;
 	--border-color: #4d6b1e;
+	--scrollbar-track-color: #050702;
+	--scrollbar-thumb-color: #80937d;
+	--sprites-url: url(images/sprites.png);
+	--sprites-url-active: url(images/sprites.png);
+	--mobile-menu-toggle-filter: invert();
 }
 body{
 	margin: 0px;
@@ -95,9 +136,10 @@ hr{
 	border-color: rgba(0,0,0,0.3);
 	border-bottom: 0;
 }
-input[type="text"], input[type="button"], select, input[type="number"], textarea{
-	border:1px solid #393939;
-	border-color: var(--border-color);
+input[type="text"], select, input[type="number"], textarea{
+	background: var(--input-background-color);
+	border: 1px solid var(--input-border-color);
+	color: var(--input-text-color);
 	padding: 3px 5px;
 	font-size: 13px;
 }
@@ -111,18 +153,16 @@ input[type="range"]{
 	margin-left:0px;
 	width:100%;
 }
-input[type="button"]{
-	background: #dddddd;
-}
-input[type="button"]:disabled{
-	visibility:hidden;
-}
-button{
+button, input[type="button"]{
 	border-radius: 0;
 	cursor: pointer;
-	background-color: var(--background-color-button);
+	border: 1px solid var(--border-color);
+	background-color: var(--button-background-color);
 	color: var(--color-text);
 }
+button:disabled, input[type="button"]:disabled{
+	visibility:hidden;
+}
 label{
 	display: inline-block;
 	vertical-align: top;
diff --git a/src/js/libs/popup.js b/src/js/libs/popup.js
index cd81f6cc..0efe339a 100644
--- a/src/js/libs/popup.js
+++ b/src/js/libs/popup.js
@@ -49,7 +49,7 @@ var instance = null;
 var template = `
 	<button type="button" class="close" id="popup_close">&times;</button>
 	<div id="pretitle_area"></div>
-	<span class="grey right" id="popup_comment"></span>
+	<span class="text_muted right" id="popup_comment"></span>
 	<h2 class="trn" id="popup_title"></h2>
 	<div id="dialog_content">
 		<div id="preview_content"></div>
diff --git a/src/js/modules/file/search.js b/src/js/modules/file/search.js
index d49bf59c..b4aeb87b 100644
--- a/src/js/modules/file/search.js
+++ b/src/js/modules/file/search.js
@@ -42,7 +42,7 @@ class File_search_media_class {
 
 		var settings = {
 			title: 'Search',
-			comment: 'Source: <a class="grey" href="https://pixabay.com/">pixabay.com</a>.',
+			comment: 'Source: <a class="text_muted" href="https://pixabay.com/">pixabay.com</a>.',
 			className: 'wide',
 			params: [
 				{name: "query", title: "Keyword:", value: query},