From 45447f34f8cb298181c5a407faf1c31e291d12fc Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Oct 2024 18:41:02 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 57 ++++++++++++++++---
 src/Common/MainModule_.java                   | 18 +++---
 src/Common/Passes/Pass.java                   |  2 +-
 .../Visual/Controls/HyperlinksStyledList.java |  3 +-
 src/Common/Visual/Controls/MenuBarButton.java |  5 +-
 src/Common/Visual/Controls/StyledList.java    |  7 ++-
 .../Visual/Controls/StyledProgressBar.java    |  5 +-
 src/Common/Visual/Menus/StyledPopupMenu.java  |  9 +--
 .../Visual/Menus/VisualiserMenuItem.java      |  7 ++-
 .../Visual/Tables/HiddenListRenderer.java     |  3 +-
 .../Visual/Tables/StatusEnumRenderer.java     |  3 +-
 src/Common/Visual/Tables/StyledCellLabel.java |  7 ++-
 src/Common/Visual/Tables/StyledTable.java     | 13 +++--
 .../Visual/Tables/WrapTextRenderer.java       |  3 +-
 .../Visual/Trees/GraphTreeCellRenderer.java   |  5 +-
 .../Trees/SelectionTreeCellRenderer.java      |  3 +-
 src/Common/Visual/Trees/StyledTree.java       |  7 ++-
 .../Visual/Trees/StyledTreeCellRenderer.java  |  5 +-
 src/Common/Visual/UIModule_.java              | 16 ++++++
 src/Common/Visual/UI_.java                    |  7 ---
 src/Common/Visual/Windows/Dialog/Dialog.java  |  3 +-
 .../Windows/Dialog/DialogTextComboBox.java    |  3 +-
 .../Visual/Windows/Dialog/DialogWrapText.java |  3 +-
 src/_VisualDVM/Global.java                    |  3 +-
 .../UI/CompilerEnvironmentValueEditor.java    |  3 +-
 .../UI/CompilerEnvironmentValueRenderer.java  |  3 +-
 .../CompilerOptionParameterNameRenderer.java  |  5 +-
 .../CompilerOptionParameterValueEditor.java   |  5 +-
 .../CompilerOptionParameterValueRenderer.java |  5 +-
 src/_VisualDVM/GlobalData/GlobalDatabase.java |  3 +
 .../RemoteFile/UI/RemoteFileRenderer.java     |  3 +-
 src/_VisualDVM/MainModule.java                |  1 +
 src/_VisualDVM/Passes/All/DropFastAccess.java |  2 +-
 src/_VisualDVM/Passes/All/UpdateSetting.java  |  2 +-
 .../Files/UI/FilesHyperlinksPanel.java        |  3 +-
 .../Files/UI/FilesTreeCellRenderer.java       |  7 ++-
 .../Project/UI/VersionsTreeCellRenderer.java  |  3 +-
 .../Arrays/UI/DimensionRenderer.java          |  4 +-
 .../Arrays/UI/DimensionStateChanger.java      |  3 +-
 .../Arrays/UI/RulesTreeCellRenderer.java      |  5 +-
 .../Component/ComponentsMenuBar.java          |  3 +-
 .../TestingSystem/Common/TestingBar.java      |  3 +-
 .../UI/SapforSettingsCommandFields.java       |  3 +-
 src/_VisualDVM/Visual/Editor/BaseEditor.java  |  3 +-
 src/_VisualDVM/Visual/MainUI.java             |  5 ++
 .../FastAccessMenuBar/FastAccessMenuBar.java  |  8 +--
 .../Visual/Menus/PassesSubMenu.java           |  3 +-
 .../Menus/ProjectMenuBar/ProjectViewMenu.java |  3 +-
 .../Visual/Menus/PropertiesSubmenu.java       |  3 +-
 .../Visual/Menus/SettingsSubmenu.java         |  3 +-
 .../Visual/Menus/VisualiserMenu.java          |  3 +-
 .../Visual/Menus/VisualiserMenuBar.java       |  3 +-
 src/_VisualDVM/Visual/UI.java                 |  1 -
 .../Visual/Windows/ProjectForm.java           |  2 +-
 54 files changed, 200 insertions(+), 100 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 158b549b..d6ccdb49 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +7,60 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Mode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Mode.java" 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/Controls/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.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/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.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/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.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/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.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/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropFastAccess.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.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/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.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/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.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/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.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/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/MainModule_.java b/src/Common/MainModule_.java
index 373144bb..54929ad7 100644
--- a/src/Common/MainModule_.java
+++ b/src/Common/MainModule_.java
@@ -6,6 +6,7 @@ import Common.Passes.Pass;
 import Common.Passes.PassCode_;
 import Common.Utils.TextLog;
 import Common.Visual.UIModule_;
+import Common.Visual.UI_;
 import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
 
 import java.util.Comparator;
@@ -15,8 +16,6 @@ import java.util.Vector;
 public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModule_> {
     public static MainModule_ instance = null; //текущий экземпляр. всегда один.
     //--
-    public FastAccessMenuBar fastAccessMenuBar = null;
-    //--
     D db;
     Class<D> db_class;
     LinkedHashMap<Current_, Object> objects;  //Current
@@ -30,15 +29,18 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
     }
     //--
     public MainModule_(Class<D> db_class_in, Class<U> ui_class_in) throws Exception {
-        objects = new LinkedHashMap<>();
-        db_class = db_class_in;
-        createPasses();
         ui_class=ui_class_in;
-        //---
-        if (ui_class!=null)
-            ui = ui_class_in.newInstance();
+        db_class = db_class_in;
         instance = this;
     }
+    public void Init() throws Exception{
+        if (ui_class!=null)
+            ui=ui_class.newInstance();
+        //--
+        createPasses();
+        //-
+        objects = new LinkedHashMap<>();
+    }
     //ИНТЕРФЕЙС
     public boolean hasUI(){return ui!=null;}
     //БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index a94dd42d..0c4c8e62 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -94,7 +94,7 @@ public class Pass<T> {
             } catch (Exception ex) {
                 Utils_.MainLog.PrintException(ex);
             }
-            MainModule_.instance.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
+            MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
         }
     }
     public boolean isDone() {
diff --git a/src/Common/Visual/Controls/HyperlinksStyledList.java b/src/Common/Visual/Controls/HyperlinksStyledList.java
index 9eb7b3f0..2c651ce4 100644
--- a/src/Common/Visual/Controls/HyperlinksStyledList.java
+++ b/src/Common/Visual/Controls/HyperlinksStyledList.java
@@ -1,10 +1,11 @@
 package Common.Visual.Controls;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
 public class HyperlinksStyledList extends StyledList {
     @Override
     public void applyTheme() {
         super.applyTheme();
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
     }
 }
diff --git a/src/Common/Visual/Controls/MenuBarButton.java b/src/Common/Visual/Controls/MenuBarButton.java
index 6981f455..5dba8cd7 100644
--- a/src/Common/Visual/Controls/MenuBarButton.java
+++ b/src/Common/Visual/Controls/MenuBarButton.java
@@ -1,4 +1,5 @@
 package Common.Visual.Controls;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -9,7 +10,7 @@ import java.awt.*;
 public class MenuBarButton extends JButton {
     public MenuBarButton() {
         super();
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
         //
         setBorderPainted(false);
         setContentAreaFilled(false);
@@ -30,6 +31,6 @@ public class MenuBarButton extends JButton {
         setIcon(Utils_.getIcon(icon_path));
     }
     public void setFont(VisualiserFonts font_in) {
-        setFont(UI_.getTheme().Fonts.get(font_in));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(font_in));
     }
 }
diff --git a/src/Common/Visual/Controls/StyledList.java b/src/Common/Visual/Controls/StyledList.java
index 804f9130..99e57878 100644
--- a/src/Common/Visual/Controls/StyledList.java
+++ b/src/Common/Visual/Controls/StyledList.java
@@ -1,4 +1,5 @@
 package Common.Visual.Controls;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.UI_;
@@ -6,12 +7,12 @@ import Common.Visual.UI_;
 import javax.swing.*;
 public class StyledList extends JList implements ThemeElement {
     public StyledList() {
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
         applyTheme();
     }
     @Override
     public void applyTheme() {
-        setBackground(UI_.getTheme().table_background);
-        setForeground(UI_.getTheme().foreground);
+        setBackground(MainModule_.instance.getUI().getTheme().table_background);
+        setForeground(MainModule_.instance.getUI().getTheme().foreground);
     }
 }
diff --git a/src/Common/Visual/Controls/StyledProgressBar.java b/src/Common/Visual/Controls/StyledProgressBar.java
index f768b797..06b42e56 100644
--- a/src/Common/Visual/Controls/StyledProgressBar.java
+++ b/src/Common/Visual/Controls/StyledProgressBar.java
@@ -1,4 +1,5 @@
 package Common.Visual.Controls;
+import Common.MainModule_;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.UI_;
 
@@ -10,7 +11,7 @@ public class StyledProgressBar extends JProgressBar implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(UI_.getTheme().bar_background);
-        setForeground(UI_.getTheme().bar_foreground);
+        setBackground(MainModule_.instance.getUI().getTheme().bar_background);
+        setForeground(MainModule_.instance.getUI().getTheme().bar_foreground);
     }
 }
diff --git a/src/Common/Visual/Menus/StyledPopupMenu.java b/src/Common/Visual/Menus/StyledPopupMenu.java
index 4735e713..b1fe66b1 100644
--- a/src/Common/Visual/Menus/StyledPopupMenu.java
+++ b/src/Common/Visual/Menus/StyledPopupMenu.java
@@ -1,4 +1,5 @@
 package Common.Visual.Menus;
+import Common.MainModule_;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.UI_;
 
@@ -21,15 +22,15 @@ public class StyledPopupMenu extends JPopupMenu implements ThemeElement {
         });
     }
     private void refreshTheme_r(MenuElement element) {
-        element.getComponent().setBackground(UI_.getTheme().background);
-        element.getComponent().setForeground(UI_.getTheme().foreground);
+        element.getComponent().setBackground(MainModule_.instance.getUI().getTheme().background);
+        element.getComponent().setForeground(MainModule_.instance.getUI().getTheme().foreground);
         for (MenuElement se : element.getSubElements())
             refreshTheme_r(se);
     }
     @Override
     public void applyTheme() {
-        setBackground(UI_.getTheme().background);
-        setForeground(UI_.getTheme().foreground);
+        setBackground(MainModule_.instance.getUI().getTheme().background);
+        setForeground(MainModule_.instance.getUI().getTheme().foreground);
         refreshTheme_r(this);
     }
     public void CheckElementsVisibility() {
diff --git a/src/Common/Visual/Menus/VisualiserMenuItem.java b/src/Common/Visual/Menus/VisualiserMenuItem.java
index 64480f61..37a43034 100644
--- a/src/Common/Visual/Menus/VisualiserMenuItem.java
+++ b/src/Common/Visual/Menus/VisualiserMenuItem.java
@@ -1,4 +1,5 @@
 package Common.Visual.Menus;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -7,15 +8,15 @@ import javax.swing.*;
 public class VisualiserMenuItem extends JMenuItem {
     public VisualiserMenuItem(String text) {
         super(text, null);
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
     }
     public VisualiserMenuItem(String text, String icon_path) {
         super(text);
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
         if (icon_path != null)
             setIcon(Utils_.getIcon(icon_path));
     }
     public VisualiserMenuItem() {
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
     }
 }
diff --git a/src/Common/Visual/Tables/HiddenListRenderer.java b/src/Common/Visual/Tables/HiddenListRenderer.java
index 0290ce72..12159b3e 100644
--- a/src/Common/Visual/Tables/HiddenListRenderer.java
+++ b/src/Common/Visual/Tables/HiddenListRenderer.java
@@ -1,4 +1,5 @@
 package Common.Visual.Tables;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
 
@@ -12,6 +13,6 @@ public class HiddenListRenderer extends RendererCell<Vector<String>> {
     @Override
     public void Display() {
         setText(String.join(";", value));
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
     }
 }
diff --git a/src/Common/Visual/Tables/StatusEnumRenderer.java b/src/Common/Visual/Tables/StatusEnumRenderer.java
index e78c42d7..a082b6e9 100644
--- a/src/Common/Visual/Tables/StatusEnumRenderer.java
+++ b/src/Common/Visual/Tables/StatusEnumRenderer.java
@@ -1,4 +1,5 @@
 package Common.Visual.Tables;
+import Common.MainModule_;
 import Common.Visual.StatusEnum;
 import Common.Visual.UI_;
 
@@ -12,7 +13,7 @@ public class StatusEnumRenderer extends RendererCell<StatusEnum> {
     public void Display() {
         if (value != null) {
             setText(value.getDescription());
-            setFont(UI_.getTheme().Fonts.get(value.getFont()));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(value.getFont()));
         }
     }
 }
diff --git a/src/Common/Visual/Tables/StyledCellLabel.java b/src/Common/Visual/Tables/StyledCellLabel.java
index 1c36e6db..2cce5fd5 100644
--- a/src/Common/Visual/Tables/StyledCellLabel.java
+++ b/src/Common/Visual/Tables/StyledCellLabel.java
@@ -1,4 +1,5 @@
 package Common.Visual.Tables;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.UI_;
@@ -7,7 +8,7 @@ import javax.swing.*;
 //наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.
 public class StyledCellLabel extends JLabel implements ThemeElement {
     public StyledCellLabel() {
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
         setHorizontalAlignment(SwingConstants.LEFT);
         setVerticalAlignment(SwingConstants.CENTER);
         setOpaque(true);
@@ -15,7 +16,7 @@ public class StyledCellLabel extends JLabel implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(UI_.getTheme().table_background);
-        setForeground(UI_.getTheme().foreground);
+        setBackground(MainModule_.instance.getUI().getTheme().table_background);
+        setForeground(MainModule_.instance.getUI().getTheme().foreground);
     }
 }
diff --git a/src/Common/Visual/Tables/StyledTable.java b/src/Common/Visual/Tables/StyledTable.java
index 3a5b4387..b86e3837 100644
--- a/src/Common/Visual/Tables/StyledTable.java
+++ b/src/Common/Visual/Tables/StyledTable.java
@@ -1,4 +1,5 @@
 package Common.Visual.Tables;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Menus.TableMenu;
 import Common.Visual.Themes.ThemeElement;
@@ -16,9 +17,9 @@ public abstract class StyledTable extends JTable implements ThemeElement {
         setFillsViewportHeight(true);
         setAutoCreateRowSorter(dataModel.getRowCount() > 0);
         Init();
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
         JTableHeader header = getTableHeader();
-        header.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        header.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
         putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         //текущий объет может определяться по первому столбцу. могут быть баги если не запретить
@@ -77,10 +78,10 @@ public abstract class StyledTable extends JTable implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(UI_.getTheme().table_background);
-        setForeground(UI_.getTheme().foreground);
-        setSelectionBackground(UI_.getTheme().selection_background);
-        setSelectionForeground(UI_.getTheme().foreground);
+        setBackground(MainModule_.instance.getUI().getTheme().table_background);
+        setForeground(MainModule_.instance.getUI().getTheme().foreground);
+        setSelectionBackground(MainModule_.instance.getUI().getTheme().selection_background);
+        setSelectionForeground(MainModule_.instance.getUI().getTheme().foreground);
     }
     public void SelectRow(int r) {
         getSelectionModel().setSelectionInterval(r, r);
diff --git a/src/Common/Visual/Tables/WrapTextRenderer.java b/src/Common/Visual/Tables/WrapTextRenderer.java
index 738fa8f4..7f9b40f2 100644
--- a/src/Common/Visual/Tables/WrapTextRenderer.java
+++ b/src/Common/Visual/Tables/WrapTextRenderer.java
@@ -1,4 +1,5 @@
 package Common.Visual.Tables;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
 
@@ -10,7 +11,7 @@ public class WrapTextRenderer extends JTextArea implements TableCellRenderer {
         setLineWrap(true);
         setWrapStyleWord(true);
         // setOpaque(false);
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f));
     }
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());
diff --git a/src/Common/Visual/Trees/GraphTreeCellRenderer.java b/src/Common/Visual/Trees/GraphTreeCellRenderer.java
index 8dbff903..c331e654 100644
--- a/src/Common/Visual/Trees/GraphTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/GraphTreeCellRenderer.java
@@ -1,4 +1,5 @@
 package Common.Visual.Trees;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -16,10 +17,10 @@ public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
         if (o instanceof FileObjectWithMessages) {
             FileObjectWithMessages target = (FileObjectWithMessages) o;
             setIcon(Utils_.getIcon(target.ImageKey()));
-            setFont(UI_.getTheme().Fonts.get(target.getFont()));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(target.getFont()));
         } else {
             setIcon(null);
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         }
         setForeground(tree.getForeground());
         return this;
diff --git a/src/Common/Visual/Trees/SelectionTreeCellRenderer.java b/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
index 7e786d13..19fb6cda 100644
--- a/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/SelectionTreeCellRenderer.java
@@ -1,4 +1,5 @@
 package Common.Visual.Trees;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Selectable;
 import Common.Visual.UI_;
@@ -17,7 +18,7 @@ public class SelectionTreeCellRenderer extends StyledTreeCellRenderer {
             setText(selectable.getSelectionText());
             setIcon(selectable.GetSelectionIcon());
         } else {
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
             setIcon(null);
         }
         setForeground(tree.getForeground());
diff --git a/src/Common/Visual/Trees/StyledTree.java b/src/Common/Visual/Trees/StyledTree.java
index 195432d1..7c4485f3 100644
--- a/src/Common/Visual/Trees/StyledTree.java
+++ b/src/Common/Visual/Trees/StyledTree.java
@@ -1,4 +1,5 @@
 package Common.Visual.Trees;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.UI_;
@@ -22,7 +23,7 @@ public class StyledTree extends JTree implements ThemeElement {
         super(root_in);
         root = root_in;
         setOpaque(true);
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
         setToggleClickCount(0);  //отключение сворачивание разворачивания по двойному клику
         //--
         if (!getRenderer().equals(TreeRenderers.RendererUndefined))
@@ -86,8 +87,8 @@ public class StyledTree extends JTree implements ThemeElement {
     }
     @Override
     public void applyTheme() {
-        setBackground(UI_.getTheme().trees_background);
-        setForeground(UI_.getTheme().foreground);
+        setBackground(MainModule_.instance.getUI().getTheme().trees_background);
+        setForeground(MainModule_.instance.getUI().getTheme().foreground);
         menu.applyTheme();
     }
     protected GraphMenu createMenu() {
diff --git a/src/Common/Visual/Trees/StyledTreeCellRenderer.java b/src/Common/Visual/Trees/StyledTreeCellRenderer.java
index 1966782d..7524cb6c 100644
--- a/src/Common/Visual/Trees/StyledTreeCellRenderer.java
+++ b/src/Common/Visual/Trees/StyledTreeCellRenderer.java
@@ -1,4 +1,5 @@
 package Common.Visual.Trees;
+import Common.MainModule_;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.UI_;
 
@@ -9,7 +10,7 @@ public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements T
     }
     @Override
     public void applyTheme() {
-        setBackgroundNonSelectionColor(UI_.getTheme().trees_background);
-        setBackgroundSelectionColor(UI_.getTheme().selection_background);
+        setBackgroundNonSelectionColor(MainModule_.instance.getUI().getTheme().trees_background);
+        setBackgroundSelectionColor(MainModule_.instance.getUI().getTheme().selection_background);
     }
 }
diff --git a/src/Common/Visual/UIModule_.java b/src/Common/Visual/UIModule_.java
index f99956f3..69ac1cec 100644
--- a/src/Common/Visual/UIModule_.java
+++ b/src/Common/Visual/UIModule_.java
@@ -1,6 +1,18 @@
 package Common.Visual;
+import Common.Visual.Themes.DefaultTheme;
+import Common.Visual.Themes.VisualiserTheme;
 import Common.Visual.Windows.PassForm;
+import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
 public class UIModule_ {
+    //--
+    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;}
@@ -8,4 +20,8 @@ public class UIModule_ {
         return passForm = passForm_in;
     }
     public void DropPassForm(){passForm=null;}
+    //--
+    //--
+    FastAccessMenuBar fastAccessMenuBar = new FastAccessMenuBar();
+    public FastAccessMenuBar getFastAccessMenuBar(){return fastAccessMenuBar;}
 }
diff --git a/src/Common/Visual/UI_.java b/src/Common/Visual/UI_.java
index b4be38c0..c3ed8aff 100644
--- a/src/Common/Visual/UI_.java
+++ b/src/Common/Visual/UI_.java
@@ -17,16 +17,9 @@ public class UI_ {
     //---
     public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
     public static Stack<Component> windowsStack = new Stack<>();
-    static VisualiserTheme theme = new DefaultTheme();
     public static boolean isActive() {
         return active;
     }
-    public static VisualiserTheme getTheme() {
-        return theme;
-    }
-    public static void setTheme(VisualiserTheme theme_in) {
-        theme = theme_in;
-    }
     public static Component getFrontWindow() {
         Component res = null;
         try {
diff --git a/src/Common/Visual/Windows/Dialog/Dialog.java b/src/Common/Visual/Windows/Dialog/Dialog.java
index 31af06ce..5972ca8c 100644
--- a/src/Common/Visual/Windows/Dialog/Dialog.java
+++ b/src/Common/Visual/Windows/Dialog/Dialog.java
@@ -1,4 +1,5 @@
 package Common.Visual.Windows.Dialog;
+import Common.MainModule_;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
@@ -32,7 +33,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         setModal(true);
         toFront();
         getContentPane().setLayout(new BorderLayout());
-        lTitle.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        lTitle.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
         if (!getIconPath().isEmpty()) {
             setIconImage(Utils_.getIcon(getIconPath()).getImage());
         }
diff --git a/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java b/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
index 54d4ef28..3bd958a7 100644
--- a/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
+++ b/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
@@ -1,4 +1,5 @@
 package Common.Visual.Windows.Dialog;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
 
@@ -6,7 +7,7 @@ import javax.swing.*;
 import java.awt.*;
 public class DialogTextComboBox extends JComboBox<String> implements DialogFields {
     public DialogTextComboBox() {
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
         setEditable(false);
     }
     @Override
diff --git a/src/Common/Visual/Windows/Dialog/DialogWrapText.java b/src/Common/Visual/Windows/Dialog/DialogWrapText.java
index 85f2dbed..32069015 100644
--- a/src/Common/Visual/Windows/Dialog/DialogWrapText.java
+++ b/src/Common/Visual/Windows/Dialog/DialogWrapText.java
@@ -1,4 +1,5 @@
 package Common.Visual.Windows.Dialog;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
 
@@ -8,7 +9,7 @@ public class DialogWrapText extends JTextPane implements DialogFields {
     public DialogWrapText() {
         setOpaque(true);
         setBackground(Color.WHITE);
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeBold));
         setEditable(false);
     }
     @Override
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 7d4be900..334bd653 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -224,8 +224,9 @@ public class Global {
     public static void NormalMode(int port) throws Exception {
         //-------------------------------->>
         UI_.active = true;
-        UI_.setTheme(new LightSPFEditorTheme());
         mainModule = new MainModule();
+        mainModule.Init();
+        //--
         CheckVisualiserDirectories();
         CreateLogAtComponentsPath();
         //-
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
index a0cedacd..520b4ab1 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
@@ -1,4 +1,5 @@
 package _VisualDVM.GlobalData.CompilerEnvironment.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.UI_;
@@ -7,7 +8,7 @@ import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
     @Override
     public void Action() {
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         setText(value.value.isEmpty() ? "не задано" : value.value);
         //-
         ComboTextDialog dialog = new ComboTextDialog() {
diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
index 84de512f..9215f6b2 100644
--- a/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.GlobalData.CompilerEnvironment.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.UI_;
@@ -8,7 +9,7 @@ public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
     public void Display() {
         if (value != null) {
             CompilerEnvironment environment = (CompilerEnvironment) value;
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
             setText(environment.value.isEmpty() ? "не задано" : environment.value);
         }
     }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
index 0bae6649..00037f58 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.GlobalData.CompilerOption.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.UI_;
@@ -9,10 +10,10 @@ public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
         if (value != null) {
             CompilerOption option = (CompilerOption) value;
             if (option.hasParameter()) {
-                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
                 setText(option.parameterName);
             } else {
-                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.UnknownState));
                 setText("нет");
             }
         }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
index b5134e65..05b32065 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
@@ -1,4 +1,5 @@
 package _VisualDVM.GlobalData.CompilerOption.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.UI_;
@@ -8,7 +9,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
     @Override
     public void Action() {
         if (value.hasParameter()) {
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
             //-
             setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
             //-
@@ -22,7 +23,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
                 setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
             }
         } else {
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.UnknownState));
             setText("нет");
         }
     }
diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
index 9eb6f417..dc2e7e82 100644
--- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
+++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.GlobalData.CompilerOption.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectRenderer;
 import Common.Visual.UI_;
@@ -9,10 +10,10 @@ public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
         if (value != null) {
             CompilerOption option = (CompilerOption) value;
             if (option.hasParameter()) {
-                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
                 setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue);
             } else {
-                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState));
+                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.UnknownState));
                 setText("нет");
             }
         }
diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java
index 36065770..798b6c78 100644
--- a/src/_VisualDVM/GlobalData/GlobalDatabase.java
+++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java
@@ -1,5 +1,6 @@
 package _VisualDVM.GlobalData;
 import Common.Database.VisualiserDatabase;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -89,6 +90,8 @@ public class GlobalDatabase extends VisualiserDatabase {
         //настройки компонент
         settings.AddAll();
         runConfigurations.Patch();
+        //---
+        MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
     }
     @Override
     public PassCode getSynchronizePassCode() {
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
index 98c4e371..2cd3e625 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.GlobalData.RemoteFile.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
 import Common.Visual.UI_;
@@ -16,7 +17,7 @@ public class RemoteFileRenderer extends StyledTreeCellRenderer {
         if (o instanceof RemoteFile) {
             RemoteFile file = (RemoteFile) o;
             setText(file.name);
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
             if (file.isDirectory())
                 setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
         }
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index 0b074ae7..1eb62465 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -35,6 +35,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import _VisualDVM.Visual.MainUI;
+import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
diff --git a/src/_VisualDVM/Passes/All/DropFastAccess.java b/src/_VisualDVM/Passes/All/DropFastAccess.java
index 1b0cbb1d..7e209ec1 100644
--- a/src/_VisualDVM/Passes/All/DropFastAccess.java
+++ b/src/_VisualDVM/Passes/All/DropFastAccess.java
@@ -14,6 +14,6 @@ public class DropFastAccess extends Pass {
     }
     @Override
     protected void showDone() throws Exception {
-        MainModule_.instance.fastAccessMenuBar.Drop();
+        MainModule_.instance.getUI().getFastAccessMenuBar().Drop();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index 09eb9e1a..5b464827 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -120,7 +120,7 @@ public class UpdateSetting extends Pass<DBSetting> {
                     break;
                 case FastAccessPassesCount:
                     if (Global.mainModule.HasProject())
-                        MainModule_.instance.fastAccessMenuBar.Refresh();
+                        MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
                     break;
                 case ShowFullArraysDeclarations:
                     if (Global.mainModule.HasProject())
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java b/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
index 2b7a3e64..adb4f35a 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
 import _VisualDVM.Visual.UI;
@@ -41,7 +42,7 @@ public class FilesHyperlinksPanel extends JPanel {
             }
         });
         Hyperlinks.setLayoutOrientation(JList.VERTICAL);
-        Hyperlinks.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        Hyperlinks.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         add(Hyperlinks, BorderLayout.CENTER);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java b/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
index 81bda100..7958e884 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
 import Common.Visual.UI_;
@@ -23,7 +24,7 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
             File dir = (File) o;
             setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
             setText(dir.getName());
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
         } else if (o instanceof DBProjectFile) {
             DBProjectFile file = (DBProjectFile) o;
             if (Global.files_multiselection) {
@@ -32,8 +33,8 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
                 setIcon(file.GetIcon());
             }
             setText(file.file.getName());
-            if (file.IsMain()) setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold));
-            else setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
+            if (file.IsMain()) setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeBold));
+            else setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
             if (file.state.equals(FileState.Excluded)) {
                 Map attributes = getFont().getAttributes();
                 attributes.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON);
diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
index 7f889875..e1472e70 100644
--- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.Project.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Selectable;
 import Common.Visual.Trees.StyledTreeCellRenderer;
@@ -41,7 +42,7 @@ public class VersionsTreeCellRenderer extends StyledTreeCellRenderer {
             }
         }
         setForeground(tree.getForeground());
-        setFont(UI_.getTheme().Fonts.get(
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(
                 version.isNew ? VisualiserFonts.NewVersion : VisualiserFonts.TreePlain));
         setText(version.getTitle());
         return this;
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
index 32326ae8..54bd2ecc 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.RendererCell;
 import Common.Visual.UI_;
@@ -14,7 +15,8 @@ public class DimensionRenderer extends RendererCell<TemplateDimension> {
     public void Display() {
         if (value != null) {
             setText(value.state.getMaskDescription());
-            setFont(value.isBlocked() ? UI_.getTheme().Fonts.get(VisualiserFonts.Disabled) : UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+            setFont(value.isBlocked() ? MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Disabled) :
+                    MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         }
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
index 843b46ee..722aed05 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Tables.DBObjectEditor;
 import Common.Visual.UI_;
@@ -17,7 +18,7 @@ public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {
     }
     @Override
     public void Action() {
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
         value.SwitchState();
         setText(value.state.getMaskDescription());
         UI.getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount();
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
index f16e32fc..217870ed 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.UI;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Trees.StyledTreeCellRenderer;
 import Common.Visual.UI_;
@@ -14,9 +15,9 @@ public class RulesTreeCellRenderer extends StyledTreeCellRenderer {
         super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
         Object o = ((DefaultMutableTreeNode) value).getUserObject();
         if (o instanceof String) {
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Distribution));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Distribution));
         } else if (o instanceof ParallelRegion)
-            setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+            setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         setForeground(tree.getForeground());
         return this;
     }
diff --git a/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java b/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
index 12300288..0ccbc739 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Repository.Component;
+import Common.MainModule_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI_;
@@ -12,7 +13,7 @@ public class ComponentsMenuBar extends DataMenuBar {
                 new VisualiserMenu(
                         "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
                     {
-                        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+                        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
                         add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
                         add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
                     }
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingBar.java b/src/_VisualDVM/TestingSystem/Common/TestingBar.java
index d18a9b90..eda337f0 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingBar.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingBar.java
@@ -1,4 +1,5 @@
 package _VisualDVM.TestingSystem.Common;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.Fonts.VisualiserFonts;
@@ -81,7 +82,7 @@ public class TestingBar extends VisualiserMenuBar {
         });
         add(new JLabel(" сек ") {
             {
-                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
             }
         });
         addSeparator();
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
index 8790974b..c5791975 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
@@ -1,4 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
+import Common.MainModule_;
 import Common.Visual.Tables.StyledCellLabel;
 import Common.Visual.UI_;
 import Common.Visual.Windows.Dialog.DialogFields;
@@ -21,7 +22,7 @@ public class SapforSettingsCommandFields implements DialogFields {
             JLabel res = new StyledCellLabel();
             res.setText(value.getDescription());
             res.setBackground(isSelected ?
-                    UI_.getTheme().selection_background : UI_.getTheme().background
+                    MainModule_.instance.getUI().getTheme().selection_background : MainModule_.instance.getUI().getTheme().background
             );
             return res;
         });
diff --git a/src/_VisualDVM/Visual/Editor/BaseEditor.java b/src/_VisualDVM/Visual/Editor/BaseEditor.java
index 6b289b69..acfe07e6 100644
--- a/src/_VisualDVM/Visual/Editor/BaseEditor.java
+++ b/src/_VisualDVM/Visual/Editor/BaseEditor.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Editor;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.TextEditorMenu;
@@ -129,7 +130,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
     @Override
     public void applyTheme() {
         float font_size = (float) getFont().getSize();
-        ((SPFEditorTheme) UI_.getTheme()).getEditorTheme().apply(this);
+        ((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
         setFont(getFont().deriveFont(font_size));
         menu.applyTheme();
         //меню связано с редактором. поэтому тема меняется только вместе с ним.
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index fa374ea9..29d11836 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -1,4 +1,9 @@
 package _VisualDVM.Visual;
 import Common.Visual.UIModule_;
+import Common.Visual.UI_;
+import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
 public class MainUI extends UIModule_ {
+    public MainUI(){
+        setTheme(new LightSPFEditorTheme());
+    }
 }
diff --git a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
index 84011322..19c6141f 100644
--- a/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus.FastAccessMenuBar;
+import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Visual.UI_;
 import _VisualDVM.Global;
@@ -8,9 +9,6 @@ import _VisualDVM.Visual.Menus.VisualiserMenuBar;
 import javax.swing.*;
 import java.awt.*;
 public class FastAccessMenuBar extends VisualiserMenuBar {
-    public FastAccessMenuBar() {
-        Refresh();
-    }
     @Override
     public void setSizeLimits() {
         //если задавать PreffredSize 0, скролл НЕ РАБОТАЕТ. Магия!
@@ -26,8 +24,8 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
     public void Refresh() {
         Drop();
         int i = 1;
-        for (Pass pass : Global.mainModule.getFirstAccessPasses()) {
-            showPass(pass);
+        for (Object pass : MainModule_.instance.getFirstAccessPasses()) {
+            showPass((Pass) pass);
             ++i;
             if (i > ((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
         }
diff --git a/src/_VisualDVM/Visual/Menus/PassesSubMenu.java b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
index ba2ad0f4..76e2ab57 100644
--- a/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
+++ b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -10,7 +11,7 @@ public class PassesSubMenu extends JMenu {
     public PassesSubMenu(String title, String icon, PassCode... passes) {
         super(title);
         setIcon(Utils_.getIcon(icon));
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
         for (PassCode code : passes) {
             add(Global.mainModule.getPass(code).createMenuItem());
         }
diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
index af0c2d43..b2d18a27 100644
--- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
+++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus.ProjectMenuBar;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -19,7 +20,7 @@ public class ProjectViewMenu extends VisualiserMenu {
             JMenuItem m = new JMenuItem(view.getDescription()) {
                 {
                     setIcon(Utils_.getIcon(view.getIcon()));
-                    setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                    setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
                     addActionListener(e -> {
                         Global.mainModule.set(Current.ProjectView, view);
                         UI.getMainWindow().getProjectWindow().ShowProjectView();
diff --git a/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java b/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
index 6cdd6eba..d5e0d574 100644
--- a/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -10,7 +11,7 @@ public class PropertiesSubmenu extends JMenu {
         super(title);
         if (icon != null)
             setIcon(Utils_.getIcon(icon));
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
         for (String name : settings) {
             Global.properties.addFlagMenuItem(this, name);
         }
diff --git a/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
index 8e9745b3..b37a8c97 100644
--- a/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
+++ b/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -11,7 +12,7 @@ public class SettingsSubmenu extends JMenu {
         super(title);
         if (icon != null)
             setIcon(Utils_.getIcon(icon));
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
         for (SettingName c : settings) {
             add((Global.mainModule.getDb()).settings.get(c).getMenuItem());
         }
diff --git a/src/_VisualDVM/Visual/Menus/VisualiserMenu.java b/src/_VisualDVM/Visual/Menus/VisualiserMenu.java
index 26e7b197..52da4ab1 100644
--- a/src/_VisualDVM/Visual/Menus/VisualiserMenu.java
+++ b/src/_VisualDVM/Visual/Menus/VisualiserMenu.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -13,7 +14,7 @@ public class VisualiserMenu extends JMenu {
         setToolTipText(text);
         if (textVisible)
             setText(text);
-        setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
         if (!iconPath.isEmpty())
             setIcon(Utils_.getIcon(iconPath));
     }
diff --git a/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java b/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
index 50158dbe..71f66150 100644
--- a/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Menus;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Fonts.VisualiserFonts;
 import Common.Visual.UI_;
@@ -37,7 +38,7 @@ public class VisualiserMenuBar extends JToolBar {
     public JLabel addLabel(String text_in, String icon_path_in) {
         JLabel res = new JLabel(text_in) {
             {
-                setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
                 if (icon_path_in != null) {
                     setIcon(Utils_.getIcon(icon_path_in));
                 }
diff --git a/src/_VisualDVM/Visual/UI.java b/src/_VisualDVM/Visual/UI.java
index 2c1cc432..7bd15f02 100644
--- a/src/_VisualDVM/Visual/UI.java
+++ b/src/_VisualDVM/Visual/UI.java
@@ -127,7 +127,6 @@ public class UI {
         testingBar = new TestingBar();
         credentialsBar = new CredentialsBar();
         versionsMenuBar = new VersionsMenuBar();
-        MainModule_.instance.fastAccessMenuBar = new FastAccessMenuBar();
         //---------------------------------------------------->>
         UI_.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
         UI_.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());
diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java
index 318dd2d3..33a187d3 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectForm.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java
@@ -55,7 +55,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
         functionsFormPanel.add((functionsForm = new FunctionsForm()).getContent());
         analysisFormPanel.add((analysisForm = new AnalysisForm()).getContent());
         //-
-        FastAccessScroll = new JScrollPane(MainModule_.instance.fastAccessMenuBar) {
+        FastAccessScroll = new JScrollPane(MainModule_.instance.getUI().getFastAccessMenuBar()) {
             {
                 getHorizontalScrollBar().setPreferredSize(new Dimension(0, 10));
                 setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);