diff --git a/metadata/dbms/dbms.css b/metadata/dbms/dbms.css
index cd6cab9..28ab9c7 100644
--- a/metadata/dbms/dbms.css
+++ b/metadata/dbms/dbms.css
@@ -1,11 +1,3 @@
-/*Переменные для настройки цветов*/
-:root{
-	--header-color: #505050;
-	/*--header-color: #fdfdfd;*/
-	--back-color: #3a3a3a;
-	/*--back-color: #ffffff;*/
-}
-
 
 *{
 	box-sizing:			border-box;
@@ -21,7 +13,7 @@ html,body
 	padding: 0px;
 	font-size: 14px;
 	font-family: Arial;
-	background-color: #3a3a3a;
+	background-color: var(--back-color);
 }
 
 input,textarea
@@ -68,14 +60,13 @@ select
   text-align: center;
 }
 
-/*Табличка исполняющая роль окна*/
+/*Стили для таблицы которая исполняет роль окна*/
 .shadow {
     box-shadow: 0 0 10px rgba(255,255,255,0.7);
-    background-color: #3a3a3a;
-    color: #ffffff;
+	background-color: var(--back-color);
+	color: var(--main-font-color);
 }
 
-
 /* Для полей состояжих из нескольких элементов (поле с кнопочкой допустим) */
 table.DBMSSimple {
     width: 100%;
diff --git a/metadata/dbms/form/g.gif b/metadata/dbms/form/g.gif
deleted file mode 100644
index 2cf8de9..0000000
Binary files a/metadata/dbms/form/g.gif and /dev/null differ
diff --git a/metadata/dbms/form/b_g.png b/metadata/dbms/form/g_b.png
similarity index 100%
rename from metadata/dbms/form/b_g.png
rename to metadata/dbms/form/g_b.png
diff --git a/metadata/dbms/form/g_w.png b/metadata/dbms/form/g_w.png
new file mode 100644
index 0000000..f87b9f9
Binary files /dev/null and b/metadata/dbms/form/g_w.png differ
diff --git a/metadata/dbms/form/x_b.png b/metadata/dbms/form/x_b.png
new file mode 100644
index 0000000..991be72
Binary files /dev/null and b/metadata/dbms/form/x_b.png differ
diff --git a/metadata/dbms/form/b_x.png b/metadata/dbms/form/x_w.png
similarity index 100%
rename from metadata/dbms/form/b_x.png
rename to metadata/dbms/form/x_w.png
diff --git a/metadata/dbms/tools.js b/metadata/dbms/tools.js
index 96bfcab..0ca53a0 100644
--- a/metadata/dbms/tools.js
+++ b/metadata/dbms/tools.js
@@ -1195,10 +1195,17 @@ class TWin
 		str+='	</tr>';
 		str+='</table>';
 */
-		
-		var str='';
-		str+='<table id="TWin_TBL_'+this.tWinId+'" class="shadow" bgcolor="#f1f1f1" border="0px" cellspacing="0" cellpadding="0" style="width: 100%; height: 100%; border: 1px solid #000000;">';
-		str+='	<tr id="TWin_H0_'+this.tWinId+'" style="background: url(../resources/metadata/dbms/form/b_g.png) repeat-x;"><td></td><td><table cellspacing="0" cellpadding="0" style="width: 100%; height: 29px;"><tr><td id="TWin_Ca_'+this.tWinId+'" style="vertical-align: middle; cursor: move; font-weight: bold; white-space: nowrap;"></td><td style="width: 10px; vertical-align: middle;"><img src="../resources/metadata/dbms/form/b_x.png" id="TWin_CL_'+this.tWinId+'" style="cursor:pointer;padding-right: 5px;"></td></tr></table></td><td></td></tr>';
+
+		let imgB='g_b.gif';
+		let imgX='x_w.png';
+		if(g_textColor1=='#000000') { //Если тёмный стиль
+			imgB = 'g_w.png';
+			imgX = 'x_b.png';
+		}
+
+		let str='';
+		str+='<table id="TWin_TBL_'+this.tWinId+'" class="shadow" border="0px" cellspacing="0" cellpadding="0" style="width: 100%; height: 100%; border: 1px solid #000000;">';
+		str+='	<tr id="TWin_H0_'+this.tWinId+'" style="background: url(../resources/metadata/dbms/form/'+imgB+') repeat-x;"><td></td><td><table cellspacing="0" cellpadding="0" style="width: 100%; height: 29px;"><tr><td id="TWin_Ca_'+this.tWinId+'" style="vertical-align: middle; cursor: move; font-weight: bold; white-space: nowrap;"></td><td style="width: 10px; vertical-align: middle;"><img src="../resources/metadata/dbms/form/'+imgX+'" id="TWin_CL_'+this.tWinId+'" style="cursor:pointer;padding-right: 5px;"></td></tr></table></td><td></td></tr>';
 		str+='	<tr>';
 		str+='		<td style="width: 5px; height: 5px;'+(!this.dialog ? ' cursor:nw-resize;' : '')+'" id="TWin_TL_'+this.tWinId+'"><img src="../resources/metadata/dbms/form/5.gif" alt="" style="display: block;" border="0px" draggable="false"></td>';
 		str+='		<td style="vertical-align:top;height: 5px;'+(!this.dialog ? ' cursor:n-resize;' : '')+'" id="TWin_T_'+this.tWinId+'"></td>';