diff --git a/metadata/dbms/editrecord.js b/metadata/dbms/editrecord.js
index b1d08ef..259d376 100644
--- a/metadata/dbms/editrecord.js
+++ b/metadata/dbms/editrecord.js
@@ -54,6 +54,7 @@ class EdtRec
 			this.pBarDiv.innerHTML='<table  style="width:100%;height:100%" cellpadding="0" cellspacing="0"><tr><td align="center" style="vertical-align: middle;"><img src="../resources/metadata/dbms/images/loading.gif" alt=""></td></tr></table>';
 
 			let eDiv=document.getElementById('eDiv'+this.uid);
+			if(eDiv==null) return;
 			eDiv.appendChild(this.pBarDiv);
 		}
 	};
@@ -1050,6 +1051,7 @@ class EdtRec
 		let nodeType=findFirstNode(node, 'type');
 		prop_name=nodeType.getAttribute("pn"); //field name
 		prop=document.getElementById("prop_"+this.uid+"_"+prop_name);
+		if(prop==null) return;
 
 		let selector=null; //find what kind of object object
 		let nodeFilter=findFirstNode(this.nodeMetadata, 'properties');
diff --git a/metadata/dbms/tools.js b/metadata/dbms/tools.js
index d9bd1c8..5b022c0 100644
--- a/metadata/dbms/tools.js
+++ b/metadata/dbms/tools.js
@@ -209,6 +209,7 @@ function alert2(title,text,okFunc=null)
 
 	win.setContent(html);
 	let obj=document.getElementById(win.uid+'_close');
+	obj.focus();
 	if(obj!=null) obj.onclick=function(win,okFunc){return function(){ win.Close(); if(okFunc!=null) okFunc(); };}(win,okFunc);
 	win.setSize("300px","150px");
 	win.setCenter();
@@ -237,6 +238,7 @@ function confirm2(title,text,okFunc,cancelFunc)
 
 	win.setContent(html);
 	let btnO=document.getElementById(win.uid+'_ok');
+	btnO.focus();
 	if(btnO!=null){
 		btnO.onclick=function(win){
 			return function(){
@@ -1289,16 +1291,9 @@ class TWin
 		str+='</table>';
 */
 
-		let imgB='g_b.png';
-		let imgX='x_w.png';
-		if(document.body.getAttribute('data-theme')!='1') { //Если тёмный стиль
-			imgB = 'g_w.gif';
-			imgX = 'x_b.gif';
-		}
-
 		let str='';
 		str+='<table id="TWin_TBL_'+this.tWinId+'" class="DBMSShadow" style="width: 100%; height: 100%; border: 1px solid #000000;">';
-		str+='	<tr id="TWin_H0_'+this.tWinId+'" style="background: url('+this.path+'/metadata/dbms/form/'+imgB+') repeat-x;"><td></td><td><table 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;">'+(this.disableClosing ? '' : '<img src="'+this.path+'/metadata/dbms/form/'+imgX+'" id="TWin_CL_'+this.tWinId+'" style="cursor:pointer;padding-right: 5px;">')+'</td></tr></table></td><td></td></tr>';
+		str+='	<tr id="TWin_H0_'+this.tWinId+'" style="background: var(--path-grad) repeat-x;"><td></td><td><table 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;">'+(this.disableClosing ? '' : '<div id="TWin_CL_'+this.tWinId+'" style="display: inline-block; width: 10px; height: 10px; background-image: var(--path-X); cursor:pointer;padding-right: 5px;"></div>')+'</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="'+this.path+'/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>';