From b7b82e54c6ea891bde5d1954d7f83912e3f66be0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 15 Oct 2024 13:35:33 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  20 +++-
 src/Common/Database/Tables/DataSet.java       |   9 +-
 src/Common/MainModule_.java                   |  40 ++++---
 src/Common/Passes/Pass.java                   |   6 +-
 src/Common/Visual/DataSetControlForm.java     |   6 +-
 .../Visual/Menus}/FastAccessMenuBar.java      |   9 +-
 src/Common/Visual/Trees/StyledTree.java       |   3 +-
 src/Common/Visual/UIModule_.java              | 102 ++++++++++++------
 src/Common/Visual/UI_.java                    |  11 +-
 src/_VisualDVM/Global.java                    |   3 -
 .../GlobalData/Account/Account.java           |   1 -
 .../GlobalData/Compiler/CompilersDBTable.java |   1 -
 src/_VisualDVM/GlobalData/GlobalDatabase.java |   2 +-
 .../GlobalData/Machine/MachinesDBTable.java   |   1 -
 .../UI/RemoteFileChooserFields.java           |   1 -
 .../RemoteFile/UI/RemoteFilesTree.java        |   1 -
 .../CompilationTasksDBTable.java              |   1 -
 .../Tasks/RunTask/RunTasksDBTable.java        |   1 -
 .../GlobalData/User/UsersDBTable.java         |   1 -
 src/_VisualDVM/Passes/All/AddFile.java        |   1 -
 .../Passes/All/AppendBugReportComment.java    |   1 -
 .../All/AppendBugReportDescription.java       |   1 -
 .../Passes/All/AppendBugReportField.java      |   1 -
 .../Passes/All/ApplyCurrentFunction.java      |   1 -
 src/_VisualDVM/Passes/All/CheckAccount.java   |   1 -
 src/_VisualDVM/Passes/All/CleanAnalyses.java  |   1 -
 .../Passes/All/CloseCurrentFile.java          |   1 -
 .../Passes/All/CloseCurrentProject.java       |   1 -
 .../Passes/All/CompareDVMRunTasks.java        |   1 -
 .../Passes/All/CompareSapforPackages.java     |   1 -
 src/_VisualDVM/Passes/All/Compile.java        |   1 -
 .../Passes/All/CreateEmptyDirectory.java      |   1 -
 .../Passes/All/CreateParallelVariants.java    |   1 -
 .../Passes/All/DVMConvertProject.java         |   1 -
 .../Passes/All/DeleteDVMPackage.java          |   1 -
 .../Passes/All/DeleteDirectory.java           |   1 -
 src/_VisualDVM/Passes/All/DeleteFile.java     |   1 -
 .../Passes/All/DeleteSapforPackage.java       |   1 -
 .../Passes/All/DeleteSelectedFiles.java       |   1 -
 src/_VisualDVM/Passes/All/DeleteVersion.java  |   1 -
 .../Passes/All/DownloadDVMPackage.java        |   1 -
 .../Passes/All/DownloadProject.java           |   1 -
 src/_VisualDVM/Passes/All/ExcludeFile.java    |   1 -
 .../Passes/All/GenerateParallelVariants.java  |   1 -
 src/_VisualDVM/Passes/All/IncludeFile.java    |   1 -
 .../Passes/All/OpenCurrentFile.java           |   1 -
 .../Passes/All/OpenCurrentProject.java        |   1 -
 src/_VisualDVM/Passes/All/Precompilation.java |   1 -
 .../Passes/All/PublishBugReport.java          |   1 -
 .../Passes/All/PublishComponent.java          |   1 -
 src/_VisualDVM/Passes/All/PublishTests.java   |   1 -
 .../Passes/All/RenameDirectory.java           |   1 -
 src/_VisualDVM/Passes/All/RenameFile.java     |   1 -
 src/_VisualDVM/Passes/All/Run.java            |   1 -
 .../All/SPF_GetAllDeclaratedArrays.java       |   1 -
 .../Passes/All/SPF_GetArrayDistribution.java  |   1 -
 .../SPF_GetArrayDistributionOnlyAnalysis.java |   1 -
 .../SPF_GetArrayDistributionOnlyRegions.java  |   1 -
 .../Passes/All/SPF_GetFileLineInfo.java       |   1 -
 .../All/SPF_GetGraphFunctionPositions.java    |   3 +-
 .../Passes/All/SPF_GetGraphFunctions.java     |   1 -
 .../Passes/All/SPF_GetGraphLoops.java         |   1 -
 .../All/SPF_GetIncludeDependencies.java       |   1 -
 .../Passes/All/SPF_InlineProcedures.java      |   1 -
 .../Passes/All/SPF_InlineProceduresH.java     |   1 -
 .../Passes/All/SPF_InsertIncludesPass.java    |   1 -
 .../All/SPF_ModifyArrayDistribution.java      |   1 -
 .../Passes/All/SPF_ParseFilesWithOrder.java   |   1 -
 .../Passes/All/SaveBugReportComment.java      |   1 -
 .../Passes/All/SaveBugReportDescription.java  |   3 +-
 .../All/SaveFunctionsGraphCoordinates.java    |   1 -
 src/_VisualDVM/Passes/All/SaveGraph.java      |   1 -
 .../Passes/All/SelectRemoteFile.java          |   1 -
 .../Passes/All/SynchronizeBugReports.java     |   1 -
 .../Passes/All/SynchronizeTests.java          |   1 -
 .../Passes/All/UpdateBugReportField.java      |   1 -
 src/_VisualDVM/Passes/All/UpdateProperty.java |   3 +-
 src/_VisualDVM/Passes/All/UpdateSetting.java  |   4 +-
 .../Passes/Project/FilesMassPass.java         |   1 -
 .../Passes/Sapfor/SapforAnalysis.java         |   1 -
 src/_VisualDVM/Passes/Sapfor/SapforPass.java  |   1 -
 .../Passes/Sapfor/SapforTransformation.java   |   1 -
 .../Passes/Sapfor/Transformation.java         |   1 -
 .../Passes/Sapfor/VariantsMassPass.java       |   1 -
 .../ProjectData/DBArray/DBArraysMenuBar.java  |   2 +-
 .../Files/UI/Editor/SPFEditor.java            |   1 -
 .../Files/UI/FilesHyperlinksPanel.java        |   1 -
 .../ProjectData/Files/UI/FilesTree.java       |   1 -
 .../ProjectData/Project/db_project_info.java  |   1 -
 .../Arrays/UI/DimensionStateChanger.java      |   1 -
 .../Arrays/UI/DimensionsTableForm.java        |   6 +-
 .../ProjectData/SapforData/FileObject.java    |   1 -
 .../UI/Graph/FunctionsGraphMenu.java          |   1 -
 .../SapforData/Loops/LoopState.java           |   6 +-
 .../SapforData/Variants/ParallelVariant.java  |   1 -
 .../BugReport/BugReportsDBTable.java          |   1 -
 .../Repository/Component/Sapfor/Sapfor.java   |   1 -
 .../TestingSystem/Common/Group/Group.java     |   1 -
 .../TestingSystem/Common/Test/Test.java       |   1 -
 .../DVM/DVMPackage/DVMPackageDBTable.java     |   1 -
 .../UI/SapforTasksPackageTree.java            |   1 -
 .../ServerSapfor/ServerSapforsDBTable.java    |   1 -
 .../Visual/Interface/ProjectWindow.java       |   1 -
 src/_VisualDVM/Visual/MainUI.java             |  52 +++++++--
 .../Visual/Menus/FileMenuBar/FileMenuBar.java |   1 -
 .../Menus/FileMenuBar/FileSettingsMenu.java   |   1 -
 .../Visual/Menus/MainMenuBar/MainMenuBar.java |   1 -
 .../Visual/Menus/ProjectFilesMenu.java        |   1 -
 .../Menus/ProjectMenuBar/ProjectMenuBar.java  |   1 -
 .../Menus/ProjectMenuBar/ProjectViewMenu.java |   1 -
 src/_VisualDVM/Visual/Menus/VersionsMenu.java |   1 -
 .../Visual/Syntax/SPFEditorTheme.java         |   2 +
 src/_VisualDVM/Visual/UI.java                 |  75 -------------
 .../Visual/Windows/CallbackForm.java          |   1 -
 .../Visual/Windows/ComparisonForm.java        |   5 +-
 src/_VisualDVM/Visual/Windows/FileForm.java   |   5 +-
 src/_VisualDVM/Visual/Windows/MainForm.java   |   7 +-
 .../Windows/SapforPackagesComparisonForm.java |   1 -
 .../Visual/Windows/SearchReplaceForm.java     |   3 +-
 .../Visual/Windows/TestingForm.java           |   1 -
 .../Visual/Windows/VersionsForm.java          |   2 -
 121 files changed, 204 insertions(+), 280 deletions(-)
 rename src/{_VisualDVM/Visual/Menus/FastAccessMenuBar => Common/Visual/Menus}/FastAccessMenuBar.java (72%)
 delete mode 100644 src/_VisualDVM/Visual/UI.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0bddd25e..1bb9c8c5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,21 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/Account.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportDescription.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportDescription.java" afterDir="false" />
@@ -86,8 +93,10 @@
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
@@ -98,6 +107,7 @@
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ProjectWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ProjectWindow.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
@@ -105,13 +115,15 @@
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -210,11 +222,11 @@
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="Common.Visual.UI_" />
       <recent name="Common.Utils.Utils_" />
       <recent name="Common.Visual.CommonUI" />
       <recent name="CommomUI" />
       <recent name="_VisualDVM.Global" />
-      <recent name="Common.CurrentAnchestor" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\Visual\Windows" />
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index ab2ea82a..ac74502f 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -42,14 +42,16 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     }
     protected void createFilters() {
     }
-    public Class getMenuBarClass(){return null;}
+    public Class getMenuBarClass() {
+        return null;
+    }
     public void mountUI(JPanel content_in) {
         UI_.Clear(content_in);
         //-->
         ui_ = createUI();
         ui_.setContent(content_in);
         //-->
-        if (getMenuBarClass()!=null){
+        if (getMenuBarClass() != null) {
             try {
                 DataMenuBar bar = null;
                 if (!MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
@@ -64,8 +66,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
                 if (ui_.hasCheckBox())
                     bar.createSelectionButtons(this);
                 //--
-            }
-            catch ( Exception ex){
+            } catch (Exception ex) {
                 ex.printStackTrace();
             }
         }
diff --git a/src/Common/MainModule_.java b/src/Common/MainModule_.java
index 2136a5ff..0c9cef61 100644
--- a/src/Common/MainModule_.java
+++ b/src/Common/MainModule_.java
@@ -15,37 +15,45 @@ import java.util.Vector;
 public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModule_> {
     public static MainModule_ instance = null; //текущий экземпляр. всегда один.
     //--
-    D db=null;
-    Class<D> db_class=null;
-    LinkedHashMap<Current_, Object> objects=null;  //Current
+    D db = null;
+    Class<D> db_class = null;
+    LinkedHashMap<Current_, Object> objects = null;  //Current
     //--
-    LinkedHashMap<PassCode_, Pass> passes=null;
+    LinkedHashMap<PassCode_, Pass> passes = null;
     //--
-    U ui=null;
-    Class<U> ui_class=null;
-    MenuElement[] last_menu_path=null;
+    U ui = null;
+    Class<U> ui_class = null;
+    MenuElement[] last_menu_path = null;
     //--
     public MainModule_(Class<D> db_class_in, Class<U> ui_class_in) throws Exception {
-        ui_class=ui_class_in;
+        ui_class = ui_class_in;
         db_class = db_class_in;
         instance = this;
     }
-    public void CreateAll() throws Exception{
-        if (ui_class!=null)
-            ui=ui_class.newInstance();
+    public void CreateAll() throws Exception {
+        if (ui_class != null)
+            ui = ui_class.newInstance();
         //--
         createPasses();
         //-
         objects = new LinkedHashMap<>();
     }
     //ИНТЕРФЕЙС
-    public boolean hasUI(){return ui!=null;}
-    public U getUI(){
+    public boolean hasUI() {
+        return ui != null;
+    }
+    public U getUI() {
         return ui;
     }
-    public boolean hasLastMenuPath(){return  last_menu_path!=null;}
-    public MenuElement[] getLastMenuPath(){return last_menu_path;}
-    public MenuElement[] setLastMenuPath(MenuElement[] last_menu_path_in){return last_menu_path=last_menu_path_in;}
+    public boolean hasLastMenuPath() {
+        return last_menu_path != null;
+    }
+    public MenuElement[] getLastMenuPath() {
+        return last_menu_path;
+    }
+    public MenuElement[] setLastMenuPath(MenuElement[] last_menu_path_in) {
+        return last_menu_path = last_menu_path_in;
+    }
     //БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ
     public D getDb() {
         return db;
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index 00119fc8..5b35e49b 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -9,6 +9,7 @@ import Common.Visual.Controls.StablePassMenuItem;
 import Common.Visual.UI_;
 import Common.Visual.Windows.PassForm;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Settings.SettingName;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -94,7 +95,7 @@ public class Pass<T> {
             } catch (Exception ex) {
                 Utils_.MainLog.PrintException(ex);
             }
-            MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
+            MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
         }
     }
     public boolean isDone() {
@@ -266,7 +267,8 @@ public class Pass<T> {
                     animation_sem.acquire();
                     //---
                     form = null;
-                    MainModule_.instance.getUI().DropPassForm();;
+                    MainModule_.instance.getUI().DropPassForm();
+                    ;
                     System.gc();
                     //--
                     form = MainModule_.instance.getUI().SetPassForm(new PassForm(this));
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index dfd5658c..c813e11a 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -5,6 +5,7 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.FKBehaviour;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Menus.TableMenu;
 import Common.Visual.Tables.ColumnInfo;
@@ -12,7 +13,6 @@ import Common.Visual.Tables.DataTable;
 import Common.Visual.Tables.Grid.GridAnchestor;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Grid.TableVisualData;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import javax.swing.table.TableColumn;
@@ -184,9 +184,9 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
                     ColumnInfo columnInfo = columns.get(i);
                     if (columnInfo.isVisible()) {
                         if (columnInfo.hasRenderer())
-                            getColumnModel().getColumn(i).setCellRenderer(UI.TableRenderers.get(columnInfo.getRenderer()));
+                            getColumnModel().getColumn(i).setCellRenderer(MainModule_.instance.getUI().getTableRenderer(columnInfo.getRenderer()));
                         if (columnInfo.hasEditor())
-                            getColumnModel().getColumn(i).setCellEditor(UI.TableEditors.get(columnInfo.getEditor()));
+                            getColumnModel().getColumn(i).setCellEditor(MainModule_.instance.getUI().getTableEditor(columnInfo.getEditor()));
                         if (columnInfo.hasMaxWidth())
                             getColumnModel().getColumn((i)).setMaxWidth(columnInfo.getMaxWidth());
                         if (columnInfo.hasMinWidth())
diff --git a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java b/src/Common/Visual/Menus/FastAccessMenuBar.java
similarity index 72%
rename from src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
rename to src/Common/Visual/Menus/FastAccessMenuBar.java
index 67ff5068..61e29de1 100644
--- a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
+++ b/src/Common/Visual/Menus/FastAccessMenuBar.java
@@ -1,10 +1,7 @@
-package _VisualDVM.Visual.Menus.FastAccessMenuBar;
+package Common.Visual.Menus;
 import Common.MainModule_;
 import Common.Passes.Pass;
-import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI_;
-import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Settings.SettingName;
 
 import javax.swing.*;
 import java.awt.*;
@@ -21,13 +18,13 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
         revalidate();
         repaint();
     }
-    public void Refresh() {
+    public void Refresh(int limit) {
         Drop();
         int i = 1;
         for (Object pass : MainModule_.instance.getFirstAccessPasses()) {
             showPass((Pass) pass);
             ++i;
-            if (i > ((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
+            if (i > limit) break;
         }
     }
     public void Drop() {
diff --git a/src/Common/Visual/Trees/StyledTree.java b/src/Common/Visual/Trees/StyledTree.java
index eff7c1f0..07ba1719 100644
--- a/src/Common/Visual/Trees/StyledTree.java
+++ b/src/Common/Visual/Trees/StyledTree.java
@@ -3,7 +3,6 @@ import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Themes.ThemeElement;
 import _VisualDVM.Visual.Menus.GraphMenu;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -26,7 +25,7 @@ public class StyledTree extends JTree implements ThemeElement {
         setToggleClickCount(0);  //отключение сворачивание разворачивания по двойному клику
         //--
         if (!getRenderer().equals(TreeRenderers.RendererUndefined))
-            setCellRenderer(UI.TreeRenderers.get(getRenderer()));
+            setCellRenderer(MainModule_.instance.getUI().getTreeRenderer(getRenderer()));
         //--
         getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
         addTreeSelectionListener(e -> {
diff --git a/src/Common/Visual/UIModule_.java b/src/Common/Visual/UIModule_.java
index 3e3eac0b..becbb7c6 100644
--- a/src/Common/Visual/UIModule_.java
+++ b/src/Common/Visual/UIModule_.java
@@ -1,49 +1,35 @@
 package Common.Visual;
 import Common.Database.Tables.DataSet;
 import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Menus.FastAccessMenuBar;
+import Common.Visual.Tables.*;
 import Common.Visual.Themes.DefaultTheme;
 import Common.Visual.Themes.VisualiserTheme;
+import Common.Visual.Trees.SelectionTreeCellRenderer;
 import Common.Visual.Windows.PassForm;
-import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
 
 import javax.swing.*;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.tree.TreeCellRenderer;
 import java.awt.*;
 import java.util.LinkedHashMap;
 import java.util.Stack;
+
+import static Common.Visual.Tables.TableEditors.EditorSelect;
+import static Common.Visual.Tables.TableRenderers.*;
+import static Common.Visual.Trees.TreeRenderers.RendererSelection;
 public class UIModule_ {
+    public LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
+    public Stack<Component> windowsStack = new Stack<>();
+    protected LinkedHashMap<Common.Visual.Tables.TableRenderers, TableCellRenderer> tableRenderers = new LinkedHashMap<>();
+    protected LinkedHashMap<Common.Visual.Tables.TableEditors, TableCellEditor> tableEditors = new LinkedHashMap<>();
+    protected LinkedHashMap<Common.Visual.Trees.TreeRenderers, TreeCellRenderer> treeRenderers = new LinkedHashMap<>();
     //--
     VisualiserTheme theme = new DefaultTheme();
-    public VisualiserTheme getTheme() {
-        return theme;
-    }
-    public void setTheme(VisualiserTheme theme_in) {
-        theme = theme_in;
-    }
-    //--
-    PassForm passForm = null;//текущая форма прохода. нужна для
-    public boolean HasPassForm(){return passForm!=null;}
-    public PassForm GetPassForm(){return passForm;}
-    public PassForm SetPassForm(PassForm passForm_in){
-        return passForm = passForm_in;
-    }
-    public void DropPassForm(){passForm=null;}
-    //--
-    //--
     FastAccessMenuBar fastAccessMenuBar = new FastAccessMenuBar();
-    public FastAccessMenuBar getFastAccessMenuBar(){return fastAccessMenuBar;}
-    //-
-    public LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
-    //--
-    public Stack<Component> windowsStack = new Stack<>();
-    public Component getFrontWindow() {
-        Component res = null;
-        try {
-            res = windowsStack.peek();
-        } catch (Exception ignored) {
-        }
-        return res;
-    }
-    public UIModule_(){
+    PassForm passForm = null;//текущая форма прохода. нужна для
+    public UIModule_() {
         //<editor-fold desc="Локализация компонентов окна JFileChooser">
         UIManager.put("FileChooser.openButtonText", "Открыть");
         UIManager.put("FileChooser.cancelButtonText", "Отмена");
@@ -76,5 +62,59 @@ public class UIModule_ {
         UIManager.put("OptionPane.cancelButtonText", "Отмена");
         UIManager.put("OptionPane.okButtonText", "Готово");
         //</editor-fold>
+        tableRenderers.put(RendererDate, new DateRenderer_());
+        tableRenderers.put(RendererProgress, new ProgressBarRenderer());
+        tableRenderers.put(RendererSelect, new DBObjectSelectionRenderer());
+        tableRenderers.put(RendererMultiline, new MultilineRenderer());
+        tableRenderers.put(RendererHyperlinks, new HyperlinksRenderer());
+        tableRenderers.put(RendererTopLeft, new TopLeftRenderer());
+        tableRenderers.put(RendererMaskedInt, new MaskedIntegerValueRenderer());
+        tableRenderers.put(RendererHiddenList, new HiddenListRenderer());
+        tableRenderers.put(RendererWrapText, new WrapTextRenderer());
+        tableRenderers.put(RendererStatusEnum, new StatusEnumRenderer());
+        //-
+        tableEditors.put(EditorSelect, new DBObjectSelector());
+        //
+        treeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
+    }
+    //--
+    public VisualiserTheme getTheme() {
+        return theme;
+    }
+    public void setTheme(VisualiserTheme theme_in) {
+        theme = theme_in;
+    }
+    //--
+    public boolean HasPassForm() {
+        return passForm != null;
+    }
+    public PassForm GetPassForm() {
+        return passForm;
+    }
+    public PassForm SetPassForm(PassForm passForm_in) {
+        return passForm = passForm_in;
+    }
+    public void DropPassForm() {
+        passForm = null;
+    }
+    public FastAccessMenuBar getFastAccessMenuBar() {
+        return fastAccessMenuBar;
+    }
+    public Component getFrontWindow() {
+        Component res = null;
+        try {
+            res = windowsStack.peek();
+        } catch (Exception ignored) {
+        }
+        return res;
+    }
+    public TableCellRenderer getTableRenderer(Common.Visual.Tables.TableRenderers r_name) {
+        return tableRenderers.get(r_name);
+    }
+    public TableCellEditor getTableEditor(Common.Visual.Tables.TableEditors e_name) {
+        return tableEditors.get(e_name);
+    }
+    public TreeCellRenderer getTreeRenderer(Common.Visual.Trees.TreeRenderers r_name) {
+        return treeRenderers.get(r_name);
     }
 }
diff --git a/src/Common/Visual/UI_.java b/src/Common/Visual/UI_.java
index c26e21d5..05933f55 100644
--- a/src/Common/Visual/UI_.java
+++ b/src/Common/Visual/UI_.java
@@ -5,15 +5,18 @@ import Common.Utils.Utils_;
 import javax.swing.*;
 import javax.swing.event.ChangeListener;
 import javax.swing.text.DefaultFormatter;
+import javax.swing.text.DefaultHighlighter;
+import javax.swing.text.Highlighter;
 import java.awt.*;
-import java.util.Stack;
 public class UI_ {
-    public static boolean active = false; //есть ли интерфейс. в консольных версиях не нужен.
-    //---
+    //--
+    public static final Highlighter.HighlightPainter GreenTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
+    public static final Highlighter.HighlightPainter RedTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
+    public static boolean active = false;
     public static boolean isActive() {
         return active;
     }
-    //-----
+    //---
     public static void Clear(Container container) {
         container.removeAll();
         container.repaint();
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 66ef59b2..c1cd8656 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -19,7 +19,6 @@ import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
 import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
 import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
-import _VisualDVM.Visual.UI;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 
@@ -241,8 +240,6 @@ public class Global {
         }
         messagesServer = new MessagesServer();
         messagesServer.Start();
-        //создание списков служебных объектов
-        UI.CreateAll();
         Components = new ComponentsSet();
         mainModule.set(Current.ProjectView, ProjectView.Files);
         Components.put(ComponentType.Visualiser, visualiser = new Visualiser());
diff --git a/src/_VisualDVM/GlobalData/Account/Account.java b/src/_VisualDVM/GlobalData/Account/Account.java
index a9af1754..dba087a8 100644
--- a/src/_VisualDVM/GlobalData/Account/Account.java
+++ b/src/_VisualDVM/GlobalData/Account/Account.java
@@ -3,7 +3,6 @@ import Common.Database.Objects.DBObject;
 import Common.Utils.TextLog;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.BugReport.BugReport;
-import _VisualDVM.Visual.UI;
 import com.sun.org.glassfish.gmbal.Description;
 public class Account extends DBObject {
     @Description("PRIMARY KEY,NOT NULL")
diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
index d83ad1c7..7af01135 100644
--- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
@@ -16,7 +16,6 @@ import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.Utils;
 import _VisualDVM.Validators.PathValidator;
-import _VisualDVM.Visual.UI;
 
 import java.util.LinkedHashMap;
 public class CompilersDBTable extends iDBTable<Compiler> {
diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java
index 798b6c78..2a4757b3 100644
--- a/src/_VisualDVM/GlobalData/GlobalDatabase.java
+++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java
@@ -91,7 +91,7 @@ public class GlobalDatabase extends VisualiserDatabase {
         settings.AddAll();
         runConfigurations.Patch();
         //---
-        MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
+        MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
     }
     @Override
     public PassCode getSynchronizePassCode() {
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index a90cb24e..6df80265 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -19,7 +19,6 @@ import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.User.User;
-import _VisualDVM.Visual.UI;
 
 import java.util.LinkedHashMap;
 public class MachinesDBTable extends iDBTable<Machine> {
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
index a4232540..0c823ee8 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.RemoteFile.UI;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
index b89041cd..18c20cd2 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
@@ -3,7 +3,6 @@ import Common.Visual.Trees.DataTree;
 import Common.Visual.Trees.TreeRenderers;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 public class RemoteFilesTree extends DataTree {
     public RemoteFilesTree() {
         super(Global.mainModule.getUI().getRemoteFileChooser().root);
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index c2a72b7d..841dbf05 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -10,7 +10,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.UI;
 
 import java.util.LinkedHashMap;
 
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index 26cf678a..452c0196 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -5,7 +5,6 @@ import Common.Visual.Menus.TableMenu;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.UI;
 
 import static Common.Visual.Tables.TableRenderers.RendererDate;
 import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
index f09760df..9fb77d2a 100644
--- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java
+++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
@@ -13,7 +13,6 @@ import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.User.UI.UserFields;
-import _VisualDVM.Visual.UI;
 
 import java.util.LinkedHashMap;
 public class UsersDBTable extends iDBTable<User> {
diff --git a/src/_VisualDVM/Passes/All/AddFile.java b/src/_VisualDVM/Passes/All/AddFile.java
index 25ed740b..4aa091ae 100644
--- a/src/_VisualDVM/Passes/All/AddFile.java
+++ b/src/_VisualDVM/Passes/All/AddFile.java
@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Project.ChangeFilePass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportComment.java b/src/_VisualDVM/Passes/All/AppendBugReportComment.java
index 008e2036..9b5ccddf 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportComment.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportComment.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 public class AppendBugReportComment extends AppendBugReportField {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportDescription.java b/src/_VisualDVM/Passes/All/AppendBugReportDescription.java
index 505b4f46..3d48d4ba 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportDescription.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportDescription.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 public class AppendBugReportDescription extends AppendBugReportField {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java
index 7ad47554..4dd50824 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportField.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java
@@ -9,7 +9,6 @@ import _VisualDVM.Repository.BugReport.BugReportInterface;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-import _VisualDVM.Visual.UI;
 import javafx.util.Pair;
 
 import java.util.Date;
diff --git a/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java b/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java
index 99aca3eb..ebc6d89b 100644
--- a/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java
+++ b/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java
@@ -6,7 +6,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
-import _VisualDVM.Visual.UI;
 
 import java.util.Comparator;
 import java.util.Vector;
diff --git a/src/_VisualDVM/Passes/All/CheckAccount.java b/src/_VisualDVM/Passes/All/CheckAccount.java
index 7c1c9b1d..0a2cc439 100644
--- a/src/_VisualDVM/Passes/All/CheckAccount.java
+++ b/src/_VisualDVM/Passes/All/CheckAccount.java
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.UI;
 public class CheckAccount extends Pass<Boolean> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/_VisualDVM/Passes/All/CleanAnalyses.java b/src/_VisualDVM/Passes/All/CleanAnalyses.java
index 6c88fb76..2b460c0f 100644
--- a/src/_VisualDVM/Passes/All/CleanAnalyses.java
+++ b/src/_VisualDVM/Passes/All/CleanAnalyses.java
@@ -1,7 +1,6 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Project.CurrentProjectPass;
-import _VisualDVM.Visual.UI;
 public class CleanAnalyses extends CurrentProjectPass {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/_VisualDVM/Passes/All/CloseCurrentFile.java b/src/_VisualDVM/Passes/All/CloseCurrentFile.java
index 7e1fc1ce..d3b40d0a 100644
--- a/src/_VisualDVM/Passes/All/CloseCurrentFile.java
+++ b/src/_VisualDVM/Passes/All/CloseCurrentFile.java
@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 public class CloseCurrentFile extends Pass<DBProjectFile> {
diff --git a/src/_VisualDVM/Passes/All/CloseCurrentProject.java b/src/_VisualDVM/Passes/All/CloseCurrentProject.java
index 84031ad3..91febe48 100644
--- a/src/_VisualDVM/Passes/All/CloseCurrentProject.java
+++ b/src/_VisualDVM/Passes/All/CloseCurrentProject.java
@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Project.db_project_info;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 public class CloseCurrentProject extends Pass<db_project_info> {
diff --git a/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java b/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
index ab44f534..2e19acb5 100644
--- a/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
+++ b/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
-import _VisualDVM.Visual.UI;
 
 import java.util.Vector;
 public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
diff --git a/src/_VisualDVM/Passes/All/CompareSapforPackages.java b/src/_VisualDVM/Passes/All/CompareSapforPackages.java
index 0e4b36d9..d19cf22e 100644
--- a/src/_VisualDVM/Passes/All/CompareSapforPackages.java
+++ b/src/_VisualDVM/Passes/All/CompareSapforPackages.java
@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import _VisualDVM.Visual.UI;
 
 import java.util.Vector;
 public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
diff --git a/src/_VisualDVM/Passes/All/Compile.java b/src/_VisualDVM/Passes/All/Compile.java
index 8fdad0e2..6d2f985a 100644
--- a/src/_VisualDVM/Passes/All/Compile.java
+++ b/src/_VisualDVM/Passes/All/Compile.java
@@ -10,7 +10,6 @@ import _VisualDVM.GlobalData.User.UserState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.ProjectData.Project.db_project_info;
-import _VisualDVM.Visual.UI;
 public class Compile extends Pass<db_project_info> {
     Pass subpass = null;
     CompilationTask compilationTask = null;
diff --git a/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java b/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java
index 5ec3e8b0..fc8444e2 100644
--- a/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java
@@ -5,7 +5,6 @@ import Common.Visual.Windows.Dialog.Text.FileNameForm;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Project.ChangeFilePass;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
diff --git a/src/_VisualDVM/Passes/All/CreateParallelVariants.java b/src/_VisualDVM/Passes/All/CreateParallelVariants.java
index d8493c1c..0cb5de2c 100644
--- a/src/_VisualDVM/Passes/All/CreateParallelVariants.java
+++ b/src/_VisualDVM/Passes/All/CreateParallelVariants.java
@@ -3,7 +3,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.VariantsMassPass;
 import _VisualDVM.ProjectData.Project.db_project_info;
-import _VisualDVM.Visual.UI;
 public class CreateParallelVariants extends VariantsMassPass {
     @Override
     public String getIconPath() {
diff --git a/src/_VisualDVM/Passes/All/DVMConvertProject.java b/src/_VisualDVM/Passes/All/DVMConvertProject.java
index 4aa46a10..87509f45 100644
--- a/src/_VisualDVM/Passes/All/DVMConvertProject.java
+++ b/src/_VisualDVM/Passes/All/DVMConvertProject.java
@@ -12,7 +12,6 @@ import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Passes/All/DeleteDVMPackage.java b/src/_VisualDVM/Passes/All/DeleteDVMPackage.java
index 64cbe222..cd13ab20 100644
--- a/src/_VisualDVM/Passes/All/DeleteDVMPackage.java
+++ b/src/_VisualDVM/Passes/All/DeleteDVMPackage.java
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Testing.DeleteTestingPackages;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 public class DeleteDVMPackage extends DeleteTestingPackages<DVMPackage> {
diff --git a/src/_VisualDVM/Passes/All/DeleteDirectory.java b/src/_VisualDVM/Passes/All/DeleteDirectory.java
index 15da8516..afd1df39 100644
--- a/src/_VisualDVM/Passes/All/DeleteDirectory.java
+++ b/src/_VisualDVM/Passes/All/DeleteDirectory.java
@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Project.ChangeFilePass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/_VisualDVM/Passes/All/DeleteFile.java b/src/_VisualDVM/Passes/All/DeleteFile.java
index 3e46db21..1f296963 100644
--- a/src/_VisualDVM/Passes/All/DeleteFile.java
+++ b/src/_VisualDVM/Passes/All/DeleteFile.java
@@ -6,7 +6,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Project.ChangeFilePass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.Visual.UI;
 public class DeleteFile extends ChangeFilePass<DBProjectFile> {
     @Override
     public String getIconPath() {
diff --git a/src/_VisualDVM/Passes/All/DeleteSapforPackage.java b/src/_VisualDVM/Passes/All/DeleteSapforPackage.java
index e2320257..c1e90f90 100644
--- a/src/_VisualDVM/Passes/All/DeleteSapforPackage.java
+++ b/src/_VisualDVM/Passes/All/DeleteSapforPackage.java
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Testing.DeleteTestingPackages;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 public class DeleteSapforPackage extends DeleteTestingPackages<SapforPackage> {
diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java b/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java
index 4fa211a6..31cdc05d 100644
--- a/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java
+++ b/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java
@@ -6,7 +6,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.Visual.UI;
 public class DeleteSelectedFiles extends Pass {
     @Override
     public String getIconPath() {
diff --git a/src/_VisualDVM/Passes/All/DeleteVersion.java b/src/_VisualDVM/Passes/All/DeleteVersion.java
index 77391f87..7638ffab 100644
--- a/src/_VisualDVM/Passes/All/DeleteVersion.java
+++ b/src/_VisualDVM/Passes/All/DeleteVersion.java
@@ -6,7 +6,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Project.db_project_info;
-import _VisualDVM.Visual.UI;
 public class DeleteVersion extends Pass<db_project_info> {
     db_project_info parent;
     boolean current;
diff --git a/src/_VisualDVM/Passes/All/DownloadDVMPackage.java b/src/_VisualDVM/Passes/All/DownloadDVMPackage.java
index 0688c57e..869370d7 100644
--- a/src/_VisualDVM/Passes/All/DownloadDVMPackage.java
+++ b/src/_VisualDVM/Passes/All/DownloadDVMPackage.java
@@ -3,7 +3,6 @@ import _VisualDVM.Constants;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 import java.util.Vector;
diff --git a/src/_VisualDVM/Passes/All/DownloadProject.java b/src/_VisualDVM/Passes/All/DownloadProject.java
index 6b7e30e1..bf60447f 100644
--- a/src/_VisualDVM/Passes/All/DownloadProject.java
+++ b/src/_VisualDVM/Passes/All/DownloadProject.java
@@ -8,7 +8,6 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.SSH.CurrentConnectionPass;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 import java.nio.file.Paths;
diff --git a/src/_VisualDVM/Passes/All/ExcludeFile.java b/src/_VisualDVM/Passes/All/ExcludeFile.java
index f3eb912a..a4149687 100644
--- a/src/_VisualDVM/Passes/All/ExcludeFile.java
+++ b/src/_VisualDVM/Passes/All/ExcludeFile.java
@@ -4,7 +4,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileState;
-import _VisualDVM.Visual.UI;
 public class ExcludeFile extends Pass<DBProjectFile> {
     @Override
     public String getIconPath() {
diff --git a/src/_VisualDVM/Passes/All/GenerateParallelVariants.java b/src/_VisualDVM/Passes/All/GenerateParallelVariants.java
index d33fe9dd..a9a44af7 100644
--- a/src/_VisualDVM/Passes/All/GenerateParallelVariants.java
+++ b/src/_VisualDVM/Passes/All/GenerateParallelVariants.java
@@ -3,7 +3,6 @@ import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Project.CurrentProjectPass;
-import _VisualDVM.Visual.UI;
 
 import java.math.BigInteger;
 public class GenerateParallelVariants extends CurrentProjectPass {
diff --git a/src/_VisualDVM/Passes/All/IncludeFile.java b/src/_VisualDVM/Passes/All/IncludeFile.java
index 09a373d3..5fbc4a5f 100644
--- a/src/_VisualDVM/Passes/All/IncludeFile.java
+++ b/src/_VisualDVM/Passes/All/IncludeFile.java
@@ -4,7 +4,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileState;
-import _VisualDVM.Visual.UI;
 public class IncludeFile extends Pass<DBProjectFile> {
     @Override
     public String getIconPath() {
diff --git a/src/_VisualDVM/Passes/All/OpenCurrentFile.java b/src/_VisualDVM/Passes/All/OpenCurrentFile.java
index b969ce5b..8fff4138 100644
--- a/src/_VisualDVM/Passes/All/OpenCurrentFile.java
+++ b/src/_VisualDVM/Passes/All/OpenCurrentFile.java
@@ -4,7 +4,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.Visual.UI;
 public class OpenCurrentFile extends Pass<DBProjectFile> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/_VisualDVM/Passes/All/OpenCurrentProject.java b/src/_VisualDVM/Passes/All/OpenCurrentProject.java
index 039f0b1b..fb80a66f 100644
--- a/src/_VisualDVM/Passes/All/OpenCurrentProject.java
+++ b/src/_VisualDVM/Passes/All/OpenCurrentProject.java
@@ -12,7 +12,6 @@ import _VisualDVM.ProjectData.Files.LanguageStyle;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.ProjectView;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 public class OpenCurrentProject extends Pass<db_project_info> {
diff --git a/src/_VisualDVM/Passes/All/Precompilation.java b/src/_VisualDVM/Passes/All/Precompilation.java
index ccffd322..1554f867 100644
--- a/src/_VisualDVM/Passes/All/Precompilation.java
+++ b/src/_VisualDVM/Passes/All/Precompilation.java
@@ -16,7 +16,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import java.io.BufferedReader;
diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java
index 50165876..65dd0d5c 100644
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -9,7 +9,6 @@ import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReport.BugReportInterface;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.EmailMessage;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 import java.util.Date;
diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java
index fcd1237c..c41a0927 100644
--- a/src/_VisualDVM/Passes/All/PublishComponent.java
+++ b/src/_VisualDVM/Passes/All/PublishComponent.java
@@ -12,7 +12,6 @@ import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.RepositoryServer;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-import _VisualDVM.Visual.UI;
 
 import java.util.Date;
 import java.util.Vector;
diff --git a/src/_VisualDVM/Passes/All/PublishTests.java b/src/_VisualDVM/Passes/All/PublishTests.java
index e53d1d09..05949381 100644
--- a/src/_VisualDVM/Passes/All/PublishTests.java
+++ b/src/_VisualDVM/Passes/All/PublishTests.java
@@ -9,7 +9,6 @@ import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 import java.util.Vector;
diff --git a/src/_VisualDVM/Passes/All/RenameDirectory.java b/src/_VisualDVM/Passes/All/RenameDirectory.java
index 5a7243d6..1000b29d 100644
--- a/src/_VisualDVM/Passes/All/RenameDirectory.java
+++ b/src/_VisualDVM/Passes/All/RenameDirectory.java
@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Project.ChangeFilePass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/_VisualDVM/Passes/All/RenameFile.java b/src/_VisualDVM/Passes/All/RenameFile.java
index 3eb94b52..1b937485 100644
--- a/src/_VisualDVM/Passes/All/RenameFile.java
+++ b/src/_VisualDVM/Passes/All/RenameFile.java
@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Project.ChangeFilePass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
-import _VisualDVM.Visual.UI;
 
 import java.io.File;
 import java.nio.file.Paths;
diff --git a/src/_VisualDVM/Passes/All/Run.java b/src/_VisualDVM/Passes/All/Run.java
index f0be5056..8efd9eae 100644
--- a/src/_VisualDVM/Passes/All/Run.java
+++ b/src/_VisualDVM/Passes/All/Run.java
@@ -9,7 +9,6 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Project.db_project_info;
-import _VisualDVM.Visual.UI;
 
 import java.util.Vector;
 public class Run extends Pass<db_project_info> {
diff --git a/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java b/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
index 484ef033..d74c851b 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
@@ -4,7 +4,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
-import _VisualDVM.Visual.UI;
 
 import java.math.BigInteger;
 public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
diff --git a/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java b/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java
index 5a5c980f..52afc842 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java
@@ -4,7 +4,6 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
-import _VisualDVM.Visual.UI;
 public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalysis {
     @Override
     protected void performDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java b/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
index a4c38222..44538c28 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
@@ -6,7 +6,6 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import _VisualDVM.Visual.UI;
 
 import java.util.Comparator;
 import java.util.Vector;
diff --git a/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java b/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java
index ec3a3c01..a243c1b2 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java
@@ -3,7 +3,6 @@ import Common.Utils.Index;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import _VisualDVM.Visual.UI;
 public class SPF_GetArrayDistributionOnlyRegions extends SapforAnalysis {
     @Override
     public String phase() {
diff --git a/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java b/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java
index 1a227942..cfae4562 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java
@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.Visual.UI;
 public class SPF_GetFileLineInfo extends SapforAnalysis {
     @Override
     public String phase() {
diff --git a/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java
index cc9c9cbb..0a173195 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java
@@ -6,7 +6,6 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
-import _VisualDVM.Visual.UI;
 import javafx.util.Pair;
 
 import java.util.Vector;
@@ -125,7 +124,7 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
         return res;
     }
     public String packFgSettings() {
-        Pair<Integer, Integer> screenDims =  Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphPanelSizes();
+        Pair<Integer, Integer> screenDims = Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphPanelSizes();
         int x = (int) (screenDims.getKey() * target.fgScreen);
         int y = (int) (screenDims.getValue() * target.fgScreen);
         Vector<String> visibleFuncNames = new Vector<>();
diff --git a/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java
index de09927b..d17a1ab8 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java
@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
-import _VisualDVM.Visual.UI;
 
 import java.util.LinkedHashMap;
 import java.util.Vector;
diff --git a/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
index 8acc3752..5a66acb4 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
@@ -5,7 +5,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.Loops.Loop;
-import _VisualDVM.Visual.UI;
 
 import java.util.Vector;
 public class SPF_GetGraphLoops extends SapforAnalysis {
diff --git a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
index 7e0ee47d..40803842 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
@@ -10,7 +10,6 @@ import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
 import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 public class SPF_GetIncludeDependencies extends SapforAnalysis {
diff --git a/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java b/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java
index b2f9dab4..faf3f4a7 100644
--- a/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java
+++ b/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java
@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
-import _VisualDVM.Visual.UI;
 
 import java.util.Vector;
 public class SPF_InlineProcedures extends SapforTransformation {
diff --git a/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java b/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java
index c746dc1a..87b542ad 100644
--- a/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java
+++ b/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java
@@ -5,7 +5,6 @@ import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
-import _VisualDVM.Visual.UI;
 
 import java.util.Vector;
 public class SPF_InlineProceduresH extends SapforTransformation {
diff --git a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
index 60533cd2..285e61d9 100644
--- a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
 import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
 import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
-import _VisualDVM.Visual.UI;
 
 import java.util.Vector;
 import java.util.stream.Collectors;
diff --git a/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java b/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java
index 2cde1837..b6a37a87 100644
--- a/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java
+++ b/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java
@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
 import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
 import _VisualDVM.ProjectData.SapforData.Regions.UI.ParallelRegionFields;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
index 66960eb8..42f1674b 100644
--- a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
@@ -8,7 +8,6 @@ import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileState;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import java.util.Vector;
diff --git a/src/_VisualDVM/Passes/All/SaveBugReportComment.java b/src/_VisualDVM/Passes/All/SaveBugReportComment.java
index ca421a6b..0426e475 100644
--- a/src/_VisualDVM/Passes/All/SaveBugReportComment.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportComment.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 public class SaveBugReportComment extends UpdateBugReportField {
     @Override
     public String getIconPath() {
diff --git a/src/_VisualDVM/Passes/All/SaveBugReportDescription.java b/src/_VisualDVM/Passes/All/SaveBugReportDescription.java
index 548ae0c3..80547906 100644
--- a/src/_VisualDVM/Passes/All/SaveBugReportDescription.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportDescription.java
@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 public class SaveBugReportDescription extends UpdateBugReportField {
     @Override
     public String getIconPath() {
@@ -12,6 +11,6 @@ public class SaveBugReportDescription extends UpdateBugReportField {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return super.canStart("description",  Global.mainModule.getUI().getMainWindow().getCallbackWindow().getBugReportDescriptionText());
+        return super.canStart("description", Global.mainModule.getUI().getMainWindow().getCallbackWindow().getBugReportDescriptionText());
     }
 }
diff --git a/src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java b/src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java
index b58ddb7d..93eb5c13 100644
--- a/src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java
+++ b/src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java
@@ -3,7 +3,6 @@ import Common.Passes.Pass;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
-import _VisualDVM.Visual.UI;
 public class SaveFunctionsGraphCoordinates extends Pass {
     FunctionsGraphForm graphForm = null;
     @Override
diff --git a/src/_VisualDVM/Passes/All/SaveGraph.java b/src/_VisualDVM/Passes/All/SaveGraph.java
index 334a232a..eb59bde9 100644
--- a/src/_VisualDVM/Passes/All/SaveGraph.java
+++ b/src/_VisualDVM/Passes/All/SaveGraph.java
@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
-import _VisualDVM.Visual.UI;
 import com.mxgraph.io.mxCodec;
 import com.mxgraph.util.mxCellRenderer;
 import com.mxgraph.util.mxXmlUtils;
diff --git a/src/_VisualDVM/Passes/All/SelectRemoteFile.java b/src/_VisualDVM/Passes/All/SelectRemoteFile.java
index b7e84709..58148076 100644
--- a/src/_VisualDVM/Passes/All/SelectRemoteFile.java
+++ b/src/_VisualDVM/Passes/All/SelectRemoteFile.java
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.SSH.CurrentConnectionPass;
-import _VisualDVM.Visual.UI;
 public class SelectRemoteFile extends CurrentConnectionPass {
     boolean dialogOK;
     boolean needs_directory = false;
diff --git a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
index d84c56a7..8bf8a7b5 100644
--- a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
+++ b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
@@ -5,7 +5,6 @@ import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/_VisualDVM/Passes/All/SynchronizeTests.java b/src/_VisualDVM/Passes/All/SynchronizeTests.java
index d52ba6f2..0a0422d3 100644
--- a/src/_VisualDVM/Passes/All/SynchronizeTests.java
+++ b/src/_VisualDVM/Passes/All/SynchronizeTests.java
@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Server.TestingSystemPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.*;
diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
index da1c6db9..7f75dad1 100644
--- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java
+++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
@@ -11,7 +11,6 @@ import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import javafx.util.Pair;
 
 import java.io.Serializable;
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index 97cff68a..6bd89ef7 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
 import Common.Passes.Pass;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalProperties;
-import _VisualDVM.Visual.UI;
 
 import java.lang.reflect.Field;
 public class UpdateProperty extends Pass<Object> {
@@ -39,7 +38,7 @@ public class UpdateProperty extends Pass<Object> {
                 if (Global.mainModule.HasProject()) {
                     if ((boolean) newValue)
                         Global.mainModule.getUI().getMainWindow().getProjectWindow().CollapseProjectTrees();
-                    else  Global.mainModule.getUI().getMainWindow().getProjectWindow().ExpandProjectTrees();
+                    else Global.mainModule.getUI().getMainWindow().getProjectWindow().ExpandProjectTrees();
                 }
                 break;
             case "collapseFileGraphs":
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index 2e3e0da2..d72fa051 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -5,9 +5,9 @@ import Common.Visual.Windows.Dialog.*;
 import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Settings.DBSetting;
+import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.io.File;
@@ -120,7 +120,7 @@ public class UpdateSetting extends Pass<DBSetting> {
                     break;
                 case FastAccessPassesCount:
                     if (Global.mainModule.HasProject())
-                        MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
+                        MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
                     break;
                 case ShowFullArraysDeclarations:
                     if (Global.mainModule.HasProject())
diff --git a/src/_VisualDVM/Passes/Project/FilesMassPass.java b/src/_VisualDVM/Passes/Project/FilesMassPass.java
index f1e25e75..9aba23e4 100644
--- a/src/_VisualDVM/Passes/Project/FilesMassPass.java
+++ b/src/_VisualDVM/Passes/Project/FilesMassPass.java
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.Project;
 import Common.Passes.Pass;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.Visual.UI;
 public abstract class FilesMassPass<T> extends Pass<T> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java b/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java
index 9203772c..d4d6981b 100644
--- a/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java
+++ b/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java
@@ -6,7 +6,6 @@ import Common.Visual.Controls.PassMenuItem;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/_VisualDVM/Passes/Sapfor/SapforPass.java b/src/_VisualDVM/Passes/Sapfor/SapforPass.java
index 250aaed7..d98d7dae 100644
--- a/src/_VisualDVM/Passes/Sapfor/SapforPass.java
+++ b/src/_VisualDVM/Passes/Sapfor/SapforPass.java
@@ -1,7 +1,6 @@
 package _VisualDVM.Passes.Sapfor;
 import Common.Passes.PassException;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 public class SapforPass extends SilentSapforPass {
     //отличается наличием журнала и сообщений
     @Override
diff --git a/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java b/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java
index 394f2795..c9161105 100644
--- a/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java
+++ b/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java
@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.ProjectView;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 public class SapforTransformation extends SapforPass {
diff --git a/src/_VisualDVM/Passes/Sapfor/Transformation.java b/src/_VisualDVM/Passes/Sapfor/Transformation.java
index 129929a9..86f6d069 100644
--- a/src/_VisualDVM/Passes/Sapfor/Transformation.java
+++ b/src/_VisualDVM/Passes/Sapfor/Transformation.java
@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Project.CurrentProjectPass;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.ProjectView;
 import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 public class Transformation extends CurrentProjectPass {
diff --git a/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java b/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java
index ee2aba92..fa27bd2c 100644
--- a/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java
+++ b/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java
@@ -5,7 +5,6 @@ import _VisualDVM.Passes.Project.CurrentProjectPass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor;
-import _VisualDVM.Visual.UI;
 public abstract class VariantsMassPass extends CurrentProjectPass {
     int count;
     public abstract PassCode getSubPassCode();
diff --git a/src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java b/src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java
index b2fdaeb9..261865bd 100644
--- a/src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java
+++ b/src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java
@@ -1,7 +1,7 @@
 package _VisualDVM.ProjectData.DBArray;
 import Common.Database.Tables.DataSet;
 import Common.Visual.Menus.DataMenuBar;
-public class DBArraysMenuBar extends DataMenuBar{
+public class DBArraysMenuBar extends DataMenuBar {
     public DBArraysMenuBar() {
         super("сохранённые состояния");
     }
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
index fcfa9dbe..73bcc5ee 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
@@ -13,7 +13,6 @@ import _VisualDVM.Visual.Editor.BaseEditor;
 import _VisualDVM.Visual.Editor.CaretInfo;
 import _VisualDVM.Visual.Interface.SPFEditorInterface;
 import _VisualDVM.Visual.Menus.MainEditorMenu;
-import _VisualDVM.Visual.UI;
 import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
 
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java b/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
index 0da6c926..5d6a8520 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.Files.UI;
 import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
index 441453ba..e1410e69 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.Visual.Menus.GraphMenu;
 import _VisualDVM.Visual.Menus.ProjectFilesMenu;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index 54d9de9e..47ce708d 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -36,7 +36,6 @@ import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
 import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
 import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import com.mxgraph.swing.mxGraphComponent;
 import com.sun.org.glassfish.gmbal.Description;
 import javafx.util.Pair;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
index e4bc52a7..6e673659 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
@@ -4,7 +4,6 @@ import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectEditor;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
index cb54ab23..2499c138 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
+import Common.MainModule_;
 import Common.Visual.ControlForm;
 import Common.Visual.Tables.Grid.GridAnchestor;
 import Common.Visual.Tables.StyledTable;
@@ -6,7 +7,6 @@ import Common.Visual.UI_;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
-import _VisualDVM.Visual.UI;
 
 import java.awt.*;
 import java.util.Vector;
@@ -48,8 +48,8 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
         }) {
             @Override
             public void Init() {
-                setDefaultRenderer(TemplateDimension.class, UI.TableRenderers.get(RendererDimension));
-                setDefaultEditor(TemplateDimension.class, UI.TableEditors.get(EditorDimension));
+                setDefaultRenderer(TemplateDimension.class, MainModule_.instance.getUI().getTableRenderer(RendererDimension));
+                setDefaultEditor(TemplateDimension.class, MainModule_.instance.getUI().getTableEditor(EditorDimension));
             }
         };
     }
diff --git a/src/_VisualDVM/ProjectData/SapforData/FileObject.java b/src/_VisualDVM/ProjectData/SapforData/FileObject.java
index 9e8d16f7..93900dd5 100644
--- a/src/_VisualDVM/ProjectData/SapforData/FileObject.java
+++ b/src/_VisualDVM/ProjectData/SapforData/FileObject.java
@@ -3,7 +3,6 @@ import Common.Database.Objects.iDBObject;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
-import _VisualDVM.Visual.UI;
 import com.sun.org.glassfish.gmbal.Description;
 //объект принадлежащий файлу и относящийся к его строке.
 public abstract class FileObject extends iDBObject {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
index a0714889..acc1225a 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
@@ -6,7 +6,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java b/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java
index 73681148..8222739d 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java
@@ -1,6 +1,6 @@
 package _VisualDVM.ProjectData.SapforData.Loops;
 import Common.Visual.Fonts.VisualiserFonts;
-import _VisualDVM.Visual.UI;
+import Common.Visual.UI_;
 
 import javax.swing.text.Highlighter;
 public enum LoopState {
@@ -29,9 +29,9 @@ public enum LoopState {
     public Highlighter.HighlightPainter getPainter() {
         switch (this) {
             case GoodLoop:
-                return UI.GoodLoopPainter;
+                return UI_.GreenTextPainter;
             case BadLoop:
-                return UI.BadLoopPainter;
+                return UI_.RedTextPainter;
             default:
                 return null;
         }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
index cf34c4ea..334456ff 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
@@ -5,7 +5,6 @@ import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatistics_2021;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import _VisualDVM.Visual.UI;
 import javafx.util.Pair;
 
 import java.io.File;
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
index 19ef4502..027a6f5f 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
index 24c41285..d94e88c0 100644
--- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
@@ -14,7 +14,6 @@ import _VisualDVM.Repository.Component.OSDComponent;
 import _VisualDVM.Repository.Component.Visualizer_2;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/Group.java b/src/_VisualDVM/TestingSystem/Common/Group/Group.java
index 5430046f..a93af12c 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/Group.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/Group.java
@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestType;
 import _VisualDVM.Utils;
-import _VisualDVM.Visual.UI;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.LinkedHashMap;
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Test.java b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
index 7a0f745e..3b8d3f10 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/Test.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/Test.java
@@ -13,7 +13,6 @@ import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.RepositoryRefuseException;
-import _VisualDVM.Visual.UI;
 import com.sun.org.glassfish.gmbal.Description;
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index e7ef846d..44eb58e6 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -6,7 +6,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
-import _VisualDVM.Visual.UI;
 
 import java.util.Comparator;
 import java.util.Date;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
index 0a3e3646..ddc8d2ce 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
@@ -4,7 +4,6 @@ import Common.Visual.Trees.TreeRenderers;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index bbe423a2..861b0dc2 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Tables.TableRenderers;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 
 import java.util.Comparator;
 public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
diff --git a/src/_VisualDVM/Visual/Interface/ProjectWindow.java b/src/_VisualDVM/Visual/Interface/ProjectWindow.java
index a18517c0..da45c99e 100644
--- a/src/_VisualDVM/Visual/Interface/ProjectWindow.java
+++ b/src/_VisualDVM/Visual/Interface/ProjectWindow.java
@@ -1,7 +1,6 @@
 package _VisualDVM.Visual.Interface;
 import Common.Visual.Trees.TreeForm;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 public interface ProjectWindow {
     //-
     ArraysWindow getArraysWindow();
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index a6af5fec..c3db86b2 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -1,9 +1,26 @@
 package _VisualDVM.Visual;
+import Common.Visual.Tables.ConfigurationAutoRenderer;
+import Common.Visual.Tables.ConfigurationAutoSwitcher;
+import Common.Visual.Tables.VectorEditor;
+import Common.Visual.Trees.GraphTreeCellRenderer;
 import Common.Visual.UIModule_;
 import _VisualDVM.Global;
+import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
+import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
+import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
+import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
+import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
 import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
+import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileRenderer;
+import _VisualDVM.ProjectData.Files.UI.FilesTreeCellRenderer;
+import _VisualDVM.ProjectData.Project.UI.VersionsTreeCellRenderer;
+import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionRenderer;
+import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
+import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
+import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
 import _VisualDVM.Repository.Component.UI.ComponentsForm;
 import _VisualDVM.TestingSystem.Common.TestingMenuBar;
+import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
 import _VisualDVM.Visual.Interface.DebugWindow;
 import _VisualDVM.Visual.Interface.VersionsWindow;
 import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsMenuBar;
@@ -11,19 +28,47 @@ import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
 import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
 import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
 import _VisualDVM.Visual.Windows.*;
+
+import static Common.Visual.Tables.TableEditors.*;
+import static Common.Visual.Tables.TableRenderers.*;
+import static Common.Visual.Trees.TreeRenderers.*;
 public class MainUI extends UIModule_ {
     public MainWindow mainWindow = null;
-    ComponentsForm componentsWindow = null;
     public SearchReplaceForm searchReplaceWindow = null;
     public ProfilesForm profilesWindow = null;
     public VersionsWindow versionsWindow = null;
     public DebugWindow debugWindow = null;
     public RemoteFileChooser remoteFileChooser = null;
+    ComponentsForm componentsWindow = null;
     //-
     TestingMenuBar testingMenuBar = null;
     CredentialsMenuBar credentialsMenuBar = null;
     VersionsMenuBar versionsMenuBar = null;
     //-
+    //-
+    public MainUI() {
+        setTheme(new LightSPFEditorTheme());
+        tableRenderers.put(RendererDimension, new DimensionRenderer());
+        tableRenderers.put(RendererVariantRank, new VariantRankRenderer());
+        tableRenderers.put(RendererCompilerOptionParameterValue, new CompilerOptionParameterValueRenderer());
+        tableRenderers.put(RendererCompilerOptionParameterName, new CompilerOptionParameterNameRenderer());
+        tableRenderers.put(RendererCompilerEnvironmentValue, new CompilerEnvironmentValueRenderer());
+        tableRenderers.put(RendererAutoConfiguration, new ConfigurationAutoRenderer());
+        //--
+        tableEditors.put(EditorHyperlinks, new VectorEditor());
+        tableEditors.put(EditorDimension, new DimensionStateChanger());
+        tableEditors.put(EditorCompilerOptionParameterValue, new CompilerOptionParameterValueEditor());
+        tableEditors.put(EditorCompilerEnvironmentValue, new CompilerEnvironmentValueEditor());
+        tableEditors.put(EditorAutoConfiguration, new ConfigurationAutoSwitcher());
+        //--
+        treeRenderers.put(RendererGraph, new GraphTreeCellRenderer());
+        treeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
+        treeRenderers.put(RendererFile, new FilesTreeCellRenderer());
+        treeRenderers.put(RendererVersion, new VersionsTreeCellRenderer());
+        treeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
+        treeRenderers.put(RendererRule, new RulesTreeCellRenderer());
+    }
+    //-
     public TestingMenuBar getTestingMenuBar() {
         if (testingMenuBar == null)
             testingMenuBar = new TestingMenuBar();
@@ -39,11 +84,6 @@ public class MainUI extends UIModule_ {
             credentialsMenuBar = new CredentialsMenuBar();
         return credentialsMenuBar;
     }
-    //-
-    //-
-    public MainUI() {
-        setTheme(new LightSPFEditorTheme());
-    }
     public MainWindow getMainWindow() {
         if (mainWindow == null)
             mainWindow = new MainForm();
diff --git a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
index 72ba90f6..5a025830 100644
--- a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
@@ -4,7 +4,6 @@ import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
index 17ca2d68..f8ae8738 100644
--- a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
@@ -7,7 +7,6 @@ import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Visual.Menus.LanguagesSubmenu;
 import _VisualDVM.Visual.Menus.StylesSubmenu;
 import _VisualDVM.Visual.Menus.TypesSubmenu;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 public class FileSettingsMenu extends VisualiserMenu {
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index cf9961bf..a08ffa72 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -7,7 +7,6 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
 import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
index 8412e470..cec69c44 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.ProjectData.Files.LanguageStyle;
 import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java
index 1ef52c4d..cec7ff8c 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java
@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus.ProjectMenuBar;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.Menus.VisualiserMenuBar;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
index d71b7342..cff07440 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
@@ -6,7 +6,6 @@ import Common.Visual.Menus.VisualiserMenu;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.ProjectView;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.util.LinkedHashMap;
diff --git a/src/_VisualDVM/Visual/Menus/VersionsMenu.java b/src/_VisualDVM/Visual/Menus/VersionsMenu.java
index 40c32ac6..acc3f080 100644
--- a/src/_VisualDVM/Visual/Menus/VersionsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/VersionsMenu.java
@@ -5,7 +5,6 @@ import Common.Visual.Menus.VisualiserMenuItem;
 import Common.Visual.Trees.DataTree;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.UI;
 public class VersionsMenu extends GraphMenu<DataTree> {
     VisualiserMenuItem m_select_all;
     VisualiserMenuItem m_unselect_all;
diff --git a/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java b/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
index 6564b6ed..f12ecb1a 100644
--- a/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
+++ b/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
@@ -15,4 +15,6 @@ public abstract class SPFEditorTheme extends VisualiserTheme {
         }
         return res;
     }
+    //-
 }
+
diff --git a/src/_VisualDVM/Visual/UI.java b/src/_VisualDVM/Visual/UI.java
deleted file mode 100644
index 73b718f7..00000000
--- a/src/_VisualDVM/Visual/UI.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package _VisualDVM.Visual;
-import Common.Visual.Tables.*;
-import Common.Visual.Trees.GraphTreeCellRenderer;
-import Common.Visual.Trees.SelectionTreeCellRenderer;
-import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
-import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
-import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
-import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
-import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
-import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileRenderer;
-import _VisualDVM.ProjectData.Files.UI.FilesTreeCellRenderer;
-import _VisualDVM.ProjectData.Project.UI.VersionsTreeCellRenderer;
-import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionRenderer;
-import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
-import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
-import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
-import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
-
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.text.DefaultHighlighter;
-import javax.swing.text.Highlighter;
-import javax.swing.tree.TreeCellRenderer;
-import java.awt.*;
-import java.util.LinkedHashMap;
-
-import static Common.Visual.Tables.TableEditors.*;
-import static Common.Visual.Tables.TableRenderers.*;
-import static Common.Visual.Trees.TreeRenderers.*;
-public class UI {
-    //------------
-    public static final Highlighter.HighlightPainter GoodLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
-    public static final Highlighter.HighlightPainter BadLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
-
-    public static LinkedHashMap<Common.Visual.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>();
-    public static LinkedHashMap<Common.Visual.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>();
-    public static LinkedHashMap<Common.Visual.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
-    //ФОРМЫ
-    //-
-    public static void CreateAll() {
-        //<editor-fold desc="Объекты отрисовки и редактирования деревьев и таблиц">
-        TableRenderers.put(RendererDate, new DateRenderer_());
-        TableRenderers.put(RendererProgress, new ProgressBarRenderer());
-        TableRenderers.put(RendererSelect, new DBObjectSelectionRenderer());
-        TableRenderers.put(RendererDimension, new DimensionRenderer());
-        TableRenderers.put(RendererMultiline, new MultilineRenderer());
-        TableRenderers.put(RendererHyperlinks, new HyperlinksRenderer());
-        TableRenderers.put(RendererTopLeft, new TopLeftRenderer());
-        TableRenderers.put(RendererMaskedInt, new MaskedIntegerValueRenderer());
-        TableRenderers.put(RendererVariantRank, new VariantRankRenderer());
-        TableRenderers.put(RendererHiddenList, new HiddenListRenderer());
-        TableRenderers.put(RendererWrapText, new WrapTextRenderer());
-        TableRenderers.put(RendererCompilerOptionParameterValue, new CompilerOptionParameterValueRenderer());
-        TableRenderers.put(RendererCompilerOptionParameterName, new CompilerOptionParameterNameRenderer());
-        TableRenderers.put(RendererCompilerEnvironmentValue, new CompilerEnvironmentValueRenderer());
-        TableRenderers.put(RendererStatusEnum, new StatusEnumRenderer());
-        TableRenderers.put(RendererAutoConfiguration, new ConfigurationAutoRenderer());
-        //---------------------------------------------
-        TreeRenderers.put(RendererGraph, new GraphTreeCellRenderer());
-        TreeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
-        TreeRenderers.put(RendererFile, new FilesTreeCellRenderer());
-        TreeRenderers.put(RendererVersion, new VersionsTreeCellRenderer());
-        TreeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
-        TreeRenderers.put(RendererRule, new RulesTreeCellRenderer());
-        TreeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
-        //----------------------------------------------
-        TableEditors.put(EditorSelect, new DBObjectSelector());
-        TableEditors.put(EditorHyperlinks, new VectorEditor());
-        TableEditors.put(EditorDimension, new DimensionStateChanger());
-        TableEditors.put(EditorCompilerOptionParameterValue, new CompilerOptionParameterValueEditor());
-        TableEditors.put(EditorCompilerEnvironmentValue, new CompilerEnvironmentValueEditor());
-        TableEditors.put(EditorAutoConfiguration, new ConfigurationAutoSwitcher());
-        //</editor-fold>
-    }
-}
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index 9ac2264d..72369be1 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -15,7 +15,6 @@ import _VisualDVM.Visual.Interface.CallbackWindow;
 import _VisualDVM.Visual.Interface.CommentInterface;
 import _VisualDVM.Visual.Interface.DescriptionInterface;
 import _VisualDVM.Visual.Interface.FormWithSplitters;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.java b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
index 2002a1f9..4660a81a 100644
--- a/src/_VisualDVM/Visual/Windows/ComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
@@ -11,7 +11,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Utils;
 import _VisualDVM.Visual.Editor.BaseEditor;
-import _VisualDVM.Visual.UI;
 import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
 import org.fife.ui.rtextarea.RTextScrollPane;
@@ -232,7 +231,9 @@ public abstract class ComparisonForm<T> {
             slave_highlighter.addHighlight(
                     slave.Body.getLineStartOffset(colors.get(diff_num).getKey()),
                     slave.Body.getLineEndOffset(colors.get(diff_num).getKey()),
-                    colors.get(diff_num).getValue() ? UI.GoodLoopPainter : UI.BadLoopPainter
+                    colors.get(diff_num).getValue() ?
+                            UI_.GreenTextPainter :
+                            UI_.RedTextPainter
             );
         }
         if (colors.size() > 0) current_diff_line = 0;
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index 526e9d07..37e9d875 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -38,6 +38,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     public JSplitPane SC12;
     @Description("IGNORE")
     protected boolean events_on = true;
+    FileMenuBar fileMenuBar = null;
     //-
     private JPanel content;
     private JButton bClose;
@@ -66,7 +67,6 @@ public class FileForm implements FileWindow, FormWithSplitters {
     private TreeForm arraysForm;
     //-
     private SPFEditor Body = null; //времянка? не очень красиво.
-    FileMenuBar fileMenuBar= null;
     //-
     public FileForm(DBProjectFile file_in) {
         LoadSplitters();
@@ -191,9 +191,8 @@ public class FileForm implements FileWindow, FormWithSplitters {
     //---
     @Override
     public void RefreshTabsNames() {
-
         boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        UI_.ShowTabsNames(graphsTabs,flag);
+        UI_.ShowTabsNames(graphsTabs, flag);
         //--
         ShowNotesCount();
         ShowWarningsCount();
diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java
index ae2c21de..45644fcb 100644
--- a/src/_VisualDVM/Visual/Windows/MainForm.java
+++ b/src/_VisualDVM/Visual/Windows/MainForm.java
@@ -10,7 +10,6 @@ import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Visual.Interface.*;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
@@ -18,6 +17,7 @@ import java.util.Vector;
 public class MainForm extends Form implements MainWindow {
     private final WelcomeForm welcomeForm = new WelcomeForm(); //заглушка когда проекта нет.
     int global_index = 0;
+    MainMenuBar mainMenuBar;
     //-----------------
     private ProjectForm projectForm;
     private CallbackForm callbackForm;
@@ -28,9 +28,8 @@ public class MainForm extends Form implements MainWindow {
     private JPanel Content;
     private JTabbedPane globalTabs;
     private JPanel mainPanel;
-    MainMenuBar mainMenuBar;
     public MainForm() {
-        mainPanel.add( mainMenuBar = new MainMenuBar(), BorderLayout.NORTH);
+        mainPanel.add(mainMenuBar = new MainMenuBar(), BorderLayout.NORTH);
         InstallWelcomePanel();
         InstallCallbackPanel();
         InstallTestsPanel();
@@ -62,7 +61,7 @@ public class MainForm extends Form implements MainWindow {
     public void AfterClose() {
         Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
         if (Global.mainModule.getUI().getVersionsWindow() != null)
-            ((FormWithSplitters)Global.mainModule.getUI().getVersionsWindow()).SaveSplitters();
+            ((FormWithSplitters) Global.mainModule.getUI().getVersionsWindow()).SaveSplitters();
         SaveCallbackPanel();
         SaveTestsPanel();
         SaveTestingPanel();
diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
index dccd64aa..3ca43480 100644
--- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
@@ -11,7 +11,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 public class SapforPackagesComparisonForm {
diff --git a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
index 37c40046..f6e808c4 100644
--- a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
+++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
@@ -6,7 +6,6 @@ import Common.Visual.UI_;
 import Common.Visual.Windows.Form;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Visual.UI;
 import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rtextarea.SearchContext;
@@ -129,7 +128,7 @@ public class SearchReplaceForm extends Form {
     }
     @Override
     public Component getRelative() {
-        return (Component)  Global.mainModule.getUI().getMainWindow();
+        return (Component) Global.mainModule.getUI().getMainWindow();
     }
     @Override
     public int getDefaultWidth() {
diff --git a/src/_VisualDVM/Visual/Windows/TestingForm.java b/src/_VisualDVM/Visual/Windows/TestingForm.java
index 254634a4..b42ddf39 100644
--- a/src/_VisualDVM/Visual/Windows/TestingForm.java
+++ b/src/_VisualDVM/Visual/Windows/TestingForm.java
@@ -12,7 +12,6 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.Visual.Interface.FormWithSplitters;
 import _VisualDVM.Visual.Interface.TestingWindow;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/_VisualDVM/Visual/Windows/VersionsForm.java b/src/_VisualDVM/Visual/Windows/VersionsForm.java
index 0be93e07..e665ed8f 100644
--- a/src/_VisualDVM/Visual/Windows/VersionsForm.java
+++ b/src/_VisualDVM/Visual/Windows/VersionsForm.java
@@ -1,5 +1,4 @@
 package _VisualDVM.Visual.Windows;
-import Common.MainModule_;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
@@ -8,7 +7,6 @@ import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.Visual.Interface.FormWithSplitters;
 import _VisualDVM.Visual.Interface.VariantsWindow;
 import _VisualDVM.Visual.Interface.VersionsWindow;
-import _VisualDVM.Visual.UI;
 
 import javax.swing.*;
 import java.awt.*;